wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Rafał Harabień : ntdll/tests: Test getting/setting x86_64 context of x86 processes in wine64.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: bee9f0126fe43359b87b2d9fc2c1e2577ebda4c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bee9f0126fe43359b87b2d9f… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Mon Mar 1 00:42:27 2021 +0100 ntdll/tests: Test getting/setting x86_64 context of x86 processes in wine64. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8418f925565..75765bee5a0 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5816,6 +5816,120 @@ static void test_debug_registers(void) CloseHandle(thread); } +#if defined(__x86_64__) + +static void test_debug_registers_wow64(void) +{ + char cmdline[] = "C:\\windows\\syswow64\\notepad.exe"; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + WOW64_CONTEXT wow64_ctx; + CONTEXT ctx; + BOOL is_wow64; + NTSTATUS ret; + BOOL bret; + + si.cb = sizeof(si); + bret = CreateProcessA(cmdline, NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(bret, "CreateProcessA failed\n"); + + bret = pIsWow64Process(pi.hProcess, &is_wow64); + ok(bret && is_wow64, "expected Wow64 process\n"); + + SuspendThread(pi.hThread); + + ZeroMemory(&ctx, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_ALL; + bret = GetThreadContext(pi.hThread, &ctx); + todo_wine + ok(bret, "GetThreadContext failed\n"); + + ctx.Dr0 = 0x12340000; + ctx.Dr1 = 0x12340001; + ctx.Dr2 = 0x12340002; + ctx.Dr3 = 0x12340003; + ctx.Dr7 = 0x155; /* enable all breakpoints (local) */ + bret = SetThreadContext(pi.hThread, &ctx); + todo_wine + ok(bret, "SetThreadContext failed\n"); + + if (bret) { + ZeroMemory(&ctx, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_ALL; + bret = GetThreadContext(pi.hThread, &ctx); + todo_wine + ok(bret, "GetThreadContext failed\n"); + if (bret) + { + ok(ctx.Dr0 == 0x12340000, "expected 0x12340000, got %lx\n", ctx.Dr0); + ok(ctx.Dr1 == 0x12340001, "expected 0x12340001, got %lx\n", ctx.Dr1); + ok(ctx.Dr2 == 0x12340002, "expected 0x12340002, got %lx\n", ctx.Dr2); + ok(ctx.Dr3 == 0x12340003, "expected 0x12340003, got %lx\n", ctx.Dr3); + ok(ctx.Dr7 == 0x155, "expected 0x155, got %lx\n", ctx.Dr7); + } + + ZeroMemory(&wow64_ctx, sizeof(wow64_ctx)); + wow64_ctx.ContextFlags = WOW64_CONTEXT_ALL; + ret = pRtlWow64GetThreadContext(pi.hThread, &wow64_ctx); + ok(ret == STATUS_SUCCESS, "Wow64GetThreadContext failed with %lx\n", ret); + if (ret == STATUS_SUCCESS) + { + ok(wow64_ctx.Dr0 == 0x12340000, "expected 0x12340000, got %lx\n", wow64_ctx.Dr0); + ok(wow64_ctx.Dr1 == 0x12340001, "expected 0x12340001, got %lx\n", wow64_ctx.Dr1); + ok(wow64_ctx.Dr2 == 0x12340002, "expected 0x12340002, got %lx\n", wow64_ctx.Dr2); + ok(wow64_ctx.Dr3 == 0x12340003, "expected 0x12340003, got %lx\n", wow64_ctx.Dr3); + ok(wow64_ctx.Dr7 == 0x155, "expected 0x155, got %lx\n", wow64_ctx.Dr7); + } + } + + wow64_ctx.Dr0 = 0x56780000; + wow64_ctx.Dr1 = 0x56780001; + wow64_ctx.Dr2 = 0x56780002; + wow64_ctx.Dr3 = 0x56780003; + wow64_ctx.Dr7 = 0x101; /* enable only the first breakpoint */ + ret = pRtlWow64SetThreadContext(pi.hThread, &wow64_ctx); + ok(ret == STATUS_SUCCESS, "Wow64SetThreadContext failed with %lx\n", ret); + + ZeroMemory(&wow64_ctx, sizeof(wow64_ctx)); + wow64_ctx.ContextFlags = WOW64_CONTEXT_ALL; + ret = pRtlWow64GetThreadContext(pi.hThread, &wow64_ctx); + ok(ret == STATUS_SUCCESS, "Wow64GetThreadContext failed with %lx\n", ret); + if (ret == STATUS_SUCCESS) + { + todo_wine + ok(wow64_ctx.Dr0 == 0x56780000, "expected 0x56780000, got %lx\n", wow64_ctx.Dr0); + todo_wine + ok(wow64_ctx.Dr1 == 0x56780001, "expected 0x56780001, got %lx\n", wow64_ctx.Dr1); + todo_wine + ok(wow64_ctx.Dr2 == 0x56780002, "expected 0x56780002, got %lx\n", wow64_ctx.Dr2); + todo_wine + ok(wow64_ctx.Dr3 == 0x56780003, "expected 0x56780003, got %lx\n", wow64_ctx.Dr3); + todo_wine + ok(wow64_ctx.Dr7 == 0x101, "expected 0x101, got %lx\n", wow64_ctx.Dr7); + } + + ZeroMemory(&ctx, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_ALL; + bret = GetThreadContext(pi.hThread, &ctx); + todo_wine + ok(bret, "GetThreadContext failed\n"); + if (bret) + { + ok(ctx.Dr0 == 0x56780000, "expected 0x56780000, got %lx\n", ctx.Dr0); + ok(ctx.Dr1 == 0x56780001, "expected 0x56780001, got %lx\n", ctx.Dr1); + ok(ctx.Dr2 == 0x56780002, "expected 0x56780002, got %lx\n", ctx.Dr2); + ok(ctx.Dr3 == 0x56780003, "expected 0x56780003, got %lx\n", ctx.Dr3); + ok(ctx.Dr7 == 0x101, "expected 0x101, got %lx\n", ctx.Dr7); + } + + ResumeThread(pi.hThread); + TerminateProcess(pi.hProcess, 0); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + +#endif + static DWORD debug_service_exceptions; static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) @@ -8314,6 +8428,7 @@ START_TEST(exception) test_rtlraiseexception(); test_debug_registers(); + test_debug_registers_wow64(); test_debug_service(1); test_virtual_unwind(); test___C_specific_handler();

