April 2022 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Don't use GetDaylightFlag function in _ftime64.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 4c16e0f20b6fad1d4eb4a8572aa8d73a74908763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c16e0f20b6fad1d4eb4a857… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 1 15:07:17 2021 +0100 msvcrt: Don't use GetDaylightFlag function in _ftime64. The function is not available on current Windows releases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51959 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 00824a94f02340c2725f494f04f7f1f8ca311033) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/time.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 327d8e086e0..9abd1f5555b 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -44,8 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #undef _time32 #undef _wctime32 -BOOL WINAPI GetDaylightFlag(void); - static LONGLONG init_time; void msvcrt_init_clock(void) @@ -691,6 +689,7 @@ double CDECL _difftime32(__time32_t time1, __time32_t time2) */ void CDECL _ftime64(struct __timeb64 *buf) { + TIME_ZONE_INFORMATION tzinfo; FILETIME ft; ULONGLONG time; @@ -703,7 +702,7 @@ void CDECL _ftime64(struct __timeb64 *buf) buf->time = time / TICKSPERSEC - SECS_1601_TO_1970; buf->millitm = (time % TICKSPERSEC) / TICKSPERMSEC; buf->timezone = MSVCRT___timezone / 60; - buf->dstflag = GetDaylightFlag(); + buf->dstflag = GetTimeZoneInformation( &tzinfo) == TIME_ZONE_ID_DAYLIGHT; } /*********************************************************************

1 0

Alex Henrie : krnl386: Add GetLPErrMode stub.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 05bcb3cde06b98685abf206b87fea775a6c8304d URL: https://source.winehq.org/git/wine.git/?a=commit;h=05bcb3cde06b98685abf206b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 1 22:35:23 2021 -0700 krnl386: Add GetLPErrMode stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52102 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 819d049f1277090033bcfe17783490cd6b190c88) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/krnl386.exe16/krnl386.exe16.spec | 2 +- dlls/krnl386.exe16/task.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index ddd321cbc31..fe223898127 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -100,7 +100,7 @@ 96 pascal -ret16 FreeLibrary(word) FreeLibrary16 97 pascal -ret16 GetTempFileName(word str word ptr) GetTempFileName16 98 pascal -ret16 GetLastDiskChange() KERNEL_nop -99 stub GetLPErrMode +99 pascal GetLPErrMode() 100 pascal -ret16 ValidateCodeSegments() KERNEL_nop 101 stub NoHookDosCall 102 pascal -register DOS3Call() DOS3Call diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c index 892f4d19f07..30a40328c86 100644 --- a/dlls/krnl386.exe16/task.c +++ b/dlls/krnl386.exe16/task.c @@ -1255,6 +1255,16 @@ WORD WINAPI GetExeVersion16(void) } +/*********************************************************************** + * GetLPErrMode (KERNEL.99) + */ +SEGPTR WINAPI GetLPErrMode(void) +{ + FIXME("(): stub\n"); + return 0; +} + + /*********************************************************************** * SetErrorMode (KERNEL.107) */

1 0

Derek Lesho : kernelbase: Fix parameter order of FindResourceExW call for non-localized path.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 6dfcf590e139f4de8c71376360db0a5f3bfb553a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dfcf590e139f4de8c713763… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Dec 6 10:58:18 2021 +0100 kernelbase: Fix parameter order of FindResourceExW call for non-localized path. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 472763c5237febcb8745835c96f8b49b000564de) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/version.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index d5bfa081939..c66d8f8f792 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -751,8 +751,8 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD r if (!(flags & FILE_VER_GET_LOCALISED)) { LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); - hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO, english ); + hRsrc = FindResourceExW( hModule, (LPWSTR)VS_FILE_INFO, + MAKEINTRESOURCEW(VS_VERSION_INFO), english ); } if (!hRsrc) hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), @@ -857,8 +857,8 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD ignored, if (!(flags & FILE_VER_GET_LOCALISED)) { LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); - hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO, english ); + hRsrc = FindResourceExW( hModule, (LPWSTR)VS_FILE_INFO, + MAKEINTRESOURCEW(VS_VERSION_INFO), english ); } if (!hRsrc) hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO),

