May 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : user32: Read rawinput device handles assigned by hidclass.sys.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: f2e9783111cb6cb1b001f1d23db5f361a418c03a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e9783111cb6cb1b001f1d2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 26 12:38:01 2021 +0200 user32: Read rawinput device handles assigned by hidclass.sys. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 129c1933c36..ad93517ae8a 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -38,11 +38,14 @@ #include "user_private.h" #include "initguid.h" +#include "devpkey.h" #include "ntddmou.h" #include "ntddkbd.h" WINE_DEFAULT_DEBUG_CHANNEL(rawinput); +DEFINE_DEVPROPKEY(DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2); + struct device { SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; @@ -92,17 +95,27 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) { + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; struct device *device; + UINT32 handle; HANDLE file; - DWORD size; + DWORD size, type; - SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, NULL); + SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, &device_data); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) { ERR("Failed to get device path, error %#x.\n", GetLastError()); return FALSE; } + + if (!SetupDiGetDevicePropertyW(set, &device_data, &DEVPROPKEY_HID_HANDLE, &type, (BYTE *)&handle, sizeof(handle), NULL, 0) || + type != DEVPROP_TYPE_UINT32) + { + ERR("Failed to get device handle, error %#x.\n", GetLastError()); + return NULL; + } + if (!(detail = malloc(size))) { ERR("Failed to allocate memory.\n"); @@ -111,7 +124,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); SetupDiGetDeviceInterfaceDetailW(set, iface, detail, size, NULL, NULL); - TRACE("Found HID device %s.\n", debugstr_w(detail->DevicePath)); + TRACE("Found device %x / %s.\n", handle, debugstr_w(detail->DevicePath)); file = CreateFileW(detail->DevicePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0);

1 0

Rémi Bernon : user32: Remove hardcoded devices from GetRawInputDeviceList.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 0ac619ae7ab7dd90622371a5f58a1ff12d46eb8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ac619ae7ab7dd90622371a5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 26 12:38:03 2021 +0200 user32: Remove hardcoded devices from GetRawInputDeviceList. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index a2cf5769fcc..5c009624fe6 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -408,29 +408,24 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun if (!devices) { - *device_count = 2 + rawinput_devices_count; + *device_count = rawinput_devices_count; return 0; } - if (*device_count < 2 + rawinput_devices_count) + if (*device_count < rawinput_devices_count) { SetLastError(ERROR_INSUFFICIENT_BUFFER); - *device_count = 2 + rawinput_devices_count; + *device_count = rawinput_devices_count; return ~0U; } - devices[0].hDevice = WINE_MOUSE_HANDLE; - devices[0].dwType = RIM_TYPEMOUSE; - devices[1].hDevice = WINE_KEYBOARD_HANDLE; - devices[1].dwType = RIM_TYPEKEYBOARD; - for (i = 0; i < rawinput_devices_count; ++i) { - devices[2 + i].hDevice = rawinput_devices[i].handle; - devices[2 + i].dwType = rawinput_devices[i].info.dwType; + devices[i].hDevice = rawinput_devices[i].handle; + devices[i].dwType = rawinput_devices[i].info.dwType; } - return 2 + rawinput_devices_count; + return rawinput_devices_count; } /***********************************************************************

1 0

Nikolay Sivov : gdi32: Enumerate scalable fonts with zero charset mask as OEM.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 8241d21ae0d385bb436930320056d16a8906caf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8241d21ae0d385bb43693032… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 28 00:03:51 2021 +0300 gdi32: Enumerate scalable fonts with zero charset mask as OEM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51041 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 43c743bd281..2d2831ec725 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2818,7 +2818,7 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi for (i = 0; i < count; i++) { - if (!face->scalable && face->fs.fsCsb[0] == 0) /* OEM bitmap */ + if (face->fs.fsCsb[0] == 0) /* OEM */ { elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; load_script_name( IDS_OEM_DOS - IDS_FIRST_SCRIPT, elf.elfScript );

1 0

Rémi Bernon : user32: Factor unsupported cases into ActivateKeyboardLayout.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: f044f401f70bb9b9f7488378504d5b14f3d4b8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f044f401f70bb9b9f7488378… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 3 11:37:57 2021 +0200 user32: Factor unsupported cases into ActivateKeyboardLayout. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 9 +++++++++ dlls/winemac.drv/keyboard.c | 9 --------- dlls/winex11.drv/keyboard.c | 10 ---------- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index ff90bc6f343..d3dcf375746 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1316,6 +1316,15 @@ HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT flags ) TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags ); + if (flags) FIXME_(keyboard)( "flags %x not supported\n", flags ); + + if (layout == (HKL)HKL_NEXT || layout == (HKL)HKL_PREV) + { + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + FIXME_(keyboard)( "HKL_NEXT and HKL_PREV not supported\n" ); + return 0; + } + if ((old_layout = USER_Driver->pActivateKeyboardLayout( layout, flags )) != (HKL)~0) return old_layout; diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 1ea15f59341..6732c5755ee 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1169,15 +1169,6 @@ HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) TRACE("hkl %p flags %04x\n", hkl, flags); - if (flags) FIXME("flags %x not supported\n",flags); - - if (hkl == (HKL)HKL_NEXT || hkl == (HKL)HKL_PREV) - { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - FIXME("HKL_NEXT and HKL_PREV not supported\n"); - return 0; - } - EnterCriticalSection(&layout_list_section); update_layout_list(); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 01620c5e4a4..d583c8588cd 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1943,16 +1943,6 @@ HKL CDECL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags) return 0; } - if (flags) - FIXME("flags %x not supported\n",flags); - - if (hkl == (HKL)HKL_NEXT || hkl == (HKL)HKL_PREV) - { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - FIXME("HKL_NEXT and HKL_PREV not supported\n"); - return 0; - } - if (!match_x11_keyboard_layout(hkl)) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

