June 2022 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Add _wmakepath_s.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 0c986b2c778022a8c271471b89bd0ff9a3ff7a41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c986b2c778022a8c271471b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:07:04 2022 +0200 ntdll: Add _wmakepath_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/wcstring.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ffc3cb00fcd..cc78f4539f3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1555,6 +1555,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) @ cdecl _wcsupr(wstr) @ cdecl _wcsupr_s(wstr long) +@ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) @ cdecl _wtoi(wstr) @ cdecl -ret64 _wtoi64(wstr) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 76190c08c12..aa43c3de16b 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -1375,3 +1375,80 @@ error: if (ext) ext[0]= 0; return ERANGE; } + + +/********************************************************************* + * _wmakepath_s (NTDLL.@) + */ +errno_t __cdecl _wmakepath_s( wchar_t *path, size_t size, const wchar_t *drive, + const wchar_t *directory, const wchar_t *filename, + const wchar_t *extension ) +{ + wchar_t *p = path; + + if (!path || !size) return EINVAL; + + if (drive && drive[0]) + { + if (size <= 2) goto range; + *p++ = drive[0]; + *p++ = ':'; + size -= 2; + } + + if (directory && directory[0]) + { + unsigned int len = wcslen(directory); + unsigned int needs_separator = directory[len - 1] != '/' && directory[len - 1] != '\\'; + unsigned int copylen = min(size - 1, len); + + if (size < 2) goto range; + memmove(p, directory, copylen * sizeof(wchar_t)); + if (size <= len) goto range; + p += copylen; + size -= copylen; + if (needs_separator) + { + if (size < 2) goto range; + *p++ = '\\'; + size -= 1; + } + } + + if (filename && filename[0]) + { + unsigned int len = wcslen(filename); + unsigned int copylen = min(size - 1, len); + + if (size < 2) goto range; + memmove(p, filename, copylen * sizeof(wchar_t)); + if (size <= len) goto range; + p += len; + size -= len; + } + + if (extension && extension[0]) + { + unsigned int len = wcslen(extension); + unsigned int needs_period = extension[0] != '.'; + unsigned int copylen; + + if (size < 2) goto range; + if (needs_period) + { + *p++ = '.'; + size -= 1; + } + copylen = min(size - 1, len); + memcpy(p, extension, copylen * sizeof(wchar_t)); + if (size <= len) goto range; + p += copylen; + } + + *p = 0; + return 0; + +range: + path[0] = 0; + return ERANGE; +}

1 0