1 0

Rémi Bernon : ntdll: Initialize mountmgr_unix_drive before NtDeviceIoControlFile (valgrind).
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 0eb3258a69fa168b2f9e0d44762261a150fc0ca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eb3258a69fa168b2f9e0d44… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 8 09:14:20 2021 +0100 ntdll: Initialize mountmgr_unix_drive before NtDeviceIoControlFile (valgrind). Syscall param writev(vector[...]) points to uninitialised byte(s) at 0x4189DA3: writev (writev.c:26) by 0x46A5A1B: send_request (server.c:213) by 0x46A5A1B: server_call_unlocked (server.c:273) by 0x46CA54F: virtual_locked_server_call (virtual.c:2993) by 0x4681C9A: server_ioctl_file (file.c:4789) by 0x468B326: NtDeviceIoControlFile (file.c:5620) by 0x468B7AF: get_mountmgr_fs_info (file.c:1986) by 0x468B7AF: get_mountmgr_fs_info (file.c:1955) by 0x468FCBB: NtQueryVolumeInformationFile (file.c:6483) by 0x4677E88: __wine_syscall_dispatcher_xsave (in /home/rbernon/Code/build-wine/wine64/dlls/ntdll/ntdll.so) by 0x7BC0DEB3: NtQueryVolumeInformationFile (in /home/rbernon/Code/build-wine/wine64/dlls/ntdll/ntdll.dll) by 0x7B01F127: GetFileInformationByHandle (file.c:2938) by 0x7096A5C3: _fstat64 (file.c:1791) by 0x7096A941: _fstat64i32 (file.c:1877) Address 0x7ffffe30e520 is in a rw- anonymous segment Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c169b49343f..233778df3b2 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1963,13 +1963,13 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni letter = find_dos_device( unix_name ); free( unix_name ); + memset( drive, 0, sizeof(*drive) ); if (letter == -1) { struct stat st; fstat( fd, &st ); drive->unix_dev = st.st_rdev ? st.st_rdev : st.st_dev; - drive->letter = 0; } else drive->letter = 'a' + letter;

