March 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : win32u: Introduce a win32u_get_window_pixel_format() helper.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 463a11379bc19beb566fd86ea1617b54a8f8381a URL: https://gitlab.winehq.org/wine/wine/-/commit/463a11379bc19beb566fd86ea1617b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 14:01:54 2023 -0600 win32u: Introduce a win32u_get_window_pixel_format() helper. --- dlls/win32u/window.c | 17 +++++++++++++++++ include/wine/gdi_driver.h | 1 + 2 files changed, 18 insertions(+) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index cd8b6583249..a3c46dfdf31 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1457,6 +1457,23 @@ BOOL win32u_set_window_pixel_format( HWND hwnd, int format ) return TRUE; } +int win32u_get_window_pixel_format( HWND hwnd ) +{ + WND *win = get_win_ptr( hwnd ); + int ret; + + if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) + { + WARN( "getting format on win %p not supported\n", hwnd ); + return 0; + } + + ret = win->pixel_format; + release_win_ptr( win ); + + return ret; +} + /*********************************************************************** * NtUserGetProp (win32u.@) * diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 5ecd54c70f3..eefefce695b 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -340,6 +340,7 @@ struct user_driver_funcs extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format ); +extern int win32u_get_window_pixel_format( HWND hwnd ); #endif /* WINE_UNIX_LIB */

1 0

Zebediah Figura : winex11: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 46c8a637525d0f1cf67830295fb460c819b800b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/46c8a637525d0f1cf67830295fb460… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 16:23:42 2023 -0600 winex11: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough. --- dlls/d3d8/tests/device.c | 6 +++--- dlls/d3d9/tests/device.c | 6 +++--- dlls/ddraw/tests/ddraw1.c | 6 +++--- dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 6 +++--- dlls/ddraw/tests/ddraw7.c | 6 +++--- dlls/winex11.drv/opengl.c | 26 +++++++++++--------------- 7 files changed, 29 insertions(+), 33 deletions(-)

1 0