1 0

Louis Lenders : ntdll: Stub RtlQueryProcessPlaceholderCompatibilityMode().
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 1a02b3f1c6dbe1cb342f7e9066116eba9bcf6c85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a02b3f1c6dbe1cb342f7e90… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat May 1 18:49:40 2021 -0500 ntdll: Stub RtlQueryProcessPlaceholderCompatibilityMode(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50026 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/ntifs.h | 10 ++++++++++ 4 files changed, 22 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4da9ea5a0b1..94ebca02f35 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -898,6 +898,7 @@ @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stub RtlQueryProcessHeapInformation @ stub RtlQueryProcessLockInformation +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() @ stub RtlQueryProperties @ stub RtlQueryPropertyNames @ stub RtlQueryPropertySet diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index cf21c980a45..d7740a7a044 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -37,6 +37,7 @@ #include "ntdll_misc.h" #include "in6addr.h" #include "ddk/ntddk.h" +#include "ddk/ntifs.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DECLARE_DEBUG_CHANNEL(debugstr); @@ -2165,3 +2166,12 @@ NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *f FIXME("(%p, %p, %p, %p, %p, %p): stub\n", token, fullname, fullname_size, appid, appid_size, packaged); return STATUS_NOT_FOUND; } + +/********************************************************************* + * RtlQueryProcessPlaceholderCompatibilityMode [NTDLL.@] + */ +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) +{ + FIXME("stub\n"); + return PHCM_APPLICATION_DEFAULT; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2e5e2e6e11b..3505a58b9d6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1212,6 +1212,7 @@ @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) @ stdcall RtlQueryRegistryValuesEx(long ptr ptr ptr ptr) RtlQueryRegistryValues @ stdcall RtlQueryTimeZoneInformation(ptr) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 73d602595c4..bd4bd58be26 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -21,6 +21,15 @@ #include "ntddk.h" +#define PHCM_ERROR_INVALID_PARAMETER ((char)-1) +#define PHCM_ERROR_NO_TEB ((char)-2) +#define PHCM_ERROR_NO_PEB ((char)-3) +#define PHCM_APPLICATION_DEFAULT ((char)0) +#define PHCM_DISGUISE_PLACEHOLDERS ((char)1) +#define PHCM_EXPOSE_PLACEHOLDERS ((char)2) +#define PHCM_DISGUISE_FULL_PLACEHOLDERS ((char)3) +#define PHCM_MAX ((char)3) + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; typedef enum _FS_FILTER_SECTION_SYNC_TYPE @@ -140,5 +149,6 @@ BOOLEAN WINAPI PsIsSystemThread(PETHREAD); NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*); NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void); #endif

1 0

Damjan Jovanovic : shell32: Implement some of the missing shellview IContextMenu command verbs.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 566454b9dcc89069b66b8634f685d175e528f26b URL: https://source.winehq.org/git/wine.git/?a=commit;h=566454b9dcc89069b66b8634… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 3 03:12:43 2021 +0200 shell32: Implement some of the missing shellview IContextMenu command verbs. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 83 +++++++++++++++++++++++++++++++++--------- dlls/shell32/tests/shlfolder.c | 1 - 2 files changed, 65 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index e7c1cf16e10..bd58a448d17 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -828,6 +828,10 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( TRACE("Verb is %s\n",debugstr_a(lpcmi->lpVerb)); if (strcmp(lpcmi->lpVerb,"delete")==0) DoDelete(This); + else if (strcmp(lpcmi->lpVerb,"copy")==0) + DoCopyOrCut(This, lpcmi->hwnd, FALSE); + else if (strcmp(lpcmi->lpVerb,"cut")==0) + DoCopyOrCut(This, lpcmi->hwnd, TRUE); else if (strcmp(lpcmi->lpVerb,"properties")==0) DoOpenProperties(This, lpcmi->hwnd); else { @@ -1256,6 +1260,10 @@ static HRESULT WINAPI BackgroundMenu_InvokeCommand( { if (hWnd) SendMessageA(hWnd, WM_COMMAND, MAKEWPARAM(FCIDM_SHVIEW_REPORTVIEW, 0), 0); } + else if (!strcmp(lpcmi->lpVerb, "paste")) + { + DoPaste(This); + } else { FIXME("please report: unknown verb %s\n", debugstr_a(lpcmi->lpVerb)); @@ -1306,27 +1314,66 @@ static HRESULT WINAPI BackgroundMenu_GetCommandString( LPSTR lpszName, UINT uMaxNameLen) { - ContextMenu *This = impl_from_IContextMenu3(iface); + static const WCHAR pasteW[] = {'p','a','s','t','e',0}; + static const WCHAR propertiesW[] = {'p','r','o','p','e','r','t','i','e','s',0}; + ContextMenu *This = impl_from_IContextMenu3(iface); + const WCHAR *cmdW = NULL; + HRESULT hr = E_FAIL; - TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); - /* test the existence of the menu items, the file dialog enables - the buttons according to this */ - if (uFlags == GCS_VALIDATEA) - { - if(HIWORD(idCommand)) - { - if (!strcmp((LPSTR)idCommand, CMDSTR_VIEWLISTA) || - !strcmp((LPSTR)idCommand, CMDSTR_VIEWDETAILSA) || - !strcmp((LPSTR)idCommand, CMDSTR_NEWFOLDERA)) - { - return S_OK; - } - } - } + switch (uFlags) + { + case GCS_HELPTEXTA: + case GCS_HELPTEXTW: + hr = E_NOTIMPL; + break; + + case GCS_VERBA: + case GCS_VERBW: + switch (idCommand + FCIDM_BASE) + { + case FCIDM_SHVIEW_INSERT: + cmdW = pasteW; + break; + case FCIDM_SHVIEW_PROPERTIES: + cmdW = propertiesW; + break; + } + + if (!cmdW) + { + hr = E_INVALIDARG; + break; + } - FIXME("unknown command string\n"); - return E_FAIL; + if (uFlags == GCS_VERBA) + WideCharToMultiByte(CP_ACP, 0, cmdW, -1, lpszName, uMaxNameLen, NULL, NULL); + else + lstrcpynW((WCHAR *)lpszName, cmdW, uMaxNameLen); + TRACE("name %s\n", uFlags == GCS_VERBA ? debugstr_a(lpszName) : debugstr_w((WCHAR *)lpszName)); + hr = S_OK; + break; + + case GCS_VALIDATEA: + case GCS_VALIDATEW: + /* test the existence of the menu items, the file dialog enables + the buttons according to this */ + if (HIWORD(idCommand)) + { + if (!strcmp((LPSTR)idCommand, CMDSTR_VIEWLISTA) || + !strcmp((LPSTR)idCommand, CMDSTR_VIEWDETAILSA) || + !strcmp((LPSTR)idCommand, CMDSTR_NEWFOLDERA)) + hr = S_OK; + else + { + FIXME("unknown command string %s\n", uFlags == GCS_VALIDATEA ? debugstr_a((LPSTR)idCommand) : debugstr_w((WCHAR*)idCommand)); + hr = E_FAIL; + } + } + break; + } + return hr; } static const IContextMenu3Vtbl BackgroundContextMenuVtbl = diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index cb238c959cd..51776f050ae 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4381,7 +4381,6 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) ok(mii.wID >= 64 && mii.wID <= 64 + max_id, "Expected between 64 and %d, got %d.\n", 64 + max_id, mii.wID); hr = IContextMenu_GetCommandString(menu, mii.wID - 64, GCS_VERBA, 0, buf, sizeof(buf)); - todo_wine_if(background) ok(hr == S_OK || hr == E_NOTIMPL || hr == E_INVALIDARG, "Got unexpected hr %#x for ID %d, string %s.\n", hr, mii.wID, debugstr_a(mii.dwTypeData)); if (hr == S_OK)

1 0

Damjan Jovanovic : shell32: Implement IID_IContextMenu in CreateViewObject() methods for shell folders that support it.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: ad412b11a7ea17b708994ed6609f8ed0cbfb169b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad412b11a7ea17b708994ed6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 3 03:12:07 2021 +0200 shell32: Implement IID_IContextMenu in CreateViewObject() methods for shell folders that support it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39841 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/cpanelfolder.c | 6 ++-- dlls/shell32/recyclebin.c | 2 ++ dlls/shell32/shfldr_desktop.c | 3 +- dlls/shell32/shfldr_fs.c | 3 +- dlls/shell32/shfldr_mycomp.c | 3 +- dlls/shell32/shfldr_netplaces.c | 10 +++--- dlls/shell32/shfldr_printers.c | 5 ++- dlls/shell32/shfldr_unixfs.c | 2 ++ dlls/shell32/tests/shlfolder.c | 72 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 91 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 114eb6babd3..f2e845e5dab 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -524,15 +524,15 @@ static HRESULT WINAPI ISF_ControlPanel_fnCreateViewObject(IShellFolder2 *iface, if (IsEqualIID(riid, &IID_IDropTarget)) { WARN("IDropTarget not implemented\n"); hr = E_NOTIMPL; - } else if (IsEqualIID(riid, &IID_IContextMenu)) { - WARN("IContextMenu not implemented\n"); - hr = E_NOTIMPL; } else if (IsEqualIID(riid, &IID_IShellView)) { pShellView = IShellView_Constructor((IShellFolder *) iface); if (pShellView) { hr = IShellView_QueryInterface(pShellView, riid, ppvOut); IShellView_Release(pShellView); } + } else { + FIXME("invalid/unsupported interface %s\n", shdebugstr_guid(riid)); + hr = E_NOINTERFACE; } } TRACE("--(%p)->(interface=%p)\n", This, ppvOut); diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 49e7f5da322..971239a5f20 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -490,6 +490,8 @@ static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwn *ppv = tmp; return ret; } + else + FIXME("invalid/unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 938871ee066..26f8c8cbd06 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -428,8 +428,7 @@ static HRESULT WINAPI ISF_Desktop_fnCreateViewObject (IShellFolder2 * iface, } else if (IsEqualIID (riid, &IID_IContextMenu)) { - WARN ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; + hr = BackgroundMenu_Constructor((IShellFolder*)iface, TRUE, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IShellView)) { diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 22f568a592f..5b616c5242e 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -467,8 +467,7 @@ IShellFolder_fnCreateViewObject (IShellFolder2 * iface, HWND hwndOwner, if (IsEqualIID (riid, &IID_IDropTarget)) { hr = IShellFolder2_QueryInterface (iface, &IID_IDropTarget, ppvOut); } else if (IsEqualIID (riid, &IID_IContextMenu)) { - FIXME ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; + hr = BackgroundMenu_Constructor((IShellFolder*)iface, FALSE, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IShellView)) { pShellView = IShellView_Constructor ((IShellFolder *) iface); if (pShellView) { diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 6a31e8ce1e6..7f5aaeb13fc 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -438,8 +438,7 @@ static HRESULT WINAPI ISF_MyComputer_fnCreateViewObject (IShellFolder2 *iface, } else if (IsEqualIID (riid, &IID_IContextMenu)) { - WARN ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; + hr = BackgroundMenu_Constructor((IShellFolder*)iface, FALSE, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IShellView)) { diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 71b21c5e73d..e74336544f3 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -321,11 +321,6 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnCreateViewObject (IShellFolder2 * ifac WARN ("IDropTarget not implemented\n"); hr = E_NOTIMPL; } - else if (IsEqualIID (riid, &IID_IContextMenu)) - { - WARN ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; - } else if (IsEqualIID (riid, &IID_IShellView)) { pShellView = IShellView_Constructor ((IShellFolder *) iface); @@ -335,6 +330,11 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnCreateViewObject (IShellFolder2 * ifac IShellView_Release (pShellView); } } + else + { + FIXME ("invalid/unsupported interface %s\n", shdebugstr_guid (riid)); + hr = E_NOINTERFACE; + } TRACE ("-- (%p)->(interface=%p)\n", This, ppvOut); return hr; } diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 8e25e58857b..76375525c52 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -195,7 +195,10 @@ static HRESULT WINAPI IShellFolder_Printers_fnCreateViewObject(IShellFolder2 *if } } else - WARN("unsupported interface %s\n", shdebugstr_guid (riid)); + { + FIXME("unsupported interface %s\n", shdebugstr_guid (riid)); + hr = E_NOINTERFACE; + } return hr; } diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 48d5fe4ecb6..cdd3951efb0 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1117,6 +1117,8 @@ static HRESULT WINAPI ShellFolder2_CreateViewObject(IShellFolder2* iface, HWND h } } else if (IsEqualIID(&IID_IDropTarget, riid)) { hr = IShellFolder2_QueryInterface(iface, &IID_IDropTarget, ppv); + } else if (IsEqualIID(&IID_IContextMenu, riid)) { + hr = BackgroundMenu_Constructor((IShellFolder*)iface, FALSE, riid, ppv); } return hr; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index a2c15d9f40e..cb238c959cd 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4471,6 +4471,77 @@ static void test_GetUIObject(void) Cleanup(); } +static void test_CreateViewObject_contextmenu(void) +{ + IShellFolder *desktop; + IShellFolder *folder; + IContextMenu *cmenu; + WCHAR path[MAX_PATH]; + LPITEMIDLIST pidl; + HRESULT hr; + DWORD ret; + + hr = CoCreateInstance(&CLSID_ControlPanel, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = CoCreateInstance(&CLSID_MyComputer, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = CoCreateInstance(&CLSID_NetworkPlaces, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = CoCreateInstance(&CLSID_Printers, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = CoCreateInstance(&CLSID_RecycleBin, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + ret = GetCurrentDirectoryW(MAX_PATH, path); + ok(ret, "got %d\n", GetLastError()); + hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, path, NULL, &pidl, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder, (void**)&folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + ILFree(pidl); + IShellFolder_Release(desktop); +} + #define verify_pidl(i,p) r_verify_pidl(__LINE__, i, p) static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) { @@ -5313,6 +5384,7 @@ START_TEST(shlfolder) test_ShellItemArrayEnumItems(); test_desktop_IPersist(); test_GetUIObject(); + test_CreateViewObject_contextmenu(); test_SHSimpleIDListFromPath(); test_ParseDisplayNamePBC(); test_SHGetNameFromIDList();

1 0

Sven Baars : ntdll/tests: Use FindClose() to close handles returned by FindFirstFileW() (Valgrind).
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: fc8bf8d33d24ccb1f7c266f01a0798509d49d0ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc8bf8d33d24ccb1f7c266f0… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun May 2 16:36:20 2021 +0200 ntdll/tests: Use FindClose() to close handles returned by FindFirstFileW() (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d469b449a74..b7b46365911 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2319,7 +2319,7 @@ static void test_file_link_information(void) "Link did not change casing on existing target file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } - CloseHandle( handle ); + FindClose( handle ); HeapFree( GetProcessHeap(), 0, fli ); delete_object( oldpath ); delete_object( newpath ); @@ -2904,7 +2904,7 @@ static void test_file_link_information(void) "Link did not change casing on same file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } - CloseHandle( handle ); + FindClose( handle ); HeapFree( GetProcessHeap(), 0, fli ); delete_object( oldpath ); }

