January 2020 - Wine-Commits

Alexandre Julliard : kernelbase: Set an explicit load address.
by Alexandre Julliard Jan. 5, 2020

Jan. 5, 2020

Module: wine Branch: master Commit: 8f7d88c707b84e9f414a66d4b4a67c0f22970099 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f7d88c707b84e9f414a66d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 5 17:31:58 2020 +0100 kernelbase: Set an explicit load address. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48417 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index 9279ddbb57..b62fc825a6 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1,7 +1,7 @@ MODULE = kernelbase.dll IMPORTLIB = kernelbase IMPORTS = uuid ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -mno-cygwin +EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -mno-cygwin -Wl,--image-base,0x7b000000 C_SRCS = \ collation.c \

1 0

Alexandre Julliard : ntdll: Make loop counter signed.
by Alexandre Julliard Jan. 5, 2020

Jan. 5, 2020

Module: wine Branch: master Commit: d96331d83050ef2748d0d7d70ecf921370e24bef URL: https://source.winehq.org/git/wine.git/?a=commit;h=d96331d83050ef2748d0d7d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 4 11:21:28 2020 +0100 ntdll: Make loop counter signed. Spotted by Gianfranco Costamagna. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48398 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 687219ec40..6d72938809 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1519,7 +1519,8 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION *func, CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ptrs ) { - unsigned int i, len, offset, skip = 0; + int i; + unsigned int len, offset, skip = 0; unsigned int int_size = func->u.s.RegI * 8, fp_size = func->u.s.RegF * 8, regsave, local_size; TRACE( "function %lx-%lx: len=%#x flag=%x regF=%u regI=%u H=%u CR=%u frame=%x\n",

1 0

Alexandre Julliard : Wine release 5.0-rc4
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: website Branch: master Commit: 6294d16db1d87b98760362dafee39bd5260db60b URL: https://source.winehq.org/git/website.git/?a=commit;h=6294d16db1d87b9876036… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 3 22:25:21 2020 +0100 Wine release 5.0-rc4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020010301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2020010301.xml b/news/en/2020010301.xml new file mode 100644 index 00000000..0b592791 --- /dev/null +++ b/news/en/2020010301.xml @@ -0,0 +1,12 @@ +<news> +<date>January 3, 2020</date> +<title>Wine 5.0-rc4 Released</title> +<body> + The Wine development release 5.0-rc4 is now available. + <a href="{$root}/announce/5.0-rc4">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0-rc4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Matteo Bruni : d3dcompiler/tests: Load the correct d3dcompiler DLL in the asm tests.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: d367c9aeff769171cad907b2ad4e125b92a8c472 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d367c9aeff769171cad907b2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 3 20:52:34 2020 +0100 d3dcompiler/tests: Load the correct d3dcompiler DLL in the asm tests. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/asm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 900e662843..749b115326 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1725,7 +1725,11 @@ static BOOL load_d3dcompiler(void) { HMODULE module; +#if D3D_COMPILER_VERSION == 47 + if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; +#else if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; +#endif pD3DAssemble = (void*)GetProcAddress(module, "D3DAssemble"); ppD3DPreprocess = (void*)GetProcAddress(module, "D3DPreprocess"); @@ -1736,7 +1740,7 @@ START_TEST(asm) { if (!load_d3dcompiler()) { - win_skip("Could not load d3dcompiler_43.dll\n"); + win_skip("Could not load DLL.\n"); return; }

1 0

Piotr Caban : msvcrt: Don't use ungetc when reading double in scanf.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: c4ad7391956fcbfe7a1a9324ebda1e013e5f6edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4ad7391956fcbfe7a1a9324… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 3 19:42:25 2020 +0100 msvcrt: Don't use ungetc when reading double in scanf. It may not work on unbuffered streams. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 43 +++++++++------ dlls/ucrtbase/tests/scanf.c | 132 +++++++++++++++++++++++++++++--------------- 2 files changed, 115 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4ad7391956fcbfe7a1a…

1 0