Zebediah Figura : win32u: Allow separately storing the internal pixel format set by WGL_WINE_pixel_format_passthrough.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: c2018ff466120ff2706c166ec66aea66ecea1683 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2018ff466120ff2706c166ec66aea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 16:17:44 2023 -0600 win32u: Allow separately storing the internal pixel format set by WGL_WINE_pixel_format_passthrough. --- dlls/win32u/ntuser_private.h | 1 + dlls/win32u/window.c | 10 +++++++--- dlls/wineandroid.drv/opengl.c | 2 +- dlls/winemac.drv/opengl.c | 3 ++- dlls/winex11.drv/opengl.c | 4 ++-- include/wine/gdi_driver.h | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 385e7c0ded5..5c337c722a7 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -90,6 +90,7 @@ typedef struct tagWND struct window_surface *surface; /* Window surface if any */ struct tagDIALOGINFO *dlgInfo; /* Dialog additional info (dialogs only) */ int pixel_format; /* Pixel format set by the graphics driver */ + int internal_pixel_format; /* Internal pixel format set via WGL_WINE_pixel_format_passthrough */ int cbWndExtra; /* class cbWndExtra at window creation */ DWORD_PTR userdata; /* User private data */ DWORD wExtra[1]; /* Window extra bytes */ diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index a3c46dfdf31..4db9d99884c 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1441,7 +1441,7 @@ LONG_PTR WINAPI NtUserSetWindowLongPtr( HWND hwnd, INT offset, LONG_PTR newval, return set_window_long( hwnd, offset, sizeof(LONG_PTR), newval, ansi ); } -BOOL win32u_set_window_pixel_format( HWND hwnd, int format ) +BOOL win32u_set_window_pixel_format( HWND hwnd, int format, BOOL internal ) { WND *win = get_win_ptr( hwnd ); @@ -1450,7 +1450,10 @@ BOOL win32u_set_window_pixel_format( HWND hwnd, int format ) WARN( "setting format %d on win %p not supported\n", format, hwnd ); return FALSE; } - win->pixel_format = format; + if (internal) + win->internal_pixel_format = format; + else + win->pixel_format = format; release_win_ptr( win ); update_window_state( hwnd ); @@ -1852,7 +1855,8 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, wine_server_add_data( req, extra_rects, sizeof(extra_rects) ); } if (new_surface) req->paint_flags |= SET_WINPOS_PAINT_SURFACE; - if (win->pixel_format) req->paint_flags |= SET_WINPOS_PIXEL_FORMAT; + if (win->pixel_format || win->internal_pixel_format) + req->paint_flags |= SET_WINPOS_PIXEL_FORMAT; if ((ret = !wine_server_call( req ))) { diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 37e9c713fb1..c8b7bf85cfb 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -242,7 +242,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) release_gl_drawable( gl ); if (prev && prev != format && !allow_change) return FALSE; - if (win32u_set_window_pixel_format( hwnd, format )) return TRUE; + if (win32u_set_window_pixel_format( hwnd, format, FALSE )) return TRUE; destroy_gl_drawable( hwnd ); return FALSE; } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index d92276bf253..6f3c3b88155 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1587,7 +1587,8 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) done: release_win_data(data); - if (ret && gl_surface_mode == GL_SURFACE_BEHIND) win32u_set_window_pixel_format(hwnd, fmt); + if (ret && gl_surface_mode == GL_SURFACE_BEHIND) + win32u_set_window_pixel_format(hwnd, fmt, FALSE); return ret; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 92768267bae..3006d1a2447 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1402,7 +1402,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format, BO XFlush( gdi_display ); release_gl_drawable( gl ); - win32u_set_window_pixel_format( hwnd, pixel_format_index( format )); + win32u_set_window_pixel_format( hwnd, pixel_format_index( format ), FALSE ); return TRUE; } @@ -1512,7 +1512,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) else { destroy_gl_drawable( hwnd ); - win32u_set_window_pixel_format( hwnd, 0 ); + win32u_set_window_pixel_format( hwnd, 0, FALSE ); } release_gl_drawable( old ); } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index eefefce695b..c492252d4ab 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -339,7 +339,7 @@ struct user_driver_funcs extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); -extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format ); +extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format, BOOL internal ); extern int win32u_get_window_pixel_format( HWND hwnd ); #endif /* WINE_UNIX_LIB */

1 0

Zebediah Figura : wineandroid: Retrieve the pixel format from win32u for normal windows in wglGetPixelFormat().
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 899f010232c1ace8d6963d85b673803aaa6da520 URL: https://gitlab.winehq.org/wine/wine/-/commit/899f010232c1ace8d6963d85b67380… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 14:16:59 2023 -0600 wineandroid: Retrieve the pixel format from win32u for normal windows in wglGetPixelFormat(). --- dlls/wineandroid.drv/opengl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 41df3d3c09c..37e9c713fb1 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -497,8 +497,14 @@ static int android_wglGetPixelFormat( HDC hdc ) { struct gl_drawable *gl; int ret = 0; + HWND hwnd; + + if ((hwnd = NtUserWindowFromDC( hdc ))) + return win32u_get_window_pixel_format( hwnd ); - if ((gl = get_gl_drawable( NtUserWindowFromDC( hdc ), hdc ))) + /* This code is currently dead, but will be necessary if WGL_ARB_pbuffer + * support is introduced. */ + if ((gl = get_gl_drawable( NULL, hdc ))) { ret = gl->format; /* offscreen formats can't be used with traditional WGL calls */

1 0

