January 2023 - Wine-Commits

Gabriel Ivăncescu : win32u: Initialize the tracking_info for NtUserDrawScrollBar params.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: 29ebb5b3ec2b09a77676df31f21eb9142ee287f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/29ebb5b3ec2b09a77676df31f21eb9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 6 21:20:06 2023 +0200 win32u: Initialize the tracking_info for NtUserDrawScrollBar params. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/win32u/scroll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index de688e36f23..ce3af5189d3 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -354,6 +354,7 @@ void draw_scroll_bar( HWND hwnd, HDC hdc, int bar, enum SCROLL_HITTEST hit_test, params.hdc = hdc; params.bar = bar; params.hit_test = hit_test; + params.tracking_info = *tracking_info; params.arrows = draw_arrows; params.interior = draw_interior; KeUserModeCallback( NtUserDrawScrollBar, &params, sizeof(params), &ret_ptr, &ret_len );

1 0

Eric Pouech : user32/tests: Retry when opening the clipboard.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: e439611d100603d02fdb586b8e6cbce9822e24e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e439611d100603d02fdb586b8e6cbc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 9 09:31:02 2023 +0100 user32/tests: Retry when opening the clipboard. As the clipboard is a shared resource, we cannot expect that no other app hasn't openeded it. So wrap clipboard access with a retry feature in case of failure. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/user32/tests/edit.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 2afbbd5bea4..1918d1c10e9 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -32,6 +32,35 @@ #define ID_EDITTEST2 99 #define MAXLEN 200 +static BOOL open_clipboard(HWND hwnd) +{ + DWORD start = GetTickCount(); + while (1) + { + BOOL ret = OpenClipboard(hwnd); + if (ret || GetLastError() != ERROR_ACCESS_DENIED) + return ret; + if (GetTickCount() - start > 100) + { + char classname[256]; + DWORD le = GetLastError(); + HWND clipwnd = GetOpenClipboardWindow(); + /* Provide a hint as to the source of interference: + * - The class name would typically be CLIPBRDWNDCLASS if the + * clipboard was opened by a Windows application using the + * ole32 API. + * - And it would be __wine_clipboard_manager if it was opened in + * response to a native application. + */ + GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); + trace("%p (%s) opened the clipboard\n", clipwnd, classname); + SetLastError(le); + return ret; + } + Sleep(15); + } +} + struct edit_notify { int en_change, en_maxtext, en_update; }; @@ -2192,7 +2221,7 @@ static void test_espassword(void) ok(r == strlen(password), "Expected: %s, got len %ld\n", password, r); ok(strcmp(buffer, password) == 0, "expected %s, got %s\n", password, buffer); - r = OpenClipboard(hwEdit); + r = open_clipboard(hwEdit); ok(r == TRUE, "expected %d, got %ld le=%lu\n", TRUE, r, GetLastError()); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %ld\n", TRUE, r); @@ -3195,7 +3224,7 @@ static void test_paste(void) strcpy(buffer, str); GlobalUnlock(hmem); - r = OpenClipboard(hEdit); + r = open_clipboard(hEdit); ok(r == TRUE, "expected %d, got %d le=%lu\n", TRUE, r, GetLastError()); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); @@ -3218,7 +3247,7 @@ static void test_paste(void) strcpy(buffer, str2); GlobalUnlock(hmem); - r = OpenClipboard(hEdit); + r = open_clipboard(hEdit); ok(r == TRUE, "expected %d, got %d le=%lu\n", TRUE, r, GetLastError()); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r);

1 0

Zhiyi Zhang : win32u: Introduce a get_display_depth() helper to retrieve emulated display depth.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: d81cf4ed555e87e469146829b86bd3bca801efd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d81cf4ed555e87e469146829b86bd3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jan 3 22:38:09 2023 +0800 win32u: Introduce a get_display_depth() helper to retrieve emulated display depth. Using EnumDisplaySettings() directly to query display depth has a high overhead when using the XRandR 1.0 display device handler on some NVIDIA setups. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51420 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53382 --- dlls/win32u/driver.c | 19 +++++++++++++------ dlls/win32u/sysparams.c | 25 +++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/winemac.drv/display.c | 8 ++++++++ dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/macdrv.h | 1 + dlls/winex11.drv/display.c | 10 ++++++++++ dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 1 + include/wine/gdi_driver.h | 1 + 10 files changed, 62 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 557d555d673..e2c9ba04efd 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -207,18 +207,13 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case BITSPIXEL: { UNICODE_STRING display; - DEVMODEW devmode; DC *dc; if (NtGdiGetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY) { dc = get_nulldrv_dc( dev ); - memset( &devmode, 0, sizeof(devmode) ); - devmode.dmSize = sizeof(devmode); RtlInitUnicodeString( &display, dc->display ); - if (NtUserEnumDisplaySettings( &display, ENUM_CURRENT_SETTINGS, &devmode, 0 ) && - (devmode.dmFields & DM_BITSPERPEL) && devmode.dmBitsPerPel) - return devmode.dmBitsPerPel; + return get_display_depth( &display ); } return 32; } @@ -764,6 +759,11 @@ static BOOL nulldrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LP return FALSE; /* use default implementation */ } +static INT nulldrv_GetDisplayDepth( LPCWSTR name, BOOL is_primary ) +{ + return 32; +} + static BOOL nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, BOOL force, void *param ) { return FALSE; @@ -1077,6 +1077,11 @@ static BOOL loaderdrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, return load_driver()->pGetCurrentDisplaySettings( name, is_primary, mode ); } +static INT loaderdrv_GetDisplayDepth( LPCWSTR name, BOOL is_primary ) +{ + return load_driver()->pGetDisplayDepth( name, is_primary ); +} + static void loaderdrv_SetCursor( HCURSOR cursor ) { load_driver()->pSetCursor( cursor ); @@ -1179,6 +1184,7 @@ static const struct user_driver_funcs lazy_load_driver = /* display modes */ loaderdrv_ChangeDisplaySettings, loaderdrv_GetCurrentDisplaySettings, + loaderdrv_GetDisplayDepth, loaderdrv_UpdateDisplayDevices, /* windowing functions */ loaderdrv_CreateDesktopWindow, @@ -1254,6 +1260,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version SET_USER_FUNC(UpdateClipboard); SET_USER_FUNC(ChangeDisplaySettings); SET_USER_FUNC(GetCurrentDisplaySettings); + SET_USER_FUNC(GetDisplayDepth); SET_USER_FUNC(UpdateDisplayDevices); SET_USER_FUNC(CreateDesktopWindow); SET_USER_FUNC(CreateWindow); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 13aaaa308c9..2269193b7ff 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2655,6 +2655,31 @@ static unsigned int active_monitor_count(void) return count; } +INT get_display_depth( UNICODE_STRING *name ) +{ + struct display_device *device; + INT depth; + + if (!lock_display_devices()) + return 32; + + if (name && name->Length) + device = find_adapter_device_by_name( name ); + else + device = find_adapter_device_by_id( 0 ); /* use primary adapter */ + + if (!device) + { + unlock_display_devices(); + return 32; + } + + depth = user_driver->pGetDisplayDepth( device->device_name, + !!(device->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE) ); + unlock_display_devices(); + return depth; +} + /*********************************************************************** * NtUserEnumDisplayMonitors (win32u.@) */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index dfa83daba91..96b1b7647fe 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -334,6 +334,7 @@ extern BOOL enable_thunk_lock DECLSPEC_HIDDEN; extern HBRUSH get_55aa_brush(void) DECLSPEC_HIDDEN; extern DWORD get_dialog_base_units(void) DECLSPEC_HIDDEN; extern LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, int *height ) DECLSPEC_HIDDEN; +extern INT get_display_depth( UNICODE_STRING *name ) DECLSPEC_HIDDEN; extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN; extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 12e12d297d9..dab81cc8ffb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -927,6 +927,14 @@ BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, BOOL is_primary, LPDEVMOD return TRUE; } +/*********************************************************************** + * GetDisplayDepth (MACDRV.@) + * + */ +INT macdrv_GetDisplayDepth(LPCWSTR name, BOOL is_primary) +{ + return get_default_bpp(); +} /*********************************************************************** * GetDeviceGammaRamp (MACDRV.@) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 193a3f4bbd2..fd1da722061 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -276,6 +276,7 @@ static const struct user_driver_funcs macdrv_funcs = .pDestroyCursorIcon = macdrv_DestroyCursorIcon, .pDestroyWindow = macdrv_DestroyWindow, .pGetCurrentDisplaySettings = macdrv_GetCurrentDisplaySettings, + .pGetDisplayDepth = macdrv_GetDisplayDepth, .pUpdateDisplayDevices = macdrv_UpdateDisplayDevices, .pGetCursorPos = macdrv_GetCursorPos, .pGetKeyboardLayoutList = macdrv_GetKeyboardLayoutList, diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index f6f9e5b6c67..40f70e55094 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -124,6 +124,7 @@ extern BOOL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) DECLSPEC_HIDDEN; extern void macdrv_Beep(void) DECLSPEC_HIDDEN; extern LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid) DECLSPEC_HIDDEN; extern BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR name, BOOL is_primary, LPDEVMODEW devmode) DECLSPEC_HIDDEN; +extern INT macdrv_GetDisplayDepth(LPCWSTR name, BOOL is_primary) DECLSPEC_HIDDEN; extern LRESULT macdrv_ClipboardWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; extern BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 5e8305432a0..34085c49543 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -239,6 +239,16 @@ static DWORD get_display_depth(ULONG_PTR display_id) return screen_bpp; } +INT X11DRV_GetDisplayDepth(LPCWSTR name, BOOL is_primary) +{ + ULONG_PTR id; + + if (settings_handler.get_id( name, is_primary, &id )) + return get_display_depth( id ); + + return screen_bpp; +} + /*********************************************************************** * GetCurrentDisplaySettings (X11DRV.@) * diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 4ebe3a16367..7e343591413 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -405,6 +405,7 @@ static const struct user_driver_funcs x11drv_funcs = .pClipCursor = X11DRV_ClipCursor, .pChangeDisplaySettings = X11DRV_ChangeDisplaySettings, .pGetCurrentDisplaySettings = X11DRV_GetCurrentDisplaySettings, + .pGetDisplayDepth = X11DRV_GetDisplayDepth, .pUpdateDisplayDevices = X11DRV_UpdateDisplayDevices, .pCreateDesktopWindow = X11DRV_CreateDesktopWindow, .pCreateWindow = X11DRV_CreateWindow, diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b394795a326..4997367ce9a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -216,6 +216,7 @@ extern BOOL X11DRV_GetCursorPos( LPPOINT pos ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ClipCursor( LPCRECT clip ) DECLSPEC_HIDDEN; extern LONG X11DRV_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW devmode ) DECLSPEC_HIDDEN; +extern INT X11DRV_GetDisplayDepth( LPCWSTR name, BOOL is_primary ) DECLSPEC_HIDDEN; extern BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateDesktopWindow( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index d074c09cceb..3db3d0d6af3 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -299,6 +299,7 @@ struct user_driver_funcs /* display modes */ LONG (*pChangeDisplaySettings)(LPDEVMODEW,LPCWSTR,HWND,DWORD,LPVOID); BOOL (*pGetCurrentDisplaySettings)(LPCWSTR,BOOL,LPDEVMODEW); + INT (*pGetDisplayDepth)(LPCWSTR,BOOL); BOOL (*pUpdateDisplayDevices)(const struct gdi_device_manager *,BOOL,void*); /* windowing functions */ BOOL (*pCreateDesktopWindow)(HWND);

