October 2019 - Wine-Commits

Vincent Povirk : regsvr32: Re-exec as 32-bit or 64-bit if necessary.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: e90cca8e7a429c58076262626b8bb4d3f4f2c5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e90cca8e7a429c5807626262… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 18 15:46:34 2019 -0500 regsvr32: Re-exec as 32-bit or 64-bit if necessary. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47075 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 122 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 111 insertions(+), 11 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 4aa3f7d5c1..a7fb12e0fc 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -83,6 +83,97 @@ static void WINAPIV output_write(UINT id, ...) LocalFree(str); } +static LPCWSTR find_arg_start(LPCWSTR cmdline) +{ + LPCWSTR s; + BOOL in_quotes; + int bcount; + + bcount=0; + in_quotes=FALSE; + s=cmdline; + while (1) { + if (*s==0 || ((*s=='\t' || *s==' ') && !in_quotes)) { + /* end of this command line argument */ + break; + } else if (*s=='\\') { + /* '\', count them */ + bcount++; + } else if ((*s=='"') && ((bcount & 1)==0)) { + /* unescaped '"' */ + in_quotes=!in_quotes; + bcount=0; + } else { + /* a regular character */ + bcount=0; + } + s++; + } + return s; +} + +static void reexec_self(void) +{ + /* restart current process as 32-bit or 64-bit with same command line */ + static const WCHAR exe_name[] = {'\\','r','e','g','s','v','r','3','2','.','e','x','e',0}; +#ifndef _WIN64 + static const WCHAR sysnative[] = {'\\','S','y','s','N','a','t','i','v','e',0}; + BOOL wow64; +#endif + WCHAR systemdir[MAX_PATH]; + LPCWSTR args; + WCHAR *cmdline; + STARTUPINFOW si = {0}; + PROCESS_INFORMATION pi; + +#ifdef _WIN64 + TRACE("restarting as 32-bit\n"); + GetSystemWow64DirectoryW(systemdir, MAX_PATH); +#else + TRACE("restarting as 64-bit\n"); + + if (!IsWow64Process(GetCurrentProcess(), &wow64) || !wow64) + { + TRACE("not running in wow64, can't restart as 64-bit\n"); + return; + } + + GetWindowsDirectoryW(systemdir, MAX_PATH); + wcscat(systemdir, sysnative); +#endif + + args = find_arg_start(GetCommandLineW()); + + cmdline = HeapAlloc(GetProcessHeap(), 0, + (wcslen(systemdir)+wcslen(exe_name)+wcslen(args)+1)*sizeof(WCHAR)); + + wcscpy(cmdline, systemdir); + wcscat(cmdline, exe_name); + wcscat(cmdline, args); + + si.cb = sizeof(si); + + if (CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + DWORD exit_code; + WaitForSingleObject(pi.hProcess, INFINITE); + GetExitCodeProcess(pi.hProcess, &exit_code); + ExitProcess(exit_code); + } + else + { + WINE_TRACE("failed to restart, err=%d\n", GetLastError()); + } + + HeapFree(GetProcessHeap(), 0, cmdline); +} + +#ifdef _WIN64 +# define ALT_BINARY_TYPE SCS_32BIT_BINARY +#else +# define ALT_BINARY_TYPE SCS_64BIT_BINARY +#endif + /** * Loads procedure. * @@ -90,14 +181,22 @@ static void WINAPIV output_write(UINT id, ...) * strDll - name of the dll. * procName - name of the procedure to load from the dll. * DllHandle - a variable that receives the handle of the loaded dll. + * firstDll - true if this is the first dll in the command line. */ -static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHandle) +static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHandle, BOOL firstDll) { VOID* (*proc)(void); *DllHandle = LoadLibraryExW(strDll, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if(!*DllHandle) { + DWORD binary_type; + if (firstDll && GetLastError() == ERROR_BAD_EXE_FORMAT && + GetBinaryTypeW(strDll, &binary_type) && + binary_type == ALT_BINARY_TYPE) + { + reexec_self(); + } output_write(STRING_DLL_LOAD_FAILED, strDll); ExitProcess(LOADLIBRARY_FAILED); } @@ -111,13 +210,13 @@ static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHan return proc; } -static int RegisterDll(const WCHAR* strDll) +static int RegisterDll(const WCHAR* strDll, BOOL firstDll) { HRESULT hr; DLLREGISTER pfRegister; HMODULE DllHandle = NULL; - pfRegister = LoadProc(strDll, "DllRegisterServer", &DllHandle); + pfRegister = LoadProc(strDll, "DllRegisterServer", &DllHandle, firstDll); if (!pfRegister) return GETPROCADDRESS_FAILED; @@ -134,13 +233,13 @@ static int RegisterDll(const WCHAR* strDll) return 0; } -static int UnregisterDll(const WCHAR* strDll) +static int UnregisterDll(const WCHAR* strDll, BOOL firstDll) { HRESULT hr; DLLUNREGISTER pfUnregister; HMODULE DllHandle = NULL; - pfUnregister = LoadProc(strDll, "DllUnregisterServer", &DllHandle); + pfUnregister = LoadProc(strDll, "DllUnregisterServer", &DllHandle, firstDll); if (!pfUnregister) return GETPROCADDRESS_FAILED; @@ -157,13 +256,13 @@ static int UnregisterDll(const WCHAR* strDll) return 0; } -static int InstallDll(BOOL install, const WCHAR *strDll, const WCHAR *command_line) +static int InstallDll(BOOL install, const WCHAR *strDll, const WCHAR *command_line, BOOL firstDll) { HRESULT hr; DLLINSTALL pfInstall; HMODULE DllHandle = NULL; - pfInstall = LoadProc(strDll, "DllInstall", &DllHandle); + pfInstall = LoadProc(strDll, "DllInstall", &DllHandle, firstDll); if (!pfInstall) return GETPROCADDRESS_FAILED; @@ -278,11 +377,12 @@ int __cdecl wmain(int argc, WCHAR* argv[]) if (argv[i]) { WCHAR *DllName = argv[i]; + BOOL firstDll = !DllFound; res = 0; DllFound = TRUE; if (CallInstall && Unregister) - res = InstallDll(!Unregister, DllName, wsCommandLine); + res = InstallDll(!Unregister, DllName, wsCommandLine, firstDll); /* The Windows version stops processing the current file on the first error. */ if (res) @@ -294,9 +394,9 @@ int __cdecl wmain(int argc, WCHAR* argv[]) if (!CallInstall || CallRegister) { if(Unregister) - res = UnregisterDll(DllName); + res = UnregisterDll(DllName, firstDll); else - res = RegisterDll(DllName); + res = RegisterDll(DllName, firstDll); } if (res) @@ -306,7 +406,7 @@ int __cdecl wmain(int argc, WCHAR* argv[]) } if (CallInstall && !Unregister) - res = InstallDll(!Unregister, DllName, wsCommandLine); + res = InstallDll(!Unregister, DllName, wsCommandLine, firstDll); if (res) {

1 0

Sven Baars : msvcp120: Add a helper for tr2_sys__Equivalent.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: fb1fa3a404b88d120abef9c3c4b40bdced25ce76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb1fa3a404b88d120abef9c3… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Oct 21 20:01:45 2019 +0200 msvcp120: Add a helper for tr2_sys__Equivalent. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 3 ++ dlls/msvcp90/ios.c | 65 ++++++++++++++++-------------------------- 2 files changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 8f7b75aab4..d484cdd7ed 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1230,6 +1230,7 @@ static void test_tr2_sys__Equivalent(void) char temp_path[MAX_PATH], current_path[MAX_PATH]; WCHAR testW[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','1',0}; WCHAR testW2[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','2',0}; + WCHAR test_dirW[] = {'t','r','2','_','t','e','s','t','_','d','i','r',0}; struct { char const *path1; char const *path2; @@ -1273,6 +1274,8 @@ static void test_tr2_sys__Equivalent(void) ok(val == 1, "tr2_sys__Equivalent(): expect: 1, got %d\n", val); val = p_tr2_sys__Equivalent_wchar(testW, testW2); ok(val == 0, "tr2_sys__Equivalent(): expect: 0, got %d\n", val); + val = p_tr2_sys__Equivalent_wchar(test_dirW, test_dirW); + ok(val == -1, "tr2_sys__Equivalent(): expect: -1, got %d\n", val); ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); ok(DeleteFileA("tr2_test_dir/f2"), "expect tr2_test_dir/f2 to exist\n"); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 84174e4f95..8f0e5cfd7b 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14680,40 +14680,42 @@ ULONGLONG __cdecl tr2_sys__File_size(char const* path) return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; } +static int equivalent_handles(HANDLE h1, HANDLE h2) +{ + int ret; + BY_HANDLE_FILE_INFORMATION info1, info2; + + if(h1 == INVALID_HANDLE_VALUE) + return h2 == INVALID_HANDLE_VALUE ? -1 : 0; + else if(h2 == INVALID_HANDLE_VALUE) + return 0; + + ret = GetFileInformationByHandle(h1, &info1) && GetFileInformationByHandle(h2, &info2); + if(!ret) + return -1; + return (info1.dwVolumeSerialNumber == info2.dwVolumeSerialNumber + && info1.nFileIndexHigh == info2.nFileIndexHigh + && info1.nFileIndexLow == info2.nFileIndexLow + ); +} + /* ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z */ /* ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z */ int __cdecl tr2_sys__Equivalent(char const* path1, char const* path2) { HANDLE h1, h2; int ret; - BY_HANDLE_FILE_INFORMATION info1, info2; + TRACE("(%s %s)\n", debugstr_a(path1), debugstr_a(path2)); h1 = CreateFileA(path1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); h2 = CreateFileA(path2, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); - if(h1 == INVALID_HANDLE_VALUE) { - if(h2 == INVALID_HANDLE_VALUE) { - return -1; - }else { - CloseHandle(h2); - return 0; - } - }else if(h2 == INVALID_HANDLE_VALUE) { - CloseHandle(h1); - return 0; - } - - ret = GetFileInformationByHandle(h1, &info1) && GetFileInformationByHandle(h2, &info2); + ret = equivalent_handles(h1, h2); CloseHandle(h1); CloseHandle(h2); - if(!ret) - return -1; - return (info1.dwVolumeSerialNumber == info2.dwVolumeSerialNumber - && info1.nFileIndexHigh == info2.nFileIndexHigh - && info1.nFileIndexLow == info2.nFileIndexLow - ); + return ret; } /* ?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z */ @@ -15617,34 +15619,17 @@ int __cdecl tr2_sys__Equivalent_wchar(WCHAR const* path1, WCHAR const* path2) { HANDLE h1, h2; int ret; - BY_HANDLE_FILE_INFORMATION info1, info2; + TRACE("(%s %s)\n", debugstr_w(path1), debugstr_w(path2)); h1 = CreateFileW(path1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); h2 = CreateFileW(path2, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); - if(h1 == INVALID_HANDLE_VALUE) { - if(h2 == INVALID_HANDLE_VALUE) { - return -1; - }else { - CloseHandle(h2); - return 0; - } - }else if(h2 == INVALID_HANDLE_VALUE) { - CloseHandle(h1); - return 0; - } - - ret = GetFileInformationByHandle(h1, &info1) && GetFileInformationByHandle(h2, &info2); + ret = equivalent_handles(h1, h2); CloseHandle(h1); CloseHandle(h2); - if(!ret) - return -1; - return (info1.dwVolumeSerialNumber == info2.dwVolumeSerialNumber - && info1.nFileIndexHigh == info2.nFileIndexHigh - && info1.nFileIndexLow == info2.nFileIndexLow - ); + return ret; } /* ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z */