Zebediah Figura : winex11: Retrieve the pixel format from win32u for normal windows in wglGetPixelFormat().
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 775a2d5f4cc9a84bd9473d5fd81c67f29a62583f URL: https://gitlab.winehq.org/wine/wine/-/commit/775a2d5f4cc9a84bd9473d5fd81c67… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 14:03:48 2023 -0600 winex11: Retrieve the pixel format from win32u for normal windows in wglGetPixelFormat(). --- dlls/winex11.drv/opengl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 783ac5f3a9d..92768267bae 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1687,8 +1687,12 @@ static int glxdrv_wglGetPixelFormat( HDC hdc ) { struct gl_drawable *gl; int ret = 0; + HWND hwnd; - if ((gl = get_gl_drawable( NtUserWindowFromDC( hdc ), hdc ))) + if ((hwnd = NtUserWindowFromDC( hdc ))) + return win32u_get_window_pixel_format( hwnd ); + + if ((gl = get_gl_drawable( NULL, hdc ))) { ret = pixel_format_index( gl->format ); /* Offscreen formats can't be used with traditional WGL calls.

1 0

Zebediah Figura : win32u: Make NtUserSetWindowPixelFormat() into a proper export.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: b545ca0f9b0cdc5f814d41d892bbc5f8e7dc4fa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b545ca0f9b0cdc5f814d41d892bbc5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 20:10:29 2023 -0600 win32u: Make NtUserSetWindowPixelFormat() into a proper export. This is simpler in general, given that this function is no longer used from user-space. In this particular case, the secondary purpose is to allow easily adding arguments to the function. --- dlls/win32u/window.c | 5 +---- dlls/wineandroid.drv/opengl.c | 2 +- dlls/winemac.drv/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 4 ++-- include/ntuser.h | 6 ------ include/wine/gdi_driver.h | 2 ++ 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index a3ff0647dcd..cd8b6583249 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1441,7 +1441,7 @@ LONG_PTR WINAPI NtUserSetWindowLongPtr( HWND hwnd, INT offset, LONG_PTR newval, return set_window_long( hwnd, offset, sizeof(LONG_PTR), newval, ansi ); } -static BOOL set_window_pixel_format( HWND hwnd, int format ) +BOOL win32u_set_window_pixel_format( HWND hwnd, int format ) { WND *win = get_win_ptr( hwnd ); @@ -5555,9 +5555,6 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_SetWindowContextHelpId: return set_window_context_help_id( hwnd, param ); - case NtUserCallHwndParam_SetWindowPixelFormat: - return set_window_pixel_format( hwnd, param ); - case NtUserCallHwndParam_ShowOwnedPopups: return show_owned_popups( hwnd, param ); diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index a930e249ba5..41df3d3c09c 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -242,7 +242,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) release_gl_drawable( gl ); if (prev && prev != format && !allow_change) return FALSE; - if (NtUserSetWindowPixelFormat( hwnd, format )) return TRUE; + if (win32u_set_window_pixel_format( hwnd, format )) return TRUE; destroy_gl_drawable( hwnd ); return FALSE; } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ff78b183360..7251745258a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1588,7 +1588,7 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) done: release_win_data(data); - if (ret && gl_surface_mode == GL_SURFACE_BEHIND) NtUserSetWindowPixelFormat(hwnd, fmt); + if (ret && gl_surface_mode == GL_SURFACE_BEHIND) win32u_set_window_pixel_format(hwnd, fmt); return ret; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c44e9579cb6..783ac5f3a9d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1402,7 +1402,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format, BO XFlush( gdi_display ); release_gl_drawable( gl ); - NtUserSetWindowPixelFormat( hwnd, pixel_format_index( format )); + win32u_set_window_pixel_format( hwnd, pixel_format_index( format )); return TRUE; } @@ -1512,7 +1512,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) else { destroy_gl_drawable( hwnd ); - NtUserSetWindowPixelFormat( hwnd, 0 ); + win32u_set_window_pixel_format( hwnd, 0 ); } release_gl_drawable( old ); } diff --git a/include/ntuser.h b/include/ntuser.h index 3b821f0c9fe..35ead9750c6 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1331,7 +1331,6 @@ enum NtUserCallHwndParam_SetDialogInfo, NtUserCallHwndParam_SetMDIClientInfo, NtUserCallHwndParam_SetWindowContextHelpId, - NtUserCallHwndParam_SetWindowPixelFormat, NtUserCallHwndParam_ShowOwnedPopups, /* temporary exports */ NtUserSetWindowStyle, @@ -1498,11 +1497,6 @@ static inline BOOL NtUserSetWindowContextHelpId( HWND hwnd, DWORD id ) return NtUserCallHwndParam( hwnd, id, NtUserCallHwndParam_SetWindowContextHelpId ); } -static inline BOOL NtUserSetWindowPixelFormat( HWND hwnd, int format ) -{ - return NtUserCallHwndParam( hwnd, format, NtUserCallHwndParam_SetWindowPixelFormat ); -} - static inline BOOL NtUserShowOwnedPopups( HWND hwnd, BOOL show ) { return NtUserCallHwndParam( hwnd, show, NtUserCallHwndParam_ShowOwnedPopups ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index dca03934a44..5ecd54c70f3 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -339,6 +339,8 @@ struct user_driver_funcs extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); +extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format ); + #endif /* WINE_UNIX_LIB */ #endif /* __WINE_WINE_GDI_DRIVER_H */

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Use array element type for array's regset.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: vkd3d Branch: master Commit: 193692bbcbaf6fbcd8138ae8f0b0c6995d5b02c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/193692bbcbaf6fbcd8138ae8f0b0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 02:47:59 2023 +0100 vkd3d-shader/hlsl: Use array element type for array's regset. Currently this affects SM1 compilation only, with a minimal example like this: float4 var[3]; float4 main() : sv_target { return var[1]; } --- libs/vkd3d-shader/hlsl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a62a76de..286c6e60 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -203,6 +203,8 @@ enum hlsl_regset hlsl_type_get_regset(const struct hlsl_type *type) vkd3d_unreachable(); } } + else if (type->type == HLSL_CLASS_ARRAY) + return hlsl_type_get_regset(type->e.array.type); vkd3d_unreachable(); }

