May 2022 - Wine-commits - list.winehq.org

Jacek Caban : win32u: Allow NULL client_menu_name in NtUserRegisterClassExWOW.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: f4b9ff7850d0d55cd0ac4bf383de2aca323d7f4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4b9ff7850d0d55cd0ac4bf3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 19:09:44 2022 +0200 win32u: Allow NULL client_menu_name in NtUserRegisterClassExWOW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 64ac48cad19..fd74f63291a 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -443,7 +443,7 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam class->hCursor = wc->hCursor; class->hbrBackground = wc->hbrBackground; class->winproc = alloc_winproc( wc->lpfnWndProc, ansi ); - class->menu_name = *client_menu_name; + if (client_menu_name) class->menu_name = *client_menu_name; if (wc->hIcon && !wc->hIconSm && user_callbacks) class->hIconSmIntern = user_callbacks->pCopyImage( wc->hIcon, IMAGE_ICON, get_system_metrics( SM_CXSMICON ),

1 0

Jacek Caban : winex11: Directly use ntdll in more places.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: c736411fb897444609fd539d0a110772a292daca URL: https://source.winehq.org/git/wine.git/?a=commit;h=c736411fb897444609fd539d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 00:21:21 2022 +0200 winex11: Directly use ntdll in more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 6 +++--- dlls/winex11.drv/keyboard.c | 6 +++--- dlls/winex11.drv/mouse.c | 10 +++++----- dlls/winex11.drv/vulkan.c | 2 +- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv_main.c | 10 +++++----- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 3bd771fa4fd..a6499400283 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -512,7 +512,7 @@ NTSTATUS X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD EVENT_x11_time_to_win32_time(Time time) { static DWORD adjust = 0; - DWORD now = GetTickCount(); + DWORD now = NtGetTickCount(); DWORD ret; if (! adjust && time != 0) @@ -1365,7 +1365,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) { Display *display = thread_display(); struct x11drv_win_data *data; - DWORD end = GetTickCount() + 2000; + DWORD end = NtGetTickCount() + 2000; TRACE( "waiting for window %p to become %swithdrawn\n", hwnd, set ? "" : "not " ); @@ -1401,7 +1401,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) if (!count) { struct pollfd pfd; - int timeout = end - GetTickCount(); + int timeout = end - NtGetTickCount(); pfd.fd = ConnectionNumber(display); pfd.events = POLLIN; diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 7a30b3b4a3e..6b876c3bee9 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1525,7 +1525,7 @@ X11DRV_KEYBOARD_DetectLayout( Display *display ) static HKL get_locale_kbd_layout(void) { - ULONG_PTR layout; + LCID layout; LANGID langid; /* FIXME: @@ -1539,7 +1539,7 @@ static HKL get_locale_kbd_layout(void) * locale id we return the US one. */ - layout = GetUserDefaultLCID(); + NtQueryDefaultLocale( TRUE, &layout ); /* * Microsoft Office expects this value to be something specific @@ -1553,7 +1553,7 @@ static HKL get_locale_kbd_layout(void) else layout |= layout << 16; - return (HKL)layout; + return (HKL)(UINT_PTR)layout; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 1a5230300a3..3d68dc80b3e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -513,7 +513,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) { TRACE( "clip hwnd reset from %p\n", hwnd ); data->clip_hwnd = 0; - data->clip_reset = GetTickCount(); + data->clip_reset = NtGetTickCount(); disable_xinput2(); NtUserDestroyWindow( hwnd ); } @@ -553,7 +553,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) release_win_data( data ); if (!fullscreen) return FALSE; if (!(thread_data = x11drv_thread_data())) return FALSE; - if (GetTickCount() - thread_data->clip_reset < 1000) return FALSE; + if (NtGetTickCount() - thread_data->clip_reset < 1000) return FALSE; if (!reset && clipping_cursor && thread_data->clip_hwnd) return FALSE; /* already clipping */ monitor = NtUserMonitorFromWindow( hwnd, MONITOR_DEFAULTTONEAREST ); @@ -1472,9 +1472,9 @@ void X11DRV_DestroyCursorIcon( HCURSOR handle ) void X11DRV_SetCursor( HCURSOR handle ) { if (InterlockedExchangePointer( (void **)&last_cursor, handle ) != handle || - GetTickCount() - last_cursor_change > 100) + NtGetTickCount() - last_cursor_change > 100) { - last_cursor_change = GetTickCount(); + last_cursor_change = NtGetTickCount(); if (cursor_window) send_notify_message( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); } } @@ -1667,7 +1667,7 @@ void move_resize_window( HWND hwnd, int dir ) input.u.mi.dy = pos.y; input.u.mi.mouseData = button_up_data[button - 1]; input.u.mi.dwFlags = button_up_flags[button - 1] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; - input.u.mi.time = GetTickCount(); + input.u.mi.time = NtGetTickCount(); input.u.mi.dwExtraInfo = 0; __wine_send_input( hwnd, &input, NULL ); } diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 29e0b10763a..0f96b6860fd 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -650,7 +650,7 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * static long prev_time, start_time; DWORD time; - time = GetTickCount(); + time = NtGetTickCount(); frames++; frames_total++; if (time - prev_time > 1500) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 79970f55444..de52023c467 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1861,8 +1861,8 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, { case WM_WINE_NOTIFY_ACTIVITY: { - static ULONGLONG last = 0; - ULONGLONG now = GetTickCount64(); + static ULONG last = 0; + ULONG now = NtGetTickCount(); /* calling XResetScreenSaver too often can cause performance * problems, so throttle it */ if (now > last + 5000) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 6042f2522b5..aa8ddc49385 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -722,7 +722,7 @@ static void set_queue_display_fd( Display *display ) if (wine_server_fd_to_handle( ConnectionNumber(display), GENERIC_READ | SYNCHRONIZE, 0, &handle )) { MESSAGE( "x11drv: Can't allocate handle for display fd\n" ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } SERVER_START_REQ( set_queue_fd ) { @@ -733,9 +733,9 @@ static void set_queue_display_fd( Display *display ) if (ret) { MESSAGE( "x11drv: Can't store handle for display fd\n" ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } - CloseHandle( handle ); + NtClose( handle ); } @@ -751,12 +751,12 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) if (!(data = calloc( 1, sizeof(*data) ))) { ERR( "could not create data\n" ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } if (!(data->display = XOpenDisplay(NULL))) { ERR_(winediag)( "x11drv: Can't open display: %s. Please ensure that your X server is running and that $DISPLAY is set correctly.\n", XDisplayName(NULL)); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag */

1 0

Francois Gouget : winebus.sys: Fix the HAVE_SYS_INOTIFY_H checks.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 9aa1d0a1a79647a8b575f6a68473392e16a5efcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aa1d0a1a79647a8b575f6a6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 2 19:42:19 2022 +0200 winebus.sys: Fix the HAVE_SYS_INOTIFY_H checks. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 6b4bf09a773..39573162afa 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1773,7 +1773,7 @@ NTSTATUS udev_bus_init(void *args) goto error; } -#if HAVE_SYS_INOTIFY_H +#ifdef HAVE_SYS_INOTIFY_H if (options.disable_udevd) monitor_fd = create_inotify(); if (monitor_fd < 0) options.disable_udevd = FALSE; #else @@ -1798,7 +1798,7 @@ NTSTATUS udev_bus_init(void *args) poll_count = 2; if (!options.disable_udevd) build_initial_deviceset_udevd(); -#if HAVE_SYS_INOTIFY_H +#ifdef HAVE_SYS_INOTIFY_H else build_initial_deviceset_direct(); #endif @@ -1841,7 +1841,7 @@ NTSTATUS udev_bus_wait(void *args) if (pfd[0].revents) { if (udev_monitor) process_monitor_event(udev_monitor); -#if HAVE_SYS_INOTIFY_H +#ifdef HAVE_SYS_INOTIFY_H else process_inotify_event(pfd[0].fd); #endif }

