March 2020 - Wine-Devel - list.winehq.org

[PATCH v2 1/2] winex11.drv: Remove frame when non-client area is empty.
by Rémi Bernon March 23, 2020

March 23, 2020

Several applications -Steam, Battle.net for instance- handle the WM_NCCALCSIZE message to override the non-client areas size and make the client area cover the whole window, instead of changing the styles. In winex11.drv, in decorated mode, we adjust the window rect according to the window style to hide the unwanted decorations behind the frame, but when client and window rects are equals, there's nothing to hide and the actual window styles are irrelevant and can safely be ignored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40930 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Use the new window and client rectangles from within the X11DRV_WindowPosChanging callback. dlls/winex11.drv/window.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd9..4676b099358 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -280,13 +280,16 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl * get_mwm_decorations */ static unsigned long get_mwm_decorations( struct x11drv_win_data *data, - DWORD style, DWORD ex_style ) + DWORD style, DWORD ex_style, + const RECT *window_rect, + const RECT *client_rect ) { unsigned long ret = 0; if (!decorated_mode) return 0; - if (IsRectEmpty( &data->window_rect )) return 0; + if (EqualRect( window_rect, client_rect )) return 0; + if (IsRectEmpty( window_rect )) return 0; if (data->shaped) return 0; if (ex_style & WS_EX_TOOLWINDOW) return 0; @@ -712,7 +715,7 @@ static void set_mwm_hints( struct x11drv_win_data *data, DWORD style, DWORD ex_s } else { - mwm_hints.decorations = get_mwm_decorations( data, style, ex_style ); + mwm_hints.decorations = get_mwm_decorations( data, style, ex_style, &data->window_rect, &data->client_rect ); mwm_hints.functions = MWM_FUNC_MOVE; if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; if (!(style & WS_DISABLED)) @@ -1157,7 +1160,8 @@ void make_window_embedded( struct x11drv_win_data *data ) * * Convert a rect from client to X window coordinates */ -static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) +static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect, + const RECT *window_rect, const RECT *client_rect ) { DWORD style, ex_style, style_mask = 0, ex_style_mask = 0; unsigned long decor; @@ -1168,7 +1172,7 @@ static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - decor = get_mwm_decorations( data, style, ex_style ); + decor = get_mwm_decorations( data, style, ex_style, window_rect, client_rect ); if (decor & MWM_DECOR_TITLE) style_mask |= WS_CAPTION; if (decor & MWM_DECOR_BORDER) @@ -2274,7 +2278,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag } *visible_rect = *window_rect; - X11DRV_window_to_X_rect( data, visible_rect ); + X11DRV_window_to_X_rect( data, visible_rect, window_rect, client_rect ); /* create the window surface if necessary */ -- 2.26.0.rc2

2 2

[PATCH] ole32: Add support for reading VT_CLSID properties.
by Nikolay Sivov March 23, 2020

March 23, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Mentioned in https://bugs.winehq.org/show_bug.cgi?id=47056. dlls/ole32/stg_prop.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index c5d2a42e1c..adf4c2f337 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1454,6 +1454,14 @@ static HRESULT propertystorage_read_scalar(PROPVARIANT *prop, const struct read_ else hr = STG_E_INVALIDPARAMETER; } + break; + case VT_CLSID: + if (!(prop->u.puuid = allocate(allocate_data, sizeof (*prop->u.puuid)))) + return STG_E_INSUFFICIENTMEMORY; + + if (SUCCEEDED(hr = buffer_test_offset(buffer, offset, sizeof(*prop->u.puuid)))) + StorageUtl_ReadGUID(buffer->data, offset, prop->u.puuid); + break; default: FIXME("unsupported type %d\n", prop->vt); -- 2.25.1

2 1

[PATCH 1/2] gdiplus: Don't test font face of DEFAULT_GUI_FONT.
by Esme March 23, 2020

March 23, 2020

From: Vincent Povirk <vincent(a)codeweavers.com> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47872 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdiplus/tests/font.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 9abb80faaf5..7f4b1e876e5 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -808,29 +808,21 @@ static void test_font_metrics(void) static void test_font_substitution(void) { - WCHAR ms_shell_dlg[LF_FACESIZE]; + const WCHAR ms_shell_dlg[] = {'M','S',' ','S','h','e','l','l',' ','D','l','g',0}; char fallback_font[LF_FACESIZE]; HDC hdc; - HFONT hfont; LOGFONTA lf; GpStatus status; GpGraphics *graphics; GpFont *font; GpFontFamily *family; - int ret; hdc = CreateCompatibleDC(0); status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); - hfont = GetStockObject(DEFAULT_GUI_FONT); - ok(hfont != 0, "GetStockObject(DEFAULT_GUI_FONT) failed\n"); - - memset(&lf, 0xfe, sizeof(lf)); - ret = GetObjectA(hfont, sizeof(lf), &lf); - ok(ret == sizeof(lf), "GetObject failed\n"); - ok(!lstrcmpA(lf.lfFaceName, "MS Shell Dlg"), "wrong face name %s\n", lf.lfFaceName); - MultiByteToWideChar(CP_ACP, 0, lf.lfFaceName, -1, ms_shell_dlg, LF_FACESIZE); + memset(&lf, 0, sizeof(lf)); + lstrcpyA(lf.lfFaceName, "MS Shell Dlg"); status = GdipCreateFontFromLogfontA(hdc, &lf, &font); expect(Ok, status); -- 2.17.1