Hans Leidekker : msi/tests: Avoid test failure when running as an unprivileged user.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: 90422f9bb59d4a2e34ad9cffbb4f04b896ab7235 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90422f9bb59d4a2e34ad9cff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 3 10:06:53 2020 +0100 msi/tests: Avoid test failure when running as an unprivileged user. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3c547bf04a..3b7b11d81e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4054,7 +4054,6 @@ static void test_appsearch(void) r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, NULL, &hkey, NULL); - ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); if (r == ERROR_ACCESS_DENIED) { skip("insufficient rights\n"); @@ -4063,6 +4062,7 @@ static void test_appsearch(void) DeleteFileA(msifile); return; } + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); r = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE *)"c:\\windows\\system32\\notepad.exe", sizeof("c:\\windows\\system32\\notepad.exe"));

1 0

Nikolay Sivov : vbscript/tests: Add missing checks for Close() calls (Coverity).
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: e04c168c3062d3ad2a8dcf5feaa4ece26a5a2d3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e04c168c3062d3ad2a8dcf5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 16:09:10 2020 +0300 vbscript/tests: Add missing checks for Close() calls (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 5357ab1f12..d45416a94a 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1956,7 +1956,6 @@ static HRESULT parse_script(DWORD flags, BSTR script_str, const WCHAR *delim) IActiveScriptParse *parser; IActiveScript *engine; IDispatch *script_disp; - LONG ref; HRESULT hres; engine = create_and_init_script(flags, TRUE); @@ -1980,13 +1979,10 @@ static HRESULT parse_script(DWORD flags, BSTR script_str, const WCHAR *delim) hres = IActiveScriptParse_ParseScriptText(parser, script_str, NULL, NULL, delim, 0, 0, 0, NULL, NULL); - IActiveScript_Close(engine); - IDispatch_Release(script_disp); - IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + close_script(engine); - ref = IActiveScriptParse_Release(parser); - ok(!ref, "ref=%d\n", ref); return hres; } @@ -2383,7 +2379,8 @@ static void test_gc(void) SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - IActiveScript_Close(engine); + hres = IActiveScript_Close(engine); + ok(hres == S_OK, "Close failed: %08x\n", hres); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i);

1 0

Piotr Caban : webservices: Fix WsWriteText test crash on Windows 10.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: 83a518214d5a76af9a74b39a8f5b07638d553178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83a518214d5a76af9a74b39a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 3 14:31:42 2020 +0100 webservices: Fix WsWriteText test crash on Windows 10. The tests crashes on my system when utf8.value.dictionary != NULL. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index afbc46b83e..70623052de 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -2215,6 +2215,7 @@ static void test_WsMoveReader(void) hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + memset(&utf8, 0, sizeof(utf8)); utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; utf8.value.bytes = (BYTE *)"test"; utf8.value.length = sizeof("test") - 1;

1 0

