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

Hans Leidekker : secur32: Load the MSV1_0 provider instead of using builtin support for NTLM.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 8a9c3b1e54513dd16791e853b149b2caa459ba11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a9c3b1e54513dd16791e853… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 30 16:42:20 2021 +0200 secur32: Load the MSV1_0 provider instead of using builtin support for NTLM. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 1 - loader/wine.inf.in | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 8288286c615..4382ec55174 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -563,7 +563,6 @@ static void SECUR32_initializeProviders(void) TRACE("\n"); /* First load built-in providers */ SECUR32_initSchannelSP(); - SECUR32_initNTLMSP(); /* Load SSP/AP packages (Kerberos and others) */ load_auth_packages(); /* Load the Negotiate provider last so apps stumble over the working NTLM diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 6ae4e96e37f..a20efbcce3e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -750,6 +750,7 @@ HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\hivelist,,16 HKLM,System\CurrentControlSet\Control\Lsa,"Security Packages",0x10002,kerberos,schannel HKLM,System\CurrentControlSet\Control\Lsa\Kerberos,,16 +HKLM,System\CurrentControlSet\Control\Lsa\MSV1_0,,16 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"StandardName",2,""

1 0

Alexandre Julliard : winecrt0: Determine the registration module handle directly in __wine_register_resources().
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 1331a8ea0fd4f19b80b3fd434c5e8b2a3b6e0fd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1331a8ea0fd4f19b80b3fd43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 30 13:40:11 2021 +0200 winecrt0: Determine the registration module handle directly in __wine_register_resources(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_main.c | 21 ++------------------- dlls/mlang/mlang.c | 6 ++---- dlls/mp3dmod/mp3dmod.c | 19 ++----------------- dlls/mscoree/mscoree_main.c | 8 ++------ dlls/mshtml/main.c | 4 ++-- dlls/qcap/qcap_main.c | 4 ++-- dlls/qedit/main.c | 7 ++----- dlls/shell32/shell32_main.c | 4 ++-- dlls/winecrt0/dll_register.c | 15 ++------------- dlls/winecrt0/register.c | 19 +++++++++++++++---- dlls/winegstreamer/main.c | 10 ++++------ dlls/wineqtdecoder/main.c | 16 ++-------------- include/rpcproxy.h | 8 ++++---- 13 files changed, 43 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1331a8ea0fd4f19b80b3…

1 0

Alexandre Julliard : kernelbase: Compare against the correct constants in GetNativeSystemInfo().
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 1b7c292d625cc3675d187adddd6fef577644e1f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b7c292d625cc3675d187add… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 30 20:49:47 2021 +0200 kernelbase: Compare against the correct constants in GetNativeSystemInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51082 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 1969fd732b1..0cfce90a979 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -81,16 +81,16 @@ void WINAPI DECLSPEC_HOTPATCH GetNativeSystemInfo( SYSTEM_INFO *si ) if (!current_machine) return; switch (native_machine) { - case PROCESSOR_ARCHITECTURE_AMD64: + case IMAGE_FILE_MACHINE_AMD64: si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; si->dwProcessorType = PROCESSOR_AMD_X8664; break; - case PROCESSOR_ARCHITECTURE_ARM64: + case IMAGE_FILE_MACHINE_ARM64: si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM64; si->dwProcessorType = 0; break; default: - FIXME( "Add the proper information for %d in wow64 mode\n", si->u.s.wProcessorArchitecture ); + FIXME( "Add the proper information for %x in wow64 mode\n", native_machine ); } }

1 0

Alexandre Julliard : winecrt0: Add a default implementation DllRegisterServer()/DllUnregisterServer().
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 5d82baf9747b7b133cad3be77c0cc9e24cc09582 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d82baf9747b7b133cad3be7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 30 13:19:22 2021 +0200 winecrt0: Add a default implementation DllRegisterServer()/DllUnregisterServer(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/activeds.spec | 4 +- dlls/adsldp/adsldp.c | 27 --------- dlls/amsi/amsi.spec | 4 +- dlls/amstream/main.c | 30 ---------- dlls/atl/atl.c | 3 - dlls/atl/atl30.c | 18 ------ dlls/avifil32/factory.c | 16 ----- dlls/browseui/browseui_main.c | 16 ----- dlls/cdosys/main.c | 26 --------- dlls/comcat/Makefile.in | 5 -- dlls/comdlg32/cdlg32.c | 16 ----- dlls/comsvcs/main.c | 30 ---------- dlls/credui/credui.spec | 4 +- dlls/cryptext/cryptext.spec | 4 +- dlls/cryptui/cryptui.spec | 4 +- dlls/d3dxof/main.c | 30 ---------- dlls/ddraw/main.c | 10 ---- dlls/ddrawex/main.c | 34 ----------- dlls/dhtmled.ocx/main.c | 21 ------- dlls/dinput/dinput_main.c | 16 ----- dlls/directmanipulation/directmanipulation.c | 28 --------- dlls/dmband/dmband_main.c | 32 ---------- dlls/dmcompos/dmcompos_main.c | 37 ------------ dlls/dmime/dmime_main.c | 32 ---------- dlls/dmloader/dmloader_main.c | 29 --------- dlls/dmscript/dmscript_main.c | 33 ----------- dlls/dmstyle/dmstyle_main.c | 32 ---------- dlls/dmsynth/dmsynth_main.c | 32 ---------- dlls/dmusic/dmusic_main.c | 32 ---------- dlls/dplayx/dplayx_main.c | 21 +------ dlls/dpnet/dpnet_main.c | 19 ------ dlls/dpnhpast/main.c | 24 -------- dlls/dpvoice/main.c | 29 --------- dlls/drmclien/Makefile.in | 5 +- dlls/drmclien/drmclien.spec | 6 +- dlls/drmclien/main.c | 37 ------------ dlls/dsdmo/main.c | 27 --------- dlls/dsound/dsound_main.c | 18 ------ dlls/dsquery/main.c | 36 ------------ dlls/dssenh/main.c | 32 ---------- dlls/dsuiext/dsuiext.spec | 4 +- dlls/dswave/dswave_main.c | 32 ---------- dlls/dx8vb/main.c | 27 --------- dlls/dxdiagn/dxdiag_main.c | 16 ----- dlls/evr/main.c | 12 ---- dlls/explorerframe/explorerframe_main.c | 16 ----- dlls/fntcache/fntcache.spec | 4 +- dlls/gameux/Makefile.in | 3 +- dlls/gameux/factory.c | 3 +- dlls/gameux/main.c | 68 ---------------------- dlls/gpkcsp/Makefile.in | 5 +- dlls/gpkcsp/main.c | 44 -------------- dlls/hhctrl.ocx/hhctrl.c | 16 ----- dlls/hlink/hlink_main.c | 32 ---------- dlls/hnetcfg/hnetcfg.c | 19 ------ dlls/ieframe/ieframe_main.c | 18 ------ dlls/inetcomm/inetcomm_main.c | 19 ------ dlls/infosoft/infosoft_main.c | 31 ---------- dlls/initpki/Makefile.in | 5 +- dlls/initpki/main.c | 44 -------------- dlls/inkobj/inkobj.c | 18 ------ dlls/inseng/inseng_main.c | 30 ---------- dlls/itircl/Makefile.in | 5 +- dlls/itircl/itircl_main.c | 46 --------------- dlls/itss/itss.c | 28 --------- dlls/jscript/jscript_main.c | 18 ------ dlls/jsproxy/main.c | 20 ------- dlls/ksproxy.ax/ksproxy.ax.spec | 4 +- dlls/mf/main.c | 30 ---------- dlls/mfplay/mfplay.spec | 4 +- dlls/mfreadwrite/reader.c | 25 -------- dlls/mmcndmgr/mmcndmgr.c | 25 -------- dlls/mmdevapi/main.c | 19 ------ dlls/msado15/main.c | 30 ---------- dlls/msctf/msctf.c | 19 ------ dlls/msdrm/msdrm.spec | 4 +- dlls/msi/msi_main.c | 16 ----- dlls/msident/msident.c | 38 ------------ dlls/msimtf/main.c | 33 ----------- dlls/msisip/msisip.spec | 4 +- dlls/msisys.ocx/msisys.c | 20 ------- dlls/msscript.ocx/msscript.c | 21 ------- dlls/mssign32/mssign32.spec | 4 +- dlls/mssip32/Makefile.in | 5 +- dlls/mssip32/main.c | 43 -------------- dlls/mstask/mstask_main.c | 26 --------- dlls/msxml/Makefile.in | 4 -- dlls/msxml/main.c | 55 ----------------- dlls/msxml2/Makefile.in | 4 -- dlls/msxml2/main.c | 55 ----------------- dlls/msxml3/main.c | 16 ----- dlls/msxml4/Makefile.in | 6 -- dlls/msxml4/main.c | 55 ----------------- dlls/msxml6/Makefile.in | 6 -- dlls/msxml6/main.c | 55 ----------------- dlls/netcfgx/main.c | 30 ---------- dlls/netprofm/main.c | 30 ---------- dlls/objsel/objsel.c | 35 ----------- dlls/oledb32/main.c | 16 ----- dlls/olepro32/olepro32stubs.c | 18 ------ dlls/opcservices/factory.c | 25 -------- dlls/packager/packager_main.c | 26 --------- .../photometadatahandler/photometadatahandler.spec | 4 +- dlls/prntvpt/prntvpt.spec | 4 +- dlls/propsys/propsys_main.c | 27 --------- dlls/pstorec/pstorec.c | 12 ---- dlls/qasf/qasf_main.c | 13 ----- dlls/qdvd/qdvd_main.c | 22 ------- dlls/qmgr/Makefile.in | 1 - dlls/qmgr/qmgr_main.c | 67 --------------------- dlls/query/query.spec | 2 +- dlls/query/query_main.c | 6 -- dlls/rpcrt4/rpcrt4_main.c | 10 ---- dlls/rsaenh/rsaenh.c | 19 ------ dlls/sapi/main.c | 30 ---------- dlls/sccbase/Makefile.in | 5 +- dlls/sccbase/main.c | 43 -------------- dlls/scrobj/scrobj.c | 18 ------ dlls/scrrun/scrrun.c | 21 ------- dlls/shdocvw/shdocvw_main.c | 18 ------ dlls/slbcsp/Makefile.in | 5 +- dlls/slbcsp/main.c | 43 -------------- dlls/taskschd/taskschd.c | 33 ----------- dlls/uianimation/main.c | 32 ---------- dlls/uiautomationcore/uiautomationcore.spec | 4 +- dlls/uiribbon/main.c | 27 --------- dlls/vbscript/vbscript_main.c | 18 ------ dlls/wbemdisp/main.c | 31 ---------- dlls/wbemprox/main.c | 16 ----- dlls/wiaservc/Makefile.in | 3 +- dlls/wiaservc/wiaservc_main.c | 67 --------------------- dlls/winecrt0/Makefile.in | 1 + .../comcat_main.c => winecrt0/dll_register.c} | 29 +++++---- dlls/winhttp/main.c | 16 ----- dlls/wmiutils/main.c | 30 ---------- dlls/wmp/wmp_main.c | 18 ------ dlls/wmphoto/main.c | 10 ---- dlls/wmvcore/wmvcore_main.c | 7 --- dlls/wpc/wpc.c | 37 ------------ dlls/wshom.ocx/wshom_main.c | 23 +------- dlls/wuapi/main.c | 30 ---------- dlls/wuaueng/wuaueng.spec | 6 +- dlls/xactengine3_7/xact_dll.c | 13 ----- dlls/xaudio2_7/x3daudio.c | 15 ----- dlls/xaudio2_7/xapofx.c | 15 ----- dlls/xaudio2_7/xaudio_dll.c | 15 ----- include/objbase.h | 7 --- include/olectl.h | 5 +- 148 files changed, 71 insertions(+), 3055 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d82baf9747b7b133cad…

1 0

Damjan Jovanovic : shell32: The menu wIDs in hmenu were rebased by idCmdFirst.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 91a8b4819ead8609f0e1828de527d61da18f1508 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91a8b4819ead8609f0e1828d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 30 07:39:10 2021 +0200 shell32: The menu wIDs in hmenu were rebased by idCmdFirst. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 04ac0b6fd3c..351d1e5d141 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -174,14 +174,14 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( mi.fMask = MIIM_ID | MIIM_STRING | MIIM_FTYPE; mi.dwTypeData = str; mi.cch = 255; - GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND, &mi); + GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND, &mi); RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND); mi.cbSize = sizeof(mi); mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_STRING; mi.dwTypeData = str; mi.fState = MFS_ENABLED; - mi.wID = FCIDM_SHVIEW_EXPLORE; + mi.wID = FCIDM_SHVIEW_EXPLORE + idCmdFirst; mi.fType = MFT_STRING; InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, &mi); } @@ -189,7 +189,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); if(uFlags & ~CMF_CANRENAME) - RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME, MF_BYCOMMAND); + RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME + idCmdFirst, MF_BYCOMMAND); else { UINT enable = MF_BYCOMMAND; @@ -205,7 +205,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( enable |= (attr & SFGAO_CANRENAME) ? MFS_ENABLED : MFS_DISABLED; } - EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME, enable); + EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME + idCmdFirst, enable); } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, uIDMax-idCmdFirst);

1 0

Alexandre Julliard : winecrt0: Add a default implementation for DllCanUnloadNow().
by Alexandre Julliard April 30, 2021

April 30, 2021

1 0

Damjan Jovanovic : shell32: Use a smaller range of shellview menu IDs in our IContextMenu functions.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 2b6458b75713cedc6cd28d2980298d6ac844757e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b6458b75713cedc6cd28d29… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 30 07:39:24 2021 +0200 shell32: Use a smaller range of shellview menu IDs in our IContextMenu functions. The shellview menu IDs are very large, eg. FCIDM_SHVIEW_OPEN is 0x7102, while applications want menu IDs to fit into a small range, eg. 1-1000 for Explorer++. This causes our IContextMenu_QueryContextMenu() functions to leave out most menu options. We should rebase our shellview menu ids by -0x7000 so they occupy a smaller range. This gets both Explorer++ and Double Commander to show the correct right-click menus. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24893 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 57 ++++++++++++++++++++++++++++++++++-------- dlls/shell32/tests/shlfolder.c | 8 ++++++ 2 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 351d1e5d141..e7c1cf16e10 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +#define FCIDM_BASE 0x7000 + typedef struct { IContextMenu3 IContextMenu3_iface; @@ -142,6 +144,37 @@ static ULONG WINAPI ContextMenu_Release(IContextMenu3 *iface) return ref; } +static UINT max_menu_id(HMENU hmenu, UINT offset, UINT last) +{ + int i; + UINT max_id = 0; + + for (i = GetMenuItemCount(hmenu) - 1; i >= 0; i--) + { + MENUITEMINFOW item; + memset(&item, 0, sizeof(MENUITEMINFOW)); + item.cbSize = sizeof(MENUITEMINFOW); + item.fMask = MIIM_ID | MIIM_SUBMENU | MIIM_TYPE; + if (!GetMenuItemInfoW(hmenu, i, TRUE, &item)) + continue; + if (!(item.fType & MFT_SEPARATOR)) + { + if (item.hSubMenu) + { + UINT submenu_max_id = max_menu_id(item.hSubMenu, offset, last); + if (max_id < submenu_max_id) + max_id = submenu_max_id; + } + if (item.wID + offset <= last) + { + if (max_id <= item.wID + offset) + max_id = item.wID + offset + 1; + } + } + } + return max_id; +} + static HRESULT WINAPI ItemMenu_QueryContextMenu( IContextMenu3 *iface, HMENU hmenu, @@ -162,7 +195,8 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( if(uFlags & CMF_EXPLORE) RemoveMenu(hmenures, FCIDM_SHVIEW_OPEN, MF_BYCOMMAND); - uIDMax = Shell_MergeMenus(hmenu, GetSubMenu(hmenures, 0), indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS); + Shell_MergeMenus(hmenu, GetSubMenu(hmenures, 0), indexMenu, idCmdFirst - FCIDM_BASE, idCmdLast, MM_SUBMENUSHAVEIDS); + uIDMax = max_menu_id(GetSubMenu(hmenures, 0), idCmdFirst - FCIDM_BASE, idCmdLast); DestroyMenu(hmenures); @@ -174,14 +208,14 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( mi.fMask = MIIM_ID | MIIM_STRING | MIIM_FTYPE; mi.dwTypeData = str; mi.cch = 255; - GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND, &mi); - RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND); + GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE - FCIDM_BASE + idCmdFirst, MF_BYCOMMAND, &mi); + RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE - FCIDM_BASE + idCmdFirst, MF_BYCOMMAND); mi.cbSize = sizeof(mi); mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_STRING; mi.dwTypeData = str; mi.fState = MFS_ENABLED; - mi.wID = FCIDM_SHVIEW_EXPLORE + idCmdFirst; + mi.wID = FCIDM_SHVIEW_EXPLORE - FCIDM_BASE + idCmdFirst; mi.fType = MFT_STRING; InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, &mi); } @@ -189,7 +223,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); if(uFlags & ~CMF_CANRENAME) - RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME + idCmdFirst, MF_BYCOMMAND); + RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME - FCIDM_BASE + idCmdFirst, MF_BYCOMMAND); else { UINT enable = MF_BYCOMMAND; @@ -205,7 +239,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( enable |= (attr & SFGAO_CANRENAME) ? MFS_ENABLED : MFS_DISABLED; } - EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME + idCmdFirst, enable); + EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME - FCIDM_BASE + idCmdFirst, enable); } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, uIDMax-idCmdFirst); @@ -738,7 +772,7 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( if (IS_INTRESOURCE(lpcmi->lpVerb)) { - switch(LOWORD(lpcmi->lpVerb)) + switch(LOWORD(lpcmi->lpVerb) + FCIDM_BASE) { case FCIDM_SHVIEW_EXPLORE: TRACE("Verb FCIDM_SHVIEW_EXPLORE\n"); @@ -830,7 +864,7 @@ static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR c case GCS_VERBA: case GCS_VERBW: - switch (cmdid) + switch (cmdid + FCIDM_BASE) { case FCIDM_SHVIEW_OPEN: cmdW = openW; @@ -1059,8 +1093,9 @@ static HRESULT WINAPI BackgroundMenu_QueryContextMenu( } else { - idMax = Shell_MergeMenus (hMenu, GetSubMenu(hMyMenu,0), indexMenu, - idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS); + Shell_MergeMenus (hMenu, GetSubMenu(hMyMenu,0), indexMenu, + idCmdFirst - FCIDM_BASE, idCmdLast, MM_SUBMENUSHAVEIDS); + idMax = max_menu_id(GetSubMenu(hMyMenu, 0), idCmdFirst - FCIDM_BASE, idCmdLast); hr = MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, idMax-idCmdFirst); } DestroyMenu(hMyMenu); @@ -1228,7 +1263,7 @@ static HRESULT WINAPI BackgroundMenu_InvokeCommand( } else { - switch (LOWORD(lpcmi->lpVerb)) + switch (LOWORD(lpcmi->lpVerb) + FCIDM_BASE) { case FCIDM_SHVIEW_REFRESH: if (view) IShellView_Refresh(view); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index e724448c7a0..a2c15d9f40e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4385,7 +4385,15 @@ static void test_contextmenu(IContextMenu *menu, BOOL 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) + { trace("Got ID %d, verb %s, string %s.\n", mii.wID, debugstr_a(buf), debugstr_a(mii.dwTypeData)); + if (!strcmp(buf, "copy")) + ok(mii.wID == 64 - 0x7000 + FCIDM_SHVIEW_COPY, "wrong menu wID %d\n", mii.wID); + else if (!strcmp(buf, "paste")) + ok(mii.wID == 64 - 0x7000 + FCIDM_SHVIEW_INSERT, "wrong menu wID %d\n", mii.wID); + else if (!strcmp(buf, "properties")) + ok(mii.wID == 64 - 0x7000 + FCIDM_SHVIEW_PROPERTIES, "wrong menu wID %d\n", mii.wID); + } else trace("Got ID %d, hr %#x, string %s.\n", mii.wID, hr, debugstr_a(mii.dwTypeData)); }

1 0

Damjan Jovanovic : shell32/tests: Test what Shell_MergeMenus() does with a negative adjustment.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 42ecb0ec15f28ee0a5acc24d60c3bdb5416d71d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42ecb0ec15f28ee0a5acc24d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 30 07:39:13 2021 +0200 shell32/tests: Test what Shell_MergeMenus() does with a negative adjustment. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index dc3572abf3d..9eab928c12f 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2673,6 +2673,7 @@ test_shlmenu(void) { src_menu = CreatePopupMenu (); ok (src_menu != NULL, "CreatePopupMenu() failed, error %d\n", GetLastError ()); + dst_menu = CreatePopupMenu (); ok (dst_menu != NULL, "CreatePopupMenu() failed, error %d\n", GetLastError ()); bres = InsertMenuA (src_menu, -1, MF_BYPOSITION | MF_STRING, 10, "item1"); @@ -2690,6 +2691,16 @@ test_shlmenu(void) { ok (bres, "GetMenuItemInfoA failed, error %d\n", GetLastError ()); ok (item_info.wID == 133, "got %d\n", item_info.wID); DestroyMenu (dst_menu); + + /* integer overflow: Shell_MergeMenus() return value is wrong, but items are still added */ + dst_menu = CreatePopupMenu (); + ok (dst_menu != NULL, "CreatePopupMenu() failed, error %d\n", GetLastError ()); + hres = Shell_MergeMenus (dst_menu, src_menu, 0, -1, 133, MM_SUBMENUSHAVEIDS); + ok (hres == -1, "got %d\n", hres); + count = GetMenuItemCount (dst_menu); + ok (count == 2, "got %d\n", count); + DestroyMenu (dst_menu); + DestroyMenu (src_menu); }

1 0

Hugh McMaster : reg/tests: Fix a typo in a REG_DWORD test.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: a8e961ecacb845b3fc613401431ae9ca37bf9d4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e961ecacb845b3fc613401… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:46 2021 +1000 reg/tests: Fix a typo in a REG_DWORD test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index f6a4a7fe576..6090b587f92 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -673,7 +673,7 @@ static void test_reg_dword(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); - run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0x01ffffffff /f", &r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword11 /t REG_dword /d 0x01ffffffff /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword12 /t REG_DWORD /d 0xffffffff /f", &r);

1 0

Hugh McMaster : reg/tests: Add two REG_DWORD tests.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 357601a01b894ecdd0e26f5493914192d7ccae6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=357601a01b894ecdd0e26f54… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:47 2021 +1000 reg/tests: Add two REG_DWORD tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 6090b587f92..78519565b22 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -692,6 +692,16 @@ static void test_reg_dword(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword15 /t REG_DWORD /d 4294967296 /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword16 /t REG_DWORD /d 456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 456; + verify_reg(hkey, "dword16", REG_DWORD, &dword, sizeof(dword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword17 /t REG_DWORD /d 0x456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x456; + verify_reg(hkey, "dword17", REG_DWORD, &dword, sizeof(dword), 0); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0