Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows expects Unicode String for IShellFolder#ParseDisplayName #1127

Merged
merged 2 commits into from
Aug 18, 2019
Merged

Windows expects Unicode String for IShellFolder#ParseDisplayName #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d84f5e0
Add failing test for IShellFolder#ParseDisplayName
dbwiddis Aug 16, 2019
28da1fb
Fixed the bug, tests now pass!
dbwiddis Aug 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Features
Bug Fixes
---------
* [#1115](https://github.com/java-native-access/jna/issues/1115): Fix signature for `c.s.j.p.win32.Kernel32#CreateRemoteThread` and bind `VirtualAllocEx`, `VirtualFreeEx`, `GetExitCodeThread` in `c.s.j.p.win32.Kernel32` - [@apangin](https://github.com/apangin), [@matthiasblaesing](https://github.com/matthiasblaesing).
* [#1127](https://github.com/java-native-access/jna/issues/1127): Windows needs a wide string in `c.s.j.p.win32.COM.IShellFolder#ParseDisplayName` - [@dbwiddis](https://github.com/dbwiddis).

Release 5.4.0
=============
Expand Down
7 changes: 6 additions & 1 deletion contrib/platform/src/com/sun/jna/platform/win32/COM/IShellFolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/

import com.sun.jna.Function;
import com.sun.jna.Native;
import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.IID;
import com.sun.jna.platform.win32.Guid.REFIID;
Expand Down Expand Up @@ -480,7 +481,11 @@ public int Release() {
@Override
public WinNT.HRESULT ParseDisplayName(WinDef.HWND hwnd, Pointer pbc, String pszDisplayName, IntByReference pchEaten, PointerByReference ppidl, IntByReference pdwAttributes) {
Function f = Function.getFunction(vTable[3], Function.ALT_CONVENTION);
return new WinNT.HRESULT(f.invokeInt(new Object[]{interfacePointer, hwnd, pbc, pszDisplayName, pchEaten, ppidl, pdwAttributes}));
// pszDisplayName is mapped as String but Windows needs
// Wide String. Convert and pass here.
char[] pszDisplayNameNative = Native.toCharArray(pszDisplayName);
return new WinNT.HRESULT(f.invokeInt(new Object[] { interfacePointer, hwnd, pbc,
pszDisplayNameNative, pchEaten, ppidl, pdwAttributes }));
}

@Override
Expand Down
28 changes: 25 additions & 3 deletions contrib/platform/test/com/sun/jna/platform/win32/COM/IShellFolderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,19 @@
*/

import com.sun.jna.Pointer;
import junit.framework.TestCase;

import com.sun.jna.platform.win32.*;
import com.sun.jna.platform.win32.Guid;
import com.sun.jna.platform.win32.Guid.REFIID;
import com.sun.jna.platform.win32.Ole32;
import com.sun.jna.platform.win32.ShTypes.STRRET;
import com.sun.jna.platform.win32.Shell32;
import com.sun.jna.platform.win32.ShlObj;
import com.sun.jna.platform.win32.Shlwapi;
import com.sun.jna.platform.win32.WinNT;
import com.sun.jna.ptr.IntByReference;
import com.sun.jna.ptr.PointerByReference;

import junit.framework.TestCase;

public class IShellFolderTest extends TestCase {
static {
ClassLoader.getSystemClassLoader().setDefaultAssertionStatus(true);
Expand Down Expand Up @@ -102,4 +108,20 @@ public void testEnumObjects() throws Exception {
peidl.Release();
assertTrue(sawNames); // We should see at least one item with a name
}

public void testParseDisplayName() throws Exception {
String directory = System.getenv("WinDir");

IntByReference pchEaten = new IntByReference();
PointerByReference ppidl = new PointerByReference();
IntByReference pdwAttributes = new IntByReference();
PointerByReference desktopFolder = new PointerByReference();

WinNT.HRESULT hResult = Shell32.INSTANCE.SHGetDesktopFolder(desktopFolder);
assertEquals(COMUtils.S_OK, hResult.intValue());

IShellFolder shellFolder = IShellFolder.Converter.PointerToIShellFolder(desktopFolder);
hResult = shellFolder.ParseDisplayName(null, null, directory, pchEaten, ppidl, pdwAttributes);
assertEquals(COMUtils.S_OK, hResult.intValue());
}
}