1 0

Zebediah Figura : dinput/tests: Do not test that reports are identical when polling.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 982a5b9f91619f094d79c944594a3ea437b128d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=982a5b9f91619f094d79c944… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 2 16:48:41 2022 -0500 dinput/tests: Do not test that reports are identical when polling. This is dependent on timing, and currently fails occasionally both on Windows and Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 4e107625064..aeafbd4dbc3 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -2343,12 +2343,11 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( ret, "GetOverlappedResult failed, last error %lu\n", GetLastError() ); ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %lu, expected %u\n", value, (report_id ? 3 : 4) ); - /* first report should be ready and the same */ + /* first report should be ready */ ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); ok( ret, "GetOverlappedResult failed, last error %lu\n", GetLastError() ); ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %lu, expected %u\n", value, (report_id ? 3 : 4) ); - ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); send_hid_input( file, expect_small, sizeof(expect_small) );

1 0

Alexandre Julliard : oleaut32: Use the locale leading zero flag instead of hardcoding it.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: c8fd78317902f80084a626d20aa3dfeb12572b65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8fd78317902f80084a626d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:33:21 2022 +0200 oleaut32: Use the locale leading zero flag instead of hardcoding it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 3850fec7066..bc8bd0d2197 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6512,12 +6512,14 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl NUMBERFMTW minFormat; minFormat.NumDigits = 0; - minFormat.LeadingZero = 0; minFormat.Grouping = 0; minFormat.lpDecimalSep = lpDecimalSep; minFormat.lpThousandSep = empty; minFormat.NegativeOrder = 1; /* NLS_NEG_LEFT */ + GetLocaleInfoW(lcid, LOCALE_ILZERO | LOCALE_RETURN_NUMBER | (dwFlags & LOCALE_NOUSEROVERRIDE), + (WCHAR *)&minFormat.LeadingZero, sizeof(DWORD)/sizeof(WCHAR) ); + /* count number of decimal digits in string */ p = wcschr( buff, '.' ); if (p) minFormat.NumDigits = lstrlenW(p + 1);