1 0

Piotr Caban : vcruntime140_1: Add support for exception separated code segments.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: c2efc7ed8adecdda958f8efdb3b61917887d6ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2efc7ed8adecdda958f8efd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Dec 4 18:15:06 2021 +0100 vcruntime140_1: Add support for exception separated code segments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51396 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9ccd84b945c4935e200becfe08a9a5bdb4799bd5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 62 ++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 12 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index f50847d886d..b29a2baa696 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -74,6 +74,7 @@ typedef struct #define CATCHBLOCK_FLAGS 0x01 #define CATCHBLOCK_TYPE_INFO 0x02 #define CATCHBLOCK_OFFSET 0x04 +#define CATCHBLOCK_SEPARATED 0x08 #define CATCHBLOCK_RET_ADDR_MASK 0x30 #define CATCHBLOCK_RET_ADDR 0x10 #define CATCHBLOCK_TWO_RET_ADDRS 0x20 @@ -219,13 +220,14 @@ static void read_tryblock_info(BYTE **b, tryblock_info *ti, ULONG64 image_base) } } -static BOOL read_catchblock_info(BYTE **b, catchblock_info *ci) +static BOOL read_catchblock_info(BYTE **b, catchblock_info *ci, DWORD func_rva) { BYTE ret_addr_type; memset(ci, 0, sizeof(*ci)); ci->header = **b; (*b)++; - if (ci->header & ~(CATCHBLOCK_FLAGS | CATCHBLOCK_TYPE_INFO | CATCHBLOCK_OFFSET | CATCHBLOCK_RET_ADDR_MASK)) + if (ci->header & ~(CATCHBLOCK_FLAGS | CATCHBLOCK_TYPE_INFO | CATCHBLOCK_OFFSET | + CATCHBLOCK_SEPARATED | CATCHBLOCK_RET_ADDR_MASK)) { FIXME("unknown header: %x\n", ci->header); return FALSE; @@ -241,10 +243,20 @@ static BOOL read_catchblock_info(BYTE **b, catchblock_info *ci) if (ci->header & CATCHBLOCK_TYPE_INFO) ci->type_info = read_rva(b); if (ci->header & CATCHBLOCK_OFFSET) ci->offset = decode_uint(b); ci->handler = read_rva(b); - if (ret_addr_type == CATCHBLOCK_RET_ADDR || ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) - ci->ret_addr[0] = decode_uint(b); - if (ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) - ci->ret_addr[1] = decode_uint(b); + if (ci->header & CATCHBLOCK_SEPARATED) + { + if (ret_addr_type == CATCHBLOCK_RET_ADDR || ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[0] = read_rva(b); + if (ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[1] = read_rva(b); + } + else + { + if (ret_addr_type == CATCHBLOCK_RET_ADDR || ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[0] = decode_uint(b) + func_rva; + if (ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[1] = decode_uint(b) + func_rva; + } return TRUE; } @@ -320,7 +332,8 @@ static BOOL validate_cxx_function_descr4(const cxx_function_descr *descr, DISPAT for (j = 0; j < ti.catchblock_count; j++) { catchblock_info ci; - if (!read_catchblock_info(&catchblock, &ci)) return FALSE; + if (!read_catchblock_info(&catchblock, &ci, + dispatch->FunctionEntry->BeginAddress)) return FALSE; TRACE(" %d: header 0x%x offset %d handler 0x%x(%p) " "ret addr[0] %#x ret_addr[1] %#x type %#x %s\n", j, ci.header, ci.offset, ci.handler, rva_to_ptr(ci.handler, image_base), @@ -614,7 +627,7 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, { catchblock_info ci; - read_catchblock_info(&catchblock, &ci); + read_catchblock_info(&catchblock, &ci, dispatch->FunctionEntry->BeginAddress); if (info) { @@ -652,11 +665,15 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; catch_record.ExceptionInformation[7] = (ULONG_PTR)context; if (ci.ret_addr[0]) + { catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr( - ci.ret_addr[0] + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); + ci.ret_addr[0], dispatch->ImageBase); + } if (ci.ret_addr[1]) + { catch_record.ExceptionInformation[9] = (ULONG_PTR)rva_to_ptr( - ci.ret_addr[1] + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); + ci.ret_addr[1], dispatch->ImageBase); + } RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &ctx, NULL); } } @@ -808,8 +825,9 @@ EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec, rec->ExceptionCode != STATUS_LONGJUMP) return ExceptionContinueSearch; /* handle only c++ exceptions */ - if (descr.header & ~(FUNC_DESCR_IS_CATCH | FUNC_DESCR_UNWIND_MAP | - FUNC_DESCR_TRYBLOCK_MAP | FUNC_DESCR_EHS | FUNC_DESCR_NO_EXCEPT)) + if (descr.header & ~(FUNC_DESCR_IS_CATCH | FUNC_DESCR_IS_SEPARATED | + FUNC_DESCR_UNWIND_MAP | FUNC_DESCR_TRYBLOCK_MAP | FUNC_DESCR_EHS | + FUNC_DESCR_NO_EXCEPT)) { FIXME("unsupported flags: %x\n", descr.header); return ExceptionContinueSearch; @@ -831,6 +849,26 @@ EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec, descr.tryblock_map += count_end - count; } descr.ip_map = read_rva(&p); + if (descr.header & FUNC_DESCR_IS_SEPARATED) + { + UINT i, num, func; + BYTE *map; + + map = rva_to_ptr(descr.ip_map, dispatch->ImageBase); + num = decode_uint(&map); + for (i = 0; i < num; i++) + { + func = read_rva(&map); + descr.ip_map = read_rva(&map); + if (func == dispatch->FunctionEntry->BeginAddress) + break; + } + if (i == num) + { + FIXME("function ip_map not found\n"); + return ExceptionContinueSearch; + } + } count_end = count = rva_to_ptr(descr.ip_map, dispatch->ImageBase); descr.ip_count = decode_uint(&count_end); descr.ip_map += count_end - count;