1 0

Gabriel Ivăncescu : kernel32: Fix GetNumberFormatA when input length is 0.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: c55f8f3518c1ed6759de9078831956898b007d08 URL: https://gitlab.winehq.org/wine/wine/-/commit/c55f8f3518c1ed6759de9078831956… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 8 20:31:29 2023 +0200 kernel32: Fix GetNumberFormatA when input length is 0. Fixes a regression introduced by b6bf69ef804146f81b803719a72d8c6afde184ba. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/locale.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 16aa0bdd2aa..3783cf6505f 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -430,8 +430,6 @@ int WINAPI GetNumberFormatA( LCID lcid, DWORD flags, const char *value, } MultiByteToWideChar( cp, 0, value, -1, input, ARRAY_SIZE(input) ); - if (len > (int)ARRAY_SIZE(output)) len = ARRAY_SIZE(output); - if (format) { NUMBERFMTW fmt; @@ -455,9 +453,9 @@ int WINAPI GetNumberFormatA( LCID lcid, DWORD flags, const char *value, fmt.NegativeOrder = format->NegativeOrder; fmt.lpDecimalSep = fmt_decimal; fmt.lpThousandSep = fmt_thousand; - ret = GetNumberFormatW( lcid, flags, input, &fmt, output, len ); + ret = GetNumberFormatW( lcid, flags, input, &fmt, output, ARRAY_SIZE(output) ); } - else ret = GetNumberFormatW( lcid, flags, input, NULL, output, len ); + else ret = GetNumberFormatW( lcid, flags, input, NULL, output, ARRAY_SIZE(output) ); if (ret) ret = WideCharToMultiByte( cp, 0, output, -1, buffer, len, 0, 0 ); return ret;

1 0