1 0

Alexandre Julliard : shlwapi: Fix copy/paste typo in number format initialization.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 88a91169c5299c2eb4df5438b5052b08b10b118f URL: https://source.winehq.org/git/wine.git/?a=commit;h=88a91169c5299c2eb4df5438… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:33:39 2022 +0200 shlwapi: Fix copy/paste typo in number format initialization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 49aef6d12aa..77e3b978cee 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -56,7 +56,7 @@ static void FillNumberFmt(NUMBERFMTW *fmt, LPWSTR decimal_buffer, int decimal_bu WCHAR *c; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_ILZERO|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->LeadingZero, sizeof(fmt->LeadingZero)/sizeof(WCHAR)); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->LeadingZero, sizeof(fmt->NegativeOrder)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->NegativeOrder, sizeof(fmt->NegativeOrder)/sizeof(WCHAR)); fmt->NumDigits = 0; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal_buffer, decimal_bufwlen); GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousand_buffer, thousand_bufwlen);

1 0

Alexandre Julliard : kernel32: Reimplement GetNumberFormatA().
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: b6bf69ef804146f81b803719a72d8c6afde184ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6bf69ef804146f81b803719… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:35:27 2022 +0200 kernel32: Reimplement GetNumberFormatA(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 90 ------------------------------------------------ dlls/kernel32/locale.c | 53 ++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 90 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 7f112767880..a38edcc7758 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -986,96 +986,6 @@ INT WINAPI GetTimeFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, lpFormat, lpTimeStr, cchOut); } -/************************************************************************** - * GetNumberFormatA (KERNEL32.@) - * - * Format a number string for a given locale. - * - * PARAMS - * lcid [I] Locale to format for - * dwFlags [I] LOCALE_ flags from "winnls.h" - * lpszValue [I] String to format - * lpFormat [I] Formatting overrides - * lpNumberStr [O] Destination for formatted string - * cchOut [I] Size of lpNumberStr, or 0 to calculate the resulting size - * - * NOTES - * - lpszValue can contain only '0' - '9', '-' and '.'. - * - If lpFormat is non-NULL, dwFlags must be 0. In this case lpszValue will - * be formatted according to the format details returned by GetLocaleInfoA(). - * - This function rounds the number string if the number of decimals exceeds the - * locales normal number of decimal places. - * - If cchOut is 0, this function does not write to lpNumberStr. - * - The ANSI version of this function fails if lcid is Unicode only. - * - * RETURNS - * Success: The number of character written to lpNumberStr, or that would - * have been written, if cchOut is 0. - * Failure: 0. Use GetLastError() to determine the cause. - */ -INT WINAPI GetNumberFormatA(LCID lcid, DWORD dwFlags, - LPCSTR lpszValue, const NUMBERFMTA *lpFormat, - LPSTR lpNumberStr, int cchOut) -{ - DWORD cp = CP_ACP; - WCHAR szDec[8], szGrp[8], szIn[128], szOut[128]; - NUMBERFMTW fmt; - const NUMBERFMTW *pfmt = NULL; - INT iRet; - - TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue), - lpFormat, lpNumberStr, cchOut); - - if (NLS_IsUnicodeOnlyLcid(lcid)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (!(dwFlags & LOCALE_USE_CP_ACP)) - { - const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); - if (!node) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - cp = node->dwCodePage; - } - - if (lpFormat) - { - memcpy(&fmt, lpFormat, sizeof(fmt)); - pfmt = &fmt; - if (lpFormat->lpDecimalSep) - { - MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, ARRAY_SIZE(szDec)); - fmt.lpDecimalSep = szDec; - } - if (lpFormat->lpThousandSep) - { - MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, ARRAY_SIZE(szGrp)); - fmt.lpThousandSep = szGrp; - } - } - - if (lpszValue) - MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, ARRAY_SIZE(szIn)); - - if (cchOut > (int) ARRAY_SIZE(szOut)) - cchOut = ARRAY_SIZE(szOut); - - szOut[0] = '\0'; - - iRet = GetNumberFormatW(lcid, dwFlags, lpszValue ? szIn : NULL, pfmt, - lpNumberStr ? szOut : NULL, cchOut); - - if (szOut[0] && lpNumberStr) - WideCharToMultiByte(cp, 0, szOut, -1, lpNumberStr, cchOut, 0, 0); - return iRet; -} - /* Number parsing state flags */ #define NF_ISNEGATIVE 0x1 /* '-' found */ #define NF_ISREAL 0x2 /* '.' found */ diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 2187d3e2883..c6cbec870e2 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -411,6 +411,59 @@ int WINAPI SetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPCSTR data ) } +/************************************************************************** + * GetNumberFormatA (KERNEL32.@) + */ +int WINAPI GetNumberFormatA( LCID lcid, DWORD flags, const char *value, + const NUMBERFMTA *format, char *buffer, int len ) +{ + UINT cp = get_lcid_codepage( lcid, flags ); + WCHAR input[128], output[128]; + int ret; + + TRACE( "(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, flags, debugstr_a(value), format, buffer, len ); + + if (len < 0 || (len && !buffer) || !value) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + MultiByteToWideChar( cp, 0, value, -1, input, ARRAY_SIZE(input) ); + + if (len > (int)ARRAY_SIZE(output)) len = ARRAY_SIZE(output); + + if (format) + { + NUMBERFMTW fmt; + WCHAR fmt_decimal[4], fmt_thousand[4]; + + if (flags & LOCALE_NOUSEROVERRIDE) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (!format->lpDecimalSep || !format->lpThousandSep) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + MultiByteToWideChar( cp, 0, format->lpDecimalSep, -1, fmt_decimal, ARRAY_SIZE(fmt_decimal) ); + MultiByteToWideChar( cp, 0, format->lpThousandSep, -1, fmt_thousand, ARRAY_SIZE(fmt_thousand) ); + fmt.NumDigits = format->NumDigits; + fmt.LeadingZero = format->LeadingZero; + fmt.Grouping = format->Grouping; + fmt.NegativeOrder = format->NegativeOrder; + fmt.lpDecimalSep = fmt_decimal; + fmt.lpThousandSep = fmt_thousand; + ret = GetNumberFormatW( lcid, flags, input, &fmt, output, len ); + } + else ret = GetNumberFormatW( lcid, flags, input, NULL, output, len ); + + if (ret) ret = WideCharToMultiByte( cp, 0, output, -1, buffer, len, 0, 0 ); + return ret; +} + + /****************************************************************************** * GetGeoInfoA (KERNEL32.@) */