1 0

Sven Baars : scrobj: Add a missing return value check (Coverity).
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 43eb22c57f3a6227f23178205139c775199db2c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43eb22c57f3a6227f2317820… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Oct 19 21:20:54 2019 +0200 scrobj: Add a missing return value check (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 1d37864039..427e4e5439 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1695,6 +1695,8 @@ static HRESULT parse_scriptlet_file(struct scriptlet_factory *factory, const WCH hres = next_xml_node(factory, &node_type); if (hres == S_OK && node_type == XmlNodeType_XmlDeclaration) hres = next_xml_node(factory, &node_type); + if (FAILED(hres)) + return hres; if (node_type != XmlNodeType_Element || !is_xml_name(factory, L"component")) {

1 0

Conor McCarthy : dxgi: Do not warn about ignoring a null refresh rate.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 66548659d0bb961da31d6183272e396aaa511dc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66548659d0bb961da31d6183… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 8 14:13:52 2019 +1000 dxgi: Do not warn about ignoring a null refresh rate. Both values will be zero if fullscreen_desc was NULL. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index c76ad1d135..53dabe7cde 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2880,7 +2880,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (swapchain_desc->Flags) FIXME("Ignoring swapchain flags %#x.\n", swapchain_desc->Flags); - FIXME("Ignoring refresh rate.\n"); + if (fullscreen_desc->RefreshRate.Numerator || fullscreen_desc->RefreshRate.Denominator) + FIXME("Ignoring refresh rate.\n"); if (fullscreen_desc->ScanlineOrdering) FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); if (fullscreen_desc->Scaling)

1 0

Paul Gofman : user32: Fix coords in WINDOWPOS for WM_NCCALCSIZE sent from SetWindowPos().
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 2ac268436b535ed35c82aa2d5c2518e5dfb3cd12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ac268436b535ed35c82aa2d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Oct 18 13:05:14 2019 +0300 user32: Fix coords in WINDOWPOS for WM_NCCALCSIZE sent from SetWindowPos(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40777 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 86 ++++++++++++++++++++++++++++++++++++++++++------- dlls/user32/winpos.c | 12 +++++++ 2 files changed, 86 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2766e7f5fb..477661ab62 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2186,9 +2186,27 @@ static void add_message_(int line, const struct recvd_message *msg) seq->wParam = winpos->flags & 0xffff; /* We are not interested in the flags that don't match under XP and Win9x */ seq->wParam &= ~SWP_NOZORDER; + seq->lParam = (!!winpos->cx) | ((!!winpos->cy) << 1) + | ((!!winpos->x) << 2) | ((!!winpos->y) << 3); break; } + case WM_NCCALCSIZE: + if (msg->wParam) + { + NCCALCSIZE_PARAMS *p = (NCCALCSIZE_PARAMS *)msg->lParam; + WINDOWPOS *winpos = p->lppos; + + sprintf(seq->output, "%s: %p WM_NCCALCSIZE: winpos->cx %u, winpos->cy %u", + msg->descr, msg->hwnd, winpos->cx, winpos->cy); + seq->lParam = (!!winpos->cx) | ((!!winpos->cy) << 1) + | ((!!winpos->x) << 2) | ((!!winpos->y) << 3); + } + else + { + seq->lParam = 0; + } + break; case WM_DRAWITEM: { DRAW_ITEM_STRUCT di; @@ -5664,32 +5682,72 @@ done: flush_sequence(); } +static const struct message WmFrameChanged[] = { + { WM_WINDOWPOSCHANGING, sent|wparam|lparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE, 0 }, + { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, + { WM_WINDOWPOSCHANGED, sent|wparam|lparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOREDRAW + |SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE, 0xf }, + { WM_GETTEXT, sent|optional }, + { 0 } +}; + +static const struct message WmFrameChanged_move[] = { + { WM_WINDOWPOSCHANGING, sent|wparam|lparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE, 0 }, + { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0x3 }, + { WM_WINDOWPOSCHANGED, sent|wparam|lparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOREDRAW + |SWP_NOSIZE|SWP_NOCLIENTSIZE, 0x3 }, + { WM_MOVE, sent|defwinproc, 0 }, + { WM_GETTEXT, sent|optional }, + { 0 } +}; + static void test_setwindowpos(void) { HWND hwnd; RECT rc; LRESULT res; + const INT X = 50; + const INT Y = 50; const INT winX = 100; const INT winY = 100; const INT sysX = GetSystemMetrics(SM_CXMINTRACK); hwnd = CreateWindowExA(0, "TestWindowClass", NULL, 0, - 0, 0, winX, winY, 0, + X, Y, winX, winY, 0, NULL, NULL, 0); GetWindowRect(hwnd, &rc); - expect(sysX, rc.right); - expect(winY, rc.bottom); + expect(sysX + X, rc.right); + expect(winY + Y, rc.bottom); flush_events(); flush_sequence(); - res = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, winX, winY, 0); + res = SetWindowPos(hwnd, HWND_TOPMOST, 50, 50, winX, winY, 0); ok_sequence(WmZOrder, "Z-Order", TRUE); ok(res == TRUE, "SetWindowPos expected TRUE, got %ld\n", res); + GetWindowRect(hwnd, &rc); + expect(sysX + X, rc.right); + expect(winY + Y, rc.bottom); + + res = SetWindowPos( hwnd, 0, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); + ok_sequence(WmFrameChanged, "FrameChanged", FALSE); + ok(res == TRUE, "SetWindowPos expected TRUE, got %ld.\n", res); + + GetWindowRect(hwnd, &rc); + expect(sysX + X, rc.right); + expect(winY + Y, rc.bottom); + + res = SetWindowPos( hwnd, 0, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); + ok_sequence(WmFrameChanged_move, "FrameChanged", FALSE); + ok(res == TRUE, "SetWindowPos expected TRUE, got %ld.\n", res); + GetWindowRect(hwnd, &rc); expect(sysX, rc.right); expect(winY, rc.bottom); + DestroyWindow(hwnd); } @@ -12884,27 +12942,31 @@ static void test_TrackMouseEvent(void) static const struct message WmSetWindowRgn[] = { - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE }, - { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE + |SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE, 0 }, + { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, { WM_NCPAINT, sent|optional }, /* wparam != 1 */ { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE, 0xf }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; static const struct message WmSetWindowRgn_no_redraw[] = { - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW }, - { WM_NCCALCSIZE, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW }, + { WM_WINDOWPOSCHANGING, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE + |SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW, 0 }, + { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, + { WM_WINDOWPOSCHANGED, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW, 0xf }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; static const struct message WmSetWindowRgn_clear[] = { - { WM_WINDOWPOSCHANGING, sent/*|wparam*/, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE/*|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE only on some Windows versions */ }, - { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent/*|wparam|lparam*/, SWP_NOACTIVATE|SWP_FRAMECHANGED + |SWP_NOSIZE|SWP_NOMOVE/*|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE only on some Windows versions */, 0xf + /* Some newer Windows versions set window coordinates instead of zeros in WINDOWPOS structure */}, + { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, /* FIXME: remove optional once Wine is fixed */ diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index bbbab60fbe..aad5274973 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1873,6 +1873,18 @@ static UINT SWP_DoNCCalcSize( WINDOWPOS *pWinpos, const RECT *old_window_rect, c params.lppos = &winposCopy; winposCopy = *pWinpos; + if (pWinpos->flags & SWP_NOMOVE) + { + winposCopy.x = old_window_rect->left; + winposCopy.y = old_window_rect->top; + } + + if (pWinpos->flags & SWP_NOSIZE) + { + winposCopy.cx = old_window_rect->right - old_window_rect->left; + winposCopy.cy = old_window_rect->bottom - old_window_rect->top; + } + wvrFlags = SendMessageW( pWinpos->hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params ); *new_client_rect = params.rgrc[0];

1 0

Sven Baars : webservices: Fix some leaks on error paths (Coverity).
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 4f07e4f014587d016ea159c16052d30f0ea72a43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f07e4f014587d016ea159c1… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Oct 21 11:22:06 2019 +0200 webservices: Fix some leaks on error paths (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index a006841be6..6922224a05 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1552,12 +1552,12 @@ HRESULT WINAPI WsRemoveMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *na return hr; } -static HRESULT xmlstring_to_wsz( const WS_XML_STRING *str, WS_HEAP *heap, WCHAR **ret ) +static HRESULT xmlstring_to_wsz( const WS_XML_STRING *str, WS_HEAP *heap, WCHAR **ret, int *len ) { - int len = MultiByteToWideChar( CP_UTF8, 0, (char *)str->bytes, str->length, NULL, 0 ); - if (!(*ret = ws_alloc( heap, (len + 1) * sizeof(WCHAR) ))) return WS_E_QUOTA_EXCEEDED; - MultiByteToWideChar( CP_UTF8, 0, (char *)str->bytes, str->length, *ret, len ); - (*ret)[len] = 0; + *len = MultiByteToWideChar( CP_UTF8, 0, (char *)str->bytes, str->length, NULL, 0 ); + if (!(*ret = ws_alloc( heap, (*len + 1) * sizeof(WCHAR) ))) return WS_E_QUOTA_EXCEEDED; + MultiByteToWideChar( CP_UTF8, 0, (char *)str->bytes, str->length, *ret, *len ); + (*ret)[*len] = 0; return S_OK; } @@ -1565,9 +1565,10 @@ static HRESULT get_header_value_wsz( struct header *header, WS_READ_OPTION optio ULONG size ) { WCHAR *str = NULL; + int len = 0; HRESULT hr; - if (header && (hr = xmlstring_to_wsz( header->u.text, heap, &str )) != S_OK) return hr; + if (header && (hr = xmlstring_to_wsz( header->u.text, heap, &str, &len )) != S_OK) return hr; switch (option) { @@ -1577,12 +1578,17 @@ static HRESULT get_header_value_wsz( struct header *header, WS_READ_OPTION optio case WS_READ_OPTIONAL_POINTER: case WS_READ_NILLABLE_POINTER: - if (size != sizeof(str)) return E_INVALIDARG; + if (size != sizeof(str)) + { + ws_free( heap, str, (len + 1) * sizeof(WCHAR) ); + return E_INVALIDARG; + } *ret = str; break; default: FIXME( "read option %u not supported\n", option ); + ws_free( heap, str, (len + 1) * sizeof(WCHAR) ); return E_NOTIMPL; }

1 0

Sven Baars : scrobj: Fix some leaks on error paths (Coverity).
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: fae51bd740339c3a15a1dd4751ec0eb994ee1551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fae51bd740339c3a15a1dd47… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Oct 21 14:18:25 2019 +0200 scrobj: Fix some leaks on error paths (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index ce5a3dedd1..1d37864039 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1491,6 +1491,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) if (!wcsicmp(member_iter->name, member->name)) { FIXME("Duplicated member %s\n", debugstr_w(member->name)); + heap_free(member); return E_FAIL; } } @@ -1529,11 +1530,11 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(parameter = heap_alloc(sizeof(*parameter)))) return E_OUTOFMEMORY; + if (!(parameter = heap_alloc_zero(sizeof(*parameter)))) return E_OUTOFMEMORY; + list_add_tail(&member->u.parameters, &parameter->entry); hres = read_xml_value(factory, &parameter->name); if (FAILED(hres)) return hres; - list_add_tail(&member->u.parameters, &parameter->entry); if (!empty && FAILED(hres = expect_end_element(factory))) return hres; } break;

1 0

Francois Gouget : msi: Fix the spelling of a comment.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: a0c6c8c2ecdad0bf8992b6c89276ee7bf2402883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0c6c8c2ecdad0bf8992b6c8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 21 06:21:39 2019 +0200 msi: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f6f7ffbcf4..048d5983a9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5878,7 +5878,7 @@ end: } /* - * At present I am ignorning the advertised components part of this and only + * At present I am ignoring the advertised components part of this and only * focusing on the qualified component sets */ static UINT ACTION_PublishComponents(MSIPACKAGE *package)

1 0

Vijay Kiran Kamuju : ntdll: Fix the SYSTEM_MODULE struct field names.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 1aff1e6a370ee8c0213a0fd4b220d121da8527aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aff1e6a370ee8c0213a0fd4… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Oct 20 11:18:52 2019 +0200 ntdll: Fix the SYSTEM_MODULE struct field names. Based on https://www.geoffchappell.com/studies/windows/km/ntoskrnl/api/rtl/ldrreloc/… Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 10 +++++----- dlls/ntdll/tests/info.c | 2 +- include/winternl.h | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5eacc5a23c..e33c24d7af 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3259,14 +3259,14 @@ NTSTATUS WINAPI LdrQueryProcessModuleInformation(PSYSTEM_MODULE_INFORMATION smi, size += sizeof(*sm); if (size <= buf_size) { - sm->Reserved1 = 0; /* FIXME */ - sm->Reserved2 = 0; /* FIXME */ + sm->Section = 0; /* FIXME */ + sm->MappedBaseAddress = mod->BaseAddress; sm->ImageBaseAddress = mod->BaseAddress; sm->ImageSize = mod->SizeOfImage; sm->Flags = mod->Flags; - sm->Id = id++; - sm->Rank = 0; /* FIXME */ - sm->Unknown = 0; /* FIXME */ + sm->LoadOrderIndex = id++; + sm->InitOrderIndex = 0; /* FIXME */ + sm->LoadCount = mod->LoadCount; str.Length = 0; str.MaximumLength = MAXIMUM_FILENAME_LENGTH; str.Buffer = (char*)sm->Name; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 93920714f2..64c39f0940 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -488,7 +488,7 @@ static void test_query_module(void) /* Loop through all the modules/drivers, Wine doesn't get here (yet) */ for (i = 0; i < ModuleCount ; i++) { - ok( i == sm->Id, "Id (%d) should have matched %u\n", sm->Id, i); + ok( i == sm->LoadOrderIndex, "LoadOrderIndex (%d) should have matched %u\n", sm->LoadOrderIndex, i); sm++; } diff --git a/include/winternl.h b/include/winternl.h index 16df963770..9b8bef0fe7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2271,14 +2271,14 @@ typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICAT typedef struct _SYSTEM_MODULE { - PVOID Reserved1; /* 00/00 */ - PVOID Reserved2; /* 04/08 */ + PVOID Section; /* 00/00 */ + PVOID MappedBaseAddress; /* 04/08 */ PVOID ImageBaseAddress; /* 08/10 */ ULONG ImageSize; /* 0c/18 */ ULONG Flags; /* 10/1c */ - WORD Id; /* 14/20 */ - WORD Rank; /* 16/22 */ - WORD Unknown; /* 18/24 */ + WORD LoadOrderIndex; /* 14/20 */ + WORD InitOrderIndex; /* 16/22 */ + WORD LoadCount; /* 18/24 */ WORD NameOffset; /* 1a/26 */ BYTE Name[MAXIMUM_FILENAME_LENGTH]; /* 1c/28 */ } SYSTEM_MODULE, *PSYSTEM_MODULE;

1 0

Nikolay Sivov : gdiplus: Trace GpRectF arguments.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 9d123b5424aabcbb99f0b1ad7617a8c8d987bfb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d123b5424aabcbb99f0b1ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 20 23:51:03 2019 +0300 gdiplus: Trace GpRectF arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 4 ++-- dlls/gdiplus/matrix.c | 3 ++- dlls/gdiplus/metafile.c | 6 +++--- dlls/gdiplus/region.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index e65d4a29b2..e321dcaa60 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -410,7 +410,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, { float angle; - TRACE("(%p, %x, %x, %d, %d, %p)\n", rect, startcolor, endcolor, mode, + TRACE("(%s, %x, %x, %d, %d, %p)\n", debugstr_rectf(rect), startcolor, endcolor, mode, wrap, line); if(!line || !rect) @@ -466,7 +466,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect REAL sin_angle, cos_angle, sin_cos_angle; GpPointF start, end; - TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, + TRACE("(%s, %x, %x, %.2f, %d, %d, %p)\n", debugstr_rectf(rect), startcolor, endcolor, angle, isAngleScalable, wrap, line); if (!rect || !line || wrap == WrapModeClamp) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 2219d46369..5d8cf89007 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -86,7 +86,8 @@ GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *rect, GDIPCONST GpPointF *pt, GpMatrix **matrix) { REAL m11, m12, m21, m22, dx, dy; - TRACE("(%p, %p, %p)\n", rect, pt, matrix); + + TRACE("(%s, %p, %p)\n", debugstr_rectf(rect), pt, matrix); if(!matrix || !pt) return InvalidParameter; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d1a95d678d..2cb1c5f284 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -740,7 +740,7 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF RECT rc, *lprc; GpStatus stat; - TRACE("(%p %d %p %d %p %p)\n", hdc, type, frameRect, frameUnit, desc, metafile); + TRACE("(%p %d %s %d %p %p)\n", hdc, type, debugstr_rectf(frameRect), frameUnit, desc, metafile); if (!hdc || type < EmfTypeEmfOnly || type > EmfTypeEmfPlusDual || !metafile) return InvalidParameter; @@ -885,7 +885,7 @@ GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream *stream, HDC hdc, EmfType t { GpStatus stat; - TRACE("(%p %p %d %p %d %p %p)\n", stream, hdc, type, frameRect, frameUnit, desc, metafile); + TRACE("(%p %p %d %s %d %p %p)\n", stream, hdc, type, debugstr_rectf(frameRect), frameUnit, desc, metafile); if (!stream) return InvalidParameter; @@ -4048,7 +4048,7 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR* fileName, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) { - FIXME("%s %p %d %p %d %s %p stub!\n", debugstr_w(fileName), hdc, type, pFrameRect, + FIXME("%s %p %d %s %d %s %p stub!\n", debugstr_w(fileName), hdc, type, debugstr_rectf(pFrameRect), frameUnit, debugstr_w(desc), metafile); return NotImplemented; diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 470bcd20ce..dcc4000283 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -461,7 +461,7 @@ GpStatus WINGDIPAPI GdipCreateRegionRect(GDIPCONST GpRectF *rect, { GpStatus stat; - TRACE("%p, %p\n", rect, region); + TRACE("%s, %p\n", debugstr_rectf(rect), region); if (!(rect && region)) return InvalidParameter;

1 0