1 0

Nick Fox : kernel32: Add tests for LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 9288f9e22a554b0424a52edbb977b4571857edee URL: https://source.winehq.org/git/wine.git/?a=commit;h=9288f9e22a554b0424a52edb… Author: Nick Fox <nick(a)foxsec.net> Date: Fri Oct 29 03:16:54 2021 +0000 kernel32: Add tests for LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH. Signed-off-by: Nick Fox <nick(a)foxsec.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85723b920899e5f6482d268379b3536fbd33fbd8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/path.c | 73 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index f49af6d5bfe..86d604f6a96 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2409,10 +2409,12 @@ static void test_SetSearchPathMode(void) static const WCHAR pathW[] = {'P','A','T','H',0}; -static void build_search_path( WCHAR *buffer, UINT size, const WCHAR *dlldir, BOOL safe ) +static void build_search_path( WCHAR *buffer, UINT size, const WCHAR *module, const WCHAR *dlldir, BOOL safe ) { WCHAR *p; - GetModuleFileNameW( NULL, buffer, size ); + + if (module) lstrcpynW( buffer, module, size ); + else GetModuleFileNameW( NULL, buffer, size ); if (!(p = wcsrchr( buffer, '\\' ))) return; *p++ = ';'; if (dlldir) @@ -2471,7 +2473,7 @@ static void test_RtlGetSearchPath(void) GetWindowsDirectoryW( buffer, ARRAY_SIZE(buffer) ); lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetSearchPath( &path ); ok( !ret, "RtlGetSearchPath failed %x\n", ret ); @@ -2479,7 +2481,7 @@ static void test_RtlGetSearchPath(void) pRtlReleasePath( path ); SetEnvironmentVariableA( "PATH", "foo" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetSearchPath( &path ); ok( !ret, "RtlGetSearchPath failed %x\n", ret ); @@ -2489,7 +2491,7 @@ static void test_RtlGetSearchPath(void) if (pSetDllDirectoryW) { ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetSearchPath( &path ); ok( !ret, "RtlGetSearchPath failed %x\n", ret ); @@ -2520,14 +2522,14 @@ static void test_RtlGetExePath(void) lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); SetEnvironmentVariableA( "NoDefaultCurrentDirectoryInExePath", NULL ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, FALSE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); pRtlReleasePath( path ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, FALSE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW + 1, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2536,14 +2538,14 @@ static void test_RtlGetExePath(void) SetEnvironmentVariableA( "NoDefaultCurrentDirectoryInExePath", "yes" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, FALSE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); pRtlReleasePath( path ); - build_search_path( buffer, ARRAY_SIZE(buffer), emptyW, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, emptyW, TRUE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW + 1, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2551,7 +2553,7 @@ static void test_RtlGetExePath(void) pRtlReleasePath( path ); SetEnvironmentVariableA( "PATH", "foo" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, FALSE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2561,7 +2563,7 @@ static void test_RtlGetExePath(void) if (pSetDllDirectoryW) { ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, FALSE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2589,7 +2591,7 @@ static void test_LdrGetDllPath(void) GetWindowsDirectoryW( buffer, ARRAY_SIZE(buffer) ); lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); path = unknown_ptr = (WCHAR *)0xdeadbeef; ret = pLdrGetDllPath( 0, 0, &path, &unknown_ptr ); @@ -2599,7 +2601,7 @@ static void test_LdrGetDllPath(void) pRtlReleasePath( path ); SetEnvironmentVariableA( "PATH", "foo" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); ret = pLdrGetDllPath( 0, 0, &path, &unknown_ptr ); ok( !ret, "LdrGetDllPath failed %x\n", ret ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); @@ -2609,7 +2611,7 @@ static void test_LdrGetDllPath(void) if (pSetDllDirectoryW) { ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); - build_search_path( buffer, ARRAY_SIZE(buffer), dlldir, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, dlldir, TRUE ); ret = pLdrGetDllPath( 0, 0, &path, &unknown_ptr ); ok( !ret, "LdrGetDllPath failed %x\n", ret ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); @@ -2654,6 +2656,49 @@ static void test_LdrGetDllPath(void) ok( !lstrcmpW( path, L"\\\\?\\c:" ), "got %s expected \\\\?\\c:\n", wine_dbgstr_w(path)); pRtlReleasePath( path ); + ret = pLdrGetDllPath( fooW, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + todo_wine + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + ret = pLdrGetDllPath( L"temp/foo", LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + todo_wine + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + ret = pLdrGetDllPath( L".\\foo\\foobar", LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( buffer, ARRAY_SIZE(buffer), L".\\foo\\foobar", NULL, TRUE ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + ret = pLdrGetDllPath( L"temp\\foo", LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( buffer, ARRAY_SIZE(buffer), L"temp\\foo", NULL, TRUE ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + ret = pLdrGetDllPath( L"c:\\temp\\foo", LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( buffer, ARRAY_SIZE(buffer), L"c:\\temp\\foo", NULL, TRUE ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); + ok( ret == STATUS_INVALID_PARAMETER, "got %x expected %x\n", ret, STATUS_INVALID_PARAMETER ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + pRtlReleasePath( path ); + lstrcpyW( buffer, dlldir ); p = buffer + lstrlenW(buffer); *p++ = '\\';