1 0

Hans Leidekker : iphlpapi: Handle errors from DnsQueryConfig(DnsConfigDnsServerList).
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: fbf4544f7d49fab5bc00b972cd6c9441004cf3e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbf4544f7d49fab5bc00b972cd6c94… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 6 14:05:45 2023 +0100 iphlpapi: Handle errors from DnsQueryConfig(DnsConfigDnsServerList). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52557 --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a95a581532f..f8fb5de3f0e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2599,6 +2599,7 @@ static DWORD get_dns_server_list( const NET_LUID *luid, IP_ADDR_STRING *list, IP for (;;) { err = DnsQueryConfig( DnsConfigDnsServerList, 0, NULL, NULL, servers, &array_len ); + if (err != ERROR_SUCCESS && err != ERROR_MORE_DATA) goto err; num = (array_len - FIELD_OFFSET(IP4_ARRAY, AddrArray[0])) / sizeof(IP4_ADDRESS); needed = num * sizeof(IP_ADDR_STRING); if (!list || *len < needed)

1 0

Alistair Leslie-Hughes : faudio: Purge and clear notifications on ShutDown.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: 8e9763871b6f33e298c4c24627c490b1b46dda7e URL: https://gitlab.winehq.org/wine/wine/-/commit/8e9763871b6f33e298c4c24627c490… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 9 07:06:11 2023 +1100 faudio: Purge and clear notifications on ShutDown. Cherry-picked from upstream commit 16f86bffec36b6e82e5c93d5f04ebc4ee4f980ab. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54264 --- libs/faudio/src/FACT.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/faudio/src/FACT.c b/libs/faudio/src/FACT.c index 649abf2111c..d40e56f12e6 100644 --- a/libs/faudio/src/FACT.c +++ b/libs/faudio/src/FACT.c @@ -352,6 +352,16 @@ uint32_t FACTAudioEngine_ShutDown(FACTAudioEngine *pEngine) FAudio_StopEngine(pEngine->audio); } + /* Purge All pending notifactions */ + while (pEngine->wb_notifications_list) + { + FACTNotification *note = (FACTNotification*) pEngine->wb_notifications_list->entry; + pEngine->notificationCallback(note); + LinkedList_RemoveEntry(&pEngine->wb_notifications_list, note, pEngine->apiLock, pEngine->pFree); + } + + pEngine->notifications = 0; + /* This method destroys all existing cues, sound banks, and wave banks. * It blocks until all cues are destroyed. */

1 0

Alexandre Julliard : gitlab: Add a daily win10 test run.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: 1bc133a3d34cbf89a772c50bc423205eaa0cdb9e URL: https://gitlab.winehq.org/wine/wine/-/commit/1bc133a3d34cbf89a772c50bc42320… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 16:43:33 2023 +0100 gitlab: Add a daily win10 test run. --- tools/gitlab/build.yml | 2 +- tools/gitlab/test.yml | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 6bc253b2c77..12ffe86dd62 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -63,7 +63,7 @@ build-daily-linux: build-winetest: stage: build - image: $CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/debian:bullseye + image: $CI_REGISTRY/wine/wine:debian-bullseye rules: - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index d2b1966ad6e..da34390bc1f 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -71,3 +71,31 @@ debian-64: - job: build-daily-linux script: - wine usr/local/lib/wine/x86_64-windows/winetest.exe -q -t gitlab-$CI_JOB_NAME -u $CI_JOB_URL + +win10-21h2-32: + stage: test + interruptible: true + variables: + GIT_STRATEGY: none + rules: + - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + needs: + - job: build-winetest + tags: + - win10-21h2 + script: + - ./winetest.exe -q -t gitlab-$CI_JOB_NAME -u $CI_JOB_URL + +win10-21h2-64: + stage: test + interruptible: true + variables: + GIT_STRATEGY: none + rules: + - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + needs: + - job: build-winetest + tags: + - win10-21h2 + script: + - ./winetest64.exe -q -t gitlab-$CI_JOB_NAME -u $CI_JOB_URL

1 0

Alexandre Julliard : kernelbase: Fix FindNLSStringEx for strings with no primary weights.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: 448e68ab5b937d168f5d091d8f65a7de534a9891 URL: https://gitlab.winehq.org/wine/wine/-/commit/448e68ab5b937d168f5d091d8f65a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 11:50:20 2023 +0100 kernelbase: Fix FindNLSStringEx for strings with no primary weights. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53583 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53837 --- dlls/kernel32/tests/locale.c | 10 +++++++ dlls/kernelbase/locale.c | 66 +++++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 40706c15755..886240cc22c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6741,6 +6741,16 @@ static void test_FindNLSStringEx(void) { localeW, FIND_ENDSWITH, L"SimpleSimple", L"Simp", -1, 0xdeadbeef}, { localeW, FIND_FROMSTART, comb_s_accent1W, comb_s_accent2W, 0, 6 }, { localeW, FIND_FROMSTART, comb_q_accent1W, comb_q_accent2W, 2, 7 }, + { localeW, FIND_STARTSWITH, L"--Option", L"--", 0, 2}, + { localeW, FIND_ENDSWITH, L"Option--", L"--", 6, 2}, + { localeW, FIND_FROMSTART, L"----", L"--", 0, 2}, + { localeW, FIND_FROMEND, L"----", L"--", 2, 2}, + { localeW, FIND_FROMSTART, L"opt1--opt2--opt3", L"--", 4, 2}, + { localeW, FIND_FROMEND, L"opt1--opt2--opt3", L"--", 10, 2}, + { localeW, FIND_FROMSTART, L"x-oss-security", L"x-oss-", 0, 6}, + { localeW, FIND_FROMSTART, L"x-oss-security", L"-oss", 1, 4}, + { localeW, FIND_FROMSTART, L"x-oss-security", L"-oss--", -1, 0xdeadbeef}, + { localeW, FIND_FROMEND, L"x-oss-oss2", L"-oss", 5, 4}, }; unsigned int i; diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 5cc4152e491..1e96e49622e 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3892,7 +3892,7 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH struct sortkey_state val; BYTE primary[32]; BYTE primary_val[256]; - int i, start, found = -1, foundlen, pos = 0; + int i, start, len, found = -1, foundlen = 0, pos = 0; BOOL have_extra, have_extra_val; BYTE case_mask = 0x3f; UINT except = sortid->except; @@ -3915,43 +3915,47 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH for (start = 0; start < srclen; start++) { - pos = start; - while (pos < srclen && s.primary_pos < val.key_primary.len) + for (len = start + 1; len <= srclen; len++) { - while (pos < srclen && !s.key_primary.len) - pos += append_weights( sortid, flags, src, srclen, pos, - case_mask, except, compr_tables, &s, TRUE ); - - if (s.primary_pos + s.key_primary.len > val.key_primary.len) goto next; - if (memcmp( primary, val.key_primary.buf + s.primary_pos, s.key_primary.len )) goto next; - s.primary_pos += s.key_primary.len; - s.key_primary.len = 0; - } - if (s.primary_pos < val.key_primary.len) goto next; + pos = start; + while (pos < len && s.primary_pos <= val.key_primary.len) + { + while (pos < len && !s.key_primary.len) + pos += append_weights( sortid, flags, src, srclen, pos, + case_mask, except, compr_tables, &s, TRUE ); + + if (s.primary_pos + s.key_primary.len > val.key_primary.len) goto next; + if (memcmp( primary, val.key_primary.buf + s.primary_pos, s.key_primary.len )) goto next; + s.primary_pos += s.key_primary.len; + s.key_primary.len = 0; + } + if (s.primary_pos < val.key_primary.len) goto next; - have_extra = remove_unneeded_weights( sortid, &s ); - if (compare_sortkeys( &s.key_diacritic, &val.key_diacritic, FALSE )) goto next; - if (compare_sortkeys( &s.key_case, &val.key_case, FALSE )) goto next; + have_extra = remove_unneeded_weights( sortid, &s ); + if (compare_sortkeys( &s.key_diacritic, &val.key_diacritic, FALSE )) goto next; + if (compare_sortkeys( &s.key_case, &val.key_case, FALSE )) goto next; - if (have_extra && have_extra_val) - { - for (i = 0; i < 4; i++) - if (compare_sortkeys( &s.key_extra[i], &val.key_extra[i], i != 1 )) goto next; - } - else if (have_extra || have_extra_val) goto next; + if (have_extra && have_extra_val) + { + for (i = 0; i < 4; i++) + if (compare_sortkeys( &s.key_extra[i], &val.key_extra[i], i != 1 )) goto next; + } + else if (have_extra || have_extra_val) goto next; - if (compare_sortkeys( &s.key_special, &val.key_special, FALSE )) goto next; + if (compare_sortkeys( &s.key_special, &val.key_special, FALSE )) goto next; - found = start; - foundlen = pos - start; - if (flags & FIND_FROMSTART) break; + found = start; + foundlen = pos - start; + len = srclen; /* no need to continue checking longer strings */ - next: + next: + /* reset state */ + s.key_primary.len = s.key_diacritic.len = s.key_case.len = s.key_special.len = 0; + s.key_extra[0].len = s.key_extra[1].len = s.key_extra[2].len = s.key_extra[3].len = 0; + s.primary_pos = 0; + } if (flags & FIND_STARTSWITH) break; - /* reset state */ - s.key_primary.len = s.key_diacritic.len = s.key_case.len = s.key_special.len = 0; - s.key_extra[0].len = s.key_extra[1].len = s.key_extra[2].len = s.key_extra[3].len = 0; - s.primary_pos = 0; + if (flags & FIND_FROMSTART && found != -1) break; } if (found != -1)

1 0

Alexandre Julliard : Update copyright info for 2023.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: 1c83f47893af5344a817a536b36c04ff5b4418ac URL: https://gitlab.winehq.org/wine/wine/-/commit/1c83f47893af5344a817a536b36c04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 8 12:12:25 2023 +0100 Update copyright info for 2023. --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index e8275c2cfc9..f8aa2b9658d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2022 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2023 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index b8e01166a44..63d526ffe00 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2022 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2023 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index a70dee3b678..95ab04666e8 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -80,7 +80,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2022 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2023 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Jeremy White : gitlab: Add tools for using gitlab-runner with libvirt.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: tools Branch: master Commit: aec25a1a92850342768bbb37e514f47e003bd94e URL: https://gitlab.winehq.org/winehq/tools/-/commit/aec25a1a92850342768bbb37e51… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Jan 9 17:00:56 2023 +0100 gitlab: Add tools for using gitlab-runner with libvirt. --- gitlab/virtrunner/README | 57 ++++++++++ gitlab/virtrunner/cleanup.sh | 7 ++ gitlab/virtrunner/config | 20 ++++ gitlab/virtrunner/config.toml.example | 29 ++++++ gitlab/virtrunner/prepare.sh | 27 +++++ gitlab/virtrunner/qemu-agent.py | 190 ++++++++++++++++++++++++++++++++++ gitlab/virtrunner/run.sh | 15 +++ 7 files changed, 345 insertions(+)

1 0

Alexandre Julliard : Wine release 8.0-rc3
by Alexandre Julliard Jan. 7, 2023

Jan. 7, 2023

Module: website Branch: master Commit: 55e491b7797eaa16d7534162af780a1b973d83a3 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/55e491b7797eaa16d7534162af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 7 11:42:46 2023 +0100 Wine release 8.0-rc3 --- news/en/2023010701.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2023010701.xml b/news/en/2023010701.xml new file mode 100644 index 00000000..06efd494 --- /dev/null +++ b/news/en/2023010701.xml @@ -0,0 +1,13 @@ +<news> +<date>January 7, 2023</date> +<title>Wine 8.0-rc3 Released</title> +<body> + The Wine development release 8.0-rc3 is now available. + <a href="{$root}/announce/8.0-rc3">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.0/wine-8.0-rc3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0