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

Ziqing Hui : d2d1/tests: Add tests for GetPropertyCount().
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 5a58ea8c2a98ce8b8b91c257b495541db363e70e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a58ea8c2a98ce8b8b91c257… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jun 30 11:19:17 2022 +0300 d2d1/tests: Add tests for GetPropertyCount(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a43843bb8ca..3d517983e69 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11238,6 +11238,9 @@ static void test_effect_properties(BOOL d3d11) hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + count = ID2D1Effect_GetPropertyCount(effect); + ok(count == 2, "Got unexpected property count %u.\n", count); + index = ID2D1Effect_GetPropertyIndex(effect, L"Context"); ok(index == 0, "Got unexpected index %u.\n", index); index = ID2D1Effect_GetPropertyIndex(effect, L"Integer"); @@ -11322,10 +11325,10 @@ static void test_effect_2d_affine(BOOL d3d11) { D2D1_MATRIX_3X2_F rotate, scale, skew; D2D1_BITMAP_PROPERTIES1 bitmap_desc; + unsigned int i, x, y, w, h, count; D2D_RECT_F output_bounds = {0}; struct d2d1_test_context ctx; ID2D1DeviceContext *context; - unsigned int i, x, y, w, h; D2D1_SIZE_U input_size; ID2D1Factory1 *factory; D2D1_POINT_2F offset; @@ -11404,6 +11407,9 @@ static void test_effect_2d_affine(BOOL d3d11) check_system_properties(effect, TRUE); + count = ID2D1Effect_GetPropertyCount(effect); + todo_wine ok(count == 4, "Got unexpected property count %u.\n", count); + for (i = 0; i < ARRAY_SIZE(effect_2d_affine_tests); ++i) { const struct effect_2d_affine_test *test = &effect_2d_affine_tests[i]; @@ -11474,11 +11480,11 @@ static void test_effect_crop(BOOL d3d11) D2D_RECT_F output_bounds; D2D1_SIZE_U input_size; ID2D1Factory1 *factory; + unsigned int count, i; ID2D1Bitmap1 *bitmap; DWORD image[16 * 16]; ID2D1Effect *effect; ID2D1Image *output; - unsigned int i; HRESULT hr; const struct crop_effect_test @@ -11516,6 +11522,9 @@ static void test_effect_crop(BOOL d3d11) check_system_properties(effect, TRUE); + count = ID2D1Effect_GetPropertyCount(effect); + todo_wine ok(count == 2, "Got unexpected property count %u.\n", count); + for (i = 0; i < ARRAY_SIZE(crop_effect_tests); ++i) { const struct crop_effect_test *test = &crop_effect_tests[i]; @@ -11565,10 +11574,10 @@ static void test_effect_grayscale(BOOL d3d11) ID2D1DeviceContext *context; D2D1_SIZE_U input_size; ID2D1Factory3 *factory; + unsigned int count, i; ID2D1Bitmap1 *bitmap; ID2D1Effect *effect; ID2D1Image *output; - unsigned int i; HRESULT hr; const DWORD test_pixels[] = {0xffffffff, 0x12345678, 0x89abcdef, 0x77777777, 0xdeadbeef}; @@ -11591,6 +11600,9 @@ static void test_effect_grayscale(BOOL d3d11) check_system_properties(effect, TRUE); + count = ID2D1Effect_GetPropertyCount(effect); + ok(!count, "Got unexpected property count %u.\n", count); + for (i = 0; i < ARRAY_SIZE(test_pixels); ++i) { DWORD pixel = test_pixels[i];

1 0

Ziqing Hui : d2d1/tests: Test value size checking for custom properties.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 34a701f29eee4cb0e353e6a5a38787ec6774f9d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34a701f29eee4cb0e353e6a5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 22 18:50:01 2022 +0800 d2d1/tests: Test value size checking for custom properties. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3d517983e69..78f255c1f99 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10690,7 +10690,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_set_integer(IUnknown *iface, const { struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); - if (!data || data_size != sizeof(effect_impl->integer)) + if (!data) return E_INVALIDARG; effect_impl->integer = *((UINT *)data); @@ -10703,7 +10703,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_integer(const IUnknown *iface, { struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); - if (!data || data_size != sizeof(effect_impl->integer)) + if (!data) return E_INVALIDARG; *((UINT *)data) = effect_impl->integer; @@ -10718,7 +10718,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, { struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); - if (!data || data_size != sizeof(effect_impl->effect_context)) + if (!data) return E_INVALIDARG; *((ID2D1EffectContext **)data) = effect_impl->effect_context; @@ -11247,6 +11247,12 @@ static void test_effect_properties(BOOL d3d11) ok(index == 1, "Got unexpected index %u.\n", index); effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValueByName(effect, + L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValueByName(effect, + L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_GetValueByName(effect, L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -11254,6 +11260,10 @@ static void test_effect_properties(BOOL d3d11) "Got unexpected effect context %p.\n", effect_context); effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(effect_context != NULL && effect_context != (ID2D1EffectContext *)0xdeadbeef, @@ -11263,16 +11273,28 @@ static void test_effect_properties(BOOL d3d11) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); integer = 0xdeadbeef; + hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(integer == 10, "Got unexpected integer %u.", integer); integer = 0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(integer == 10, "Got unexpected integer %u.", integer); integer = 20; + hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) - 1); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) + 1); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); integer = 0xdeadbeef;

1 0

Rémi Bernon : winex11.drv: Rename display settings handlers to settings_handler.
by Alexandre Julliard 30 Jun '22

30 Jun '22

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

Rémi Bernon : winex11.drv: Use nameless structs and unions in settings.c.
by Alexandre Julliard 30 Jun '22

30 Jun '22

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: Merge settings.c into display.c.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 5cc3808a629b8517c3d7375284bfab9f01c818b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc3808a629b8517c3d73752… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 14:14:33 2022 +0200 winex11.drv: Merge settings.c into display.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/display.c | 962 +++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 999 ------------------------------------------- 3 files changed, 962 insertions(+), 1000 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5cc3808a629b8517c3d7…

1 0

Rémi Bernon : winex11.drv: Avoid requesting current mode in X11DRV_desktop_get_modes.
by Alexandre Julliard 30 Jun '22

30 Jun '22

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+ tab parts.
by Alexandre Julliard 30 Jun '22

30 Jun '22

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

Zhiyi Zhang : light.msstyles: Add taskdialog class.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: c894d9a41ca91e616e87b04e8916dd18eb6c97d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c894d9a41ca91e616e87b04e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 1 15:49:32 2022 +0800 light.msstyles: Add taskdialog class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 44 +++ ...skdialog_expando_button_expanded_hover_19px.bmp | Bin 0 -> 1734 bytes ...skdialog_expando_button_expanded_hover_19px.svg | 6 + ...skdialog_expando_button_expanded_hover_24px.bmp | Bin 0 -> 2634 bytes ...skdialog_expando_button_expanded_hover_24px.svg | 6 + ...skdialog_expando_button_expanded_hover_29px.bmp | Bin 0 -> 3850 bytes ...skdialog_expando_button_expanded_hover_29px.svg | 6 + ...skdialog_expando_button_expanded_hover_33px.bmp | Bin 0 -> 5022 bytes ...skdialog_expando_button_expanded_hover_33px.svg | 6 + ...skdialog_expando_button_expanded_hover_38px.bmp | Bin 0 -> 6522 bytes ...skdialog_expando_button_expanded_hover_38px.svg | 6 + ...skdialog_expando_button_expanded_hover_43px.bmp | Bin 0 -> 8222 bytes ...skdialog_expando_button_expanded_hover_43px.svg | 6 + ...skdialog_expando_button_expanded_hover_48px.bmp | Bin 0 -> 10314 bytes ...skdialog_expando_button_expanded_hover_48px.svg | 6 + ...kdialog_expando_button_expanded_normal_19px.bmp | Bin 0 -> 1734 bytes ...kdialog_expando_button_expanded_normal_19px.svg | 6 + ...kdialog_expando_button_expanded_normal_24px.bmp | Bin 0 -> 2634 bytes ...kdialog_expando_button_expanded_normal_24px.svg | 6 + ...kdialog_expando_button_expanded_normal_29px.bmp | Bin 0 -> 3850 bytes ...kdialog_expando_button_expanded_normal_29px.svg | 6 + ...kdialog_expando_button_expanded_normal_33px.bmp | Bin 0 -> 5022 bytes ...kdialog_expando_button_expanded_normal_33px.svg | 6 + ...kdialog_expando_button_expanded_normal_38px.bmp | Bin 0 -> 6522 bytes ...kdialog_expando_button_expanded_normal_38px.svg | 6 + ...kdialog_expando_button_expanded_normal_43px.bmp | Bin 0 -> 8222 bytes ...kdialog_expando_button_expanded_normal_43px.svg | 6 + ...kdialog_expando_button_expanded_normal_48px.bmp | Bin 0 -> 10314 bytes ...kdialog_expando_button_expanded_normal_48px.svg | 6 + ...dialog_expando_button_expanded_pressed_19px.bmp | Bin 0 -> 1734 bytes ...dialog_expando_button_expanded_pressed_19px.svg | 6 + ...dialog_expando_button_expanded_pressed_24px.bmp | Bin 0 -> 2634 bytes ...dialog_expando_button_expanded_pressed_24px.svg | 6 + ...dialog_expando_button_expanded_pressed_29px.bmp | Bin 0 -> 3850 bytes ...dialog_expando_button_expanded_pressed_29px.svg | 6 + ...dialog_expando_button_expanded_pressed_33px.bmp | Bin 0 -> 5022 bytes ...dialog_expando_button_expanded_pressed_33px.svg | 6 + ...dialog_expando_button_expanded_pressed_38px.bmp | Bin 0 -> 6522 bytes ...dialog_expando_button_expanded_pressed_38px.svg | 6 + ...dialog_expando_button_expanded_pressed_43px.bmp | Bin 0 -> 8222 bytes ...dialog_expando_button_expanded_pressed_43px.svg | 6 + ...dialog_expando_button_expanded_pressed_48px.bmp | Bin 0 -> 10314 bytes ...dialog_expando_button_expanded_pressed_48px.svg | 6 + .../blue_taskdialog_expando_button_hover_19px.bmp | Bin 0 -> 1734 bytes .../blue_taskdialog_expando_button_hover_19px.svg | 6 + .../blue_taskdialog_expando_button_hover_24px.bmp | Bin 0 -> 2634 bytes .../blue_taskdialog_expando_button_hover_24px.svg | 6 + .../blue_taskdialog_expando_button_hover_29px.bmp | Bin 0 -> 3850 bytes .../blue_taskdialog_expando_button_hover_29px.svg | 6 + .../blue_taskdialog_expando_button_hover_33px.bmp | Bin 0 -> 5022 bytes .../blue_taskdialog_expando_button_hover_33px.svg | 6 + .../blue_taskdialog_expando_button_hover_38px.bmp | Bin 0 -> 6522 bytes .../blue_taskdialog_expando_button_hover_38px.svg | 6 + .../blue_taskdialog_expando_button_hover_43px.bmp | Bin 0 -> 8222 bytes .../blue_taskdialog_expando_button_hover_43px.svg | 6 + .../blue_taskdialog_expando_button_hover_48px.bmp | Bin 0 -> 10314 bytes .../blue_taskdialog_expando_button_hover_48px.svg | 6 + .../blue_taskdialog_expando_button_normal_19px.bmp | Bin 0 -> 1734 bytes .../blue_taskdialog_expando_button_normal_19px.svg | 6 + .../blue_taskdialog_expando_button_normal_24px.bmp | Bin 0 -> 2634 bytes .../blue_taskdialog_expando_button_normal_24px.svg | 6 + .../blue_taskdialog_expando_button_normal_29px.bmp | Bin 0 -> 3850 bytes .../blue_taskdialog_expando_button_normal_29px.svg | 6 + .../blue_taskdialog_expando_button_normal_33px.bmp | Bin 0 -> 5022 bytes .../blue_taskdialog_expando_button_normal_33px.svg | 6 + .../blue_taskdialog_expando_button_normal_38px.bmp | Bin 0 -> 6522 bytes .../blue_taskdialog_expando_button_normal_38px.svg | 6 + .../blue_taskdialog_expando_button_normal_43px.bmp | Bin 0 -> 8222 bytes .../blue_taskdialog_expando_button_normal_43px.svg | 6 + .../blue_taskdialog_expando_button_normal_48px.bmp | Bin 0 -> 10314 bytes .../blue_taskdialog_expando_button_normal_48px.svg | 6 + ...blue_taskdialog_expando_button_pressed_19px.bmp | Bin 0 -> 1734 bytes ...blue_taskdialog_expando_button_pressed_19px.svg | 6 + ...blue_taskdialog_expando_button_pressed_24px.bmp | Bin 0 -> 2634 bytes ...blue_taskdialog_expando_button_pressed_24px.svg | 6 + ...blue_taskdialog_expando_button_pressed_29px.bmp | Bin 0 -> 3850 bytes ...blue_taskdialog_expando_button_pressed_29px.svg | 6 + ...blue_taskdialog_expando_button_pressed_33px.bmp | Bin 0 -> 5022 bytes ...blue_taskdialog_expando_button_pressed_33px.svg | 6 + ...blue_taskdialog_expando_button_pressed_38px.bmp | Bin 0 -> 6522 bytes ...blue_taskdialog_expando_button_pressed_38px.svg | 6 + ...blue_taskdialog_expando_button_pressed_43px.bmp | Bin 0 -> 8222 bytes ...blue_taskdialog_expando_button_pressed_43px.svg | 6 + ...blue_taskdialog_expando_button_pressed_48px.bmp | Bin 0 -> 10314 bytes ...blue_taskdialog_expando_button_pressed_48px.svg | 6 + .../blue_taskdialog_footnote_separator.bmp | Bin 0 -> 146 bytes .../blue_taskdialog_footnote_separator.svg | 13 + .../blue_taskdialog_secondary_panel.bmp | Bin 0 -> 146 bytes .../blue_taskdialog_secondary_panel.svg | 13 + dlls/light.msstyles/light.rc | 347 +++++++++++++++++++++ 90 files changed, 669 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c894d9a41ca91e616e87…

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ toolbar parts.
by Alexandre Julliard 30 Jun '22

30 Jun '22

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

Zhiyi Zhang : light.msstyles: Add Vista+ tooltip parts.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 4c292e773fc0ba044a3f8b7dd7eecb37a8e08a30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c292e773fc0ba044a3f8b7d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 15 16:11:33 2022 +0800 light.msstyles: Add Vista+ tooltip parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 16 + dlls/light.msstyles/blue_tooltip_ballon.bmp | Bin 0 -> 754 bytes dlls/light.msstyles/blue_tooltip_ballon.svg | 12 + .../blue_tooltip_ballon_stem_21px.bmp | Bin 0 -> 10722 bytes .../blue_tooltip_ballon_stem_21px.svg | 177 ++++++ .../blue_tooltip_ballon_stem_26px.bmp | Bin 0 -> 16362 bytes .../blue_tooltip_ballon_stem_26px.svg | 203 +++++++ .../blue_tooltip_ballon_stem_32px.bmp | Bin 0 -> 24714 bytes .../blue_tooltip_ballon_stem_32px.svg | 253 +++++++++ .../blue_tooltip_ballon_stem_42px.bmp | Bin 0 -> 42474 bytes .../blue_tooltip_ballon_stem_42px.svg | 319 +++++++++++ .../blue_tooltip_ballon_stem_53px.bmp | Bin 0 -> 66918 bytes .../blue_tooltip_ballon_stem_53px.svg | 406 ++++++++++++++ .../blue_tooltip_ballon_stem_63px.bmp | Bin 0 -> 95394 bytes .../blue_tooltip_ballon_stem_63px.svg | 472 ++++++++++++++++ .../blue_tooltip_ballon_stem_84px.bmp | Bin 0 -> 169482 bytes .../blue_tooltip_ballon_stem_84px.svg | 619 +++++++++++++++++++++ dlls/light.msstyles/blue_tooltip_standard.bmp | Bin 0 -> 754 bytes dlls/light.msstyles/blue_tooltip_standard.svg | 12 + dlls/light.msstyles/blue_tooltip_wrench_17px.bmp | Bin 0 -> 3402 bytes dlls/light.msstyles/blue_tooltip_wrench_17px.svg | 24 + dlls/light.msstyles/blue_tooltip_wrench_21px.bmp | Bin 0 -> 5178 bytes dlls/light.msstyles/blue_tooltip_wrench_21px.svg | 24 + dlls/light.msstyles/blue_tooltip_wrench_26px.bmp | Bin 0 -> 7626 bytes dlls/light.msstyles/blue_tooltip_wrench_26px.svg | 24 + dlls/light.msstyles/blue_tooltip_wrench_34px.bmp | Bin 0 -> 13194 bytes dlls/light.msstyles/blue_tooltip_wrench_34px.svg | 24 + dlls/light.msstyles/blue_tooltip_wrench_42px.bmp | Bin 0 -> 20298 bytes dlls/light.msstyles/blue_tooltip_wrench_42px.svg | 24 + dlls/light.msstyles/blue_tooltip_wrench_51px.bmp | Bin 0 -> 29514 bytes dlls/light.msstyles/blue_tooltip_wrench_51px.svg | 24 + dlls/light.msstyles/blue_tooltip_wrench_68px.bmp | Bin 0 -> 52362 bytes dlls/light.msstyles/blue_tooltip_wrench_68px.svg | 24 + dlls/light.msstyles/light.rc | 127 +++++ 34 files changed, 2784 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c292e773fc0ba044a3f…

1 0