1 0

Alexandre Julliard : kernel32: Reimplement GetCurrencyFormatA().
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 42afb693b10dee9a06fcadb204560490a24f1754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42afb693b10dee9a06fcadb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:35:45 2022 +0200 kernel32: Reimplement GetCurrencyFormatA(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 95 ------------------------------------------------ dlls/kernel32/locale.c | 56 ++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 95 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index a38edcc7758..de31db5c113 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1261,101 +1261,6 @@ INT WINAPI GetNumberFormatEx(LPCWSTR name, DWORD flags, return GetNumberFormatW(lcid, flags, value, format, number, numout); } -/************************************************************************** - * GetCurrencyFormatA (KERNEL32.@) - * - * Format a currency string for a given locale. - * - * PARAMS - * lcid [I] Locale to format for - * dwFlags [I] LOCALE_ flags from "winnls.h" - * lpszValue [I] String to format - * lpFormat [I] Formatting overrides - * lpCurrencyStr [O] Destination for formatted string - * cchOut [I] Size of lpCurrencyStr, or 0 to calculate the resulting size - * - * NOTES - * - lpszValue can contain only '0' - '9', '-' and '.'. - * - If lpFormat is non-NULL, dwFlags must be 0. In this case lpszValue will - * be formatted according to the format details returned by GetLocaleInfoA(). - * - This function rounds the currency if the number of decimals exceeds the - * locales number of currency decimal places. - * - If cchOut is 0, this function does not write to lpCurrencyStr. - * - The ANSI version of this function fails if lcid is Unicode only. - * - * RETURNS - * Success: The number of character written to lpNumberStr, or that would - * have been written, if cchOut is 0. - * Failure: 0. Use GetLastError() to determine the cause. - */ -INT WINAPI GetCurrencyFormatA(LCID lcid, DWORD dwFlags, - LPCSTR lpszValue, const CURRENCYFMTA *lpFormat, - LPSTR lpCurrencyStr, int cchOut) -{ - DWORD cp = CP_ACP; - WCHAR szDec[8], szGrp[8], szCy[8], szIn[128], szOut[128]; - CURRENCYFMTW fmt; - const CURRENCYFMTW *pfmt = NULL; - INT iRet; - - TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue), - lpFormat, lpCurrencyStr, cchOut); - - if (NLS_IsUnicodeOnlyLcid(lcid)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (!(dwFlags & LOCALE_USE_CP_ACP)) - { - const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); - if (!node) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - cp = node->dwCodePage; - } - - if (lpFormat) - { - memcpy(&fmt, lpFormat, sizeof(fmt)); - pfmt = &fmt; - if (lpFormat->lpDecimalSep) - { - MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, ARRAY_SIZE(szDec)); - fmt.lpDecimalSep = szDec; - } - if (lpFormat->lpThousandSep) - { - MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, ARRAY_SIZE(szGrp)); - fmt.lpThousandSep = szGrp; - } - if (lpFormat->lpCurrencySymbol) - { - MultiByteToWideChar(cp, 0, lpFormat->lpCurrencySymbol, -1, szCy, ARRAY_SIZE(szCy)); - fmt.lpCurrencySymbol = szCy; - } - } - - if (lpszValue) - MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, ARRAY_SIZE(szIn)); - - if (cchOut > (int) ARRAY_SIZE(szOut)) - cchOut = ARRAY_SIZE(szOut); - - szOut[0] = '\0'; - - iRet = GetCurrencyFormatW(lcid, dwFlags, lpszValue ? szIn : NULL, pfmt, - lpCurrencyStr ? szOut : NULL, cchOut); - - if (szOut[0] && lpCurrencyStr) - WideCharToMultiByte(cp, 0, szOut, -1, lpCurrencyStr, cchOut, 0, 0); - return iRet; -} - /* Formatting states for Currencies. We use flags to avoid code duplication. */ #define CF_PARENS 0x1 /* Parentheses */ #define CF_MINUS_LEFT 0x2 /* '-' to the left */ diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c6cbec870e2..16aa0bdd2aa 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -464,6 +464,62 @@ int WINAPI GetNumberFormatA( LCID lcid, DWORD flags, const char *value, } +/************************************************************************** + * GetCurrencyFormatA (KERNEL32.@) + */ +int WINAPI GetCurrencyFormatA( LCID lcid, DWORD flags, const char *value, + const CURRENCYFMTA *format, char *buffer, int len ) +{ + UINT cp = get_lcid_codepage( lcid, flags ); + WCHAR input[128], output[128]; + int ret; + + TRACE( "(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, flags, debugstr_a(value), format, buffer, len ); + + if (len < 0 || (len && !buffer) || !value) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + MultiByteToWideChar( cp, 0, value, -1, input, ARRAY_SIZE(input) ); + + if (len > (int)ARRAY_SIZE(output)) len = ARRAY_SIZE(output); + + if (format) + { + CURRENCYFMTW fmt; + WCHAR fmt_decimal[4], fmt_thousand[4], fmt_symbol[13]; + + if (flags & LOCALE_NOUSEROVERRIDE) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (!format->lpDecimalSep || !format->lpThousandSep || !format->lpCurrencySymbol) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + MultiByteToWideChar( cp, 0, format->lpDecimalSep, -1, fmt_decimal, ARRAY_SIZE(fmt_decimal) ); + MultiByteToWideChar( cp, 0, format->lpThousandSep, -1, fmt_thousand, ARRAY_SIZE(fmt_thousand) ); + MultiByteToWideChar( cp, 0, format->lpCurrencySymbol, -1, fmt_symbol, ARRAY_SIZE(fmt_symbol) ); + fmt.NumDigits = format->NumDigits; + fmt.LeadingZero = format->LeadingZero; + fmt.Grouping = format->Grouping; + fmt.NegativeOrder = format->NegativeOrder; + fmt.PositiveOrder = format->PositiveOrder; + fmt.lpDecimalSep = fmt_decimal; + fmt.lpThousandSep = fmt_thousand; + fmt.lpCurrencySymbol = fmt_symbol; + ret = GetCurrencyFormatW( lcid, flags, input, &fmt, output, len ); + } + else ret = GetCurrencyFormatW( lcid, flags, input, NULL, output, len ); + + if (ret) ret = WideCharToMultiByte( cp, 0, output, -1, buffer, len, 0, 0 ); + return ret; +} + + /****************************************************************************** * GetGeoInfoA (KERNEL32.@) */

1 0

Alexandre Julliard : kernelbase: Reimplement GetNumberFormatW/Ex() using get_locale_info().
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 56099a31242dcc522fb94643e70553e152c522ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=56099a31242dcc522fb94643… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:37:03 2022 +0200 kernelbase: Reimplement GetNumberFormatW/Ex() using get_locale_info(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/lcformat.c | 268 ---------------------------------------- dlls/kernel32/tests/locale.c | 23 ++++ dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/locale.c | 243 ++++++++++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 272 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56099a31242dcc522fb9…

1 0

Alexandre Julliard : kernelbase: Reimplement GetCurrencyFormatW/Ex() using get_locale_info().
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 9afc20949a4d63c4d1323683aeda4f7af13f3969 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9afc20949a4d63c4d1323683… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:37:38 2022 +0200 kernelbase: Reimplement GetCurrencyFormatW/Ex() using get_locale_info(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/lcformat.c | 371 ---------------------------------------- dlls/kernel32/tests/locale.c | 20 +++ dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/locale.c | 205 ++++++++++++++++++++++ 5 files changed, 229 insertions(+), 375 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9afc20949a4d63c4d132…

1 0