1 0

Nick Fox : ntdll: Fix LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH without a path.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: c133264b69f1c026052338b62aa6e0dfbede2c03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c133264b69f1c026052338b6… Author: Nick Fox <nick(a)foxsec.net> Date: Fri Oct 29 03:17:03 2021 +0000 ntdll: Fix LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH without a path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26350 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51821 Signed-off-by: Nick Fox <nick(a)foxsec.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ef26f7bd5cf36806f7b465dc1942ab6a2e0541b9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/path.c | 2 -- dlls/ntdll/loader.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 86d604f6a96..2955be0da9c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2659,7 +2659,6 @@ static void test_LdrGetDllPath(void) ret = pLdrGetDllPath( fooW, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); ok( !ret, "LdrGetDllPath failed %x\n", ret ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); - todo_wine build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); pRtlReleasePath( path ); @@ -2667,7 +2666,6 @@ static void test_LdrGetDllPath(void) ret = pLdrGetDllPath( L"temp/foo", LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); ok( !ret, "LdrGetDllPath failed %x\n", ret ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); - todo_wine build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); pRtlReleasePath( path ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 35527119eae..d10d126eb41 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3829,7 +3829,7 @@ NTSTATUS WINAPI LdrGetDllPath( PCWSTR module, ULONG flags, PWSTR *path, PWSTR *u else { const WCHAR *dlldir = dll_directory.Length ? dll_directory.Buffer : NULL; - if (!(flags & LOAD_WITH_ALTERED_SEARCH_PATH)) + if (!(flags & LOAD_WITH_ALTERED_SEARCH_PATH) || !wcschr( module, L'\\' )) module = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; status = get_dll_load_path( module, dlldir, dll_safe_mode, path ); }

1 0

Zhiyi Zhang : comctl32/button: Support image list margin for buttons with BS_CENTER or BS_VCENTER.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: d0b9ab2b91bc202df03691efa479fd8100b18914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0b9ab2b91bc202df03691ef… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Dec 9 16:13:13 2021 +0800 comctl32/button: Support image list margin for buttons with BS_CENTER or BS_VCENTER. WinSCP uses image list margin to adjust image position on a button when theming is on. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52076 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit feb0b73a3c7281dee923cdcfb5ebf4ae954cdc7b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/button.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 67bf5ceae48..5e16fdb0e08 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1125,7 +1125,10 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe switch (style & BS_CENTER) { case BS_CENTER: - innerRect->left = outerRect->left + (outerRect->right - outerRect->left - width) / 2; + /* The left and right margins are added to the inner rectangle to get a new rectangle. Then + * the new rectangle is adjusted to be in the horizontal center */ + innerRect->left = outerRect->left + (outerRect->right - outerRect->left - width + + margin->left - margin->right) / 2; innerRect->right = innerRect->left + width; break; case BS_RIGHT: @@ -1151,7 +1154,10 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe break; case BS_VCENTER: default: - innerRect->top = outerRect->top + (outerRect->bottom - outerRect->top - height) / 2; + /* The top and bottom margins are added to the inner rectangle to get a new rectangle. Then + * the new rectangle is adjusted to be in the vertical center */ + innerRect->top = outerRect->top + (outerRect->bottom - outerRect->top - height + + margin->top - margin->bottom) / 2; innerRect->bottom = innerRect->top + height; break; }

1 0

Alexandros Frantzis : win32u: Avoid iterating over a NULL window list when broadcasting.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 4f705f6f62185de6fa78b88b0aaec554a0fbf0de URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f705f6f62185de6fa78b88b… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 11 12:53:50 2022 +0300 win32u: Avoid iterating over a NULL window list when broadcasting. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/message.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 46c42188d70..9479595ae53 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2508,9 +2508,11 @@ static BOOL is_message_broadcastable( UINT msg ) */ static BOOL broadcast_message( struct send_message_info *info, DWORD_PTR *res_ptr ) { - if (is_message_broadcastable( info->msg )) + HWND *list; + + if (is_message_broadcastable( info->msg ) && + (list = list_window_children( 0, get_desktop_window(), NULL, 0 ))) { - HWND *list = list_window_children( 0, get_desktop_window(), NULL, 0 ); int i; for (i = 0; list[i]; i++)

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 5fc32a204d6e2590619e194d412d81d559eec1d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fc32a204d6e2590619e194d… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Apr 11 16:52:31 2022 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 54 +++++++++++++++--------------------------------------- 1 file changed, 15 insertions(+), 39 deletions(-) diff --git a/po/de.po b/po/de.po index 596eb9974c9..ad81f08de43 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-01-10 13:49+0200\n" +"PO-Revision-Date: 2022-04-11 16:51+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -3981,13 +3981,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "Zyklischer __proto__-Wert" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "Eigenschaft '|' kann nicht definiert werden: Objekt nicht erweiterbar" +msgstr "Eigenschaft für nicht-erweiterbares Objekt kann nicht angelegt werden" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -7014,54 +7012,40 @@ msgid "This network connection does not exist.\n" msgstr "Diese Netzwerkverbindung existiert nicht.\n" #: dlls/kernelbase/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "Ungültig während eines Interrupts.\n" +msgstr "Aufruf unterbrochen.\n" #: dlls/kernelbase/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "Ungültiges Handle.\n" +msgstr "Ungültiges Dateihandle.\n" #: dlls/kernelbase/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "Ungültige Netzwerkadresse.\n" +msgstr "Ungültige Zeigeradresse.\n" #: dlls/kernelbase/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "Ungültiger Name.\n" +msgstr "Ungültiges Argument.\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Verbindung von Gegenstelle zurückgesetzt.\n" #: dlls/kernelbase/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "Punkt nicht gefunden.\n" +msgstr "Host nicht gefunden.\n" #: dlls/kernelbase/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "Attribut nicht gefunden.\n" +msgstr "Nicht-authoritativer Host nicht gefunden.\n" #: dlls/kernelbase/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "Nicht ausgleichbarer Fehler aufgetreten.\n" +msgstr "Unausgleichbarer Fehler.\n" #: dlls/kernelbase/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "Name gültig, kein Datensatz.\n" #: dlls/kernelbase/winerror.mc:3817 msgid "Not implemented.\n" @@ -11042,18 +11026,14 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) Stadt Buenos Aires" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turks And Caicos Standard Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" -msgstr "Turks- und Caicosinseln Normalzeit" +msgstr "Turks-, Caicosinseln Normalzeit" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turks And Caicos Daylight Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" -msgstr "Turks- und Caicosinseln Sommerzeit" +msgstr "Turks-, Caicosinseln Sommerzeit" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" @@ -11647,18 +11627,14 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) Moskau, St. Petersburg" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Aus Central W. Standard Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" -msgstr "West-Zentralaustralische Normalzeit" +msgstr "West-Zentralaustr. Normalzeit" #: dlls/tzres/tzres.rc:64 -#, fuzzy -#| msgid "Aus Central W. Daylight Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" -msgstr "West-Zentralaustralische Sommerzeit" +msgstr "West-Zentralaustr. Sommerzeit" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla"

1 0

Huw Davies : wineoss: Explicitly store the channel count in the client.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 9ff920cdd9b4bb07eb0c7f5f8f33c21a3a644eac URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ff920cdd9b4bb07eb0c7f5f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 6 07:55:51 2022 +0100 wineoss: Explicitly store the channel count in the client. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index fd35a439c5a..5b6addef0f7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -117,6 +117,7 @@ struct ACImpl { AUDCLNT_SHAREMODE share; HANDLE event; float *vols; + UINT32 channel_count; int fd; oss_audioinfo ai; @@ -970,7 +971,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return E_OUTOFMEMORY; } - This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); + This->channel_count = fmt->nChannels; + This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ CoTaskMemFree(This->fmt); This->fmt = NULL; @@ -979,14 +981,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return E_OUTOFMEMORY; } - for(i = 0; i < fmt->nChannels; ++i) + for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; This->share = mode; This->flags = flags; This->oss_bufsize_bytes = 0; - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, + hr = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); if(FAILED(hr)){ HeapFree(GetProcessHeap(), 0, This->vols); @@ -2674,7 +2676,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelCount( if(!out) return E_POINTER; - *out = This->fmt->nChannels; + *out = This->channel_count; return S_OK; } @@ -2689,7 +2691,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(level < 0.f || level > 1.f) return E_INVALIDARG; - if(index >= This->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; EnterCriticalSection(&This->lock); @@ -2713,7 +2715,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if(!level) return E_POINTER; - if(index >= This->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; *level = This->vols[index]; @@ -2732,7 +2734,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; EnterCriticalSection(&This->lock); @@ -2758,7 +2760,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; EnterCriticalSection(&This->lock);

1 0