5 5

[PATCH] ntdll: Fix the overflow check in read_changes_apc().
by Zebediah Figura March 23, 2020

March 23, 2020

Fixes test failures in kernel32:change. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/file.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5175e9d5ce..5b60c887e2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1768,16 +1768,17 @@ static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS st while (size && left >= sizeof(*pfni)) { + DWORD len = (left - offsetof(FILE_NOTIFY_INFORMATION, FileName)) / sizeof(WCHAR); + /* convert to an NT style path */ for (i = 0; i < event->len; i++) if (event->name[i] == '/') event->name[i] = '\\'; pfni->Action = event->action; - pfni->FileNameLength = ntdll_umbstowcs( event->name, event->len, pfni->FileName, - (left - offsetof(FILE_NOTIFY_INFORMATION, FileName)) / sizeof(WCHAR)); + pfni->FileNameLength = ntdll_umbstowcs( event->name, event->len, pfni->FileName, len ); last_entry_offset = &pfni->NextEntryOffset; - if (pfni->FileNameLength == -1 || pfni->FileNameLength == -2) break; + if (pfni->FileNameLength == len) break; i = offsetof(FILE_NOTIFY_INFORMATION, FileName[pfni->FileNameLength]); pfni->FileNameLength *= sizeof(WCHAR); -- 2.25.2

1 0

[PATCH v2 1/2] d3dx9_36: Handle NULL palette
by Alistair Leslie-Hughes March 22, 2020

March 22, 2020

D3DFMT_P8 don't have a palette and cause a if they have to_rgba function. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3dx9_36/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 42e7bf16f1..e2b398345c 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1796,7 +1796,7 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic struct vec4 color, tmp; format_to_vec4(src_format, src_ptr, &color); - if (src_format->to_rgba) + if (src_format->to_rgba && palette) src_format->to_rgba(&color, &tmp, palette); else tmp = color; -- 2.25.1

1 1

[PATCH 2/2] gdiplus: Don't test the exact substitution of MS Shell Dlg.
by Esme March 22, 2020

March 22, 2020

From: Vincent Povirk <vincent(a)codeweavers.com> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47872 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdiplus/tests/font.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 7f4b1e876e5..09ace74ccec 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -829,8 +829,7 @@ static void test_font_substitution(void) memset(&lf, 0xfe, sizeof(lf)); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); - ok(!lstrcmpA(lf.lfFaceName, "Microsoft Sans Serif") || - !lstrcmpA(lf.lfFaceName, "Tahoma"), "wrong face name %s\n", lf.lfFaceName); + ok(lstrcmpA(lf.lfFaceName, "MS Shell Dlg") != 0, "expected substitution of MS Shell Dlg\n"); GdipDeleteFont(font); status = GdipCreateFontFamilyFromName(ms_shell_dlg, NULL, &family); @@ -840,8 +839,7 @@ static void test_font_substitution(void) memset(&lf, 0xfe, sizeof(lf)); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); - ok(!lstrcmpA(lf.lfFaceName, "Microsoft Sans Serif") || - !lstrcmpA(lf.lfFaceName, "Tahoma"), "wrong face name %s\n", lf.lfFaceName); + ok(lstrcmpA(lf.lfFaceName, "MS Shell Dlg") != 0, "expected substitution of MS Shell Dlg\n"); GdipDeleteFont(font); GdipDeleteFontFamily(family); -- 2.17.1

1 0

[PATCH] advapi32/tests: The Everyone group name is sometimes translated.
by Francois Gouget March 22, 2020

March 22, 2020