1 0

Ziqing Hui : windowscodecs: Add test data index to win_skip messages for DDS tests.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: b719f00a3d8b4face49abf381bda672421baa5ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=b719f00a3d8b4face49abf38… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat May 1 11:14:44 2021 +0800 windowscodecs: Add test data index to win_skip messages for DDS tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 492416c0ce4..a5f1d6754a9 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -827,9 +827,9 @@ static void test_dds_decoder_image_parameters(void) hr = init_decoder(decoder, stream, test_data[i].init_hr, i, test_data[i].wine_init); if (hr != S_OK) { if (test_data[i].expected_parameters.Dimension == WICDdsTextureCube) { - win_skip("Cube map is not supported\n"); + win_skip("Test %u: Cube map is not supported\n", i); } else { - win_skip("Uncompressed DDS image is not supported\n"); + win_skip("Test %u: Uncompressed DDS image is not supported\n", i); } goto next; } @@ -1240,9 +1240,9 @@ static void test_dds_decoder(void) hr = init_decoder(decoder, stream, test_data[i].init_hr, i, test_data[i].wine_init); if (hr != S_OK) { if (test_data[i].expected_parameters.Dimension == WICDdsTextureCube) { - win_skip("Cube map is not supported\n"); + win_skip("Test %u: Cube map is not supported\n", i); } else { - win_skip("Uncompressed DDS image is not supported\n"); + win_skip("Test %u: Uncompressed DDS image is not supported\n", i); } goto next; }

1 0

Hugh McMaster : reg: Fail if access is denied when adding registry data.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: d433d1f122a85b7902b48bae1930eef503a239a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d433d1f122a85b7902b48bae… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 3 23:20:36 2021 +1000 reg: Fail if access is denied when adding registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 897c6f60621..258e3e8cb25 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -156,6 +156,7 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, HKEY hkey; DWORD data_type, data_size; BYTE *reg_data = NULL; + LONG rc; if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &hkey, NULL)) @@ -199,10 +200,17 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, return 1; } - RegSetValueExW(hkey, value_name, 0, data_type, reg_data, data_size); - free(reg_data); + rc = RegSetValueExW(hkey, value_name, 0, data_type, reg_data, data_size); + free(reg_data); RegCloseKey(hkey); + + if (rc) + { + output_message(STRING_ACCESS_DENIED); + return 1; + } + output_message(STRING_SUCCESS); return 0;

1 0