Eric Pouech : dbghelp/tests: Use msinfo32.exe instead of notepad.exe.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 13afaa7c16a1acea62935ea634f5278d15d12464 URL: https://gitlab.winehq.org/wine/wine/-/commit/13afaa7c16a1acea62935ea634f527… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 21 17:35:00 2023 +0100 dbghelp/tests: Use msinfo32.exe instead of notepad.exe. Under Windows 11, notepad.exe has been migrated into the UWP framework, and can no longer be launched as a 32bit process: - even if c:\windows\syswow64\notepad.exe is still a 32 bit PE file - the process created from c:\windows\syswow64\notepad.exe is not a wow64 process. So use msinfo32.exe instead. Like notepad.exe, it's a gui application, present on Wine and all test-bot:ed windows platforms. But unlike notepad.exe, it's not an UWP app on Windows 11. (May not fully fix all the bugs below, but will get rid of a bunch of errors). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54535 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54536 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54537 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 339585993e0..276faf0101a 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -381,7 +381,7 @@ static BOOL test_modules(void) ok(ret, "SymInitialize failed: %lu\n", GetLastError()); GetSystemWow64DirectoryA(file_wow64, MAX_PATH); - strcat(file_wow64, "\\notepad.exe"); + strcat(file_wow64, "\\msinfo32.exe"); /* not always present */ machine_wow = get_module_machine(file_wow64); @@ -397,7 +397,7 @@ static BOOL test_modules(void) } GetSystemDirectoryA(file_system, MAX_PATH); - strcat(file_system, "\\notepad.exe"); + strcat(file_system, "\\msinfo32.exe"); base = SymLoadModule(GetCurrentProcess(), NULL, file_system, NULL, base1, 0); ok(base == base1, "SymLoadModule failed: %lu\n", GetLastError()); @@ -676,7 +676,7 @@ static void test_loaded_modules(void) ret = GetSystemDirectoryA(buffer, sizeof(buffer)); ok(ret, "got error %lu\n", GetLastError()); - strcat(buffer, "\\notepad.exe"); + strcat(buffer, "\\msinfo32.exe"); /* testing with child process of different machines */ ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); @@ -744,7 +744,7 @@ static void test_loaded_modules(void) { ret = GetSystemWow64DirectoryA(buffer, sizeof(buffer)); ok(ret, "got error %lu\n", GetLastError()); - strcat(buffer, "\\notepad.exe"); + strcat(buffer, "\\msinfo32.exe"); SymSetOptions(SymGetOptions() & ~SYMOPT_INCLUDE_32BIT_MODULES);

1 0

Gabriel Ivăncescu : kernel32: Fix GetCurrencyFormatA when input length is 0.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 606e0c191ed8fc26544c04f236c560b2f5e3e835 URL: https://gitlab.winehq.org/wine/wine/-/commit/606e0c191ed8fc26544c04f236c560… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 8 20:31:29 2023 +0200 kernel32: Fix GetCurrencyFormatA when input length is 0. Fixes a regression introduced by 42afb693b10dee9a06fcadb204560490a24f1754. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/locale.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 3783cf6505f..235034f6117 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -481,8 +481,6 @@ int WINAPI GetCurrencyFormatA( LCID lcid, DWORD flags, const char *value, } MultiByteToWideChar( cp, 0, value, -1, input, ARRAY_SIZE(input) ); - if (len > (int)ARRAY_SIZE(output)) len = ARRAY_SIZE(output); - if (format) { CURRENCYFMTW fmt; @@ -509,9 +507,9 @@ int WINAPI GetCurrencyFormatA( LCID lcid, DWORD flags, const char *value, fmt.lpDecimalSep = fmt_decimal; fmt.lpThousandSep = fmt_thousand; fmt.lpCurrencySymbol = fmt_symbol; - ret = GetCurrencyFormatW( lcid, flags, input, &fmt, output, len ); + ret = GetCurrencyFormatW( lcid, flags, input, &fmt, output, ARRAY_SIZE(output) ); } - else ret = GetCurrencyFormatW( lcid, flags, input, NULL, output, len ); + else ret = GetCurrencyFormatW( lcid, flags, input, NULL, output, ARRAY_SIZE(output) ); if (ret) ret = WideCharToMultiByte( cp, 0, output, -1, buffer, len, 0, 0 ); return ret;

1 0