This depends on SystemPreferredUILanguages, which does not always match the language really used by the Windows interface (UserDefaultUILanguage). Also the group name is not translated in all languages. So just check the name that LsaLookupSids() returns in a few known languages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/advapi32/tests/lsa.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 57ec8994eb7..f2e10671a47 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -37,6 +37,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); + static void test_lsa(void) { NTSTATUS status; @@ -332,6 +334,7 @@ static void check_unicode_string_(int line, const LSA_UNICODE_STRING *string, co static void test_LsaLookupSids(void) { + WCHAR langW[32]; char user_buffer[64]; LSA_OBJECT_ATTRIBUTES attrs = {.Length = sizeof(attrs)}; TOKEN_USER *user = (TOKEN_USER *)user_buffer; @@ -341,7 +344,7 @@ static void test_LsaLookupSids(void) LSA_HANDLE policy; NTSTATUS status; HANDLE token; - DWORD size; + DWORD num, size; BOOL ret; PSID sid; @@ -387,7 +390,21 @@ static void test_LsaLookupSids(void) ok(names[0].Use == SidTypeWellKnownGroup, "got type %u\n", names[0].Use); ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); - check_unicode_string(&names[0].Name, L"Everyone"); + + /* The group name gets translated... but not in all locales */ + size = ARRAY_SIZE(langW); + if (!pGetSystemPreferredUILanguages || + !pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &num, langW, &size)) + langW[0] = 0; + if (wcscmp(langW, L"0409") == 0 || wcscmp(langW, L"0411") == 0) + /* English and Japanese */ + check_unicode_string(&names[0].Name, L"Everyone"); + else if (wcscmp(langW, L"0407") == 0) /* German */ + check_unicode_string(&names[0].Name, L"Jeder"); + else if (wcscmp(langW, L"040C") == 0) /* French */ + check_unicode_string(&names[0].Name, L"Tout le monde"); + else + trace("<Everyone-group>.Name=%s\n", debugstr_w(names[0].Name.Buffer)); LsaFreeMemory(names); LsaFreeMemory(list); @@ -448,6 +465,9 @@ static void test_LsaLookupPrivilegeName(void) START_TEST(lsa) { + HMODULE hkernel32 = GetModuleHandleA("kernel32"); + pGetSystemPreferredUILanguages = (void*)GetProcAddress(hkernel32, "GetSystemPreferredUILanguages"); + test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); -- 2.20.1

1 0

[PATCH] advapi32/tests: On Windows 7 GetServiceKeyName() fails for all localized display names.
by Francois Gouget March 22, 2020

March 22, 2020

It's not just the service display names that contain a smart quote that Windows 7 fails to handle, it's all localized names. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> --- dlls/advapi32/tests/service.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 43d97386270..4bf9f4c34b3 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -720,17 +720,6 @@ static void test_get_displayname(void) CloseServiceHandle(scm_handle); } -static int is_printable_ascii_str(const char *s) -{ - while (*s) - { - if (*s < 32 || *s >= 127) - return 0; - s++; - } - return 1; -} - static void test_get_servicekeyname(void) { SC_HANDLE scm_handle, svc_handle; @@ -872,10 +861,10 @@ static void test_get_servicekeyname(void) servicesize = 0; ret = GetServiceKeyNameA(scm_handle, displayname, NULL, &servicesize); ok(!ret, "Expected failure\n"); - if (!is_printable_ascii_str(displayname) && + if (strcmp(displayname, "Print Spooler") != 0 && GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST) { - win_skip("GetServiceKeyName() does not support non-ASCII display names: %s\n", displayname); /* Windows 7 */ + win_skip("GetServiceKeyName() does not support localized display names: %s\n", displayname); /* Windows 7 */ CloseServiceHandle(scm_handle); return; /* All the tests that follow will fail too */ } -- 2.20.1

1 0

Summer of Code and Projects around Wine
by Stefan Dösinger March 22, 2020

March 22, 2020

Hi, Since we had troubles getting GSoC students and project ideas in the past year I'd like to bring up a controversial suggestion: Talk to the projects that popped up around Wine like PlayOnLinux, Lutris, DXVK if they have GSoC-compatible ideas and host them as a Wine GSoC project. Ideally those projects would be something that reduces friction between upstream Wine and other projects. E.g. on FOSDEM I talked with Josh Ashton and he mentioned d3d behaviors that some games depend on for which we don't have tests and that sometimes work in wined3d by accident or don't work. Syncing those lessons by writing and upstreaming proper Wine tests would be a valuable thing for everyone. I don't know enough about PlayOnLinux or Lutris to suggest anything outright, but I still think it's worth asking them. Cheers, Stefan

8 10

[PATCH] kernel32/tests: Remove an unneeded sprintf() in the process tests.
by Francois Gouget March 22, 2020

March 22, 2020

The buffer content is not used before being overwritten again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 1889939fff3..0f0889073b0 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1036,7 +1036,6 @@ static void test_CommandLine(void) WritePrivateProfileStringA(NULL, NULL, NULL, resfile); CloseHandle(info.hThread); CloseHandle(info.hProcess); - sprintf(buffer, "process dump %s", resfile); okChildString("Arguments", "argvA0", "dummy"); okChildString("Arguments", "CommandLineA", buffer2); okChildStringWA("Arguments", "CommandLineW", buffer2); -- 2.20.1

1 0