wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Piotr Caban : msvcrt: Fix round implementation when 24-bit precision is used.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: df9c11ffa8ddc3b4dbb22f6e304cba8cfcda8ada URL: https://source.winehq.org/git/wine.git/?a=commit;h=df9c11ffa8ddc3b4dbb22f6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 3 14:01:57 2021 +0200 msvcrt: Fix round implementation when 24-bit precision is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a29ed5786e2..1da6a0162da 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -87,14 +87,6 @@ static inline float fp_barrierf(float x) return y; } -#if _MSVCR_VER>=120 -static inline double fp_barrier(double x) -{ - volatile double y = x; - return y; -} -#endif - static inline double CDECL ret_nan( BOOL update_sw ) { double x = 1.0; @@ -4330,32 +4322,26 @@ short CDECL _dclass(double x) /********************************************************************* * round (MSVCR120.@) * - * Copied from musl: src/math/round.c + * Based on musl implementation: src/math/round.c */ double CDECL round(double x) { - static const double toint = 1 / DBL_EPSILON; + ULONGLONG llx = *(ULONGLONG*)&x, tmp; + int e = (llx >> 52 & 0x7ff) - 0x3ff; - ULONGLONG llx = *(ULONGLONG*)&x; - int e = llx >> 52 & 0x7ff; - double y; + if (e >= 52) + return x; + if (e < -1) + return 0 * x; + else if (e == -1) + return signbit(x) ? -1 : 1; - if (e >= 0x3ff + 52) + tmp = 0x000fffffffffffffULL >> e; + if (!(llx & tmp)) return x; - if (llx >> 63) - x = -x; - if (e < 0x3ff - 1) - return 0 * *(double*)&llx; - y = fp_barrier(x + toint) - toint - x; - if (y > 0.5) - y = y + x - 1; - else if (y <= -0.5) - y = y + x + 1; - else - y = y + x; - if (llx >> 63) - y = -y; - return y; + llx += 0x0008000000000000ULL >> e; + llx &= ~tmp; + return *(double*)&llx; } /*********************************************************************

1 0