Zhiyi Zhang : d2d1/tests: Fix resource leaks.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 9678d0f9f51297c5db11246acd4227eab8a2079a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9678d0f9f51297c5db11246a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 29 17:48:05 2022 +0800 d2d1/tests: Fix resource leaks. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53231 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 6ba4d8cec59..960d4480747 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1168,7 +1168,8 @@ static void release_test_context_(unsigned int line, struct d2d1_test_context *c IDXGISurface_Release(ctx->surface); IDXGISwapChain_Release(ctx->swapchain); DestroyWindow(ctx->window); - IDXGIDevice_Release(ctx->device); + ref = IDXGIDevice_Release(ctx->device); + ok_(__FILE__, line)(!ref, "Device has %lu references left.\n", ref); } #define init_test_context(ctx, d3d11) init_test_context_(__LINE__, ctx, d3d11) @@ -5182,16 +5183,17 @@ static void test_shared_bitmap(BOOL d3d11) todo_wine_if(i == 2 || i == 3 || i == 5 || i == 6) ok(hr == bitmap_format_tests[i].hr, "%u: Got unexpected hr %#lx.\n", i, hr); - if (SUCCEEDED(bitmap_format_tests[i].hr)) + if (SUCCEEDED(hr) && hr == bitmap_format_tests[i].hr) { pixel_format = ID2D1Bitmap_GetPixelFormat(bitmap2); ok(pixel_format.format == bitmap_format_tests[i].result.format, "%u: unexpected pixel format %#x.\n", i, pixel_format.format); ok(pixel_format.alphaMode == bitmap_format_tests[i].result.alphaMode, "%u: unexpected alpha mode %d.\n", i, pixel_format.alphaMode); + } + if (SUCCEEDED(hr)) ID2D1Bitmap_Release(bitmap2); - } } } @@ -5723,6 +5725,8 @@ static void test_draw_text_layout(BOOL d3d11) IDWriteRenderingParams_Release(rendering_params); } + ID2D1SolidColorBrush_Release(brush2); + ID2D1SolidColorBrush_Release(brush); IDWriteTextFormat_Release(text_format); IDWriteTextLayout_Release(text_layout); IDWriteFactory_Release(dwrite_factory); @@ -8899,7 +8903,7 @@ static void test_bitmap_surface(BOOL d3d11) todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) ok(hr == bitmap_format_tests[i].hr, "%u: Got unexpected hr %#lx.\n", i, hr); - if (SUCCEEDED(bitmap_format_tests[i].hr)) + if (SUCCEEDED(hr) && hr == bitmap_format_tests[i].hr) { pixel_format = ID2D1Bitmap1_GetPixelFormat(bitmap); @@ -8907,9 +8911,10 @@ static void test_bitmap_surface(BOOL d3d11) i, pixel_format.format); ok(pixel_format.alphaMode == bitmap_format_tests[i].result.alphaMode, "%u: unexpected alpha mode %d.\n", i, pixel_format.alphaMode); + } + if (SUCCEEDED(hr)) ID2D1Bitmap1_Release(bitmap); - } } /* A8 surface */ @@ -8943,6 +8948,7 @@ static void test_bitmap_surface(BOOL d3d11) ID2D1DeviceContext_SetTarget(device_context, (ID2D1Image *)bitmap); ID2D1DeviceContext_GetTarget(device_context, &target); ok(target == (ID2D1Image *)bitmap, "Unexpected target.\n"); + ID2D1Image_Release(target); check_rt_bitmap_surface((ID2D1RenderTarget *)device_context, TRUE, D2D1_BITMAP_OPTIONS_NONE); @@ -9036,6 +9042,7 @@ static void test_bitmap_surface(BOOL d3d11) hr = ID2D1Factory1_CreateWicBitmapRenderTarget(factory, wic_bitmap, &rt_desc, &rt); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + IWICBitmap_Release(wic_bitmap); check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); ID2D1RenderTarget_Release(rt); @@ -9423,6 +9430,7 @@ static void test_command_list(BOOL d3d11) { ID2D1DeviceContext_Release(device_context); ID2D1Factory1_Release(factory); + release_test_context(&ctx); return; }

1 0

