September 2021 - Wine-Commits

Nikolay Sivov : oleaut32: Remove unnecessary initialization of retval arg slot in Invoke().
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: 93a4fd5887a348ee9d6a887bad6247a27ddadfd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a4fd5887a348ee9d6a887b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 17 14:12:52 2021 +0300 oleaut32: Remove unnecessary initialization of retval arg slot in Invoke(). Whole argument buffer is already zero-initialized. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index fb49cd303fe..5c5aca63538 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7361,7 +7361,6 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( { VARIANTARG *arg; arg = prgpvarg[i] = &rgvarg[i]; - memset(arg, 0, sizeof(*arg)); V_VT(arg) = rgvt[i]; memset(&retval, 0, sizeof(retval)); V_BYREF(arg) = &retval;

1 0

Nikolay Sivov : oleaut32/tests: Remove unused variable.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: 3c7b0e8d85985aee5d5c51c97f46b7d5c33c13f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c7b0e8d85985aee5d5c51c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 17 14:12:48 2021 +0300 oleaut32/tests: Remove unused variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 4e9a8baeca0..1e75a93ebce 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -30,9 +30,6 @@ #include "tmarshal.h" -static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); - - #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) static inline void release_iface_(unsigned int line, void *iface) { @@ -3747,8 +3744,6 @@ static void test_marshal_dispinterface(void) START_TEST(tmarshal) { HRESULT hr; - HANDLE hOleaut32 = GetModuleHandleA("oleaut32.dll"); - pVarAdd = (void*)GetProcAddress(hOleaut32, "VarAdd"); CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);

1 0

Esme Povirk : mscoree: Update Wine Mono to 6.4.0.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: e6513521ff8b81ba838bb96d10fb20c64c1c2306 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6513521ff8b81ba838bb96d… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Sep 17 10:59:58 2021 -0500 mscoree: Update Wine Mono to 6.4.0. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index dda94d34e1a..7ef7ca312ae 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.3.0" +#define MONO_VERSION "6.4.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0" +#define MONO_SHA "db8b85f3b910590f61adbfa0005a995d613e299a1cc73d00553d70dc81010e36" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 985cdeff770..04844c8da69 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.3.0" +#define WINE_MONO_VERSION "6.4.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Connor McAdams : user32/tests: Fix occasional test failure in test_ShowWindow().
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: ca37d6ea6b897cd73e96349e292a33b6ec29ada9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca37d6ea6b897cd73e96349e… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 17 11:41:14 2021 -0400 user32/tests: Fix occasional test failure in test_ShowWindow(). Windows 8+ sometimes sends an optional WM_WINDOWPOSCHANGED after an optional WM_WINDOWPOSCHANGING. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4c9f1dc6913..f2bfb81679f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13389,9 +13389,10 @@ static const struct message WmShowNoActivate_2[] = { { HCBT_ACTIVATE, hook|optional }, { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 sends this. */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|optional }, /* Sometimes sent on Win8+. */ { HCBT_SETFOCUS, hook|optional }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, /* Win7 sends this. */ - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, { HCBT_SETFOCUS, hook|optional },

1 0

Connor McAdams : user32/tests: Fix existing winevents in test_showwindow() message sequences.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: 804210fc77327a85feb11ceeedf06625667d41ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=804210fc77327a85feb11cee… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 17 11:41:15 2021 -0400 user32/tests: Fix existing winevents in test_showwindow() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=804210fc77327a85feb1…

1 0

Jacek Caban : gdi32: Access stretch mode directly from DC in NtGdiTransparentBlt.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: 6b1cdd1b5ee0db822f350ffe95c7579f33a0a851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b1cdd1b5ee0db822f350ffe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 17 13:44:16 2021 +0200 gdi32: Access stretch mode directly from DC in NtGdiTransparentBlt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 83ef949ec3f..cf56f39da4c 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -852,19 +852,22 @@ BOOL WINAPI NtGdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDes COLORREF oldForeground; int oldStretchMode; DIBSECTION dib; + DC *dc_src; if(widthDest < 0 || heightDest < 0 || widthSrc < 0 || heightSrc < 0) { TRACE("Cannot mirror\n"); return FALSE; } + if (!(dc_src = get_dc_ptr( hdcSrc ))) return FALSE; + NtGdiGetAndSetDCDword( hdcDest, NtGdiSetBkColor, RGB(255,255,255), &oldBackground ); NtGdiGetAndSetDCDword( hdcDest, NtGdiSetTextColor, RGB(0,0,0), &oldForeground ); /* Stretch bitmap */ - oldStretchMode = GetStretchBltMode(hdcSrc); - if(oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) - SetStretchBltMode(hdcSrc, COLORONCOLOR); + oldStretchMode = dc_src->attr->stretch_blt_mode; + if (oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) + dc_src->attr->stretch_blt_mode = COLORONCOLOR; hdcWork = NtGdiCreateCompatibleDC( hdcDest ); if ((get_gdi_object_type( hdcDest ) != NTGDI_OBJ_MEMDC || NtGdiExtGetObjectW( NtGdiGetDCObject( hdcDest, NTGDI_OBJ_SURF ), @@ -926,7 +929,8 @@ BOOL WINAPI NtGdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDes ret = TRUE; error: - SetStretchBltMode(hdcSrc, oldStretchMode); + dc_src->attr->stretch_blt_mode = oldStretchMode; + release_dc_ptr( dc_src ); NtGdiGetAndSetDCDword( hdcDest, NtGdiSetBkColor, oldBackground, NULL ); NtGdiGetAndSetDCDword( hdcDest, NtGdiSetTextColor, oldForeground, NULL ); if(hdcWork) {

1 0

Alexandre Julliard : winebus.sys: Remove the no longer used CFStringToWSTR function.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: 80a57c617bd0f90c0fa584de08ac512447181cb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80a57c617bd0f90c0fa584de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 17 12:56:49 2021 +0200 winebus.sys: Remove the no longer used CFStringToWSTR function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index d44f7ae257d..b1c11ee22ec 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -132,13 +132,6 @@ static struct platform_private *find_device_from_iohid(IOHIDDeviceRef IOHIDDevic return NULL; } -static void CFStringToWSTR(CFStringRef cstr, LPWSTR wstr, int length) -{ - int len = min(CFStringGetLength(cstr), length-1); - CFStringGetCharacters(cstr, CFRangeMake(0, len), (UniChar*)wstr); - wstr[len] = 0; -} - static DWORD CFNumberToDWORD(CFNumberRef num) { int dwNum = 0;

1 0

Alexandre Julliard : loader: Start the mount manager before registering dlls.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: cd37863832f54f38ba734b86b2bbc392d87a67c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd37863832f54f38ba734b86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 17 12:53:04 2021 +0200 loader: Start the mount manager before registering dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e600ee82b37..ce68069a9a2 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -26,12 +26,30 @@ [version] signature="$CHICAGO$" +[PreInstall] +WineFakeDlls=FakeDllsPreInstall + [PreInstall.ntamd64] +WineFakeDlls=FakeDllsPreInstall AddReg=Wow64 [PreInstall.ntarm64] +WineFakeDlls=FakeDllsPreInstall AddReg=Wow64 +[PreInstall.Services] +AddService=MountMgr,0x800,MountMgrService + +[PreInstall.ntamd64.Services] +AddService=MountMgr,0x800,MountMgrService + +[PreInstall.ntarm64.Services] +AddService=MountMgr,0x800,MountMgrService + +[FakeDllsPreInstall] +11,,winedevice.exe +12,,mountmgr.sys + [DefaultInstall] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls @@ -156,7 +174,6 @@ AddService=BITS,0,BITSService AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService -AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService @@ -176,7 +193,6 @@ AddService=BITS,0,BITSService AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService -AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService @@ -196,7 +212,6 @@ AddService=BITS,0,BITSService AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService -AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService @@ -216,7 +231,6 @@ AddService=BITS,0,BITSService AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService -AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService

1 0

Daniel Lehman : msxml3/tests: Avoid double-free using BSTR helper.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: 001aa01760168cd7e21e70bc1bb5fcc39a8432c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=001aa01760168cd7e21e70bc… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Sep 14 11:18:50 2021 -0700 msxml3/tests: Avoid double-free using BSTR helper. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a0bcca2d4e9..9e9789ebd9a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13644,11 +13644,11 @@ todo_wine ok(hr == S_OK, "got %#x\n", hr); ok(b == VARIANT_TRUE, "got %d\n", b); ok(qi_count == 0, "got %d QI calls\n", qi_count); - SysFreeString(V_BSTR(&var)); IXMLDOMDocument2_Release(doc); DeleteFileA(path); + free_bstrs(); } START_TEST(domdoc)

1 0

Alexandre Julliard : shell32: Check for macOS at runtime.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: ac241bf763efb18a3503678c25107dcb76bec94c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac241bf763efb18a3503678c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 17 17:47:07 2021 +0200 shell32: Check for macOS at runtime. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/recyclebin.c | 79 ++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 7db504c18cd..21d3fcd4be7 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -79,47 +79,56 @@ static WCHAR *trash_dir; static WCHAR *trash_info_dir; static ULONG random_seed; +extern void CDECL wine_get_host_version( const char **sysname, const char **release ); + +static BOOL is_macos(void) +{ + const char *sysname; + + wine_get_host_version( &sysname, NULL ); + return !strcmp( sysname, "Darwin" ); +} + static BOOL WINAPI init_trash_dirs( INIT_ONCE *once, void *param, void **context ) { - static const WCHAR homedirW[] = {'W','I','N','E','H','O','M','E','D','I','R',0}; - WCHAR var[MAX_PATH], *info = NULL, *files = NULL; - -#ifdef __APPLE__ - static const WCHAR trashW[] = {'\\','.','T','r','a','s','h',0}; - - if (!GetEnvironmentVariableW( homedirW, var, MAX_PATH )) return TRUE; - files = heap_alloc( (lstrlenW(var) + lstrlenW(trashW) + 1) * sizeof(WCHAR) ); - lstrcpyW( files, var ); - lstrcatW( files, trashW ); - files[1] = '\\'; /* change \??\ to \\?\ */ -#else - static const WCHAR dataW[] = {'X','D','G','_','D','A','T','A','_','H','O','M','E',0}; - static const WCHAR infoW[] = {'\\','i','n','f','o',0}; - static const WCHAR filesW[] = {'\\','f','i','l','e','s',0}; - static const WCHAR home_fmtW[] = {'%','s','/','.','l','o','c','a','l','/','s','h','a','r','e','/','T','r','a','s','h',0}; - static const WCHAR config_fmtW[] = {'\\','?','?','\\','u','n','i','x','%','s','/','T','r','a','s','h',0}; - const WCHAR *fmt = config_fmtW; - WCHAR *p; + const WCHAR *home = _wgetenv( L"WINEHOMEDIR" ); + WCHAR *info = NULL, *files = NULL; ULONG len; - if (!GetEnvironmentVariableW( dataW, var + 8, MAX_PATH - 8 ) || !var[8]) + if (!home) return TRUE; + if (is_macos()) { - if (!GetEnvironmentVariableW( homedirW, var, MAX_PATH )) return TRUE; - fmt = home_fmtW; + static const WCHAR trashW[] = {'\\','.','T','r','a','s','h',0}; + + files = heap_alloc( (lstrlenW(home) + lstrlenW(trashW) + 1) * sizeof(WCHAR) ); + lstrcpyW( files, home ); + lstrcatW( files, trashW ); + files[1] = '\\'; /* change \??\ to \\?\ */ + } + else + { + const WCHAR *data_home = _wgetenv( L"XDG_DATA_HOME" ); + const WCHAR *fmt = L"%s/.local/share/Trash"; + WCHAR *p; + + if (data_home && data_home[0] == '/') + { + home = data_home; + fmt = L"\\??\\unix%s/Trash"; + } + len = lstrlenW(home) + lstrlenW(fmt) + 7; + files = heap_alloc( len * sizeof(WCHAR) ); + swprintf( files, len, fmt, home ); + files[1] = '\\'; /* change \??\ to \\?\ */ + for (p = files; *p; p++) if (*p == '/') *p = '\\'; + CreateDirectoryW( files, NULL ); + info = heap_alloc( len * sizeof(WCHAR) ); + lstrcpyW( info, files ); + lstrcatW( files, L"\\files" ); + lstrcatW( info, L"\\info" ); + if (!CreateDirectoryW( info, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) goto done; + trash_info_dir = info; } - len = lstrlenW(var) + lstrlenW(fmt) + lstrlenW(filesW) + 1; - files = heap_alloc( len * sizeof(WCHAR) ); - swprintf( files, len, fmt, var ); - files[1] = '\\'; /* change \??\ to \\?\ */ - for (p = files; *p; p++) if (*p == '/') *p = '\\'; - CreateDirectoryW( files, NULL ); - info = heap_alloc( len * sizeof(WCHAR) ); - lstrcpyW( info, files ); - lstrcatW( files, filesW ); - lstrcatW( info, infoW ); - if (!CreateDirectoryW( info, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) goto done; - trash_info_dir = info; -#endif if (!CreateDirectoryW( files, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) goto done; trash_dir = files;

1 0