Serge Gautherie : winbase.h: Add CREATE_IGNORE_SYSTEM_DEFAULT.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: e19ad98564295354e36df473c278167b4ef72d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e19ad98564295354e36df473… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon May 3 13:29:39 2021 +0200 winbase.h: Add CREATE_IGNORE_SYSTEM_DEFAULT. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 11a92fa84d9..5e35c31a3b7 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -679,6 +679,7 @@ typedef struct _PROCESS_INFORMATION{ #define PROFILE_USER 0x10000000 #define PROFILE_KERNEL 0x20000000 #define PROFILE_SERVER 0x40000000 +#define CREATE_IGNORE_SYSTEM_DEFAULT 0x80000000 #define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000

1 0

Paul Gofman : winex11.drv: Handle Vulkan surface creation with NULL hwnd.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 011fabb2c43d13402ea18b6ea7be3669b5e6c7a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=011fabb2c43d13402ea18b6e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 3 13:26:27 2021 +0300 winex11.drv: Handle Vulkan surface creation with NULL hwnd. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 112 +++++++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/vulkan.c | 38 +++++++++++---- dlls/winex11.drv/window.c | 18 +++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 158 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=011fabb2c43d13402ea1…

1 0

Louis Lenders : ntdll: Stub RtlQueryProcessPlaceholderCompatibilityMode().
by Alexandre Julliard 03 May '21

03 May '21

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: Fix pasting from the shellview context menu.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 19379007e517a7e55857e1841cca0bea505d19d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19379007e517a7e55857e184… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 3 03:13:28 2021 +0200 shell32: Fix pasting from the shellview context menu. Pasting from the shellview context menu is completely broken, as the desktop folder's BindToObject() always fails since the CIDA parent folder PIDL is an empty PIDL. The desktop shell folder doesn't support the ISFHelper interface either. Rather bind to each item's immediate parent, and copy each item individually. Also try get error handling to work a little better. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 65 ++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index bd58a448d17..67f5ac80d84 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1136,7 +1136,7 @@ static void DoNewFolder(ContextMenu *This, IShellView *view) static BOOL DoPaste(ContextMenu *This) { - BOOL bSuccess = FALSE; + BOOL bSuccess = TRUE; IDataObject * pda; TRACE("\n"); @@ -1157,38 +1157,53 @@ static BOOL DoPaste(ContextMenu *This) LPITEMIDLIST * apidl; LPITEMIDLIST pidl; IShellFolder *psfFrom = NULL, *psfDesktop; + int i; LPIDA lpcida = GlobalLock(medium.u.hGlobal); TRACE("cida=%p\n", lpcida); apidl = _ILCopyCidaToaPidl(&pidl, lpcida); - /* bind to the source shellfolder */ - SHGetDesktopFolder(&psfDesktop); - if(psfDesktop) - { - IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (LPVOID*)&psfFrom); - IShellFolder_Release(psfDesktop); - } + for (i = 0; bSuccess && i < lpcida->cidl; i++) { + ITEMIDLIST *apidl_dir = NULL; + ITEMIDLIST *apidl_item; - if (psfFrom) - { - /* get source and destination shellfolder */ - ISFHelper *psfhlpdst, *psfhlpsrc; - IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); - IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (void**)&psfhlpsrc); + psfFrom = NULL; + /* bind to the source shellfolder */ + SHGetDesktopFolder(&psfDesktop); + if(psfDesktop) + { + apidl_dir = ILClone(apidl[i]); + ILRemoveLastID(apidl_dir); + apidl_item = ILFindLastID(apidl[i]); + IShellFolder_BindToObject(psfDesktop, apidl_dir, NULL, &IID_IShellFolder, (LPVOID*)&psfFrom); + IShellFolder_Release(psfDesktop); + } - /* do the copy/move */ - if (psfhlpdst && psfhlpsrc) + if (psfFrom) { - ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl); - /* FIXME handle move - ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, apidl); - */ + /* get source and destination shellfolder */ + ISFHelper *psfhlpdst, *psfhlpsrc; + IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); + IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (void**)&psfhlpsrc); + + /* do the copy/move */ + if (psfhlpdst && psfhlpsrc) + { + HRESULT hr = ISFHelper_CopyItems(psfhlpdst, psfFrom, 1, (LPCITEMIDLIST*)&apidl_item); + if (FAILED(hr)) + bSuccess = FALSE; + /* FIXME handle move + ISFHelper_DeleteItems(psfhlpsrc, 1, &apidl_item); + */ + } + if(psfhlpdst) ISFHelper_Release(psfhlpdst); + if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); + IShellFolder_Release(psfFrom); } - if(psfhlpdst) ISFHelper_Release(psfhlpdst); - if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); - IShellFolder_Release(psfFrom); + else + bSuccess = FALSE; + SHFree(apidl_dir); } _ILFreeaPidl(apidl, lpcida->cidl); @@ -1197,8 +1212,12 @@ static BOOL DoPaste(ContextMenu *This) /* release the medium*/ ReleaseStgMedium(&medium); } + else + bSuccess = FALSE; IDataObject_Release(pda); } + else + bSuccess = FALSE; #if 0 HGLOBAL hMem;

1 0

Damjan Jovanovic : shell32: Implement some of the missing shellview IContextMenu command verbs.
by Alexandre Julliard 03 May '21

03 May '21

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 03 May '21

03 May '21

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 03 May '21

03 May '21

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

Sven Baars : ntdll: Fix some memory leaks (Valgrind).
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 2d218c924dec978f3ac41e5ab771d944f3c63491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d218c924dec978f3ac41e5a… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun May 2 16:36:19 2021 +0200 ntdll: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/unix/file.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index fc5c462e04f..3ac1ed9ab63 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -912,7 +912,7 @@ static void rebuild_argv(void) */ static void prepend_argv( const char **args, int count ) { - char **new_argv = malloc( (main_argc + count) * sizeof(*new_argv) ); + char **new_argv; char *p, *end; BOOL write_strings = FALSE; int i, total = 0, new_argc = main_argc + count - 1; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 2f18325fb90..c033bb06fa3 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3298,7 +3298,12 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char /* check if prefix exists (except for DOS drives to avoid extra stat calls) */ - if (wcschr( prefix, '/' )) return STATUS_OBJECT_PATH_NOT_FOUND; + if (wcschr( prefix, '/' )) + { + free( unix_name ); + return STATUS_OBJECT_PATH_NOT_FOUND; + } + if (prefix_len != 2 || prefix[1] != ':') { unix_name[pos] = 0;

1 0

Zebediah Figura : ntoskrnl/tests: Open the HID device with FILE_SHARE_READ | FILE_SHARE_WRITE.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 4084200765d4dd085d73910ee035d009ad81a554 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4084200765d4dd085d73910e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 1 17:23:16 2021 -0500 ntoskrnl/tests: Open the HID device with FILE_SHARE_READ | FILE_SHARE_WRITE. Fixes a test failure on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 9fe4cd03175..5e2520a3e12 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1537,7 +1537,8 @@ static void test_hid_device(void) todo_wine ok(found, "didn't find device\n"); - file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS, 0, NULL, OPEN_EXISTING, 0, NULL); + file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); CloseHandle(file);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021