Alexandre Julliard : ntdll: Add _ui64toa_s.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 4e269f75ecafee10a611e805a21377e523f75f78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e269f75ecafee10a611e805… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:06:06 2022 +0200 ntdll: Add _ui64toa_s. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 51041c4144b..d592b7adbb4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1531,9 +1531,11 @@ @ cdecl _tolower(long) @ cdecl _toupper(long) @ cdecl _ui64toa(int64 ptr long) +@ cdecl _ui64toa_s(int64 ptr long long) @ cdecl _ui64tow(int64 ptr long) @ cdecl _ui64tow_s(int64 ptr long long) @ cdecl _ultoa(long ptr long) +@ cdecl _ultoa_s(long ptr long long) @ cdecl _ultow(long ptr long) @ cdecl _ultow_s(long ptr long long) @ cdecl -norelay _vsnprintf(ptr long str ptr) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index c0db6f832ef..797152a81e1 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -1213,6 +1213,51 @@ char * __cdecl _i64toa( } +/********************************************************************* + * _ui64toa_s (NTDLL.@) + */ +errno_t __cdecl _ui64toa_s( unsigned __int64 value, char *str, size_t size, int radix ) +{ + char buffer[65], *pos; + + if (!str || !size) return EINVAL; + if (radix < 2 || radix > 36) + { + str[0] = 0; + return EINVAL; + } + + pos = buffer + 64; + *pos = 0; + + do { + int digit = value % radix; + value = value / radix; + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } while (value != 0); + + if (buffer - pos + 65 > size) + { + str[0] = 0; + return ERANGE; + } + memcpy( str, pos, buffer - pos + 65 ); + return 0; +} + + +/********************************************************************* + * _ultoa_s (NTDLL.@) + */ +errno_t __cdecl _ultoa_s( __msvcrt_ulong value, char *str, size_t size, int radix ) +{ + return _ui64toa_s( value, str, size, radix ); +} + + /********************************************************************* * _atoi64 (NTDLL.@) *

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ toolbar parts.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: b1ac164257b40a0a031efe01c1ce357f7e51ba5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ac164257b40a0a031efe01… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 14 18:04:53 2022 +0800 light.msstyles: Add Vista+ toolbar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 13 ++- dlls/light.msstyles/blue_toolbar_buttons.bmp | Bin 4890 -> 4170 bytes dlls/light.msstyles/blue_toolbar_buttons.svg | 18 ++- dlls/light.msstyles/blue_toolbar_buttons_split.bmp | Bin 3306 -> 3594 bytes dlls/light.msstyles/blue_toolbar_buttons_split.svg | 14 ++- .../blue_toolbar_buttons_split_dropdown.bmp | Bin 2778 -> 3018 bytes .../blue_toolbar_buttons_split_dropdown.svg | 14 ++- .../blue_toolbar_buttons_split_dropdown_glyph.bmp | Bin 2298 -> 0 bytes .../blue_toolbar_buttons_split_dropdown_glyph.svg | 28 ----- ...e_toolbar_buttons_split_dropdown_glyph_11px.bmp | Bin 0 -> 3306 bytes ...e_toolbar_buttons_split_dropdown_glyph_11px.svg | 37 ++++++ ...e_toolbar_buttons_split_dropdown_glyph_14px.bmp | Bin 0 -> 5514 bytes ...e_toolbar_buttons_split_dropdown_glyph_14px.svg | 37 ++++++ ...e_toolbar_buttons_split_dropdown_glyph_17px.bmp | Bin 0 -> 8298 bytes ...e_toolbar_buttons_split_dropdown_glyph_17px.svg | 37 ++++++ ...e_toolbar_buttons_split_dropdown_glyph_21px.bmp | Bin 0 -> 12234 bytes ...e_toolbar_buttons_split_dropdown_glyph_21px.svg | 37 ++++++ ...e_toolbar_buttons_split_dropdown_glyph_28px.bmp | Bin 0 -> 21642 bytes ...e_toolbar_buttons_split_dropdown_glyph_28px.svg | 37 ++++++ ...ue_toolbar_buttons_split_dropdown_glyph_7px.bmp | Bin 0 -> 1482 bytes ...ue_toolbar_buttons_split_dropdown_glyph_7px.svg | 31 +++++ ...ue_toolbar_buttons_split_dropdown_glyph_9px.bmp | Bin 0 -> 1578 bytes ...ue_toolbar_buttons_split_dropdown_glyph_9px.svg | 37 ++++++ .../blue_toolbar_dropdown_button_glyph_11px.bmp | Bin 0 -> 3306 bytes .../blue_toolbar_dropdown_button_glyph_11px.svg | 37 ++++++ .../blue_toolbar_dropdown_button_glyph_14px.bmp | Bin 0 -> 5514 bytes .../blue_toolbar_dropdown_button_glyph_14px.svg | 37 ++++++ .../blue_toolbar_dropdown_button_glyph_17px.bmp | Bin 0 -> 8298 bytes .../blue_toolbar_dropdown_button_glyph_17px.svg | 37 ++++++ .../blue_toolbar_dropdown_button_glyph_7px.bmp | Bin 0 -> 1482 bytes .../blue_toolbar_dropdown_button_glyph_7px.svg | 31 +++++ .../blue_toolbar_dropdown_button_glyph_9px.bmp | Bin 0 -> 1578 bytes .../blue_toolbar_dropdown_button_glyph_9px.svg | 37 ++++++ .../blue_toolbar_separator_horizontal.bmp | Bin 298 -> 258 bytes .../blue_toolbar_separator_horizontal.svg | 5 +- .../blue_toolbar_separator_vertical.bmp | Bin 298 -> 258 bytes .../blue_toolbar_separator_vertical.svg | 5 +- dlls/light.msstyles/light.rc | 129 ++++++++++++++++++--- 38 files changed, 590 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1ac164257b40a0a031e…

1 0

Rémi Bernon : winex11.drv: Use nameless structs and unions in settings.c.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: a4c36cba8d1ad35711b97c0b75bfe4c73b2f2cdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4c36cba8d1ad35711b97c0b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 14:13:55 2022 +0200 winex11.drv: Use nameless structs and unions in settings.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 69 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4c36cba8d1ad35711b9…

1 0

Rémi Bernon : winex11.drv: Rename display settings handlers to settings_handler.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: b8a639c08c252abce2f77296ec38177a0c31377d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8a639c08c252abce2f77296… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 14:13:11 2022 +0200 winex11.drv: Rename display settings handlers to settings_handler. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index e7e353b33ad..0f9c4c876de 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11settings); +static struct x11drv_settings_handler settings_handler; + struct x11drv_display_setting { ULONG_PTR id; @@ -64,8 +66,6 @@ static const unsigned int depths_24[] = {8, 16, 24}; static const unsigned int depths_32[] = {8, 16, 32}; const unsigned int *depths; -static struct x11drv_settings_handler handler; - /* Cached display modes for a device, protected by modes_section */ static WCHAR cached_device_name[CCHDEVICENAME]; static DWORD cached_flags; @@ -76,10 +76,10 @@ static pthread_mutex_t settings_mutex = PTHREAD_MUTEX_INITIALIZER; void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *new_handler) { - if (new_handler->priority > handler.priority) + if (new_handler->priority > settings_handler.priority) { - handler = *new_handler; - TRACE("Display settings are now handled by: %s.\n", handler.name); + settings_handler = *new_handler; + TRACE("Display settings are now handled by: %s.\n", settings_handler.name); } } @@ -490,7 +490,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW if (n == ENUM_CURRENT_SETTINGS) { - if (!handler.get_id(name, &id) || !handler.get_current_mode(id, devmode)) + if (!settings_handler.get_id(name, &id) || !settings_handler.get_current_mode(id, devmode)) { ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); return FALSE; @@ -505,7 +505,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW pthread_mutex_lock( &settings_mutex ); if (n == 0 || wcsicmp(cached_device_name, name) || cached_flags != flags) { - if (!handler.get_id(name, &id) || !handler.get_modes(id, flags, &modes, &mode_count)) + if (!settings_handler.get_id(name, &id) || !settings_handler.get_modes(id, flags, &modes, &mode_count)) { ERR("Failed to get %s supported display modes.\n", wine_dbgstr_w(name)); pthread_mutex_unlock( &settings_mutex ); @@ -515,7 +515,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); if (cached_modes) - handler.free_modes(cached_modes); + settings_handler.free_modes(cached_modes); lstrcpyW(cached_device_name, name); cached_flags = flags; cached_modes = modes; @@ -525,7 +525,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW if (n >= cached_mode_count) { pthread_mutex_unlock( &settings_mutex ); - WARN("handler:%s device:%s mode index:%#x not found.\n", handler.name, wine_dbgstr_w(name), n); + WARN("handler:%s device:%s mode index:%#x not found.\n", settings_handler.name, wine_dbgstr_w(name), n); SetLastError(ERROR_NO_MORE_FILES); return FALSE; } @@ -562,7 +562,7 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) if (is_detached_mode(dev_mode)) return dev_mode; - if (!handler.get_modes(id, EDS_ROTATEDMODE, &modes, &mode_count)) + if (!settings_handler.get_modes(id, EDS_ROTATEDMODE, &modes, &mode_count)) return NULL; qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); @@ -593,18 +593,18 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) if (!found_mode || mode_idx == mode_count) { - handler.free_modes(modes); + settings_handler.free_modes(modes); return NULL; } if (!(full_mode = malloc(sizeof(*found_mode) + found_mode->dmDriverExtra))) { - handler.free_modes(modes); + settings_handler.free_modes(modes); return NULL; } memcpy(full_mode, found_mode, sizeof(*found_mode) + found_mode->dmDriverExtra); - handler.free_modes(modes); + settings_handler.free_modes(modes); full_mode->dmFields |= DM_POSITION; full_mode->u1.s2.dmPosition = dev_mode->u1.s2.dmPosition; @@ -640,7 +640,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, if (NtUserEnumDisplayDevices( NULL, display_idx, &display_device, 0 )) goto done; - if (!handler.get_id(display_device.DeviceName, &displays[display_idx].id)) + if (!settings_handler.get_id(display_device.DeviceName, &displays[display_idx].id)) { ret = DISP_CHANGE_BADPARAM; goto done; @@ -903,13 +903,13 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT return DISP_CHANGE_BADMODE; TRACE("handler:%s changing %s to position:(%d,%d) resolution:%ux%u frequency:%uHz " - "depth:%ubits orientation:%#x.\n", handler.name, + "depth:%ubits orientation:%#x.\n", settings_handler.name, wine_dbgstr_w(displays[display_idx].desired_mode.dmDeviceName), full_mode->u1.s2.dmPosition.x, full_mode->u1.s2.dmPosition.y, full_mode->dmPelsWidth, full_mode->dmPelsHeight, full_mode->dmDisplayFrequency, full_mode->dmBitsPerPel, full_mode->u1.s2.dmDisplayOrientation); - ret = handler.set_current_mode(displays[display_idx].id, full_mode); + ret = settings_handler.set_current_mode(displays[display_idx].id, full_mode); if (attached_mode && ret == DISP_CHANGE_SUCCESSFUL) set_display_depth(displays[display_idx].id, full_mode->dmBitsPerPel); free_full_mode(full_mode);

1 0

Alexandre Julliard : ntdll: Add _wcstoi64.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: ae1202cef0273fb8dc728d8f039062ea3aa2911f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae1202cef0273fb8dc728d8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:04:36 2022 +0200 ntdll: Add _wcstoi64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/wcstring.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2a119c9a508..2ed68e1bc5d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1540,6 +1540,7 @@ @ cdecl _wcslwr(wstr) @ cdecl _wcslwr_s(wstr long) @ cdecl _wcsnicmp(wstr wstr long) +@ cdecl -ret64 _wcstoi64(wstr ptr long) @ cdecl _wcsupr(wstr) @ cdecl _wcsupr_s(wstr long) @ cdecl _wtoi(wstr) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 97d67ee38d0..06447248235 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -22,6 +22,7 @@ #include <ctype.h> #include <errno.h> +#include <limits.h> #include <stdlib.h> #include <string.h> #include <stdarg.h> @@ -752,6 +753,53 @@ __msvcrt_ulong __cdecl wcstoul(LPCWSTR s, LPWSTR *end, INT base) } +/********************************************************************* + * _wcstoi64 (NTDLL.@) + */ +__int64 __cdecl _wcstoi64( const wchar_t *s, wchar_t **end, int base ) +{ + BOOL negative = FALSE, empty = TRUE; + __int64 ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (wchar_t *)s; + while (iswspace(*s)) s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && !wctoint( *s ) && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = wctoint( *s ) ? 10 : 8; + + while (*s) + { + int v = wctoint( *s ); + if (v < 0 || v >= base) break; + if (negative) v = -v; + s++; + empty = FALSE; + + if (!negative && (ret > I64_MAX / base || ret * base > I64_MAX - v)) + ret = I64_MAX; + else if (negative && (ret < I64_MIN / base || ret * base < I64_MIN - v)) + ret = I64_MIN; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (wchar_t *)s; + return ret; +} + + /********************************************************************* * _ultow (NTDLL.@) *

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ tab parts.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: b5301fb1477a347997f125ec4c53d780ef02ab1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5301fb1477a347997f125ec… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 14 15:47:51 2022 +0800 light.msstyles: Add Vista+ tab parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 774183473a7..e22612122c1 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -1837,6 +1837,11 @@ BLUE_INI TEXTFILE "BgType = ImageFile\r\n" "ImageFile = blue_tab_background.bmp\r\n" +"[Tab.AeroWizardBody]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillColor = 255 255 255\r\n" + "\r\n; Toolbar\r\n" "[Toolbar]\r\n" "BgType = BorderFill\r\n"

1 0

Rémi Bernon : winex11.drv: Avoid requesting current mode in X11DRV_desktop_get_modes.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: b5c65f1ee095a1729ea8dd95a895a404cee48de7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5c65f1ee095a1729ea8dd95… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 15:34:02 2022 +0200 winex11.drv: Avoid requesting current mode in X11DRV_desktop_get_modes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index bc2ba60397b..162b524d504 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -83,6 +83,39 @@ static struct screen_size { #define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_ADD 1 +/* parse the desktop size specification */ +static BOOL parse_size( const WCHAR *size, unsigned int *width, unsigned int *height ) +{ + WCHAR *end; + + *width = wcstoul( size, &end, 10 ); + if (end == size) return FALSE; + if (*end != 'x') return FALSE; + size = end + 1; + *height = wcstoul( size, &end, 10 ); + return !*end; +} + +/* retrieve the default desktop size from the registry */ +static BOOL get_default_desktop_size( unsigned int *width, unsigned int *height ) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; + WCHAR buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + DWORD size; + HKEY hkey; + + /* @@ Wine registry key: HKCU\Software\Wine\Explorer\Desktops */ + if (!(hkey = open_hkcu_key( "Software\\Wine\\Explorer\\Desktops" ))) return FALSE; + + size = query_reg_value( hkey, defaultW, value, sizeof(buffer) ); + NtClose( hkey ); + if (!size || value->Type != REG_SZ) return FALSE; + + if (!parse_size( (const WCHAR *)value->Data, width, height )) return FALSE; + return TRUE; +} + /* Return TRUE if Wine is currently in virtual desktop mode */ BOOL is_virtual_desktop(void) { @@ -118,12 +151,13 @@ static BOOL X11DRV_desktop_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_ { UINT depth_idx, size_idx, mode_idx = 0; UINT screen_width, screen_height; - RECT primary_rect; DEVMODEW *modes; - primary_rect = NtUserGetPrimaryMonitorRect(); - screen_width = primary_rect.right - primary_rect.left; - screen_height = primary_rect.bottom - primary_rect.top; + if (!get_default_desktop_size( &screen_width, &screen_height )) + { + screen_width = max_width; + screen_height = max_height; + } /* Allocate memory for modes in different color depths */ if (!(modes = calloc( (ARRAY_SIZE(screen_sizes) + 2) * DEPTH_COUNT, sizeof(*modes))) )

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ trackbar parts.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: fe944b26f197c08dcac1d37aeac79f534403a170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe944b26f197c08dcac1d37a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 14 18:11:57 2022 +0800 light.msstyles: Add Vista+ trackbar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 24 +++- .../blue_trackbar_thumb_down_11px.bmp | Bin 4318 -> 4318 bytes .../blue_trackbar_thumb_down_11px.svg | 11 +- .../blue_trackbar_thumb_down_15px.bmp | Bin 7638 -> 7338 bytes .../blue_trackbar_thumb_down_15px.svg | 13 +-- .../blue_trackbar_thumb_down_17px.bmp | Bin 0 -> 9998 bytes .../blue_trackbar_thumb_down_17px.svg | 20 ++++ .../blue_trackbar_thumb_down_21px.bmp | Bin 18618 -> 0 bytes .../blue_trackbar_thumb_down_21px.svg | 21 ---- .../blue_trackbar_thumb_down_22px.bmp | Bin 0 -> 16858 bytes .../blue_trackbar_thumb_down_22px.svg | 20 ++++ .../blue_trackbar_thumb_down_28px.bmp | Bin 0 -> 27018 bytes .../blue_trackbar_thumb_down_28px.svg | 18 +++ .../blue_trackbar_thumb_down_33px.bmp | Bin 0 -> 37758 bytes .../blue_trackbar_thumb_down_33px.svg | 18 +++ .../blue_trackbar_thumb_down_44px.bmp | Bin 0 -> 67018 bytes .../blue_trackbar_thumb_down_44px.svg | 18 +++ .../blue_trackbar_thumb_left_19px.bmp | Bin 4318 -> 4318 bytes .../blue_trackbar_thumb_left_19px.svg | 15 +-- .../blue_trackbar_thumb_left_29px.bmp | Bin 0 -> 9998 bytes .../blue_trackbar_thumb_left_29px.svg | 20 ++++ .../blue_trackbar_thumb_left_38px.bmp | Bin 0 -> 16858 bytes .../blue_trackbar_thumb_left_38px.svg | 18 +++ .../blue_trackbar_thumb_left_44px.bmp | Bin 17738 -> 0 bytes .../blue_trackbar_thumb_left_44px.svg | 21 ---- .../blue_trackbar_thumb_left_48px.bmp | Bin 0 -> 27018 bytes .../blue_trackbar_thumb_left_48px.svg | 18 +++ .../blue_trackbar_thumb_left_57px.bmp | Bin 0 -> 37758 bytes .../blue_trackbar_thumb_left_57px.svg | 18 +++ .../blue_trackbar_thumb_left_76px.bmp | Bin 0 -> 67018 bytes .../blue_trackbar_thumb_left_76px.svg | 18 +++ .../blue_trackbar_thumb_right_19px.bmp | Bin 4318 -> 4318 bytes .../blue_trackbar_thumb_right_19px.svg | 13 +-- .../blue_trackbar_thumb_right_25px.bmp | Bin 7638 -> 7638 bytes .../blue_trackbar_thumb_right_25px.svg | 13 +-- .../blue_trackbar_thumb_right_29px.bmp | Bin 0 -> 9998 bytes .../blue_trackbar_thumb_right_29px.svg | 20 ++++ .../blue_trackbar_thumb_right_38px.bmp | Bin 0 -> 16858 bytes .../blue_trackbar_thumb_right_38px.svg | 18 +++ .../blue_trackbar_thumb_right_44px.bmp | Bin 17738 -> 0 bytes .../blue_trackbar_thumb_right_44px.svg | 21 ---- .../blue_trackbar_thumb_right_48px.bmp | Bin 0 -> 27018 bytes .../blue_trackbar_thumb_right_48px.svg | 18 +++ .../blue_trackbar_thumb_right_57px.bmp | Bin 0 -> 37758 bytes .../blue_trackbar_thumb_right_57px.svg | 18 +++ .../blue_trackbar_thumb_right_76px.bmp | Bin 0 -> 67018 bytes .../blue_trackbar_thumb_right_76px.svg | 18 +++ .../light.msstyles/blue_trackbar_thumb_up_11px.bmp | Bin 4318 -> 4318 bytes .../light.msstyles/blue_trackbar_thumb_up_11px.svg | 11 +- .../light.msstyles/blue_trackbar_thumb_up_15px.bmp | Bin 7638 -> 7338 bytes .../light.msstyles/blue_trackbar_thumb_up_15px.svg | 13 +-- .../light.msstyles/blue_trackbar_thumb_up_17px.bmp | Bin 0 -> 9998 bytes .../light.msstyles/blue_trackbar_thumb_up_17px.svg | 20 ++++ .../light.msstyles/blue_trackbar_thumb_up_21px.bmp | Bin 18618 -> 0 bytes .../light.msstyles/blue_trackbar_thumb_up_21px.svg | 21 ---- .../light.msstyles/blue_trackbar_thumb_up_22px.bmp | Bin 0 -> 16858 bytes .../light.msstyles/blue_trackbar_thumb_up_22px.svg | 18 +++ .../light.msstyles/blue_trackbar_thumb_up_28px.bmp | Bin 0 -> 27018 bytes .../light.msstyles/blue_trackbar_thumb_up_28px.svg | 18 +++ .../light.msstyles/blue_trackbar_thumb_up_33px.bmp | Bin 0 -> 37758 bytes .../light.msstyles/blue_trackbar_thumb_up_33px.svg | 18 +++ .../light.msstyles/blue_trackbar_thumb_up_44px.bmp | Bin 0 -> 67018 bytes .../light.msstyles/blue_trackbar_thumb_up_44px.svg | 18 +++ dlls/light.msstyles/light.rc | 121 +++++++++++++++++---- 64 files changed, 531 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe944b26f197c08dcac1…

1 0