1 0

Rémi Bernon : ntdll: Fix environment memcpy read overflow (valgrind).
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: f69e5478d5f5ca2201fd9115b34afc95c3f00187 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f69e5478d5f5ca2201fd9115… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 8 09:14:19 2021 +0100 ntdll: Fix environment memcpy read overflow (valgrind). Invalid read of size 1 at 0x7BC5C5E3: memcpy (string.c:109) by 0x7BC267F7: RtlCreateProcessParametersEx (env.c:785) by 0x7B04EB57: create_process_params (process.c:183) by 0x7B04EB57: CreateProcessInternalW (process.c:544) by 0x7B0508E3: CreateProcessW (process.c:668) by 0x403B1E: runCmd (wineboot.c:1055) by 0x403B1E: process_run_key (wineboot.c:1126) by 0x404228: ProcessRunKeys (wineboot.c:1159) by 0x406DB1: main (wineboot.c:1707) Address 0x7ffffe00331a is 0 bytes after a recently re-allocated block of size 12,074 alloc'd at 0x7BC2D209: notify_alloc (heap.c:260) by 0x7BC2D209: RtlAllocateHeap (heap.c:1713) by 0x7BC25BAC: RtlSetEnvironmentVariable (env.c:515) by 0x7BC25EE0: set_env_var (env.c:61) by 0x7BC26C37: set_wow64_environment (env.c:228) by 0x7BC26C37: init_user_process_params (env.c:891) by 0x7BC3B01B: process_init (loader.c:3991) by 0x7BC3CD24: __wine_set_unix_funcs (loader.c:4095) by 0x469604E: start_main_thread (loader.c:1752) by 0x469604E: __wine_main (loader.c:2083) by 0x7D001231: main (main.c:157) Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index a18d1446db4..75ea2ebbb45 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -762,14 +762,13 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu + ROUND_SIZE( ShellInfo->MaximumLength ) + ROUND_SIZE( RuntimeInfo->MaximumLength )); - env_size = ROUND_SIZE( env_size ); - if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + env_size ))) + if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + ROUND_SIZE( env_size ) ))) { RTL_USER_PROCESS_PARAMETERS *params = ptr; params->AllocationSize = size; params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; - params->EnvironmentSize = env_size; + params->EnvironmentSize = ROUND_SIZE( env_size ); if (cur_params) params->ConsoleFlags = cur_params->ConsoleFlags; /* all other fields are zero */

1 0

Rémi Bernon : ntdll: Initialize dbg_offset and dbg_size (valgrind).
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: c3c4d0c37e41fef27ae06cf6784c873d6f9b68d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c4d0c37e41fef27ae06cf6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 8 09:14:18 2021 +0100 ntdll: Initialize dbg_offset and dbg_size (valgrind). Syscall param writev(vector[...]) points to uninitialised byte(s) at 0x4189DA3: writev (writev.c:26) by 0x46A5A0B: send_request (server.c:213) by 0x46A5A0B: server_call_unlocked (server.c:273) by 0x46A5B4F: wine_server_call (server.c:289) by 0x46C996A: virtual_create_builtin_view (virtual.c:2524) by 0x4692CB4: dlopen_dll (loader.c:1133) by 0x46931CA: open_builtin_file (loader.c:1373) by 0x46931CA: open_builtin_file (loader.c:1354) by 0x4694559: load_builtin_dll (loader.c:1457) by 0x7BC375F2: load_builtin_dll (loader.c:2348) by 0x7BC38369: load_dll (loader.c:2705) by 0x7BC39E46: import_dll (loader.c:782) by 0x7BC36CEC: fixup_imports (loader.c:1138) by 0x7BC3BE4B: LdrInitializeThunk (loader.c:3454) Address 0x32e390 is on thread 1's stack in frame #5, created by open_builtin_file (loader.c:1357) Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 6adf4bb5b00..1c26d1322f8 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1068,6 +1068,8 @@ static void fill_builtin_image_info( void *module, pe_image_info_t *info ) info->header_size = nt->OptionalHeader.SizeOfHeaders; info->file_size = nt->OptionalHeader.SizeOfImage; info->checksum = nt->OptionalHeader.CheckSum; + info->dbg_offset = 0; + info->dbg_size = 0; info->cpu = client_cpu; info->__pad = 0; }