Piotr Caban : ucrtbase: Fix 0 parsing in parse_double.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: 1d91c196e71413b9c72aebc2c4b8df246985fea0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d91c196e71413b9c72aebc2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 3 19:41:56 2020 +0100 ucrtbase: Fix 0 parsing in parse_double. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 796b0134c5..78a115550c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -710,6 +710,7 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), } if(nch == '0') { + found_digit = TRUE; nch = get(ctx); if(nch == 'x' || nch == 'X') return strtod16(get, unget, ctx, sign, locinfo, err);

1 0

Jacek Caban : kernel32/tests: Avoid function pointers for functions present since XP.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: 1d556188a7c698ef4f3109946fa46f4493a576ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d556188a7c698ef4f310994… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 3 18:48:36 2020 +0100 kernel32/tests: Avoid function pointers for functions present since XP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index cd982a2014..e6ba746248 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -38,9 +38,6 @@ static int myARGC; static char** myARGV; static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL); -static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD); -static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL); -static BOOL (WINAPI *pIsDebuggerPresent)(void); static void (WINAPI *pDbgBreakPoint)(void); @@ -509,7 +506,7 @@ static void doDebugger(int argc, char** argv) blackbox.nokill_err=0; if (strstr(myARGV[2], "nokill")) { - blackbox.nokill_rc=pDebugSetProcessKillOnExit(FALSE); + blackbox.nokill_rc = DebugSetProcessKillOnExit(FALSE); if (!blackbox.nokill_rc) blackbox.nokill_err=GetLastError(); } @@ -519,7 +516,7 @@ static void doDebugger(int argc, char** argv) blackbox.detach_err=0; if (strstr(myARGV[2], "detach")) { - blackbox.detach_rc=pDebugActiveProcessStop(blackbox.pid); + blackbox.detach_rc = DebugActiveProcessStop(blackbox.pid); if (!blackbox.detach_rc) blackbox.detach_err=GetLastError(); } @@ -764,17 +761,9 @@ static void test_ExitCode(void) ok(disposition == REG_OPENED_EXISTING_KEY, "expected REG_OPENED_EXISTING_KEY, got %d\n", disposition); crash_and_debug(hkey, test_exe, "dbg,event,order"); crash_and_debug(hkey, test_exe, "dbg,attach,event,code2"); - if (pDebugSetProcessKillOnExit) - crash_and_debug(hkey, test_exe, "dbg,attach,event,nokill"); - else - win_skip("DebugSetProcessKillOnExit is not available\n"); - if (pDebugActiveProcessStop) - { - crash_and_debug(hkey, test_exe, "dbg,attach,event,detach"); - crash_and_debug(hkey, test_exe, "dbg,attach,detach,late"); - } - else - win_skip("DebugActiveProcessStop is not available\n"); + crash_and_debug(hkey, test_exe, "dbg,attach,event,nokill"); + crash_and_debug(hkey, test_exe, "dbg,attach,event,detach"); + crash_and_debug(hkey, test_exe, "dbg,attach,detach,late"); crash_and_debug(hkey, test_exe, "dbg,attach,process,event,detach"); if (disposition == REG_CREATED_NEW_KEY) @@ -851,7 +840,7 @@ static void doChild(int argc, char **argv) child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); child_ok(debug, "Expected debug != 0, got %#x.\n", debug); - ret = pDebugActiveProcessStop(ppid); + ret = DebugActiveProcessStop(ppid); child_ok(ret, "DebugActiveProcessStop failed, last error %#x.\n", GetLastError()); ret = pCheckRemoteDebuggerPresent(parent, &debug); @@ -861,7 +850,7 @@ static void doChild(int argc, char **argv) ret = CloseHandle(parent); child_ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); - ret = pIsDebuggerPresent(); + ret = IsDebuggerPresent(); child_ok(ret, "Expected ret != 0, got %#x.\n", ret); ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); @@ -869,7 +858,7 @@ static void doChild(int argc, char **argv) NtCurrentTeb()->Peb->BeingDebugged = FALSE; - ret = pIsDebuggerPresent(); + ret = IsDebuggerPresent(); child_ok(!ret, "Expected ret != 0, got %#x.\n", ret); ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); @@ -893,9 +882,9 @@ static void test_debug_loop(int argc, char **argv) char *cmd; BOOL ret; - if (!pDebugActiveProcessStop || !pCheckRemoteDebuggerPresent) + if (!pCheckRemoteDebuggerPresent) { - win_skip("DebugActiveProcessStop or CheckRemoteDebuggerPresent not available, skipping test.\n"); + win_skip("CheckRemoteDebuggerPresent not available, skipping test.\n"); return; } @@ -1024,9 +1013,9 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, BOOL debug, ret; struct debugger_context ctx = { 0 }; - if (!pDebugActiveProcessStop || !pCheckRemoteDebuggerPresent) + if (!pCheckRemoteDebuggerPresent) { - win_skip("DebugActiveProcessStop or CheckRemoteDebuggerPresent not available, skipping test.\n"); + win_skip("CheckRemoteDebuggerPresent not available, skipping test.\n"); return; } @@ -1447,9 +1436,6 @@ START_TEST(debugger) hdll=GetModuleHandleA("kernel32.dll"); pCheckRemoteDebuggerPresent=(void*)GetProcAddress(hdll, "CheckRemoteDebuggerPresent"); - pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop"); - pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit"); - pIsDebuggerPresent=(void*)GetProcAddress(hdll, "IsDebuggerPresent"); ntdll = GetModuleHandleA("ntdll.dll"); pDbgBreakPoint = (void*)GetProcAddress(ntdll, "DbgBreakPoint");

1 0