August 2021 - Wine-devel - list.winehq.org

[PATCH vkd3d] vkd3d-shader/hlsl: Do not swallow compilation errors.
by Giovanni Mascellani 27 Aug '21

27 Aug '21

There are cases where compilation fails, but no error message is recorded. They usually correspond to unimplemented features, but still failure should be forwarded to the caller, otherwise it will manifest itself later in more confusing ways (like not being able to find a function even though it was apparently correctly compiled). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0d9186ae..aafd8acb 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1803,10 +1803,10 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d if (!hlsl_ctx_init(&ctx, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; - if (hlsl_lexer_compile(&ctx, hlsl) == 2) + if ((ret = hlsl_lexer_compile(&ctx, hlsl))) { hlsl_ctx_cleanup(&ctx); - return VKD3D_ERROR_OUT_OF_MEMORY; + return ret == 2 ? VKD3D_ERROR_OUT_OF_MEMORY : VKD3D_ERROR_INVALID_SHADER; } if (ctx.result) -- 2.33.0

2 1

[PATCH v5] user32: Don't save maximized position placement for toplevel windows covering the entire work area.
by Gabriel Ivăncescu 27 Aug '21

27 Aug '21

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 | 81 ++++++++++++++++++++++++++++++++--------- 2 files changed, 106 insertions(+), 29 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..255a40b 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_maximized_area_rect + * + * Get the work area that a maximized window can cover, depending on style. + */ +static BOOL get_work_rect_for_window( 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_for_window( 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,35 @@ static POINT get_minimized_pos( HWND hwnd, POINT pt ) return pt; } +static void update_maximized_pos( WND *wnd ) +{ + RECT rc_work; + + /* 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. + */ + if (wnd->parent && wnd->parent != GetDesktopWindow()) + return; + + if (wnd->dwStyle & WS_MAXIMIZE) + { + if (!get_work_rect_for_window( wnd->obj.handle, &rc_work )) + SetRect( &rc_work, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN ) ); + + if (wnd->window_rect.left <= rc_work.left && wnd->window_rect.top <= rc_work.top && + wnd->window_rect.right >= rc_work.right && wnd->window_rect.bottom >= rc_work.bottom) + wnd->max_pos.x = wnd->max_pos.y = -1; + } + else + wnd->max_pos.x = wnd->max_pos.y = -1; +} + /*********************************************************************** * WINPOS_MinMaximize @@ -1337,6 +1379,7 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) { pWnd->normal_rect = pWnd->window_rect; } + update_maximized_pos( pWnd ); wndpl->length = sizeof(*wndpl); if( pWnd->dwStyle & WS_MINIMIZE ) @@ -1425,7 +1468,11 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; if (flags & PLACE_MIN) pWnd->min_pos = point_thread_to_win_dpi( hwnd, wp.ptMinPosition ); - if (flags & PLACE_MAX) pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + if (flags & PLACE_MAX) + { + pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + update_maximized_pos( pWnd ); + } if (flags & PLACE_RECT) pWnd->normal_rect = rect_thread_to_win_dpi( hwnd, wp.rcNormalPosition ); style = pWnd->dwStyle; -- 2.31.1

3 6

[PATCH] qcap: Make v4l_device_create() static.
by Francois Gouget 27 Aug '21

27 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/qcap/v4l.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 82af4dba9e1..12fbe8162e0 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -401,7 +401,7 @@ static LONG CDECL v4l_device_get_caps_count(struct video_capture_device *device) return device->caps_count; } -struct video_capture_device * CDECL v4l_device_create(USHORT index) +static struct video_capture_device * CDECL v4l_device_create(USHORT index) { struct v4l2_frmsizeenum frmsize = {0}; struct video_capture_device *device; -- 2.20.1

2 1

[PATCH] wmphoto: Make the wmp_decoder_*() functions static.
by Francois Gouget 27 Aug '21

27 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I'm not sure the CDECL is really useful there but in doubt I decided to keep it. --- dlls/wmphoto/unix_lib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wmphoto/unix_lib.c b/dlls/wmphoto/unix_lib.c index 235828941f7..94a67434b7e 100644 --- a/dlls/wmphoto/unix_lib.c +++ b/dlls/wmphoto/unix_lib.c @@ -180,7 +180,7 @@ static JXR_ERR wmp_stream_GetPos(struct WMPStream *iface, size_t *pos) return WMP_errSuccess; } -HRESULT CDECL wmp_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) +static HRESULT CDECL wmp_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) { struct wmp_decoder *This = impl_from_decoder(iface); HRESULT hr; @@ -252,7 +252,7 @@ HRESULT CDECL wmp_decoder_initialize(struct decoder *iface, IStream *stream, str return S_OK; } -HRESULT CDECL wmp_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) +static HRESULT CDECL wmp_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) { struct wmp_decoder *This = impl_from_decoder(iface); @@ -268,7 +268,7 @@ HRESULT CDECL wmp_decoder_get_frame_info(struct decoder *iface, UINT frame, stru return S_OK; } -HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) +static HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) { struct wmp_decoder *This = impl_from_decoder(iface); PKRect pkrect; @@ -306,7 +306,7 @@ HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, const W prc, stride, buffersize, buffer); } -HRESULT CDECL wmp_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, UINT *count, struct decoder_block **blocks) +static HRESULT CDECL wmp_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, UINT *count, struct decoder_block **blocks) { TRACE("iface %p, frame %d, count %p, blocks %p\n", iface, frame, count, blocks); @@ -315,7 +315,7 @@ HRESULT CDECL wmp_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, return S_OK; } -HRESULT CDECL wmp_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, BYTE **data, DWORD *datasize) +static HRESULT CDECL wmp_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, BYTE **data, DWORD *datasize) { struct wmp_decoder *This = impl_from_decoder(iface); U32 count; @@ -348,7 +348,7 @@ HRESULT CDECL wmp_decoder_get_color_context(struct decoder* iface, UINT frame, U return S_OK; } -void CDECL wmp_decoder_destroy(struct decoder* iface) +static void CDECL wmp_decoder_destroy(struct decoder* iface) { struct wmp_decoder *This = impl_from_decoder(iface); -- 2.20.1

3 3

[PATCH] gdiplus/tests: Fix a font test crash when "MS Shell Dlg" is not found.
by Francois Gouget 27 Aug '21

27 Aug '21

When "MS Shell Dlg" is missing GdipCreateFontFamilyFromName() leaves the GpFontFamily* pointer uninitialised. So initialize it to NULL in order to get clean failures instead of a crash. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- We used to just get a failure, probably because that pointer happened to be NULL. But that changed on August 23: https://test.winehq.org/data/patterns.html#gdiplus:font The next question is "why do we get a failure in the first place?". That's the subject of bug 51685: https://bugs.winehq.org/show_bug.cgi?id=51685 Finally there are other calls to GdipCreateFontFamilyFromName() but they either check for failure or try to load Tahoma which is a built-in Wine font. So it did not feel necessary to check for failures everywhere. --- dlls/gdiplus/tests/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 4ffa9e823fc..031e4688c6c 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -883,8 +883,10 @@ static void test_font_substitution(void) ok(lstrcmpA(lf.lfFaceName, "MS Shell Dlg") != 0, "expected substitution of MS Shell Dlg\n"); GdipDeleteFont(font); + family = NULL; status = GdipCreateFontFamilyFromName(L"MS Shell Dlg", NULL, &family); expect(Ok, status); + font = NULL; status = GdipCreateFont(family, 12, FontStyleRegular, UnitPoint, &font); expect(Ok, status); memset(&lf, 0xfe, sizeof(lf)); -- 2.20.1

3 3

[PATCH] gdiplus: GdipGetFamilyName() should not crash when given a NULL name.
by Francois Gouget 27 Aug '21

27 Aug '21

It used to crash on Windows XP and Vista but does not since Windows 7. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/gdiplus/font.c | 7 +++++-- dlls/gdiplus/tests/font.c | 9 +++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 64604367da3..44431ea2ac8 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -798,17 +798,20 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily *family, GpFontFamily **clo * FAILURE: InvalidParameter if family is NULL * * NOTES - * If name is a NULL ptr, then both XP and Vista will crash (so we do as well) + * If name is NULL, XP and Vista crash but not Windows 7+ */ GpStatus WINGDIPAPI GdipGetFamilyName (GDIPCONST GpFontFamily *family, WCHAR *name, LANGID language) { static int lang_fixme; + TRACE("%p, %p, %d\n", family, name, language); + if (family == NULL) return InvalidParameter; - TRACE("%p, %p, %d\n", family, name, language); + if (name == NULL) + return Ok; if (language != LANG_NEUTRAL && !lang_fixme++) FIXME("No support for handling of multiple languages!\n"); diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index b208989c054..4ffa9e823fc 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -388,12 +388,9 @@ static void test_fontfamily (void) expect (Ok, stat); expect (0, lstrcmpiW(itsName, L"Tahoma")); - if (0) - { - /* Crashes on Windows XP SP2, Vista, and so Wine as well */ - stat = GdipGetFamilyName (family, NULL, LANG_NEUTRAL); - expect (Ok, stat); - } + /* Crashes on Windows XP SP2 and Vista */ + stat = GdipGetFamilyName (family, NULL, LANG_NEUTRAL); + expect (Ok, stat); /* Make sure we don't read old data */ ZeroMemory (itsName, sizeof(itsName)); -- 2.20.1

2 1

[PATCH 1/2] oleacc: Implement AccessibleObjectFromEvent.
by Connor McAdams 27 Aug '21

27 Aug '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleacc/main.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index f6b66a8bcab..fd85518436c 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -331,6 +331,45 @@ HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, V return E_NOTIMPL; } +HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD dwObjectID, DWORD dwChildID, + IAccessible** ppacc, VARIANT* pvarChild ) +{ + IDispatch *child; + VARIANT cid; + HRESULT hr; + + TRACE("%p %d %d %p %p\n", hwnd, dwObjectID, dwChildID, ppacc, pvarChild); + + hr = AccessibleObjectFromWindow(hwnd, dwObjectID, &IID_IAccessible, (void **)ppacc); + if (FAILED(hr)) + return hr; + + V_VT(&cid) = VT_I4; + V_I4(&cid) = dwChildID; + hr = IAccessible_get_accChild(*ppacc, cid, &child); + if (FAILED(hr)) + FIXME("get_accChild failed with %#x!\n", hr); + + V_VT(pvarChild) = VT_I4; + if (child) + { + IAccessible *acc; + + if (SUCCEEDED(IDispatch_QueryInterface(child, &IID_IAccessible, (void **)&acc))) + { + IAccessible_Release(*ppacc); + *ppacc = acc; + } + + IDispatch_Release(child); + V_I4(pvarChild) = CHILDID_SELF; + } + else + V_I4(pvarChild) = dwChildID; + + return S_OK; +} + HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 4cff0b8effc..9ad6e915965 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -1,5 +1,5 @@ @ stdcall AccessibleChildren(ptr long long ptr ptr) -@ stub AccessibleObjectFromEvent +@ stdcall AccessibleObjectFromEvent(ptr long long ptr ptr) @ stdcall AccessibleObjectFromPoint(int64 ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) @ stdcall CreateStdAccessibleObject(ptr long ptr ptr) -- 2.25.1

3 4

[PATCH] user32/tests: Use WineTest contexts to simplify test_LoadImage{Bitmap,File}().
by Francois Gouget 27 Aug '21

27 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/user32/tests/cursoricon.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index f84312f3ea2..33ca2e3cb63 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1139,7 +1139,7 @@ static const DWORD biSize_tests[] = { 0xffffffff }; -static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) +static void test_LoadImageBitmap(HBITMAP hbm) { BITMAP bm; BITMAPINFO bmi; @@ -1157,9 +1157,9 @@ static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) bmi.bmiHeader.biBitCount= 24; bmi.bmiHeader.biCompression= BI_RGB; ret = GetDIBits(hdc, hbm, 0, bm.bmHeight, &pixel, &bmi, DIB_RGB_COLORS); - ok(ret == bm.bmHeight, "%s: %d lines were converted, not %d\n", test_desc, ret, bm.bmHeight); + ok(ret == bm.bmHeight, "%d lines were converted, not %d\n", ret, bm.bmHeight); - ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); + ok(color_match(pixel, 0x00ffffff), "Pixel is 0x%08x\n", pixel); ReleaseDC(NULL, hdc); } @@ -1172,6 +1172,7 @@ static void test_LoadImageFile(const char * test_desc, const unsigned char * ima DWORD error, bytes_written; char filename[64]; + winetest_push_context("%s", test_desc); strcpy(filename, "test."); strcat(filename, ext); @@ -1186,7 +1187,7 @@ static void test_LoadImageFile(const char * test_desc, const unsigned char * ima /* Load as cursor. For all tested formats, this should fail */ SetLastError(0xdeadbeef); handle = LoadImageA(NULL, filename, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); - ok(handle == NULL, "%s: IMAGE_CURSOR succeeded incorrectly.\n", test_desc); + ok(handle == NULL, "IMAGE_CURSOR succeeded incorrectly\n"); error = GetLastError(); ok(error == 0 || broken(error == 0xdeadbeef) || /* Win9x */ @@ -1197,7 +1198,7 @@ static void test_LoadImageFile(const char * test_desc, const unsigned char * ima /* Load as icon. For all tested formats, this should fail */ SetLastError(0xdeadbeef); handle = LoadImageA(NULL, filename, IMAGE_ICON, 0, 0, LR_LOADFROMFILE); - ok(handle == NULL, "%s: IMAGE_ICON succeeded incorrectly.\n", test_desc); + ok(handle == NULL, "IMAGE_ICON succeeded incorrectly\n"); error = GetLastError(); ok(error == 0 || broken(error == 0xdeadbeef) || /* Win9x */ @@ -1214,13 +1215,14 @@ static void test_LoadImageFile(const char * test_desc, const unsigned char * ima "Last error: %u\n", error); if (expect_success) { - ok(handle != NULL, "%s: IMAGE_BITMAP failed.\n", test_desc); - if (handle != NULL) test_LoadImageBitmap(test_desc, handle); + ok(handle != NULL, "IMAGE_BITMAP failed\n"); + if (handle != NULL) test_LoadImageBitmap(handle); } - else ok(handle == NULL, "%s: IMAGE_BITMAP succeeded incorrectly.\n", test_desc); + else ok(handle == NULL, "IMAGE_BITMAP succeeded incorrectly\n"); if (handle != NULL) DeleteObject(handle); DeleteFileA(filename); + winetest_pop_context(); } typedef struct { -- 2.20.1

2 1

[PATCH v2] services/tests: Vista+ returns fixed 1024x768 WinDisc monitor information.
by Zhiyi Zhang 27 Aug '21

27 Aug '21

From: Francois Gouget <fgouget(a)codeweavers.com> Unlike Windows XP which returned the actual display information to non-interactive services. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 212175. Change the rectangle passed to EnumDisplayMonitor() callback as well. Fix tests failures. dlls/user32/sysparams.c | 6 +++--- programs/services/tests/service.c | 17 +++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 24e39206746..d6f08654ab0 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3980,12 +3980,12 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) /* Fallback to report one monitor */ if (handle == NULLDRV_DEFAULT_HMONITOR) { - RECT default_rect = {0, 0, 640, 480}; + RECT default_rect = {0, 0, 1024, 768}; info->rcMonitor = default_rect; info->rcWork = default_rect; info->dwFlags = MONITORINFOF_PRIMARY; if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, L"\\\\.\\DISPLAY1" ); + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, L"WinDisc" ); return TRUE; } @@ -4145,7 +4145,7 @@ BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC pro } /* Fallback to report one monitor if using SetupAPI failed */ - SetRect( &monitor_rect, 0, 0, 640, 480 ); + SetRect( &monitor_rect, 0, 0, 1024, 768 ); if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &monitor_rect, lp )) return FALSE; return TRUE; diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index aa9878b9769..4eebbc432df 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -131,6 +131,7 @@ static void test_create_window(void) static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { + static const RECT expected_rect = {0, 0, 1024, 768}; BOOL r; MONITORINFOEXA mi; @@ -148,16 +149,12 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR r = GetMonitorInfoA(hmon, (MONITORINFO*)&mi); service_ok(r, "GetMonitorInfo failed.\n"); - service_ok(mi.rcMonitor.left == 0 && mi.rcMonitor.top == 0 && mi.rcMonitor.right >= 640 && mi.rcMonitor.bottom >= 480, - "Unexpected monitor rcMonitor values: {%d,%d,%d,%d}\n", - mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); - - service_ok(mi.rcWork.left == 0 && mi.rcWork.top == 0 && mi.rcWork.right >= 640 && mi.rcWork.bottom >= 480, - "Unexpected monitor rcWork values: {%d,%d,%d,%d}\n", - mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); - - service_ok(!strcmp(mi.szDevice, "WinDisc") || !strcmp(mi.szDevice, "\\\\.\\DISPLAY1"), - "Unexpected szDevice received: %s\n", mi.szDevice); + service_ok(EqualRect(lprc, &expected_rect), "Unexpected rect: %s\n", wine_dbgstr_rect(lprc)); + service_ok(EqualRect(&mi.rcMonitor, &expected_rect), "Unexpected rcMonitor: %s\n", + wine_dbgstr_rect(&mi.rcMonitor)); + service_ok(EqualRect(&mi.rcWork, &expected_rect), "Unexpected rcWork: %s\n", + wine_dbgstr_rect(&mi.rcWork)); + service_ok(!strcmp(mi.szDevice, "WinDisc"), "Unexpected szDevice received: %s\n", mi.szDevice); service_ok(mi.dwFlags == MONITORINFOF_PRIMARY, "Unexpected secondary monitor info.\n"); -- 2.30.2

2 1

[PATCH] comctl32: Fix ASCII / ANSI mixups in comments.
by Francois Gouget 27 Aug '21

27 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/toolbar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8cbfee834ce..88b42db4c41 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6101,7 +6101,7 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, BOOL isW) * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure * [I] nItem : item index - * [I] isW : TRUE if it's a Unicode req, FALSE if ASCII + * [I] isW : TRUE if it's a Unicode req, FALSE if ANSI * * RETURN: * SUCCESS : TRUE diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2585e11530e..cf1dc42449b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -156,7 +156,7 @@ typedef struct BOOL bAnchor; /* anchor highlight enabled */ BOOL bDoRedraw; /* Redraw status */ BOOL bDragOutSent; /* has TBN_DRAGOUT notification been sent for this drag? */ - BOOL bUnicode; /* Notifications are ASCII (FALSE) or Unicode (TRUE)? */ + BOOL bUnicode; /* Notifications are ANSI (FALSE) or Unicode (TRUE)? */ BOOL bCaptured; /* mouse captured? */ DWORD dwStyle; /* regular toolbar style */ DWORD dwExStyle; /* extended toolbar style */ -- 2.20.1

2 3