1 0

Rémi Bernon : winex11.drv: Fix invalid range when reading GTK_WORKAREAS_D0 (valgrind).
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 99088fe17b4ea6c627a8c3d377c39bd48c68ccef URL: https://source.winehq.org/git/wine.git/?a=commit;h=99088fe17b4ea6c627a8c3d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 8 09:14:22 2021 +0100 winex11.drv: Fix invalid range when reading GTK_WORKAREAS_D0 (valgrind). Invalid read of size 8 at 0x559B816: get_work_area (display.c:296) by 0x55DC8C1: query_screens (xinerama.c:103) by 0x55DC8C1: xinerama_init (xinerama.c:275) by 0x55D6F47: process_attach (x11drv_main.c:602) by 0x55D6F47: DllMain (x11drv_main.c:721) by 0x7BC35819: call_dll_entry_point (loader.c:285) by 0x7BC35819: MODULE_InitDLL (loader.c:1317) by 0x7BC362ED: process_attach.part.0 (loader.c:1411) by 0x7BC3B843: process_attach (loader.c:1382) by 0x7BC3B843: LdrLoadDll (loader.c:2765) by 0x7B025C85: load_library (loader.c:172) by 0x7B026B72: LoadLibraryExW (loader.c:522) by 0x7B026BE5: LoadLibraryW (loader.c:492) by 0x40990D: load_graphics_driver (desktop.c:844) by 0x40990D: manage_desktop (desktop.c:1010) by 0x40C6B3: parse_command_line (explorer.c:836) by 0x40C6B3: wWinMain (explorer.c:865) by 0x4103F2: wmain (crt_wwinmain.c:55) Address 0x5272370 is 16 bytes before an unallocated block of size 3,132,512 in arena "client" Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 0f61f9f7b2e..b647455a01f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -289,9 +289,9 @@ RECT get_work_area(const RECT *monitor_rect) x11drv_atom(_GTK_WORKAREAS_D0), 0, ~0, False, XA_CARDINAL, &type, &format, &count, &remaining, (unsigned char **)&work_area)) { - if (type == XA_CARDINAL && format == 32 && count >= 4) + if (type == XA_CARDINAL && format == 32) { - for (i = 0; i + 3 < count; i += 4) + for (i = 0; i < count / 4; ++i) { work_rect.left = work_area[i * 4]; work_rect.top = work_area[i * 4 + 1];

1 0

