- Wine-Devel - list.winehq.org

[PATCH] ntoskrnl.exe: Implement PsGetCurrentProcessSessionId
by Alistair Leslie-Hughes Aug. 27, 2021

Aug. 27, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36887 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f1248300683..5c3a42c3d76 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3008,6 +3008,13 @@ HANDLE WINAPI PsGetCurrentProcessId(void) return KeGetCurrentThread()->id.UniqueProcess; } +/*********************************************************************** + * PsGetCurrentProcessSessionId (NTOSKRNL.EXE.@) + */ +ULONG WINAPI PsGetCurrentProcessSessionId(void) +{ + return PsGetCurrentProcess()->info.PebBaseAddress->SessionId; +} /*********************************************************************** * PsGetCurrentThreadId (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 071dae6ceca..0208e2f633f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -888,7 +888,7 @@ @ stub PsGetContextThread @ stdcall PsGetCurrentProcess() IoGetCurrentProcess @ stdcall PsGetCurrentProcessId() -@ stub PsGetCurrentProcessSessionId +@ stdcall PsGetCurrentProcessSessionId() @ stdcall PsGetCurrentThread() KeGetCurrentThread @ stdcall PsGetCurrentThreadId() @ stub PsGetCurrentThreadPreviousMode -- 2.32.0

1 0

[PATCH] cmd: Ensure new volume label is null-terminated (Coverity)
by Alex Henrie Aug. 27, 2021

Aug. 27, 2021

The command `echo | wine cmd /k 'label c:'` causes WCMD_ReadFile to return the single character '\n' without a null terminator, which would then cause garbage to be written to ~/.wine/drive_c/.windows-label. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c7df724ae00..62ace7510a1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4716,8 +4716,8 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) if (set_label) { WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); + string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (count > 1) { - string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ } if (*path) { -- 2.33.0

1 0

[PATCH] user32: Load libpng in DllMain.
by Tim Clem Aug. 26, 2021

Aug. 26, 2021

libpng is currently loaded on the first attempt to access a PNG icon or cursor. That creates a race condition that can deadlock the loader in certain circumstances if LoadIcon or LoadCursor is called while while the loader lock is held, e.g. from a DllMain. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- It's possible for one thread to win the INIT_ONCE to load libpng without owning the loader lock. If the thread with the loader lock happens to try to load libpng shortly thereafter, they deadlock. All of Wine's built-in icon resources are PNGs, so we almost always end up loading libpng anyway. Doing it up-front in user32's DllMain ensures that it's done while the loader lock is held and prevents the issue. dlls/user32/cursoricon.c | 21 +++------------------ dlls/user32/png.c | 4 ++-- dlls/user32/user_main.c | 6 +++++- dlls/user32/user_private.h | 3 +++ 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7ad0a04a551..dc831db9287 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -111,21 +111,6 @@ static int get_display_bpp(void) return ret; } -static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - -static const struct png_funcs *png_funcs; - -static BOOL WINAPI load_libpng( INIT_ONCE *once, void *param, void **context ) -{ - __wine_init_unix_lib( user32_module, DLL_PROCESS_ATTACH, NULL, &png_funcs ); - return TRUE; -} - -static BOOL have_libpng(void) -{ - return InitOnceExecuteOnce( &init_once, load_libpng, NULL, NULL ) && png_funcs; -} - static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) { struct cursoricon_object *obj; @@ -571,7 +556,7 @@ static BOOL CURSORICON_GetResIconEntry( LPCVOID dir, DWORD size, int n, *width = icon->bWidth; *height = icon->bHeight; *bits = resdir->idEntries[n].wBitCount; - if (!*width && !*height && have_libpng()) *width = *height = 256; + if (!*width && !*height && png_funcs) *width = *height = 256; return TRUE; } @@ -704,7 +689,7 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, if (info->biSize == PNG_SIGN) { - if (have_libpng()) return png_funcs->get_png_info(info, size, width, height, bits); + if (png_funcs) return png_funcs->get_png_info(info, size, width, height, bits); *width = *height = *bits = 0; return TRUE; } @@ -858,7 +843,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE { BITMAPINFO *bmi_png; - if (!have_libpng()) return 0; + if (!png_funcs) return 0; bmi_png = png_funcs->load_png( (const char *)bmi, &maxsize ); if (bmi_png) { diff --git a/dlls/user32/png.c b/dlls/user32/png.c index a994c6de5c2..bcd619fe52b 100644 --- a/dlls/user32/png.c +++ b/dlls/user32/png.c @@ -293,7 +293,7 @@ static BITMAPINFO * CDECL load_png(const char *png_data, DWORD *size) return info; } -static const struct png_funcs png_funcs = +static const struct png_funcs funcs = { get_png_info, load_png @@ -335,7 +335,7 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p LOAD_FUNCPTR(png_set_read_fn); #undef LOAD_FUNCPTR - *(const struct png_funcs **)ptr_out = &png_funcs; + *(const struct png_funcs **)ptr_out = &funcs; return STATUS_SUCCESS; } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 303f19accfc..882a0c5237b 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -52,6 +52,8 @@ static HPALETTE hPrimaryPalette; static DWORD exiting_thread_id; +const struct png_funcs *png_funcs = NULL; + extern void WDML_NotifyThreadDetach(void); #ifdef __MINGW32__ @@ -382,8 +384,10 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: user32_module = inst; ret = process_attach(); - if(ret) + if(ret) { imm32_module = LoadLibraryW(L"imm32.dll"); + __wine_init_unix_lib( user32_module, DLL_PROCESS_ATTACH, NULL, &png_funcs ); + } break; case DLL_THREAD_DETACH: thread_detach(); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7c4d9015976..0be02919bbe 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -380,6 +380,9 @@ struct png_funcs BITMAPINFO * (CDECL *load_png)(const char *png_data, DWORD *size); }; +/* May be NULL if libpng cannot be loaded. */ +extern const struct png_funcs *png_funcs DECLSPEC_HIDDEN; + /* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ #ifdef __MINGW32__ #undef assert -- 2.32.0

2 1

[PATCH] qcap/tests: Remove duplicated ok() call
by Michael Stefaniuc Aug. 26, 2021

Aug. 26, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index e5ae66ff2d3..6842fccb863 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -706,7 +706,6 @@ static void test_sink_allocator(IPin *pin) hr = IMemInputPin_GetAllocator(input, &ret_allocator); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); - ok(hr == S_OK, "Got hr %#x.\n", hr); IMemAllocator_Release(ret_allocator); hr = IMemAllocator_SetProperties(req_allocator, &req_props, &ret_props); -- 2.31.1

2 1

[PATCH] qedit/tests: Remove duplicated ok() call
by Michael Stefaniuc Aug. 26, 2021

Aug. 26, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qedit/tests/samplegrabber.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index f82c375b76f..6a58d5ea7e6 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -661,7 +661,6 @@ static void test_sink_allocator(IPin *pin) hr = IMemInputPin_GetAllocator(input, &ret_allocator); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); - ok(hr == S_OK, "Got hr %#x.\n", hr); IMemAllocator_Release(ret_allocator); hr = IMemAllocator_SetProperties(req_allocator, &req_props, &ret_props); -- 2.31.1

2 1

[PATCH] amstream/tests: Actually test the return of IMediaFilter_SetSyncSource
by Michael Stefaniuc Aug. 26, 2021

Aug. 26, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/tests/amstream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a43eec77ec2..d27bf801482 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5055,7 +5055,7 @@ static void test_audiostreamsample_get_sample_times(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(current_time == 0, "Got current time %s.\n", wine_dbgstr_longlong(current_time)); - IMediaFilter_SetSyncSource(graph_media_filter, &clock.IReferenceClock_iface); + hr = IMediaFilter_SetSyncSource(graph_media_filter, &clock.IReferenceClock_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); current_time = 0xdeadbeefdeadbeef; @@ -9338,7 +9338,7 @@ static void test_ddrawstreamsample_get_sample_times(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(current_time == 0, "Got current time %s.\n", wine_dbgstr_longlong(current_time)); - IMediaFilter_SetSyncSource(graph_media_filter, &clock.IReferenceClock_iface); + hr = IMediaFilter_SetSyncSource(graph_media_filter, &clock.IReferenceClock_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); current_time = 0xdeadbeefdeadbeef; -- 2.31.1

2 1

[PATCH] windows.gaming.input/tests: Test the correct return value
by Michael Stefaniuc Aug. 26, 2021

Aug. 26, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windows.gaming.input/tests/input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/tests/input.c b/dlls/windows.gaming.input/tests/input.c index b05dc508637..6e863def54d 100644 --- a/dlls/windows.gaming.input/tests/input.c +++ b/dlls/windows.gaming.input/tests/input.c @@ -190,7 +190,7 @@ static void test_Gamepad(void) ok(hr == S_OK, "IGamepadStatics_add_GamepadAdded failed, hr %#x\n", hr); token.value = 0xdeadbeef; - IGamepadStatics_add_GamepadRemoved(gamepad_statics, &gamepad_event_handler.IEventHandler_Gamepad_iface, &token); + hr = IGamepadStatics_add_GamepadRemoved(gamepad_statics, &gamepad_event_handler.IEventHandler_Gamepad_iface, &token); ok(hr == S_OK, "IGamepadStatics_add_GamepadRemoved failed, hr %#x\n", hr); ok(token.value != 0xdeadbeef, "IGamepadStatics_add_GamepadRemoved returned token %#I64x\n", token.value); @@ -367,7 +367,7 @@ static void test_RawGameController(void) ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); token.value = 0xdeadbeef; - IRawGameControllerStatics_add_RawGameControllerRemoved(controller_statics, &controller_event_handler.IEventHandler_RawGameController_iface, &token); + hr = IRawGameControllerStatics_add_RawGameControllerRemoved(controller_statics, &controller_event_handler.IEventHandler_RawGameController_iface, &token); ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerRemoved failed, hr %#x\n", hr); ok(token.value != 0xdeadbeef, "IRawGameControllerStatics_add_RawGameControllerRemoved returned token %#I64x\n", token.value); -- 2.31.1

1 0

[PATCH 1/4] ntdll/tests: Also test the IOSB status in test_volume_info().
by Zebediah Figura Aug. 26, 2021

Aug. 26, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 662dc1d55cb..1118f41f81f 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1662,8 +1662,10 @@ static void test_volume_info(void) PIPE_TYPE_MESSAGE, 4096 )) return; memset( buffer, 0xaa, sizeof(buffer) ); + memset( &iosb, 0xaa, sizeof(iosb) ); status = pNtQueryVolumeInformationFile( read, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation ); ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status ); + ok( iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status ); ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information ); device_info = (FILE_FS_DEVICE_INFORMATION*)buffer; ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType ); @@ -1671,8 +1673,10 @@ static void test_volume_info(void) "Characteristics = %x\n", device_info->Characteristics ); memset( buffer, 0xaa, sizeof(buffer) ); + memset( &iosb, 0xaa, sizeof(iosb) ); status = pNtQueryVolumeInformationFile( write, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation ); ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status ); + ok( iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status ); ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information ); device_info = (FILE_FS_DEVICE_INFORMATION*)buffer; ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType ); -- 2.30.2

2 6

[PATCH v2 1/3] kernel32/tests: Test GetTimeFormatA()'s Unicode to ANSI conversion.
by Francois Gouget Aug. 26, 2021

Aug. 26, 2021

The ANSI string may be longer than the Unicode one and the return value should reflect that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Supersedes: 212527-212529 v2: Fix the last todo_wine(). --- dlls/kernel32/tests/locale.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b83cdc6b956..45bf56d8ad7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -631,6 +631,34 @@ static void test_GetTimeFormatA(void) curtime.wMonth = 60; ret = GetTimeFormatA(lcid, 0, &curtime, "h:m:s", buffer, ARRAY_SIZE(buffer)); expect_str(ret, buffer, "12:56:13"); + + /* The ANSI string may be longer than the Unicode one. + * In particular, in the Japanese code page, "\x93\xfa" = L"\x65e5". + */ + + lcid = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), SORT_DEFAULT); + + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", buffer, 5); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, buffer, "12\x93\xfa"); /* only 3+1 WCHARs */ + todo_wine ok(ret == strlen("12\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("12\x93\xfa") + 1, ret); + ok(strcmp(buffer, "12\x93\xfa") == 0, "Expected '12\x93\xfa', got '%s'\n", buffer); + + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", buffer, 4); + todo_wine expect_err(ret, NULL, ERROR_INSUFFICIENT_BUFFER); + SetLastError(0xdeadbeef); + + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", NULL, 0); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, NULL, "12\x93\xfa"); + todo_wine ok(ret == strlen("12\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("12\x93\xfa") + 1, ret); + + strcpy(buffer, "pristine"); /* clear previous identical result */ + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", buffer, 0); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, NULL, "12\x93\xfa"); + todo_wine ok(ret == strlen("12\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("12\x93\xfa") + 1, ret); + ok(strcmp(buffer, "pristine") == 0, "Expected a pristine buffer, got '%s'\n", buffer); } static void test_GetTimeFormatEx(void) -- 2.20.1

1 2

[PATCH v6] user32: Don't save maximized position for toplevel windows covering the entire work area.
by Gabriel Ivăncescu Aug. 26, 2021

Aug. 26, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51672 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/win.c | 54 ++++++++++++++++++++------ dlls/user32/winpos.c | 86 +++++++++++++++++++++++++++++++++-------- 2 files changed, 112 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 228395e..e23ab81 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11624,8 +11624,9 @@ static void test_IsWindowEnabled(void) static void test_window_placement(void) { - RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect; + RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect, work_rect; WINDOWPLACEMENT wp = {sizeof(wp)}; + MONITORINFO mon_info; HWND hwnd; BOOL ret; @@ -11633,6 +11634,10 @@ static void test_window_placement(void) orig.left, orig.top, orig.right - orig.left, orig.bottom - orig.top, 0, 0, 0, 0); ok(!!hwnd, "failed to create window, error %u\n", GetLastError()); + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY), &mon_info); + work_rect = mon_info.rcWork; + ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); @@ -11675,7 +11680,6 @@ static void test_window_placement(void) ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11693,6 +11697,42 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left - 1, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top - 1, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + ShowWindow(hwnd, SW_MINIMIZE); ret = GetWindowPlacement(hwnd, &wp); @@ -11701,7 +11741,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11714,7 +11753,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11727,7 +11765,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11745,7 +11782,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11761,7 +11797,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11783,7 +11818,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11804,7 +11838,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11825,7 +11858,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11839,7 +11871,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11854,7 +11885,6 @@ todo_wine ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b..cdf8541 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -675,6 +675,33 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, } +/******************************************************************* + * get_work_rect + * + * Get the work area that a maximized window can cover, depending on style. + */ +static BOOL get_work_rect( HWND hwnd, RECT *rect ) +{ + HMONITOR monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ); + MONITORINFO mon_info; + DWORD style; + + if (!monitor) return FALSE; + + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + + style = GetWindowLongW( hwnd, GWL_STYLE ); + *rect = mon_info.rcMonitor; + if (style & WS_MAXIMIZEBOX) + { + if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) + *rect = mon_info.rcWork; + } + return TRUE; +} + + /******************************************************************* * WINPOS_GetMinMaxInfo * @@ -683,8 +710,8 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) { DPI_AWARENESS_CONTEXT context; + RECT rc_work, rc_primary; MINMAXINFO MinMax; - HMONITOR monitor; INT xinc, yinc; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); LONG adjustedStyle; @@ -738,22 +765,8 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) /* if the app didn't change the values, adapt them for the current monitor */ - if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) + if (get_work_rect( hwnd, &rc_work )) { - RECT rc_work, rc_primary; - MONITORINFO mon_info; - - mon_info.cbSize = sizeof(mon_info); - GetMonitorInfoW( monitor, &mon_info ); - - rc_work = mon_info.rcMonitor; - - if (style & WS_MAXIMIZEBOX) - { - if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) - rc_work = mon_info.rcWork; - } - rc_primary = get_primary_monitor_rect(); if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc) @@ -916,6 +929,41 @@ static POINT get_minimized_pos( HWND hwnd, POINT pt ) return pt; } +static void update_maximized_pos( HWND hwnd ) +{ + /* For top level windows covering the work area, we might have + to "forget" the maximized position. Windows presumably does + this to avoid situations where the border style changes, + which would lead the window to be outside the screen, or the + window gets reloaded on a different screen, and the "saved" + position no longer applies to it (despite being maximized). + + Some applications (e.g. Imperiums: Greek Wars) depend on this. + */ + WND *wnd = WIN_GetPtr( hwnd ); + RECT work_rect; + + if (!wnd) return; + if (wnd->parent && wnd->parent != GetDesktopWindow()) goto done; + + if (wnd->dwStyle & WS_MAXIMIZE) + { + WIN_ReleasePtr( wnd ); + if (!get_work_rect( hwnd, &work_rect )) + SetRect( &work_rect, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN ) ); + + if (!(wnd = WIN_GetPtr( hwnd ))) return; + if (wnd->window_rect.left <= work_rect.left && wnd->window_rect.top <= work_rect.top && + wnd->window_rect.right >= work_rect.right && wnd->window_rect.bottom >= work_rect.bottom) + wnd->max_pos.x = wnd->max_pos.y = -1; + } + else + wnd->max_pos.x = wnd->max_pos.y = -1; + +done: + WIN_ReleasePtr( wnd ); +} + /*********************************************************************** * WINPOS_MinMaximize @@ -1338,6 +1386,11 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) pWnd->normal_rect = pWnd->window_rect; } + WIN_ReleasePtr( pWnd ); + update_maximized_pos( hwnd ); + + if (!(pWnd = WIN_GetPtr( hwnd ))) return FALSE; + wndpl->length = sizeof(*wndpl); if( pWnd->dwStyle & WS_MINIMIZE ) wndpl->showCmd = SW_SHOWMINIMIZED; @@ -1431,6 +1484,7 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f style = pWnd->dwStyle; WIN_ReleasePtr( pWnd ); + if (flags & PLACE_MAX) update_maximized_pos( hwnd ); if( style & WS_MINIMIZE ) { -- 2.31.1

2 1