Paul Gofman : kernel32/tests: Add tests for {Get|Set}UserDefaultGeoName().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 9396d3b3426f9db908ff7ee0bd7e1c3911881c6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9396d3b3426f9db908ff7ee0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 8 19:34:40 2021 +0300 kernel32/tests: Add tests for {Get|Set}UserDefaultGeoName(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 215 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9396d3b3426f9db908ff…

1 0

Paul Gofman : kernel32: Implement SetUserGeoName().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: a430a69f8ba5372e478b8dd463f1347b6c35c38e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a430a69f8ba5372e478b8dd4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 8 19:34:39 2021 +0300 kernel32: Implement SetUserGeoName(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/locale.c | 46 +++++++++++++++++++++++++++++++++++++++++ include/winnls.h | 1 + 4 files changed, 49 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5dee1d9b906..0eb66a0e3b0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1482,6 +1482,7 @@ @ stdcall -arch=x86_64 SetUmsThreadInformation(ptr long ptr long) @ stdcall -import SetUnhandledExceptionFilter(ptr) @ stdcall -import SetUserGeoID(long) +@ stdcall -import SetUserGeoName(wstr) @ stub SetVDMCurrentDirectories @ stdcall SetVolumeLabelA(str str) @ stdcall SetVolumeLabelW(wstr wstr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index a0cd5f82a18..08a2f726817 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1509,6 +1509,7 @@ @ stdcall SetTokenInformation(long long ptr long) @ stdcall SetUnhandledExceptionFilter(ptr) @ stdcall SetUserGeoID(long) +@ stdcall SetUserGeoName(wstr) @ stdcall SetWaitableTimer(long ptr long ptr ptr long) @ stdcall SetWaitableTimerEx(long ptr long ptr ptr ptr long) @ stdcall -arch=i386,x86_64 SetXStateFeaturesMask(ptr int64) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 7126dc74d01..24e8cd3f338 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5927,3 +5927,49 @@ INT WINAPI GetUserDefaultGeoName(LPWSTR geo_name, int count) lstrcpyW( geo_name, buffer ); return size; } + + +/*********************************************************************** + * SetUserDefaultGeoName (kernelbase.@) + */ +BOOL WINAPI SetUserGeoName(PWSTR geo_name) +{ + unsigned int i; + WCHAR *endptr; + int uncode; + + TRACE( "geo_name %s.\n", debugstr_w( geo_name )); + + if (!geo_name) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (lstrlenW( geo_name ) == 3) + { + uncode = wcstol( geo_name, &endptr, 10 ); + if (!uncode || endptr != geo_name + 3) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + for (i = 0; i < ARRAY_SIZE(geoinfodata); ++i) + if (geoinfodata[i].uncode == uncode) + break; + } + else + { + if (!lstrcmpiW( geo_name, L"XX" )) + return SetUserGeoID( 39070 ); + for (i = 0; i < ARRAY_SIZE(geoinfodata); ++i) + if (!lstrcmpiW( geo_name, geoinfodata[i].iso2W )) + break; + } + if (i == ARRAY_SIZE(geoinfodata)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + return SetUserGeoID( geoinfodata[i].id ); +} diff --git a/include/winnls.h b/include/winnls.h index 04838cfa8d7..4b1323cc694 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -983,6 +983,7 @@ WINBASEAPI BOOL WINAPI SetThreadLocale(LCID); WINBASEAPI BOOL WINAPI SetThreadPreferredUILanguages(DWORD,PCZZWSTR,PULONG); WINBASEAPI LANGID WINAPI SetThreadUILanguage(LANGID); WINBASEAPI BOOL WINAPI SetUserGeoID(GEOID); +WINBASEAPI BOOL WINAPI SetUserGeoName(PWSTR); WINBASEAPI INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL); WINBASEAPI INT WINAPI FindNLSStringEx(const WCHAR *,DWORD,const WCHAR *,INT,const WCHAR *,INT,INT *,NLSVERSIONINFO *,void *,LPARAM);

1 0

Paul Gofman : kernel32: Implement GetUserDefaultGeoName().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: e610a56734f72f114c2233efc65c93f9223db358 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e610a56734f72f114c2233ef… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 8 19:34:38 2021 +0300 kernel32: Implement GetUserDefaultGeoName(). Fixes crash on launch in Outriders demo. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/locale.c | 50 +++++++++++++++++++++++++++++++++++++++++ include/winnls.h | 1 + 4 files changed, 53 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ee2e3f8ad31..5dee1d9b906 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -763,6 +763,7 @@ @ stdcall -import GetOEMCP() @ stdcall -import GetOverlappedResult(long ptr ptr long) @ stdcall -import GetOverlappedResultEx(long ptr ptr long long) +@ stdcall -import GetUserDefaultGeoName(ptr long) @ stdcall -import GetUserPreferredUILanguages(long ptr ptr ptr) @ stdcall GetPackageFamilyName(long ptr ptr) kernelbase.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernelbase.GetPackageFullName diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 543961d2ce6..a0cd5f82a18 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -741,6 +741,7 @@ @ stub GetUILanguageInfo # @ stub GetUnicodeStringToEightBitSizeRoutine # @ stub GetUnicodeStringToEightBitStringRoutine +@ stdcall GetUserDefaultGeoName(ptr long) @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() @ stdcall GetUserDefaultLocaleName(ptr long) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index b746feca639..7126dc74d01 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5740,6 +5740,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetUserGeoID( GEOID id ) const WCHAR *name = geoinfo->kind == LOCATION_NATION ? L"Nation" : L"Region"; swprintf( bufferW, ARRAY_SIZE(bufferW), L"%u", geoinfo->id ); RegSetValueExW( hkey, name, 0, REG_SZ, (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) ); + + if (geoinfo->kind == LOCATION_NATION || geoinfo->kind == LOCATION_BOTH) + lstrcpyW( bufferW, geoinfo->iso2W ); + else + swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03u", geoinfo->uncode ); + RegSetValueExW( hkey, L"Name", 0, REG_SZ, (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) ); RegCloseKey( hkey ); } return TRUE; @@ -5877,3 +5883,47 @@ INT WINAPI DECLSPEC_HOTPATCH WideCharToMultiByte( UINT codepage, DWORD flags, LP TRACE( "cp %d %s -> %s, ret = %d\n", codepage, debugstr_wn(src, srclen), debugstr_an(dst, ret), ret ); return ret; } + + +/*********************************************************************** + * GetUserDefaultGeoName (kernelbase.@) + */ +INT WINAPI GetUserDefaultGeoName(LPWSTR geo_name, int count) +{ + const struct geoinfo *geoinfo; + WCHAR buffer[32]; + LSTATUS status; + DWORD size; + HKEY key; + + TRACE( "geo_name %p, count %d.\n", geo_name, count ); + + if (count && !geo_name) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (!(status = RegOpenKeyExW( intl_key, L"Geo", 0, KEY_ALL_ACCESS, &key ))) + { + size = sizeof(buffer); + status = RegQueryValueExW( key, L"Name", NULL, NULL, (BYTE *)buffer, &size ); + RegCloseKey( key ); + } + if (status) + { + if ((geoinfo = get_geoinfo_ptr( GetUserGeoID( GEOCLASS_NATION ))) && geoinfo->id != 39070) + lstrcpyW( buffer, geoinfo->iso2W ); + else + lstrcpyW( buffer, L"001" ); + } + size = lstrlenW( buffer ) + 1; + if (count < size) + { + if (!count) + return size; + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + lstrcpyW( geo_name, buffer ); + return size; +} diff --git a/include/winnls.h b/include/winnls.h index 07a31cfde88..04838cfa8d7 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -946,6 +946,7 @@ WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); #define GetTimeFormat WINELIB_NAME_AW(GetTimeFormat) +WINBASEAPI INT WINAPI GetUserDefaultGeoName(LPWSTR,int); WINBASEAPI LANGID WINAPI GetUserDefaultLangID(void); WINBASEAPI LCID WINAPI GetUserDefaultLCID(void); WINBASEAPI INT WINAPI GetUserDefaultLocaleName(LPWSTR,int);

1 0

Gijs Vermeulen : kernelbase: Support FileRenameInfo in SetFileInformationByHandle.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 5c86b9f1dc56927d8e69f84d410596b786ed8c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c86b9f1dc56927d8e69f84d… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 6 18:30:37 2021 +0100 kernelbase: Support FileRenameInfo in SetFileInformationByHandle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50756 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index abfdade04ed..765bb41ab98 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3526,7 +3526,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO switch (class) { case FileNameInfo: - case FileRenameInfo: case FileAllocationInfo: case FileStreamInfo: case FileIdBothDirectoryInfo: @@ -3554,6 +3553,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO case FileIoPriorityHintInfo: status = NtSetInformationFile( file, &io, info, size, FileIoPriorityHintInformation ); break; + case FileRenameInfo: + status = NtSetInformationFile( file, &io, info, size, FileRenameInformation ); + break; case FileStandardInfo: case FileCompressionInfo: case FileAttributeTagInfo:

1 0

Roman Pišl : ntdll: Don't set error status if volume serial number is missing.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: dabba3cc86aa3ba6e7ba1d0863fb378828fef9f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dabba3cc86aa3ba6e7ba1d08… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Mar 7 11:50:11 2021 +0100 ntdll: Don't set error status if volume serial number is missing. Fixes regression from b14eee69c7240658252bc96b6302e98948f2c62c. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50781 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index bcaf03a2d02..c169b49343f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4108,7 +4108,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, FILE_ID_INFORMATION *info = ptr; info->VolumeSerialNumber = 0; - if (!(io->u.Status = get_mountmgr_fs_info( handle, fd, &drive, sizeof(drive) ))) + if (!get_mountmgr_fs_info( handle, fd, &drive, sizeof(drive) )) info->VolumeSerialNumber = drive.serial; memset( &info->FileId, 0, sizeof(info->FileId) ); *(ULONGLONG *)&info->FileId = st.st_ino;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021