- wine-devel - winehq.org

[PATCH] include: Add proofofpossessioncookieinfo.idl file.
by Jacek Caban 28 Jun '21

28 Jun '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/proofofpossessioncookieinfo.idl | 70 +++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 include/proofofpossessioncookieinfo.idl

1 0

[PATCH 1/3] reg: Support use of registry views when deleting registry values
by Hugh McMaster 28 Jun '21

28 Jun '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/delete.c | 22 ++++++++++++++++++---- programs/reg/tests/delete.c | 28 ++++++++++++++-------------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 8804e16e52f..f6965493faa 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -35,7 +35,7 @@ static void output_error(LONG rc) } } -static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, +static int run_delete(HKEY root, WCHAR *path, REGSAM sam, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL value_all, BOOL force) { LONG rc; @@ -72,7 +72,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name return 0; } - if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey))) + if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE|sam, &hkey))) { output_error(rc); return 1; @@ -132,6 +132,7 @@ int reg_delete(int argc, WCHAR *argvW[]) HKEY root; WCHAR *path, *key_name, *value_name = NULL; BOOL value_all = FALSE, value_empty = FALSE, force = FALSE; + REGSAM sam = 0; int i; if (!parse_registry_key(argvW[2], &root, &path)) @@ -158,8 +159,18 @@ int reg_delete(int argc, WCHAR *argvW[]) value_empty = TRUE; continue; } - else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64")) + else if (!lstrcmpiW(str, L"reg:32")) + { + if (sam & KEY_WOW64_32KEY) goto invalid; + sam |= KEY_WOW64_32KEY; + continue; + } + else if (!lstrcmpiW(str, L"reg:64")) + { + if (sam & KEY_WOW64_64KEY) goto invalid; + sam |= KEY_WOW64_64KEY; continue; + } else if (!str[0] || str[1]) goto invalid; @@ -181,9 +192,12 @@ int reg_delete(int argc, WCHAR *argvW[]) if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) goto invalid; + if (sam == (KEY_WOW64_32KEY|KEY_WOW64_64KEY)) + goto invalid; + key_name = get_long_key(root, path); - return run_delete(root, path, key_name, value_name, value_empty, value_all, force); + return run_delete(root, path, sam, key_name, value_name, value_empty, value_all, force); invalid: output_message(STRING_INVALID_SYNTAX); diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index d6a3b7e1d04..102fc0d788a 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -270,17 +270,17 @@ static void test_registry_view_win64(void) open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); run_reg_exe("reg delete HKLM\\" KEY_BASE " /v DWORD /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "DWORD"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "DWORD"); run_reg_exe("reg delete HKLM\\" KEY_BASE " /ve /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, NULL); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, NULL); run_reg_exe("reg delete HKLM\\" KEY_BASE " /va /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "String"); - todo_wine verify_reg_nonexist(hkey, "Multiple Strings"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "String"); + verify_reg_nonexist(hkey, "Multiple Strings"); verify_key(hkey, "Subkey", KEY_WOW64_32KEY); run_reg_exe("reg delete HKLM\\" KEY_BASE "\\Subkey /f /reg:32", &r); @@ -380,17 +380,17 @@ static void test_registry_view_wow64(void) open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); run_reg_exe("reg delete HKLM\\" KEY_BASE " /v DWORD /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "DWORD"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "DWORD"); run_reg_exe("reg delete HKLM\\" KEY_BASE " /ve /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, NULL); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, NULL); run_reg_exe("reg delete HKLM\\" KEY_BASE " /va /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "String"); - todo_wine verify_reg_nonexist(hkey, "Multiple Strings"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "String"); + verify_reg_nonexist(hkey, "Multiple Strings"); verify_key(hkey, "Subkey", KEY_WOW64_64KEY); run_reg_exe("reg delete HKLM\\" KEY_BASE "\\Subkey /f /reg:64", &r); -- 2.32.0

1 2

[RFC] Wayland driver development - June 2021 update
by Alexandros Frantzis 28 Jun '21

28 Jun '21

Hi all, For the past few months I have been working on improving the experimental Wayland driver (original announcement here [1], first update here [2]). The result of this work is an update which adds several major features: * Vulkan support * Multimonitor support * HiDPI handling * Cursor clipping/relative movement * Wayland keymap handling To get, build and use the Wayland driver do (note that building with Wayland requires wayland-client, wayland-egl and xkbcommon development files to be present on the system): $ git clone -b wayland https://gitlab.collabora.com/alf/wine/ $ cd wine $ ./configure --with-wayland [--with-vulkan --with-vkd3d] $ make [-jN] $ DISPLAY= WAYLAND_DISPLAY=wayland-0 ./wine ... I have uploaded a video showcasing the new features here: https://youtu.be/AyzOnMv7rTc Vulkan support comes with window management handling (resizing, fullscreen etc), and can be used either directly or to implement Direct3D through either WineD3D or DXVK. The Wayland driver now exposes multiple monitors to Wine and supports dynamic addition and removal of monitors. It also supports changing the application-perceived resolution of each monitor (through compositor scaling, see previous update [2]) to implement per-monitor mode changes. For HiDPI handling the Wayland driver exposes a high resolution (i.e., the native monitor resolution) by default, and leaves it to the application/Wine to perform any scaling (e.g., setting LogPixels). Note that although Wayland supports per-monitor scale factors (but not mixed-scaling for the same Wayland surface) the Wine core support for this is not yet in place. At the moment, when windows are presented on multiple monitors with different (Wayland) scale factors, the part of the window in its "main" monitor is presented in high/native resolution while other parts are scaled by the compositor. The "main" monitor for a window changes only when that window moves fully to another monitor. It's sometimes useful to let the Wayland compositor automatically perform a (naive) scaling based on the monitor scale factor. This is supported by setting the driver option HKCU\Software\Wine\Wayland Driver\HiDPIScaling (or corresponding per app option) to "Compositor" (the default being "Application"). To implement cursor clipping and provide relative mouse movement (important for first person perspective games) the driver utilizes heuristics to best map application requests to the corresponding Wayland functionality (pointer-constraints and relative-pointer protocols). Finally, the new Wayland keymap handling allows users to transparently use the current keymap of their Wayland session in Wine applications (although it doesn't allow changing it from the Wine side). --- I think the driver has reached a point where it has enough features to be useful for many use cases and also provide enough confidence that it is a viable option going forward. My plan now is to mainly focus on fixes/improvements and to start preparing for staging by creating a more upstream/review friendly patchset series. I am looking forward to any feedback or questions. Thanks, Alexandros [1] https://www.winehq.org/pipermail/wine-devel/2020-December/178575.html [2] https://www.winehq.org/pipermail/wine-devel/2021-February/181325.html

2 1

[PATCH vkd3d v5 1/6] vkd3d-shader: Pass a struct vkd3d_shader_register_range to vkd3d_dxbc_compiler_emit_combined_sampler_declarations().
by Conor McCarthy 28 Jun '21

28 Jun '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index aed15b94..c70c431e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5464,7 +5464,7 @@ static uint32_t vkd3d_dxbc_compiler_get_image_type_id(struct vkd3d_dxbc_compiler } static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *resource, unsigned int resource_space, unsigned int resource_index, + const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register_range *resource_range, enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_component_type sampled_type, unsigned int structure_stride, bool raw, const struct vkd3d_spirv_resource_type *resource_type_info) { @@ -5486,7 +5486,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ { current = &shader_interface->combined_samplers[i]; - if (current->resource_space != resource_space || current->resource_index != resource_index) + if (current->resource_space != resource_range->space || current->resource_index != resource_range->first) continue; if (!(current->flags & resource_type_flag)) @@ -5501,7 +5501,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING, "Combined descriptor binding for resource %u, space %u, " "and sampler %u, space %u has unsupported ‘count’ %u.", - resource_index, resource_space, current->sampler_index, + resource_range->first, resource_range->space, current->sampler_index, current->sampler_space, current->binding.count); } @@ -5510,8 +5510,8 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ depth = current->sampler_index != VKD3D_SHADER_DUMMY_SAMPLER_INDEX && (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE); - image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource, resource_space, - resource_index, resource_type_info, sampled_type, structure_stride || raw, depth); + image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource, resource_range->space, + resource_range->first, resource_type_info, sampled_type, structure_stride || raw, depth); type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image_type_id); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); @@ -5521,17 +5521,17 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, var_id, &current->binding); if (current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX) - vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_dummy_sampler", resource_space, resource_index); + vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_dummy_sampler", resource_range->space, + resource_range->first); else - vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_s%u_%u", resource_space, resource_index, + vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_s%u_%u", resource_range->space, resource_range->first, current->sampler_space, current->sampler_index); vkd3d_symbol_make_combined_sampler(&symbol, resource, current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX ? 0 : current->sampler_space, current->sampler_index); symbol.id = var_id; - symbol.info.resource.range.space = resource_space; - symbol.info.resource.range.first = resource_index; + symbol.info.resource.range = *resource_range; symbol.info.resource.sampled_type = sampled_type; symbol.info.resource.type_id = image_type_id; symbol.info.resource.resource_type_info = resource_type_info; @@ -5569,8 +5569,8 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, resource, NULL)) { - vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, reg, register_space, - register_index, resource_type, sampled_type, structure_stride, raw, resource_type_info); + vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, reg, &resource->range, + resource_type, sampled_type, structure_stride, raw, resource_type_info); return; } -- 2.31.1

2 11

[PATCH] ntdll: Return SessionId 1 in NtQueryInformationToken(TokenSessionId).
by Gijs Vermeulen 28 Jun '21

28 Jun '21

From: Alexander Gabello <alexandergabello(a)mail.weber.edu> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46595 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/unix/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 6a088e84e4d..8c40ea03d8e 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -419,7 +419,7 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c case TokenSessionId: { - *(DWORD *)info = 0; + *(DWORD *)info = 1; FIXME("QueryInformationToken( ..., TokenSessionId, ...) semi-stub\n"); } break; -- 2.32.0

1 0

[PATCH v2] Allow 16-bit executables to be loaded from build directory.
by Bernhard Übelacker 28 Jun '21

28 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51214 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- v2: Supersede 208473 Correction to subject and Wine-Bug line, added signed-off-by This patch is kind of related to commits: bb065801a69 and a0425b9610a. These are the events that seem to lead to the failure: - Loading of module rundll.exe16 fails - Therefore hPrevInstance is zero, which is put into context.Esi - Somehow this seem to lead to the segfault. Unfortunately the last instructions are not shown properly. 2918 WARN("Failed to load module %s; status=%x\n", debugstr_w(libname), nts); 1: x/i $pc => 0x7bc30b49 <load_dll+217>: test $0x4,%al (rr) bt #0 load_dll (load_path=<optimized out>, libname=<optimized out>, default_ext=<optimized out>, flags=<error reading variable: Could not find the frame base for "load_dll".>, pwm=<optimized out>) at .../wine-git/dlls/ntdll/loader.c:2918 #1 0x7bc328c3 in LdrLoadDll@16 (path_name=<error reading variable: Could not find the frame base for "LdrLoadDll@16".>, flags=<optimized out>, libname=<optimized out>, hModule=<optimized out>) at .../wine-git/dlls/ntdll/loader.c:2966 #2 0x7b026d63 in load_library (libname=0x21fa78, flags=0) at .../wine-git/dlls/kernelbase/loader.c:168 #3 0x7b027bd9 in LoadLibraryExW@12 (name=0x7ffc2c00, file=0x0, flags=0) at .../wine-git/dlls/kernelbase/loader.c:517 #4 0x7b027d35 in LoadLibraryA@4 (name=0x21fb54 "rundll.exe16") at .../wine-git/dlls/kernelbase/loader.c:499 #5 0x664275ca in MODULE_LoadModule16 (libname=0x2a267b "C:\\windows\\rundll.exe", implicit=0, lib_only=0) at .../wine-git/dlls/krnl386.exe16/ne_module.c:959 #6 0x664282fe in LoadModule16@8 (name=0x2a267b "C:\\windows\\rundll.exe", paramBlock=0x21fe92) at .../wine-git/dlls/krnl386.exe16/ne_module.c:1130 #7 0x7eba1c1c in main (argc=4, argv=0x2a2590) at .../wine-git/programs/winevdm/winevdm.c:556 ... (rr) step 1176 hPrevInstance = NE_GetInstance( pModule ); ... 0x66429023 in NE_StartTask () at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/dlls/krnl386.exe16/ne_module.c:1233 1233 context.Esi = pTask->hPrevInstance; ... (rr) bt #0 0x6640395f in wine_call_to_16_regs@12 () #1 0x6643f0e5 in K32WOWCallback16Ex@20 (vpfn16=0, dwFlags=2, cbArgs=4, pArgs=0x0, pdwRetCode=0x13cfc14) at .../wine-git/dlls/krnl386.exe16/wowthunk.c:439 #2 0x66429060 in NE_StartTask () at .../wine-git/dlls/krnl386.exe16/ne_module.c:1240 #3 0x66432e53 in task_start (p=0x26fc58) at .../wine-git/dlls/krnl386.exe16/task.c:475 #4 0x7b62e250 in WriteTapemark@16 () #5 0x7bc555a7 in call_thread_func_wrapper () #6 0x7bc55c60 in call_thread_func (entry=0x66432df0 <task_start>, arg=0x26fc58) at .../wine-git/dlls/ntdll/thread.c:225 ... (rr) stepi 0x6640398e in wine_call_to_16_regs@12 () 1: x/i $pc => 0x6640398e <wine_call_to_16_regs@12+178>: mov 0xa0(%edx),%esi (rr) x/1xw $edx + 0xa0 0x13cfcb4: 0x00000000 (rr) stepi 0x66403994 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x66403994 <wine_call_to_16_regs@12+184>: mov 0x9c(%edx),%edi (rr) 0x6640399a in wine_call_to_16_regs@12 () 1: x/i $pc => 0x6640399a <wine_call_to_16_regs@12+190>: mov 0xb0(%edx),%eax (rr) 0x664039a0 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039a0 <wine_call_to_16_regs@12+196>: mov 0xa4(%edx),%ebx (rr) 0x664039a6 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039a6 <wine_call_to_16_regs@12+202>: mov 0xac(%edx),%ecx (rr) 0x664039ac in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039ac <wine_call_to_16_regs@12+208>: mov 0xa8(%edx),%edx (rr) 0x664039b2 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039b2 <wine_call_to_16_regs@12+214>: popw %ds (rr) 0x664039b4 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039b4 <wine_call_to_16_regs@12+216>: lretw (rr) 0x00000020 in ?? () 1: x/i $pc => 0x20: <error: Cannot access memory at address 0x20> (rr) 0x00000022 in ?? () 1: x/i $pc => 0x22: <error: Cannot access memory at address 0x22> (rr) 0x00000027 in ?? () 1: x/i $pc => 0x27: <error: Cannot access memory at address 0x27> (rr) 0x00000000 in ?? () 1: x/i $pc => 0x0: <error: Cannot access memory at address 0x0> (rr) 0x00000005 in ?? () 1: x/i $pc => 0x5: <error: Cannot access memory at address 0x5> (rr) Thread 8 received signal SIGSEGV, Segmentation fault. 0x00000005 in ?? () 1: x/i $pc => 0x5: <error: Cannot access memory at address 0x5> --- dlls/ntdll/loader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 54806b0ab22..da539258eb3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2675,6 +2675,7 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne if (!get_env_var( L"WINEBUILDDIR", 20 + 2 * wcslen(name), new_name )) { + len = new_name->Length; RtlAppendUnicodeToString( new_name, L"\\dlls\\" ); RtlAppendUnicodeToString( new_name, name ); if ((ext = wcsrchr( name, '.' )) && !wcscmp( ext, L".dll" )) new_name->Length -= 4 * sizeof(WCHAR); @@ -2685,6 +2686,17 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, L".fake" ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status != STATUS_DLL_NOT_FOUND) goto done; + + new_name->Length = len; + RtlAppendUnicodeToString( new_name, L"\\programs\\" ); + RtlAppendUnicodeToString( new_name, name ); + RtlAppendUnicodeToString( new_name, L"\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + RtlAppendUnicodeToString( new_name, L".fake" ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } -- 2.30.2

1 0

[PATCH 1/5] hid: Return HIDP_STATUS_INCOMPATIBLE_REPORT_ID when id mismatches.
by Rémi Bernon 28 Jun '21

28 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 5 +++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 59f18276b38..6261c3c2f68 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -96,13 +96,14 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR { const struct hid_value_caps *caps, *caps_end; NTSTATUS status; + BOOL incompatible = FALSE; LONG remaining = *count; for (status = get_value_caps_range( preparsed, report_type, report_len, &caps, &caps_end ); status == HIDP_STATUS_SUCCESS && caps != caps_end; caps++) { if (!match_value_caps( caps, filter )) continue; - if (filter->report_id && caps->report_id != filter->report_id) continue; + if (filter->report_id && caps->report_id != filter->report_id) incompatible = TRUE; else if (filter->array && (caps->is_range || caps->report_count <= 1)) return HIDP_STATUS_NOT_VALUE_ARRAY; else if (remaining-- > 0) status = callback( caps, user ); } @@ -111,7 +112,7 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR if (status != HIDP_STATUS_SUCCESS) return status; *count -= remaining; - if (*count == 0) return HIDP_STATUS_USAGE_NOT_FOUND; + if (*count == 0) return incompatible ? HIDP_STATUS_INCOMPATIBLE_REPORT_ID : HIDP_STATUS_USAGE_NOT_FOUND; if (remaining < 0) return HIDP_STATUS_BUFFER_TOO_SMALL; return HIDP_STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 432bc168259..753957a8ac6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2292,14 +2292,12 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_SetUsageValue returned %#x\n", status); report[0] = 2; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_SetUsageValue returned %#x\n", status); report[0] = report_id; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, @@ -2330,13 +2328,11 @@ static void test_hidp(HANDLE file, int report_id) report[0] = 1 - report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_GetUsageValue returned %#x\n", status); report[0] = 2; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_GetUsageValue returned %#x\n", status); report[0] = report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, &value, -- 2.32.0

2 6

[PATCH 2/5] nsi: Add a stub implementation of NsiGetParameter().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 8 ++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 23 +++++++++++++++++++++++ include/wine/nsi.h | 2 ++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 3691dd5ad2b..bf52fe248c8 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -51,3 +51,11 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + DWORD param_type, void *data, DWORD data_size, DWORD data_offset ) +{ + FIXME( "%d %p %d %p %d %d %p %d %d: stub\n", unk, module, table, key, key_size, + param_type, data, data_size, data_offset ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 7db46c83e94..46757988146 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -12,7 +12,7 @@ @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity -@ stub NsiGetParameter +@ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) @ stub NsiGetParameterEx @ stub NsiRegisterChangeNotification @ stub NsiRegisterChangeNotificationEx diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index e0c0fcf168b..72c9dcdccbd 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -75,6 +75,29 @@ todo_wine ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); ok( get_stat.if_index == stat->if_index, "mismatch\n" ); ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), + FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); + ok( !err, "got %d\n", err ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &get_stat.if_index, sizeof(get_stat.if_index), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_index) ); + ok( !err, "got %d\n", err ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &get_stat.if_guid, sizeof(get_stat.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); winetest_pop_context(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 547ed91ce41..8b276e76b82 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -100,5 +100,7 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); +DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + DWORD param_type, void *data, DWORD data_size, DWORD data_offset ); #endif /* __WINE_NSI_H */ -- 2.23.0

2 2

[PATCH v2 5/5] nsi: Add a stub implementation of NsiGetAllParametersEx().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 23 +++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 30 ++++++++++++++++++++++++++++++ include/wine/nsi.h | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 1ed0cfad916..4e55721475b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -84,8 +84,31 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) { + struct nsi_get_all_parameters_ex params; + FIXME( "%d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.unknown2 = 0; + params.key = key; + params.key_size = key_size; + params.rw_data = rw_data; + params.rw_size = rw_size; + params.dynamic_data = dynamic_data; + params.dynamic_size = dynamic_size; + params.static_data = static_data; + params.static_size = static_size; + + return NsiGetAllParametersEx( &params ); +} + +DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 912a5e8d052..376d25438aa 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -9,7 +9,7 @@ @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stdcall NsiGetAllParameters(long ptr long ptr long ptr long ptr long ptr long) -@ stub NsiGetAllParametersEx +@ stdcall NsiGetAllParametersEx(ptr) @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity @ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 5e2ea71646c..7c2c57b9548 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -40,6 +40,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + struct nsi_get_all_parameters_ex get_all_params; struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -81,6 +82,35 @@ todo_wine memset( &get_dyn, 0xcc, sizeof(get_dyn) ); memset( &get_stat, 0xcc, sizeof(get_stat) ); + memset( &get_all_params, 0, sizeof(get_all_params) ); + get_all_params.first_arg = 1; + get_all_params.module = &NPI_MS_NDIS_MODULEID; + get_all_params.table = NSI_NDIS_IFINFO_TABLE; + get_all_params.key = luid_tbl + i; + get_all_params.key_size = sizeof(*luid_tbl); + get_all_params.rw_data = &get_rw; + get_all_params.rw_size = rw_size; + get_all_params.dynamic_data = &get_dyn; + get_all_params.dynamic_size = sizeof(get_dyn); + get_all_params.static_data = &get_stat; + get_all_params.static_size = sizeof(get_stat); + + err = NsiGetAllParametersEx( &get_all_params ); + ok( !err, "got %d\n", err ); + /* test a selection of members */ + ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( get_rw.phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( get_rw.phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 999b8a57810..81d221324e9 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -116,6 +116,23 @@ struct nsi_enumerate_all_ex DWORD_PTR count; }; +struct nsi_get_all_parameters_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD unknown2; + const void *key; + DWORD key_size; + void *rw_data; + DWORD rw_size; + void *dynamic_data; + DWORD dynamic_size; + void *static_data; + DWORD static_size; +}; + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); @@ -128,6 +145,7 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); +DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ); DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, DWORD param_type, void *data, DWORD data_size, DWORD data_offset ); -- 2.23.0

1 0

[PATCH v2 4/5] nsi: Add a stub implementation of NsiEnumerateObjectsAllParametersEx().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 27 +++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 20 ++++++++++++++++++++ include/wine/nsi.h | 19 +++++++++++++++++++ 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 66054ffacd6..1ed0cfad916 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -43,8 +43,35 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, DWORD *count ) { + struct nsi_enumerate_all_ex params; + DWORD err; + FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.second_arg = unk2; + params.key_data = key_data; + params.key_size = key_size; + params.rw_data = rw_data; + params.rw_size = rw_size; + params.dynamic_data = dynamic_data; + params.dynamic_size = dynamic_size; + params.static_data = static_data; + params.static_size = static_size; + params.count = *count; + + err = NsiEnumerateObjectsAllParametersEx( &params ); + *count = params.count; + return err; +} + +DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index d4a29c38fe6..912a5e8d052 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -4,7 +4,7 @@ @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx @ stdcall NsiEnumerateObjectsAllParameters(long long ptr long ptr long ptr long ptr long ptr long ptr) -@ stub NsiEnumerateObjectsAllParametersEx +@ stdcall NsiEnumerateObjectsAllParametersEx(ptr) @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index b1befd548cd..5e2ea71646c 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -40,6 +40,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -159,6 +160,25 @@ todo_wine ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "%d: mismatch\n", i ); } + memset( &enum_params, 0, sizeof(enum_params) ); + enum_params.first_arg = 1; + enum_params.second_arg = 1; + enum_params.module = &NPI_MS_NDIS_MODULEID; + enum_params.table = NSI_NDIS_IFINFO_TABLE; + enum_params.key_data = enum_luid_tbl; + enum_params.key_size = sizeof(*enum_luid_tbl); + enum_params.rw_data = enum_rw_tbl; + enum_params.rw_size = rw_size; + enum_params.dynamic_data = enum_dyn_tbl; + enum_params.dynamic_size = sizeof(*enum_dyn_tbl); + enum_params.static_data = enum_stat_tbl; + enum_params.static_size = sizeof(*enum_stat_tbl); + enum_params.count = count; + + err = NsiEnumerateObjectsAllParametersEx( &enum_params ); + ok( !err, "got %d\n", err ); + ok( enum_params.count == count, "mismatch\n" ); + free( enum_luid_tbl ); free( enum_rw_tbl ); free( enum_dyn_tbl ); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 648adac9931..999b8a57810 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -98,6 +98,24 @@ struct nsi_ndis_ifinfo_static #define NSI_PARAM_TYPE_DYNAMIC 1 #define NSI_PARAM_TYPE_STATIC 2 +struct nsi_enumerate_all_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD second_arg; + void *key_data; + DWORD key_size; + void *rw_data; + DWORD rw_size; + void *dynamic_data; + DWORD dynamic_size; + void *static_data; + DWORD static_size; + DWORD_PTR count; +}; + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); @@ -105,6 +123,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, DWORD *count ); +DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, -- 2.23.0

1 0

[PATCH v2 3/5] nsi: Add a stub implementation of NsiEnumerateObjectsAllParameters().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 10 ++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 72 +++++++++++++++++++++++++++++++++++++++++--- include/wine/nsi.h | 4 +++ 4 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index bf52fe248c8..66054ffacd6 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -38,6 +38,16 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_MODULEID *module, DWORD table, + void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, + DWORD *count ) +{ + FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) { FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 46757988146..d4a29c38fe6 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -3,7 +3,7 @@ @ stub NsiCancelChangeNotification @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx -@ stub NsiEnumerateObjectsAllParameters +@ stdcall NsiEnumerateObjectsAllParameters(long long ptr long ptr long ptr long ptr long ptr long ptr) @ stub NsiEnumerateObjectsAllParametersEx @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 72c9dcdccbd..b1befd548cd 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -37,11 +37,11 @@ static void test_nsi_api( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), sizeof(struct nsi_ndis_ifinfo_rw) }; - struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw; - struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn; - struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat; - DWORD err, count, i, rw_size; - NET_LUID *luid_tbl; + struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; + struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + DWORD err, count, i, rw_size, enum_count; + NET_LUID *luid_tbl, *enum_luid_tbl; /* Use the NDIS ifinfo table to test various api */ for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) @@ -101,6 +101,68 @@ todo_wine winetest_pop_context(); } + enum_count = 0; + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &enum_count ); + ok( !err, "got %d\n", err ); + ok( enum_count == count, "mismatch\n" ); + + enum_luid_tbl = malloc( count * sizeof(*enum_luid_tbl) ); + enum_rw_tbl = malloc( count * rw_size ); + enum_dyn_tbl = malloc( count * sizeof(*enum_dyn_tbl) ); + enum_stat_tbl = malloc( count * sizeof(*enum_stat_tbl) ); + + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + enum_luid_tbl, sizeof(*enum_luid_tbl), enum_rw_tbl, rw_size, + enum_dyn_tbl, sizeof(*enum_dyn_tbl), enum_stat_tbl, sizeof(*enum_stat_tbl), + &enum_count ); + ok( !err, "got %d\n", err ); + ok( enum_count == count, "mismatch\n" ); + + for (i = 0; i < count; i++) + { + winetest_push_context( "%d", i ); + rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + enum_rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)enum_rw_tbl + i * rw_size); + dyn = dyn_tbl + i; + enum_dyn = enum_dyn_tbl + i; + stat = stat_tbl + i; + enum_stat = enum_stat_tbl + i; + + /* test a selection of members */ + ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "mismatch\n" ); + ok( IsEqualGUID( &enum_rw->network_guid, &rw->network_guid ), "mismatch\n" ); + ok( enum_rw->alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( enum_rw->alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( enum_rw->phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( enum_rw->phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( enum_dyn->oper_status == dyn->oper_status, "mismatch\n" ); + ok( enum_stat->if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &enum_stat->if_guid, &stat->if_guid ), "mismatch\n" ); + winetest_pop_context(); + } + + if (count > 0) + { + enum_count--; + memset( enum_luid_tbl, 0xcc, count * sizeof(*enum_luid_tbl) ); + + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + enum_luid_tbl, sizeof(*enum_luid_tbl), enum_rw_tbl, rw_size, + enum_dyn_tbl, sizeof(*enum_dyn_tbl), enum_stat_tbl, sizeof(*enum_stat_tbl), + &enum_count ); + ok( err == ERROR_MORE_DATA, "got %d\n", err ); + ok( enum_count == count - 1, "mismatch\n" ); + + for (i = 0; i < enum_count; i++) /* for simplicity just check the luids */ + ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "%d: mismatch\n", i ); + } + + free( enum_luid_tbl ); + free( enum_rw_tbl ); + free( enum_dyn_tbl ); + free( enum_stat_tbl ); NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index e0370b00d41..648adac9931 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -101,6 +101,10 @@ struct nsi_ndis_ifinfo_static DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); +DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_MODULEID *module, DWORD table, + void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, + DWORD *count ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, -- 2.23.0

1 0

[PATCH v2 2/5] nsi: Add a stub implementation of NsiGetParameter().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 8 ++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 23 +++++++++++++++++++++++ include/wine/nsi.h | 7 +++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 3691dd5ad2b..bf52fe248c8 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -51,3 +51,11 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + DWORD param_type, void *data, DWORD data_size, DWORD data_offset ) +{ + FIXME( "%d %p %d %p %d %d %p %d %d: stub\n", unk, module, table, key, key_size, + param_type, data, data_size, data_offset ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 7db46c83e94..46757988146 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -12,7 +12,7 @@ @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity -@ stub NsiGetParameter +@ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) @ stub NsiGetParameterEx @ stub NsiRegisterChangeNotification @ stub NsiRegisterChangeNotificationEx diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index e0c0fcf168b..72c9dcdccbd 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -75,6 +75,29 @@ todo_wine ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); ok( get_stat.if_index == stat->if_index, "mismatch\n" ); ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), + FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); + ok( !err, "got %d\n", err ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &get_stat.if_index, sizeof(get_stat.if_index), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_index) ); + ok( !err, "got %d\n", err ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &get_stat.if_guid, sizeof(get_stat.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); winetest_pop_context(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 547ed91ce41..e0370b00d41 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -93,6 +93,11 @@ struct nsi_ndis_ifinfo_static }; /* Undocumented Nsi api */ + +#define NSI_PARAM_TYPE_RW 0 +#define NSI_PARAM_TYPE_DYNAMIC 1 +#define NSI_PARAM_TYPE_STATIC 2 + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); @@ -100,5 +105,7 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); +DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + DWORD param_type, void *data, DWORD data_size, DWORD data_offset ); #endif /* __WINE_NSI_H */ -- 2.23.0

1 0

[PATCH v2 1/5] nsi: Add a stub implementation of NsiGetAllParameters().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 9 ++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 3 +++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d55445a3dd7..3691dd5ad2b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -42,3 +42,12 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi { FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); } + +DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ) +{ + FIXME( "%d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index fc2db9e35c1..7db46c83e94 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -8,7 +8,7 @@ @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) -@ stub NsiGetAllParameters +@ stdcall NsiGetAllParameters(long ptr long ptr long ptr long ptr long ptr long) @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 0cdb1993f1c..e0c0fcf168b 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -33,6 +33,54 @@ static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) return lo <= val && val <= hi; } +static void test_nsi_api( void ) +{ + DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), + sizeof(struct nsi_ndis_ifinfo_rw) }; + struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn; + struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat; + DWORD err, count, i, rw_size; + NET_LUID *luid_tbl; + + /* Use the NDIS ifinfo table to test various api */ + for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) + { + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl, sizeof(*luid_tbl), + (void **)&rw_tbl, rw_sizes[i], (void **)&dyn_tbl, sizeof(*dyn_tbl), + (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); + if (!err) break; + } +todo_wine + ok( !err, "got %d\n", err ); + if (err) return; + rw_size = rw_sizes[i]; + + for (i = 0; i < count; i++) + { + winetest_push_context( "%d", i ); + rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + dyn = dyn_tbl + i; + stat = stat_tbl + i; + + err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + &get_rw, rw_size, &get_dyn, sizeof(get_dyn), &get_stat, sizeof(get_stat) ); + ok( !err, "got %d\n", err ); + /* test a selection of members */ + ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( get_rw.phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( get_rw.phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + winetest_pop_context(); + } + + NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); +} + static void test_ndis_ifinfo( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), @@ -145,5 +193,7 @@ todo_wine START_TEST( nsi ) { + test_nsi_api(); + test_ndis_ifinfo(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 362eaed0c4e..547ed91ce41 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -97,5 +97,8 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); +DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ); #endif /* __WINE_NSI_H */ -- 2.23.0

1 0

[PATCH 3/5] nsi: Add a stub implementation of NsiEnumerateObjectsAllParameters().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 10 ++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 72 +++++++++++++++++++++++++++++++++++++++++--- include/wine/nsi.h | 4 +++ 4 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index bf52fe248c8..66054ffacd6 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -38,6 +38,16 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_MODULEID *module, DWORD table, + void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, + DWORD *count ) +{ + FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) { FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 46757988146..d4a29c38fe6 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -3,7 +3,7 @@ @ stub NsiCancelChangeNotification @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx -@ stub NsiEnumerateObjectsAllParameters +@ stdcall NsiEnumerateObjectsAllParameters(long long ptr long ptr long ptr long ptr long ptr long ptr) @ stub NsiEnumerateObjectsAllParametersEx @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 72c9dcdccbd..b1befd548cd 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -37,11 +37,11 @@ static void test_nsi_api( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), sizeof(struct nsi_ndis_ifinfo_rw) }; - struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw; - struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn; - struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat; - DWORD err, count, i, rw_size; - NET_LUID *luid_tbl; + struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; + struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + DWORD err, count, i, rw_size, enum_count; + NET_LUID *luid_tbl, *enum_luid_tbl; /* Use the NDIS ifinfo table to test various api */ for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) @@ -101,6 +101,68 @@ todo_wine winetest_pop_context(); } + enum_count = 0; + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &enum_count ); + ok( !err, "got %d\n", err ); + ok( enum_count == count, "mismatch\n" ); + + enum_luid_tbl = malloc( count * sizeof(*enum_luid_tbl) ); + enum_rw_tbl = malloc( count * rw_size ); + enum_dyn_tbl = malloc( count * sizeof(*enum_dyn_tbl) ); + enum_stat_tbl = malloc( count * sizeof(*enum_stat_tbl) ); + + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + enum_luid_tbl, sizeof(*enum_luid_tbl), enum_rw_tbl, rw_size, + enum_dyn_tbl, sizeof(*enum_dyn_tbl), enum_stat_tbl, sizeof(*enum_stat_tbl), + &enum_count ); + ok( !err, "got %d\n", err ); + ok( enum_count == count, "mismatch\n" ); + + for (i = 0; i < count; i++) + { + winetest_push_context( "%d", i ); + rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + enum_rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)enum_rw_tbl + i * rw_size); + dyn = dyn_tbl + i; + enum_dyn = enum_dyn_tbl + i; + stat = stat_tbl + i; + enum_stat = enum_stat_tbl + i; + + /* test a selection of members */ + ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "mismatch\n" ); + ok( IsEqualGUID( &enum_rw->network_guid, &rw->network_guid ), "mismatch\n" ); + ok( enum_rw->alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( enum_rw->alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( enum_rw->phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( enum_rw->phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( enum_dyn->oper_status == dyn->oper_status, "mismatch\n" ); + ok( enum_stat->if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &enum_stat->if_guid, &stat->if_guid ), "mismatch\n" ); + winetest_pop_context(); + } + + if (count > 0) + { + enum_count--; + memset( enum_luid_tbl, 0xcc, count * sizeof(*enum_luid_tbl) ); + + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + enum_luid_tbl, sizeof(*enum_luid_tbl), enum_rw_tbl, rw_size, + enum_dyn_tbl, sizeof(*enum_dyn_tbl), enum_stat_tbl, sizeof(*enum_stat_tbl), + &enum_count ); + ok( err == ERROR_MORE_DATA, "got %d\n", err ); + ok( enum_count == count - 1, "mismatch\n" ); + + for (i = 0; i < enum_count; i++) /* for simplicity just check the luids */ + ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "%d: mismatch\n", i ); + } + + free( enum_luid_tbl ); + free( enum_rw_tbl ); + free( enum_dyn_tbl ); + free( enum_stat_tbl ); NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 8b276e76b82..8fd16dd9d97 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -96,6 +96,10 @@ struct nsi_ndis_ifinfo_static DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); +DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_MODULEID *module, DWORD table, + void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, + DWORD *count ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, -- 2.23.0

2 1

[PATCH 5/5] nsi: Add a stub implementation of NsiGetAllParametersEx().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 23 +++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 30 ++++++++++++++++++++++++++++++ include/wine/nsi.h | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 1ed0cfad916..4e55721475b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -84,8 +84,31 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) { + struct nsi_get_all_parameters_ex params; + FIXME( "%d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.unknown2 = 0; + params.key = key; + params.key_size = key_size; + params.rw_data = rw_data; + params.rw_size = rw_size; + params.dynamic_data = dynamic_data; + params.dynamic_size = dynamic_size; + params.static_data = static_data; + params.static_size = static_size; + + return NsiGetAllParametersEx( &params ); +} + +DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 912a5e8d052..376d25438aa 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -9,7 +9,7 @@ @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stdcall NsiGetAllParameters(long ptr long ptr long ptr long ptr long ptr long) -@ stub NsiGetAllParametersEx +@ stdcall NsiGetAllParametersEx(ptr) @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity @ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 5e2ea71646c..7c2c57b9548 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -40,6 +40,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + struct nsi_get_all_parameters_ex get_all_params; struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -81,6 +82,35 @@ todo_wine memset( &get_dyn, 0xcc, sizeof(get_dyn) ); memset( &get_stat, 0xcc, sizeof(get_stat) ); + memset( &get_all_params, 0, sizeof(get_all_params) ); + get_all_params.first_arg = 1; + get_all_params.module = &NPI_MS_NDIS_MODULEID; + get_all_params.table = NSI_NDIS_IFINFO_TABLE; + get_all_params.key = luid_tbl + i; + get_all_params.key_size = sizeof(*luid_tbl); + get_all_params.rw_data = &get_rw; + get_all_params.rw_size = rw_size; + get_all_params.dynamic_data = &get_dyn; + get_all_params.dynamic_size = sizeof(get_dyn); + get_all_params.static_data = &get_stat; + get_all_params.static_size = sizeof(get_stat); + + err = NsiGetAllParametersEx( &get_all_params ); + ok( !err, "got %d\n", err ); + /* test a selection of members */ + ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( get_rw.phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( get_rw.phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 999b8a57810..81d221324e9 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -116,6 +116,23 @@ struct nsi_enumerate_all_ex DWORD_PTR count; }; +struct nsi_get_all_parameters_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD unknown2; + const void *key; + DWORD key_size; + void *rw_data; + DWORD rw_size; + void *dynamic_data; + DWORD dynamic_size; + void *static_data; + DWORD static_size; +}; + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); @@ -128,6 +145,7 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); +DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ); DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, DWORD param_type, void *data, DWORD data_size, DWORD data_offset ); -- 2.23.0

1 0

[PATCH 4/5] nsi: Add a stub implementation of NsiEnumerateObjectsAllParametersEx().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 27 +++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 20 ++++++++++++++++++++ include/wine/nsi.h | 24 ++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 66054ffacd6..1ed0cfad916 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -43,8 +43,35 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, DWORD *count ) { + struct nsi_enumerate_all_ex params; + DWORD err; + FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.second_arg = unk2; + params.key_data = key_data; + params.key_size = key_size; + params.rw_data = rw_data; + params.rw_size = rw_size; + params.dynamic_data = dynamic_data; + params.dynamic_size = dynamic_size; + params.static_data = static_data; + params.static_size = static_size; + params.count = *count; + + err = NsiEnumerateObjectsAllParametersEx( &params ); + *count = params.count; + return err; +} + +DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index d4a29c38fe6..912a5e8d052 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -4,7 +4,7 @@ @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx @ stdcall NsiEnumerateObjectsAllParameters(long long ptr long ptr long ptr long ptr long ptr long ptr) -@ stub NsiEnumerateObjectsAllParametersEx +@ stdcall NsiEnumerateObjectsAllParametersEx(ptr) @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index b1befd548cd..5e2ea71646c 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -40,6 +40,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -159,6 +160,25 @@ todo_wine ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "%d: mismatch\n", i ); } + memset( &enum_params, 0, sizeof(enum_params) ); + enum_params.first_arg = 1; + enum_params.second_arg = 1; + enum_params.module = &NPI_MS_NDIS_MODULEID; + enum_params.table = NSI_NDIS_IFINFO_TABLE; + enum_params.key_data = enum_luid_tbl; + enum_params.key_size = sizeof(*enum_luid_tbl); + enum_params.rw_data = enum_rw_tbl; + enum_params.rw_size = rw_size; + enum_params.dynamic_data = enum_dyn_tbl; + enum_params.dynamic_size = sizeof(*enum_dyn_tbl); + enum_params.static_data = enum_stat_tbl; + enum_params.static_size = sizeof(*enum_stat_tbl); + enum_params.count = count; + + err = NsiEnumerateObjectsAllParametersEx( &enum_params ); + ok( !err, "got %d\n", err ); + ok( enum_params.count == count, "mismatch\n" ); + free( enum_luid_tbl ); free( enum_rw_tbl ); free( enum_dyn_tbl ); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 8fd16dd9d97..999b8a57810 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -93,6 +93,29 @@ struct nsi_ndis_ifinfo_static }; /* Undocumented Nsi api */ + +#define NSI_PARAM_TYPE_RW 0 +#define NSI_PARAM_TYPE_DYNAMIC 1 +#define NSI_PARAM_TYPE_STATIC 2 + +struct nsi_enumerate_all_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD second_arg; + void *key_data; + DWORD key_size; + void *rw_data; + DWORD rw_size; + void *dynamic_data; + DWORD dynamic_size; + void *static_data; + DWORD static_size; + DWORD_PTR count; +}; + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); @@ -100,6 +123,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, DWORD *count ); +DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, -- 2.23.0

1 0

[PATCH 1/5] nsi: Add a stub implementation of NsiGetAllParameters().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 9 ++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 3 +++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d55445a3dd7..3691dd5ad2b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -42,3 +42,12 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi { FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); } + +DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ) +{ + FIXME( "%d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index fc2db9e35c1..7db46c83e94 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -8,7 +8,7 @@ @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) -@ stub NsiGetAllParameters +@ stdcall NsiGetAllParameters(long ptr long ptr long ptr long ptr long ptr long) @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 0cdb1993f1c..e0c0fcf168b 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -33,6 +33,54 @@ static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) return lo <= val && val <= hi; } +static void test_nsi_api( void ) +{ + DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), + sizeof(struct nsi_ndis_ifinfo_rw) }; + struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn; + struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat; + DWORD err, count, i, rw_size; + NET_LUID *luid_tbl; + + /* Use the NDIS ifinfo table to test various api */ + for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) + { + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl, sizeof(*luid_tbl), + (void **)&rw_tbl, rw_sizes[i], (void **)&dyn_tbl, sizeof(*dyn_tbl), + (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); + if (!err) break; + } +todo_wine + ok( !err, "got %d\n", err ); + if (err) return; + rw_size = rw_sizes[i]; + + for (i = 0; i < count; i++) + { + winetest_push_context( "%d", i ); + rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + dyn = dyn_tbl + i; + stat = stat_tbl + i; + + err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + &get_rw, rw_size, &get_dyn, sizeof(get_dyn), &get_stat, sizeof(get_stat) ); + ok( !err, "got %d\n", err ); + /* test a selection of members */ + ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( get_rw.phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( get_rw.phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + winetest_pop_context(); + } + + NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); +} + static void test_ndis_ifinfo( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), @@ -145,5 +193,7 @@ todo_wine START_TEST( nsi ) { + test_nsi_api(); + test_ndis_ifinfo(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 362eaed0c4e..547ed91ce41 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -97,5 +97,8 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); +DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ); #endif /* __WINE_NSI_H */ -- 2.23.0

1 0

Frama-C Framework in Wine.
by Игорь Чебаненко 28 Jun '21

28 Jun '21

I don't know if you use it in your project,but if not,try. Wikipedia: https://en.wikipedia.org/wiki/Frama-C Website: https://frama-c.com/

1 0

[PATCH] qcap/vfwcapture: Set the correct allocator properties when connecting.
by Zebediah Figura 28 Jun '21

28 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/vfwcapture.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index ae073b845e0..b048fff6b4a 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -193,14 +193,6 @@ static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface) ALLOCATOR_PROPERTIES req_props, ret_props; HRESULT hr; - req_props.cBuffers = 3; - req_props.cbBuffer = get_image_size(filter); - req_props.cbAlign = 1; - req_props.cbPrefix = 0; - if (FAILED(hr = IMemAllocator_SetProperties(filter->source.pAllocator, &req_props, &ret_props)) - && hr != VFW_E_ALREADY_COMMITTED) - ERR("Failed to set allocator properties (buffer size %u), hr %#x.\n", req_props.cbBuffer, hr); - if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) ERR("Failed to commit allocator, hr %#x.\n", hr); @@ -688,20 +680,19 @@ static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, vo } static HRESULT WINAPI VfwPin_DecideBufferSize(struct strmbase_source *iface, - IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) + IMemAllocator *allocator, ALLOCATOR_PROPERTIES *req_props) { - ALLOCATOR_PROPERTIES actual; + struct vfw_capture *filter = impl_from_strmbase_pin(&iface->pin); + ALLOCATOR_PROPERTIES ret_props; - /* What we put here doesn't matter, the - driver function should override it then commit */ - if (!ppropInputRequest->cBuffers) - ppropInputRequest->cBuffers = 3; - if (!ppropInputRequest->cbBuffer) - ppropInputRequest->cbBuffer = 230400; - if (!ppropInputRequest->cbAlign) - ppropInputRequest->cbAlign = 1; + if (!req_props->cBuffers) + req_props->cBuffers = 3; + if (!req_props->cbBuffer) + req_props->cbBuffer = get_image_size(filter); + if (!req_props->cbAlign) + req_props->cbAlign = 1; - return IMemAllocator_SetProperties(pAlloc, ppropInputRequest, &actual); + return IMemAllocator_SetProperties(allocator, req_props, &ret_props); } static const struct strmbase_source_ops source_ops = -- 2.30.2

1 0

[PATCH 6/6] light.msstyles: Add Tooltip parts.
by Zhiyi Zhang 28 Jun '21

28 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 1 + dlls/light.msstyles/blue_tooltip_close.bmp | Bin 0 -> 3402 bytes dlls/light.msstyles/blue_tooltip_close.svg | 17 +++++++++++++++++ dlls/light.msstyles/light.rc | 12 ++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 dlls/light.msstyles/blue_tooltip_close.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 8f9143d62f9..3205d1b28f9 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -56,6 +56,7 @@ SVG_SRCS = \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_separator_horizontal.svg \ blue_toolbar_separator_vertical.svg \ + blue_tooltip_close.svg \ blue_trackbar_slider_track.svg \ blue_trackbar_thumb_down_11px.svg \ blue_trackbar_thumb_down_15px.svg \ diff --git a/dlls/light.msstyles/blue_tooltip_close.bmp b/dlls/light.msstyles/blue_tooltip_close.bmp new file mode 100644 index 0000000000000000000000000000000000000000..82adf7e5cc1d7e306225f7c7954ef38a29b4c141 GIT binary patch literal 3402 zcmb_czmF0@6dq3#VuBD<4m^!mTtQ=EYj;_=J5OU{Ea~i|(}Ko=(n!gFLHHS9L%AId z4VT+Bh8PM8{szLq^LxvHvtfga!-luB^WOJ8X5P&EjQ4LJ2>1Dc_cvG!_6l}KybyOW zT4B7l9ui{p;|Lj-AHHru{^7W{75^O-!tTM|Y=w3@7|*;7A1kwGu#Y=wn;_#{JoAv} zI*oAx<N2)+&ZiC3_ruNsH<$RS5I<k8U``6Yk@PPye(|LX=QCmpi5p`)_2TR#)-aTD ztjYQAjo%dh#%xE3Ur)X9_3Ro)Yxfmw8Ao@7c}ejNz<<1E_>ZFq@Rq{Cf4a5edcn`} zAkQcSd_&<fzbnM#eh~Hwqnkr_FS<3=J=>sn>?V)e`rNTY+;z8S`Rp`$&W6f3ZRFUu z_YH7N?)_|xqS++%GI81~2jiKy=4TT`uvsQaf%JoMjCXm+b8$lH^JALGJhzzy?bHuo zbHL6eeu~l6590}?@I8|LW#*WC_2WEAd0-Zd!+(u0<K)qgvp6LY8_GPqH;;aRUr=I> z@rZo&<K1(L0oPZs<s$S0wJRyU!PyDz)Q_u&6an5+IF9mdaXd)>U!772yoSQ%y>(wd zqrm#1n?rXmx;523TirW$h`a9go@URX4q=>qd*9x_NRWa4Gr9LGl}fbHX!Pp!`d<3M zc;+d5f^Sx<)dJ}U;}{Pk&Qq;c)A*k79Ci!ePW?bU2i#oZr_E;5)eq!N!A8=*#OSLZ z@aJI*i5s_CEsuU+UrEG<GR|xA=m+KnCFTI{s~??CCk9-9jm6r^#bWUY^U~UfanNqJ zcj|{}ni1eEh2tpS7RQ6=2XG;*p`mcO{#~p;uzu*~(A|q}O?A&!_l_Onu5-`GGyLzK SLmk4%(T45Y`vy2B_|ZStLw0Ha literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close.svg b/dlls/light.msstyles/blue_tooltip_close.svg new file mode 100644 index 00000000000..4a0e66448bc --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:17-32" width="17" height="48" version="1.1" viewBox="0 0 4.4979 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m4.4979 0.42636-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#aeaeae"/> + <path d="m4.4979 4.6597-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#ff1744"/> + <path d="m4.4979 8.893-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c8c3f22ddb1..bddf183132c 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -879,6 +879,14 @@ BLUE_INI TEXTFILE "[TrackBar.TicsVert]\r\n" "Color = 174 174 174\r\n" +"\r\n; Tooltip\r\n" +"[Tooltip.Close]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tooltip_close.bmp\r\n" +"ImageCount = 3\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + "\r\n; TreeView\r\n" "[TreeView]\r\n" "BgType = BorderFill\r\n" @@ -1070,6 +1078,10 @@ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropd /* @makedep: blue_toolbar_buttons_split_dropdown_glyph.bmp */ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" +/* Tooltip */ +/* @makedep: blue_tooltip_close.bmp */ +BLUE_TOOLTIP_CLOSE_BMP BITMAP "blue_tooltip_close.bmp" + /* TrackBar */ /* @makedep: blue_trackbar_thumb_horizontal.bmp */ BLUE_TRACKBAR_THUMB_HORIZONTAL_BMP BITMAP "blue_trackbar_thumb_horizontal.bmp" -- 2.30.2

1 0

[PATCH 5/6] light.msstyles: Add TrackBar parts.
by Zhiyi Zhang 28 Jun '21

28 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 15 ++ .../blue_trackbar_slider_track.bmp | Bin 0 -> 378 bytes .../blue_trackbar_slider_track.svg | 13 ++ .../blue_trackbar_thumb_down_11px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_down_11px.svg | 21 +++ .../blue_trackbar_thumb_down_15px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_down_15px.svg | 21 +++ .../blue_trackbar_thumb_down_21px.bmp | Bin 0 -> 18618 bytes .../blue_trackbar_thumb_down_21px.svg | 21 +++ .../blue_trackbar_thumb_horizontal.bmp | Bin 0 -> 2418 bytes .../blue_trackbar_thumb_horizontal.svg | 19 +++ .../blue_trackbar_thumb_left_19px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_left_19px.svg | 21 +++ .../blue_trackbar_thumb_left_25px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_left_25px.svg | 21 +++ .../blue_trackbar_thumb_left_44px.bmp | Bin 0 -> 17738 bytes .../blue_trackbar_thumb_left_44px.svg | 21 +++ .../blue_trackbar_thumb_right_19px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_right_19px.svg | 21 +++ .../blue_trackbar_thumb_right_25px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_right_25px.svg | 21 +++ .../blue_trackbar_thumb_right_44px.bmp | Bin 0 -> 17738 bytes .../blue_trackbar_thumb_right_44px.svg | 21 +++ .../blue_trackbar_thumb_up_11px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_up_11px.svg | 21 +++ .../blue_trackbar_thumb_up_15px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_up_15px.svg | 21 +++ .../blue_trackbar_thumb_up_21px.bmp | Bin 0 -> 18618 bytes .../blue_trackbar_thumb_up_21px.svg | 21 +++ .../blue_trackbar_thumb_vertical.bmp | Bin 0 -> 4758 bytes .../blue_trackbar_thumb_vertical.svg | 19 +++ dlls/light.msstyles/light.rc | 150 ++++++++++++++++++ 32 files changed, 468 insertions(+) create mode 100644 dlls/light.msstyles/blue_trackbar_slider_track.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_slider_track.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_down_11px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_down_15px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_down_21px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_down_21px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_left_19px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_left_25px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_left_44px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_left_44px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_right_19px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_right_25px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_right_44px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_right_44px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_up_11px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_up_15px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_up_21px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_up_21px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 7be6fa532a6..8f9143d62f9 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -56,6 +56,21 @@ SVG_SRCS = \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_separator_horizontal.svg \ blue_toolbar_separator_vertical.svg \ + blue_trackbar_slider_track.svg \ + blue_trackbar_thumb_down_11px.svg \ + blue_trackbar_thumb_down_15px.svg \ + blue_trackbar_thumb_down_21px.svg \ + blue_trackbar_thumb_horizontal.svg \ + blue_trackbar_thumb_left_19px.svg \ + blue_trackbar_thumb_left_25px.svg \ + blue_trackbar_thumb_left_44px.svg \ + blue_trackbar_thumb_right_19px.svg \ + blue_trackbar_thumb_right_25px.svg \ + blue_trackbar_thumb_right_44px.svg \ + blue_trackbar_thumb_up_11px.svg \ + blue_trackbar_thumb_up_15px.svg \ + blue_trackbar_thumb_up_21px.svg \ + blue_trackbar_thumb_vertical.svg \ blue_treeview_expand_collapse_10px.svg \ blue_treeview_expand_collapse_15px.svg \ blue_treeview_expand_collapse_9px.svg diff --git a/dlls/light.msstyles/blue_trackbar_slider_track.bmp b/dlls/light.msstyles/blue_trackbar_slider_track.bmp new file mode 100644 index 0000000000000000000000000000000000000000..dca5590613cda7f630e5c99ce5a9f38a5c29936b GIT binary patch literal 378 zcmZ?rtzu*VgDxOh1H|k=%mu`Z3=%++f#Cy~L?`|;FhCGU;=hx7P%*j+LVOl91?#W@ Upc<g?e^dYz8Cv3)J_EWR03b8HEdT%j literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_slider_track.svg b/dlls/light.msstyles/blue_trackbar_slider_track.svg new file mode 100644 index 00000000000..b2a6dfc9ef6 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_slider_track.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-24" width="7" height="10" version="1.1" viewBox="0 0 1.8521 2.6458" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x=".13229" y=".13229" width="1.5875" height="2.3813" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_11px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_down_11px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..eae1b3872084acad56cc0db830d2f7f5e0e2724c GIT binary patch literal 4318 zcmeH~PfG$(5WqL;)<p;*gUF~z%YzaL+09F*F44VDP?s)Aeu54Km67SCj)H%o&S4-F zK?l)YgfhzN6BM+%JI$=VWjD6fAj86k<Lu1*-k*KX=P>@oI}4|@E&L9m^rNhx^l)~r z7xi)@j*prK99RF45Bv*D>zZIok9{pstwE_&YB-%vUywHIfy_`Qld0r#xhm=>vW@sy zEM~>{y&wo8U@MhM#8=QisO6K%qy_y#u~>X3j<rIeAfo>^kw^?M9&J9K&+9nGlb_;@ z#eOVgs44ypR_?L@xM!WV4>FyjiKy#k=hsgC7IF=XVebWLvw2?kJVVu^xk~M9ty+!v zp2#-hVb^07Bffj-I-=Ym>E?v^3WR2LcL;Xe7BM<6NLL5CyHUFgiRizDeXn|la6G=2 z+tzXHf{>r$Y%St}n}rND#am-#Kvq2q^KrXueY1aUA7nZY6H(8Nopn1k1Sdx!;5;X7 zHV<q%N07Ti0h9*_y2gxn*l^e}UT$#2*7=R;aV-x)=L7^CkDoZkzd&Gmit)%if59>S zS;I2lS6bcQCSy|nzs$-_-cQo(*}rAkJGN6RdFaraZI*{1JY!Sx(CMm@hsZWsmy(B~ zzOr<E)W}1}-8`hrh`;t<t(#SE{P{I>R34%_2qoLB9*W1~Hmp0;dWdYJJJhI$$~@0^ Y>mmIQSG78@zEIa@^w5Fp{qcI}12_~nEdT%j literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg new file mode 100644 index 00000000000..5f568dcdba0 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="95" version="1.1" viewBox="0 0 2.9104 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m2.5135 3.4803-0.001511-3.0834h-2.1136l-0.0015146 3.0834 1.0583 1.0923z" fill="#fff" stroke="#aeaeae"/> + <path d="m2.6458 13.64-0.0017-3.3214h-2.3778l-0.001705 3.3214 1.1906 1.1766z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m2.5135 23.589-0.00151-3.0834h-2.1136l-0.00151 3.0834 1.0583 1.0923z" stroke="#aeaeae"/> + <path d="m2.5135 8.5074-0.0015-3.0834h-2.1136l-0.00151 3.0834 1.0583 1.0923z" stroke="#3096fa"/> + <path d="m2.5135 18.562-0.0015-3.0834h-2.1136l-0.00151 3.0834 1.0583 1.0923z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_15px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_down_15px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e034b99ce2156aaad0cb0b6c4e0b401607409bd1 GIT binary patch literal 7638 zcmeI1&2JJx6u@cp?q6VH?4c}bTrjPLCN^oJCJi2Jym|HJ(WtD}f51B*g@1wab<l$z zG${uq9@WIeC{hFo5K4iR{h0B+(jmLBth=&liSDG+`FQWQZ}#oX<n?v!)~B<s!}1({ zZ$do-^%>MT*E!cIXoE*`=&A~JxduNtN7rs{JWvTubx)hpnocR5PS0mDnLM^uo&=01 zm&-K@g@TMNj?M7NWYU|>W?RK#QKnEzr4oU08|*I`@!Q+mi^!GBWr7?ll}d$x{Wi!~ z^!QXNwF=yRwOVC}rmfX#6!;G4U03rk4g%LhxlyUt>&W*&e}nPxE^@QkG{S~5)I)v7 z!gGc)Gab+;4r|6!l+K8+H2c?R<%AI28|v@tuoE0+v#%69hZd^B&fqMy2a!wX#rV}7 zY^|)TANFxl!e5tP39^(3G;nN&7o(TGV6UZo&M5eqlrJw7F}~b}dBeM14D*Yi*HXT| z*6eTP+Z!S#{B0@B2lVVq5$~!P5A2g4dEH$>cHdJmvC@%Zyyk9~WBfYU>yq7fx*VG% zKR*EP@Ajj<+swWg^~t36k*OHAsE7JPHo_a~YlVc05q@~~p|2GijvUs|JsP2{zJmR$ z*}@u2ngLN@Z+O+;*I_jdQVs0&m4au<LY>LGoo+5HP{Ff9A6+zcH?up4KH+>+aQ~tL zN1-<8Q*N2bj9U7by9WBLBMw=t9U5}qFysVx5cGN@9OL^`xNt|0ry<W>V8jU=<7FD+ z?x}frzx%)_f8ZETK>s1*fgvV2##8tcZw`42HXT;r<SG1otgLEpShhO@tYp>Csx|*t zEPL-+Xb-lo%!^w~d2Fq$ryuirAZ~9A;&y)n$7cBPxcw!u5V!A*#_i<$Ti~6z9ewY_ z?W#C#tZQrRJ@)j;6JvIr*n5(*?2Wyr@$)|sw?jVfr1I^DIT<VYcF1e*>E+uoUk~|y z-JA^M%>F9h4*wTehv#-p=G(hqf0&bT^6irj?_hpL^4`Xa9Ff|%W|IjS$lN&j_LK6} IvFF==16bE8YybcN literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg new file mode 100644 index 00000000000..19a37abd8ee --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:15-32" width="15" height="125" version="1.1" viewBox="0 0 3.9687 33.073" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m3.5718 4.6544-0.0022678-4.2576h-3.1704l-0.0022714 4.2576 1.5875 1.5082z" fill="#fff" stroke="#aeaeae"/> + <path d="m3.7066 17.987-0.00246-4.4936h-3.4347l-0.002463 4.4936 1.7198 1.5918z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m3.5718 11.269-0.0022707-4.2576h-3.1704l-0.002273 4.2576 1.5875 1.5082z" stroke="#3096fa"/> + <path d="m3.5718 31.113-0.0023-4.2576h-3.1704l-0.00227 4.2576 1.5875 1.5082z" stroke="#aeaeae"/> + <path d="m3.5718 24.498-0.00227-4.2576h-3.1704l-0.002273 4.2576 1.5875 1.5082z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_21px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_down_21px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..d194ae3a8037ddf7601d52b3b15bec5248781a57 GIT binary patch literal 18618 zcmeI3UuYvm9LKln3DpNFA{6cf5g#s%UR!b&n~I!=sGQs(f^a^F_~45^sa)GsAM)T+ z1wqj^x#T>RyO&y;{z)4eq<tu*q4!qB9O8jc%1I$s+TFA}lii=cNjlr4P4*_)ZRvV5 zWHY<7GoPLO<~y@H`R$y)n0{R;hC%%P9JeQM`xCb&<tgPsj5~JE<8E01MJat)8k~Ra ztxwBN3hh25l<V*_C6mdP@$qqtk}YmrEgFrUn4FwkN~hCgYHBLOj-7ImcYR@DK{E^k z78e&aJih6KnMfphXJ=<sLI|)xDFv*rIx#WP+Xxr!cLD9EVJPzW*Y@@{uynlMoAq!< zM@Riwm#thb$59pW#>NJ)^J8OU?IPTfk&#xk+4}10s#yWrcd)j$W@5e^=09o2#q-VB zwkz3eR^NxHdWiW5a<gdjN2_tMP!pa{WHOn2RX~lz<>lo(mYWHO!w>A|qJ0ME=H^tU znR)`tKR-Xuw7`Z0E1<0}Pft&4J3Bk|;H<p5u0tx7Qjzl>hoUa%=H{lAr;#02o^d!6 z`Hf%>ltGRunTjIqc|aO<CwNp#wqvD;5lqu$eY3nDNv4S5YUGjj^q!WO{#m;@39LMh zAqKx6Nv5=Cqk1|DEitXK=LQ!xOY>a&UXNkuxfU8ZJI!J@ehWkcCrGSkiQc?KNc_bN zJ9f$?@!)kj@qq>gfkN^_4f&4dn>5nZM{m5Lg1%LfEztn$tJ144^fgk~LgefPdhI36 z+`3!Q4NP?%==U#c`cR;*`KJDDyPsSQZkd0tRPgwLx&Aw_^CZ$KG~a~po^PeG?semj zl<h!e-1)`Ce7XELXHMDK0lw;PCh?wMja$*ugq>HcMr_=QP|SZDzC2T7zNs|PcrZ~& zeS-5%+bWh_!GuD(H&5d|GZ0n|%s2H|_aGg4M}>mWlz5Me8l$7{s(P%aV!o*lcV4DH zyrMzA`hNg>fEs(-{{sE-Rh2}$tobGx4p8%-J2eW3CA0F3!`q7tb%+(T&1C{|tmkCO zv^AE%Noh|H>JtYd(Xpt81WW__W@mXnlFS;W5=xf#^q!Vb|A6i0D6n=P>ad=@S)Y<j z2Nsp~JX|fIR@pO?3!7C>e*g4(458DHL%(kZLeDVQuHyh<|HBY!n}d)Kki87yz#~qe z=tgcr)=woKV-~qTSDRyqUIzwzUsUpTx&6M1IfgJV)b@T=Ua_vo9`Jo6%3}GT|MWTJ z>9)*}uK*$cB@r&>YeUw?J$Spe^=-m{zr&6TSNyHW`b&_<xohy*vrksz!pEnYQG-i$ z@;LW5=zIFHaxT*b+I*}*9@kh3!so2l5KzlsJL7Tf`r^E<$fGVX0p2dYj-g1VWoNFB z#^U?gp1c3wxT+=ZF^Ow^bMLoHCch^-iP`IC7_fcZv!`SpmObzF93wtH@3qmfW|rOG zU8|>L7W?~sYfs+(UXM%u%|Oys|7INhn>Q{Ja_yM<H=|v>RsEZo-bj1?@BEv??I-Q* zQ1oxcf-C6X6mlM-f0K|{Ff09=(!a@dC4Ht2{+})ul|Iu$){^u^I+3XKMS9N{iSM+y z?$ejPNGH7rn?w3`t#RHfT9W=v-ed=2wr*3d-<0b&*`O%bZvx2mo2A<$u061xm)JT4 zH-coAhF@t<=W03vEjfId79SPm`pxn&MB3AV?7gZbxz^H|?2lr-p=={}+X(MX$A10h Ee>lY|(f|Me literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_21px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_21px.svg new file mode 100644 index 00000000000..c3433edd231 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_down_21px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:21-32" width="21" height="220" version="1.1" viewBox="0 0 5.5562 58.208" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m5.1594 8.3507-0.0034-7.9539h-4.7557l-0.0034071 7.9539 2.3812 2.8176z" fill="#fff" stroke="#aeaeae"/> + <path d="m5.2953 31.754-0.0036-8.2057h-5.0199l-0.0036 8.2057 2.5135 2.9068z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m5.1594 19.992-0.00341-7.9539h-4.7556l-0.00341 7.9539 2.3812 2.8176z" stroke="#3096fa"/> + <path d="m5.1593 54.917-0.0034-7.9539h-4.7556l-0.0034 7.9539 2.3812 2.8176z" stroke="#aeaeae"/> + <path d="m5.1594 43.276-0.0034-7.9539h-4.7556l-0.00341 7.9539 2.3812 2.8176z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f3c8f55a9b2041f5d6b551124fb5d518218cb718 GIT binary patch literal 2418 zcmeHJOHPD95XESW-ol*_H=}`tMqSLtl^ZYM9drX3PvG89GR_Sc2(VEPq9nTG=NW)b zSp`!)lNmcRCMIs^@S2y`1tjl5HU0CeZLJx%INu;P5toQHZAV+j^Vb$m3j;K*J!l2` zXBXECB};^jAJ)g?u@wYCPH<h<<dP_g;xtVmNfJQ*&bsgWwGaXb#98+|4|ovobbwWS zQ2D9ypYsaCFq_Sb^)AQ%c@O_8M;PpyU>jKj<oq3ht;gUP(7-m{r0(do)R9m1N$upC zPH+8K?t{Wl+nD<A=&~Pzy=P%o1!j;F=lhqB`(`yf$_T`zK01lT=L?9BXDCOfGRN}a zpaxL^fw-){?{Qm&5_zY?YCfp^d^$$|Ux6|}|7DKlUC*k9hXv-96K9{P$5OAI@3(XP kS>~wf1Ks}EI{I55RDQDm^p7(8e?t2pW>wHWNSvPf4R_|o;s5{u literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg new file mode 100644 index 00000000000..d1063507dd0 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="95" version="1.1" viewBox="0 0 1.5875 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <rect x=".39688" y=".13229" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39688" y="5.1594" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".39688" y="10.186" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39688" y="15.214" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39688" y="20.241" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_19px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_left_19px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6c504227cd6eefb7ac61491911dfe98e39c4d69b GIT binary patch literal 4318 zcmZ?ry(ho`23<h128e}$*c^x%859_pfpiE|9>_!j{}~t{2qgC3$vvnTNs=fg3sI`5 zqiEHtRYIFKZMwQ{-Masz;Qjmeqc{_2jwsNa+m|j~`uU#(0JQTjvRNB9ZWITabNBM) z%OsftvJ%;>wQJW(0?m1N?b@|pBsd4I6xpl|8#Wv|cI?=1xFm@TG_z!Z?s`HEcY#s> zG`#Ln8eXu}1azwyHR2Iw9<|aJ%)G%!|DU5R^lO&o)nC&L{*!|LH#nf=q5qQ%MSsn< zy8Y*94@qhN*L1_b$Y%YYtt0+xj`iI?$NESz2b8Rl&H6vnSn}6w>xX|&O(!c4A)EDU zhS{M%TXV_IL&#=*o2n!GdzR%BYPbuOp1|QX+xi}*;RQ>Z|EKGTQ6nDV=20nq!OR<s z^#2-7)&G^6Pl5P9DHz=^|0}drfcl@1Vg^htvRVJDHRXZg_hE9R(lE3Bmut%b_1+^@ zKeBqbS(Taxkj2Si!_A_iyFg}AE4<+Dqf$J=&7)HKf|)lM>Ct)!d&3O5?ij6yu!j+{ lC~|lqr*mqhFJv<Z8=G3~)zSVCa*9G_kM@Ts?{8C@ZveHxerx~$ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg new file mode 100644 index 00000000000..f737f711968 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:19-32" width="19" height="55" version="1.1" viewBox="0 0 5.0271 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m1.5481 2.5135 3.0863-0.00151v-2.1136l-3.0863-0.0015157-1.0933 1.0583z" fill="#fff" stroke="#aeaeae"/> + <path d="m1.4411 8.4667 3.3214-0.001731v-2.3778l-3.3214-0.0017307-1.1766 1.1906z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m1.5481 5.4239 3.0863-0.00151v-2.1136l-3.0863-0.0015111-1.0933 1.0583z" stroke="#3096fa"/> + <path d="m1.5481 14.155 3.0863-0.0015v-2.1136l-3.0863-0.0015-1.0933 1.0583z" stroke="#aeaeae"/> + <path d="m1.5481 11.245 3.0863-0.0015v-2.1136l-3.0863-0.00151-1.0933 1.0583z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_25px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_left_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0524d79ac9a8db631ad00a07a1881946cb2a7d42 GIT binary patch literal 7638 zcmeI1&r1S96vww8|3rtNLs3?g+99@6MbM!iMCbYs>eQi>0?*yk(7(Z-mrg;4Is|sC zLzf5%CCNgRa@C#QRL{n3f^g?8BrcA#JG=Y+%)EK;IgIlwH~rejaR}f0Q2L-OLFv*4 zv>vFJzwX1Sa4=2#{O~q5zqr05-2BsN@1LG>=An2zz6PZhi^Z6o5(oskWj&5YqYJ52 zs$3`(n4JUqXv!GSXC3rQ`F!4v{Kva82DG`8$z(B?%h}fF0#*j}e;o8*ve~Su1Ylu+ z_8{2jDU-=4)3=Tzkw{#o)9IS3{-cg)D<{Um{g-+^Fh;2T3OUsAfgI{MM-JGHG+!a7 z9qLMOYRw3FYevw`>=YKzq`AEs^eh;WnX>tKjUn4oZG=3gj8Q%I=te{@nGaVj>54DO z7{-y?ZG`ord4C~3+VZ)TQ3*|q8{z4f`rVnb+$%EPj=Y1_i2hW+JyE952QM<9|ChDX z1Le70WH>Pn9?#VCfjNWPuaH9>9}Nz1oFj)iUm>R*YPL7B#e6PixBO-c<{#Yv?Ydok z{=SUCd}FI{uc|^{#sK@wLi?*KeJg|Qj!i<_vr2uD!S-E4aGg`F-^B2Zo>S;IF&r2N z_b=-CKp$rQ;W-!|nO`+H#PRXXac#nQOcj2Bnz9=5$u>1Z#{G|N)W3tBb$jy?UtEiF zf1zF{I<emEtlOLC*m`B1b3X5#b-UF{pVu;5aeLuGov)D74mI`u74<$G^?oAtz9{wn nt`qyzo&9!sp2Ak}p&$PhQTr9<ChGV=4t1O(hdN&&M^*g}tQ~Rv literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg new file mode 100644 index 00000000000..d5b482d0cad --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:25-32" width="25" height="75" version="1.1" viewBox="0 0 6.6146 19.844" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m1.9572 3.5718 4.2628-0.00227v-3.1704l-4.2628-0.0022736-1.5101 1.5875z" fill="#fff" stroke="#aeaeae"/> + <path d="m1.8564 11.642 4.4936-0.0025v-3.4347l-4.4936-0.0025-1.5918 1.7198z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m1.9572 7.5406 4.2628-0.00227v-3.1704l-4.2628-0.0022666-1.5101 1.5875z" stroke="#3096fa"/> + <path d="m1.9572 19.447 4.2628-0.0023v-3.1704l-4.2628-0.0023-1.5101 1.5875z" stroke="#aeaeae"/> + <path d="m1.9572 15.478 4.2628-0.0023v-3.1704l-4.2628-0.0023-1.5101 1.5875z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_44px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_left_44px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3b94c674cfaaddea5cd5cd85804230df3d3ddfa0 GIT binary patch literal 17738 zcmeI4O-vI(6vs>K(VKEK@g@i%(i#u78bc%+6E8-uaF9qndw{A3&Rzs!_(<X6u}NDf z2TocOiHYE?SH*asL<lBDHj%09_+H^{hO*6WA!X*7-7xzmyR(^J-~M;rYiEa^`}cZ7 z)$JARUqb1GG61C|bTM=W?1$U1JF>}8X#Wq-$eue7o*il8aUkq*{(m~1%jF(J5!q~3 z>L}@S8gHfNRwxw03kwUQi;Ig^xm=byHt>_}hZi`{L;1Y4v}6e(bf8xI^uwFUWFq-| zexq0{3fs1|v0}$wymNDNeZXq1t*z+=J@8UJ-UF?Up;ouIx3&6I?c9wQ^xO(sUDmBt zm6PhVye4Ut7*(tCf>sAntLy9QY7?XCDlgQZ0`CqNUJMxE;}|e+nJ{*_-B{JX6yWfA z1LhSD&l@pw8qbIsE#x!(_zadxCAZsi>c`ylpz>nfq%qD9FEX1FL;Uh0vzkxpiqVbm zA~S9<<_*Ag#^>w%w86gF9uU*f0Wld7V&aO_QDpj&ukUYi<W^YB#78S{?^^cO*Ha&R zu|qN0ZTsPs<K3-d_QrB0KWNE6`to-_yy8t)q>_ql{QdM=NPAC<U#U|sUNLpGPo!ej z-s(FezQ5Jut!j1l=2%s$zrNAO({9~(t6H6juT=60OYZ*G&Zq*^@`{N_6tuc&f>u>d zs;j(WDw+_f>pS+3k968N%b6GBA}2ji9Ov}BIm{S)o$+kd7#*wnC05mn>1+KQ;>96m zM)8=qIpsSJvzkw8iqT&BC05mP$=6lppxzu0V4f+HZR0Z8E_D^ZpA0z9$>intx;Uv{ zKfLn!r7mdyovzVoy?AA^<00_v=wwv;uEz^g>Me4(eF)m_sqJ;w-FW3l$64UY=w@^4 zzm`|N=)3^!zPPnD;h4%RhdSag4*WEMs~!XK%Hg&r&}O$@J5!Ex<wb5zdT{*A=y`LP z8I5NSGoyGx%xJm9<3r4h@*U#llutU$jPiA24s3Hhz~%dVF#p#0&z^pM-wEd58uu$* zQP01@{2O`bWVY77oaS4C`L~nZd$+4O>w%(pF#qOuXODNRRuAN3vcde@@%&0xdHI+8 z9L&Fw#~QPK{Y!pE%Ozh|nS*-sJiz6BTJ?Qp)7QUodLNwA`}UyKVEtQTA>vSLxA*Ni zt;YfWD6D7M<gngpettdytZdekapT2^$Vm?r!8tu|#LRvDo9XMN$<Jsx#be^;l<yET Ur+ku_(ZZO=;{R2s%)0CU0KLue+W-In literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_44px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_44px.svg new file mode 100644 index 00000000000..e666a7ff164 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_left_44px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:44-32" width="44" height="100" version="1.1" viewBox="0 0 11.642 26.458" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m3.2942 4.8948 7.9539-0.00321v-4.4914l-7.9539-0.003221-2.8176 2.2489z" fill="#fff" stroke="#aeaeae"/> + <path d="m3.1714 15.61 8.2057-0.0034v-4.7557l-8.2057-0.0034-2.9068 2.3812z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m3.2942 10.186 7.9539-0.0032v-4.4915l-7.9539-0.00321-2.8176 2.2489z" stroke="#3096fa"/> + <path d="m3.2942 26.061 7.9539-0.0032v-4.4914l-7.9539-0.0032-2.8176 2.2489z" stroke="#aeaeae"/> + <path d="m3.2942 20.77 7.9539-0.0032v-4.4915l-7.9539-0.0032-2.8176 2.2489z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_19px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_right_19px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..71cc35f825cd4f9d2d0d9da15b1a21d61accd69e GIT binary patch literal 4318 zcmZ?ry(ho`23<h128e}$*c^x%859_pfpiE|9>_!j{}~t{2qgC3$vvnTNs=fg3sI`b zSF~>3y8oo$O`A5|*t~hO2sRr*=8yueUcLGYXx_t(8#hX!n@6fyAbW4zxbX{U*5g&H zR!Jk9M~+z_^KRa}`5S27i?wUlD#6Sn*DR2E$B!TXy<x+KW0ab8>(;G5KzF^Q)LpRf z0-7TOa}$Ur)sKYY5o8{*7+?BAcH>}T|C(m-pCmln>c;<>##r+Z$Q)9@pOaI6{hDp{ z@atqlj66iDSs;7=o}KgS_iU@j-=^!M<RNm*0-JYk!SCO*EnobYrVGzQ<eCLC@6Yza z-@j&>!t)ThX8k?4;Lq<_mM<xF7d*Ts>7nEyQr$%;9zo_2jq#+f!IW>1-SWRu^EVLx zCmw6O{9mc9g=_|lO}bfNdtYEPk4&>b{&?}fOh*&uCJ;@5SwQnN9{;b=QHGgEnOPwJ zY8|1DSyXcuwZe-^@rXNp!NP5@(L|RIu(AYCIYI663siQK0^sH9Xgx$!u))J?v>u`; nTN2w&g{i~WUInQk1rTaSlVTP~Ev$V%+8-h=<Y3`7()vRH{+c-< literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg new file mode 100644 index 00000000000..104f71ae479 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:19-32" width="19" height="55" version="1.1" viewBox="0 0 5.0271 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m3.4832 2.5135-3.0863-0.0015v-2.1136l3.0863-0.0015 1.0933 1.0583z" fill="#fff" stroke="#aeaeae"/> + <path d="m3.5902 8.4666-3.3214-0.0017v-2.3778l3.3214-0.0017 1.1766 1.1906z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m3.4832 5.4239-3.0863-0.0015v-2.1136l3.0863-0.0015 1.0933 1.0583z" stroke="#3096fa"/> + <path d="m3.4832 14.155-3.0863-0.0015v-2.1136l3.0863-0.0015 1.0933 1.0583z" stroke="#aeaeae"/> + <path d="m3.4832 11.245-3.0863-0.0015v-2.1136l3.0863-0.0015 1.0933 1.0583z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_25px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_right_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f1a133198fec5f418e8843eb13c385b958447164 GIT binary patch literal 7638 zcmeI0y-or_5XaBxOIVm#dRT}S#E*v1P^b-wZ{Qmk6F>`VdqwdT`0ll&(1gOm!otEx zB525kkAjoCaR(f7;t3mfryy~|++OaE`|aM&{C6^u-G>FE-%iExSlGO<ZDBLUqA@G_ zov-`i)YHH)20y$8k!b9|b5rVcPU<QB59M+>P&7yUKQ?Y;_<ogUSr(K^rA{`R#ij6V zstg=oqtQT4JD<;o{UACR$f?)sP%IW(f)g6$=wcwJR;wYWnaN~Uy&Rnk<W#FwS8y!x zUXwVw8OW(rDo&wLxZ`4Q&x3nCxc!PdK4jw@eM`Y6>J|CdwD<OT5R@#n>U1yG#%eph zU!}S4k6>SIb$aK)U$tG8f#Y*u?*(V0{gDcW{nk|nqtAJ{1v|abvQsNRv|SgY&v`B* zrztq!v|T3yInL9yYp2((?%CQ<+jTRL)4Mrw?90$l+jTRz=ixH1hs*3&-0>kB=eX{F zHVM7*i~VW51_{#<21=GR568`23nO8=5I6UK<7i^wcj!Spu;<6o$UsgPl1tH1j%EgO zI&ieK>E$pm0Fve#B$fljVPOpXw9L$SXPyW5dT{#{cYN^2`2@Wp|C;vx&-)+kof7+? zYJMfVpJQ&P(zx>y8XI?hHRLeoiNxW~cZu_#x6_yK@45YoJ3eINTuHMe^lI8QoyM<F zx1yTY#QK$L?Nzo8=kM|ISGntnG!pK*C~>&!yTswHQxoUE-cDb_zvuQV?)Z?6b4AUX Ks8^(oT>U3vs3r#h literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg new file mode 100644 index 00000000000..2a63c9de7c1 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:25-32" width="25" height="75" version="1.1" viewBox="0 0 6.6146 19.844" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m4.6597 3.5719-4.2628-0.0023v-3.1704l4.2628-0.0023 1.5101 1.5875z" fill="#fff" stroke="#aeaeae"/> + <path d="m4.7605 11.642-4.4936-0.0025v-3.4347l4.4936-0.0025 1.5918 1.7198z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m4.6597 7.5406-4.2628-0.0023v-3.1704l4.2628-0.0023 1.5101 1.5875z" stroke="#3096fa"/> + <path d="m4.6597 19.447-4.2628-0.0023v-3.1704l4.2628-0.0023 1.5101 1.5875z" stroke="#aeaeae"/> + <path d="m4.6597 15.478-4.2628-0.0023v-3.1704l4.2628-0.0023 1.5101 1.5875z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_44px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_right_44px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8e7a1a2178aa2ec9aeb08c2999a3b502607103b7 GIT binary patch literal 17738 zcmeI4O-vI(6vyjFjGnye#Skxuc))-`kOQK|#OTGdM>T#$6OBQU14rV)qgcy{aB4!! zM=<HlgV2+Soahzffs3Su(k46D@x5K1OiJ6`F0}JrvJ+-!`~B<d|IK@|GsDoGTQ_2E zc@M`?s28B#hk7X17CQp%*XwZDQ*<om{ox~e=;qy5d!FKR$5EfhB|Mx;rL>KjPN&t} z+}wjkZG@~g%I4;#&SWx$`T6;&WHNayD7P(Mw2@LuFE1|_7Zw(N%*@Q34#I4cmwwk= zE~miG8^C<okC_86a<8wiYhW&drXST~=E952g+jqs)0}vb88w~FW{Y6!m1>&i#*55Y zP}87|JoI~mrarjxA~R`vc6Rm&F-zbDJ3r&jyQ7Ccpy8{;iY+($8vd4pxOc{6<;F|> z8N@q4O`fP^<;07=1)L@Dt&wV+bRP#j)atv4(QIw<8d|Ly8%$0*x5Z0Z4U<nIbE_-n z>rfw(-J+I<1)Psv+De`1R!;m<!+Jng8>O6I(`x$mmNPjprIVe3$8WZHT^l)DdVBGC z5tvtWygShN%_^@8UDkiUPb!t@-%y_}_W5~<eO^zE<+X3xNemQ0(~s*hbKynma{ec3 zx}Xw$N&TU(YQDpX*R?ci`pb)=ljvV9#k=?9lk9k1XiwA5=ia=U=o&Qj!IRg8*5$RO z9ZmN>CFY3Nv(5gFg7hHB-z4>CZoHVhQd04ry5l$d{w63M3(9v$t6}m<)I`f`$b6mR zM$|UP0{U&oHdJk=o}1QVZO0q=W_EeOPH#Gv^y|)3L7A=ddcW;2{jR+y2s0C2)MH7H zoWJMC%!n76%X*|^T#v;L*WzZzOMbtohtHm@#>|u#{V=CT+uJLd+46dR_!~5R&17cI zi~3Mt>tSM!cn>sI%F%-?f0NRmNs1Se;<223M^rx9c)m_?BWjytftHWs>Doca@w~0; zQPKR{{;oI&f3=|Nea4rH=HCosH1kx@e88?51kJbXLPzs&hAj^ERFED7`5Vn?NLWu0 z&A%P2N4f77&A&BoUM^(5-kecO^sZ!qR<EO_&kMVr7GH0p?CgKr3bS6>1}}al?SHGa zSBNxVwzlkR+KBeQ0gLbYNe;ZoPJ4x5?@itHlU#U_nbzP-*e`;-Sd2XmtK9eFc*NeZ z)*cd0dN6tMoHPx4bpEfOjCd=p6z;YZJxKC5N&Ol57Q~B}X8f%@=iqNr;<2QBXFvHQ VYNFK@^L5Z_!~d_MQqP=k{{yDOX$SxS literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_44px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_44px.svg new file mode 100644 index 00000000000..3f372770d21 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_right_44px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:44-32" width="44" height="100" version="1.1" viewBox="0 0 11.642 26.458" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m8.3507 4.8947-7.9539-0.0032v-4.4914l7.9539-0.0032 2.8176 2.2489z" fill="#fff" stroke="#aeaeae"/> + <path d="m8.4736 15.61-8.2057-0.0034v-4.7557l8.2057-0.0034 2.9068 2.3812z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m8.3507 10.186-7.9539-0.0032v-4.4915l7.9539-0.0032 2.8176 2.2489z" stroke="#3096fa"/> + <path d="m8.3507 26.061-7.9539-0.0032v-4.4914l7.9539-0.0032 2.8176 2.2489z" stroke="#aeaeae"/> + <path d="m8.3507 20.77-7.9539-0.0032v-4.4915l7.9539-0.0032 2.8176 2.2489z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_11px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_up_11px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..62a89d8f36266d42b8fd223fedb9294148896d61 GIT binary patch literal 4318 zcmeH~%}WAN5WqL;)<p;*50X%XrUxSutXr2(U7~w`L8mTC{skQhLZh@pXTeYC9zuc; zbPzuf+#o;t52AM0on}^_t+BfqVX(D><GeTX+qXLV#_?_K@HS47V|<UG&Z6$4PH`@7 z8tvX7jzg6I$Ms+2gRSk|Lsf9B;mlZ+K9o+UWmGUwnO#kck<eNe3zSQ<<pFnLU-J2U zwOlU0YCUK2Q=GAxOvZ-udZki%Q}Z|%(BH&7%rTa1GMTiapRd(w3g2ingj_DyLjSy) zW8+jR<v_k&EEYwy9h$S4md$3fPSgTft@xyT!nt2Y1p^)K2V(R^rZp@U%$5gGo;}-N zLLyj|?oKpoi2M|1ES&mn!qsM7Dn&<XNGiny^fw_I7^xvRTeai$eD6N4@V$p?K}-Z& z5L?%*A-G&~i1A=sx;YTV#72ka?A}`TCFXMq7l8s<t@xyT5cbHZV4yvA??28O<$z+t z-v@(Su{F%hcE9+3-H-j?UPiX9!#_jVyTVwq5OTYaeH`W8EeLs+)Epbbk!Jx}e!xHJ zai92Gi1-$n?>8*<4uc+K^%kY^nyt5d=kr>9=%;l?|J_lo^U(i3>sjX^RUy3tkbgGh literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg new file mode 100644 index 00000000000..26ca8028227 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="95" version="1.1" viewBox="0 0 2.9104 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m2.5135 21.655-0.00151 3.0834h-2.1136l-0.00151-3.0834 1.0583-1.0923z" fill="#fff" stroke="#aeaeae"/> + <path d="m2.6458 11.495-0.0017 3.3214h-2.3778l-0.00171-3.3214 1.1906-1.1766z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m2.5135 1.547-0.00151 3.0834h-2.1136l-0.00151-3.0834 1.0583-1.0923z" stroke="#aeaeae"/> + <path d="m2.5135 16.628-0.0015 3.0834h-2.1136l-0.00151-3.0834 1.0583-1.0923z" stroke="#3096fa"/> + <path d="m2.5135 6.5741-0.0015 3.0834h-2.1136l-0.00151-3.0834 1.0583-1.0923z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_15px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_up_15px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6c6b7e0c16ce24d64d705669ba2f6306c100aa66 GIT binary patch literal 7638 zcmeHLy>AmS6i)>^e*qFpA+$7Y2tsK~C7PuSkO3h!Rz?<<rhJH*6_K=Q|Ac&pg#i`@ zM3sR7fshbVM4~7}xhTp-G`^f4&mniZyE@JtIuVKbROi|6{eFJuXZzLX*safJ1Ec3T z{yxTX2FnvHbAfY#Qz&na?O3%u5D5JFV>*a!-F|2>x~iUbg>nzd<#IX}@KAK4cjQoT z`A|wBpU+dtogOfsV>R8O1;OUjGDjB6^s3}ekCB1!F;;q~(=oagN`^zf=Kd`fi}7-~ zthU>2Ax}{hKwQ62DBLmD29w!rb`$&PHJeQ?ztw6%sZ>%knaq}zXVkI34Q8*`>$W`7 zXfy!(?c=+~3@lG#K8YZ%Tdh_{{93I>+56yoMR|Cq4*S1^{*_9lGGvmqofuIY$2E^* z_`swHH!B-SuIO06LowF|axkX0Y2nWCNJ(`dsj!(hBzJPCz~5L2963#ttpn>EIRS#U z<O+i0F!>m(R9L62FOL5CO@_lgXzt&mWH?R^)>Yd0$R~`owD}3h!L|Ni_lhmIYcH2K zNqVhEf4t}NX}tnue_hp5%iP?qB|{rzKdS2A-`bK0t-b@2j`p=wNSND6@^XaiMZ5af zS0ldu?KLIo)gJ0y<@Ujgr6n!Bstn&e9Wu$<Uh?qK?#evbyL!l^7v8_ZLgJ!^1-umF z-A*8P=p{}JYl+o~;NpPi*qCwbp2ut9>R#h4xgPegIY$c*FwWFvtSRg)JTunwc#iKO zcUt}!!glb!m1oo;u^31GuL=GK=<lw9<w@-KI&!-Xz6#rmH+Xob4*3z}{v7iacobZ7 zVnl67oDV`GcnCWeLL%I(Y<NzS=XUO?1C{=spJ(-rGih`jy^rTf{1$ZoNWXs_D|v30 z=k^KzJn)W5-nUQKSU%r-+rB#|xE!f{_A7FA%!cd1ypzHDF}p}1xuWRUZ9c|I-naj! H_wBy{<4r6B literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg new file mode 100644 index 00000000000..ae9115e84be --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:15-32" width="15" height="125" version="1.1" viewBox="0 0 3.9687 33.073" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m3.5719 28.414-0.0023 4.2576h-3.1704l-0.0023-4.2576 1.5875-1.5082z" fill="#fff" stroke="#aeaeae"/> + <path d="m3.7067 15.081-0.0025 4.4936h-3.4347l-0.0025-4.4936 1.7198-1.5918z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m3.5719 21.799-0.0023 4.2576h-3.1704l-0.0023-4.2576 1.5875-1.5082z" stroke="#3096fa"/> + <path d="m3.5719 1.9553-0.0023 4.2576h-3.1704l-0.0023-4.2576 1.5875-1.5082z" stroke="#aeaeae"/> + <path d="m3.5719 8.5698-0.0023 4.2576h-3.1704l-0.0023-4.2576 1.5875-1.5082z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_21px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_up_21px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b8df1c175900401e51c54e10ee09ff804502bf87 GIT binary patch literal 18618 zcmeHOTWB0r7@k-wsTZVFr3gat#iXlkE;XbHNG(DyQV=1eKKUR%=v&dINvgPyv4SY1 z*=!QC;tgG6?&&5bS%X0mG(m`vOBE~$5@}h|xHCz1ZpZKJX40ANb#~5bSI;3QGjlHA zp8e1FpELjd=Rbbt+mk{xUBdsjkRL|=4Y@!#And}mWV;@>rbGlG_D9Re@e?n;VXDmN z_U?>YId9b6-7O;%7TFk0Pfw4kX&P~w=$JUBAaHqdE;-R9=#h^81yq+9a*1Pdd9qsP zcen(uYPwDzoh7<=AVoRP3KP1cyWQ@)s2*`l=X1p6nL92)wvqMqbw^4R4u=VF6od1< zy}h+VLqpQm)>c-ykw}CD0s#@2uTdQ`5^$Tw$H&8V-x+E9iHQlZudnX|1IxHl-5(ej z=$@LI+ORX&nVFeQ^b7j^e)@VJmwY~7A?oMm=jS7t;4UsMDrmnnGBR>s9GIy9pSQoi zzyJF3@^VVWT3ub$(Jlm;J!a~j^tP+3%LVy_L!nT@;jXQ%5!6eVlZvDu2`bS3)ZpNt zC`pn9cXM--P>x`IJe#0f+9HhQ{P6IwD9dsbS5;LqHa14*n3`W%C&;XGa&l6ld&~6n zw20@gvIg7k==FMc17~V<bX3M1&tMMkaf(U%L#}%<zX8Z_9}B!Y2}Aaj$#P2xVUdmR zC40(MqQ&@PA*0O)Iwp=O2wa}|z@;*9Ua`sW_~us5GsDClhM&lgpzo~4$uYS+bHJri zjc97TV%RK^TT0Qx;5;KtPpMAaLe$=rJsi{Kl*BcM47og`Ye){b)LI_VL%+t!+)jbM zc8%cOLoqlXX)UW&K7LLj8;Na~wAfoWiSo$_QTCQw?9E79Ws~Bs4HGpZ6Ykc>V82zq zd0CV@suI|nLV?mz)uUcH2YWN633m$*cWThRDR)!{iN7YHy-D6bx<_uWn$v!2&1kUN zY=<JZS1*zG4yCj=$>pc_EA2<GYgezN9ISrrdmZgU8<(HV$li=JA9l%YRbl<lIm`Dn z9`qXvL~g5;WY1w+_NLlWdP@1|8A%VX8c?yTbb~0J&q|TjBQMeS4ZBJ4R@5n<Jui|- zIEJTe5#`Go5#RZ3yIAJ-;D}G@dsU))iyAm5Von^}o5Wkb8(f)EzIZ{#b%yv|Ozch4 z^3-0)FF=|r{&V&wX(-l^34^Q}^UE>0JRR~WAGxGE{LY3BY9>A6n9kQGE>92&+{_m) z8G7LKs+;u4DVEWnW5&2-$iwNC%QL^^+00~*Yb<Wx(ajoR7ilQ!bB0?KAns$9BY~vu zi3foBbC$TjkPDALXpGT(1@5E3T(*h(2f3KqJ|q_ox`25zL)^beqpQR`u4MP5-gOd~ zN*Y|1Tr4`13?orF@LoxYSzr8mqJHVhfcb7h+{WUjbbXW6!)aAO8V-JL#Vz{U_#Gu# zzjWoqeV~xk7yl5$E&7qT%kNFsCzE>U!#<36n7n!Dkxbg>QycEz%m?2Y_ZM4#M6>^7 z^&93wp3MA)CZ9etOzw-sqRf4}O#JUT<`N@c5BG0!KkWb62hGI4`Fno*H`}Yb?fW<1 zN$ubC9V_JiO+nc9Z;DC%o1W6F&eJO1Bj=S*PsjT=+bSKMr^TFga{uPPZ<*qZFpuA~ zZ@yT1K!!Uu0?xIwifQ7QP!BFoCb6sZj1G_AWT%^4o@{k<N1j+qdHkkjcd`F~HIv7g zf}gCol#lYnn3>0KLY`-H5x<Gpyi37gP|P-d6ESoj-u@;{_dAsLAXd*BV3<aoW@l$< z{N{Jb;x|#ghsJL%EG%Sno_1+zNx?X-qTl_ukJ0>$`e^*-%E}5|3zMchC4Lj}g{Ki` ri11CTc#Zf?@Gq<LwCGodSl2}Hn~u)YVh()y7QYFeJ!Iy{KY9N*hU~EO literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_21px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_21px.svg new file mode 100644 index 00000000000..5b73b2fec54 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_up_21px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:21-32" width="21" height="220" version="1.1" viewBox="0 0 5.5562 58.208" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m0.4005 49.854 0.0034 7.9539h4.7556l0.0034-7.9539-2.3812-2.8176z" fill="#fff" stroke="#aeaeae"/> + <path d="m0.26458 26.451 0.0036 8.2057h5.0199l0.0036-8.2057-2.5135-2.9068z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m0.4005 38.212 0.0034 7.9539h4.7556l0.0034-7.9539-2.3812-2.8176z" stroke="#3096fa"/> + <path d="m0.40051 3.2871 0.0034 7.9539h4.7556l0.0034-7.9539-2.3812-2.8176z" stroke="#aeaeae"/> + <path d="m0.4005 14.929 0.0034 7.9539h4.7556l0.0034-7.9539-2.3812-2.8176z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp b/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b5c9d0f78a528afc15f2073d17e0a8fce6e1884a GIT binary patch literal 4758 zcmeHJKTpC?5U<hE$;7qo*y@5|aFT(=$;GeYAgG_f*+7W)3y>6s_A~UK#u+{dv3)P+ zUEu}7guT}$L@pdx+TO44?tVY|x_5&!qqJB2enCG+zeYbYY~vW?>FPQjZWtKG@<ZpK zdwc(|adD@^lb!D3-Q@ee6^3CloleDMGJ&d2`9ToG<MG(Un9k>Oi3S{_{Ml?);u1a= zPpyS;RK4n)j;MO41507lg;_&Ci#q0B2S0g=X)c>;Crv4?DlYsrQa<8Dq)pN~X^N|* znzdO_jXF*BY#%Ud&?e14)A^sgdS}?Ac^&*DJmPzE>f${Ko?Q!iZVWv~K;MPRzRZu{ z@zO+$1f7SsUW?GOzBS&m#;1#-a;@7~`}mtX@9mmPJST&`BQ^Dv_>&+nZH%cVekR0s zo?@EIUc6md`9~+thi#D$T2R?3-|Iw+QQOSDn?!!S3y?YQ6@vNlb0pOI*m!C+;s>za zf@;-is&{*ViSyFjPnv%wzdgyurMV-2h)0WI%f^`M;V0rD-<wkx?@5O}tv)3k_O$<Z GPx}k^i?<a3 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg new file mode 100644 index 00000000000..0ea443d89ef --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:21-32" width="21" height="55" version="1.1" viewBox="0 0 5.5562 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <rect x=".13229" y=".39688" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="3.3073" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".13229" y="6.2177" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".13229" y="9.1281" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="12.039" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index f5fc7eae6f4..c8c3f22ddb1 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -775,6 +775,110 @@ BLUE_INI TEXTFILE "GlyphImageFile = blue_toolbar_buttons_split_dropdown_glyph.bmp\r\n" "GlyphTransparent = True\r\n" +"\r\n; TrackBar\r\n" +"[TrackBar]\r\n" +"BgType = BorderFill\r\n" +"FillType = Solid\r\n" +"FillColor = 245 245 245\r\n" +"BorderSize = 1\r\n" +"BorderColor = 174 174 174\r\n" + +"[TrackBar.Thumb]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_trackbar_thumb_horizontal.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"SizingMargins = 2, 3, 2, 3\r\n" +"SizingType = Tile\r\n" + +"[TrackBar.ThumbVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_trackbar_thumb_vertical.bmp\r\n" +"SizingMargins = 2, 3, 2, 3\r\n" +"SizingType = Stretch\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" + +"[TrackBar.ThumbTop]\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" +"SizingType = TrueSize\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = true\r\n" +"ImageFile1 = blue_trackbar_thumb_up_11px.bmp\r\n" +"ImageFile2 = blue_trackbar_thumb_up_15px.bmp\r\n" +"ImageFile3 = blue_trackbar_thumb_up_21px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[TrackBar.ThumbBottom]\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 5\r\n" +"Transparent = True\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_trackbar_thumb_down_11px.bmp\r\n" +"ImageFile2 = blue_trackbar_thumb_down_15px.bmp\r\n" +"ImageFile3 = blue_trackbar_thumb_down_21px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[TrackBar.ThumbLeft]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageCount = 5\r\n" +"Transparent = True\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_trackbar_thumb_left_19px.bmp\r\n" +"ImageFile2 = blue_trackbar_thumb_left_25px.bmp\r\n" +"ImageFile3 = blue_trackbar_thumb_left_44px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[TrackBar.ThumbRight]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageCount = 5\r\n" +"Transparent = True\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_trackbar_thumb_right_19px.bmp\r\n" +"ImageFile2 = blue_trackbar_thumb_right_25px.bmp\r\n" +"ImageFile3 = blue_trackbar_thumb_right_44px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[TrackBar.Track]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_trackbar_slider_track.bmp\r\n" +"ImageCount = 1\r\n" +"SizingType = Stretch\r\n" +"SizingMargins = 2, 2, 2, 2\r\n" + +"[TrackBar.TrackVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_trackbar_slider_track.bmp\r\n" +"ImageCount = 1\r\n" +"SizingType = Stretch\r\n" +"SizingMargins = 2, 2, 2, 2\r\n" + +"[TrackBar.Tics]\r\n" +"Color = 174 174 174\r\n" + +"[TrackBar.TicsVert]\r\n" +"Color = 174 174 174\r\n" + "\r\n; TreeView\r\n" "[TreeView]\r\n" "BgType = BorderFill\r\n" @@ -966,6 +1070,52 @@ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropd /* @makedep: blue_toolbar_buttons_split_dropdown_glyph.bmp */ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" +/* TrackBar */ +/* @makedep: blue_trackbar_thumb_horizontal.bmp */ +BLUE_TRACKBAR_THUMB_HORIZONTAL_BMP BITMAP "blue_trackbar_thumb_horizontal.bmp" + +/* @makedep: blue_trackbar_thumb_vertical.bmp */ +BLUE_TRACKBAR_THUMB_VERTICAL_BMP BITMAP "blue_trackbar_thumb_vertical.bmp" + +/* @makedep: blue_trackbar_slider_track.bmp */ +BLUE_TRACKBAR_SLIDER_TRACK_BMP BITMAP "blue_trackbar_slider_track.bmp" + +/* @makedep: blue_trackbar_thumb_down_11px.bmp */ +BLUE_TRACKBAR_THUMB_DOWN_11PX_BMP BITMAP "blue_trackbar_thumb_down_11px.bmp" + +/* @makedep: blue_trackbar_thumb_down_15px.bmp */ +BLUE_TRACKBAR_THUMB_DOWN_15PX_BMP BITMAP "blue_trackbar_thumb_down_15px.bmp" + +/* @makedep: blue_trackbar_thumb_down_21px.bmp */ +BLUE_TRACKBAR_THUMB_DOWN_21PX_BMP BITMAP "blue_trackbar_thumb_down_21px.bmp" + +/* @makedep: blue_trackbar_thumb_left_19px.bmp */ +BLUE_TRACKBAR_THUMB_LEFT_19PX_BMP BITMAP "blue_trackbar_thumb_left_19px.bmp" + +/* @makedep: blue_trackbar_thumb_left_25px.bmp */ +BLUE_TRACKBAR_THUMB_LEFT_25PX_BMP BITMAP "blue_trackbar_thumb_left_25px.bmp" + +/* @makedep: blue_trackbar_thumb_left_44px.bmp */ +BLUE_TRACKBAR_THUMB_LEFT_44PX_BMP BITMAP "blue_trackbar_thumb_left_44px.bmp" + +/* @makedep: blue_trackbar_thumb_right_19px.bmp */ +BLUE_TRACKBAR_THUMB_RIGHT_19PX_BMP BITMAP "blue_trackbar_thumb_right_19px.bmp" + +/* @makedep: blue_trackbar_thumb_right_25px.bmp */ +BLUE_TRACKBAR_THUMB_RIGHT_25PX_BMP BITMAP "blue_trackbar_thumb_right_25px.bmp" + +/* @makedep: blue_trackbar_thumb_right_44px.bmp */ +BLUE_TRACKBAR_THUMB_RIGHT_44PX_BMP BITMAP "blue_trackbar_thumb_right_44px.bmp" + +/* @makedep: blue_trackbar_thumb_up_11px.bmp */ +BLUE_TRACKBAR_THUMB_UP_11PX_BMP BITMAP "blue_trackbar_thumb_up_11px.bmp" + +/* @makedep: blue_trackbar_thumb_up_15px.bmp */ +BLUE_TRACKBAR_THUMB_UP_15PX_BMP BITMAP "blue_trackbar_thumb_up_15px.bmp" + +/* @makedep: blue_trackbar_thumb_up_21px.bmp */ +BLUE_TRACKBAR_THUMB_UP_21PX_BMP BITMAP "blue_trackbar_thumb_up_21px.bmp" + /* TreeView */ /* @makedep: blue_treeview_expand_collapse_9px.bmp */ BLUE_TREEVIEW_EXPAND_COLLAPSE_9PX_BMP BITMAP "blue_treeview_expand_collapse_9px.bmp" -- 2.30.2

1 0

[PATCH 4/6] light.msstyles: Add Tab parts.
by Zhiyi Zhang 28 Jun '21

28 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 5 + dlls/light.msstyles/blue_tab_background.bmp | Bin 0 -> 19338 bytes dlls/light.msstyles/blue_tab_background.svg | 13 +++ dlls/light.msstyles/blue_tab_item.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item.svg | 108 +++++++++++++++++++ dlls/light.msstyles/blue_tab_item_left.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item_left.svg | 111 ++++++++++++++++++++ dlls/light.msstyles/blue_tab_item_right.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item_right.svg | 109 +++++++++++++++++++ dlls/light.msstyles/blue_tab_pane_edge.bmp | Bin 0 -> 9354 bytes dlls/light.msstyles/blue_tab_pane_edge.svg | 16 +++ dlls/light.msstyles/light.rc | 104 ++++++++++++++++++ 12 files changed, 466 insertions(+) create mode 100644 dlls/light.msstyles/blue_tab_background.bmp create mode 100644 dlls/light.msstyles/blue_tab_background.svg create mode 100644 dlls/light.msstyles/blue_tab_item.bmp create mode 100644 dlls/light.msstyles/blue_tab_item.svg create mode 100644 dlls/light.msstyles/blue_tab_item_left.bmp create mode 100644 dlls/light.msstyles/blue_tab_item_left.svg create mode 100644 dlls/light.msstyles/blue_tab_item_right.bmp create mode 100644 dlls/light.msstyles/blue_tab_item_right.svg create mode 100644 dlls/light.msstyles/blue_tab_pane_edge.bmp create mode 100644 dlls/light.msstyles/blue_tab_pane_edge.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index c3c5643236a..7be6fa532a6 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -45,6 +45,11 @@ SVG_SRCS = \ blue_spin_glyph_up.svg \ blue_status_background.svg \ blue_status_pane.svg \ + blue_tab_background.svg \ + blue_tab_item.svg \ + blue_tab_item_left.svg \ + blue_tab_item_right.svg \ + blue_tab_pane_edge.svg \ blue_toolbar_buttons.svg \ blue_toolbar_buttons_split.svg \ blue_toolbar_buttons_split_dropdown.svg \ diff --git a/dlls/light.msstyles/blue_tab_background.bmp b/dlls/light.msstyles/blue_tab_background.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f98d95e3fa16bc27694891006c98a7e167846f4b GIT binary patch literal 19338 zcmeIxJr2Qe0Egi}F*$+rSPWt@xrfyWT)J8xi{Xvk(`ZF2k-UD-{&YW%=W(B}xB1-8 z=Vd*{YV4l($NTx~!{<7U@p>&crv2f3{XF^gee?CjDUbO_^6)(KEdNy=o@XBY>?a4p zPv+r=pBxB3nTH>Kav=O<9)9@Af$)=g_~9o9!cXSmho2k>KbeOgesUoEWFCI_$${{b zdHCTc2f|P0;fJ3b2tS#JAAWKm{A3<}_{o9rlX>{zCkMh$=HZ8*90)&|haY}&ApB$= ze)!3O@RND?;U@>ePv+r=pBxB3nTH>Kav=O<9)9@Af$)=g_~9o9!cXSmho2k>Kbhwb G{5$|xt`<uG literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tab_background.svg b/dlls/light.msstyles/blue_tab_background.svg new file mode 100644 index 00000000000..55f868b3f4a --- /dev/null +++ b/dlls/light.msstyles/blue_tab_background.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-24" width="10" height="600" version="1.1" viewBox="0 0 2.6458 158.75" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x="1e-7" y="5e-7" width="2.6458" height="158.75" fill="#fff" stroke-width="0"/> +</svg> diff --git a/dlls/light.msstyles/blue_tab_item.bmp b/dlls/light.msstyles/blue_tab_item.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4ebf519c2e7d5bd1868dc89813db582002cde966 GIT binary patch literal 1658 zcmeHGOG?8~6upAF2DeZI6{G{Foj7vh21JFr07oqq=Pp1Zwk{!`w*ZACQ=KG(WC3+r zlMo@F*Xwz08o?Ag73(GU<eqzy!8^RuIq7fHtnPpV^cMOIy+J!bq7Sub6cf!KrEur? z^t$oMipAy+oqH{=tJk8n;{9FX!5){na-higW}kR?&Myy~rTnb%=#qFc=FtV;9)j@X zopfDK7lpaO4Z~Q-=`wxQ|G!-~O*2Un91)0_Y}@vIKZ+vH^Bl(^D0m4WfS9SiTk}Er zRj(?4{xpY2Qc4^VsQiL0VHlQW83cjrx|Ls+Wq~Na^816@56tVwwKmIH9?LA(+EiFw o`S!&5r+gh2;)<s6xDeg^@d#uZ|L1Xe9^*Lv&Lbj<`&H%f3kb2a(f|Me literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tab_item.svg b/dlls/light.msstyles/blue_tab_item.svg new file mode 100644 index 00000000000..ec462d22cd7 --- /dev/null +++ b/dlls/light.msstyles/blue_tab_item.svg @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:5-24" width="5" height="95" version="1.1" viewBox="0 0 1.3229 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect y="-5e-5" width="1.3229" height="25.135" fill="#fff" stroke-width=".26458"/> + <rect transform="rotate(90)" x="19.315" y="-.26458" width=".26458" height=".26458" fill="#aeaeae" stroke-width="0"/> + <rect x=".13229" y="15.214" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/> + <g stroke-width="0"> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="19.579" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.579" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.844" y="-.26458" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="19.315" y="-1.0583" width=".79375" height=".79375" fill="#f5f5f5"/> + <rect transform="rotate(90)" x="19.844" y="-1.3229" width=".26458" height=".26458" fill="#fff"/> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="19.844" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.315" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.2333" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <g fill="#fff"> + <rect x=".13229" y="5.1594" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#3096fa" stroke-width=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/> + <rect transform="rotate(90)" x="9.525" y="-.52917" width=".26458" height=".26458" stroke-width="0"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="9.525" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + <g fill="#fff"> + <rect transform="rotate(90)" x="9.2604" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.2604" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + </g> + <g fill="#3096fa"> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <rect x=".13229" y="10.186" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> + <g stroke-width="0"> + <rect transform="rotate(90)" x="14.817" y="-1.3229" width=".26458" height="1.3229" fill="#fff"/> + <rect transform="rotate(90)" x="14.552" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.552" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.552" y="-.52917" width=".26458" height=".26458" fill="#fff"/> + <rect transform="rotate(90)" x="14.552" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + </g> + <g fill="#fff"> + <g stroke-width="0"> + <rect transform="rotate(90)" x="14.288" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.552" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.552" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.288" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.817" y="-.79375" width=".26458" height=".26458"/> + </g> + <rect x=".13229" y="20.241" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#2979ff" stroke-width=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/> + <rect transform="rotate(90)" x="24.606" y="-.52917" width=".26458" height=".26458" stroke-width="0"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="24.606" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + <g fill="#fff"> + <rect transform="rotate(90)" x="24.342" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.342" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/> + <g fill="#2979ff"> + <rect transform="rotate(90)" x="24.606" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.342" y="-1.3229" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="9.2604" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/> + <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" fill="#3096fa"/> + <rect transform="rotate(90)" x="14.287" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.288" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/> + <rect transform="rotate(90)" x="24.342" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/> + </g> + <rect x=".13229" y=".13229" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/> + <g fill="#aeaeae" stroke-width="0"> + <rect transform="rotate(90)" x="4.4979" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.4979" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.7625" y="-.26458" width=".26458" height=".26458"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="4.2333" y="-1.0583" width=".79375" height=".79375" fill="#f5f5f5"/> + <rect transform="rotate(90)" x="4.7625" y="-1.3229" width=".26458" height=".26458" fill="#fff"/> + <rect transform="rotate(90)" x="4.7625" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="4.2333" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + </g> + <rect x="1.2723" y="20.898" width=".016691" height=".060252" rx=".52917" ry=".060252" fill="#fff" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_tab_item_left.bmp b/dlls/light.msstyles/blue_tab_item_left.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e395328565e388d743e8dd088b3e15706781804e GIT binary patch literal 1658 zcmeHGJ5Iwu6nsd)8Ms24KtT%HG*mRX079T}0IHxMdJce$NH~H&djODZx6s&yeSpvg z+cJ_ro5yT$jKGo7BEpm3?3<l+v7?>t(d9PH>jpSPZ=sLT8?*x?dQ%&XVxrGaDcn8m zT{MoY*x3A`^Pt6b4O+BzeAwnPR}K^zU+of)PWb7Lvy>k-9-k6VCs_D;pT}oBeI;Gj z(?wx!aKkVba=J`k_5W|zP18)01Xl!NCfl}s-;bim^E}6K2nrS<1Q4_Gr+!`-zVXVR zTK|h29!V*2MWFHvwuE6=mSqqGuIpBQS(XK&{K{|lYCkZqAJ;l8=Xor%T<cI__2tV0 l=kM})RETq$#gjtx^ZNskS^S^J<#~+b_$!ZyDBf3<#}B7Dv)=#! literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tab_item_left.svg b/dlls/light.msstyles/blue_tab_item_left.svg new file mode 100644 index 00000000000..26bd9353a2b --- /dev/null +++ b/dlls/light.msstyles/blue_tab_item_left.svg @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:5-24" width="5" height="95" version="1.1" viewBox="0 0 1.3229 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect y="-5e-5" width="1.3229" height="25.135" fill="#fff" stroke-width=".26458"/> + <g fill="#fff"> + <rect x=".13229" y="5.1594" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#3096fa" stroke-width=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/> + <rect transform="rotate(90)" x="9.525" y="-.52917" width=".26458" height=".26458" stroke-width="0"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="9.525" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + <g fill="#fff"> + <rect transform="rotate(90)" x="9.2604" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.2604" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + </g> + <g fill="#3096fa"> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <rect x=".13229" y="10.186" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> + <g stroke-width="0"> + <rect transform="rotate(90)" x="14.817" y="-1.3229" width=".26458" height="1.3229" fill="#fff"/> + <rect transform="rotate(90)" x="14.552" y="-.26459" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.552" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.552" y="-.52917" width=".26458" height=".26458" fill="#fff"/> + <rect transform="rotate(90)" x="14.552" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + </g> + <g fill="#fff"> + <g stroke-width="0"> + <rect transform="rotate(90)" x="14.288" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.552" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.552" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.288" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.817" y="-.79375" width=".26458" height=".26458"/> + </g> + <rect x=".13229" y="20.241" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#2979ff" stroke-width=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/> + <rect transform="rotate(90)" x="24.606" y="-.52917" width=".26458" height=".26458" stroke-width="0"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="24.606" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + <g fill="#fff"> + <rect transform="rotate(90)" x="24.342" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.342" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/> + <g fill="#2979ff"> + <rect transform="rotate(90)" x="24.606" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-.26459" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.342" y="-1.3229" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="9.2604" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/> + <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" fill="#3096fa"/> + <rect transform="rotate(90)" x="14.288" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.288" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/> + <rect transform="rotate(90)" x="24.342" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="14.552" y="-.26459" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.817" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.315" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <rect x=".13229" y="15.214" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/> + <g stroke-width="0"> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="19.579" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.579" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.844" y="-.26458" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="19.315" y="-1.0583" width=".79375" height=".79375" fill="#f5f5f5"/> + <rect transform="rotate(90)" x="19.844" y="-1.3229" width=".26458" height=".26458" fill="#fff"/> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="19.844" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.315" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.2333" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <rect x=".13229" y=".13229" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/> + <g fill="#aeaeae" stroke-width="0"> + <rect transform="rotate(90)" x="4.4979" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.4979" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.7625" y="-.26458" width=".26458" height=".26458"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="4.2333" y="-1.0583" width=".79375" height=".79375" fill="#f5f5f5"/> + <rect transform="rotate(90)" x="4.7625" y="-1.3229" width=".26458" height=".26458" fill="#fff"/> + <rect transform="rotate(90)" x="4.7625" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="4.2333" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tab_item_right.bmp b/dlls/light.msstyles/blue_tab_item_right.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1ba39c28378c8fa676d9c9fcb6b266849ed16e97 GIT binary patch literal 1658 zcmeHGJ5Iw;5L_hS3|t{iKtd^K(@@dm0tk@80jPq4=s5r~BH;-ByaRw_yM@Ls>;r^0 z*p`uOzn5hk93$aKX_3szJKou`i#K}HKe^teW!(YC=pFPadW-geL?7j%QB3sxlnVEc z2Um?xHY~P(={)LiU84@Qj*q)6^U{GL<C}fr$r-;qaF+73#?uSp`HZLMe0vDO^LNs9 zJzW*%1~&|2C8z83P5=LO-89W4NpM6UX0mPD_x&h}JkN6+hoImkgaBfu`fg#U{HRxL z;P6N(g(Cw?zhFxkhEmEP2wc~#{IV<yr1UGlKdAk|+&-@LSS|A?vs~*@VGY&W6X&1m ibyA2+TEw$L4D-h$kVX8T$Mt!P<M=0!h$!w?mB%lnMYG%h literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tab_item_right.svg b/dlls/light.msstyles/blue_tab_item_right.svg new file mode 100644 index 00000000000..5043e6e2bf7 --- /dev/null +++ b/dlls/light.msstyles/blue_tab_item_right.svg @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:5-24" width="5" height="95" version="1.1" viewBox="0 0 1.3229 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect y="-5e-5" width="1.3229" height="25.135" fill="#fff" stroke-width=".26458"/> + <rect transform="rotate(90)" x="19.315" y="-.26458" width=".26458" height=".26458" fill="#aeaeae" stroke-width="0"/> + <rect x=".13229" y="15.214" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/> + <g stroke-width="0"> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="19.579" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.579" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.844" y="-.26458" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="19.315" y="-1.0583" width=".79375" height=".79375" fill="#f5f5f5"/> + <rect transform="rotate(90)" x="19.844" y="-1.3229" width=".26458" height=".26458" fill="#fff"/> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="19.844" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.315" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.2333" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <rect x=".13229" y=".13229" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/> + <g fill="#aeaeae" stroke-width="0"> + <rect transform="rotate(90)" x="4.4979" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.4979" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.7625" y="-.26458" width=".26458" height=".26458"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="4.2333" y="-1.0583" width=".79375" height=".79375" fill="#f5f5f5"/> + <rect transform="rotate(90)" x="4.7625" y="-1.3229" width=".26458" height=".26458" fill="#fff"/> + <rect transform="rotate(90)" x="4.7625" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="4.2333" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + </g> + <g fill="#fff"> + <rect x=".13229" y="5.1594" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#3096fa" stroke-width=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/> + <rect transform="rotate(90)" x="9.525" y="-.52917" width=".26458" height=".26458" stroke-width="0"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="9.525" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + <g fill="#fff"> + <rect transform="rotate(90)" x="9.2604" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.2604" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + </g> + <g fill="#3096fa"> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <rect x=".13229" y="10.186" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> + <g stroke-width="0"> + <rect transform="rotate(90)" x="14.817" y="-1.3229" width=".26458" height="1.3229" fill="#fff"/> + <rect transform="rotate(90)" x="14.552" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.552" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.552" y="-.52917" width=".26458" height=".26458" fill="#fff"/> + <rect transform="rotate(90)" x="14.552" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + </g> + <g fill="#fff"> + <g stroke-width="0"> + <rect transform="rotate(90)" x="14.288" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.552" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.552" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.288" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.817" y="-.79375" width=".26458" height=".26458"/> + </g> + <rect x=".13229" y="20.241" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#2979ff" stroke-width=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/> + <rect transform="rotate(90)" x="24.606" y="-.52917" width=".26458" height=".26458" stroke-width="0"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="24.606" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + <g fill="#fff"> + <rect transform="rotate(90)" x="24.342" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.342" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/> + <g fill="#2979ff"> + <rect transform="rotate(90)" x="24.606" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.342" y="-1.3229" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="9.2604" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/> + <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" fill="#3096fa"/> + <rect transform="rotate(90)" x="14.288" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.288" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/> + <rect transform="rotate(90)" x="24.342" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/> + <rect transform="rotate(90)" x="14.552" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.817" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tab_pane_edge.bmp b/dlls/light.msstyles/blue_tab_pane_edge.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0ee90aca9c540376d512f607da8aefd74ec87961 GIT binary patch literal 9354 zcmeI2El<Nx6oxMW0TMd_3&CMXu&8Cp)C>t0iA5kV2qc+9Vv$YSiq_2_2w%UT{VlAy zdtd0AnUUZQH#s+ZcA9?N^Y&?{c1P3MVfY?1eBXlOo{caJn>^AV=jLj}5Pm+~6-Se^ z>(#NpZEdYNEylP5cEJD~fFp1MPQe&V!3DSkSKtQRfqU=(9>EjHKm}fY;Tikq{W(0B z*YH}-!MQjm=VlM~I|uB|49vnz%*Kq&x}E3wepOX(WmztYqKGNLtjPSDW!YX`*Y8c! zEV{14?W8f7m6_!|rR*}y%y<r8d|y%>de=R_jRE&><6T|dzf9Ov_iy7}UERM-*i`p# z<6T|dzf9Ov_iy7}UERM-*i`p#<6T|dzf9Ov_iy7}UERM-*i`p#<6T|dzf9Ov_iy7} zUERM-*i`p#<6T|dzf9Ov_iy7}UFn}|2@?MQoofg_+qT6mq__ToYd7G3h<o_pbI|YM MzgK2ucCMXS0_lekzyJUM literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tab_pane_edge.svg b/dlls/light.msstyles/blue_tab_pane_edge.svg new file mode 100644 index 00000000000..73f3fc2d2c7 --- /dev/null +++ b/dlls/light.msstyles/blue_tab_pane_edge.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:48-32" width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="#fff"> + <rect x=".13229" y=".13229" width="12.435" height="12.171" rx=".52917" ry=".52917" stroke="#aeaeae" stroke-width=".26458"/> + <rect transform="matrix(1 0 .99934 .036434 0 0)" x="-341.09" y="341.31" width="5.4429" height="7.262"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 199ddcbfa77..f5fc7eae6f4 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -620,6 +620,94 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "VAlign = Bottom\r\n" +"\r\n; Tab\r\n" +"[Tab]\r\n" +"BgType = BorderFill\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" +"BorderSize = 0\r\n" + +"[Tab.Pane]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_pane_edge.bmp\r\n" +"SizingMargins = 2, 4, 2, 4\r\n" +"SizingType = Stretch\r\n" +"ImageCount = 1\r\n" + +"[Tab.TabItem]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" + +"[Tab.TabItemLeftEdge]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item_left.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" + +"[Tab.TabItemRightEdge]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item_right.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" + +"[Tab.TabItemBothEdge]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" + +"[Tab.TopTabItem]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" + +"[Tab.TopTabItemLeftEdge]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item_left.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" + +"[Tab.TopTabItemRightEdge]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item_right.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" + +"[Tab.TopTabItemBothEdge]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" + +"[Tab.Body]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_background.bmp\r\n" + "\r\n; Toolbar\r\n" "[Toolbar]\r\n" "BgType = BorderFill\r\n" @@ -843,6 +931,22 @@ BLUE_STATUS_BACKGROUND_BMP BITMAP "blue_status_background.bmp" /* @makedep: blue_status_pane.bmp */ BLUE_STATUS_PANE_BMP BITMAP "blue_status_pane.bmp" +/* Tab */ +/* @makedep: blue_tab_background.bmp */ +BLUE_TAB_BACKGROUND_BMP BITMAP "blue_tab_background.bmp" + +/* @makedep: blue_tab_item.bmp */ +BLUE_TAB_ITEM_BMP BITMAP "blue_tab_item.bmp" + +/* @makedep: blue_tab_item_left.bmp */ +BLUE_TAB_ITEM_LEFT_BMP BITMAP "blue_tab_item_left.bmp" + +/* @makedep: blue_tab_item_right.bmp */ +BLUE_TAB_ITEM_RIGHT_BMP BITMAP "blue_tab_item_right.bmp" + +/* @makedep: blue_tab_pane_edge.bmp */ +BLUE_TAB_PANE_EDGE_BMP BITMAP "blue_tab_pane_edge.bmp" + /* ToolBar */ /* @makedep: blue_toolbar_buttons.bmp */ BLUE_TOOLBAR_BUTTONS_BMP BITMAP "blue_toolbar_buttons.bmp" -- 2.30.2

1 0

[PATCH 3/6] light.msstyles: Add Progress parts.
by Zhiyi Zhang 28 Jun '21

28 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 4 ++ .../blue_progress_chunk_horizontal.bmp | Bin 0 -> 2358 bytes .../blue_progress_chunk_horizontal.svg | 13 +++++ .../blue_progress_chunk_vertical.bmp | Bin 0 -> 2490 bytes .../blue_progress_chunk_vertical.svg | 13 +++++ .../blue_progress_track_horizontal.bmp | Bin 0 -> 2698 bytes .../blue_progress_track_horizontal.svg | 13 +++++ .../blue_progress_track_vertical.bmp | Bin 0 -> 886 bytes .../blue_progress_track_vertical.svg | 13 +++++ dlls/light.msstyles/light.rc | 48 ++++++++++++++++++ 10 files changed, 104 insertions(+) create mode 100644 dlls/light.msstyles/blue_progress_chunk_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_progress_chunk_horizontal.svg create mode 100644 dlls/light.msstyles/blue_progress_chunk_vertical.bmp create mode 100644 dlls/light.msstyles/blue_progress_chunk_vertical.svg create mode 100644 dlls/light.msstyles/blue_progress_track_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_progress_track_horizontal.svg create mode 100644 dlls/light.msstyles/blue_progress_track_vertical.bmp create mode 100644 dlls/light.msstyles/blue_progress_track_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index f5bbb77df04..c3c5643236a 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -15,6 +15,10 @@ SVG_SRCS = \ blue_groupbox.svg \ blue_header.svg \ blue_header_item.svg \ + blue_progress_chunk_horizontal.svg \ + blue_progress_chunk_vertical.svg \ + blue_progress_track_horizontal.svg \ + blue_progress_track_vertical.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_25px.svg \ diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp b/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..60debfe40494d2a82bf975ee4bb42e9ddd896acd GIT binary patch literal 2358 zcmZ?rHREIegDxOh1H^_v%n!tj3=%++fnf~?m_j4|GcZ69Nc_K(dr&c&0)ku?G!?(5 q84NbWFxVUfbkC@ph)XA<;WQdf)GSa&)6-~r8ck31uMh`iz5@W5dk(t* literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.svg b/dlls/light.msstyles/blue_progress_chunk_horizontal.svg new file mode 100644 index 00000000000..629b667f585 --- /dev/null +++ b/dlls/light.msstyles/blue_progress_chunk_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:49-24" width="49" height="15" version="1.1" viewBox="0 0 12.965 3.9688" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/> +</svg> diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.bmp b/dlls/light.msstyles/blue_progress_chunk_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f9816b09dcff388dc141bf9ade59f65d1c81d2cc GIT binary patch literal 2490 zcmZ?r-NnfO23<h128j8A*bs;r86<!t1A_rn9?XFg{}~t{2qf~~$vvnTE=44R1x?+r zX$Hh2pkCq?167Wy#~)my;WHXO$RRMA9*{!=lRX+fm|=n}G8#U}p@GRB4Ij)fK^7Se MALP)$WCOzo0PaN&!~g&Q literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.svg b/dlls/light.msstyles/blue_progress_chunk_vertical.svg new file mode 100644 index 00000000000..4f43374dce5 --- /dev/null +++ b/dlls/light.msstyles/blue_progress_chunk_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:15-24" width="15" height="49" version="1.1" viewBox="0 0 3.9687 12.965" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect transform="rotate(90)" y="-3.9688" width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/> +</svg> diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.bmp b/dlls/light.msstyles/blue_progress_track_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..43d5eaa441a33b300008495fe4e215d0a10018c1 GIT binary patch literal 2698 zcmZ?r?c!npgDxOh1H`64EC9re3=%*R2%z#14vhTIzyLuYf&WhKLB%i`VrdpMh3f`4 zU;sMr|6m0`w~e}wg2)*SKMDd5sC6{_M#GP?5TH!=X!;usKgvRYGTlQY{Q;dhXaNHN D7T0e@ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.svg b/dlls/light.msstyles/blue_progress_track_horizontal.svg new file mode 100644 index 00000000000..af25bbbcd51 --- /dev/null +++ b/dlls/light.msstyles/blue_progress_track_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:53-24" width="53" height="16" version="1.1" viewBox="0 0 14.023 4.2333" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x=".13229" y=".13229" width="13.758" height="3.9688" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_progress_track_vertical.bmp b/dlls/light.msstyles/blue_progress_track_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..5dddee9c32ee9eeac628d82e4f4fead8576230cc GIT binary patch literal 886 zcmZ?rEn{W?gDxOh1H^nlEC|Gm3=%++f#D4km_j4|GcZ69Nc_K(dr&c&0)ku?G!^TJ h1`G^9rT>WlKxLz9f#Eb74v@q`>u>;?PYhsS005g#n8^SD literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_progress_track_vertical.svg b/dlls/light.msstyles/blue_progress_track_vertical.svg new file mode 100644 index 00000000000..2f0f638bd8a --- /dev/null +++ b/dlls/light.msstyles/blue_progress_track_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:14-24" width="14" height="17" version="1.1" viewBox="0 0 3.7042 4.4979" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x=".13229" y=".13229" width="3.4396" height="4.2333" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 19e3192201f..199ddcbfa77 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -365,6 +365,41 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; Progress\r\n" +"[Progress]\r\n" +"ProgressChunkSize = 1\r\n" +"ProgressSpaceSize = 0\r\n" +"BgType = BorderFill\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" +"BorderSize = 1\r\n" +"BorderColor = 174 174 174\r\n" + +"[Progress.Bar]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_horizontal.bmp\r\n" +"MinSize = 10, 10\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.BarVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_vertical.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.Chunk]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_chunk_horizontal.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.ChunkVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_chunk_vertical.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + "\r\n; Rebar\r\n" "[Rebar]\r\n" "BgType = ImageFile\r\n" @@ -722,6 +757,19 @@ BLUE_HEADER_BMP BITMAP "blue_header.bmp" /* @makedep: blue_header_item.bmp */ BLUE_HEADER_ITEM_BMP BITMAP "blue_header_item.bmp" +/* Progress */ +/* @makedep: blue_progress_chunk_horizontal.bmp */ +BLUE_PROGRESS_CHUNK_HORIZONTAL_BMP BITMAP "blue_progress_chunk_horizontal.bmp" + +/* @makedep: blue_progress_chunk_vertical.bmp */ +BLUE_PROGRESS_CHUNK_VERTICAL_BMP BITMAP "blue_progress_chunk_vertical.bmp" + +/* @makedep: blue_progress_track_horizontal.bmp */ +BLUE_PROGRESS_TRACK_HORIZONTAL_BMP BITMAP "blue_progress_track_horizontal.bmp" + +/* @makedep: blue_progress_track_vertical.bmp */ +BLUE_PROGRESS_TRACK_VERTICAL_BMP BITMAP "blue_progress_track_vertical.bmp" + /* Rebar */ /* @makedep: blue_rebar_background.bmp */ BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp" -- 2.30.2

1 0

[PATCH 2/6] light.msstyles: Add Header parts.
by Zhiyi Zhang 28 Jun '21

28 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 2 ++ dlls/light.msstyles/blue_header.bmp | Bin 0 -> 618 bytes dlls/light.msstyles/blue_header.svg | 21 ++++++++++++ dlls/light.msstyles/blue_header_item.bmp | Bin 0 -> 2538 bytes dlls/light.msstyles/blue_header_item.svg | 39 +++++++++++++++++++++++ dlls/light.msstyles/light.rc | 24 ++++++++++++++ 6 files changed, 86 insertions(+) create mode 100644 dlls/light.msstyles/blue_header.bmp create mode 100644 dlls/light.msstyles/blue_header.svg create mode 100644 dlls/light.msstyles/blue_header_item.bmp create mode 100644 dlls/light.msstyles/blue_header_item.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index c0b55dd966d..f5bbb77df04 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -13,6 +13,8 @@ SVG_SRCS = \ blue_commandlink_glyph_30px.svg \ blue_commandlink_glyph_45px.svg \ blue_groupbox.svg \ + blue_header.svg \ + blue_header_item.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_25px.svg \ diff --git a/dlls/light.msstyles/blue_header.bmp b/dlls/light.msstyles/blue_header.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fb81a657aa950214103575d3e2572d6199dfe4ea GIT binary patch literal 618 zcmZ?r&0=BzgDxOh1H^1VECIxfV3L910V9xu0sb>EKoCggzmt1VF@_QX0xW3q|1kgq X!#WHA7DHAER52<x2*Us^<`@_Na*2b5 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_header.svg b/dlls/light.msstyles/blue_header.svg new file mode 100644 index 00000000000..46046e1e454 --- /dev/null +++ b/dlls/light.msstyles/blue_header.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-24" width="6" height="24" version="1.1" viewBox="0 0 1.5875 6.35" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width="0"> + <rect width="1.5875" height="6.35" fill="#fff"/> + <g fill="#aeaeae"> + <rect x="1.3229" y="3.1988e-7" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="5.8208" y="-1.3229" width=".26458" height="1.3229"/> + <rect x="-1.5895e-8" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="2.2252e-7" y="-1.3229" width=".26458" height="1.3229"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_header_item.bmp b/dlls/light.msstyles/blue_header_item.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3a381109f575918b9b46977ffe71f58354168a91 GIT binary patch literal 2538 zcmZ?reZ|QD23<h128h{!xB`e786<!t149B-9?XFg{}~t{2qf~~$vvnTE=44R1x?+5 z48Xv!e*OA&r~qgg1{f9l4~h#6F!;qr<9G1K5k|5iC9PFz{)eM#o&QzZK>q>-{{4fZ zzklFjaC=6@{{J5YVE~V}Ds4y{!6OL9U|{$)%>aR>8~vJY1Qz@M{~r|n`->2RX&V&- s2F`$o3r4)bq6a}UFd)~xz_J<$z+!ME|Ni|O6&svk0FOFwv;pG{0Js*V-2eap literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_header_item.svg b/dlls/light.msstyles/blue_header_item.svg new file mode 100644 index 00000000000..642db57b60f --- /dev/null +++ b/dlls/light.msstyles/blue_header_item.svg @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-24" width="6" height="120" version="1.1" viewBox="0 0 1.5875 31.75" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="translate(-159.47 -110.22)" stroke-width="0"> + <rect x="159.47" y="110.22" width="1.5875" height="6.35" fill="#fff"/> + <rect x="160.79" y="110.22" width=".26458" height="6.0854" fill="#aeaeae"/> + <rect transform="rotate(90)" x="116.04" y="-160.79" width=".26458" height="1.3229" fill="#aeaeae"/> + <rect x="159.47" y="116.57" width="1.5875" height="6.35" fill="#fff"/> + <g fill="#3096fa"> + <rect x="160.79" y="116.57" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="122.39" y="-160.79" width=".26458" height="1.0583"/> + <rect x="159.47" y="116.57" width=".26458" height="6.0854"/> + </g> + <rect x="159.47" y="122.92" width="1.5875" height="6.35" fill="#fff"/> + <g fill="#2979ff"> + <rect x="160.79" y="122.92" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="122.92" y="-160.79" width=".26458" height="1.0583"/> + <rect x="159.47" y="122.92" width=".26458" height="6.0854"/> + </g> + <rect x="159.47" y="129.27" width="1.5875" height="6.35" fill="#fff"/> + <rect transform="rotate(90)" x="135.09" y="-161.06" width=".26458" height="1.5875" fill="#aeaeae"/> + <rect x="159.47" y="135.62" width="1.5875" height="6.35" fill="#fff"/> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="141.44" y="-161.06" width=".26458" height="1.5875"/> + <rect x="159.47" y="110.22" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="110.22" y="-160.79" width=".26458" height="1.3229"/> + </g> + <rect transform="rotate(90)" x="116.57" y="-160.79" width=".26458" height="1.0583" fill="#3096fa"/> + <rect transform="rotate(90)" x="128.74" y="-160.79" width=".26458" height="1.0583" fill="#2979ff"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 5aea6c02610..19e3192201f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -334,6 +334,23 @@ BLUE_INI TEXTFILE "FillColor = 245 245 245\r\n" "TextColor = 0 0 0\r\n" +"\r\n; Header\r\n" +"[Header]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 2, 2, 2, 4\r\n" +"ImageFile = blue_header.bmp\r\n" +"SizingType = Tile\r\n" + +"[Header.HeaderItem]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 2, 2, 2, 4\r\n" +"ContentMargins = 3, 0, 0, 0\r\n" +"ImageFile = blue_header_item.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + "\r\n; ListBox\r\n" "[ListBox]\r\n" "BgType = BorderFill\r\n" @@ -698,6 +715,13 @@ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" /* @makedep: blue_combobutton_glyph.bmp */ BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" +/* Header */ +/* @makedep: blue_header.bmp */ +BLUE_HEADER_BMP BITMAP "blue_header.bmp" + +/* @makedep: blue_header_item.bmp */ +BLUE_HEADER_ITEM_BMP BITMAP "blue_header_item.bmp" + /* Rebar */ /* @makedep: blue_rebar_background.bmp */ BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp" -- 2.30.2

1 0

[PATCH 1/6] light.msstyles: Add TreeView parts.
by Zhiyi Zhang 28 Jun '21

28 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 5 ++- .../blue_treeview_expand_collapse_10px.bmp | Bin 0 -> 938 bytes .../blue_treeview_expand_collapse_10px.svg | 16 +++++++++ .../blue_treeview_expand_collapse_15px.bmp | Bin 0 -> 1938 bytes .../blue_treeview_expand_collapse_15px.svg | 16 +++++++++ .../blue_treeview_expand_collapse_9px.bmp | Bin 0 -> 786 bytes .../blue_treeview_expand_collapse_9px.svg | 16 +++++++++ dlls/light.msstyles/light.rc | 31 ++++++++++++++++++ 8 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index ec23c395b3a..c0b55dd966d 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -44,4 +44,7 @@ SVG_SRCS = \ blue_toolbar_buttons_split_dropdown.svg \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_separator_horizontal.svg \ - blue_toolbar_separator_vertical.svg + blue_toolbar_separator_vertical.svg \ + blue_treeview_expand_collapse_10px.svg \ + blue_treeview_expand_collapse_15px.svg \ + blue_treeview_expand_collapse_9px.svg diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..31860c071b5e1f8a4e151da24c9b3063e286b3f2 GIT binary patch literal 938 zcmZ?rUB%1*23<h128g+USOka}859^mQVLLcAQK7vXJCLJkl24G_n=}VNuro6M5&@o z(a)&{4Zo%t{KtmTO~$1bT^)#zO)WNc*wo@uhprZ%I%Ktk)WOseqYjsvwQJW--oJl8 z!6;j|Zry(%-noALdI4N!fyANeCIIPcK()%a)PmH3<bd|40NF2qv?DgPFm)g~AlnI~ z7HDoVx>_`KHbDL}pqW{?)B)uqfcPa)jW@a)5Fcb75O)Catu<@bXkb%=q;B7;RjY(> QsR4-t?U@5q!-h=_0DaY}!T<mO literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg new file mode 100644 index 00000000000..370531f67bc --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="20" version="1.1" viewBox="0 0 2.6458 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g> + <path d="m0.92604 2.3616 1.2446-1.0424-1.2446-1.0424z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 4.7625h1.8521v-1.8521z" fill="#3096fa" stroke-width=".19844"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8f55669d86dd1d01a1188c6a2cb5beee25381c34 GIT binary patch literal 1938 zcmchVJ8r`;42EU2KnnEX8x&o#=Lo5TG|14USLxazbH)M<kSiE|#EStRCa)f$Tf3+~ zlL!z5Nue}E@Ndc_KZ&%Iy?*w@Va)OVfKuoYO2m`6g1tG#G1Z0?;`oqHW|OyfEy$W) zv$8Ie^!qiK{VfKPE3>K)-el>U%iCBk?_xQ;k3GkqV|_e_b@5!*#)q&bAIj={46FE9 z*2R@&xon!|-WB)xtE!UFwyx`uFV7Yu7TgQ$j%vvB{LYqV^ASt_wrwAXg*MQ$E!XrZ zR{4vfn4pe5rv{UyHBfg-EMjY{GgRxE*2bzFa8ty;X`Qa?Zk1nIA4@stp^uy&XeFgg q6i3#_#_Sv0Z_Izz&li1UdS9+N^$U%m!@UZ*+b1^aKGWHS?DY=`0D<fP literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg new file mode 100644 index 00000000000..d219da9b6f4 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:15-32" width="15" height="30" version="1.1" viewBox="0 0 3.9687 7.9375" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g> + <path d="m0.92604 3.7042 2.5586-1.7198-2.5586-1.7198z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 7.4083h3.175v-3.175z" fill="#3096fa" stroke-width=".19844"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..239cf2d779f9e59e69198996b7eef8da472a4123 GIT binary patch literal 786 zcmZ?r6=G%pgDxOh1H_y_ECj@i3<?Y&sSYL}fdT$AFhCGU=D(ABP%(xQ0s<@q<Z(&= zoNCbUYns7-bd0VZn>utgAU?V}Y--Te;ZlRF4xbvBIznp5m0!1RUGM+@{~7V=2deqM ze*OBTt5&UI!=(<S28cmm*T#(-d9kSj%KZnL!Mt|u+G#-cC7?Pfbafy#Ffkze2oUdt b@nJMb4Kd~b)qwzB_YmQ)i46@6SW`9tD$0)A literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg new file mode 100644 index 00000000000..15ba25f8094 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:9-32" width="9" height="18" version="1.1" viewBox="0 0 2.3812 4.7625" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g> + <path d="m0.66146 2.0842 0.99269-0.89372-0.99269-0.89372z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 4.4979h1.5875v-1.5875z" fill="#3096fa" stroke-width=".19844"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index b7a8f538536..5aea6c02610 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -634,6 +634,27 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_toolbar_buttons_split_dropdown_glyph.bmp\r\n" "GlyphTransparent = True\r\n" + +"\r\n; TreeView\r\n" +"[TreeView]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[TreeView.Glyph]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageCount = 2\r\n" +"ImageLayout = vertical\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_treeview_expand_collapse_9px.bmp\r\n" +"ImageFile2 = blue_treeview_expand_collapse_10px.bmp\r\n" +"ImageFile3 = blue_treeview_expand_collapse_15px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 133\r\n" +"MinDpi3 = 150\r\n" } /* Button */ @@ -769,6 +790,16 @@ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropd /* @makedep: blue_toolbar_buttons_split_dropdown_glyph.bmp */ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" +/* TreeView */ +/* @makedep: blue_treeview_expand_collapse_9px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_9PX_BMP BITMAP "blue_treeview_expand_collapse_9px.bmp" + +/* @makedep: blue_treeview_expand_collapse_10px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_10PX_BMP BITMAP "blue_treeview_expand_collapse_10px.bmp" + +/* @makedep: blue_treeview_expand_collapse_15px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_15PX_BMP BITMAP "blue_treeview_expand_collapse_15px.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH v2 1/2] imm32 : Make an interface to disable input method in ImmAssociateContext
by Dongwan Kim 28 Jun '21

28 Jun '21

When ImmAssociateContext(hwnd, 0) is called, imm should be disabled. On Debian using uim or fcitx for korean, a program cannot receive KeyPress(VK_HANGUL) because the input method consumes the key. We should change input context to disable it in ImmAssociateContext. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/imm32/imm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..bf243832168 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -111,6 +111,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; +static HIMC ( *wine_associate_input_context)(HWND, HIMC); static inline BOOL is_himc_ime_unicode(const InputContextData *data) { @@ -598,6 +599,13 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) } } + if(!wine_associate_input_context){ + HMODULE h = load_graphics_driver(); + wine_associate_input_context = (LPVOID)GetProcAddress(h, "wine_associate_input_context"); + FreeLibrary(h); + } + if(wine_associate_input_context) + wine_associate_input_context(hWnd, hIMC); if (!hIMC) return old; -- 2.30.2

1 1

[PATCH] po: Update Dutch translation
by Floris Renaud 27 Jun '21

27 Jun '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/nl.po b/po/nl.po index f57e73cc0a8..46076ff7ae2 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6984,10 +6984,8 @@ msgid "Resource is not currently available.\n" msgstr "Bron is tijdelijk niet beschikbaar.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Klassenaam:" +msgstr "Klassiek Blauw" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 -- 2.32.0

1 0

[PATCH 1/2] imm32 : Make an interface to disable input method in ImmAssociateContext
by Dongwan Kim 27 Jun '21

27 Jun '21

When ImmAssociateContext(hwnd, 0) is called, imm should be disabled. On Debian using uim or fcitx for korean, a program cannot receive KeyPress(VK_HANGUL) because the input method consumes the key. We should change input context to disable it in ImmAssociateContext. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/imm32/imm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..9f9f898db9e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -111,6 +111,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; +static HIMC ( *wine_associate_input_context)(HWND, HIMC); static inline BOOL is_himc_ime_unicode(const InputContextData *data) { @@ -598,6 +599,13 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) } } + if(!wine_associate_input_context) + { + HMODULE h = load_graphics_driver(); + wine_associate_input_context = (LPVOID)GetProcAddress(h, "wine_associate_input_context"); + FreeLibrary(h); + } + wine_associate_input_context(hWnd, hIMC); if (!hIMC) return old; -- 2.30.2

2 2

[PATCH 1/2] imm32 : Make an interface to disable input method in ImmAssociateContext
by Dongwan Kim 27 Jun '21

27 Jun '21

When ImmAssociateContext(hwnd, 0) is called, imm should be disabled. On Debian using uim or fcitx for korean, a program cannot receive KeyPress(VK_HANGUL) because the input method consumes the key. We should change input context to disable it in ImmAssociateContext. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/imm32/imm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..9f9f898db9e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -111,6 +111,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; +static HIMC ( *wine_associate_input_context)(HWND, HIMC); static inline BOOL is_himc_ime_unicode(const InputContextData *data) { @@ -598,6 +599,13 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) } } + if(!wine_associate_input_context) + { + HMODULE h = load_graphics_driver(); + wine_associate_input_context = (LPVOID)GetProcAddress(h, "wine_associate_input_context"); + FreeLibrary(h); + } + wine_associate_input_context(hWnd, hIMC); if (!hIMC) return old; -- 2.30.2

2 2

[PATCH 1/2] imm32 : Make an interface to disable input method in ImmAssociateContext
by Dongwan Kim 27 Jun '21

27 Jun '21

When ImmAssociateContext(hwnd, 0) is called, imm should be disabled. On Debian using uim or fcitx for korean, a program cannot receive KeyPress(VK_HANGUL) because the input method consumes the key. We should change input context to disable it in ImmAssociateContext. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/imm32/imm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..9f9f898db9e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -111,6 +111,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; +static HIMC ( *wine_associate_input_context)(HWND, HIMC); static inline BOOL is_himc_ime_unicode(const InputContextData *data) { @@ -598,6 +599,13 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) } } + if(!wine_associate_input_context) + { + HMODULE h = load_graphics_driver(); + wine_associate_input_context = (LPVOID)GetProcAddress(h, "wine_associate_input_context"); + FreeLibrary(h); + } + wine_associate_input_context(hWnd, hIMC); if (!hIMC) return old; -- 2.30.2

2 2

[PATCH 2/3] d3dx10: Handle format converting for D3DX10CreateTextureFromMemory.
by Ziqing Hui 27 Jun '21

27 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 3 +- dlls/d3dx10_43/texture.c | 89 ++++++++++++++++++++++++++++++++--- 2 files changed, 83 insertions(+), 9 deletions(-)

2 3

[PATCH 1/3] d3dx10: Implement D3DX10CreateTextureFromMemory initially.
by Ziqing Hui 27 Jun '21

27 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43_main.c | 11 -- dlls/d3dx10_43/tests/d3dx10.c | 7 +- dlls/d3dx10_43/texture.c | 233 ++++++++++++++++++++++++++++++++ 3 files changed, 236 insertions(+), 15 deletions(-)

2 3

[programs/robocopy.exe] How to do unit test correctly?
by Weiwen Chen 26 Jun '21

26 Jun '21

Hi everyone: I'm Weiwen Chen from Fudan University and I'm working on adding `robocopy.exe` into wine. I stage my work on my github fork <https://github.com/ofey404/wine/tree/robocopy>. This program accepts complex command line arguments, so I'm trying to implement my own `getopt` function which accepts dos-style flags(beginning with slash, like `/x`). The dummy code is under programs/robocopy <https://github.com/ofey404/wine/tree/robocopy/programs/robocopy> directory. And I want to add some unittest of `getopt_long()`, in robocopy/tests/getopt.c <https://github.com/ofey404/wine/blob/fe4a71850b023eefadab5ce357ce4671c1fffc…>. I try to import my source code of `getopt.c` relatively into unit test file, but I failed with error message like this: ../wine-git/programs/robocopy/tests/getopt.c:20: error: #include directive with relative path not allowed How can I include my source file correctly into the test? Maybe I should configure something in the `configure` script, but I don't know how to do it. I've read some of the builtin programs, but they seldom have a separate `test/` directory, and I don't find examples of unit tests. Wish you all the best Weiwen Chen

3 4

[PATCH] Allow 16-bit executables loaded from build directory.
by Bernhard Übelacker 26 Jun '21

26 Jun '21

https://bugs.winehq.org/show_bug.cgi?id=51214 ---- And kind of related to commits: bb065801a69 and a0425b9610a. These are the events that seem to lead to the failure: - Loading of module rundll.exe16 fails - Therefore hPrevInstance is zero, which is put into context.Esi - Somehow this seem to lead to the segfault. Unfortunately the last instructions are not shown properly. 2918 WARN("Failed to load module %s; status=%x\n", debugstr_w(libname), nts); 1: x/i $pc => 0x7bc30b49 <load_dll+217>: test $0x4,%al (rr) bt #0 load_dll (load_path=<optimized out>, libname=<optimized out>, default_ext=<optimized out>, flags=<error reading variable: Could not find the frame base for "load_dll".>, pwm=<optimized out>) at .../wine-git/dlls/ntdll/loader.c:2918 #1 0x7bc328c3 in LdrLoadDll@16 (path_name=<error reading variable: Could not find the frame base for "LdrLoadDll@16".>, flags=<optimized out>, libname=<optimized out>, hModule=<optimized out>) at .../wine-git/dlls/ntdll/loader.c:2966 #2 0x7b026d63 in load_library (libname=0x21fa78, flags=0) at .../wine-git/dlls/kernelbase/loader.c:168 #3 0x7b027bd9 in LoadLibraryExW@12 (name=0x7ffc2c00, file=0x0, flags=0) at .../wine-git/dlls/kernelbase/loader.c:517 #4 0x7b027d35 in LoadLibraryA@4 (name=0x21fb54 "rundll.exe16") at .../wine-git/dlls/kernelbase/loader.c:499 #5 0x664275ca in MODULE_LoadModule16 (libname=0x2a267b "C:\\windows\\rundll.exe", implicit=0, lib_only=0) at .../wine-git/dlls/krnl386.exe16/ne_module.c:959 #6 0x664282fe in LoadModule16@8 (name=0x2a267b "C:\\windows\\rundll.exe", paramBlock=0x21fe92) at .../wine-git/dlls/krnl386.exe16/ne_module.c:1130 #7 0x7eba1c1c in main (argc=4, argv=0x2a2590) at .../wine-git/programs/winevdm/winevdm.c:556 ... (rr) step 1176 hPrevInstance = NE_GetInstance( pModule ); ... 0x66429023 in NE_StartTask () at .../wine-git/dlls/krnl386.exe16/ne_module.c:1233 1233 context.Esi = pTask->hPrevInstance; ... (rr) bt #0 0x6640395f in wine_call_to_16_regs@12 () #1 0x6643f0e5 in K32WOWCallback16Ex@20 (vpfn16=0, dwFlags=2, cbArgs=4, pArgs=0x0, pdwRetCode=0x13cfc14) at .../wine-git/dlls/krnl386.exe16/wowthunk.c:439 #2 0x66429060 in NE_StartTask () at .../wine-git/dlls/krnl386.exe16/ne_module.c:1240 #3 0x66432e53 in task_start (p=0x26fc58) at .../wine-git/dlls/krnl386.exe16/task.c:475 #4 0x7b62e250 in WriteTapemark@16 () #5 0x7bc555a7 in call_thread_func_wrapper () #6 0x7bc55c60 in call_thread_func (entry=0x66432df0 <task_start>, arg=0x26fc58) at .../wine-git/dlls/ntdll/thread.c:225 ... (rr) stepi 0x6640398e in wine_call_to_16_regs@12 () 1: x/i $pc => 0x6640398e <wine_call_to_16_regs@12+178>: mov 0xa0(%edx),%esi (rr) x/1xw $edx + 0xa0 0x13cfcb4: 0x00000000 (rr) stepi 0x66403994 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x66403994 <wine_call_to_16_regs@12+184>: mov 0x9c(%edx),%edi (rr) 0x6640399a in wine_call_to_16_regs@12 () 1: x/i $pc => 0x6640399a <wine_call_to_16_regs@12+190>: mov 0xb0(%edx),%eax (rr) 0x664039a0 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039a0 <wine_call_to_16_regs@12+196>: mov 0xa4(%edx),%ebx (rr) 0x664039a6 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039a6 <wine_call_to_16_regs@12+202>: mov 0xac(%edx),%ecx (rr) 0x664039ac in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039ac <wine_call_to_16_regs@12+208>: mov 0xa8(%edx),%edx (rr) 0x664039b2 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039b2 <wine_call_to_16_regs@12+214>: popw %ds (rr) 0x664039b4 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039b4 <wine_call_to_16_regs@12+216>: lretw (rr) 0x00000020 in ?? () 1: x/i $pc => 0x20: <error: Cannot access memory at address 0x20> (rr) 0x00000022 in ?? () 1: x/i $pc => 0x22: <error: Cannot access memory at address 0x22> (rr) 0x00000027 in ?? () 1: x/i $pc => 0x27: <error: Cannot access memory at address 0x27> (rr) 0x00000000 in ?? () 1: x/i $pc => 0x0: <error: Cannot access memory at address 0x0> (rr) 0x00000005 in ?? () 1: x/i $pc => 0x5: <error: Cannot access memory at address 0x5> (rr) Thread 8 received signal SIGSEGV, Segmentation fault. 0x00000005 in ?? () 1: x/i $pc => 0x5: <error: Cannot access memory at address 0x5> --- dlls/ntdll/loader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 54806b0ab22..da539258eb3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2675,6 +2675,7 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne if (!get_env_var( L"WINEBUILDDIR", 20 + 2 * wcslen(name), new_name )) { + len = new_name->Length; RtlAppendUnicodeToString( new_name, L"\\dlls\\" ); RtlAppendUnicodeToString( new_name, name ); if ((ext = wcsrchr( name, '.' )) && !wcscmp( ext, L".dll" )) new_name->Length -= 4 * sizeof(WCHAR); @@ -2685,6 +2686,17 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, L".fake" ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status != STATUS_DLL_NOT_FOUND) goto done; + + new_name->Length = len; + RtlAppendUnicodeToString( new_name, L"\\programs\\" ); + RtlAppendUnicodeToString( new_name, name ); + RtlAppendUnicodeToString( new_name, L"\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + RtlAppendUnicodeToString( new_name, L".fake" ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } -- 2.30.2

1 1

[PATCH v2] Distinguish the two functions of family_matches and face_matches.
by Jiangyi Chen 26 Jun '21

26 Jun '21

2 1

[PATCH v10 1/4] winevulkan: Support use of extensions which mustn't be exposed.
by Derek Lesho 25 Jun '21

25 Jun '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9ef863837d1..d226057c69e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -120,6 +120,11 @@ UNSUPPORTED_EXTENSIONS = [ "VK_NV_external_memory_win32", ] +# Either internal extensions which aren't present on the win32 platform which +# winevulkan may nonetheless use, or extensions we want to generate headers for +# but not expose to applications (useful for test commits) +UNEXPOSED_EXTENSIONS = {} + # The Vulkan loader provides entry-points for core functionality and important # extensions. Based on vulkan-1.def this amounts to WSI extensions on 1.0.51. CORE_EXTENSIONS = [ @@ -521,8 +526,8 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extensions=[], alias=None): - self.extensions = [] + def __init__(self, _type=None, name=None, params=[], alias=None): + self.extensions = set() self.name = name self.type = _type self.params = params @@ -665,6 +670,10 @@ class VkFunction(object): def needs_private_thunk(self): return self.thunk_type == ThunkType.PRIVATE + def needs_exposing(self): + # The function needs exposed if at-least one extension isn't both UNSUPPORTED and UNEXPOSED + return self.is_required() and (not self.extensions or not self.extensions.issubset(UNEXPOSED_EXTENSIONS)) + def pfn(self, prefix="p", call_conv=None, conv=False): """ Create function pointer. """ @@ -2651,7 +2660,7 @@ class VkGenerator(object): # Create thunks for instance and device functions. # Global functions don't go through the thunks. for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.is_global_func(): @@ -2671,6 +2680,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "device": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2680,6 +2691,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "instance": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2739,7 +2752,7 @@ class VkGenerator(object): f.write("const struct unix_funcs loader_funcs =\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -2758,7 +2771,7 @@ class VkGenerator(object): # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.needs_thunk() and not vk_func.needs_private_thunk(): continue @@ -2857,7 +2870,7 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type != ThunkType.PUBLIC: continue @@ -2866,7 +2879,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_device_dispatch_table[] =\n{\n") for vk_func in self.registry.device_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2874,7 +2887,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_phys_dev_dispatch_table[] =\n{\n") for vk_func in self.registry.phys_dev_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2882,7 +2895,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_instance_dispatch_table[] =\n{\n") for vk_func in self.registry.instance_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2939,7 +2952,7 @@ class VkGenerator(object): f.write("struct unix_funcs\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -3433,7 +3446,7 @@ class VkRegistry(object): # the XML file to handle this, but because of the manner in which we parse the XML # file we pre-populate from <commands> before we check if a command is enabled. if cmd_name in self.funcs: - self.funcs[cmd_name].extensions.append(ext_name) + self.funcs[cmd_name].extensions.add(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": -- 2.32.0

2 5

[PATCH] ole32: Request the needed memory blocks at once.
by Haoyang Chen 25 Jun '21

25 Jun '21

When requesting a large block of memory, newNumBlocks can be very large and time-consuming. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/ole32/storage32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 980b6c8d9f6..1bc8455cc6b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4144,7 +4144,7 @@ static void StorageImpl_SetNextBlockInChain( * */ static ULONG StorageImpl_GetNextFreeBigBlock( - StorageImpl* This) + StorageImpl* This, ULONG neededAddNumBlocks) { ULONG depotBlockIndexPos; BYTE depotBuffer[MAX_BIG_BLOCK_SIZE]; @@ -4269,7 +4269,7 @@ static ULONG StorageImpl_GetNextFreeBigBlock( /* * make sure that the block physically exists before using it */ - neededSize.QuadPart = StorageImpl_GetBigBlockOffset(This, freeBlock)+This->bigBlockSize; + neededSize.QuadPart = StorageImpl_GetBigBlockOffset(This, freeBlock)+This->bigBlockSize * neededAddNumBlocks; ILockBytes_Stat(This->lockBytes, &statstg, STATFLAG_NONAME); @@ -7403,7 +7403,7 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, */ if (blockIndex == BLOCK_END_OF_CHAIN) { - blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage); + blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage, 1); StorageImpl_SetNextBlockInChain(This->parentStorage, blockIndex, BLOCK_END_OF_CHAIN); @@ -7472,7 +7472,7 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, { while (oldNumBlocks < newNumBlocks) { - blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage); + blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage, newNumBlocks - oldNumBlocks); StorageImpl_SetNextBlockInChain( This->parentStorage, -- 2.20.1

2 1

[PATCH v2] winedbg: Try to load debug symbols for executable in gdb mode.
by Bernhard Übelacker 25 Jun '21

25 Jun '21

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> ---- This loads the debug information similar to LOAD_DLL_DEBUG_EVENT for dll's a few lines below, or CREATE_PROCESS_DEBUG_EVENT for exe's in winedbg/tgt_active.c. It should be an improvement just for real PE executables. For .exe.so files the debug information gets loaded via the ELF enumeration, with this patch 'info share' shows a line for the fake exe additional to the .exe.so line. First submission: https://www.winehq.org/pipermail/wine-devel/2021-May/186536.html Resend: https://www.winehq.org/pipermail/wine-devel/2021-June/189401.html v2: - Removed fetch_module_name and logging. --- programs/winedbg/gdbproxy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 478e0d16fe0..19fa86d44da 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -437,6 +437,9 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx) fprintf(stderr, "%04x:%04x: create thread I @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateProcessInfo.lpStartAddress); + dbg_load_module(gdbctx->process->handle, de->u.CreateProcessInfo.hFile, u.buffer, + (DWORD_PTR)de->u.CreateProcessInfo.lpBaseOfImage, 0); + dbg_add_thread(gdbctx->process, de->dwThreadId, de->u.CreateProcessInfo.hThread, de->u.CreateProcessInfo.lpThreadLocalBase); -- 2.30.2

1 0

[PATCH resend] winedbg: Try to load debug symbols for executable in gdb mode.
by Bernhard Übelacker 25 Jun '21

25 Jun '21

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> ---- This loads the debug information similar to LOAD_DLL_DEBUG_EVENT for dll's a few lines below, or CREATE_PROCESS_DEBUG_EVENT for exe's in winedbg/tgt_active.c. It should be an improvement just for real PE executables. For .exe.so files the debug information gets loaded via the ELF enumeration, with this patch 'info share' shows a line for the fake exe additional to the .exe.so line. First submission: https://www.winehq.org/pipermail/wine-devel/2021-May/186536.html --- programs/winedbg/gdbproxy.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 478e0d16fe0..d768a8a585c 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -437,6 +437,17 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx) fprintf(stderr, "%04x:%04x: create thread I @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateProcessInfo.lpStartAddress); + fetch_module_name( de->u.CreateProcessInfo.lpImageName, de->u.CreateProcessInfo.lpBaseOfImage, + u.buffer, ARRAY_SIZE(u.buffer) ); + fprintf(stderr, "%04x:%04x: loads EXE %s @%p (%u<%u>)\n", + de->dwProcessId, de->dwThreadId, + dbg_W2A(u.buffer, -1), + de->u.CreateProcessInfo.lpBaseOfImage, + de->u.CreateProcessInfo.dwDebugInfoFileOffset, + de->u.CreateProcessInfo.nDebugInfoSize); + dbg_load_module(gdbctx->process->handle, de->u.CreateProcessInfo.hFile, u.buffer, + (DWORD_PTR)de->u.CreateProcessInfo.lpBaseOfImage, 0); + dbg_add_thread(gdbctx->process, de->dwThreadId, de->u.CreateProcessInfo.hThread, de->u.CreateProcessInfo.lpThreadLocalBase); -- 2.30.2

2 2

[PATCH 1/4] d2d1: Use D3D11 interfaces to create buffers.
by Rémi Bernon 25 Jun '21

25 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 8 +- dlls/d2d1/device.c | 211 +++++++++++++++++++++++++-------------- 2 files changed, 138 insertions(+), 81 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e2510568e3c..e85c93ec277 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -166,12 +166,12 @@ struct d2d_device_context struct d2d_bitmap *target; ID3D10StateBlock *stateblock; struct d2d_shape_resources shape_resources[D2D_SHAPE_TYPE_COUNT]; - ID3D10Buffer *vs_cb; + ID3D11Buffer *vs_cb; ID3D10PixelShader *ps; - ID3D10Buffer *ps_cb; - ID3D10Buffer *ib; + ID3D11Buffer *ps_cb; + ID3D11Buffer *ib; unsigned int vb_stride; - ID3D10Buffer *vb; + ID3D11Buffer *vb; ID3D10RasterizerState *rs; ID3D10BlendState *bs; ID3D10SamplerState *sampler_states diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 6390037bce3..5242342c454 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -118,11 +118,13 @@ static void d2d_clip_stack_pop(struct d2d_clip_stack *stack) } static void d2d_device_context_draw(struct d2d_device_context *render_target, enum d2d_shape_type shape_type, - ID3D10Buffer *ib, unsigned int index_count, ID3D10Buffer *vb, unsigned int vb_stride, + ID3D11Buffer *ib, unsigned int index_count, ID3D11Buffer *vb, unsigned int vb_stride, struct d2d_brush *brush, struct d2d_brush *opacity_brush) { struct d2d_shape_resources *shape_resources = &render_target->shape_resources[shape_type]; ID3D10Device *device = render_target->d3d_device; + ID3D10Buffer *d3d10_ib = NULL, *d3d10_vb = NULL, *d3d10_vs_cb = NULL, *d3d10_ps_cb = NULL; + ID3D11Buffer *vs_cb = render_target->vs_cb, *ps_cb = render_target->ps_cb; D3D10_RECT scissor_rect; unsigned int offset; D3D10_VIEWPORT vp; @@ -135,22 +137,46 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; + if (ib && FAILED(hr = ID3D11Buffer_QueryInterface(ib, &IID_ID3D10Buffer, (void **)&d3d10_ib))) + { + ERR("Failed to query D3D10 index buffer, hr %#x.\n", hr); + goto error; + } + + if (vb && FAILED(hr = ID3D11Buffer_QueryInterface(vb, &IID_ID3D10Buffer, (void **)&d3d10_vb))) + { + ERR("Failed to query D3D10 vertex buffer, hr %#x.\n", hr); + goto error; + } + + if (vs_cb && FAILED(hr = ID3D11Buffer_QueryInterface(vs_cb, &IID_ID3D10Buffer, (void **)&d3d10_vs_cb))) + { + ERR("Failed to query D3D10 VS constant buffer, hr %#x.\n", hr); + goto error; + } + + if (ps_cb && FAILED(hr = ID3D11Buffer_QueryInterface(ps_cb, &IID_ID3D10Buffer, (void **)&d3d10_ps_cb))) + { + ERR("Failed to query D3D10 PS constant buffer, hr %#x.\n", hr); + goto error; + } + if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); - return; + goto error; } ID3D10Device_ClearState(device); ID3D10Device_IASetInputLayout(device, shape_resources->il); ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - ID3D10Device_IASetIndexBuffer(device, ib, DXGI_FORMAT_R16_UINT, 0); + ID3D10Device_IASetIndexBuffer(device, d3d10_ib, DXGI_FORMAT_R16_UINT, 0); offset = 0; - ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &vb_stride, &offset); - ID3D10Device_VSSetConstantBuffers(device, 0, 1, &render_target->vs_cb); + ID3D10Device_IASetVertexBuffers(device, 0, 1, &d3d10_vb, &vb_stride, &offset); + ID3D10Device_VSSetConstantBuffers(device, 0, 1, &d3d10_vs_cb); ID3D10Device_VSSetShader(device, shape_resources->vs); - ID3D10Device_PSSetConstantBuffers(device, 0, 1, &render_target->ps_cb); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &d3d10_ps_cb); ID3D10Device_PSSetShader(device, render_target->ps); ID3D10Device_RSSetViewports(device, 1, &vp); if (render_target->clip_stack.count) @@ -188,6 +214,12 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en if (FAILED(hr = render_target->stateblock->lpVtbl->Apply(render_target->stateblock))) WARN("Failed to apply stateblock, hr %#x.\n", hr); + +error: + if (d3d10_ib) ID3D10Buffer_Release(d3d10_ib); + if (d3d10_vb) ID3D10Buffer_Release(d3d10_vb); + if (d3d10_vs_cb) ID3D10Buffer_Release(d3d10_vs_cb); + if (d3d10_ps_cb) ID3D10Buffer_Release(d3d10_ps_cb); } static void d2d_device_context_set_error(struct d2d_device_context *context, HRESULT code) @@ -263,11 +295,11 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) if (context->bs) ID3D10BlendState_Release(context->bs); ID3D10RasterizerState_Release(context->rs); - ID3D10Buffer_Release(context->vb); - ID3D10Buffer_Release(context->ib); - ID3D10Buffer_Release(context->ps_cb); + ID3D11Buffer_Release(context->vb); + ID3D11Buffer_Release(context->ib); + ID3D11Buffer_Release(context->ps_cb); ID3D10PixelShader_Release(context->ps); - ID3D10Buffer_Release(context->vs_cb); + ID3D11Buffer_Release(context->vs_cb); for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { ID3D10VertexShader_Release(context->shape_resources[i].vs); @@ -712,15 +744,22 @@ static void STDMETHODCALLTYPE d2d_device_context_FillEllipse(ID2D1DeviceContext static HRESULT d2d_device_context_update_ps_cb(struct d2d_device_context *context, struct d2d_brush *brush, struct d2d_brush *opacity_brush, BOOL outline, BOOL is_arc) { + D3D11_MAPPED_SUBRESOURCE map_desc; + ID3D11DeviceContext *d3d_context; struct d2d_ps_cb *cb_data; HRESULT hr; - if (FAILED(hr = ID3D10Buffer_Map(context->ps_cb, D3D10_MAP_WRITE_DISCARD, 0, (void **)&cb_data))) + ID3D11Device1_GetImmediateContext(context->d3d11_device, &d3d_context); + + if (FAILED(hr = ID3D11DeviceContext_Map(d3d_context, (ID3D11Resource *)context->ps_cb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc))) { WARN("Failed to map constant buffer, hr %#x.\n", hr); + ID3D11DeviceContext_Release(d3d_context); return hr; } + cb_data = map_desc.pData; cb_data->outline = outline; cb_data->is_arc = is_arc; cb_data->pad[0] = 0; @@ -730,7 +769,8 @@ static HRESULT d2d_device_context_update_ps_cb(struct d2d_device_context *contex if (!d2d_brush_fill_cb(opacity_brush, &cb_data->opacity_brush)) WARN("Failed to initialize opacity brush buffer.\n"); - ID3D10Buffer_Unmap(context->ps_cb); + ID3D11DeviceContext_Unmap(d3d_context, (ID3D11Resource *)context->ps_cb, 0); + ID3D11DeviceContext_Release(d3d_context); return hr; } @@ -738,17 +778,24 @@ static HRESULT d2d_device_context_update_ps_cb(struct d2d_device_context *contex static HRESULT d2d_device_context_update_vs_cb(struct d2d_device_context *context, const D2D_MATRIX_3X2_F *geometry_transform, float stroke_width) { + D3D11_MAPPED_SUBRESOURCE map_desc; + ID3D11DeviceContext *d3d_context; const D2D1_MATRIX_3X2_F *w; struct d2d_vs_cb *cb_data; float tmp_x, tmp_y; HRESULT hr; - if (FAILED(hr = ID3D10Buffer_Map(context->vs_cb, D3D10_MAP_WRITE_DISCARD, 0, (void **)&cb_data))) + ID3D11Device1_GetImmediateContext(context->d3d11_device, &d3d_context); + + if (FAILED(hr = ID3D11DeviceContext_Map(d3d_context, (ID3D11Resource *)context->vs_cb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc))) { WARN("Failed to map constant buffer, hr %#x.\n", hr); + ID3D11DeviceContext_Release(d3d_context); return hr; } + cb_data = map_desc.pData; cb_data->transform_geometry._11 = geometry_transform->_11; cb_data->transform_geometry._21 = geometry_transform->_21; cb_data->transform_geometry._31 = geometry_transform->_31; @@ -772,7 +819,8 @@ static HRESULT d2d_device_context_update_vs_cb(struct d2d_device_context *contex cb_data->transform_rty.z = w->_32 * tmp_y; cb_data->transform_rty.w = -2.0f / context->pixel_size.height; - ID3D10Buffer_Unmap(context->vs_cb); + ID3D11DeviceContext_Unmap(d3d_context, (ID3D11Resource *)context->vs_cb, 0); + ID3D11DeviceContext_Release(d3d_context); return S_OK; } @@ -780,9 +828,9 @@ static HRESULT d2d_device_context_update_vs_cb(struct d2d_device_context *contex static void d2d_device_context_draw_geometry(struct d2d_device_context *render_target, const struct d2d_geometry *geometry, struct d2d_brush *brush, float stroke_width) { - D3D10_SUBRESOURCE_DATA buffer_data; - D3D10_BUFFER_DESC buffer_desc; - ID3D10Buffer *ib, *vb; + D3D11_SUBRESOURCE_DATA buffer_data; + D3D11_BUFFER_DESC buffer_desc; + ID3D11Buffer *ib, *vb; HRESULT hr; if (FAILED(hr = d2d_device_context_update_vs_cb(render_target, &geometry->transform, stroke_width))) @@ -797,7 +845,7 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t return; } - buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -807,53 +855,53 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t if (geometry->outline.face_count) { buffer_desc.ByteWidth = geometry->outline.face_count * sizeof(*geometry->outline.faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_data.pSysMem = geometry->outline.faces; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &ib))) { WARN("Failed to create index buffer, hr %#x.\n", hr); return; } buffer_desc.ByteWidth = geometry->outline.vertex_count * sizeof(*geometry->outline.vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->outline.vertices; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(ib); return; } d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_OUTLINE, ib, 3 * geometry->outline.face_count, vb, sizeof(*geometry->outline.vertices), brush, NULL); - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); } if (geometry->outline.bezier_face_count) { buffer_desc.ByteWidth = geometry->outline.bezier_face_count * sizeof(*geometry->outline.bezier_faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_data.pSysMem = geometry->outline.bezier_faces; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &ib))) { WARN("Failed to create beziers index buffer, hr %#x.\n", hr); return; } buffer_desc.ByteWidth = geometry->outline.bezier_count * sizeof(*geometry->outline.beziers); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->outline.beziers; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create beziers vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(ib); return; } @@ -861,30 +909,30 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t 3 * geometry->outline.bezier_face_count, vb, sizeof(*geometry->outline.beziers), brush, NULL); - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); } if (geometry->outline.arc_face_count) { buffer_desc.ByteWidth = geometry->outline.arc_face_count * sizeof(*geometry->outline.arc_faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_data.pSysMem = geometry->outline.arc_faces; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &ib))) { WARN("Failed to create arcs index buffer, hr %#x.\n", hr); return; } buffer_desc.ByteWidth = geometry->outline.arc_count * sizeof(*geometry->outline.arcs); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->outline.arcs; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create arcs vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(ib); return; } @@ -893,8 +941,8 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t 3 * geometry->outline.arc_face_count, vb, sizeof(*geometry->outline.arcs), brush, NULL); - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); } } @@ -917,12 +965,12 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGeometry(ID2D1DeviceContext static void d2d_device_context_fill_geometry(struct d2d_device_context *render_target, const struct d2d_geometry *geometry, struct d2d_brush *brush, struct d2d_brush *opacity_brush) { - D3D10_SUBRESOURCE_DATA buffer_data; - D3D10_BUFFER_DESC buffer_desc; - ID3D10Buffer *ib, *vb; + D3D11_SUBRESOURCE_DATA buffer_data; + D3D11_BUFFER_DESC buffer_desc; + ID3D11Buffer *ib, *vb; HRESULT hr; - buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -944,40 +992,40 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t if (geometry->fill.face_count) { buffer_desc.ByteWidth = geometry->fill.face_count * sizeof(*geometry->fill.faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_data.pSysMem = geometry->fill.faces; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &ib))) { WARN("Failed to create index buffer, hr %#x.\n", hr); return; } buffer_desc.ByteWidth = geometry->fill.vertex_count * sizeof(*geometry->fill.vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.vertices; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(ib); return; } d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, ib, 3 * geometry->fill.face_count, vb, sizeof(*geometry->fill.vertices), brush, opacity_brush); - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); } if (geometry->fill.bezier_vertex_count) { buffer_desc.ByteWidth = geometry->fill.bezier_vertex_count * sizeof(*geometry->fill.bezier_vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.bezier_vertices; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create beziers vertex buffer, hr %#x.\n", hr); return; @@ -986,16 +1034,16 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_CURVE, NULL, geometry->fill.bezier_vertex_count, vb, sizeof(*geometry->fill.bezier_vertices), brush, opacity_brush); - ID3D10Buffer_Release(vb); + ID3D11Buffer_Release(vb); } if (geometry->fill.arc_vertex_count) { buffer_desc.ByteWidth = geometry->fill.arc_vertex_count * sizeof(*geometry->fill.arc_vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.arc_vertices; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create arc vertex buffer, hr %#x.\n", hr); return; @@ -1005,7 +1053,7 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_CURVE, NULL, geometry->fill.arc_vertex_count, vb, sizeof(*geometry->fill.arc_vertices), brush, opacity_brush); - ID3D10Buffer_Release(vb); + ID3D11Buffer_Release(vb); } } @@ -1602,6 +1650,8 @@ static void STDMETHODCALLTYPE d2d_device_context_PopAxisAlignedClip(ID2D1DeviceC static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface, const D2D1_COLOR_F *colour) { struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + D3D11_MAPPED_SUBRESOURCE map_desc; + ID3D11DeviceContext *d3d_context; struct d2d_ps_cb *ps_cb_data; struct d2d_vs_cb *vs_cb_data; D2D1_COLOR_F *c; @@ -1609,13 +1659,17 @@ static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface TRACE("iface %p, colour %p.\n", iface, colour); - if (FAILED(hr = ID3D10Buffer_Map(render_target->vs_cb, D3D10_MAP_WRITE_DISCARD, - 0, (void **)&vs_cb_data))) + ID3D11Device1_GetImmediateContext(render_target->d3d11_device, &d3d_context); + + if (FAILED(hr = ID3D11DeviceContext_Map(d3d_context, (ID3D11Resource *)render_target->vs_cb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc))) { WARN("Failed to map vs constant buffer, hr %#x.\n", hr); + ID3D11DeviceContext_Release(d3d_context); return; } + vs_cb_data = map_desc.pData; vs_cb_data->transform_geometry._11 = 1.0f; vs_cb_data->transform_geometry._21 = 0.0f; vs_cb_data->transform_geometry._31 = 0.0f; @@ -1633,15 +1687,17 @@ static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface vs_cb_data->transform_rty.z = 1.0f; vs_cb_data->transform_rty.w = -1.0f; - ID3D10Buffer_Unmap(render_target->vs_cb); + ID3D11DeviceContext_Unmap(d3d_context, (ID3D11Resource *)render_target->vs_cb, 0); - if (FAILED(hr = ID3D10Buffer_Map(render_target->ps_cb, D3D10_MAP_WRITE_DISCARD, - 0, (void **)&ps_cb_data))) + if (FAILED(hr = ID3D11DeviceContext_Map(d3d_context, (ID3D11Resource *)render_target->ps_cb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc))) { WARN("Failed to map ps constant buffer, hr %#x.\n", hr); + ID3D11DeviceContext_Release(d3d_context); return; } + ps_cb_data = map_desc.pData; memset(ps_cb_data, 0, sizeof(*ps_cb_data)); ps_cb_data->colour_brush.type = D2D_BRUSH_TYPE_SOLID; ps_cb_data->colour_brush.opacity = 1.0f; @@ -1655,7 +1711,8 @@ static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface c->g *= c->a; c->b *= c->a; - ID3D10Buffer_Unmap(render_target->ps_cb); + ID3D11DeviceContext_Unmap(d3d_context, (ID3D11Resource *)render_target->ps_cb, 0); + ID3D11DeviceContext_Release(d3d_context); d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, render_target->ib, 6, render_target->vb, render_target->vb_stride, NULL, NULL); @@ -2774,12 +2831,12 @@ static const struct ID2D1GdiInteropRenderTargetVtbl d2d_gdi_interop_render_targe static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, ID2D1Device *device, IUnknown *outer_unknown, const struct d2d_device_context_ops *ops) { - D3D10_SUBRESOURCE_DATA buffer_data; + D3D11_SUBRESOURCE_DATA buffer_data; D3D10_STATE_BLOCK_MASK state_mask; struct d2d_device *device_impl; IDWriteFactory *dwrite_factory; D3D10_RASTERIZER_DESC rs_desc; - D3D10_BUFFER_DESC buffer_desc; + D3D11_BUFFER_DESC buffer_desc; unsigned int i; HRESULT hr; @@ -3891,12 +3948,12 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, } buffer_desc.ByteWidth = sizeof(struct d2d_vs_cb); - buffer_desc.Usage = D3D10_USAGE_DYNAMIC; + buffer_desc.Usage = D3D11_USAGE_DYNAMIC; buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; buffer_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; buffer_desc.MiscFlags = 0; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, NULL, + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, NULL, &render_target->vs_cb))) { WARN("Failed to create constant buffer, hr %#x.\n", hr); @@ -3911,12 +3968,12 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, } buffer_desc.ByteWidth = sizeof(struct d2d_ps_cb); - buffer_desc.Usage = D3D10_USAGE_DYNAMIC; + buffer_desc.Usage = D3D11_USAGE_DYNAMIC; buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; buffer_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; buffer_desc.MiscFlags = 0; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, NULL, + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, NULL, &render_target->ps_cb))) { WARN("Failed to create constant buffer, hr %#x.\n", hr); @@ -3924,8 +3981,8 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, } buffer_desc.ByteWidth = sizeof(indices); - buffer_desc.Usage = D3D10_USAGE_DEFAULT; - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -3933,7 +3990,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, buffer_data.SysMemPitch = 0; buffer_data.SysMemSlicePitch = 0; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &render_target->ib))) { WARN("Failed to create clear index buffer, hr %#x.\n", hr); @@ -3941,11 +3998,11 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, } buffer_desc.ByteWidth = sizeof(quad); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = quad; render_target->vb_stride = sizeof(*quad); - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &render_target->vb))) { WARN("Failed to create clear vertex buffer, hr %#x.\n", hr); @@ -4003,15 +4060,15 @@ err: if (render_target->rs) ID3D10RasterizerState_Release(render_target->rs); if (render_target->vb) - ID3D10Buffer_Release(render_target->vb); + ID3D11Buffer_Release(render_target->vb); if (render_target->ib) - ID3D10Buffer_Release(render_target->ib); + ID3D11Buffer_Release(render_target->ib); if (render_target->ps_cb) - ID3D10Buffer_Release(render_target->ps_cb); + ID3D11Buffer_Release(render_target->ps_cb); if (render_target->ps) ID3D10PixelShader_Release(render_target->ps); if (render_target->vs_cb) - ID3D10Buffer_Release(render_target->vs_cb); + ID3D11Buffer_Release(render_target->vs_cb); for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { if (render_target->shape_resources[i].vs) -- 2.32.0

2 7

[PATCH v2 1/3] wined3d: Use a wined3d_resource operation to retrieve the resource dimensions in wined3d_device_context_update_sub_resource().
by Zebediah Figura 25 Jun '21

25 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Potentially we could obviate even this, by storing the level and layer count inside the wined3d_resource structure. However, it's not immediately clear to me what's worth taking up memory for. dlls/wined3d/buffer.c | 23 +++++++++++++++++++ dlls/wined3d/device.c | 40 ++++++---------------------------- dlls/wined3d/texture.c | 9 ++++++++ dlls/wined3d/wined3d_private.h | 8 +++++++ 4 files changed, 47 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7b8c8904961..142cce0299f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -840,6 +840,28 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe return &buffer->resource; } +static HRESULT buffer_resource_sub_resource_get_desc(struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc) +{ + if (sub_resource_idx) + { + WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); + return E_INVALIDARG; + } + + desc->format = WINED3DFMT_UNKNOWN; + desc->multisample_type = WINED3D_MULTISAMPLE_NONE; + desc->multisample_quality = 0; + desc->usage = resource->usage; + desc->bind_flags = resource->bind_flags; + desc->access = resource->access; + desc->width = resource->size; + desc->height = 1; + desc->depth = 1; + desc->size = resource->size; + return S_OK; +} + static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags) { @@ -1105,6 +1127,7 @@ static const struct wined3d_resource_ops buffer_resource_ops = buffer_resource_decref, buffer_resource_preload, buffer_resource_unload, + buffer_resource_sub_resource_get_desc, buffer_resource_sub_resource_map, buffer_resource_sub_resource_unmap, }; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a11f137729f..6d749269c18 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4649,7 +4649,7 @@ void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_cont struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int depth_pitch, unsigned int flags) { - unsigned int width, height, depth; + struct wined3d_sub_resource_desc desc; struct wined3d_box b; TRACE("context %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u, flags %#x.\n", @@ -4664,43 +4664,17 @@ void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_cont return; } - if (resource->type == WINED3D_RTYPE_BUFFER) - { - if (sub_resource_idx > 0) - { - WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); - return; - } - - width = resource->size; - height = 1; - depth = 1; - } - else - { - struct wined3d_texture *texture = texture_from_resource(resource); - unsigned int level; - - if (sub_resource_idx >= texture->level_count * texture->layer_count) - { - WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); - return; - } - - level = sub_resource_idx % texture->level_count; - width = wined3d_texture_get_level_width(texture, level); - height = wined3d_texture_get_level_height(texture, level); - depth = wined3d_texture_get_level_depth(texture, level); - } + if (FAILED(wined3d_resource_get_sub_resource_desc(resource, sub_resource_idx, &desc))) + return; if (!box) { - wined3d_box_set(&b, 0, 0, width, height, 0, depth); + wined3d_box_set(&b, 0, 0, desc.width, desc.height, 0, desc.depth); box = &b; } - else if (box->left >= box->right || box->right > width - || box->top >= box->bottom || box->bottom > height - || box->front >= box->back || box->back > depth) + else if (box->left >= box->right || box->right > desc.width + || box->top >= box->bottom || box->bottom > desc.height + || box->front >= box->back || box->back > desc.depth) { WARN("Invalid box %s specified.\n", debug_box(box)); return; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 165d83eb035..5f02bcfed8f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3506,6 +3506,14 @@ static void texture_resource_unload(struct wined3d_resource *resource) resource_unload(&texture->resource); } +static HRESULT texture_resource_sub_resource_get_desc(struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc) +{ + const struct wined3d_texture *texture = texture_from_resource(resource); + + return wined3d_texture_get_sub_resource_desc(texture, sub_resource_idx, desc); +} + static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { @@ -3692,6 +3700,7 @@ static const struct wined3d_resource_ops texture_resource_ops = texture_resource_decref, texture_resource_preload, texture_resource_unload, + texture_resource_sub_resource_get_desc, texture_resource_sub_resource_map, texture_resource_sub_resource_unmap, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da1cf638606..15b028a00f0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4050,6 +4050,8 @@ struct wined3d_resource_ops ULONG (*resource_decref)(struct wined3d_resource *resource); void (*resource_preload)(struct wined3d_resource *resource); void (*resource_unload)(struct wined3d_resource *resource); + HRESULT (*resource_sub_resource_get_desc)(struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc); HRESULT (*resource_sub_resource_map)(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); HRESULT (*resource_sub_resource_unmap)(struct wined3d_resource *resource, unsigned int sub_resource_idx); @@ -4110,6 +4112,12 @@ static inline void wined3d_resource_release(struct wined3d_resource *resource) InterlockedDecrement(&resource->access_count); } +static inline HRESULT wined3d_resource_get_sub_resource_desc(struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc) +{ + return resource->resource_ops->resource_sub_resource_get_desc(resource, sub_resource_idx, desc); +} + void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format, -- 2.30.2

2 5

[PATCH 5/5] wined3d: Use wined3d_mask_from_size() in find_draw_buffers_mask().
by Henri Verbeet 25 Jun '21

25 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 742dc5f3042..474003d7553 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3310,7 +3310,7 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_ return context_generate_rt_mask_from_resource(rts[0]->resource); rt_mask = ps ? ps->reg_maps.rt_mask : 1; - rt_mask &= (1u << gl_info->limits.buffers) - 1; + rt_mask &= wined3d_mask_from_size(gl_info->limits.buffers); if (state->blend_state && state->blend_state->dual_source) rt_mask = 1; -- 2.20.1

1 0

[PATCH 4/5] wined3d: Use wined3d_mask_from_size() in wined3d_context_gl_enable_clip_distances().
by Henri Verbeet 25 Jun '21

25 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 43c086ac758..742dc5f3042 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2396,8 +2396,8 @@ void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context clip_distance_count = gl_info->limits.user_clip_distances; disable_mask = ~enable_mask; - enable_mask &= (1u << clip_distance_count) - 1; - disable_mask &= (1u << clip_distance_count) - 1; + enable_mask &= wined3d_mask_from_size(clip_distance_count); + disable_mask &= wined3d_mask_from_size(clip_distance_count); current_mask = context_gl->c.clip_distance_mask; context_gl->c.clip_distance_mask = enable_mask; -- 2.20.1

1 0

[PATCH 3/5] wined3d: Use wined3d_mask_from_size() in glsl_blitter_blit().
by Henri Verbeet 25 Jun '21

25 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ccfd5f3f28e..5d0e7b13bd4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13215,7 +13215,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli const struct wined3d_format *f = src_texture->resource.format; alpha_test_key.color_space_low_value = 0; - alpha_test_key.color_space_high_value = ~(((1u << f->alpha_size) - 1) << f->alpha_offset); + alpha_test_key.color_space_high_value = ~(wined3d_mask_from_size(f->alpha_size) << f->alpha_offset); colour_key = &alpha_test_key; } else if (op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY) -- 2.20.1

1 0

[PATCH 2/5] wined3d: Use wined3d_mask_from_size() in arbfp_blitter_blit().
by Henri Verbeet 25 Jun '21

25 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e297c724412..1b533107f64 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7922,7 +7922,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl { const struct wined3d_format *fmt = src_texture->resource.format; alpha_test_key.color_space_low_value = 0; - alpha_test_key.color_space_high_value = ~(((1u << fmt->alpha_size) - 1) << fmt->alpha_offset); + alpha_test_key.color_space_high_value = ~(wined3d_mask_from_size(fmt->alpha_size) << fmt->alpha_offset); color_key = &alpha_test_key; } -- 2.20.1

1 0

[PATCH 1/5] wined3d: Only invalidate valid state IDs in wined3d_cs_exec_reset_state().
by Henri Verbeet 25 Jun '21

25 Jun '21

Not every state ID between 0 and STATE_HIGHEST is valid; for example, there are holes in the renderstate IDs. While invalidating these works fine, attempting to subsequently apply them in e.g. context_apply_draw_state() ends up calling state_undefined() and printing an ERR. This is especially visible when running the d2d1 tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 544b76534d0..492644e1f30 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2214,15 +2214,21 @@ static void wined3d_cs_mt_push_constants(struct wined3d_device_context *context, static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) { + const struct wined3d_device *device = cs->c.device; const struct wined3d_cs_reset_state *op = data; + const struct wined3d_state_entry *state_table; unsigned int state; state_cleanup(&cs->state); - wined3d_state_reset(&cs->state, &cs->c.device->adapter->d3d_info); + wined3d_state_reset(&cs->state, &device->adapter->d3d_info); if (op->invalidate) { + state_table = device->state_table; for (state = 0; state <= STATE_HIGHEST; ++state) - device_invalidate_state(cs->c.device, state); + { + if (state_table[state].representative) + device_invalidate_state(device, state); + } } } -- 2.20.1

1 0

[PATCH 1/3] reg/tests: Modify delete_tree() to support the use of registry views
by Hugh McMaster 25 Jun '21

25 Jun '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/add.c | 17 ++++++++++------- programs/reg/tests/copy.c | 36 +++++++++++++++++------------------ programs/reg/tests/delete.c | 4 ++-- programs/reg/tests/export.c | 8 ++++---- programs/reg/tests/import.c | 12 ++++++------ programs/reg/tests/query.c | 6 +++--- programs/reg/tests/reg_test.h | 2 +- 7 files changed, 44 insertions(+), 41 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 3b4a895d0c5..bb72c4a3737 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -154,7 +154,7 @@ void delete_key_(const char *file, unsigned line, HKEY root, const char *path, R } } -LONG delete_tree(const HKEY key, const char *subkey) +LONG delete_tree(HKEY root, const char *path, REGSAM sam) { HKEY hkey; LONG ret; @@ -162,7 +162,7 @@ LONG delete_tree(const HKEY key, const char *subkey) DWORD max_subkey_len, subkey_len; static const char empty[1]; - ret = RegOpenKeyExA(key, subkey, 0, KEY_READ, &hkey); + ret = RegOpenKeyExA(root, path, 0, KEY_READ|sam, &hkey); if (ret) return ret; ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &max_subkey_len, @@ -184,11 +184,14 @@ LONG delete_tree(const HKEY key, const char *subkey) ret = RegEnumKeyExA(hkey, 0, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (ret == ERROR_NO_MORE_ITEMS) break; if (ret) goto cleanup; - ret = delete_tree(hkey, subkey_name); + ret = delete_tree(hkey, subkey_name, sam); if (ret) goto cleanup; } - ret = RegDeleteKeyA(hkey, empty); + if (!sam) + ret = RegDeleteKeyA(hkey, empty); + else + ret = RegDeleteKeyExA(hkey, empty, sam, 0); cleanup: HeapFree(GetProcessHeap(), 0, subkey_name); @@ -219,7 +222,7 @@ static void test_command_syntax(void) { DWORD r; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg add", &r); @@ -322,7 +325,7 @@ static void test_key_formats(void) verify_key(hkey, "https://winehq.org", 0); close_key(hkey); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); /* Test validity of trailing backslash after system key */ run_reg_exe("reg add HKCU\\ /v Value1 /t REG_SZ /d foo /f", &r); @@ -409,7 +412,7 @@ static void test_add(void) verify_reg(hkey, NULL, REG_NONE, "T\0e\0s\0t\0\0", 10, 0); close_key(hkey); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_reg_none(void) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 2b461c17f5e..c6a83e57276 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -126,10 +126,10 @@ static void test_copy_empty_key(void) { DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, NULL); @@ -191,10 +191,10 @@ static void test_copy_simple_data(void) HKEY hkey; DWORD r, dword; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -261,10 +261,10 @@ static void test_copy_complex_data(void) HKEY hkey, subkey; DWORD r, dword; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -330,10 +330,10 @@ static void test_copy_key_order(void) HKEY hkey; DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -355,10 +355,10 @@ static void test_copy_value_order(void) HKEY hkey; DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -380,10 +380,10 @@ static void test_copy_hex_data(void) HKEY hkey; DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); /* Try copying empty hex values */ @@ -449,10 +449,10 @@ static void test_copy_embedded_null_values(void) { DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -482,10 +482,10 @@ static void test_copy_slashes(void) HKEY hkey; DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -508,10 +508,10 @@ static void test_copy_escaped_null_values(void) HKEY hkey; DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index 251a15f3371..e40c0256925 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -23,7 +23,7 @@ static void test_command_syntax(void) { DWORD r; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg delete", &r); @@ -74,7 +74,7 @@ static void test_delete(void) DWORD r; const DWORD deadbeef = 0xdeadbeef; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); /* Create a test key */ diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index df44baddb30..0f48443384e 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -176,7 +176,7 @@ static void test_export(void) HKEY hkey, subkey; BYTE hex[4], buffer[8]; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg export", &r); @@ -287,7 +287,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", complex_data_test, 0), "compare_export() failed\n"); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); /* Test the export order of registry keys */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -413,7 +413,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", slashes_test, TODO_REG_COMPARE), "compare_export() failed\n"); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); /* Test escaped null characters */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -428,7 +428,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", escaped_null_test, 0), "compare_export() failed\n"); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } START_TEST(export) diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 2d8ece8990b..2531ba336e8 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -101,7 +101,7 @@ static void test_import(void) LONG err; BYTE hex[8]; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg import", &r); @@ -1643,7 +1643,7 @@ static void test_import(void) close_key(hkey); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_unicode_import(void) @@ -1654,7 +1654,7 @@ static void test_unicode_import(void) char buffer[24]; BYTE hex[8]; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_wstr("REGEDIT\n", &r); @@ -3192,7 +3192,7 @@ static void test_unicode_import(void) close_key(hkey); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_import_with_whitespace(void) @@ -3200,7 +3200,7 @@ static void test_import_with_whitespace(void) HKEY hkey; DWORD r, dword; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_str(" REGEDIT4\n\n" @@ -3346,7 +3346,7 @@ static void test_unicode_import_with_whitespace(void) HKEY hkey; DWORD r, dword; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 3e8b134363b..270f0aad75d 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -164,7 +164,7 @@ static void test_query(void) HKEY hkey, subkey; BYTE buf[512]; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg query", &r); @@ -270,7 +270,7 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, "got exit code %d, expected 0\n", r); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); /* Subkeys only */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -288,7 +288,7 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); compare_query(buf, test8b, FALSE, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } START_TEST(query) diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index fdc747af1e9..a5d7169beb4 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -64,7 +64,7 @@ void add_key_(const char *file, unsigned line, const HKEY root, const char *path #define delete_key(r,p,s) delete_key_(__FILE__,__LINE__,r,p,s) void delete_key_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam); -LONG delete_tree(const HKEY key, const char *subkey); +LONG delete_tree(HKEY root, const char *path, REGSAM sam); #define add_value(k,n,t,d,s) add_value_(__FILE__,__LINE__,k,n,t,d,s) void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, -- 2.32.0

1 2

[PATCH] kernelbase: Don't pass on StdHandles if they are never to be inherited
by Brendan McGrath 25 Jun '21

25 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51262 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- dlls/kernelbase/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index e3bd5feb296c..2833e76138bf 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -141,8 +141,8 @@ static WCHAR *get_file_name( WCHAR *cmdline, WCHAR *buffer, DWORD buflen ) * create_process_params */ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename, const WCHAR *cmdline, - const WCHAR *cur_dir, void *env, DWORD flags, - const STARTUPINFOW *startup ) + const WCHAR *cur_dir, void *env, BOOL inherit, + DWORD flags, const STARTUPINFOW *startup ) { RTL_USER_PROCESS_PARAMETERS *params; UNICODE_STRING imageW, curdirW, cmdlineW, titleW, desktopW, runtimeW, newdirW; @@ -199,7 +199,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename params->hStdOutput = startup->hStdOutput; params->hStdError = startup->hStdError; } - else if (flags & DETACHED_PROCESS) + else if (flags & DETACHED_PROCESS || ((flags & CREATE_NEW_CONSOLE) && !inherit) ) { params->hStdInput = INVALID_HANDLE_VALUE; params->hStdOutput = INVALID_HANDLE_VALUE; @@ -545,7 +545,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR info->hThread = info->hProcess = 0; info->dwProcessId = info->dwThreadId = 0; - if (!(params = create_process_params( app_name, tidy_cmdline, cur_dir, env, flags, startup_info ))) + if (!(params = create_process_params( app_name, tidy_cmdline, cur_dir, env, inherit, flags, startup_info ))) { status = STATUS_NO_MEMORY; goto done; -- 2.25.1

2 8

[PATCH vkd3d v4 1/6] vkd3d-shader: Pass a struct vkd3d_shader_register_range to vkd3d_dxbc_compiler_emit_combined_sampler_declarations().
by Conor McCarthy 25 Jun '21

25 Jun '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index aed15b94..4ea0efeb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5464,7 +5464,7 @@ static uint32_t vkd3d_dxbc_compiler_get_image_type_id(struct vkd3d_dxbc_compiler } static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *resource, unsigned int resource_space, unsigned int resource_index, + const struct vkd3d_shader_register *resource, struct vkd3d_shader_register_range resource_range, enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_component_type sampled_type, unsigned int structure_stride, bool raw, const struct vkd3d_spirv_resource_type *resource_type_info) { @@ -5486,7 +5486,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ { current = &shader_interface->combined_samplers[i]; - if (current->resource_space != resource_space || current->resource_index != resource_index) + if (current->resource_space != resource_range.space || current->resource_index != resource_range.first) continue; if (!(current->flags & resource_type_flag)) @@ -5501,7 +5501,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING, "Combined descriptor binding for resource %u, space %u, " "and sampler %u, space %u has unsupported ‘count’ %u.", - resource_index, resource_space, current->sampler_index, + resource_range.first, resource_range.space, current->sampler_index, current->sampler_space, current->binding.count); } @@ -5510,8 +5510,8 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ depth = current->sampler_index != VKD3D_SHADER_DUMMY_SAMPLER_INDEX && (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE); - image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource, resource_space, - resource_index, resource_type_info, sampled_type, structure_stride || raw, depth); + image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource, resource_range.space, + resource_range.first, resource_type_info, sampled_type, structure_stride || raw, depth); type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image_type_id); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); @@ -5521,17 +5521,17 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, var_id, &current->binding); if (current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX) - vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_dummy_sampler", resource_space, resource_index); + vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_dummy_sampler", resource_range.space, + resource_range.first); else - vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_s%u_%u", resource_space, resource_index, + vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_s%u_%u", resource_range.space, resource_range.first, current->sampler_space, current->sampler_index); vkd3d_symbol_make_combined_sampler(&symbol, resource, current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX ? 0 : current->sampler_space, current->sampler_index); symbol.id = var_id; - symbol.info.resource.range.space = resource_space; - symbol.info.resource.range.first = resource_index; + symbol.info.resource.range = resource_range; symbol.info.resource.sampled_type = sampled_type; symbol.info.resource.type_id = image_type_id; symbol.info.resource.resource_type_info = resource_type_info; @@ -5569,8 +5569,8 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, resource, NULL)) { - vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, reg, register_space, - register_index, resource_type, sampled_type, structure_stride, raw, resource_type_info); + vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, reg, resource->range, + resource_type, sampled_type, structure_stride, raw, resource_type_info); return; } -- 2.31.1

2 6

[PATCH] oleaut32: ICreateTypeInfo2::AddVarDesc() should handle failure of allocation and initialization of a variant description.
by Dmitry Timoshkov 25 Jun '21

25 Jun '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/typelib.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4669b03d5fc..0526af0abdb 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -11019,6 +11019,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); TLBVarDesc *var_desc; + HRESULT hr; TRACE("%p %u %p\n", This, index, varDesc); @@ -11044,7 +11045,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, var_desc = This->vardescs = heap_alloc_zero(sizeof(TLBVarDesc)); TLBVarDesc_Constructor(var_desc); - TLB_AllocAndInitVarDesc(varDesc, &var_desc->vardesc_create); + hr = TLB_AllocAndInitVarDesc(varDesc, &var_desc->vardesc_create); + if (FAILED(hr)) + return hr; var_desc->vardesc = *var_desc->vardesc_create; ++This->typeattr.cVars; -- 2.31.1

1 0

[PATCH] ntdll: Fix null pointer dereference in RtlDosPathNameToNtPathName_U_WithStatus.
by Akihiro Sagawa 25 Jun '21

25 Jun '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v3 5/5] nsi/tests: Add tests for the NDIS ifinfo table.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/Makefile.in | 5 ++ dlls/nsi/tests/nsi.c | 149 +++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 73 ++++++++++++++++++ 3 files changed, 227 insertions(+) create mode 100644 dlls/nsi/tests/Makefile.in create mode 100644 dlls/nsi/tests/nsi.c diff --git a/dlls/nsi/tests/Makefile.in b/dlls/nsi/tests/Makefile.in new file mode 100644 index 00000000000..98129935198 --- /dev/null +++ b/dlls/nsi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = nsi.dll +IMPORTS = nsi uuid iphlpapi + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c new file mode 100644 index 00000000000..0cdb1993f1c --- /dev/null +++ b/dlls/nsi/tests/nsi.c @@ -0,0 +1,149 @@ +/* + * Network Store Interface tests + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "wine/test.h" + +static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) +{ + return lo <= val && val <= hi; +} + +static void test_ndis_ifinfo( void ) +{ + DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), + sizeof(struct nsi_ndis_ifinfo_rw) }; + struct nsi_ndis_ifinfo_rw *rw_tbl; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn_tbl_2; + struct nsi_ndis_ifinfo_static *stat_tbl; + DWORD err, count, i, rw_size; + NET_LUID *luid_tbl, *luid_tbl_2; + MIB_IF_TABLE2 *table; + + /* Contents of GetIfTable2() keyed by luids */ + + for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) + { + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl, sizeof(*luid_tbl), + (void **)&rw_tbl, rw_sizes[i], (void **)&dyn_tbl, sizeof(*dyn_tbl), + (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); + if (!err) break; + } +todo_wine + ok( !err, "got %d\n", err ); + if (err) return; + rw_size = rw_sizes[i]; + + err = GetIfTable2( &table ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + /* Grab the dyn table again to provide an upper bound for the stats returned from GetIfTable2(). + (The luids must be retrieved again otherwise NsiAllocateAndGetTable() fails). */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl_2, sizeof(*luid_tbl_2), + NULL, 0, (void **)&dyn_tbl_2, sizeof(*dyn_tbl_2), + NULL, 0, &count, 0 ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + for (i = 0; i < count; i++) + { + MIB_IF_ROW2 *row = table->Table + i; + NET_LUID *luid = luid_tbl + i; + struct nsi_ndis_ifinfo_rw *rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + struct nsi_ndis_ifinfo_dynamic *dyn = dyn_tbl + i, *dyn_2 = dyn_tbl_2 + i; + struct nsi_ndis_ifinfo_static *stat = stat_tbl + i; + + winetest_push_context( "%d", i ); + ok( row->InterfaceLuid.Value == luid->Value, "mismatch\n" ); + ok( row->InterfaceIndex == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &row->InterfaceGuid, &stat->if_guid ), "mismatch\n" ); + ok( !memcmp( row->Alias, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( lstrlenW( row->Alias ) * 2 == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( row->Description, stat->descr.String, sizeof(row->Description) ), "mismatch\n" ); + ok( lstrlenW( row->Description ) * 2 == stat->descr.Length, "mismatch\n" ); + ok( row->PhysicalAddressLength == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( row->PhysicalAddress, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( row->PhysicalAddressLength == stat->perm_phys_addr.Length, "mismatch\n" ); + ok( !memcmp( row->PermanentPhysicalAddress, stat->perm_phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), + "mismatch\n" ); + ok( row->Mtu == dyn->mtu, "mismatch\n" ); + ok( row->Type == stat->type, "mismatch\n" ); + /* TunnelType */ + ok( row->MediaType == stat->media_type, "mismatch\n" ); + ok( row->PhysicalMediumType == stat->phys_medium_type, "mismatch\n" ); + ok( row->AccessType == stat->access_type, "mismatch\n" ); + /* DirectionType */ + ok( row->InterfaceAndOperStatusFlags.HardwareInterface == stat->flags.hw, "mismatch\n" ); + ok( row->InterfaceAndOperStatusFlags.FilterInterface == stat->flags.filter, "mismatch\n" ); + ok( row->InterfaceAndOperStatusFlags.ConnectorPresent == stat->conn_present, "mismatch\n" ); + /* NotAuthenticated */ + ok( row->InterfaceAndOperStatusFlags.NotMediaConnected == dyn->flags.not_media_conn, "mismatch\n" ); + /* Paused */ + /* LowPower */ + /* EndPointInterface */ + ok( row->OperStatus == dyn->oper_status, "mismatch\n" ); + ok( row->AdminStatus == rw->admin_status, "mismatch\n" ); + ok( row->MediaConnectState == dyn->media_conn_state, "mismatch\n" ); + ok( IsEqualGUID( &row->NetworkGuid, &rw->network_guid ), "mismatch\n" ); + ok( row->ConnectionType == stat->conn_type, "mismatch\n" ); + if (dyn->xmit_speed == ~0ULL) dyn->xmit_speed = 0; + ok( row->TransmitLinkSpeed == dyn->xmit_speed, "mismatch\n" ); + if (dyn->rcv_speed == ~0ULL) dyn->rcv_speed = 0; + ok( row->ReceiveLinkSpeed == dyn->rcv_speed, "mismatch\n" ); + ok( bounded( row->InOctets, dyn->in_octets, dyn_2->in_octets ), "mismatch\n" ); + ok( bounded( row->InUcastPkts, dyn->in_ucast_pkts, dyn_2->in_ucast_pkts ), "mismatch\n" ); + ok( bounded( row->InNUcastPkts, dyn->in_mcast_pkts + dyn->in_bcast_pkts, + dyn_2->in_mcast_pkts + dyn_2->in_bcast_pkts ), "mismatch\n" ); + ok( bounded( row->InDiscards, dyn->in_discards, dyn_2->in_discards ), "mismatch\n" ); + ok( bounded( row->InErrors, dyn->in_errors, dyn_2->in_errors ), "mismatch\n" ); + /* InUnknownProtos */ + ok( bounded( row->InUcastOctets, dyn->in_ucast_octs, dyn_2->in_ucast_octs ), "mismatch\n" ); + ok( bounded( row->InMulticastOctets, dyn->in_mcast_octs, dyn_2->in_mcast_octs ), "mismatch\n" ); + ok( bounded( row->InBroadcastOctets, dyn->in_bcast_octs, dyn_2->in_bcast_octs ), "mismatch\n" ); + ok( bounded( row->OutOctets, dyn->out_octets, dyn_2->out_octets ), "mismatch\n" ); + ok( bounded( row->OutUcastPkts, dyn->out_ucast_pkts, dyn_2->out_ucast_pkts ), "mismatch\n" ); + ok( bounded( row->OutNUcastPkts, dyn->out_mcast_pkts + dyn->out_bcast_pkts, + dyn_2->out_mcast_pkts + dyn_2->out_bcast_pkts ), "mismatch\n" ); + ok( bounded( row->OutDiscards, dyn->out_discards, dyn_2->out_discards ), "mismatch\n" ); + ok( bounded( row->OutErrors, dyn->out_errors, dyn_2->out_errors ), "mismatch\n" ); + ok( bounded( row->OutUcastOctets, dyn->out_ucast_octs, dyn_2->out_ucast_octs ), "mismatch\n" ); + ok( bounded( row->OutMulticastOctets, dyn->out_mcast_octs, dyn_2->out_mcast_octs ), "mismatch\n" ); + ok( bounded( row->OutBroadcastOctets, dyn->out_bcast_octs, dyn_2->out_bcast_octs ), "mismatch\n" ); + /* OutQLen */ + winetest_pop_context(); + } + + FreeMibTable( table ); + NsiFreeTable( luid_tbl_2, NULL, dyn_tbl_2, NULL ); + NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); +} + +START_TEST( nsi ) +{ + test_ndis_ifinfo(); +} diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 594d6f9ea5d..362eaed0c4e 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -19,6 +19,79 @@ #ifndef __WINE_NSI_H #define __WINE_NSI_H +/* Undocumented NSI NDIS tables */ +#define NSI_NDIS_IFINFO_TABLE 0 +#define NSI_NDIS_INDEX_LUID_TABLE 2 + +struct nsi_ndis_ifinfo_rw +{ + GUID network_guid; + DWORD admin_status; + IF_COUNTED_STRING alias; /* .Length in bytes not including '\0' */ + IF_PHYSICAL_ADDRESS phys_addr; + USHORT pad; + IF_COUNTED_STRING name2; + DWORD unk; +}; + +struct nsi_ndis_ifinfo_dynamic +{ + DWORD oper_status; + struct + { + DWORD unk : 1; + DWORD not_media_conn : 1; + DWORD unk2 : 30; + } flags; + DWORD media_conn_state; + DWORD unk; + DWORD mtu; + ULONG64 xmit_speed; + ULONG64 rcv_speed; + ULONG64 in_errors; + ULONG64 in_discards; + ULONG64 out_errors; + ULONG64 out_discards; + ULONG64 unk2; + ULONG64 in_octets; + ULONG64 in_ucast_pkts; + ULONG64 in_mcast_pkts; + ULONG64 in_bcast_pkts; + ULONG64 out_octets; + ULONG64 out_ucast_pkts; + ULONG64 out_mcast_pkts; + ULONG64 out_bcast_pkts; + ULONG64 unk3[2]; + ULONG64 in_ucast_octs; + ULONG64 in_mcast_octs; + ULONG64 in_bcast_octs; + ULONG64 out_ucast_octs; + ULONG64 out_mcast_octs; + ULONG64 out_bcast_octs; + ULONG64 unk4; +}; + +struct nsi_ndis_ifinfo_static +{ + DWORD if_index; + IF_COUNTED_STRING descr; + DWORD type; + DWORD access_type; + DWORD unk; + DWORD conn_type; + GUID if_guid; + USHORT conn_present; + IF_PHYSICAL_ADDRESS perm_phys_addr; + struct + { + DWORD hw : 1; + DWORD filter : 1; + DWORD unk : 30; + } flags; + DWORD media_type; + DWORD phys_medium_type; +}; + /* Undocumented Nsi api */ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, -- 2.23.0

1 0

[PATCH v3 4/5] nsi: Add stub implementations of NsiAllocateAndGetTable() and NsiFreeTable().
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/Makefile.in | 3 +++ dlls/nsi/nsi.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 4 ++-- include/wine/nsi.h | 28 ++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 dlls/nsi/nsi.c create mode 100644 include/wine/nsi.h diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in index 634c4011ed9..68126cab6c6 100644 --- a/dlls/nsi/Makefile.in +++ b/dlls/nsi/Makefile.in @@ -2,3 +2,6 @@ MODULE = nsi.dll IMPORTLIB = nsi EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c new file mode 100644 index 00000000000..d55445a3dd7 --- /dev/null +++ b/dlls/nsi/nsi.c @@ -0,0 +1,44 @@ +/* + * Network Store Interface + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, + void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, + void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ) +{ + FIXME( "%d %p %d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key_data, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count, unk2 ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) +{ + FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 2d500d30e94..fc2db9e35c1 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -1,5 +1,5 @@ @ stub NsiAllocateAndGetPersistentDataWithMaskTable -@ stub NsiAllocateAndGetTable +@ stdcall NsiAllocateAndGetTable(long ptr long ptr long ptr long ptr long ptr long ptr long) @ stub NsiCancelChangeNotification @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx @@ -7,7 +7,7 @@ @ stub NsiEnumerateObjectsAllParametersEx @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable -@ stub NsiFreeTable +@ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stub NsiGetAllParameters @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask diff --git a/include/wine/nsi.h b/include/wine/nsi.h new file mode 100644 index 00000000000..594d6f9ea5d --- /dev/null +++ b/include/wine/nsi.h @@ -0,0 +1,28 @@ +/* + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_NSI_H +#define __WINE_NSI_H + +/* Undocumented Nsi api */ +DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, + void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, + void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); +void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); + +#endif /* __WINE_NSI_H */ -- 2.23.0

1 0

[PATCH v3 3/5] nsi: Add a stub dll.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/Makefile.in | 4 ++++ dlls/nsi/nsi.spec | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 dlls/nsi/Makefile.in create mode 100644 dlls/nsi/nsi.spec diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in new file mode 100644 index 00000000000..634c4011ed9 --- /dev/null +++ b/dlls/nsi/Makefile.in @@ -0,0 +1,4 @@ +MODULE = nsi.dll +IMPORTLIB = nsi + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec new file mode 100644 index 00000000000..2d500d30e94 --- /dev/null +++ b/dlls/nsi/nsi.spec @@ -0,0 +1,26 @@ +@ stub NsiAllocateAndGetPersistentDataWithMaskTable +@ stub NsiAllocateAndGetTable +@ stub NsiCancelChangeNotification +@ stub NsiDeregisterChangeNotification +@ stub NsiDeregisterChangeNotificationEx +@ stub NsiEnumerateObjectsAllParameters +@ stub NsiEnumerateObjectsAllParametersEx +@ stub NsiEnumerateObjectsAllPersistentParametersWithMask +@ stub NsiFreePersistentDataWithMaskTable +@ stub NsiFreeTable +@ stub NsiGetAllParameters +@ stub NsiGetAllParametersEx +@ stub NsiGetAllPersistentParametersWithMask +@ stub NsiObjectSecurity +@ stub NsiGetParameter +@ stub NsiGetParameterEx +@ stub NsiRegisterChangeNotification +@ stub NsiRegisterChangeNotificationEx +@ stub NsiRequestChangeNotification +@ stub NsiRequestChangeNotificationEx +@ stub NsiSetAllParameters +@ stub NsiSetAllParametersEx +@ stub NsiSetAllPersistentParametersWithMask +@ stub NsiSetObjectSecurity +@ stub NsiSetParameter +@ stub NsiSetParameterEx -- 2.23.0

1 0

[PATCH v3 2/5] uuid: Add a few NPI module ids.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/uuid/uuid.c | 3 +++ include/netiodef.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index eacb83301d1..aa7ad3dd678 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -92,6 +92,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "comsvcs.h" #include "directmanipulation.h" +#define __WINE_INIT_NPI_MODULEID +#include "netiodef.h" + /* FIXME: cguids declares GUIDs but does not define their values */ /* GUIDs not declared in an exported header file */ diff --git a/include/netiodef.h b/include/netiodef.h index 611359c49f8..658dd235db0 100644 --- a/include/netiodef.h +++ b/include/netiodef.h @@ -57,4 +57,33 @@ static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI return FALSE; } +#ifdef __WINE_INIT_NPI_MODULEID +#ifdef __cplusplus +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN; \ + EXTERN_C const NPI_MODULEID name = \ + { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } +#else +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + const NPI_MODULEID name DECLSPEC_HIDDEN; \ + const NPI_MODULEID name = \ + { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } +#endif +#else /* __WINE_INIT_MODULEID */ +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN +#endif /* __WINE_INIT_MODULEID */ + +#define DEFINE_NPI_MS_MODULEID(name, n) DEFINE_NPI_GUID_MODULEID(name, 0xeb004a00 + (n), 0x9b1a, 0x11d4, \ + 0x91, 0x23, 0x00, 0x50, 0x04, 0x77, 0x59, 0xbc) + +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV4_MODULEID, 0x00 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV6_MODULEID, 0x01 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_UDP_MODULEID, 0x02 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_TCP_MODULEID, 0x03 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_NDIS_MODULEID, 0x11 ); + +#undef DEFINE_NPI_MS_MODULEID +#undef DEFINE_NPI_GUID_MODULEID + #endif /* __WINE_NETIODEF_H */ -- 2.23.0

1 0

[PATCH v3 1/5] include: Add netiodef.h.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- include/Makefile.in | 1 + include/netiodef.h | 60 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 include/netiodef.h diff --git a/include/Makefile.in b/include/Makefile.in index 5b84d7858ff..4a8c261bb8f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -524,6 +524,7 @@ SOURCES = \ netcon.idl \ netfw.idl \ netioapi.h \ + netiodef.h \ netlistmgr.idl \ newdev.h \ nldef.h \ diff --git a/include/netiodef.h b/include/netiodef.h new file mode 100644 index 00000000000..611359c49f8 --- /dev/null +++ b/include/netiodef.h @@ -0,0 +1,60 @@ +/* + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_NETIODEF_H +#define __WINE_NETIODEF_H + +typedef enum _NPI_MODULEID_TYPE +{ + MIT_GUID = 1, + MIT_IF_LUID +} NPI_MODULEID_TYPE; + +typedef struct _NPI_MODULEID +{ + USHORT Length; + NPI_MODULEID_TYPE Type; + union + { + GUID Guid; + LUID IfLuid; + }; +} NPI_MODULEID; + +typedef const NPI_MODULEID *PNPI_MODULEID; + +static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI_MODULEID *mod2 ) +{ + if (mod1->Type == mod2->Type) + { + if (mod1->Type == MIT_GUID) + { +#ifdef __cplusplus + return IsEqualGUID( mod1->Guid, mod2->Guid ); +#else + return IsEqualGUID( &mod1->Guid, &mod2->Guid ); +#endif + } + else if (mod1->Type == MIT_IF_LUID) + return mod1->IfLuid.HighPart == mod2->IfLuid.HighPart && + mod1->IfLuid.LowPart == mod2->IfLuid.LowPart; + } + return FALSE; +} + +#endif /* __WINE_NETIODEF_H */ -- 2.23.0

1 0

[PATCH 1/5] hid: Introduce new copy_bits helper for HidP_SetUsageValueArray.
by Rémi Bernon 25 Jun '21

25 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 70 ++++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 +-- 2 files changed, 68 insertions(+), 8 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 8d893f6327d..827de20c634 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -70,6 +70,7 @@ struct caps_filter { BOOLEAN buttons; BOOLEAN values; + BOOLEAN array; USAGE usage_page; USHORT collection; USAGE usage; @@ -102,6 +103,7 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR { if (!match_value_caps( caps, filter )) continue; if (filter->report_id && caps->report_id != filter->report_id) continue; + else if (filter->array && (caps->is_range || caps->report_count <= 1)) return HIDP_STATUS_NOT_VALUE_ARRAY; else if (remaining-- > 0) status = callback( caps, user ); } @@ -114,6 +116,44 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR return HIDP_STATUS_SUCCESS; } +/* copy count bits from src, starting at (-shift) bit if < 0, to dst starting at (shift) bit if > 0 */ +static void copy_bits( unsigned char *dst, const unsigned char *src, int count, int shift ) +{ + unsigned char bits, mask; + size_t src_shift = shift < 0 ? (-shift & 7) : 0; + size_t dst_shift = shift > 0 ? (shift & 7) : 0; + if (shift < 0) src += -shift / 8; + if (shift > 0) dst += shift / 8; + + if (src_shift == 0 && dst_shift == 0) + { + memcpy( dst, src, count / 8 ); + dst += count / 8; + src += count / 8; + count &= 7; + } + + if (!count) return; + + bits = *dst << (8 - dst_shift); + count += dst_shift; + + while (count > 8) + { + *dst = bits >> (8 - dst_shift); + bits = *(unsigned short *)src++ >> src_shift; + *dst++ |= bits << dst_shift; + count -= 8; + } + + bits >>= (8 - dst_shift); + if (count <= 8 - src_shift) bits |= (*src >> src_shift) << dst_shift; + else bits |= (*(unsigned short *)src >> src_shift) << dst_shift; + + mask = (1 << count) - 1; + *dst = (bits & mask) | (*dst & ~mask); +} + static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, INT valueSize, PULONG value) { @@ -323,6 +363,13 @@ static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT return HIDP_STATUS_USAGE_NOT_FOUND; } +struct usage_value_params +{ + void *value_buf; + USHORT value_len; + void *report_buf; +}; + static LONG sign_extend(ULONG value, const WINE_HID_ELEMENT *element) { UINT bit_count = element->bitCount; @@ -514,6 +561,15 @@ ULONG WINAPI HidP_MaxUsageListLength( HIDP_REPORT_TYPE report_type, USAGE usage_ return count; } +static NTSTATUS set_usage_value( const struct hid_value_caps *caps, void *user ) +{ + struct usage_value_params *params = user; + ULONG bit_count = caps->bit_size * caps->report_count; + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + copy_bits( params->report_buf, params->value_buf, bit_count, caps->start_bit ); + return HIDP_STATUS_NULL; +} + NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength) @@ -539,11 +595,19 @@ NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usa USAGE usage, char *value_buf, USHORT value_len, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) { - FIXME( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " - "preparsed_data %p, report_buf %p, report_len %u stub!\n", + struct usage_value_params params = {.value_buf = value_buf, .value_len = value_len, .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.values = TRUE, .array = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; + USHORT count = 1; + + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " + "preparsed_data %p, report_buf %p, report_len %u.\n", report_type, usage_page, collection, usage, value_buf, value_len, preparsed_data, report_buf, report_len ); - return HIDP_STATUS_NOT_IMPLEMENTED; + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; + + filter.report_id = report_buf[0]; + return enum_value_caps( preparsed, report_type, report_len, &filter, set_usage_value, &params, &count ); } struct set_usage_params diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index ca030599299..3185b0f7893 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2021,15 +2021,14 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, sizeof(buffer), preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_NOT_VALUE_ARRAY, "HidP_SetUsageValueArray returned %#x\n", status); memset(buffer, 0xcd, sizeof(buffer)); status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, 0, preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#x\n", status); status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, 8, preparsed_data, report, caps.InputReportByteLength); + todo_wine ok(status == HIDP_STATUS_NOT_IMPLEMENTED, "HidP_SetUsageValueArray returned %#x\n", status); status = HidP_GetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, @@ -2365,13 +2364,10 @@ static void test_hidp(HANDLE file, int report_id) memset(buffer, 0xff, sizeof(buffer)); status = HidP_SetUsageValueArray(HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, 0, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#x\n", status); status = HidP_SetUsageValueArray(HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, 64, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValueArray returned %#x\n", status); - todo_wine ok(!memcmp(report + 9, buffer, 8), "unexpected report data\n"); memset(buffer, 0, sizeof(buffer)); -- 2.32.0

2 6

[PATCH v2 5/5] nsi/tests: Add tests for the NDIS ifinfo table.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/Makefile.in | 5 ++ dlls/nsi/tests/nsi.c | 146 +++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 73 +++++++++++++++++++ 3 files changed, 224 insertions(+) create mode 100644 dlls/nsi/tests/Makefile.in create mode 100644 dlls/nsi/tests/nsi.c diff --git a/dlls/nsi/tests/Makefile.in b/dlls/nsi/tests/Makefile.in new file mode 100644 index 00000000000..98129935198 --- /dev/null +++ b/dlls/nsi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = nsi.dll +IMPORTS = nsi uuid iphlpapi + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c new file mode 100644 index 00000000000..2fc1876c833 --- /dev/null +++ b/dlls/nsi/tests/nsi.c @@ -0,0 +1,146 @@ +/* + * Network Store Interface tests + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "wine/test.h" + +static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) +{ + return lo <= val && val <= hi; +} + +static void test_ndis_ifinfo( void ) +{ + DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), + sizeof(struct nsi_ndis_ifinfo_rw) }; + struct nsi_ndis_ifinfo_rw *rw_tbl; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn_tbl_2; + struct nsi_ndis_ifinfo_static *stat_tbl; + DWORD err, count, i, rw_size; + NET_LUID *luid_tbl, *luid_tbl_2; + MIB_IF_TABLE2 *table; + + /* Contents of GetIfTable2() keyed by luids */ + + for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) + { + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl, sizeof(*luid_tbl), + (void **)&rw_tbl, rw_sizes[i], (void **)&dyn_tbl, sizeof(*dyn_tbl), + (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); + if (!err) break; + } +todo_wine + ok( !err, "got %d\n", err ); + if (err) return; + rw_size = rw_sizes[i]; + + err = GetIfTable2( &table ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + /* Grab the dyn table again to provide an upper bound for the stats returned from GetIfTable2(). + (The luids must be retrieved again otherwise NsiAllocateAndGetTable() fails). */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl_2, sizeof(*luid_tbl_2), + NULL, 0, (void **)&dyn_tbl_2, sizeof(*dyn_tbl_2), + NULL, 0, &count, 0 ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + for (i = 0; i < count; i++) + { + MIB_IF_ROW2 *row = table->Table + i; + NET_LUID *luid = luid_tbl + i; + struct nsi_ndis_ifinfo_rw *rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + struct nsi_ndis_ifinfo_dynamic *dyn = dyn_tbl + i, *dyn_2 = dyn_tbl_2 + i; + struct nsi_ndis_ifinfo_static *stat = stat_tbl + i; + + ok( row->InterfaceLuid.Value == luid->Value, "%d: mismatch\n", i ); + ok( row->InterfaceIndex == stat->if_index, "%d: mismatch\n", i ); + ok( IsEqualGUID( &row->InterfaceGuid, &stat->if_guid ), "%d: mismatch\n", i ); + ok( !memcmp( row->Alias, rw->alias.String, rw->alias.Length ), "%d: mismatch\n", i ); + ok( lstrlenW( row->Alias ) * 2 == rw->alias.Length, "%d: mismatch\n", i ); + ok( !memcmp( row->Description, stat->descr.String, sizeof(row->Description) ), "%d: mismatch\n", i ); + ok( lstrlenW( row->Description ) * 2 == stat->descr.Length, "%d: mismatch\n", i ); + ok( row->PhysicalAddressLength == rw->phys_addr.Length, "%d: mismatch\n", i ); + ok( !memcmp( row->PhysicalAddress, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "%d: mismatch\n", i ); + ok( row->PhysicalAddressLength == stat->perm_phys_addr.Length, "%d: mismatch\n", i ); + ok( !memcmp( row->PermanentPhysicalAddress, stat->perm_phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "%d: mismatch\n", i ); + ok( row->Mtu == dyn->mtu, "%d: mismatch\n", i ); + ok( row->Type == stat->type, "%d: mismatch\n", i ); + /* TunnelType */ + ok( row->MediaType == stat->media_type, "%d: mismatch\n", i ); + ok( row->PhysicalMediumType == stat->phys_medium_type, "%d: mismatch\n", i ); + ok( row->AccessType == stat->access_type, "%d: mismatch\n", i ); + /* DirectionType */ + ok( row->InterfaceAndOperStatusFlags.HardwareInterface == stat->flags.hw, "%d: mismatch\n", i ); + ok( row->InterfaceAndOperStatusFlags.FilterInterface == stat->flags.filter, "%d: mismatch\n", i ); + ok( row->InterfaceAndOperStatusFlags.ConnectorPresent == stat->conn_present, "%d: mismatch\n", i ); + /* NotAuthenticated */ + ok( row->InterfaceAndOperStatusFlags.NotMediaConnected == dyn->flags.not_media_conn, "%d: mismatch\n", i ); + /* Paused */ + /* LowPower */ + /* EndPointInterface */ + ok( row->OperStatus == dyn->oper_status, "%d: mismatch\n", i ); + ok( row->AdminStatus == rw->admin_status, "%d: mismatch\n", i ); + ok( row->MediaConnectState == dyn->media_conn_state, "%d: status mismatch\n", i ); + ok( IsEqualGUID( &row->NetworkGuid, &rw->network_guid ), "%d: mismatch\n", i ); + ok( row->ConnectionType == stat->conn_type, "%d: mismatch\n", i ); + if (dyn->xmit_speed == ~0ULL) dyn->xmit_speed = 0; + ok( row->TransmitLinkSpeed == dyn->xmit_speed, "%d: mismatch\n", i ); + if (dyn->rcv_speed == ~0ULL) dyn->rcv_speed = 0; + ok( row->ReceiveLinkSpeed == dyn->rcv_speed, "%d: mismatch\n", i ); + ok( bounded( row->InOctets, dyn->in_octets, dyn_2->in_octets ), "%d: mismatch\n", i ); + ok( bounded( row->InUcastPkts, dyn->in_ucast_pkts, dyn_2->in_ucast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->InNUcastPkts, dyn->in_mcast_pkts + dyn->in_bcast_pkts, + dyn_2->in_mcast_pkts + dyn_2->in_bcast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->InDiscards, dyn->in_discards, dyn_2->in_discards ), "%d: mismatch\n", i ); + ok( bounded( row->InErrors, dyn->in_errors, dyn_2->in_errors ), "%d: mismatch\n", i ); + /* InUnknownProtos */ + ok( bounded( row->InUcastOctets, dyn->in_ucast_octs, dyn_2->in_ucast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->InMulticastOctets, dyn->in_mcast_octs, dyn_2->in_mcast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->InBroadcastOctets, dyn->in_bcast_octs, dyn_2->in_bcast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->OutOctets, dyn->out_octets, dyn_2->out_octets ), "%d: mismatch\n", i ); + ok( bounded( row->OutUcastPkts, dyn->out_ucast_pkts, dyn_2->out_ucast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->OutNUcastPkts, dyn->out_mcast_pkts + dyn->out_bcast_pkts, + dyn_2->out_mcast_pkts + dyn_2->out_bcast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->OutDiscards, dyn->out_discards, dyn_2->out_discards ), "%d: mismatch\n", i ); + ok( bounded( row->OutErrors, dyn->out_errors, dyn_2->out_errors ), "%d: mismatch\n", i ); + ok( bounded( row->OutUcastOctets, dyn->out_ucast_octs, dyn_2->out_ucast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->OutMulticastOctets, dyn->out_mcast_octs, dyn_2->out_mcast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->OutBroadcastOctets, dyn->out_bcast_octs, dyn_2->out_bcast_octs ), "%d: mismatch\n", i ); + /* OutQLen */ + } + + FreeMibTable( table ); + NsiFreeTable( luid_tbl_2, NULL, dyn_tbl_2, NULL ); + NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); +} + +START_TEST( nsi ) +{ + test_ndis_ifinfo(); +} diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 594d6f9ea5d..362eaed0c4e 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -19,6 +19,79 @@ #ifndef __WINE_NSI_H #define __WINE_NSI_H +/* Undocumented NSI NDIS tables */ +#define NSI_NDIS_IFINFO_TABLE 0 +#define NSI_NDIS_INDEX_LUID_TABLE 2 + +struct nsi_ndis_ifinfo_rw +{ + GUID network_guid; + DWORD admin_status; + IF_COUNTED_STRING alias; /* .Length in bytes not including '\0' */ + IF_PHYSICAL_ADDRESS phys_addr; + USHORT pad; + IF_COUNTED_STRING name2; + DWORD unk; +}; + +struct nsi_ndis_ifinfo_dynamic +{ + DWORD oper_status; + struct + { + DWORD unk : 1; + DWORD not_media_conn : 1; + DWORD unk2 : 30; + } flags; + DWORD media_conn_state; + DWORD unk; + DWORD mtu; + ULONG64 xmit_speed; + ULONG64 rcv_speed; + ULONG64 in_errors; + ULONG64 in_discards; + ULONG64 out_errors; + ULONG64 out_discards; + ULONG64 unk2; + ULONG64 in_octets; + ULONG64 in_ucast_pkts; + ULONG64 in_mcast_pkts; + ULONG64 in_bcast_pkts; + ULONG64 out_octets; + ULONG64 out_ucast_pkts; + ULONG64 out_mcast_pkts; + ULONG64 out_bcast_pkts; + ULONG64 unk3[2]; + ULONG64 in_ucast_octs; + ULONG64 in_mcast_octs; + ULONG64 in_bcast_octs; + ULONG64 out_ucast_octs; + ULONG64 out_mcast_octs; + ULONG64 out_bcast_octs; + ULONG64 unk4; +}; + +struct nsi_ndis_ifinfo_static +{ + DWORD if_index; + IF_COUNTED_STRING descr; + DWORD type; + DWORD access_type; + DWORD unk; + DWORD conn_type; + GUID if_guid; + USHORT conn_present; + IF_PHYSICAL_ADDRESS perm_phys_addr; + struct + { + DWORD hw : 1; + DWORD filter : 1; + DWORD unk : 30; + } flags; + DWORD media_type; + DWORD phys_medium_type; +}; + /* Undocumented Nsi api */ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, -- 2.23.0

2 2

[PATCH v2 4/5] nsi: Add stub implementations of NsiAllocateAndGetTable() and NsiFreeTable().
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/Makefile.in | 3 +++ dlls/nsi/nsi.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 4 ++-- include/wine/nsi.h | 28 ++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 dlls/nsi/nsi.c create mode 100644 include/wine/nsi.h diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in index 634c4011ed9..68126cab6c6 100644 --- a/dlls/nsi/Makefile.in +++ b/dlls/nsi/Makefile.in @@ -2,3 +2,6 @@ MODULE = nsi.dll IMPORTLIB = nsi EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c new file mode 100644 index 00000000000..d55445a3dd7 --- /dev/null +++ b/dlls/nsi/nsi.c @@ -0,0 +1,44 @@ +/* + * Network Store Interface + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, + void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, + void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ) +{ + FIXME( "%d %p %d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key_data, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count, unk2 ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) +{ + FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 2d500d30e94..fc2db9e35c1 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -1,5 +1,5 @@ @ stub NsiAllocateAndGetPersistentDataWithMaskTable -@ stub NsiAllocateAndGetTable +@ stdcall NsiAllocateAndGetTable(long ptr long ptr long ptr long ptr long ptr long ptr long) @ stub NsiCancelChangeNotification @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx @@ -7,7 +7,7 @@ @ stub NsiEnumerateObjectsAllParametersEx @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable -@ stub NsiFreeTable +@ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stub NsiGetAllParameters @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask diff --git a/include/wine/nsi.h b/include/wine/nsi.h new file mode 100644 index 00000000000..594d6f9ea5d --- /dev/null +++ b/include/wine/nsi.h @@ -0,0 +1,28 @@ +/* + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_NSI_H +#define __WINE_NSI_H + +/* Undocumented Nsi api */ +DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, + void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, + void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); +void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); + +#endif /* __WINE_NSI_H */ -- 2.23.0

1 0

[PATCH v2 3/5] nsi: Add a stub dll.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/Makefile.in | 4 ++++ dlls/nsi/nsi.spec | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 dlls/nsi/Makefile.in create mode 100644 dlls/nsi/nsi.spec diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in new file mode 100644 index 00000000000..634c4011ed9 --- /dev/null +++ b/dlls/nsi/Makefile.in @@ -0,0 +1,4 @@ +MODULE = nsi.dll +IMPORTLIB = nsi + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec new file mode 100644 index 00000000000..2d500d30e94 --- /dev/null +++ b/dlls/nsi/nsi.spec @@ -0,0 +1,26 @@ +@ stub NsiAllocateAndGetPersistentDataWithMaskTable +@ stub NsiAllocateAndGetTable +@ stub NsiCancelChangeNotification +@ stub NsiDeregisterChangeNotification +@ stub NsiDeregisterChangeNotificationEx +@ stub NsiEnumerateObjectsAllParameters +@ stub NsiEnumerateObjectsAllParametersEx +@ stub NsiEnumerateObjectsAllPersistentParametersWithMask +@ stub NsiFreePersistentDataWithMaskTable +@ stub NsiFreeTable +@ stub NsiGetAllParameters +@ stub NsiGetAllParametersEx +@ stub NsiGetAllPersistentParametersWithMask +@ stub NsiObjectSecurity +@ stub NsiGetParameter +@ stub NsiGetParameterEx +@ stub NsiRegisterChangeNotification +@ stub NsiRegisterChangeNotificationEx +@ stub NsiRequestChangeNotification +@ stub NsiRequestChangeNotificationEx +@ stub NsiSetAllParameters +@ stub NsiSetAllParametersEx +@ stub NsiSetAllPersistentParametersWithMask +@ stub NsiSetObjectSecurity +@ stub NsiSetParameter +@ stub NsiSetParameterEx -- 2.23.0

1 0

[PATCH v2 2/5] uuid: Add a few NPI module ids.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/uuid/uuid.c | 3 +++ include/netiodef.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index eacb83301d1..aa7ad3dd678 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -92,6 +92,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "comsvcs.h" #include "directmanipulation.h" +#define __WINE_INIT_NPI_MODULEID +#include "netiodef.h" + /* FIXME: cguids declares GUIDs but does not define their values */ /* GUIDs not declared in an exported header file */ diff --git a/include/netiodef.h b/include/netiodef.h index 611359c49f8..658dd235db0 100644 --- a/include/netiodef.h +++ b/include/netiodef.h @@ -57,4 +57,33 @@ static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI return FALSE; } +#ifdef __WINE_INIT_NPI_MODULEID +#ifdef __cplusplus +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN; \ + EXTERN_C const NPI_MODULEID name = \ + { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } +#else +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + const NPI_MODULEID name DECLSPEC_HIDDEN; \ + const NPI_MODULEID name = \ + { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } +#endif +#else /* __WINE_INIT_MODULEID */ +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN +#endif /* __WINE_INIT_MODULEID */ + +#define DEFINE_NPI_MS_MODULEID(name, n) DEFINE_NPI_GUID_MODULEID(name, 0xeb004a00 + (n), 0x9b1a, 0x11d4, \ + 0x91, 0x23, 0x00, 0x50, 0x04, 0x77, 0x59, 0xbc) + +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV4_MODULEID, 0x00 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV6_MODULEID, 0x01 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_UDP_MODULEID, 0x02 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_TCP_MODULEID, 0x03 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_NDIS_MODULEID, 0x11 ); + +#undef DEFINE_NPI_MS_MODULEID +#undef DEFINE_NPI_GUID_MODULEID + #endif /* __WINE_NETIODEF_H */ -- 2.23.0

1 0

[PATCH v2 1/5] include: Add netiodef.h.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- include/Makefile.in | 1 + include/netiodef.h | 60 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 include/netiodef.h diff --git a/include/Makefile.in b/include/Makefile.in index 5b84d7858ff..4a8c261bb8f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -524,6 +524,7 @@ SOURCES = \ netcon.idl \ netfw.idl \ netioapi.h \ + netiodef.h \ netlistmgr.idl \ newdev.h \ nldef.h \ diff --git a/include/netiodef.h b/include/netiodef.h new file mode 100644 index 00000000000..611359c49f8 --- /dev/null +++ b/include/netiodef.h @@ -0,0 +1,60 @@ +/* + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_NETIODEF_H +#define __WINE_NETIODEF_H + +typedef enum _NPI_MODULEID_TYPE +{ + MIT_GUID = 1, + MIT_IF_LUID +} NPI_MODULEID_TYPE; + +typedef struct _NPI_MODULEID +{ + USHORT Length; + NPI_MODULEID_TYPE Type; + union + { + GUID Guid; + LUID IfLuid; + }; +} NPI_MODULEID; + +typedef const NPI_MODULEID *PNPI_MODULEID; + +static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI_MODULEID *mod2 ) +{ + if (mod1->Type == mod2->Type) + { + if (mod1->Type == MIT_GUID) + { +#ifdef __cplusplus + return IsEqualGUID( mod1->Guid, mod2->Guid ); +#else + return IsEqualGUID( &mod1->Guid, &mod2->Guid ); +#endif + } + else if (mod1->Type == MIT_IF_LUID) + return mod1->IfLuid.HighPart == mod2->IfLuid.HighPart && + mod1->IfLuid.LowPart == mod2->IfLuid.LowPart; + } + return FALSE; +} + +#endif /* __WINE_NETIODEF_H */ -- 2.23.0

1 0

[PATCH v4 1/2] mf/sar: Query for current padding before requesting sample buffer.
by Giovanni Mascellani 25 Jun '21

25 Jun '21

According to both MSDN and our impementation, GetBufferSize returns the size of the buffer, but it doesn't guarantee that all of it is available. In order to know how much of it is available, the caller must also call GetCurrentPadding and subtract that number to the buffer size. Failing to do so might result in GetBuffer returning an error. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- This patch is unchanged. It is being resent because otherwise the second patch fails to apply. dlls/mf/sar.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 77cbfcb21da..eba822ae0fe 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1751,7 +1751,7 @@ static HRESULT WINAPI audio_renderer_render_callback_GetParameters(IMFAsyncCallb static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResult *result) { - unsigned int src_frames, dst_frames, max_frames, src_len; + unsigned int src_frames, dst_frames, max_frames, pad_frames, src_len; struct queued_object *obj, *obj2; BOOL keep_sample = FALSE; IMFMediaBuffer *buffer; @@ -1775,20 +1775,24 @@ static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResul { if (SUCCEEDED(IAudioClient_GetBufferSize(renderer->audio_client, &max_frames))) { - src_frames -= obj->u.sample.frame_offset; - dst_frames = min(src_frames, max_frames); - - if (SUCCEEDED(hr = IAudioRenderClient_GetBuffer(renderer->audio_render_client, dst_frames, &dst))) + if (SUCCEEDED(IAudioClient_GetCurrentPadding(renderer->audio_client, &pad_frames))) { - memcpy(dst, src + obj->u.sample.frame_offset * renderer->frame_size, - dst_frames * renderer->frame_size); + max_frames -= pad_frames; + src_frames -= obj->u.sample.frame_offset; + dst_frames = min(src_frames, max_frames); - IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); + if (SUCCEEDED(hr = IAudioRenderClient_GetBuffer(renderer->audio_render_client, dst_frames, &dst))) + { + memcpy(dst, src + obj->u.sample.frame_offset * renderer->frame_size, + dst_frames * renderer->frame_size); - obj->u.sample.frame_offset += dst_frames; - } + IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); - keep_sample = FAILED(hr) || src_frames > max_frames; + obj->u.sample.frame_offset += dst_frames; + } + + keep_sample = FAILED(hr) || src_frames > max_frames; + } } } IMFMediaBuffer_Unlock(buffer); -- 2.32.0

2 9

[PATCH 1/5] ntdll/tests: Test deleting files with an open mapping.
by Zebediah Figura 25 Jun '21

25 Jun '21

From: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/file.c | 93 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index b7b46365911..5d234114fd5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2960,12 +2960,13 @@ static void test_file_disposition_information(void) { char tmp_path[MAX_PATH], buffer[MAX_PATH + 16]; DWORD dirpos; - HANDLE handle, handle2, handle3; + HANDLE handle, handle2, handle3, mapping; NTSTATUS res; IO_STATUS_BLOCK io; FILE_DISPOSITION_INFORMATION fdi; BOOL fileDeleted; - DWORD fdi2; + DWORD fdi2, size; + void *view; GetTempPathA( MAX_PATH, tmp_path ); @@ -3312,6 +3313,94 @@ todo_wine ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); fileDeleted = RemoveDirectoryA( buffer ); ok( fileDeleted, "Directory should have been deleted\n" ); + + /* a file with an open mapping handle cannot be deleted */ + + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + WriteFile(handle, "data", 4, &size, NULL); + mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); + ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + ok( !res, "got %#x\n", res ); + + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + todo_wine ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); + res = GetFileAttributesA( buffer ); + ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); + + CloseHandle( mapping ); + CloseHandle( handle ); + res = DeleteFileA( buffer ); + todo_wine ok( res, "got error %u\n", GetLastError() ); + + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + WriteFile(handle, "data", 4, &size, NULL); + mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); + ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + CloseHandle( mapping ); + + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + ok( !res, "got %#x\n", res ); + + CloseHandle( handle ); + res = DeleteFileA( buffer ); + ok( !res, "expected failure\n" ); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError() ); + + /* a file with an open view cannot be deleted */ + + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + WriteFile(handle, "data", 4, &size, NULL); + mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); + ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + view = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4 ); + ok( !!view, "failed to map view, error %u\n", GetLastError() ); + CloseHandle( mapping ); + + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + ok( !res, "got %#x\n", res ); + + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + todo_wine ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); + res = GetFileAttributesA( buffer ); + ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); + + UnmapViewOfFile( view ); + CloseHandle( handle ); + res = DeleteFileA( buffer ); + todo_wine ok( res, "got error %u\n", GetLastError() ); + + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + WriteFile(handle, "data", 4, &size, NULL); + mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); + ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + view = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4 ); + ok( !!view, "failed to map view, error %u\n", GetLastError() ); + CloseHandle( mapping ); + UnmapViewOfFile( view ); + + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + ok( !res, "got %#x\n", res ); + + CloseHandle( handle ); + res = DeleteFileA( buffer ); + ok( !res, "expected failure\n" ); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError() ); } static void test_file_name_information(void) -- 2.30.2

1 4

[PATCH 1/6] ws2_32: Move the getsockopt(SO_LINGER) implementation to ntdll.
by Zebediah Figura 25 Jun '21

25 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/unix/socket.c | 22 ++++++++++++++++++++++ dlls/ws2_32/socket.c | 23 +++++------------------ include/wine/afd.h | 1 + 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 7b62c5aef68..89926411a40 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1613,6 +1613,28 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_SO_KEEPALIVE: return do_setsockopt( handle, io, SOL_SOCKET, SO_KEEPALIVE, in_buffer, in_size ); + case IOCTL_AFD_WINE_GET_SO_LINGER: + { + struct WS_linger *ws_linger = out_buffer; + struct linger unix_linger; + socklen_t len = sizeof(unix_linger); + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + ret = getsockopt( fd, SOL_SOCKET, SO_LINGER, &unix_linger, &len ); + if (needs_close) close( fd ); + if (!ret) + { + ws_linger->l_onoff = unix_linger.l_onoff; + ws_linger->l_linger = unix_linger.l_linger; + io->Information = sizeof(*ws_linger); + } + + return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; + } + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c35972c1d27..de83563bd29 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2229,9 +2229,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_LINGER: { - struct linger lingval; - socklen_t len = sizeof(struct linger); - /* struct linger and LINGER have different sizes */ if (!optlen || *optlen < sizeof(LINGER) || !optval) { @@ -2243,23 +2240,13 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if (_get_fd_type(fd) == SOCK_DGRAM) { - SetLastError(WSAENOPROTOOPT); - ret = SOCKET_ERROR; + release_sock_fd( s, fd ); + SetLastError( WSAENOPROTOOPT ); + return -1; } - else if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - else - { - ((LINGER *)optval)->l_onoff = lingval.l_onoff; - ((LINGER *)optval)->l_linger = lingval.l_linger; - *optlen = sizeof(struct linger); - } - release_sock_fd( s, fd ); - return ret; + + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_LINGER, optval, optlen ); } case WS_SO_MAX_MSG_SIZE: diff --git a/include/wine/afd.h b/include/wine/afd.h index 616ba27b679..f1dd392ed32 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -165,6 +165,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 224, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 225, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { -- 2.30.2

2 8

[PATCH v2 1/5] ntdll/tests: Fix AVX tests on processors that don't support XSAVEOPT.
by Zebediah Figura 25 Jun '21

25 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix test failures dlls/ntdll/tests/exception.c | 58 +++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7e849fba1aa..1a63a717d21 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7562,7 +7562,7 @@ static const unsigned test_extended_context_spoil_data1[8] = {0x10, 0x20, 0x30, static const unsigned test_extended_context_spoil_data2[8] = {0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75, 0x85}; static BOOL test_extended_context_modified_state; -static BOOL compaction_enabled; +static BOOL xsaveopt_enabled, compaction_enabled; static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) @@ -7603,9 +7603,11 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI context_ymm_data = (unsigned int *)&xs->YmmContext; ok(!((ULONG_PTR)xs % 64), "Got unexpected xs %p.\n", xs); - ok((compaction_enabled && (xs->CompactionMask & (expected_compaction_mask | 3)) == expected_compaction_mask) - || (!compaction_enabled && !xs->CompactionMask), "Got unexpected CompactionMask %s, compaction %#x.\n", - wine_dbgstr_longlong(xs->CompactionMask), compaction_enabled); + if (compaction_enabled) + ok((xs->CompactionMask & (expected_compaction_mask | 3)) == expected_compaction_mask, + "Got compaction mask %#I64x.\n", xs->CompactionMask); + else + ok(!xs->CompactionMask, "Got compaction mask %#I64x.\n", xs->CompactionMask); if (test_extended_context_modified_state) { @@ -7615,9 +7617,13 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI } else { - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); - /* The save area has garbage in this case, the state should be restored to INIT_STATE - * without using these data. */ + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); + /* The save area has garbage if xsaveopt is available, so we can't test + * its contents. */ + + /* Clear the mask; the state should be restored to INIT_STATE without + * using this data. */ + xs->Mask = 0; memcpy(context_ymm_data, test_extended_context_spoil_data1 + 4, sizeof(M128A)); } @@ -7897,6 +7903,7 @@ static void test_extended_context(void) int regs[4]; __cpuidex(regs, 0xd, 1); + xsaveopt_enabled = regs[0] & 1; compaction_enabled = regs[0] & 2; } @@ -8547,7 +8554,7 @@ static void test_extended_context(void) "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n", context->ContextFlags); - ok(xs->Mask == (compaction_enabled ? 0 : 4), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (compaction_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == 4, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) @@ -8618,7 +8625,7 @@ static void test_extended_context(void) expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0; xs = (XSTATE *)((BYTE *)context_ex + context_ex->XState.Offset); - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); @@ -8626,12 +8633,13 @@ static void test_extended_context(void) ok(!data[i], "Got unexpected data %#x, i %u.\n", data[i], i); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc) || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]), "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); /* Test fault exception context. */ memset(data, 0xff, sizeof(data)); + xs->Mask = 0; test_extended_context_modified_state = FALSE; run_exception_test(test_extended_context_handler, NULL, except_code_reset_ymm_state, ARRAY_SIZE(except_code_reset_ymm_state), PAGE_EXECUTE_READ); @@ -8664,12 +8672,13 @@ static void test_extended_context(void) bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + todo_wine_if (!xsaveopt_enabled) + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, "Got unexpected value %#x, i %u.\n", - ((ULONG *)&xs->YmmContext)[i], i); + ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc), + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); pSetXStateFeaturesMask(context, 4); memset(&xs->YmmContext, 0, sizeof(xs->YmmContext)); @@ -8725,11 +8734,24 @@ static void test_extended_context(void) memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(!xs->Mask || (sizeof(void *) == 4 && xs->Mask == 4), - "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); - for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask ? (i < 8 * 4 ? 0 : 0x48484848) : 0xcccccccc), - "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + todo_wine_if (!xsaveopt_enabled && sizeof(void *) != 4) + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4) || (sizeof(void *) == 4 && xs->Mask == 4), + "Got unexpected Mask %#I64x.\n", xs->Mask); + if (xs->Mask == 4) + { + for (i = 0; i < 8 * sizeof(void *); ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + for (; i < 16 * 4; ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0x48484848, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + } + else + { + for (i = 0; i < 16 * 4; ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + } bret = ResumeThread(thread); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); -- 2.30.2

4 7

[PATCH 6/6] light.msstyles: Add ListView parts.
by Zhiyi Zhang 25 Jun '21

25 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index f0a462035a7..b7a8f538536 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -341,6 +341,13 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; ListView\r\n" +"[ListView]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + "\r\n; Rebar\r\n" "[Rebar]\r\n" "BgType = ImageFile\r\n" -- 2.30.2

1 0

[PATCH 5/6] light.msstyles: Add Status parts.
by Zhiyi Zhang 25 Jun '21

25 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 2 + .../light.msstyles/blue_status_background.bmp | Bin 0 -> 186 bytes .../light.msstyles/blue_status_background.svg | 14 +++++++ dlls/light.msstyles/blue_status_pane.bmp | Bin 0 -> 318 bytes dlls/light.msstyles/blue_status_pane.svg | 13 +++++++ dlls/light.msstyles/light.rc | 36 ++++++++++++++++++ 6 files changed, 65 insertions(+) create mode 100644 dlls/light.msstyles/blue_status_background.bmp create mode 100644 dlls/light.msstyles/blue_status_background.svg create mode 100644 dlls/light.msstyles/blue_status_pane.bmp create mode 100644 dlls/light.msstyles/blue_status_pane.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index aef2c2f66e1..c446a1c3b56 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -37,6 +37,8 @@ SVG_SRCS = \ blue_spin_glyph_left.svg \ blue_spin_glyph_right.svg \ blue_spin_glyph_up.svg \ + blue_status_background.svg \ + blue_status_pane.svg \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_buttons_split_dropdown.svg \ blue_toolbar_buttons_split.svg \ diff --git a/dlls/light.msstyles/blue_status_background.bmp b/dlls/light.msstyles/blue_status_background.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b56048f2f66628f7c08dbbd6e566c502a9b4b878 GIT binary patch literal 186 zcmZ?r-NgU_T|lY^h?#+y1&A3LB!DCXg8`UCC;l@qKoCgczmt1VF}eyue2^W;;42IO P1!2suXzX<`02BuR!v-hg literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_status_background.svg b/dlls/light.msstyles/blue_status_background.svg new file mode 100644 index 00000000000..4fc5d4fdce0 --- /dev/null +++ b/dlls/light.msstyles/blue_status_background.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:3-24" width="3" height="4" version="1.1" viewBox="0 0 .79375 1.0583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect y=".13229" width=".79375" height="3.4173e-7" fill="#aeaeae" stroke="#aeaeae" stroke-width=".26458"/> + <rect x="-1.1102e-16" y=".26457" width=".79375" height=".79375" fill="#f5f5f5"/> +</svg> diff --git a/dlls/light.msstyles/blue_status_pane.bmp b/dlls/light.msstyles/blue_status_pane.bmp new file mode 100644 index 0000000000000000000000000000000000000000..befc4807cbdd86bb652179774b0d646f8120bd73 GIT binary patch literal 318 zcmZ?rwPR!egDxOh1H{Zg%n!tj3<_ZO79blF{AXZ*Adu95C-<OYOf~pLSnx|TtXsDZ KXafWcRyF{Fgffc& literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_status_pane.svg b/dlls/light.msstyles/blue_status_pane.svg new file mode 100644 index 00000000000..9c1b197b6c6 --- /dev/null +++ b/dlls/light.msstyles/blue_status_pane.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:3-32" width="3" height="15" version="1.1" viewBox="0 0 .79375 3.9688" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x=".26458" width=".26458" height="3.7042" fill="#aeaeae" stroke-width="0"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c96b4dcf30f..f0a462035a7 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -532,6 +532,35 @@ BLUE_INI TEXTFILE "GlyphImageFile = blue_spin_glyph_left.bmp\r\n" "GlyphTransparent = True\r\n" +"\r\n; Status\r\n" +"[Status]\r\n" +"SizingMargins = 1, 1, 2, 1\r\n" +"ImageFile = blue_status_background.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Stretch\r\n" + +"[Status.Pane]\r\n" +"SizingMargins = 0, 2, 2, 2\r\n" +"ImageFile = blue_status_pane.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Status.GripperPane]\r\n" +"BgType = None\r\n" + +"[Status.Gripper]\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"; Same as scrollbar resize box gripper \r\n" +"ImageFile = blue_scrollbar_resizebox_grip.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"Transparent = True\r\n" +"VAlign = Bottom\r\n" + "\r\n; Toolbar\r\n" "[Toolbar]\r\n" "BgType = BorderFill\r\n" @@ -707,6 +736,13 @@ BLUE_SPIN_GLYPH_RIGHT_BMP BITMAP "blue_spin_glyph_right.bmp" /* @makedep: blue_spin_glyph_up.bmp */ BLUE_SPIN_GLYPH_UP_BMP BITMAP "blue_spin_glyph_up.bmp" +/* Status */ +/* @makedep: blue_status_background.bmp */ +BLUE_STATUS_BACKGROUND_BMP BITMAP "blue_status_background.bmp" + +/* @makedep: blue_status_pane.bmp */ +BLUE_STATUS_PANE_BMP BITMAP "blue_status_pane.bmp" + /* ToolBar */ /* @makedep: blue_toolbar_buttons.bmp */ BLUE_TOOLBAR_BUTTONS_BMP BITMAP "blue_toolbar_buttons.bmp" -- 2.30.2

1 0

[PATCH 4/6] light.msstyles: Add Rebar parts.
by Zhiyi Zhang 25 Jun '21

25 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 4 + dlls/light.msstyles/blue_rebar_background.bmp | Bin 0 -> 438 bytes dlls/light.msstyles/blue_rebar_background.svg | 13 ++++ dlls/light.msstyles/blue_rebar_chevron.bmp | Bin 0 -> 2298 bytes dlls/light.msstyles/blue_rebar_chevron.svg | 28 +++++++ .../blue_rebar_gripper_horizontal.bmp | Bin 0 -> 378 bytes .../blue_rebar_gripper_horizontal.svg | 16 ++++ .../blue_rebar_gripper_vertical.bmp | Bin 0 -> 378 bytes .../blue_rebar_gripper_vertical.svg | 14 ++++ dlls/light.msstyles/light.rc | 72 ++++++++++++++++++ 10 files changed, 147 insertions(+) create mode 100644 dlls/light.msstyles/blue_rebar_background.bmp create mode 100644 dlls/light.msstyles/blue_rebar_background.svg create mode 100644 dlls/light.msstyles/blue_rebar_chevron.bmp create mode 100644 dlls/light.msstyles/blue_rebar_chevron.svg create mode 100644 dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_rebar_gripper_horizontal.svg create mode 100644 dlls/light.msstyles/blue_rebar_gripper_vertical.bmp create mode 100644 dlls/light.msstyles/blue_rebar_gripper_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 524c2607b18..aef2c2f66e1 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -16,6 +16,10 @@ SVG_SRCS = \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_25px.svg \ + blue_rebar_background.svg \ + blue_rebar_chevron.svg \ + blue_rebar_gripper_horizontal.svg \ + blue_rebar_gripper_vertical.svg \ blue_scrollbar_arrow_glyphs_7px.svg \ blue_scrollbar_arrow_glyphs_9px.svg \ blue_scrollbar_arrows.svg \ diff --git a/dlls/light.msstyles/blue_rebar_background.bmp b/dlls/light.msstyles/blue_rebar_background.bmp new file mode 100644 index 0000000000000000000000000000000000000000..18a85f93f1915e3482438217a59fd1860aee8b88 GIT binary patch literal 438 zcmZ?r-NwiO23<h128fw~SQ3aC86<!t1A`7!9?XFg{}~t{2qf~~$vvnTE=44R1x?+5 Q7yuav1EXw6NT7uS09Zok8~^|S literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_rebar_background.svg b/dlls/light.msstyles/blue_rebar_background.svg new file mode 100644 index 00000000000..aca531e8bb4 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_background.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:3-24" width="3" height="25" version="1.1" viewBox="0 0 .79375 6.6146" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x="-1e-6" y="-5.5511e-17" width=".79375" height="6.6146" fill="#fff" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_rebar_chevron.bmp b/dlls/light.msstyles/blue_rebar_chevron.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4b581c5ed1da2f8ef954635ef2784c73010c6971 GIT binary patch literal 2298 zcmZ?r{l&om23<h128g+U*bImn859_pfph^>9>_!j{}~t{2qgC3$vvnTNs=fg3jtMY z*RGup#PS4`F|1m(N^ae{b^AAM+N4NLwLrTqfaYGqXC}~Y380!?8#iuL!KIEEH6Xn} zb7tc+2bcMjiVuZw28N3`Fnsm_u_iA65~BvBcc8)<Xzzm2^o%R^=qvueQgb&Neol-F zfO<9$W_854jaq7cO*2^VeTpH$^7;ErV>zJO{og0+5iFlcQTuJ0o(0fcyyf%%siqRY lrW)+}G1UlX`Am!&P?!PjnvKsKYK1GhIiuwUdWcYm4*=2{@T&j- literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_rebar_chevron.svg b/dlls/light.msstyles/blue_rebar_chevron.svg new file mode 100644 index 00000000000..a6e1b707c47 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_chevron.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="54" version="1.1" viewBox="0 0 2.6458 14.288" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m1.9855 1.5795-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z" fill="#aeaeae"/> + <path d="m2.1074 1.4622-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z" fill="#aeaeae"/> + <path d="m1.9855 3.9607-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z" fill="#3096fa"/> + <path d="m2.1074 3.8435-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z" fill="#3096fa"/> + <path d="m1.9294 6.8751 7.757e-4 -1.3187 0.18651-1.14e-4 -7.75e-4 1.3187z" fill="#2979ff"/> + <path d="m2.0993 6.8784-1.3055 7.821e-4 1.1418e-4 -0.18839 1.3055-7.827e-4z" fill="#2979ff"/> + <g fill="#aeaeae"> + <path d="m1.9855 8.7232-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z"/> + <path d="m2.1074 8.606-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z"/> + <path d="m1.9855 11.104-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z"/> + <path d="m2.1074 10.987-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z"/> + <path d="m1.9855 13.486-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z"/> + <path d="m2.1074 13.368-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp b/dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3dca037e702f49f747318e0930e52ecd41c54a41 GIT binary patch literal 378 zcmZ?rtzu*VgDxOh1H^1V%mu`Z3<?a)K>7m^V}kz-3=jm8`tRf(RE((xzX%I{X`*G< Sty}jW1kg1MlsLLOaPa}q{4${c literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_rebar_gripper_horizontal.svg b/dlls/light.msstyles/blue_rebar_gripper_horizontal.svg new file mode 100644 index 00000000000..faaa3d41ba4 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_gripper_horizontal.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="10" version="1.1" viewBox="0 0 1.5875 2.6458" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m0.52917 0.52917h0.26458v1.5875h-0.26458z" fill="#aeaeae"/> + <path d="m0.79375 0.52917h0.26458v1.5875h-0.26458z" fill="#fff"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_rebar_gripper_vertical.bmp b/dlls/light.msstyles/blue_rebar_gripper_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4b1e85479a16a21e908bfb3cf6779a11f916c765 GIT binary patch literal 378 zcmZ?rtzu*VgDxOh1H@cF%m&1a3<?a)K>7m^V}kz-3=jm8`tRf(RE((xzX%I{X_92u Yty}jWgz;(8)z$qE!o;e>XBIW&0IM7qwg3PC literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_rebar_gripper_vertical.svg b/dlls/light.msstyles/blue_rebar_gripper_vertical.svg new file mode 100644 index 00000000000..0a1249e8883 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_gripper_vertical.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="6" version="1.1" viewBox="0 0 2.6458 1.5875" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <path d="m1.3229 0.79375h0.52917v0.52917h-0.52917z" fill="#aeaeae" stroke-width=".26458"/> + <path d="m1.0583 0.52917h0.52917v0.52917h-0.52917z" fill="#2d2d2d" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c24df6ca17f..c96b4dcf30f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -341,6 +341,65 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; Rebar\r\n" +"[Rebar]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_rebar_background.bmp\r\n" +"SizingMargins = 1, 1, 9, 2\r\n" +"Font = Tahoma, 8\r\n" +"TextColor = 0 0 0\r\n" + +"[Rebar.Band]\r\n" +"BgType = None\r\n" +"ContentMargins = 2, 0, 0, 0\r\n" + +"[Rebar.Gripper]\r\n" +"Bgtype = imagefile\r\n" +"SizingMargins = 2, 1, 4, 2\r\n" +"ContentMargins = 2, 1, 0, 0\r\n" +"ImageFile = blue_rebar_gripper_horizontal.bmp\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Rebar.GripperVert]\r\n" +"Bgtype = ImageFile\r\n" +"SizingMargins = 3, 3, 2, 1\r\n" +"ContentMargins = 1, 2, 0, 0\r\n" +"ImageFile = blue_rebar_gripper_vertical.bmp\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Rebar.Chevron]\r\n" +"SizingMargins = 4, 4, 4, 4\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"; Same as toolbar buttons \r\n" +"ImageFile = blue_toolbar_buttons.bmp\r\n" +"Bgtype = ImageFile\r\n" +"Imagelayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_rebar_chevron.bmp\r\n" +"GlyphTransparent = True\r\n" +"VAlign = Top\r\n" + +"[Rebar.ChevronVert]\r\n" +"SizingMargins = 4, 4, 4, 4\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"; Same as toolbar buttons \r\n" +"ImageFile = blue_toolbar_buttons.bmp\r\n" +"Bgtype = ImageFile\r\n" +"Imagelayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_rebar_chevron.bmp\r\n" +"GlyphTransparent = True\r\n" +"VAlign = Top\r\n" + "\r\n; Scroll Bar\r\n" "[ScrollBar.ArrowBtn]\r\n" "BgType = ImageFile\r\n" @@ -582,6 +641,19 @@ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" /* @makedep: blue_combobutton_glyph.bmp */ BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" +/* Rebar */ +/* @makedep: blue_rebar_background.bmp */ +BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp" + +/* @makedep: blue_rebar_gripper_horizontal.bmp */ +BLUE_REBAR_GRIPPER_HORIZONTAL_BMP BITMAP "blue_rebar_gripper_horizontal.bmp" + +/* @makedep: blue_rebar_gripper_vertical.bmp */ +BLUE_REBAR_GRIPPER_VERTICAL_BMP BITMAP "blue_rebar_gripper_vertical.bmp" + +/* @makedep: blue_rebar_chevron.bmp */ +BLUE_REBAR_CHEVRON_BMP BITMAP "blue_rebar_chevron.bmp" + /* Scroll Bar */ /* @makedep: blue_scrollbar_arrows.bmp */ BLUE_SCROLLBAR_ARROWS_BMP BITMAP "blue_scrollbar_arrows.bmp" -- 2.30.2

1 0

[PATCH 3/6] light.msstyles: Add Toolbar parts.
by Zhiyi Zhang 25 Jun '21

25 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 8 +- dlls/light.msstyles/blue_toolbar_buttons.bmp | Bin 0 -> 4890 bytes dlls/light.msstyles/blue_toolbar_buttons.svg | 20 ++++ .../blue_toolbar_buttons_split.bmp | Bin 0 -> 3306 bytes .../blue_toolbar_buttons_split.svg | 18 ++++ .../blue_toolbar_buttons_split_dropdown.bmp | Bin 0 -> 2778 bytes .../blue_toolbar_buttons_split_dropdown.svg | 18 ++++ ...e_toolbar_buttons_split_dropdown_glyph.bmp | Bin 0 -> 2298 bytes ...e_toolbar_buttons_split_dropdown_glyph.svg | 28 ++++++ .../blue_toolbar_separator_horizontal.bmp | Bin 0 -> 298 bytes .../blue_toolbar_separator_horizontal.svg | 13 +++ .../blue_toolbar_separator_vertical.bmp | Bin 0 -> 298 bytes .../blue_toolbar_separator_vertical.svg | 13 +++ dlls/light.msstyles/light.rc | 86 ++++++++++++++++++ 14 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 dlls/light.msstyles/blue_toolbar_buttons.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_buttons.svg create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split.svg create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.svg create mode 100644 dlls/light.msstyles/blue_toolbar_separator_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_separator_horizontal.svg create mode 100644 dlls/light.msstyles/blue_toolbar_separator_vertical.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_separator_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index ad21f8683bf..524c2607b18 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -32,4 +32,10 @@ SVG_SRCS = \ blue_spin_glyph_down.svg \ blue_spin_glyph_left.svg \ blue_spin_glyph_right.svg \ - blue_spin_glyph_up.svg + blue_spin_glyph_up.svg \ + blue_toolbar_buttons_split_dropdown_glyph.svg \ + blue_toolbar_buttons_split_dropdown.svg \ + blue_toolbar_buttons_split.svg \ + blue_toolbar_buttons.svg \ + blue_toolbar_separator_horizontal.svg \ + blue_toolbar_separator_vertical.svg diff --git a/dlls/light.msstyles/blue_toolbar_buttons.bmp b/dlls/light.msstyles/blue_toolbar_buttons.bmp new file mode 100644 index 0000000000000000000000000000000000000000..820a119f1aaeb51aaeb7536b2f93b56c4002809c GIT binary patch literal 4890 zcmeHKJx{|h5DkKb6*h)8BNZKrD$yw&x-hZuR~Yyx3y6t{0ks60p8{fP)AI3mqB?eu zJEMz2>?UhfeCp+NzGp{yeTmP#lf7L}+dW>d(YMj>&^J8a+r;>=gBQcV^L~F+f!^`y znE|O7*ecYa->Ab)X98DE36~AXobubw7|suB7-M*Qk{|{AG0I;DGMitlGdP_C^qZ+( zo5yUC?{BN|n8Pp=_PEackS5DCrZsysgZEGwIGRTqCM{p=`>5IJ63xf-P9%?qbusEr z#IP;Jpaq#z9(Bh_*sh5vh}Gwd1XXx1FjpU;<oQOO|2a7aTtB6?%Z%^sFm?w1JwK?) z3XP#=gQ@x&DFdgq`mD98HIF#E=7X3tU)Vle>KJegAOo(CvVWWP=sNc#^lW9eiqF2H zebfT?q6Ko9d7+Oo>Wt0xQQ2Is<s$b94wK{9@uT&owSj$9g~q7&pULk?8934^o(1Sk YkPKTs^;=8(C_G!ZP17;p7%&<50c@fXasU7T literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_buttons.svg b/dlls/light.msstyles/blue_toolbar_buttons.svg new file mode 100644 index 00000000000..7eb3130ec1c --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_buttons.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:9-32" width="9" height="132" version="1.1" viewBox="0 0 2.3812 34.925" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-linejoin="bevel" stroke-width=".26458"> + <rect x=".13229" y="5.9531" width="2.1167" height="5.5563" rx=".52917" ry=".52917" fill="#fffffe" stroke="#3096fa"/> + <g fill="#fff"> + <rect x=".13229" y="11.774" width="2.1167" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="29.236" width="2.1167" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="23.416" width="2.1167" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split.bmp b/dlls/light.msstyles/blue_toolbar_buttons_split.bmp new file mode 100644 index 0000000000000000000000000000000000000000..61a440b6640887429ff42ca41846bad4ced6a1f5 GIT binary patch literal 3306 zcmZ?reZ|8723<h128h{!xCMwA859_pfph{?9>_!j{}~t{2qgC3$vvnTNs=fg3!19` z)td7E8_kdZuhRJg#!cqO{+DaZ{ckcq@qgcpKmY&y`VYo?r~QGe1Bt=F@1OtwSL^)# zU#STbLC_$vQE^BZ&^jDI@rNESAh9O1Q~wXl{0omqP@IC|wn9Sz7@sGR;{60DEqtG1 zDF17Y-SJ=3jsJl0T)Si6XBx}>nrnOF@0r<u{{IEWJrMsrJ@XGt9asz&>wkX!2kQI% zYnlN}1Wtp*M#cYw!+_@D0E|B@@$v^4k0<}0o%0tFkF&t>2#$B493tLrPk`bbt+*KF zj_?o|tuKJZ*>I@WM(Ydul*2=%9>iH+*q!=&ZZ4v}0JZ@@ZGrF84HQ6i2}*qdY&(qb L;&IgbXdwUq!W$Kv literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split.svg b/dlls/light.msstyles/blue_toolbar_buttons_split.svg new file mode 100644 index 00000000000..d5fec105607 --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_buttons_split.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="132" version="1.1" viewBox="0 0 1.5875 34.925" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="#fff" stroke-linejoin="bevel" stroke-width=".26458"> + <rect x=".13229" y="5.9531" width="1.3229" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="11.774" width="1.3229" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="29.236" width="1.3229" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="23.416" width="1.3229" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.bmp b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fb5be321f129856612422afe671867e36c0aaad0 GIT binary patch literal 2778 zcmeHIyH3ME5HtcBJ|b~RL?Q(_A{8#uP$40Hg#w7v5K*N@aSZXNfT;4~@d5lt9(TUe zu(wX4$WVj|S-REj?ai(WYeqNMIR83uI6AbqDEBGvDR&&#*`<21oYQe5;5g|rJv7cP zuQrBT9rrR{At)7bS05s%EYPkGaD7yuI>Jj&K}><?uHt#Kte_+~5&;C|1h=IWuXclN zZ+i~1oEqFdncy|j5Hqj_MvI$6moyloRS~QWX*Pd2F3P??l)c(Q#{OU)c?B7tj`aJJ zf}BFXMT+O4r=XX*DFGRJiR@Naig7jA_Wr=ZPfitaKh__84LKw3ADMgBi25?B38RhC zD0BTR%n1Y5C;!pgtxx9DpMUj9f1*F*)F<h!VqXlauJO;cPtx0#6I-yqnPK1?>BPYd literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg new file mode 100644 index 00000000000..aa5d05aef6e --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:5-32" width="5" height="132" version="1.1" viewBox="0 0 1.3229 34.925" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="#fff" stroke-linejoin="bevel" stroke-width=".26458"> + <rect x=".13229" y="5.9531" width="1.0583" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="11.774" width="1.0583" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="29.236" width="1.0583" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="23.416" width="1.0583" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.bmp b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.bmp new file mode 100644 index 0000000000000000000000000000000000000000..2ada751dd6b4de8e519bf382b4a2c33446231e91 GIT binary patch literal 2298 zcmeH|y-UMT6vbl|B7#d+7l)#z1(RkFT|30dMJPIF7X(52;qYchF^Pj+0tS50Higi^ zZ03Iwk`C9CYC>zO?c!kY(O>U-_nsHR<@U6G60ZxBb&KyCumKLhim)xLB3^#hv7K5Z z2p^v$NA=^=tEu8r+qI=sKZ}S7C2GnXc+{A@ZtenIltpUEF10I+niT_DpRRW|r-j6- z5;Os7XK9|AdpdHj)Y;j}axK}Rj(nJ&(@1Su!`*IrE?P|b9GS}V*j7E_jbtoxi|)!| zY^hI?sj}EsjL1@b>VE0-V^xYx^(C@v=jj8+rlR9s_+~3vpJPjL#t*flRFlT|eqW2t zT4DRl7%TPreGWX%`P@E_Mk5h*x7X`2L<9K4;c#Z2aaS4)1_3nLJmaiG8={u=894`< z+&m+vL0i~9C-aQo>+ktSTMqwy1Ah#OZ&)f{=o_}`F7ypc4d6l9Jb&jKv8Cnax#+$D ue=GqGJTTWckQadq7%+ejW_$x@2?QYPGxj<NLFOCSJ0RC*<TUUneB&LK{N%#` literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.svg new file mode 100644 index 00000000000..dd0200a5c2e --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="54" version="1.1" viewBox="0 0 2.6458 14.288" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m2.3813 1.1987-1.0503 0.91793-0.15004-0.13113 1.0503-0.91794z"/> + <path d="m0.41463 1.0583 1.0503 0.91794-0.15004 0.13113-1.0503-0.91794z"/> + <g> + <path d="m2.3813 3.58-1.0503 0.91794-0.15004-0.13113 1.0503-0.91793z" fill="#3096fa"/> + <path d="m0.41463 3.4396 1.0503 0.91794-0.15004 0.13113-1.0503-0.91793z" fill="#3096fa"/> + <path d="m2.3813 5.9612-1.0503 0.91793-0.15004-0.13113 1.0503-0.91793z" fill="#2979ff"/> + <path d="m0.41463 5.8208 1.0503 0.91793-0.15004 0.13113-1.0503-0.91793z" fill="#2979ff"/> + <path d="m2.3812 8.3425-1.0503 0.91794-0.15004-0.13113 1.0503-0.91794z" fill="#aeaeae"/> + <path d="m0.41463 8.2021 1.0503 0.91794-0.15004 0.13113-1.0503-0.91793z" fill="#aeaeae"/> + <path d="m2.3813 10.724-1.0503 0.91794-0.15004-0.13113 1.0503-0.91794z" fill="#3096fa"/> + <path d="m0.41463 10.583 1.0503 0.91794-0.15004 0.13113-1.0503-0.91793z" fill="#3096fa"/> + <path d="m2.3813 13.105-1.0503 0.91794-0.15004-0.13113 1.0503-0.91794z" fill="#2979ff"/> + <path d="m0.41463 12.965 1.0503 0.91794-0.15004 0.13113-1.0503-0.91794z" fill="#2979ff"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_separator_horizontal.bmp b/dlls/light.msstyles/blue_toolbar_separator_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7d05303b554e947a099d3bbe1380c1175a1e3282 GIT binary patch literal 298 zcmZ?r)na4-gDxOh1H>Fa%nHPe3<?a)KzacXV}kz-3=jm8`tRf(RE((xzX%I{X}q%Q R)~y5DjvEk?$E_2$3;+bg4e|g0 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_separator_horizontal.svg b/dlls/light.msstyles/blue_toolbar_separator_horizontal.svg new file mode 100644 index 00000000000..43ad7bea4d6 --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_separator_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:8-32" width="8" height="5" version="1.1" viewBox="0 0 2.1167 1.3229" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect transform="rotate(90)" x=".52917" y="-1.0583" width=".52917" height=".26458" fill="#aeaeae" stroke-width="0"/> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_separator_vertical.bmp b/dlls/light.msstyles/blue_toolbar_separator_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..45abed769996520d59ead98337759e02ebf8bbe9 GIT binary patch literal 298 zcmZ?r)na4-gDxOh1H`OA%mKuV3<?a)KzacXV}kz-3=jm8`tRf(RE((xzX%I{X{yPt MTet2%2vcex08Wh!@&Et; literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_separator_vertical.svg b/dlls/light.msstyles/blue_toolbar_separator_vertical.svg new file mode 100644 index 00000000000..60b3e07b92f --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_separator_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:5-32" width="5" height="8" version="1.1" viewBox="0 0 1.3229 2.1167" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x=".52917" y=".79375" width=".52917" height=".26458" fill="#aeaeae" stroke-width="0"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 0f9fe2847fe..c24df6ca17f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -472,6 +472,73 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_spin_glyph_left.bmp\r\n" "GlyphTransparent = True\r\n" + +"\r\n; Toolbar\r\n" +"[Toolbar]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillColor = 244 244 244\r\n" +"TextColor = 0 0 0\r\n" + +"[Toolbar(Pressed)]\r\n" +"TextColor = 0 0 0\r\n" + +"[Toolbar.Button]\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageFile = blue_toolbar_buttons.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" + +"[Toolbar.Separator]\r\n" +"SizingMargins = 5, 2, 2, 1\r\n" +"ImageFile = blue_toolbar_separator_horizontal.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Toolbar.SeparatorVert]\r\n" +"SizingMargins = 2, 1, 5, 1\r\n" +"ImageFile = blue_toolbar_separator_vertical.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Toolbar.DropdownButton]\r\n" +"SizingMargins = 4, 4, 4, 4\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageFile = blue_toolbar_buttons.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" + +"[Toolbar.SplitButton]\r\n" +"SizingMargins = 3, 2, 3, 3\r\n" +"ImageFile = blue_toolbar_buttons_split.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" + +"[Toolbar.SplitButtonDropdown]\r\n" +"SizingMargins = 1, 3, 3, 3\r\n" +"ImageFile = blue_toolbar_buttons_split_dropdown.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_toolbar_buttons_split_dropdown_glyph.bmp\r\n" +"GlyphTransparent = True\r\n" } /* Button */ @@ -568,6 +635,25 @@ BLUE_SPIN_GLYPH_RIGHT_BMP BITMAP "blue_spin_glyph_right.bmp" /* @makedep: blue_spin_glyph_up.bmp */ BLUE_SPIN_GLYPH_UP_BMP BITMAP "blue_spin_glyph_up.bmp" +/* ToolBar */ +/* @makedep: blue_toolbar_buttons.bmp */ +BLUE_TOOLBAR_BUTTONS_BMP BITMAP "blue_toolbar_buttons.bmp" + +/* @makedep: blue_toolbar_buttons_split.bmp */ +BLUE_TOOLBAR_BUTTONS_SPLIT_BMP BITMAP "blue_toolbar_buttons_split.bmp" + +/* @makedep: blue_toolbar_separator_horizontal.bmp */ +BLUE_TOOLBAR_SEPARATOR_HORIZONTAL_BMP BITMAP "blue_toolbar_separator_horizontal.bmp" + +/* @makedep: blue_toolbar_separator_vertical.bmp */ +BLUE_TOOLBAR_SEPARATOR_VERTICAL_BMP BITMAP "blue_toolbar_separator_vertical.bmp" + +/* @makedep: blue_toolbar_buttons_split_dropdown.bmp */ +BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropdown.bmp" + +/* @makedep: blue_toolbar_buttons_split_dropdown_glyph.bmp */ +BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH 2/6] light.msstyles: Add Spin parts.
by Zhiyi Zhang 25 Jun '21

25 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 11 ++- dlls/light.msstyles/blue_spin_background.bmp | Bin 0 -> 446 bytes dlls/light.msstyles/blue_spin_background.svg | 16 ++++ .../blue_spin_background_down.bmp | Bin 0 -> 1674 bytes .../blue_spin_background_down.svg | 19 ++++ .../blue_spin_background_left.bmp | Bin 0 -> 1674 bytes .../blue_spin_background_left.svg | 19 ++++ .../blue_spin_background_right.bmp | Bin 0 -> 1674 bytes .../blue_spin_background_right.svg | 19 ++++ .../blue_spin_background_up.bmp | Bin 0 -> 1674 bytes .../blue_spin_background_up.svg | 19 ++++ dlls/light.msstyles/blue_spin_glyph_down.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_down.svg | 24 +++++ dlls/light.msstyles/blue_spin_glyph_left.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_left.svg | 24 +++++ dlls/light.msstyles/blue_spin_glyph_right.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_right.svg | 24 +++++ dlls/light.msstyles/blue_spin_glyph_up.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_up.svg | 24 +++++ dlls/light.msstyles/light.rc | 84 ++++++++++++++++++ 20 files changed, 282 insertions(+), 1 deletion(-) create mode 100644 dlls/light.msstyles/blue_spin_background.bmp create mode 100644 dlls/light.msstyles/blue_spin_background.svg create mode 100644 dlls/light.msstyles/blue_spin_background_down.bmp create mode 100644 dlls/light.msstyles/blue_spin_background_down.svg create mode 100644 dlls/light.msstyles/blue_spin_background_left.bmp create mode 100644 dlls/light.msstyles/blue_spin_background_left.svg create mode 100644 dlls/light.msstyles/blue_spin_background_right.bmp create mode 100644 dlls/light.msstyles/blue_spin_background_right.svg create mode 100644 dlls/light.msstyles/blue_spin_background_up.bmp create mode 100644 dlls/light.msstyles/blue_spin_background_up.svg create mode 100644 dlls/light.msstyles/blue_spin_glyph_down.bmp create mode 100644 dlls/light.msstyles/blue_spin_glyph_down.svg create mode 100644 dlls/light.msstyles/blue_spin_glyph_left.bmp create mode 100644 dlls/light.msstyles/blue_spin_glyph_left.svg create mode 100644 dlls/light.msstyles/blue_spin_glyph_right.bmp create mode 100644 dlls/light.msstyles/blue_spin_glyph_right.svg create mode 100644 dlls/light.msstyles/blue_spin_glyph_up.bmp create mode 100644 dlls/light.msstyles/blue_spin_glyph_up.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index bcfb38b319c..ad21f8683bf 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -23,4 +23,13 @@ SVG_SRCS = \ blue_scrollbar_shaft_horizontal.svg \ blue_scrollbar_shaft_vertical.svg \ blue_scrollbar_thumb_horizontal.svg \ - blue_scrollbar_thumb_vertical.svg + blue_scrollbar_thumb_vertical.svg \ + blue_spin_background_down.svg \ + blue_spin_background_left.svg \ + blue_spin_background_right.svg \ + blue_spin_background.svg \ + blue_spin_background_up.svg \ + blue_spin_glyph_down.svg \ + blue_spin_glyph_left.svg \ + blue_spin_glyph_right.svg \ + blue_spin_glyph_up.svg diff --git a/dlls/light.msstyles/blue_spin_background.bmp b/dlls/light.msstyles/blue_spin_background.bmp new file mode 100644 index 0000000000000000000000000000000000000000..083b3062dda511d970de85f6fc4d7c56071737e2 GIT binary patch literal 446 zcmZ?r-N(oP23<h128j89m>q~286<!t1A_@v9?XFg{}~t{2qf~~$vvnTE=44R1x?*L jY~TSlz`y`h`X3blMSx0C#r^|DhNN1|kiZrUK)(S1!w?N` literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background.svg b/dlls/light.msstyles/blue_spin_background.svg new file mode 100644 index 00000000000..a817341f6ed --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:14-24" width="14" height="7" version="1.1" viewBox="0 0 3.7042 1.8521" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="#fff" stroke-width=".26458"> + <rect x=".13229" y=".13229" width="1.5875" height="1.5875" stroke="#aeaeae"/> + <rect x="1.9844" y=".13229" width="1.5875" height="1.5875" stroke="#e0e0e0"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_background_down.bmp b/dlls/light.msstyles/blue_spin_background_down.bmp new file mode 100644 index 0000000000000000000000000000000000000000..762755aacaa123204fbab2e403c288db395882c1 GIT binary patch literal 1674 zcmeHHJ5Iwu6f_cwI09E7xS)X=rJ<ssAaDUbH5G;vq{jqEu3$yx2zCj*-ILG}DaZvj z_G5P6voRZ4qM)(F=<V*jd9%e%vAz94$I=*Jzs6d_+QnM2*0BRJ=ce4rvbdB$y}g5r za`M}A)i6>sk|YVkaH0W%mc2m`L{XG$fMCQrjL?{apk?lP9uuQ&yWaF(<P*p7ay|$U zBOT|Yo@YIrAACL~_lO)@)$K9OXEMDxq^nK3+)xDq4+Az9Wn_z97n$>*?Yi+^v<&3q zbR`O>me1P@spxD~ZvQ(^xn>^4VwU-5>2MpBJ)Rfuuk6VDll*x^d5X%P?%`n_HYGAX zKhnD$(cLW(^^ulsMGRYObmP5fHFQ4XGM|SkpJFk^Nb>Ygt33JE^8Ww-a3)Rv<e&UM EUon&;oB#j- literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background_down.svg b/dlls/light.msstyles/blue_spin_background_down.svg new file mode 100644 index 00000000000..6742bd1c57f --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background_down.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:8-24" width="8" height="64" version="1.1" viewBox="0 0 2.1167 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect y="-3e-4" width="2.1167" height="16.934" fill="#fff" stroke-width=".26459"/> + <g stroke-width=".265"> + <rect x=".39708" y=".1325" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39708" y="4.3658" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".39708" y="8.5992" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39708" y="12.832" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_background_left.bmp b/dlls/light.msstyles/blue_spin_background_left.bmp new file mode 100644 index 0000000000000000000000000000000000000000..673c554e9fcd84b8f8d6b51174d290cce69ac626 GIT binary patch literal 1674 zcmeH{J5Iwu5QdF};0jy;aFHg|C=C@25+q!JM@@y{1nIMc*A=YD9KkN3w|f#gA_cj? zjy?RlGmch{BGJ%TjAq9(-;8X{Z)rP+{SC)hAMqAv6K5Z1&DlbPNuP@<lH;&zK%Il5 ztE%(c=X!0Bh|)BTqG)6c2}=EPqA(2OI4+DKL5n#C!7u<rf|9xK`wTgvYzAMoFZ4;0 zWLX~wh?bFaWb0{*!#V3i(=n+Yd9L=mQ<_eM4^HT2m#(+9BT+r!7-J|cSGWyL-Vk2f z*Q@p&9Fw<W>C=^cKi^49=W177$SZv52QV*ZlRUV{hHZHMa#?<TFwcXt;_Zow3|_oG zV1_xyG-R89XZL%;Rm=WDrdkc*wS9+eOP}XTpT~th<!lV;M9<)Sp{Fel=lq`k`-gQ{ Kb$|Zp{qqCe-DFAt literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background_left.svg b/dlls/light.msstyles/blue_spin_background_left.svg new file mode 100644 index 00000000000..84d342d124d --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background_left.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-24" width="7" height="64" version="1.1" viewBox="0 0 1.8521 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x="1.7764e-15" y="-.00024286" width="1.8521" height="16.933" fill="#fff" stroke-width=".26459"/> + <g stroke-width=".265"> + <rect x=".39708" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39708" y="4.6305" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".39708" y="8.8636" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39708" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_background_right.bmp b/dlls/light.msstyles/blue_spin_background_right.bmp new file mode 100644 index 0000000000000000000000000000000000000000..56a6281810884e67d023d98c6269e5e68ea71e61 GIT binary patch literal 1674 zcmeH{Jx;?w5QP^B!4<dy;DQEfl!l512?7`3r=}vw3DRT!uV6*y2zCj*-ILG}DaZvj z_V9LRysR8WqM-<4G`l<V=E>H6#kO|)OUgtadk<?FYa44ptzbvUoSS+lr8u=ft)0E| zdh*kAv0==zERN%W2^46F@Cy}1QIaI32^1Ky4kI+w2oz{hz#jyG(PZQH59qV*3qEO@ zPV)gkj110!%hQEpYw)4*ko-gHcsj3+XgtDH>z4=AU8jpxohaa89X1wa<caQzT(f`P z^~QbC3ZH%ItT}wzqQAWubRKm*^4l6O`*BPKI9HQV5uWDPo5<qvta^Wi3wjYAm(TZ9 z=E(Bt79Q4N(;~;`M}D&<y1yZ!IdaqDJ6zb&{OOJRqW$LcQ1iL7e5%P1=!9o@VtHBu SZUH|3?+^2w^?v^L`||}t8)QlV literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background_right.svg b/dlls/light.msstyles/blue_spin_background_right.svg new file mode 100644 index 00000000000..c8ac6d2146b --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background_right.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-24" width="7" height="64" version="1.1" viewBox="0 0 1.8521 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect y="-.00024286" width="1.8521" height="16.933" fill="#fff" stroke-width=".26459"/> + <g stroke-width=".265"> + <rect x=".1325" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".1325" y="4.6305" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".1325" y="8.8636" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".1325" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_background_up.bmp b/dlls/light.msstyles/blue_spin_background_up.bmp new file mode 100644 index 0000000000000000000000000000000000000000..5c53878b300f632667e5a7d5a94891620ca37a87 GIT binary patch literal 1674 zcmeHHJ5Iwu6m%qnas;jbxS)X=rJ<ssfN%jIH5G;vq{sZPU`6H#cA4~cpM;J`K`yYd zAG7<OjoBy?4TYtQ-tNwud0Xrh+d1s7TN-`rH&|_~eXN$XfgKQ^n{p@1;!*;24vsEM z=db6QF-Sy7l7wM6&;UUT5eR}HilSTt1QzQUgvJ~MEpyNFm>6x-^=0oxK5-l`=7RuX z={N`VJnP~7;<E|4U2<$ycc(O)ihFxZ*V}ZpsR{%$42-cTmMwZ+WX?v@b>qEg8OX=k zk|>;7KJQ~v(b=lplb<~0nt2rSY35&~_q(X<wO4$+@kHjI<)dfHQ&c{D#0={gQzGN* zGkw?--Q5vUA8FZE#29OgZoC(*hR)}u%;%}fr<hM*NuK_Bl_%d?+*kh(XR_>{{MY~I E8&hc`oB#j- literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background_up.svg b/dlls/light.msstyles/blue_spin_background_up.svg new file mode 100644 index 00000000000..1ec9953a6c1 --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background_up.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:8-24" width="8" height="64" version="1.1" viewBox="0 0 2.1167 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect y="-3e-4" width="2.1167" height="16.934" fill="#fff" stroke-width=".26459"/> + <g stroke-width=".265"> + <rect x=".39708" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39708" y="4.6304" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".39708" y="8.8637" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39708" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_glyph_down.bmp b/dlls/light.msstyles/blue_spin_glyph_down.bmp new file mode 100644 index 0000000000000000000000000000000000000000..d729401a67ff5df11be9af50b00bf4635237a77f GIT binary patch literal 810 zcmbu7!D_-l6h)`D&|e4yl2W=7v}r}Mchi-d{z|ugfol`7n{*wLK(^WBFY+l>vKh}r z9%NJ$bjX=E@7~Gd5;B_)A62)O><f4X2OiXmGS=UK?PO`C4v%s4?CbmI<jNJ{>56~O z&hy+ailQmY@~!WuY3iZZS(b&=N_^3I@73I=cf?0a%)FyHF8*&{yXCC4_MrhQC%p$X zgit}}Q$_D`(mUc)6R>j9yKr~T?drpCqoCPEpH|N8X5zJRP`9gbh+l~>`Ys+Faz;}} x{B|8AW?uh${jc9$^t*F1)68wa%1Q4*4Ixw@zUW;}bn{D#pK!Kv(z|dm=N^N6n~wkh literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_glyph_down.svg b/dlls/light.msstyles/blue_spin_glyph_down.svg new file mode 100644 index 00000000000..6f0fef139fc --- /dev/null +++ b/dlls/light.msstyles/blue_spin_glyph_down.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="24" version="1.1" viewBox="0 0 1.8521 6.35" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m1.8521 0.40498-0.91902 0.91793-0.13129-0.13113 0.91902-0.91794z"/> + <path d="m0.13129 0.26458 0.91902 0.91793-0.13129 0.13113-0.91902-0.91794z"/> + <g> + <path d="m1.8521 1.9925-0.91902 0.91794-0.13129-0.13113 0.91902-0.91793z" fill="#3096fa"/> + <path d="m0.13129 1.8521 0.91902 0.91794-0.13129 0.13113-0.91902-0.91793z" fill="#3096fa"/> + <path d="m1.8521 3.58-0.91902 0.91793-0.13129-0.13113 0.91902-0.91793z" fill="#fff"/> + <path d="m0.13129 3.4396 0.91902 0.91793-0.13129 0.13113-0.91902-0.91793z" fill="#fff"/> + <path d="m1.8521 5.1675-0.91902 0.91794-0.13129-0.13113 0.91902-0.91794z" fill="#aeaeae"/> + <path d="m0.13129 5.0271 0.91902 0.91794-0.13129 0.13113-0.91902-0.91793z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_glyph_left.bmp b/dlls/light.msstyles/blue_spin_glyph_left.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a895c886808d8a97f543e7da2193fc157688c44a GIT binary patch literal 810 zcmaiwyH12a7)J3DUqZQPsEqESHrCr%+4w59KEbvM#Mn@ia4l)(F?f?@-3HIBvjq4P zo$SXj=bN25VfB1{V(rJ8=NmaA7v#wDEL|nXJjCcN>-VRde)aV7Dz^LsPXFkus`B$Z z{~B+}vdo1wX_}rNxM8X&3h%)53~%eYejGFXUY4cJ8H)aD-f^y@JN|b$@60{PocDe2 zlZhv5mo#MXG)ysj<1<*dM0mn%qKNQ>Ii?eyaF+<rZFukRqG00LecZXbFlaXMa`4=< zC{SG-Ogz8iWxI<O!gCYe*qp1j(XH_8J|7(2b?*z|Y3>o8d>fxkJXyP>A%mx3irFLM Y(XtSpFq`Q8!V~70PI$ug-3hUN0A)s-yZ`_I literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_glyph_left.svg b/dlls/light.msstyles/blue_spin_glyph_left.svg new file mode 100644 index 00000000000..334ee0b87cf --- /dev/null +++ b/dlls/light.msstyles/blue_spin_glyph_left.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="28" version="1.1" viewBox="0 0 1.5875 7.4083" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m1.3229 0.13141-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z"/> + <path d="m0.39572 0.80081 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z"/> + <g> + <path d="m1.3229 1.9835-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#3096fa"/> + <path d="m0.39572 2.6529 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#3096fa"/> + <path d="m1.3229 3.8356-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#fff"/> + <path d="m0.39572 4.505 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#fff"/> + <path d="m1.3229 5.6877-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#aeaeae"/> + <path d="m0.39572 6.3571 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_glyph_right.bmp b/dlls/light.msstyles/blue_spin_glyph_right.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1e5804c5bc54b956471f35a9351258b2613d56c5 GIT binary patch literal 810 zcmb7;K~94}7)Hm|cm-HAsEM1J##)RVfQ>6RUd62^=u(S`nS^vr0t5~K$LLLpbu+%v zP=&vdIN=R5-#0UP;r-=UeT^ma6P&;Vj?|g5)q2DvhEeMKvyBPw9v;P!f#CQ+pJiE` zrs-+FN|MB*tIM)H|4*0adBDBR?>j|NIAj$}+no2^er7u|&H0P=T>Cf1#2`G$Jg7l< z4s-#1$CJGS73@7(yZy{Mk!cW~AFtPOvswtx=IzF#tDBcA;rUm$eVzxqXwmi5Gl#dT wUF83GMz?N1vz}!7J@SPoRSd$D%!3+)=Rg<GcRblUP{H1lwR<2VQW`p*pDJXV`v3p{ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_glyph_right.svg b/dlls/light.msstyles/blue_spin_glyph_right.svg new file mode 100644 index 00000000000..56b68ce195a --- /dev/null +++ b/dlls/light.msstyles/blue_spin_glyph_right.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="28" version="1.1" viewBox="0 0 1.5875 7.4083" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m1.1938 1.049-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z"/> + <path d="m1.3159 0.93194-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z"/> + <g> + <path d="m1.1938 2.9011-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#3096fa"/> + <path d="m1.3159 2.784-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#3096fa"/> + <path d="m1.1938 4.7532-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#fff"/> + <path d="m1.3159 4.6361-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#fff"/> + <path d="m1.1938 6.6053-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#aeaeae"/> + <path d="m1.3159 6.4882-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_glyph_up.bmp b/dlls/light.msstyles/blue_spin_glyph_up.bmp new file mode 100644 index 0000000000000000000000000000000000000000..62c560a676d0074669f15ea439a8cc3b35390768 GIT binary patch literal 810 zcmbu5Jx;?w5QPmv;tEJe_JTVk5=SZAr=g<ZDzuz{mLyi(nA-A><kF3g;hW&#X8C5p z$V&=KVdZaU=e^z0lh==TGsmn~_7}K>D>!qMBi8#l+tJdF^ZkjV*AGw6M^`3<iwS>h z7ex`LX?i`@@;vt-Da%sf*Mm=W=^MOTxj*<>mW85MRdq9-gYR><m3d?Rl(W`41}i7M z2MH*s!T3}c8ZbGjgCG9rR!%e@TKIR)J__QGXkq2-HcJmZ>7qdO+n^r&ZohK-UC<nM z_a^7BznO=kcW-km=V8C{Kcht}^G^APf8NCOR!(}En}C8E2H)k}fXPW!Abtp<TRG`{ JXhG&pt}n}On{faD literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_glyph_up.svg b/dlls/light.msstyles/blue_spin_glyph_up.svg new file mode 100644 index 00000000000..6641d33cb20 --- /dev/null +++ b/dlls/light.msstyles/blue_spin_glyph_up.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="24" version="1.1" viewBox="0 0 1.8521 6.35" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m0.93222 0.27387 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z"/> + <path d="m0 1.1825 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z"/> + <g> + <path d="m0.93222 1.8614 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#3096fa"/> + <path d="m0 2.77 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#3096fa"/> + <path d="m0.93222 3.4489 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#fff"/> + <path d="m0 4.3575 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#fff"/> + <path d="m0.93222 5.0364 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#aeaeae"/> + <path d="m0 5.945 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c197a35960a..0f9fe2847fe 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -416,6 +416,62 @@ BLUE_INI TEXTFILE "SizingType = TrueSize\r\n" "Transparent = True\r\n" "VAlign = Bottom\r\n" + +"\r\n; Spin\r\n" +"[Spin]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_spin_background.bmp\r\n" +"SizingMargins = 2, 2, 2, 2\r\n" +"ImageCount = 1\r\n" + +"[Spin.Up]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_spin_background_up.bmp\r\n" +"SizingMargins = 4, 3, 4, 2\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_spin_glyph_up.bmp\r\n" +"GlyphTransparent = True\r\n" + +"[Spin.Down]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_spin_background_down.bmp\r\n" +"SizingMargins = 4, 3, 3, 3\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_spin_glyph_down.bmp\r\n" +"GlyphTransparent = True\r\n" + +"[Spin.Uphorz]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_spin_background_right.bmp\r\n" +"SizingMargins = 3, 3, 4, 2\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_spin_glyph_right.bmp\r\n" +"GlyphTransparent = True\r\n" + +"[Spin.Downhorz]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_spin_background_left.bmp\r\n" +"SizingMargins = 4, 2, 4, 2\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_spin_glyph_left.bmp\r\n" +"GlyphTransparent = True\r\n" } /* Button */ @@ -484,6 +540,34 @@ BLUE_SCROLLBAR_THUMB_HORIZONTAL_BMP BITMAP "blue_scrollbar_thumb_horizontal.bmp" /* @makedep: blue_scrollbar_thumb_vertical.bmp */ BLUE_SCROLLBAR_THUMB_VERTICAL_BMP BITMAP "blue_scrollbar_thumb_vertical.bmp" +/* Spin */ +/* @makedep: blue_spin_background.bmp */ +BLUE_SPIN_BACKGROUND_BMP BITMAP "blue_spin_background.bmp" + +/* @makedep: blue_spin_background_down.bmp */ +BLUE_SPIN_BACKGROUND_DOWN_BMP BITMAP "blue_spin_background_down.bmp" + +/* @makedep: blue_spin_background_right.bmp */ +BLUE_SPIN_BACKGROUND_RIGHT_BMP BITMAP "blue_spin_background_right.bmp" + +/* @makedep: blue_spin_background_left.bmp */ +BLUE_SPIN_BACKGROUND_LEFT_BMP BITMAP "blue_spin_background_left.bmp" + +/* @makedep: blue_spin_background_up.bmp */ +BLUE_SPIN_BACKGROUND_UP_BMP BITMAP "blue_spin_background_up.bmp" + +/* @makedep: blue_spin_glyph_down.bmp */ +BLUE_SPIN_GLYPH_DOWN_BMP BITMAP "blue_spin_glyph_down.bmp" + +/* @makedep: blue_spin_glyph_left.bmp */ +BLUE_SPIN_GLYPH_LEFT_BMP BITMAP "blue_spin_glyph_left.bmp" + +/* @makedep: blue_spin_glyph_right.bmp */ +BLUE_SPIN_GLYPH_RIGHT_BMP BITMAP "blue_spin_glyph_right.bmp" + +/* @makedep: blue_spin_glyph_up.bmp */ +BLUE_SPIN_GLYPH_UP_BMP BITMAP "blue_spin_glyph_up.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH 1/6] light.msstyles: Add Scroll Bar parts.
by Zhiyi Zhang 25 Jun '21

25 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 10 +- .../blue_scrollbar_arrow_glyphs_7px.bmp | Bin 0 -> 3274 bytes .../blue_scrollbar_arrow_glyphs_7px.svg | 54 ++++++++++ .../blue_scrollbar_arrow_glyphs_9px.bmp | Bin 0 -> 5322 bytes .../blue_scrollbar_arrow_glyphs_9px.svg | 54 ++++++++++ dlls/light.msstyles/blue_scrollbar_arrows.bmp | Bin 0 -> 14282 bytes dlls/light.msstyles/blue_scrollbar_arrows.svg | 37 +++++++ .../blue_scrollbar_resizebox_grip.bmp | Bin 0 -> 2314 bytes .../blue_scrollbar_resizebox_grip.svg | 26 +++++ .../blue_scrollbar_shaft_horizontal.bmp | Bin 0 -> 394 bytes .../blue_scrollbar_shaft_horizontal.svg | 13 +++ .../blue_scrollbar_shaft_vertical.bmp | Bin 0 -> 490 bytes .../blue_scrollbar_shaft_vertical.svg | 13 +++ .../blue_scrollbar_thumb_horizontal.bmp | Bin 0 -> 4762 bytes .../blue_scrollbar_thumb_horizontal.svg | 19 ++++ .../blue_scrollbar_thumb_vertical.bmp | Bin 0 -> 4714 bytes .../blue_scrollbar_thumb_vertical.svg | 19 ++++ dlls/light.msstyles/light.rc | 101 ++++++++++++++++++ 18 files changed, 345 insertions(+), 1 deletion(-) create mode 100644 dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_arrows.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_arrows.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_shaft_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_shaft_horizontal.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_shaft_vertical.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_shaft_vertical.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 201ed57d055..bcfb38b319c 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -15,4 +15,12 @@ SVG_SRCS = \ blue_groupbox.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ - blue_radiobutton_25px.svg + blue_radiobutton_25px.svg \ + blue_scrollbar_arrow_glyphs_7px.svg \ + blue_scrollbar_arrow_glyphs_9px.svg \ + blue_scrollbar_arrows.svg \ + blue_scrollbar_resizebox_grip.svg \ + blue_scrollbar_shaft_horizontal.svg \ + blue_scrollbar_shaft_vertical.svg \ + blue_scrollbar_thumb_horizontal.svg \ + blue_scrollbar_thumb_vertical.svg diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.bmp b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e8de9a21fd637883a13d7773f777d35ca74a727e GIT binary patch literal 3274 zcmcJRyKWjm7=<@Vq%^4kDO@%oO^CzARv=~MCRLg|Nu;!Sf|QPd7$l&!d@r$J`@8^e z0)}Suo%N2hmq8#ajC?#Z=gjQxVgLW1J^b?Lg%h-&{Qm)-gKyx8<2q02KZQEONb?=% z{!g5L`1$Mih`818*_u@s7Z-!`^YfBTK0Q4xqI)+tH?JO}UtV4|**{C}y}rKA!cW25 zsK)(rHePGs`|NuYU2n#|?+<|01AGy9!0KTOy~&!C2e>Slf|v*9IUBEMh3^BahgGLO zSR6O39u_ADMRafRt7`SINuM9pn#*=0?V-Py<+{^ldq3`>{UK-L<pI8b*WR~!Kpp_A z2lyiJfYrkmdXqIN4{%v91u+lIb8C2Lrw`V7a1>{XH!X}d<q7<lIDKj1J>uPs@*1;e zM*e(E@|s^=T@|>V$C}qReN+C0&oi>^Rh%i_k{VnIj6uvp$b0mzWzP)W>H)q0JYe+z zzbXGptQjTmsk!1z@s`vU-MR~ZJMY$F9+W@up7i9NWw$n4b*fem^Y&gr`|djLtsXYz zS9sr1@}A*bahCD`r#u;hn1_&8p12^{6#rHa@CBfKRuAx-@=wn*0$VrYFR%C}hGV%W zUU5x)x9BHlXJ_wp(XhUcO&v$eNM~JzK2_ht^@FV+=n)Hvy*yBS$2^3*N3Z%n0f7g4 z)pzAjP(SE1KzarAKsovt%(Z@}9_B~Y{EGOt*70_IygIJ7R-MLVd0e~qp!yDP>bT#n zW&-_pqoRB>yz$}Rp9eejz`gQ7@f~{)%yU3_(gG6@c%V1DspFYYuh1*s49_rVTEA-# z;jR94#C6YhUXUY0ofqg2=ZUHJXh9Aeo%~TArM|<^%gR5X+}&9V<2qKS;7VW!T<~z7 zFgEo*@DR~kj6D!L|CyJ8@^7aeR^58fdR}zv!{9t2AB=A5y*Upa^dOJY-(hzr2W6cv u>%QOq<BREWt=M~DuHS74To64^ip)J=&I6+>kHp8`19R0a<)5y%vHb-+w^!)^ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.svg new file mode 100644 index 00000000000..c5eed6d9d3b --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.svg @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="112" version="1.1" viewBox="0 0 1.8521 29.633" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m0.93222 0.27387 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z"/> + <path d="m0 1.1825 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z"/> + <g> + <path d="m0.93222 2.126 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#3096fa"/> + <path d="m0 3.0346 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#3096fa"/> + <path d="m0.93222 3.978 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#fff"/> + <path d="m0 4.8867 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#fff"/> + <path d="m0.93222 5.8301 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#aeaeae"/> + <path d="m0 6.7388 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#aeaeae"/> + </g> + <path d="m1.8591 8.0782-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z"/> + <path d="m0.14042 7.9375 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z"/> + <g> + <path d="m1.8591 9.9303-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#3096fa"/> + <path d="m0.14042 9.7896 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#3096fa"/> + <path d="m1.8591 11.782-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#fff"/> + <path d="m0.14042 11.642 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#fff"/> + <path d="m1.8591 13.634-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#aeaeae"/> + <path d="m0.14042 13.494 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#aeaeae"/> + </g> + <path d="m1.3229 14.948-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z"/> + <path d="m0.39572 15.617 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z"/> + <g> + <path d="m1.3229 16.8-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#3096fa"/> + <path d="m0.39572 17.47 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#3096fa"/> + <path d="m1.3229 18.652-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#fff"/> + <path d="m0.39572 19.322 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#fff"/> + <path d="m1.3229 20.504-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#aeaeae"/> + <path d="m0.39571 21.174 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#aeaeae"/> + </g> + <path d="m1.4583 23.274-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z"/> + <path d="m1.5805 23.157-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z"/> + <g> + <path d="m1.4583 25.126-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#3096fa"/> + <path d="m1.5805 25.009-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#3096fa"/> + <path d="m1.4583 26.978-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#fff"/> + <path d="m1.5805 26.861-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#fff"/> + <path d="m1.4583 28.83-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#aeaeae"/> + <path d="m1.5805 28.713-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.bmp b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..da6e0a47f02d02fbaef5158f534588dd411b787e GIT binary patch literal 5322 zcmds(zit{q7{o71n)H!C3YbfrCX$1(tw74iO{z3`m9%++RFPwh3=+B8^8b>8>-_?} z3D`8`H{|wociLT_CFIDgJigtXx!q;74B!6On^(cI{p9}-@Dlt2&w?;`&hvA^)6KL+ z5d8bo++zRBx9=IURQE+Gm0NUvem*=oIoWV4f<QdF`1<<#%_?*k7Z+{To4D4xy1J^s zkHLGJhVxW?yxxHyu+BT%`>UQ?EEYr1@U08K0b=0w@Bz9uTBnC_6)*-?51Fs}czqW5 z0eBP-=SQvK>~P2H;p}*C16@4(-Sm1`RyRG^Zr^ox+#U|LD(pAD>+ae;?0&5JczFmv zxb5yfiid1B1YQr}^<9sF*TV<s+Gw2~!d1W+SUqIEdJhjB48UV~7$`TCAKKW~&d$yn z@FQ~QwTF+%xzNUIjx{Fa=_ePj`OC}8I{U<E-}-cA^Eo+p<XdZ1oN`0?;aU%_0Y<>; zVZz5eL(du$c&~@>br1uuhwx?dxq&uvooSWx$_?d*Yfa_lyxSU0d)rnIm%Q?_*9u*0 z-1W96^P{HM!)bS`&N<@SqYqvW%jRx!uE=$!70)X-oF2j{FO`QOu(kVmy`%i|dI(<! z+Q;i5eA#@~xgzl2n{tkvnz-sMlTS(AH!A83Z|X~Os;1mSziB=k<4E~s#(GKzj<a)5 zwNIvmKzU~UonzkQlj=U@W=@ykm%r<bYaj-xhx8+m^N_K0YvG}CZcd)L>MfH`bLu|j zW>IH&Q(sOGnzd!_9q*+cGLDLMYNA^U5BdItKzWwCUyMyN`J}pU1d2MtoBFbbM!A=I zNIwF(d&pS2b@7moVsGSFzgRaa*T5h1Mv|v#eQEL$P42hD=uS^hJIYIwpJpBNRF3lQ zMEjVzr~D+Z`XE>HFm8a<L;A|ow7#To@-ydQM%SSq19NY47BRmGl+SD7;k?)C7wg7l zUDj)*9xn4VQ(u~VEY^Xk?y%WWUYh*O8OY$4996wp%+I3k361-lHFpmg>wcsj(hq@h c(&$V+=I&ue*P$N+>pf&%IjVftJ}Ym30bpQQ0ssI2 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.svg new file mode 100644 index 00000000000..7f5bde5dcc8 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.svg @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:9-32" width="9" height="144" version="1.1" viewBox="0 0 2.3812 38.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m1.1968 0.53845 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z"/> + <path d="m0.26458 1.4471 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z"/> + <g> + <path d="m1.1968 2.9197 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#3096fa"/> + <path d="m0.26458 3.8283 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#3096fa"/> + <path d="m1.1968 5.301 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#fff"/> + <path d="m0.26458 6.2096 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#fff"/> + <path d="m1.1968 7.6822 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#aeaeae"/> + <path d="m0.26458 8.5908 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#aeaeae"/> + </g> + <path d="m2.1144 10.459-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z"/> + <path d="m0.39571 10.319 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z"/> + <g> + <path d="m2.1144 12.841-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#3096fa"/> + <path d="m0.39571 12.7 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#3096fa"/> + <path d="m2.1144 15.222-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#fff"/> + <path d="m0.39571 15.081 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#fff"/> + <path d="m2.1144 17.603-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#aeaeae"/> + <path d="m0.39571 17.462 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#aeaeae"/> + </g> + <path d="m1.5875 19.446-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z"/> + <path d="m0.6603 20.115 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z"/> + <g> + <path d="m1.5875 21.827-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#3096fa"/> + <path d="m0.6603 22.497 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#3096fa"/> + <path d="m1.5875 24.208-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#fff"/> + <path d="m0.6603 24.878 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#fff"/> + <path d="m1.5875 26.59-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#aeaeae"/> + <path d="m0.6603 27.259 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#aeaeae"/> + </g> + <path d="m1.7229 29.889-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z"/> + <path d="m1.845 29.772-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z"/> + <g> + <path d="m1.7229 32.27-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#3096fa"/> + <path d="m1.845 32.153-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#3096fa"/> + <path d="m1.7229 34.651-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#fff"/> + <path d="m1.845 34.534-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#fff"/> + <path d="m1.7229 37.032-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#aeaeae"/> + <path d="m1.845 36.915-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_arrows.bmp b/dlls/light.msstyles/blue_scrollbar_arrows.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8e6ae4fe96acdcd67e7d576f6315d3680e39bcc4 GIT binary patch literal 14282 zcmeI2&2HL26oqf3JV3kaE2Pb$8`5o*O;_1e%HInl>AI_sK0)^(q>1tf5hafRt0>79 z*cY-Z6%|O>3^!*CB0r*<u@}||9m_WM_*~l>?uGMtys>%nNs{RY*59$b#qwrJWJ%s7 z?d#Ly$<A!0B9qy+=*H(S-)4tAH<n-N`u%>rUawRtSFQ;fD4`d8G@DIhjJhUhpoCr! z?GrFLA(YSy?#Ok47ssJz4EsQB9%RY4TCLV<wS3a_DX&ov2*cG}<#Pqiw0^YP*3zyP zSM_McF++2@r`?WdX-AJgIMlP#L0Q@ruPe-AuyMR9zE^k_#+aiO_JQpKpNxK%IM9op zY-#bmZ`Rqo-Vy!tTTix;t?n>rP&nPTjQ>5v)x+p)Eh>F<%x7!y^;hU6t{#}%a~%y| z{L9SU84b<tPlQQSE~ts-YUVVKhPWfa{meP`|0d`e!#>a?57OpaxghbceRF^5m8K># zcNeGw8TZ<8bsyR7C>~T-xqyIiuOn%_<zO&K=PetJ2EC;weurK;Kkpx;w}cC|Y{r_) zFArFA`So?kH3vSkJm=|0!E=8f5}qr1^Bk0?d+Gf(dCu}R*(_@x<jHeeUXM2bfFM81 zbG?q`IZr?O#B+BSzP=YcS3M-pk+UY8l^3Hg5YJgZ%CUm{JQDqAw!RM1TTaIc(()W@ zj?Y8vlVkiA1U(iSa?Npkj?A=>+?XfNr5&Fm&v8s|5m}Qwm+4&`vP{_iE#&VfWN%5H zV_t{OW?5=G<eDSTk>|*Bc=0mN_bthD<T>)(5F^yVzHiB~g7BY{XYpc-78A0!d<0o% B3bFtI literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_arrows.svg b/dlls/light.msstyles/blue_scrollbar_arrows.svg new file mode 100644 index 00000000000..352db059a9d --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_arrows.svg @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:17-24" width="17" height="272" version="1.1" viewBox="0 0 4.4979 71.967" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x="-1.875e-5" width="4.4979" height="71.967" fill="#fff"/> + <g stroke-width=".26458"> + <rect x=".13229" y=".13229" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="4.6302" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".13229" y="9.1281" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <g fill="#fff"> + <rect x=".13229" y="13.626" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="18.124" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="22.622" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> + <rect x=".13229" y="27.12" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <g fill="#fff"> + <rect x=".13229" y="31.618" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="36.116" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="40.614" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> + <rect x=".13229" y="45.111" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <g fill="#fff"> + <rect x=".13229" y="49.609" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="54.107" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="58.605" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> + <rect x=".13229" y="63.103" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".13229" y="67.601" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6bc433536ddf5adfba071bea14e246fb9e41b33a GIT binary patch literal 2314 zcmZ?r<>F)jgDxOh1H=kIEC|GmKo&EQZr}hC7~nqx0|bF&{yVt`6=NtNAizREelSVz z-MjZc2!q^&i;YhXSr0k>Le`IqO-uX9aWk#-kmG-9x@Dm4r>0*hH48Z`KxU!yDK(#v XesufL`GoY3%8!P?Xb6mk04M|ikd>kI literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg new file mode 100644 index 00000000000..5c31233d422 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:32-32" width="32" height="17" version="1.1" viewBox="0 0 8.4667 4.4979" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="#bdbdbd" stroke-width="0"> + <rect x="3.4396" y="3.7042" width=".52917" height=".52917"/> + <rect x="2.6458" y="3.7042" width=".52917" height=".52917"/> + <rect x="1.8521" y="3.7042" width=".52917" height=".52917"/> + <rect x="2.6458" y="2.9104" width=".52917" height=".52917"/> + <rect x="3.4396" y="2.9104" width=".52917" height=".52917"/> + <rect x="3.4396" y="2.1167" width=".52917" height=".52917"/> + <rect x="4.4979" y="2.1167" width=".52917" height=".52917"/> + <rect x="5.2917" y="3.7042" width=".52917" height=".52917"/> + <rect x="4.4979" y="3.7042" width=".52917" height=".52917"/> + <rect x="4.4979" y="2.9104" width=".52917" height=".52917"/> + <rect x="5.2917" y="2.9104" width=".52917" height=".52917"/> + <rect x="6.0854" y="3.7042" width=".52917" height=".52917"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.bmp b/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..36ba313b639d525267e9de26bbbd503fdf0a8a3c GIT binary patch literal 394 zcmZ?r?P6pAgDxOh1H?=~tN_G}3=%*R%z)4+<bMVR2m*=zcXAIZMv*3h!-A&fD;O{^ Hj8qx`Ui`mn literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.svg b/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.svg new file mode 100644 index 00000000000..9a2fd73b407 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:2-24" width="2" height="32" version="1.1" viewBox="0 0 .52917 8.4667" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect width=".52917" height="8.4667" fill="#f5f5f5" stroke="#0091ea" stroke-dasharray="0, 2.91041999999999978" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_shaft_vertical.bmp b/dlls/light.msstyles/blue_scrollbar_shaft_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..17cca423462277fc3594d93e4843c794bbcecf7a GIT binary patch literal 490 zcmZ?reZ|NC23<h128j89m;;Cz86<!t149B-9?XFg{}~t{2qf~~$vvnTE=44R1x?*o Sq5%T~(MrFLs)d9V0|Nk*?n(Xt literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_shaft_vertical.svg b/dlls/light.msstyles/blue_scrollbar_shaft_vertical.svg new file mode 100644 index 00000000000..b9408619f1b --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_shaft_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:14-24" width="14" height="8" version="1.1" viewBox="0 0 3.7042 2.1167" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect width="3.7042" height="2.1167" fill="#f5f5f5" stroke="#0091ea" stroke-dasharray="0, 2.91042999999999985" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1107be09217240ede1d7eb5d97879ba360c66fe6 GIT binary patch literal 4762 zcmeHKK~4fO6#XV1z_>78feo_30}vBeZajga0bRQy886@g5XcNiFypva6IhCC*bDBQ zL^BIIl<$MlNpVGsiwSAdmUd>|Yx~;wLrX`kZJMVW)DFrH$^ps-?V={y`guR^q!kk- zdG>@$hsRgxt0fzof4+;NsN3!OzJI5g009tiBK-FIeJLetCO`lLoCtIV1j%>+0#1Y# zXii|^bHFW!qKMT)5d+Ok>G2<a>2x}S!N9<Fif<7BK!e#p9jye&Z~WkJ$le({d9LO3 zG9c}94o3)vUYVboJQ0g~wnPt*$6JgK4$v78BxA&5zTN`|mas~y<t&G)pVdQEgK@kv zbUs$`3ykLEu@?7)pIauj0|5;0mBI1x#_p+M{6O3YheXrQQ5;-|Mp4uYdbv@IA1<d~ z??iD>l|7fGehiXAzO*nt5oTaQkQ|c9STy&+Q7<eW8oeIimP3)u>Y<2%X14TL#V=C8 zZt(4WMZUI8YzN==T-bgVKZbEoF^nHU72$`--o?^`hQE^bE|#j1vAYL0N12*-bM5wa Ho$g}aUx`De literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg new file mode 100644 index 00000000000..a94689a93ab --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:22-24" width="22" height="68" version="1.1" viewBox="0 0 5.8208 17.992" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="#fff" stroke-width=".26458"> + <rect x="-7.0588e-5" width="5.8209" height="17.992" fill="#fff" stroke-width=".070005"/> + <rect x=".13229" y=".13229" width="5.5563" height="4.2333" rx=".52917" ry=".52918" stroke="#aeaeae"/> + <rect x=".13229" y="4.6302" width="5.5563" height="4.2333" rx=".52917" ry=".52918" stroke="#3096fa"/> + <rect x=".13229" y="9.1281" width="5.5563" height="4.2333" rx=".52917" ry=".52918" stroke="#2979ff"/> + <rect x=".13229" y="13.626" width="5.5563" height="4.2333" rx=".52917" ry=".52918" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..49c5ceb41d9425b7b6a40aad7d4f205ad7d9bc1c GIT binary patch literal 4714 zcmeHKF;2rk5L_fa02N<I6KKo>(ooS*Q9?io&{9P*AK(GtM0TDK8PfxjT@q@$qrjoV z5|NA8xh&%t356itnJUGt?#{Ar_V%>e8EYH+7n?M<Ypf>b2Ie8=8f{@EdM!RI855PG z*x|<B!Q~P}@?rhgewwC15V)>8kQp#Q0#A5^VJL)PnE?YN@C0uahw?xmfhXKZ7GPl? zc<rNez`722o`e5z&iDN&id3lj!)<5++z?GBAp>B(HH4Fxof9_e+^I<hF#S_bM#N5& zAG<uw7Fhr13osA22tY*y6^HVae8N}TRNSYMb!ys2=YUZ+x(<pQROOsmC$^9Hsi#C$ z&>1S=G>Jdn*gjU(5Qs+-)9iDUduN$tWH&pKVHx@T`E2}7xz`p$n}vezh)g{95P%Rt z$)VJl=_Kp!67Ew;c7WGDItQ%lfXf_I<(y?ue%BH&eI=@b+d~^#01b(AucfLXUK^T2 Zy3f+RneI!<z65!w^q*VxysdJd^#!G8L{I<# literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg new file mode 100644 index 00000000000..bd0cd89ff2c --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:17-24" width="17" height="88" version="1.1" viewBox="0 0 4.4979 23.283" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect y="-.00012353" width="4.4979" height="23.283" fill="#fff" stroke-width=".26458"/> + <g fill="#fff" stroke-width=".26458"> + <rect transform="rotate(90)" x=".13229" y="-4.3656" width="5.5563" height="4.2333" rx=".52917" ry=".52916" stroke="#aeaeae"/> + <rect transform="rotate(90)" x="5.9531" y="-4.3656" width="5.5563" height="4.2333" rx=".52917" ry=".52916" stroke="#3096fa"/> + <rect transform="rotate(90)" x="11.774" y="-4.3656" width="5.5563" height="4.2333" rx=".52917" ry=".52916" stroke="#2979ff"/> + <rect transform="rotate(90)" x="17.595" y="-4.3656" width="5.5563" height="4.2333" rx=".52917" ry=".52916" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index cb51b8a5246..c197a35960a 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -340,6 +340,82 @@ BLUE_INI TEXTFILE "BorderSize = 1\r\n" "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" + +"\r\n; Scroll Bar\r\n" +"[ScrollBar.ArrowBtn]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"ContentMargins = 0, 0, 3, 3\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_scrollbar_arrows.bmp\r\n" +"ImageCount = 16\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphTransparent = True\r\n" +"ImageSelectType = Size\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_scrollbar_arrow_glyphs_7px.bmp\r\n" +"ImageFile2 = blue_scrollbar_arrow_glyphs_9px.bmp\r\n" +"MinSize1 = 7, 7\r\n" +"MinSize2 = 9, 9\r\n" + +"[ScrollBar.ThumbBtnHorz]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"ContentMargins = 4, 4, 0, 0\r\n" +"ImageFile = blue_scrollbar_thumb_horizontal.bmp\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.ThumbBtnVert]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"ContentMargins = 0, 0, 4, 4\r\n" +"ImageFile = blue_scrollbar_thumb_vertical.bmp\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.GripperHorz]\r\n" +"BgType = None\r\n" + +"[ScrollBar.GripperVert]\r\n" +"BgType = None\r\n" + +"[ScrollBar.LowerTrackHorz]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_scrollbar_shaft_horizontal.bmp\r\n" +"SizingMargins = 0, 0, 1, 1\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.LowerTrackVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_scrollbar_shaft_vertical.bmp\r\n" +"SizingMargins = 1, 1, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.UpperTrackHorz]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_scrollbar_shaft_horizontal.bmp\r\n" +"SizingMargins = 0, 0, 1, 1\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.UpperTrackVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_scrollbar_shaft_vertical.bmp\r\n" +"SizingMargins = 1, 1, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.SizeBox]\r\n" +"ImageFile = blue_scrollbar_resizebox_grip.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"Transparent = True\r\n" +"VAlign = Bottom\r\n" } /* Button */ @@ -383,6 +459,31 @@ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" /* @makedep: blue_combobutton_glyph.bmp */ BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" +/* Scroll Bar */ +/* @makedep: blue_scrollbar_arrows.bmp */ +BLUE_SCROLLBAR_ARROWS_BMP BITMAP "blue_scrollbar_arrows.bmp" + +/* @makedep: blue_scrollbar_arrow_glyphs_7px.bmp */ +BLUE_SCROLLBAR_ARROW_GLYPHS_7PX_BMP BITMAP "blue_scrollbar_arrow_glyphs_7px.bmp" + +/* @makedep: blue_scrollbar_arrow_glyphs_9px.bmp */ +BLUE_SCROLLBAR_ARROW_GLYPHS_9PX_BMP BITMAP "blue_scrollbar_arrow_glyphs_9px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_BMP BITMAP "blue_scrollbar_resizebox_grip.bmp" + +/* @makedep: blue_scrollbar_shaft_horizontal.bmp */ +BLUE_SCROLLBAR_SHAFT_HORIZONTAL_BMP BITMAP "blue_scrollbar_shaft_horizontal.bmp" + +/* @makedep: blue_scrollbar_shaft_vertical.bmp */ +BLUE_SCROLLBAR_SHAFT_VERTICAL_BMP BITMAP "blue_scrollbar_shaft_vertical.bmp" + +/* @makedep: blue_scrollbar_thumb_horizontal.bmp */ +BLUE_SCROLLBAR_THUMB_HORIZONTAL_BMP BITMAP "blue_scrollbar_thumb_horizontal.bmp" + +/* @makedep: blue_scrollbar_thumb_vertical.bmp */ +BLUE_SCROLLBAR_THUMB_VERTICAL_BMP BITMAP "blue_scrollbar_thumb_vertical.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[WineHQ] news: Fix some spelling issues.
by Francois Gouget 25 Jun '21

25 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- news/en/2004012201.xml | 2 +- news/en/2017052601.xml | 2 +- news/en/2018070901.xml | 2 +- news/ko/2017052601.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[WineHQ] Fix the WineConf case.
by Francois Gouget 25 Jun '21

25 Jun '21

1 0

[PATCH 1/2] ntdll: Implement RtlDefaultNpAcl
by Patrick Hibbs 24 Jun '21

24 Jun '21

Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> --- dlls/ntdll/sec.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 169 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index eccfc82ce8c..448b0b7def6 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1721,11 +1721,178 @@ NTSTATUS WINAPI RtlConvertToAutoInheritSecurityObject( /****************************************************************************** * RtlDefaultNpAcl (NTDLL.@) + * + * Constructs a default ACL with the following entries: + * Local System: Full Control + * Administrators: Full Control + * World: Read Only + * Anonymous: Read Only + * Owner: Full Control + * + * 'Owner' is determined by the current effective + * thread token's default owner. (Or process token if + * the thread token cannot be retrieved.) + * + * Returns STATUS_SUCCESS if successful. + * Generates EXCEPTION_ACCESS_VIOLATION if pAcl is NULL. */ NTSTATUS WINAPI RtlDefaultNpAcl(PACL *pAcl) { - FIXME("%p - stub\n", pAcl); + PACL new_acl = NULL; + PSID new_sid = NULL; + DWORD acl_length = 0; + ULONG owner_sid_length = 0; + PTOKEN_OWNER owner = NULL; + HANDLE token = NULL; + SID_IDENTIFIER_AUTHORITY local_auth = {SECURITY_NT_AUTHORITY}; + SID_IDENTIFIER_AUTHORITY world_auth = {SECURITY_WORLD_SID_AUTHORITY}; + NTSTATUS ret; + + TRACE("pAcl=%p\n", pAcl); *pAcl = NULL; - return STATUS_SUCCESS; + + new_sid = RtlAllocateHeap(GetProcessHeap(), 0, SECURITY_MAX_SID_SIZE); + if (new_sid) + { + ret = NtOpenThreadToken(GetCurrentThread(), + TOKEN_QUERY, + TRUE, + &token); + if (ret == STATUS_NO_TOKEN) + { + ret = NtOpenProcessToken(GetCurrentProcess(), + TOKEN_QUERY, + &token); + if (!NT_SUCCESS(ret)) + { + RtlFreeHeap(GetProcessHeap(), 0, new_sid); + return ret; + } + } + + /* Get the length of the owner's SID. */ + ret = NtQueryInformationToken(token, + TokenOwner, + NULL, + 0, + &owner_sid_length); + if (ret == STATUS_BUFFER_TOO_SMALL) + { + owner = RtlAllocateHeap(GetProcessHeap(), 0, owner_sid_length); + if (owner) + { + /* Actually get the owner's SID. */ + ret = NtQueryInformationToken(token, + TokenOwner, + owner, + owner_sid_length, + &owner_sid_length); + if (NT_SUCCESS(ret)) + { + acl_length = sizeof(ACL) + + (5 * sizeof(ACCESS_ALLOWED_ACE)) + + RtlLengthRequiredSid(1) + /* Local System */ + RtlLengthRequiredSid(2) + /* Administrators */ + RtlLengthRequiredSid(1) + /* World */ + RtlLengthRequiredSid(1) + /* Anonymous */ + RtlLengthSid(owner->Owner); /* Owner */ + + new_acl = RtlAllocateHeap(GetProcessHeap(), 0, acl_length); + if (new_acl) + { + ret = RtlCreateAcl(new_acl, acl_length, MIN_ACL_REVISION); + if (NT_SUCCESS(ret)) + { + ret = RtlInitializeSid(new_sid, + &local_auth, + 1); + if (NT_SUCCESS(ret)) + { + *RtlSubAuthoritySid(new_sid, 0) = SECURITY_LOCAL_SYSTEM_RID; + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_ALL, + new_sid); + if (NT_SUCCESS(ret)) + { + ret = RtlInitializeSid(new_sid, + &local_auth, + 2); + if (NT_SUCCESS(ret)) + { + *RtlSubAuthoritySid(new_sid, 0) = SECURITY_BUILTIN_DOMAIN_RID; + *RtlSubAuthoritySid(new_sid, 1) = DOMAIN_ALIAS_RID_ADMINS; + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_ALL, + new_sid); + if (NT_SUCCESS(ret)) + { + ret = RtlInitializeSid(new_sid, + &world_auth, + 1); + if (NT_SUCCESS(ret)) + { + *RtlSubAuthoritySid(new_sid, 0) = SECURITY_WORLD_RID; + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_READ, + new_sid); + if (NT_SUCCESS(ret)) + { + ret = RtlInitializeSid(new_sid, + &local_auth, + 1); + if (NT_SUCCESS(ret)) + { + *RtlSubAuthoritySid(new_sid, 0) = SECURITY_ANONYMOUS_LOGON_RID; + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_READ, + new_sid); + if (NT_SUCCESS(ret)) + { + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_ALL, + owner->Owner); + if (NT_SUCCESS(ret)) + { + *pAcl = new_acl; + } + } + } + } + } + } + } + } + } + } + } + else + ret = STATUS_NO_MEMORY; + } + } + else + ret = STATUS_NO_MEMORY; + } + } + else + ret = STATUS_NO_MEMORY; + + if (new_sid) + RtlFreeHeap(GetProcessHeap(), 0, new_sid); + + if (owner) + RtlFreeHeap(GetProcessHeap(), 0, owner); + + if ((!NT_SUCCESS(ret)) && (new_acl)) + RtlFreeHeap(GetProcessHeap(), 0, new_acl); + + if (token) + NtClose(token); + + return ret; } -- 2.32.0

1 1

[PATCH 2/5] uuid: Add a few NPI module ids.
by Huw Davies 24 Jun '21

24 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/uuid/uuid.c | 3 +++ include/netiodef.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index eacb83301d1..aa7ad3dd678 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -92,6 +92,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "comsvcs.h" #include "directmanipulation.h" +#define __WINE_INIT_NPI_MODULEID +#include "netiodef.h" + /* FIXME: cguids declares GUIDs but does not define their values */ /* GUIDs not declared in an exported header file */ diff --git a/include/netiodef.h b/include/netiodef.h index 4d8d469b138..3089685bef1 100644 --- a/include/netiodef.h +++ b/include/netiodef.h @@ -40,8 +40,10 @@ typedef const NPI_MODULEID *PNPI_MODULEID; #ifdef NONAMELESSUNION #define _U(x) (x).u +#define __U .u #else #define _U(x) (x) +#define __U #endif static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI_MODULEID *mod2 ) @@ -63,6 +65,35 @@ static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI return FALSE; } +#ifdef __WINE_INIT_NPI_MODULEID +#ifdef __cplusplus +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN; \ + EXTERN_C const NPI_MODULEID name = \ + { .Length = sizeof(NPI_MODULEID), .Type = MIT_GUID, __U.Guid = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } +#else +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + const NPI_MODULEID name DECLSPEC_HIDDEN; \ + const NPI_MODULEID name = \ + { .Length = sizeof(NPI_MODULEID), .Type = MIT_GUID, __U.Guid = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } +#endif +#else /* __WINE_INIT_MODULEID */ +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN +#endif /* __WINE_INIT_MODULEID */ + +#define DEFINE_NPI_MS_MODULEID(name, l) DEFINE_NPI_GUID_MODULEID(name, 0xeb004a00 + l, 0x9b1a, 0x11d4, 0x91, 0x23, 0x00, 0x50, 0x04, 0x77, 0x59, 0xbc) + +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV4_MODULEID, 0x00 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV6_MODULEID, 0x01 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_UDP_MODULEID, 0x02 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_TCP_MODULEID, 0x03 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_NDIS_MODULEID, 0x11 ); + +#undef DEFINE_NPI_MS_MODULEID +#undef DEFINE_NPI_GUID_MODULEID + #undef _U +#undef __U #endif /* __WINE_NETIODEF_H */ -- 2.23.0

2 1

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 24 Jun '21

24 Jun '21

1 0

[PATCH 1/5] wined3d: Store the map pitch in the wined3d_texture_sub_resource structure.
by Zebediah Figura 24 Jun '21

24 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/texture.c | 34 +++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 165d83eb035..ad34e44b406 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1711,6 +1711,20 @@ void CDECL wined3d_texture_get_pitch(const struct wined3d_texture *texture, width, height, row_pitch, slice_pitch); } +static void wined3d_texture_get_map_pitch(const struct wined3d_texture *texture, + unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch) +{ + if (texture->resource.format_flags & WINED3DFMT_FLAG_BROKEN_PITCH) + { + *row_pitch = wined3d_texture_get_level_width(texture, level) * texture->resource.format->byte_count; + *slice_pitch = wined3d_texture_get_level_height(texture, level) * (*row_pitch); + } + else + { + wined3d_texture_get_pitch(texture, level, row_pitch, slice_pitch); + } +} + DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) { struct wined3d_resource *resource; @@ -1992,6 +2006,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, unsig sub_resource->size = texture->slice_pitch; sub_resource->locations = WINED3D_LOCATION_DISCARDED; + wined3d_texture_get_map_pitch(texture, level, &sub_resource->map_row_pitch, &sub_resource->map_slice_pitch); + if (texture->texture_ops == &texture_gl_ops) { if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) @@ -3587,15 +3603,8 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour context_release(context); - if (fmt_flags & WINED3DFMT_FLAG_BROKEN_PITCH) - { - map_desc->row_pitch = wined3d_texture_get_level_width(texture, texture_level) * format->byte_count; - map_desc->slice_pitch = wined3d_texture_get_level_height(texture, texture_level) * map_desc->row_pitch; - } - else - { - wined3d_texture_get_pitch(texture, texture_level, &map_desc->row_pitch, &map_desc->slice_pitch); - } + map_desc->row_pitch = sub_resource->map_row_pitch; + map_desc->slice_pitch = sub_resource->map_slice_pitch; if (!box) { @@ -3950,6 +3959,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc for (i = 0; i < sub_count; ++i) { struct wined3d_texture_sub_resource *sub_resource; + unsigned int level = i % texture->level_count; + unsigned int layer = i / texture->level_count; sub_resource = &texture->sub_resources[i]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; @@ -3959,6 +3970,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_SYSMEM); } + wined3d_texture_get_map_pitch(texture, level, &sub_resource->map_row_pitch, &sub_resource->map_slice_pitch); + if (FAILED(hr = device_parent->ops->texture_sub_resource_created(device_parent, desc->resource_type, texture, i, &sub_resource->parent, &sub_resource->parent_ops))) { @@ -3970,8 +3983,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc TRACE("parent %p, parent_ops %p.\n", sub_resource->parent, sub_resource->parent_ops); - TRACE("Created sub-resource %u (level %u, layer %u).\n", - i, i % texture->level_count, i / texture->level_count); + TRACE("Created sub-resource %u (level %u, layer %u).\n", i, level, layer); if (desc->usage & WINED3DUSAGE_OWNDC) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da1cf638606..1e6a315e72c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4259,6 +4259,8 @@ struct wined3d_texture DWORD locations; struct wined3d_bo_gl bo; + unsigned int map_row_pitch, map_slice_pitch; + void *user_memory; } *sub_resources; }; -- 2.30.2

3 11

[PATCH 1/5] ntdll/tests: Fix AVX tests on processors that don't support XSAVEOPT.
by Zebediah Figura 24 Jun '21

24 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/exception.c | 57 ++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7e849fba1aa..cf2f6b1e7fb 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7562,7 +7562,7 @@ static const unsigned test_extended_context_spoil_data1[8] = {0x10, 0x20, 0x30, static const unsigned test_extended_context_spoil_data2[8] = {0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75, 0x85}; static BOOL test_extended_context_modified_state; -static BOOL compaction_enabled; +static BOOL xsaveopt_enabled, compaction_enabled; static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) @@ -7603,9 +7603,11 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI context_ymm_data = (unsigned int *)&xs->YmmContext; ok(!((ULONG_PTR)xs % 64), "Got unexpected xs %p.\n", xs); - ok((compaction_enabled && (xs->CompactionMask & (expected_compaction_mask | 3)) == expected_compaction_mask) - || (!compaction_enabled && !xs->CompactionMask), "Got unexpected CompactionMask %s, compaction %#x.\n", - wine_dbgstr_longlong(xs->CompactionMask), compaction_enabled); + if (compaction_enabled) + ok((xs->CompactionMask & (expected_compaction_mask | 3)) == expected_compaction_mask, + "Got compaction mask %#I64x.\n", xs->CompactionMask); + else + ok(!xs->CompactionMask, "Got compaction mask %#I64x.\n", xs->CompactionMask); if (test_extended_context_modified_state) { @@ -7615,9 +7617,12 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI } else { - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); - /* The save area has garbage in this case, the state should be restored to INIT_STATE - * without using these data. */ + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); + /* The save area has garbage if xsaveopt is available. + * + * Clear the mask; the state should be restored to INIT_STATE without + * using this data. */ + xs->Mask = 0; memcpy(context_ymm_data, test_extended_context_spoil_data1 + 4, sizeof(M128A)); } @@ -7897,6 +7902,7 @@ static void test_extended_context(void) int regs[4]; __cpuidex(regs, 0xd, 1); + xsaveopt_enabled = regs[0] & 1; compaction_enabled = regs[0] & 2; } @@ -8547,7 +8553,7 @@ static void test_extended_context(void) "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n", context->ContextFlags); - ok(xs->Mask == (compaction_enabled ? 0 : 4), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (compaction_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == 4, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) @@ -8618,7 +8624,7 @@ static void test_extended_context(void) expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0; xs = (XSTATE *)((BYTE *)context_ex + context_ex->XState.Offset); - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); @@ -8626,12 +8632,13 @@ static void test_extended_context(void) ok(!data[i], "Got unexpected data %#x, i %u.\n", data[i], i); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc) || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]), "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); /* Test fault exception context. */ memset(data, 0xff, sizeof(data)); + xs->Mask = 0; test_extended_context_modified_state = FALSE; run_exception_test(test_extended_context_handler, NULL, except_code_reset_ymm_state, ARRAY_SIZE(except_code_reset_ymm_state), PAGE_EXECUTE_READ); @@ -8664,12 +8671,13 @@ static void test_extended_context(void) bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + todo_wine_if (!xsaveopt_enabled) + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, "Got unexpected value %#x, i %u.\n", - ((ULONG *)&xs->YmmContext)[i], i); + ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc), + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); pSetXStateFeaturesMask(context, 4); memset(&xs->YmmContext, 0, sizeof(xs->YmmContext)); @@ -8725,11 +8733,24 @@ static void test_extended_context(void) memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(!xs->Mask || (sizeof(void *) == 4 && xs->Mask == 4), - "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); - for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask ? (i < 8 * 4 ? 0 : 0x48484848) : 0xcccccccc), - "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + if (sizeof(void *) == 4) + { + ok(xs->Mask == 4, "Got unexpected Mask %#I64x.\n", xs->Mask); + for (i = 0; i < 8 * 4; ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + for (; i < 16 * 4; ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0x48484848, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + } + else + { + todo_wine_if (!xsaveopt_enabled) + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); + for (i = 0; i < 16 * 4; ++i) + ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc), + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + } bret = ResumeThread(thread); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); -- 2.30.2

4 11

[PATCH 1/6] d2d1: Use D3D11 interfaces in d2d_bitmap_create_shared.
by Rémi Bernon 24 Jun '21

24 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 0b5f3e6dc5a..03982924efa 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -414,7 +414,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (IsEqualGUID(iid, &IID_ID2D1Bitmap)) { struct d2d_bitmap *src_impl = unsafe_impl_from_ID2D1Bitmap(data); - ID3D10Device *device; + ID3D11Device *device; HRESULT hr = S_OK; if (src_impl->factory != context->factory) @@ -423,9 +423,9 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - ID3D10Resource_GetDevice(src_impl->resource, &device); - ID3D10Device_Release(device); - if (device != context->d3d_device) + ID3D11Resource_GetDevice(src_impl->d3d11_resource, &device); + ID3D11Device_Release(device); + if (device != (ID3D11Device *)context->d3d11_device) { hr = D2DERR_UNSUPPORTED_OPERATION; goto failed; @@ -466,28 +466,37 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, { DXGI_SURFACE_DESC surface_desc; IDXGISurface *surface = data; - ID3D10Resource *resource; + ID3D11Resource *resource; + ID3D10Resource *d3d10_resource; D2D1_SIZE_U pixel_size; - ID3D10Device *device; + ID3D11Device *device; HRESULT hr; - if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&resource))) + if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D11Resource, (void **)&resource))) { WARN("Failed to get d3d resource from dxgi surface.\n"); return E_FAIL; } - ID3D10Resource_GetDevice(resource, &device); - ID3D10Device_Release(device); - if (device != context->d3d_device) + if (FAILED(hr = ID3D11Resource_QueryInterface(resource, &IID_ID3D10Resource, (void **)&d3d10_resource))) { - ID3D10Resource_Release(resource); + ERR("Failed to query ID3D10Resource interface, hr %#x.\n", hr); + ID3D11Resource_Release(resource); + return hr; + } + + ID3D11Resource_GetDevice(resource, &device); + ID3D11Resource_Release(resource); + ID3D11Device_Release(device); + if (device != (ID3D11Device *)context->d3d11_device) + { + ID3D10Resource_Release(d3d10_resource); return D2DERR_UNSUPPORTED_OPERATION; } if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - ID3D10Resource_Release(resource); + ID3D10Resource_Release(d3d10_resource); return E_OUTOFMEMORY; } @@ -495,7 +504,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) { WARN("Failed to get surface desc, hr %#x.\n", hr); - ID3D10Resource_Release(resource); + ID3D10Resource_Release(d3d10_resource); return hr; } @@ -522,8 +531,8 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; - d2d_bitmap_init(*bitmap, context, resource, pixel_size, &d); - ID3D10Resource_Release(resource); + d2d_bitmap_init(*bitmap, context, d3d10_resource, pixel_size, &d); + ID3D10Resource_Release(d3d10_resource); TRACE("Created bitmap %p.\n", *bitmap); return S_OK; -- 2.32.0

3 11

[PATCH v3 4/4] light.msstyles: Add List Box parts.
by Zhiyi Zhang 24 Jun '21

24 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index bebee8788c4..cb51b8a5246 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -333,6 +333,13 @@ BLUE_INI TEXTFILE "[Edit.Edittext(ReadOnly)]\r\n" "FillColor = 245 245 245\r\n" "TextColor = 0 0 0\r\n" + +"\r\n; ListBox\r\n" +"[ListBox]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" } /* Button */ -- 2.30.2

1 0

[PATCH v3 3/4] light.msstyles: Add Edit parts.
by Zhiyi Zhang 24 Jun '21

24 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 2451ffcd4f0..bebee8788c4 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -318,6 +318,21 @@ BLUE_INI TEXTFILE "GlyphImageFile = blue_combobutton_glyph.bmp\r\n" "GlyphTransparent = True\r\n" "Transparent = True\r\n" + +"\r\n; Edit\r\n" +"[Edit]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[Edit.Edittext(Disabled)]\r\n" +"FillColor = 245 245 245\r\n" +"TextColor = 166 166 166\r\n" + +"[Edit.Edittext(ReadOnly)]\r\n" +"FillColor = 245 245 245\r\n" +"TextColor = 0 0 0\r\n" } /* Button */ -- 2.30.2

1 0

[PATCH v3 2/4] light.msstyles: Add ComboBox parts.
by Zhiyi Zhang 24 Jun '21

24 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 2 ++ dlls/light.msstyles/blue_combobutton.bmp | Bin 0 -> 6858 bytes dlls/light.msstyles/blue_combobutton.svg | 18 ++++++++++ .../light.msstyles/blue_combobutton_glyph.bmp | Bin 0 -> 1258 bytes .../light.msstyles/blue_combobutton_glyph.svg | 28 ++++++++++++++++ dlls/light.msstyles/light.rc | 31 ++++++++++++++++++ 6 files changed, 79 insertions(+) create mode 100644 dlls/light.msstyles/blue_combobutton.bmp create mode 100644 dlls/light.msstyles/blue_combobutton.svg create mode 100644 dlls/light.msstyles/blue_combobutton_glyph.bmp create mode 100644 dlls/light.msstyles/blue_combobutton_glyph.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 599609def60..8f4ffdb9a22 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -7,6 +7,8 @@ SVG_SRCS = \ blue_checkbox_13px.svg \ blue_checkbox_16px.svg \ blue_checkbox_25px.svg \ + blue_combobutton_glyph.svg \ + blue_combobutton.svg \ blue_commandlink_glyph_30px.svg \ blue_commandlink_glyph_45px.svg \ blue_commandlink.svg \ diff --git a/dlls/light.msstyles/blue_combobutton.bmp b/dlls/light.msstyles/blue_combobutton.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a2b12ba3e1f3c3506f30c0dd75e567612a6e526c GIT binary patch literal 6858 zcmeI1&raJw5XN1B$_sGf(B#lVLJm0M1rV2>dO>}Y9_svgf*vdCh*yY|<Q9n}TxrS+ zrA|Q03}&29-pkA;m2$AfFrRn7`DMMa2H9MHeL9QYj-T|qPjO1|jp9R8kB%r`z0Z?` z!$nd4!(;CH%guL~RLNtNYd6zqG^&lq;~7Op;f%pG_ru}vldNJgnaqjVrLm7Prp;VK z^?hQ_q=s}B!jk&wbb3OJe{xQmzLnh$WS|bEA_H~B)9nE68ERd%??MJ@->Dlx25Mck z??MJ@->Dlx25Mck??MJ@->Dlx25Mck??MLYee{=1K81J->S3Lbp2am(-=iq{-+O;v z@H#2X{h9kQaf|*e>pax#dd-?kntxo<cy^tpGeutW=zg?{>!tc7g`Kti>}Ot&>{rmb zwygYmy62mMSDp(zuXx6LrL@o0{#E;D={5iDehKM&rF)rs)OLN1C)a7bSgx()<=(k0 zcuAv9=YNCxV18{&?(xDq^t`%l*Vez|**c9g3TKQgOXK_1-DUCji0bE?H14`#%lv%A zHJkLJ&+CzW<8_6wq~87dd_s)k`G~Ji=0Y<vP**(N4&a`l)>Zp1WT5t)x)Efc)>Zp1 zWT5t)x)Efc)>Zp1WT5t)x)Efc)>Zp1WT5t)x)EfM-ba5ao{!dP`(ZO^Cm}s6?|*TZ z)-;zZSq<X)dT_Deb@IB6!8LR4@xnXwT)nTee?$D-ELEsw%$kvb+R70>GEmFBH6sJH zl_P#+pq6=SMh0ptNBqb@E%Vll4AfSR_>qBH=B*hSsI46FBLlU}TQf3HTRGxK2I+mj guX`Y768gT5|JT9q*krAw>%`mXeI56B;q5cO0viV@SpWb4 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_combobutton.svg b/dlls/light.msstyles/blue_combobutton.svg new file mode 100644 index 00000000000..aab7ff06812 --- /dev/null +++ b/dlls/light.msstyles/blue_combobutton.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:20-32" width="20" height="84" version="1.1" viewBox="0 0 5.2917 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <rect x=".39687" y=".39687" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/> + <rect x=".39687" y="5.9531" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#3096fa"/> + <rect x=".39687" y="11.509" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39687" y="17.066" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_combobutton_glyph.bmp b/dlls/light.msstyles/blue_combobutton_glyph.bmp new file mode 100644 index 0000000000000000000000000000000000000000..2c0bd8a357fbffce7007fb3606beba2cf9a7b606 GIT binary patch literal 1258 zcmd6jO>ToQ5QQBztDK>W-XP8iKy13|CMU=pDrJQd3wGTDQg<AHpL68~luGV52}HOc z#G+DT@!2zPo{{{5x64{x*9UtD8+eA5dQnfDhi*<eSXQaqCz=gj_wR$@qH^-Li*CB6 zvMlquu0LJX?W(GZAS{Z);6J(3TgNOGPd^hc{kiYu<gSNy9BNXF5B%TyfA-ee9A<N2 z9zh5OCUZfL#nZo~^E$bpc`(Wa?F<i<%U7!N?@Z6;(j?ocO}Al_Xw#;<$y}Or7mKIQ z<?79}lM8pfHqoP8T72+Ox$ur0W^-X4fxOwkWG?72+;gEe;N(K@!6=u`=X3t~`T;?t Bf*t?> literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_combobutton_glyph.svg b/dlls/light.msstyles/blue_combobutton_glyph.svg new file mode 100644 index 00000000000..0caf1c4b696 --- /dev/null +++ b/dlls/light.msstyles/blue_combobutton_glyph.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="28" version="1.1" viewBox="0 0 2.6458 7.4083" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g> + <path d="m0-1.8521h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> + <path d="m0 3.7042h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> + <path d="m0.39688 0.66961 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" stroke-width=".26458"/> + <path d="m2.1173 0.52917-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" stroke-width=".26458"/> + <g> + <g stroke-width=".26458"> + <path d="m0.39688 2.5217 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/> + <path d="m2.1173 2.3812-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/> + <path d="m0.39688 4.3738 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/> + <path d="m2.1173 4.2333-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/> + </g> + <path d="m0.39688 6.2259 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#aeaeae"/> + <path d="m2.1173 6.0854-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index cc5b371da8c..2451ffcd4f0 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -294,6 +294,30 @@ BLUE_INI TEXTFILE "ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n" "MinDpi1 = 96\r\n" "MinDpi2 = 144\r\n" + +"\r\n; ComboBox\r\n" +"[ComboBox]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[ComboBox(Disabled)]\r\n" +"BorderColor = 228 228 228\r\n" +"FillColor = 231 231 231\r\n" + +"[ComboBox.DropDownButton]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_combobutton.bmp\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_combobutton_glyph.bmp\r\n" +"GlyphTransparent = True\r\n" +"Transparent = True\r\n" } /* Button */ @@ -330,6 +354,13 @@ BLUE_COMMANDLINK_GLYPH_30PX_BMP BITMAP "blue_commandlink_glyph_30px.bmp" /* @makedep: blue_commandlink_glyph_45px.bmp */ BLUE_COMMANDLINK_GLYPH_45PX_BMP BITMAP "blue_commandlink_glyph_45px.bmp" +/* ComboBox */ +/* @makedep: blue_combobutton.bmp */ +BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" + +/* @makedep: blue_combobutton_glyph.bmp */ +BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH v3 1/4] light.msstyles: Add Button parts.
by Zhiyi Zhang 24 Jun '21

24 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 208166~208171. Move from themes/light to dlls/light.msstyles. Save SVGs in optimized SVG instead of Inkscape SVG to save space. v3: Supersede 208185~208189. Use buildimage to generate bitmaps. dlls/light.msstyles/Makefile.in | 13 ++ dlls/light.msstyles/blue_button.bmp | Bin 0 -> 12282 bytes dlls/light.msstyles/blue_button.svg | 24 +++ dlls/light.msstyles/blue_checkbox_13px.bmp | Bin 0 -> 8250 bytes dlls/light.msstyles/blue_checkbox_13px.svg | 44 ++++++ dlls/light.msstyles/blue_checkbox_16px.bmp | Bin 0 -> 12426 bytes dlls/light.msstyles/blue_checkbox_16px.svg | 36 +++++ dlls/light.msstyles/blue_checkbox_25px.bmp | Bin 0 -> 30138 bytes dlls/light.msstyles/blue_checkbox_25px.svg | 40 +++++ dlls/light.msstyles/blue_commandlink.bmp | Bin 0 -> 13074 bytes dlls/light.msstyles/blue_commandlink.svg | 18 +++ .../blue_commandlink_glyph_30px.bmp | Bin 0 -> 18138 bytes .../blue_commandlink_glyph_30px.svg | 19 +++ .../blue_commandlink_glyph_45px.bmp | Bin 0 -> 40638 bytes .../blue_commandlink_glyph_45px.svg | 19 +++ dlls/light.msstyles/blue_groupbox.bmp | Bin 0 -> 1898 bytes dlls/light.msstyles/blue_groupbox.svg | 15 ++ dlls/light.msstyles/blue_radiobutton_13px.bmp | Bin 0 -> 5546 bytes dlls/light.msstyles/blue_radiobutton_13px.svg | 28 ++++ dlls/light.msstyles/blue_radiobutton_16px.bmp | Bin 0 -> 8330 bytes dlls/light.msstyles/blue_radiobutton_16px.svg | 28 ++++ dlls/light.msstyles/blue_radiobutton_25px.bmp | Bin 0 -> 20138 bytes dlls/light.msstyles/blue_radiobutton_25px.svg | 28 ++++ dlls/light.msstyles/light.rc | 149 ++++++++++++++++++ 24 files changed, 461 insertions(+) create mode 100644 dlls/light.msstyles/blue_button.bmp create mode 100644 dlls/light.msstyles/blue_button.svg create mode 100644 dlls/light.msstyles/blue_checkbox_13px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_13px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_16px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_16px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_25px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_25px.svg create mode 100644 dlls/light.msstyles/blue_commandlink.bmp create mode 100644 dlls/light.msstyles/blue_commandlink.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_30px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_30px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_45px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_45px.svg create mode 100644 dlls/light.msstyles/blue_groupbox.bmp create mode 100644 dlls/light.msstyles/blue_groupbox.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_13px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_13px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_16px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_16px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_25px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_25px.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index d6b7a53d7f8..599609def60 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -1,3 +1,16 @@ MODULE = light.msstyles RC_SRCS = light.rc + +SVG_SRCS = \ + blue_button.svg \ + blue_checkbox_13px.svg \ + blue_checkbox_16px.svg \ + blue_checkbox_25px.svg \ + blue_commandlink_glyph_30px.svg \ + blue_commandlink_glyph_45px.svg \ + blue_commandlink.svg \ + blue_groupbox.svg \ + blue_radiobutton_13px.svg \ + blue_radiobutton_16px.svg \ + blue_radiobutton_25px.svg diff --git a/dlls/light.msstyles/blue_button.bmp b/dlls/light.msstyles/blue_button.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6dd20ad167d73dd2a5e607df51b73197295a177e GIT binary patch literal 12282 zcmeI1&rZTX5XNit89YLdpa=hOmID`0UVIW04}$sxo{a>B7a#!+@C;D!&l#SC*mg6{ zblH?}GIUBp@@-hUQ1WH>V<x}uZ0#mI^OE+$@6X(ixy$&#^Swj9-mUKQaIKN&*_V7r zwd>pawVVGM9&P+;`Fc?dJ6A#2yo|%QbIR03qg|aWTa^N9PR)1QkclXBGa;GJ_e48v zR$}7MYAyaH(Uf&-H|HgEZCt?z_#iQWys()7A9mnFKD>xhzA3P1jc+NBEt6b~Y;_f` zt$3X1^4PI%D?RsoAiACEc*Xg^e0}IJIq{*DC+8zsw{~-0LKl3K7(hJOOn?vY!8))5 zAM)Y6aBgOPI=qin;yklb_S?(mxi8NUdOT)L-pluTz2a~<oD2qoxZm$nmM$8sHSTu1 zh0$mf%;)pi7_<JDZZ#GS(Q@<D&~y_KEuMEI>(*}0OX%9Tf)DUPVgPwzGXXy2?}IQY z2VMw^ri;abrFHqX;_+0A$HHOZF+G)wR4-4cUW%zvrcB*xjOpRDz&Zi<?3(GEVzqgu zns&X9CsC$#Z|dQ5wm5=+@DDM77|@6T4X$m@Bhf6)s8KSC+z?g<%weCeQ$-#J!g$o} zlk<7h?fKCf^;EmRfDiD&IshN`-Urm}QMczHM%_NmWYiI@7w`c-q*;M;2Is{-=0%Qm W`<Zs#UTW+-Uti7yH0$<q7Vro8$&m8^ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_button.svg b/dlls/light.msstyles/blue_button.svg new file mode 100644 index 00000000000..99041a80209 --- /dev/null +++ b/dlls/light.msstyles/blue_button.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:22-32" width="22" height="138" version="1.1" viewBox="0 0 5.8208 36.512" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="translate(-40.717 -1.1913)" stroke-width=".26458"> + <g fill="#fff"> + <rect x="40.849" y="1.3236" width="5.5563" height="5.8208" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x="40.849" y="19.58" width="5.5563" height="5.8208" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <g stroke="#3096fa"> + <rect x="40.849" y="25.665" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/> + <rect x="40.849" y="31.751" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/> + <rect x="40.849" y="7.409" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/> + </g> + </g> + <rect x="40.849" y="13.494" width="5.5563" height="5.8208" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_13px.bmp b/dlls/light.msstyles/blue_checkbox_13px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a6b1903b236fae8ccbbcd272d143f36a01eca005 GIT binary patch literal 8250 zcmeHM&2HL27&K|soGR282&k&mK-9)=I6yB*x%5y)mD)=s`U*Yu5QlK!++#^h5PgB7 z{BVdOB_t1kco9I{gQ3!PKF8~>4S4M$Sw*syVb}Z3?5@2N_S3Sv_cpCq*LQqYfTzGu zAfcp{M=0AVe9T--Q6By%!gk+%{5C_8G(7gi&(6+L=jZ1)fC(@kQ2e^pYHeIxTy&r- zqyEIxo$Hq3;8vis`j_#!`0DCv9hx!Cg|`JMi66CwkLg#^+<836b8t??8Z+ejkRR>< zU8bWr`GtG~q@lS5q<*t~mSTsQ6g$Y=04BhEK=Es~zqNs~!w#}#R^9UTD8<3801y33 z_<U{H*B9&1jDb)dC4STzKBiwu&&A{X8H1D&YfRaC@;Te<13zru0lG~0-~;%De4}rs zQQiVU{MI3V-XCeH$+3DfF;o*^J}^x~y}obkY=G058fuxfBpyY4YHU|{|1!Sw4t~5? z#~5Rp3vUZj^0^1$a?Y|EuJ<cxEFS0M1}P)fm?75(e$noxbxoJ)C{BLC^K|a(YI;)N zzC~T?H;WH{#(VwJ`2qbO$q?`LOYHTl;?Zigx`rI4i5%t2qVFKYoqUurmcX+$!0(~G z4}6}d6E)!1aNkA#lsr8>)leTm|H-QpHK>;^FE5{Q4s<!R4S^55jY?4?w(~m1&Vw^* zx7&NXO{O6pI0e!{|K7fL-U07tUI|SR_$6rKe3bH!CGt^LRn}NJ(`4oBLXV318@|{Q z;5N|K1NzX;^{7j8kgegq%l4lqnV!{<YYmV;&3M$M(X%C{zj8dv4qxUFAF}<d%cG)Z zo@bDE<-r-T!%fGdG7a^EITkEkIb(S=h{o0x!L>YUYr?KioR50)QSvDAlcs5GFZ3wl zRz7X50aFsVZy*=$0e!Qs&Go3LnH+01+;>@HCyAU%Lwx|<j7LR{SyxNU`0LThiIzir zXdbC9kBS<apZA&=Z}Q-b#>cN6kIFRE$Mi%iknXpkS{@Cev2=!3#Cx$kYHQ+r6lV>x zGYY<L3(lU_5N`qtJ&L_c+~*SDHh><`2j+Uzqp5+{1(JXU41gJrdNd_)obOT8bHEUA zdDNppc;?EZWdt}L4WOY;3broPUJp$Xusmvy6Lx(fJ9|PNlfoS1^HD5V&?}&KT-~jJ z=D+o5d_EfenX1dYJ~u&gOR<Y3G;uzP^Dx;t8h_Vph0aI$oMmOuJW=c?VolifiO)w@ S<hM}KQ-1Y$umAVoLjM5TYj8mT literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_13px.svg b/dlls/light.msstyles/blue_checkbox_13px.svg new file mode 100644 index 00000000000..fbbca0ae2f6 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_13px.svg @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:13-32" width="13" height="156" fill="#000000" version="1.1" viewBox="0 0 13 156" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="none"> + <path d="m0 0h24v24h-24z"/> + <rect x=".5" y=".5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="13.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/> + <path d="m0.5 25.5h24v24h-24z"/> + <rect x=".5" y="26.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="39.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <path d="m4.1723e-7 52h24v24h-24z"/> + <rect x=".5" y="52.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="65.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/> + <path d="m0.5 77.5h24v24h-24z"/> + <rect x=".5" y="78.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="91.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <path d="m-1.9073e-6 104h24v24h-24z"/> + <rect x=".5" y="104.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="117.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/> + <path d="m0.5 129.5h24v24h-24z"/> + <rect x=".5" y="130.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="143.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <path d="m4.8636 60.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z"/> + <g> + <path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/> + <path d="m4.8636 99.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/> + <path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#2979ff"/> + </g> + <path d="m2 110h9v1h-9z"/> + <g> + <path d="m2 123h9v1h-9z" fill="#3096fa"/> + <path d="m2 136h9v1h-9z" fill="#2979ff"/> + <path d="m2 149h9v1h-9z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_16px.bmp b/dlls/light.msstyles/blue_checkbox_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3504ce48ff7b2a97db094252fc1bd13f6ab5fa00 GIT binary patch literal 12426 zcmeHNJx|+E6m`_9VW>oxPDmuGP#|HjBN#grmP(bnRLaH=VCmE$A7seX0Wl$xPzlsM zQo@D=AyNk>CPp?U79<vi5GRG#a~)seI0^Q1IwY2#INay!d)}Ad5x&o?f8Ev;qio}M z9(V`*0YXYtc?GMO_o><|LQ%Ru<Pz(jzy0Xlb60z93#(SEky@>G3h01v35q?bR4VgF zM@MzEkwg8Bt?7}M6boJ+Z5aK^aJkXr<Kr;+EgCQTWG!)h#HV$TfnuA#4A)q58((($ z?fp+HUms)tl8zccMy3slCC!ocfGGH9fRuhs-A2S#JR-93Q$PoVOHk~INH5RB)<rgv z6NP2h`lnd%@<6v=2`+CE@qHl-ehV=6BKu`5as9&Qxwy5oP8@5kv(L#|IaK#jxDPK} z;!Fr%m)ZL~S9AYDM@tPLBhyA#KhPX$FS8VdJp*L*TPN*5>?I@ZqITLYX*wWWLf1>$ z$-}RedBoQ{B`qf^68cAMr=;e&Um5Q6`t2@+(RYi+%RX7lbCu<B{3P*tEN(5$fn%+8 z_BmNAhw5Gm_u++0oC)FUW9(mOF4^dmlNp&dD3&yb`PU!HTC`nO&rp}rufc`(gZF>m z<PYP%zmLn8mNDL0{g8i6_4~gM^&i4UJOsWtZO9S(ZwEZmLKFD-QX50~X_K3UJqPZ9 zWngHr@i!3k1pG9EXJIda8z2e{6dS*afCGT$&t(pkYv2la&rY^B{tW!a(G%Y{Z4CAn zxB%XoKEv4f)?4=aDjfGf0|@g?2|iKQfEG{#jB!fxK~qw|Bd|vo9{5Dt1PW9!`BSZb zzvcfBZb)R}hscK<^^cf={9j}eJEp&h^NknvZ|9@mwBgGvWpO5Qj{2QQCr0Yu$``rB z2CkoA4gHJshgsx>m+;+Cjz{~=Ui$dicoo+NG=Gj0Td_I#t}(7FkzE+je;>aPoe`-) z{bLL<#NEPPAn)wczm?B@4zprwaTT%mXrn=SFUPp$Q@qG6t|7i9a`76EQ-*J}kx8V$ zc?1mo%ks@OHt~!KM!ma#g8YAi@_!+eP`j8s{JXC?>VH`N*e<F&roY)KsxRu_&c~TX zntaI3vasjCoxZ1z)W4Olm(&ehKjB=ZtN&jsv$(!QTQ`*B(SEZRE5B1pR@)`@facF} z&9XX&m}}rl>?Q~FZ{>^MpJqfQHSqVpwWr1qcMDvIV!!^aeC~6YZSN;n5qnR$uE4ns z$GGKFJf6iG;#-}fR^xHX@Tm=~Z3>)6z|g-epW472Hua)b=+=$%vLOGTtnYuc|AY5` z+MtROy#IICfqw_@|J^eeoxlJ2F#qRg?Pxvbf6wg(d|#a3(OHkD66F8E_kYSEJ#8M4 zyyTzOz5@Q>`Hgjboa+B+{et{|g7SZ-XKuakCI1Wfy%h-7FUbGRJR<o2-<~X7*Mj`P L7x}|ffB*Xjzuufm literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_16px.svg b/dlls/light.msstyles/blue_checkbox_16px.svg new file mode 100644 index 00000000000..4646a259e62 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_16px.svg @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:16-32" width="16" height="192" fill="#000000" version="1.1" viewBox="0 0 16 192" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="none"> + <rect x=".5" y=".5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="16.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> + <rect x=".5" y="32.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="48.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="64.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="80.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> + <rect x=".5" y="96.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="112.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="128.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="144.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> + <rect x=".5" y="160.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="176.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <path d="m5.8182 74.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/> + <path d="m5.8182 90.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#3096fa"/> + <path d="m5.8182 106.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#2979ff"/> + <path d="m5.8182 122.91-2.8636-3.1343-0.95454 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/> + <g> + <path d="m2 135h12v2h-12z"/> + <path d="m2 151h12v2h-12z" fill="#3096fa"/> + <path d="m2 167h12v2h-12z" fill="#2979ff"/> + <path d="m2 183h12v2h-12z"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_25px.bmp b/dlls/light.msstyles/blue_checkbox_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8720209c6081e0c7f097a0822be7c621895e56d4 GIT binary patch literal 30138 zcmeHPO=ufO6jsvO!4%w!FNIQ<5@N|IwuBF%4e=p8^i(JXgQ3uq>CKdqmRL#;GK9oG z&_jsi8r+j_w)02qK#al1`f7ai**f~@9|?Q<z17TSHM_Gj+MTEc&C-{*^X9$pn|T^Z zuiBT~{cijBjCU>I&p#laK)$?^$y~{Np7{Xxc|MQZz{N6|=6_^kcfbANUSQJb_Cv{Q zZEdah*|TT!&!0a(f-s9hc#jDmdd?zlXpLC^BjDGF1NXP3Ev6d2eEISYU%Q{5RDg<L zIX?=wRA$Fvo<5hW^tqCAm}D$gA;+rhvY*LVg{88aV9Gu!EMd2)RospvoB@}sa86W~ z4(H1IKF9a(*Q)g-u~U7(_d(z13-X>UkLTXJd2@~Pc>A%4U!%H>>MK^h*~^N#dB_oj zSrp(6KlboTxjBot;Wd_q9|6DC<QTGA!(k71_}cyaBsn{}7&$*W|0MH{!#ry)SLt&l z=P=1wtU``e*=0YIu?kCNH^G#BR9M1pQ>(ZgM>qp6SK*wfEFI2O^ZWck)@lvMibJ>g zK91N-Zb9CY)iKpQ)7P(Y9$ueVtFZ`g-m9<HZuXup<>wpK{87D{XSRg!&MTvj8R1t8 zbGC4!aL%jwN01uLHJ0*LYq&;r<c^0M$dBrbr?JcXN`s|}bsVb9gzYX@;hd-}s$9wT zBxAuT$ExhIpUGH-rLvn~%04PAVYjJO+>Rrh0hg<APE?jo=F0y*ujH-Pa8w`AKD_#* znqQFjWOGb)4|{U`8uqdv_G1g5@ThL1`pP{^Rh`(T-91Z<&yPGS|5hx|+Za0z^DO?y zxkBd$b$_H1Z?iG`NQ+PL{|64SjMO?NSE;cDfa4IE&})|~eU5}jAXn~LYJ6{-|18zj zaN_ht>u#*!@SJ@R@1@PRZ{L0tofWk;@E-K~7Nb1TBhU}Oee!+r;>8xuAhm!RUpkKE z<>emuY)gKB856)!iuJ$e1qO1o!hMc$KaKkajj^9!gpW?gaR9T#=j*`yhOl6p;<gLe zzSrT?yov+%3CIQH67o|J3*$uyy?!S+|F?p3QTN=}?^6{%u<y_u)?F4hq08m+RoFLp zYz=4NGcgyXRUEHhzaGHcL&g}oiNhCg`@plu;}0<YIPBH5s5n&qK|8GjJck@(7d*Ye zd2yeHgD^HWHnPAt<~V-~+@Ma&L0H(!IB?E5)=Ute?rm^zoJnBO86^2J$YYCx^UQL* zQ|!%uR%4Tc&LHqsIp#lNFE%*{lYhRgzk2m*=zVbr+@Q9-k07?V4{*2|uK5}4f35~{ zLpHyLbNz7Q^hE1!?1y6ya)Wq=zsY_ZX}gA#`w615%F5UK;kVCyx7dXD*Lb2_BW*ek z_VZW|e70NtvTfCHt+BaK4Tt#^?sLpa!_&BLc;iyexQ65Let&0hvp9DpK3@mESHs~o znc}t!XrmfV#ldEVCoo4im#ma)so_{LyU62Cunuhvr{pN+cD%XLa5=a)x@YCgRqShn z$JW^Wo3S;VlH=Zu0j&QaUZBVtj{W*+A7b}-`~kcFg|dcIamZ_r8Z%l)F?Yx@cIk69 z(ogC+j`E4KvEq#^IF3D@nOtNI$JY>fuHvwRbL@U@95`o9tZb-;v%x`pc<m;Eb?M2> za7ztmi^Jn74$pGDQ|gHld$r1eGl=)-s)sp~^J_Sp9Nu2M&$sM4`(wzj;cRn=`~-D} zIb1)S^jRV0-}S=<4`<AMH}=DwJ}nI5dHW_?Y`=z+pZ7<lmOZ)E55Il#J+I`q*xE!} zzr*P`*z#CUy^`N<@v9Wts^MB<u}*m(_3G#f_c^Xt3)8r7c;iamxQ2`4K)*(b&(|AI z3tkO}@f5dR;Po-8;Zz)mpTOJ&<g#8VwA65zTjX&k^`|4+8cxMgUmD$^IlRVYIe%2c zHL9Z<-aL9cPM61GYd94LUh4t$h2VEMMGg1oSAB@x<M9XZSJrSU4tecSV_FB|4>`sz z^{GVprQsmF^X0KDFmUG3yId(m)^KS#hzDnG95`o$)mSQoYB(Dl-hP$}lfb$p!Ry#k z!`b5Sc&ekbO}x?5V9&Ho4myLtTje}{4QG>s_ClX;*u(l+b;PgXY;zEge07oopFz$3 zcGnLV`F9j3Kdv86KB3X$ZhV%CObkLcA#MK-C;i?Vs(pBt`=R$CG`|IDtA;b+=mF+7 z$0rVwwrV&7juno33_T5L@Ud|Xr{O4ZygIa3!$D7R+Xb{y4Hv^P0Sv;qgtXLf7%xI7 zXD1MC4Hv_)!*R;c@^ux44G8hnAh9)E495UsA3`F3hl9NjvIila1BkMQi{U_+_M&wh zLWpM<5?RBg<N$0Y3!yVdJdrh=1r9)G#vx}A;tADomN)>NnS{_8Bx$MPEOG!kGYg@; zoI-9xyvs5NoxxQI@%S~IWe!?5eZH+j{2J~(a1c++)nN|zEY<K?D)nukKfwL_a4o0x z-JnZrxOWL?^RC11bFWvR%_SPSyL}j?$#ZhKa=9|kfVrnTS6!VeSHl_BaIPON{(aJo z{c!OaiJz68+0*}zTE85Jc}iWbT&~PBVD9P8mCKcR2FyJJ=gRfNxqdkFgA?P~js0*j z>CjGfvS&hYX&05iL0}7=074rgu!YtJBybSeLMMRGh6rq-wE+nn1h&u#AhaO@TWD=S z0tbODbOH!%h`<(F8<4<3U<;i9LK`Bmh1Lcna1hu+CxFm~2yCIX0SO!gw$KS6v>^gp zXl+0O2Z8PS;o|?TUe^z2ez@GTRP$Vsr+fZko-daxmn-uOn0vZ&<#J`70dvm|pDXt) I)$m#BzuylKPXGV_ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_25px.svg b/dlls/light.msstyles/blue_checkbox_25px.svg new file mode 100644 index 00000000000..0815af16e31 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_25px.svg @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:25-32" width="25" height="300" fill="#000000" version="1.1" viewBox="0 0 25 300" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x="1" y="1" width="23" height="23" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> + <path d="m9.4091 116.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z"/> + <path d="m4 211h17v3h-17z"/> + <g fill="none" stroke-width="2"> + <rect x="1" y="26" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> + <rect x="1" y="51" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> + <rect x="1" y="76" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + <rect x="1" y="101" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + <rect x="1" y="126" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> + <rect x="1" y="151" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> + <rect x="1" y="176" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <g> + <path d="m9.4091 141.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#3096fa"/> + <path d="m9.4091 166.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#2979ff"/> + <path d="m9.4091 191.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#aeaeae"/> + </g> + <g fill="none" stroke-width="2"> + <rect x="1" y="201" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + <rect x="1" y="226" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> + <rect x="1" y="251" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> + <rect x="1" y="276" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <g> + <path d="m4 236h17v3h-17z" fill="#3096fa"/> + <path d="m4 261h17v3h-17z" fill="#2979ff"/> + <path d="m4 286h17v3h-17z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink.bmp b/dlls/light.msstyles/blue_commandlink.bmp new file mode 100644 index 0000000000000000000000000000000000000000..73f06fe6040b47966522ef122e007712a0d6d9b4 GIT binary patch literal 13074 zcmeI1y;8zJ6ote1SJ>Hu6pllL8G^h4jg^fLVP|ClAuwa<SUQpnuizW-_gX@d;(9jA z&cu)q3mf%h*zD%+ne6iAX77dV-JW%=<aoh(gmQ{<S+T5&Rkse%e!j+O=Mc-%AJrqh zo4dyyNr~Yw)4!f}Yth7+N4~Q`k({y#eP{MDX;sm;h$oIGuNNno+a#CD9tWMV(nA}{ zd-FI?XKYFjT{5n*?W@h)_GwHXwVDJukb`+AR84=NKhPi21pbXbl*ePlYpf4p<abuF z-|ow_d$dami3jYl?+l?`tOKX6^k_$BZOPP86ttJ?x6ZjL+gt-<<mMWo${muNMCBS7 zqbP?^cFb{P?pLHU^JlJMNH7K%62=G3^}d=~O@|!FA^o1vALtJ`{!pH4=->W2*9ba; zqWG=jd@9#KE&-n_%pcIVP<cjrPHd9^36KB@kN^pgz)us9ezPX7JxAG~NKR4qnRu-# z>V*t!PaX>PP+&*@IMKUyC{HDOC`!K__dDMU+GKvzl7sRA`h$KG$blR*0dgRRG=VSv zP#%vFud$Yd;x<-@<9)d=*h7I`+^Zq9$OjtrMDN;>S%)&UvM<H6xrc(s!T%h!Pm%*U lXaeLw4rv1Phct~}x=wNrCH)ZDCIJ#40TLhq68LijJ^`<tISl{+ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink.svg b/dlls/light.msstyles/blue_commandlink.svg new file mode 100644 index 00000000000..77f23aca6e1 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="294" version="1.1" viewBox="0 0 2.9104 77.788" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="none" stroke-linecap="round" stroke-width=".26458"> + <rect x=".13229" y="13.097" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="26.061" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="51.991" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="64.955" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_30px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_30px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e52b192007ce04e5d3180ed01e8b810873ce12bf GIT binary patch literal 18138 zcmeI2T~32Q5XUik4&$SIMCld!pid@7;UqrTHYVlK_-yGV__&WZp_q)bv>;8Jv|E-T z(Ld<`U3TXWzZsTHvg3!ZJFD70c>l(B$riJnSy$FMA0Ic@`Lwl>WvzdzjmGy+FRhD5 zon9Q(3!Oj!1pW(wV&O;1B%ilf-gv9nFWE?3JNCm`yIlHn(dULX=`vS2V#;*1O=&7W zMLc?!$g^TG3RrLbUP03+@<G^s-nvaZrRQk%T@cD4qk)1m5C8!X009sH0c`?#p3jwO z59}}?%QBDcn~et04q3N^c836J4rSISGgomkWjeWLN^|2!q#jJuG+@0dxB2+jHCK{s zId`5}PgFBW61R>g$2QV@?K*W=dQv&m=|(Xa1V8`;KmY_lpfdrQIgzr?jx-$5%=Tz% zmuw`iJ#oTDdvYyW2NSf3G?`a9qVmLqX=oeKtM7Sci_~T`b%Q3ip{X$=9qu{^+gHc^ zji>Y+t-cE~d3%^XdVl~3fB*=900{I+0P98jq`U3Az<N=v7u`+?qyGk3(}*>yMq}7^ zR$#qo8wbuo00ck)1V8`;dLn>&uqUv4+@c=zQ4j9P3sX&~2ThUO^)m=t)PuW$Knn<f IKraM-0R9zDg8%>k literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_30px.svg b/dlls/light.msstyles/blue_commandlink_glyph_30px.svg new file mode 100644 index 00000000000..cb367b792a2 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_30px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:30-32" width="30" height="150" version="1.1" viewBox="0 0 7.9375 39.688" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m4.7625 2.1167-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + <path d="m4.7625 10.054-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + <path d="m4.7625 17.992-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#2979ff"/> + <path d="m4.7625 25.929-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#aeaeae"/> + <path d="m4.7625 33.867-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_45px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_45px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a450715cf8a86a62713750564169cb2102860e36 GIT binary patch literal 40638 zcmeI5&rj1}7{@n%L=SpVFKSFQF|y4cYoqZ@xOnp75l@;RCr=Pyz+s7=ObFs^mnGr| zaw6f^X1M7Rju4K7a3S%J5W@&OK5bXlcEga;SDq$c;%iIC-hKG+?AcqM^`Yze&#wvl z;{*Rc%HtuAUp$hD+ljNhebTs{cRe4JNI3tjW7PHRMW5%!W9^<h)>q++U;qYS00v+H z24En52I^+^Ro&FSQNA-4OP+c$+snNBJZR6<EA;8^1<BTl5=nMEZSlHe*VL+1?z||T zyQmp1b7Na0<NhV_+(vf7&#kY}WXEOk+@?O}=hjx~%l#{oxh=L`L(BWPi~2f!etK0p z_nw&@^l_Wo29+LP7td{I{XT9ZyZO7I-#7`kZ$3}1Qha=C$9QlnEVp8|!+hQPIQoy6 zF>n7VJh~H>S@r$)ih3VAJ~;Hu@w`*a-c<d#Vdsxq-e}>q@^k6&wXom6>ig}Q`n$te zuyT>1tx0_ybk=v;xR2MAyWX&Q4ZYy!)kLrBn03m_8;A8X$7~NX+vh1ZukiB}_c_h1 z-ON72`Qf~K3|kn00T_S*7=Qs7fB_hQ0T_S*7=Qs7fC04z=I7^M^O&jCYO$!%&&|#C zGVeYQ;!#~*UKU=Xr{u!I!gPbzVz$Qja=9$LMsIT)0q)xD?5yw_JtdiWBEY?}w6r9= zMsIVEdAT`m*4VfB8a+QJ^ImS=U$0iHVrxKdMrF>y0QUxeFXC(T%-kQ~-sCtrQB5;2 zpPQ$YZrSyArBVr9J3bBO#$$%A(Vr6Y*5cw~==Van&lgo&j)Ok-a^P{Z$@%(3?>SM$ zYR$`>vC125c-Q%u*!NIzJiPP7f|Y|-rM?al+3Te70I%5fhQ-T%3jtoy>pEtg3h-8? zub-K>hlhQh!oDlg&r{rd$*kSXJyR-`P@{LHU<(5<00S@p126ysFaQHE00S@p126ys ziVe_E<~8L~GjX|&o^qL9%BA;t5RWRo6@DE(w|rvG=?1UGOf;1KPWjuiYxEZPaN6*3 z=h8LG3%`!u;vPzW3~;Z|fbi?+?KsJd1-RGPxA+=84QKKJ?se+BC%#6{aWWX--r$%Q zU!&(7*w5StP4>(tjodp?jlMaTomZVa<>XkE``a|y5xPcyO3dsd6}m=$O3Yg{624!7 z;w4C;5zn4D<9HtE5L=^<Ti$4!pK~d(HG0m$@BPn{)T-3iL2lP+t?$PDylJuP4Tm>V z2=Izt*D>pqk9R0j5x?%wrFxjzIZufJubbm(IMr>R55B>5^sW<ZVE_hT00v+H24DaN zU;qYS00v+H24Fz70ra|8Yq-%1^;_I}by7ZYrf%qyUT)qO-4oUNNjkk;(d%AqRQqQ~ zuY11_)t~L5*S)PckemL|o4)yXMxwb7dfi7E<LGrCrOnp4(Cfa{NmNJB>pm)zN6%9) zYGrTUjzzC~Q+vbA@#}S8)Lx?3{n4?ATVMbNU;qYS00v+H24DaNU;qYS00v+{g#py) zRakA#>HH2Ce~-RtMC~4G^lJUKn;kX!c2?9KLyg{X>#f`T-+k2Rql|9U=%cjRIu~m6 qtxlpkf*O5PCXb#6HTt97M19LHYV=Vn#e6UT126ysFaQGz4g3W~>mIoP literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_45px.svg b/dlls/light.msstyles/blue_commandlink_glyph_45px.svg new file mode 100644 index 00000000000..b724ef6bd96 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_45px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:45-32" width="45" height="225" version="1.1" viewBox="0 0 11.906 59.531" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m7.1834 3.175-0.57825 0.55959 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/> + <path d="m7.1834 15.081-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/> + <path d="m7.1834 26.988-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#2979ff"/> + <path d="m7.1834 50.8-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/> + <path d="m7.1834 38.894-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_groupbox.bmp b/dlls/light.msstyles/blue_groupbox.bmp new file mode 100644 index 0000000000000000000000000000000000000000..9ef6c2136a694370f4339982703425ade854f185 GIT binary patch literal 1898 zcmZ?r&0=Q&gDxOh1H@uLECR%g3<?a)K>7h2kiY={85kf4B=g_NJ*XH%2>}5XH2Jk_ z*UGP3w{8~@{{-Uy6k?DWJ6Ek*CAWV4`rSaYtAK2*K0$K^UM|QCpm{Ywv%&79hM6!6 zw{6?T4m9@%$lowAYSADwN6lqm7!3zViW&`v(QrU6TWFjfe$t?v1eNc5fw+PiW`oQC X)e)e&0*DoW=I#Mvs?<Z!`bQoBr@jye literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_groupbox.svg b/dlls/light.msstyles/blue_groupbox.svg new file mode 100644 index 00000000000..4354fac3d32 --- /dev/null +++ b/dlls/light.msstyles/blue_groupbox.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:22-32" width="22" height="20" version="1.1" viewBox="0 0 5.8208 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="translate(0,-1)"> + <rect x=".13229" y="1.1323" width="5.5563" height="5.0271" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_13px.bmp b/dlls/light.msstyles/blue_radiobutton_13px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..636992294934772b6821a1bdebbc8c625c46c738 GIT binary patch literal 5546 zcmeHLyG~m{5OowDO;V;KkOB#8B76}gMv7=6#YBqo5jIV#NCbxz)F}~M$3<FWSv(tr zD{9O)a9v>Y0f2a1kT&P+Biz?Qq@;j|D<-ouduDfb_K2M@^}hZhCBN_Z_Z#FnWCrpi z^(yrg`jwu?Fz|^~O8w9$rrv)19GLv0Vb?9F_4V}}WChZOTtW^Z)wQ*?iD=mF?rs<S zF6LX%#d^Ko59y(XZ-#!z5^*M0;~QIBTRd*;qaQI1#&HrlhZxV`G0wxc2RWf$U0r=g zoQ`826B`>FHAsPejTgX%#KghRJgbnS&CSi1j6v*v6tC?)z2*RHSs$L4KG?^Wm}Aaw zZ*TWv{sPiLPJQ&<wU4f2J9r+%PbcjI%m=QCwTqaq;w+QU2Uz17{W`9R`BRLk^YpWB z7<=&LXk+YRtsN6bU+^>cL!9v&9&jDR7FfqhrP2+%k2d|p2YFy(nI|wc?B9X-)Y_K$ z7+g?`FC#foO0PiLkV{b-K7_7{(ol?}V&P2}=3Gcilrlxc_KSs)9;xRtGs>S{BF^lg z@eMIMl*m!~foVV_M|D1)!HciyJm&TwCt6F6>Nw;vGy#82%neJ9YP^6iDk@IpiSwn8 z#QbZ?QH=K!@Qjxn74zu<j8%PbUY-s1u_Z=wRD2rj#ry@NBW4FBM=`#AAJ$Xtb90{3 z@HBkUv(T0tmG>a;D>I4l0q#R`6!(a@;U;jWQlpMCZ&h!Pb=K#=eP(t{9DTtra6i8} z8sLG)y0ea=Fy75`O1qTyu&*2BfmsuKAy3>F>rzVlTGvcI1{c&<%h{aoW>>CUr|rAW z<yF}^^vg~aI+3HmxR91#&KA!r<NcyO(nIaLV>8n4Iw6h{f9X06@zcUl_&E=p<fzKW z@eKajb@G_ogPc%b|8Nx75C^-(Jh68TW64pC7qCNO;$)sUAND*tTUH$Pm!176UfYtR z=SyP)ran9`>xcPcON`>^;$Sc4FA&!`TO5@fy>lPbQSB2rPdPiCv=8!^9OXU8`*KGo zfjbb(ilf&mt_j~Mq{+H4Z`KvI$2#kC;C{w-OdNf|k9d7QA&z1V^1y=>SVvJA@8&sa zYkwj~uVkKMHP!_<UuoDnpWxnR%-{Ktd;8WSPu7-PInnyow_fAX9kD|SiHyTpV{bih z`w^^(wZ8ShlZyry)YiBDu6>f;dc;gy_PO<~*KtkgQwX)>=tF$#9{@*D-uP$hN8`w_ z$HLJtC}N?viuI!rNX$&?M`NIf!@|)BDr_RR#C|l4y0IQ2M|J;qZ~M`k>V`+Qel(1V zTOy$!jibVzq<%Dvh+9ehXdD&x;4WhQXc!T<Z2f2)sXV%FkNs%i|4isP{;D6f*4omK z+VIAo)Q_4un@;LSZCK+M3H_*<vuXDA(SFp1HGW$^YUZQ*u^;{Se|w77*w~M6y{g3j H`quvf$~kDv literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_13px.svg b/dlls/light.msstyles/blue_radiobutton_13px.svg new file mode 100644 index 00000000000..41f2b6e976a --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_13px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:13-32" width="13" height="104" version="1.1" viewBox="0 0 13 104" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <path d="m10 58.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z"/> + <g fill="none"> + <ellipse cx="6.5" cy="6.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="19.5" rx="6" ry="6" stroke="#3096fa"/> + <ellipse cx="6.5" cy="32.5" rx="6" ry="6" stroke="#2979ff"/> + <ellipse cx="6.5" cy="45.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="58.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="71.5" rx="6" ry="6" stroke="#3096fa"/> + <ellipse cx="6.5" cy="84.5" rx="6" ry="6" stroke="#2979ff"/> + <ellipse cx="6.5" cy="97.5" rx="6" ry="6" stroke="#aeaeae"/> + </g> + <g> + <path d="m10 71.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#3096fa"/> + <path d="m10 84.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#2979ff"/> + <path d="m10 97.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_16px.bmp b/dlls/light.msstyles/blue_radiobutton_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..9b8ffe570b308de67845223ad0c3d1d409f430ac GIT binary patch literal 8330 zcmeHM%}yLg5MB}o4#p;rU`3X^KfunAL!`*EB9bVFU|Gt0<d8TDEWay7NXU@@13QpI zUI5s|zF4xv0`CCJ3nXE=E|A0S9y;GwGadI1JwK76C~+9M=$@+js;jE2HC^8E$ItF% z<avg_v!M4uWl&${Uglkl7%Y#<Wc+`WsqrtqdTLRMW!;LEW-`0GyM?{Iy_H(6b^^K# z=osTNWl`|$?d|?*wYm<ybBuGKG4KXSoP$448Emgn*R;cT$m*c#t5>h?nlf_^y&>rE z**9&#W(8~PmdoXLs1NxB=m4bsuS5PNWz+$`Mn3}GVZ1i=x|lD5l#O8H2Vw$0&R@KE zk%!(Y_;cjr{jm*a^0XgVe*yeuPy<vX9^)a%y0*cuQx|*Tf+u_Q^5x4r0iN+D;ak*Y zywGidE)mb*U%+2bml$9#K&K$>{}JX%>mLx0_#NmTgH}N^<Y9aQO2SVBx~!*V<a`9< znURB~7#oYk2C+AFJ!4NiV0M&JeSvNIaRmMq3G+klEoDLdfL&eZJ0I8^fDY?zNBiMR zdjE1=;C7)`H|tm1fQ)`Lk(*iO=k@E?w@KV<@&Z{Uj5SvY^6?zH4cOEEv&NX`VN=&O zSCjdID&<x{C!ouKj@49dnKB!OJXJ3At5SX)`sdJ{Q`5OI@CJoAFJ<RNR?4nX*R<nf zvvtU;s(e54{Hw_ihG4e_y?xULcoj9B-&N&|oPVq}0bdTF7x)j`(>Xc+)bVX(<@{ql z485ja7uZF-s|b?wFMcr2QX!96R~fJ5U?%%G0{6zA_G2o$AUQ4N8fvm2=LgusM0_bL z=U+|bUFiCI^!)=l|9EG-Z`QKU<@_^V=(YrdeG>oE;pP0xzLs(q$ls~q|55V#c{%@T zy5K;Ub;bP2`A2;{Nyca8{7XGaO=d@cIa4|Z)48Q+8(BI3LF`Rk&(QZ^ZwH@NIsbtl zjO8kzLxsJS9I<{_r>J#Z!|Ln%1Ae{1M&O5*nWL=BI>jEE^(%J82K_)SmU6R_pYKL* zE0Vw0vm#@yht5yW8k5XN_BnJLAnkuc@{C$Hb#3$ZMzPTGoE6Xs=rW+=&Ze_WnGHjp z+Aj2WD(-rx;+%Ik-MP-j=$NYD{DU~}dhR@B9j~}XUDJ+WJ+}^>s#^Q#t}1_W3-ix9 zmEt#~?uPp*dFrPRhq@J~*4ZrXn>OHErRx>t{C6wGhh5M4t>d|^w&!$6oOd^!Ux59X z=U;5V5BkvF935_Z#U|G!7V%zzR0Lg#4fw%W+FNcOYp*h1`1YQ^ZX{N0(hrGm(^+6n zu}-72<re*TomRxUhChsDbR0Qwp(}f&etvKVK0Iw#7;F6ckhhVmZy7J<T<?;5lpgQ; zc<!s`T!2o+|1Ib9z@Fi&%@_EO{Y3s8=(Da?k<*zVe`nyu;*q~!gZh|f{@Uv!BiQ3J z$-##E2=m`#Y+(P24;ef6T-P)7J=n$fKhp=_9$_EP;2(11vUZr$7WY=LtRK`VYhBl{ zTDw00oddCfy^vUt59V3w7jvm!))?v(HtS~n(oSH*qhHXOWq#C;IQt;(HF=aF=1Lf= z{ou%aV9n?7rvYLulN!u3Yu(hf&3PxnU1J4zh5zjRA93*;!SBpvK>TK=y8lCu-w1pP ztQ33y2ZrB>D6Hm-AIR|na=Z-s^ZpO)VG4ZY{U2DytJjGdBk%ty@sam`;Ez(QA9?== z_DKr7eE*R*>-``2r5GEj?*D-wM;NaH;=cSZ?*DJe`NwwIpQQfZj_T#2{~AL5UF-jQ zwc_6*&VM|}kg_L)4?X?AAx@my`u{|bp<wI(4RPWW@n7rz6G4VT%=tI8?9-(F-;VOR zH~qgoJM2mRE&adUL!X<}|HomqEUN$4@-(Be^#5saTF2J^YgwAn*8iu$X&qbtuVraQ zTmPR1r*)$Ge=Uz2lluR7>`nh~%a8Q%e^dW&vrk@{{yz$<`EmWf)=3)aN4Wn_!i44M z6?^*susrEK-2W%(hvnh^KP*prm;cu>`u`;Tusq!VhviA{=)te`|4A4vkL&-nPShy% plhFT1VsHBYf8_VSsQi<EbN~0Vb94W%MgIPmqJHqx+S~E_-yax7=H&nY literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_16px.svg b/dlls/light.msstyles/blue_radiobutton_16px.svg new file mode 100644 index 00000000000..158279ee557 --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_16px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:16-32" width="16" height="128" version="1.1" viewBox="0 0 16 128" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <path d="m13 72a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z"/> + <g fill="none"> + <circle cx="8" cy="8" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="24" r="7.5" stroke="#3096fa"/> + <circle cx="8" cy="40" r="7.5" stroke="#2979ff"/> + <circle cx="8" cy="56" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="72" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="88" r="7.5" stroke="#3096fa"/> + <circle cx="8" cy="104" r="7.5" stroke="#2979ff"/> + <circle cx="8" cy="120" r="7.5" stroke="#aeaeae"/> + </g> + <g> + <path d="m13 88a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#3096fa" stroke="#3096fa"/> + <path d="m13 104a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#2979ff"/> + <path d="m13 120a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_25px.bmp b/dlls/light.msstyles/blue_radiobutton_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..cab87f62316ed9d409412a5b32a1c30b394a6e1b GIT binary patch literal 20138 zcmeHPOKeoh74=NQXG4-@00j&}gWFEV-Glh;MzaYYB|)IkU>59R#3HLG@oxaHvxzi= zyWL0;dy9{4z_4Q*;kJ#J7?#*zyq<w>BUR3+cdNR(-LI-%?}EBDHTC*_&aHc^>eh9? z65sr3>d#&J^Dq4Wd$iqX|3&+(tGnwL=(~lFN9Uuux|07$Q{VjY{NEjB)Z;Isq!OXI zxw#$p?%g|uHhKU4{dx4OXjSQ-p)aAGqFe@8Ejm6v{yB6n3zkA3YO5H-;M1p1qg<Gp zn%W2XMF)5J?%liB@crb>%*-C}x3lMWwCiZgXl4wR>FMd;`FsM_QOK`T2hT6jpI1tK z=F=e`W4Zv@SJXp$OPp3Z96$M#gU%DQ-?WlTqrtabz@9aBn*CuMo%qbb9+#c|$lP3n z?hKkc=hMLaj(j6aJ;*#3I~8|+AbUmVE0FuO(V3l{Jpg(|cqZlzJ;pXqIio}WA#dXL zSJGvDt`P_Pb4C_+4}zxW#%Du#>(K2sx_IXNa4f6DzjNo#8Tr0sWF$TdLT?y%8V$Jf zCT?5@kTdJ;6vkVo9%Psb^asxaX;?lw=f}agL0Qm>=yklY4vrf>=w^LH`C#lq@4mqR zjr)gVXMWIg0Y1~2{uml%GPc(S18Zlm=)Oi@<uhp84d2j2CX1a921C{obw8lJAr@@> z*6<CD^o(uQU`W29KKGQK55(=5;e+-tBeogKjKM(cPY^@q;})Mm8+G`X+O%=e!C)Sx z?MYyt<umLp8a~%Kzl)3+W2mn*?T_bzd;0e6+dJ{B=LG#<j2+nKK7U8Kh_>$L6Ud(z zoi%fQVa!*BwgTF(Tssl|EO0zVhxrcQc`h(EgN9x%m$!jte0v1BhP(?M&d&oh?xh-g z&}M-#VB$k8>VY?hrep8sUGkx`A3U7{q5Fj6AwBlP^8@<K|BUSh@T_kx2C$DAJLq4a z+4*thnxCO}4wyPV)W>tnbI|CCKRRxZ=a`nz#+c8*+YSHpdCu>o3tz7b*jfaCpTY9= zaxM-+U*|IP8pG3XfHy?@KHOG3u4|0_ELs^DJWpto`Hg*rbe=zyYo#AUQ-3?OLk;(x zQX@T+Y9u$0wu)9w`krTMG*{Am$i?8fGHSf*bLd|dOocwwR@HFNpc?-=s)kcTefxm9 z=-@7^;oLR&a#H>C@E$eZw_W%AKGJg?a?6fvMUDO5Tf@QcqtIIyotJn%kMi1I!+{SU zE<op%=)EP58yE8|<A0mT^*&MK`Ajt&eA}glduOekCVv=5@RIlp=jPP6`cDUKUgqW^ ze42qwea=U7(}>}B<lAvV4|0#iPQ{%cHPU-U(}!~_YUrTNA?o|X2SBfgPTIWBQ_k9f z|B#os_2?Q-ug{U(n&8+PP7Qx?(3zVwe4%3whkLrMon(H<TNV5>g1=;CxOPW!3qlXz z+jTu};>L9X-DJISe~tE*1<TfO7}G#T{A3)MA3M(Bo*RNuL@)8~wKbfxK4N_^a`&wb zy??Zi%n!+2jOJ_&XKCU6ZLm#mYdAIb#a{8_HG1YB#r<0!gV3_uur-{_HEn-Dd!udq zqtDiGmX_Uyt>Kb<qhrNAmCVOjpRM7rw;pP{nQipg8cvPnP6!6)<5u$AYil?)+H<Kb z8>2Z}!zFo?e&Adf&7BoITf^!6VRB2nFUTE9UP<;x&vT7C+Iw1!ckje=GABd5wnj+y zdG1}DKiKDPK4HF2#<s?}=UT$|tD44qHGas}aAL<jOUxQ|`vuC`HHmx&ESw976V5G5 zA3U-RaZ7v~$vxVdclG={fFAc!P4~>>%m>YRmw7w!VbRUI+Ly81{(26?`QhYWGZtU3 z&yOVkE6nkR>zk{muzu@yaxauKKdxN!Gsb-mEr}1$(Uf!0=wV&c9}_pmeF^Ju3}?)7 zjBj`SJjZuU2fx1d7I~f;EMKqBMb;T6m(?-cxvoF!*yM)XeB{G-d3s%Q|0MaJ=LzSW z`Hg)==w~SB>ScLWKOEYzIq}u0+C*WpHj$s-Eaq2h#e7xzXSHH~iG0ds!KEzMBXBPZ zmIAJ~iClCI_r82&A21gk+~v(u;o9b8;p9(07WSyAzU}P!eY04&4!LDVw(|3YzlK9R zjzWH2bY4~``tdtlpoRm#S}I(C&MU1qk$+2^R<YCLCm(UC77I_*zcbcw|2e!1e$5&? z&Hiw$f~VtCE#~Lc)VKEULCy`vc@Z(6k+|zQ-z?>);b&tF2fb>s|FO1H%s13<wNn2T zp|7a&5nIE(|MANMpjU*~dfu_#C}(0r{~>SUmeg=qcNqH`anRcu?nChp2SGD)(;C0N z-qzoj^4-Rc%#WhqT-P5b^Jiq74K-Y?R9Fyt2tVP&ACrT*PN1vTo8Di=e3@9A#eQ4E zRVNAqnefFQ&X4g0^L0Zois+Mg-~7_naCUvvV-e*GVq<GK?jLOf{+YSJT-zGX(6agh z8@7h~xzxXx`lO++@|pYB_-SaQXKeKv4s$KKAF!U^@L5e9wKbffWyII($c&TuhWcDv z=#%*<_1hW_v3i&lU+`=VS1W#XLStY)YNh-w;oBMxHZHYegZaSt!91GSC`^7V=FbXV zLk$O-n|ovCrC!4&`{OxrKNbt8)$Ol$n)p|5=4}lp`~02Q57}6E^9l1c^|(IG`Gq}w zRj^jn565i{CwBb)ARkc9#EAJ0ST6;yUc;4-Yy(aER-MQ{+LCuMKN!;kjtg=%_S~n; z2PS{e2KB(36Z|bT-20n_{ov^wsLu~4|C%xSdZo{g{EXmlxW2i1$nnRF9rQ2U`Eli% zpE34xkT>yJPdf*Vp7^8VCSzLKoXC&Wkk6QJ%z4i5nqJH=i5%C(BF|HU<?H2K9F+Kn z))e_0$lF71KJwwaJg#fmKV_aLVzVke^Fx{E59M6FEYI?Oq4O@aMbPj&=O_Cv74GtP zHs)-e4g4LUD*ZHi)(G}@IQ)j3`CTgXS({bR@F#a_n-@8BU0wJ+Jo;TK#F<Oi(R}!Z zN4ah^{ehj}yHp6${{=LI5!2Hj9k-ZwsgNDWh;PPVYdH9F1HZ|qzDouEY@0T04F~*_ zv;kW!-=zY7txX%YhQk{3zDor@*QfD6OK)qq(7RONziHEk{T(j!E*1C>+q7Y8IOHYo zyHwy`YSV_T;b6o2E*1D(=d9_n%mwp-yFbkP#?*JIkUxm_F47M7x&50EYc~2_s@Mtn z!+gN;=nvLx=69)3r2m|s2WZ?kHR-uenGbY)(0AUYcHX6O83aF_8ZJFVpLh+I?syZY z%^I!=CHysG4HpJXk%+9}Qncg9ku_W#m`5t2hVy90u_9`?I3SNyL=ETBj$=jCaB)B$ zsfZfRqaDYJsNv#(JW>%goJTv%lKl}=!-c_8Br?`;DJbdWHfy+az$T95-Ohcu&V9J1 zmC^WB-x2BDhieRqeEXE|!?kocg~<CHxTlcmK3ocvm(2TsxFZmCAI=LDVB+2h?<?}Y zL+X9F07Q_DA18wM;esF$0`TRA_|oz|Tm(c=1ap5<Y_z-&7X*k92;GN^fC!3&?!yHE zA_PMB;UXY{BBA?mL4XK>(0#ZF2(L)8Kf?FnydVK4)@}5CxByg3Ht(NdUu3!u*Agg& zsPk^;K3wNMT*~?|<j#FK6N#<;r+go7tGDTt<X%R$`*7)K>6|S0;nGpUoS6G?VHCea z%zZdNLL4`AA1)5XFBQ5E=hu$ohVH|~q4=ek>*W4S%lmMC?Kp1eK3p7%Un+DT&aWNE z4c&)}LrIsC{SmwmmyQtTWVsI)M%yaU&V9J8DCv~WeYkw*K3w|pu$<1jR2zyd51n_Z zNk}^HQnxIPAffXvH5j4>fzG?shH!Ylbl#<U!(*A9cd0fMEgw4nw#fg_zb*1VVemvv literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_25px.svg b/dlls/light.msstyles/blue_radiobutton_25px.svg new file mode 100644 index 00000000000..f105f57095c --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_25px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:25-32" width="25" height="200" version="1.1" viewBox="0 0 25 200" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="none" stroke-width="2"> + <ellipse cx="12.5" cy="12.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="37.5" rx="11.5" ry="11.5" stroke="#3096fa"/> + <ellipse cx="12.5" cy="62.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + <ellipse cx="12.5" cy="87.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="112.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="137.5" rx="11.5" ry="11.5" stroke="#3096fa"/> + <ellipse cx="12.5" cy="162.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + <ellipse cx="12.5" cy="187.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + </g> + <path d="m20 112.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z"/> + <g> + <path d="m20 137.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#3096fa"/> + <path d="m20 162.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#2979ff"/> + <path d="m20 187.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index dccda341b7c..cc5b371da8c 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -179,8 +179,157 @@ BLUE_INI TEXTFILE "\r\n; Flat menus\r\n" "FlatMenus = true\r\n" + +"\r\n; Button\r\n" +"[Button.Pushbutton]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 8, 8, 8, 8\r\n" +"SizingType = Stretch\r\n" +"ContentMargins = 3, 3, 3, 3\r\n" +"ImageFile = blue_button.bmp\r\n" +"ImageCount = 6\r\n" +"ImageLayout = Vertical\r\n" +"TextColor = 0 0 0\r\n" +"MinSize = 10, 5\r\n" + +"[Button.Pushbutton(Pressed)]\r\n" +"TextColor = 255 255 255\r\n" + +"[Button.Pushbutton(Disabled)]\r\n" +"TextColor = 166 166 166\r\n" + +"[Button.Checkbox]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = TrueSize\r\n" +"SizingMargins = 0, 0, 0, 0\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 12\r\n" +"MirrorImage = False\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"Transparent = True\r\n" +"ImageFile1 = blue_checkbox_13px.bmp\r\n" +"ImageFile2 = blue_checkbox_16px.bmp\r\n" +"ImageFile3 = blue_checkbox_25px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[Button.Checkbox(Checkeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Checkbox(Uncheckeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Checkbox(Mixeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Radiobutton]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" +"SizingType = TrueSize\r\n" +"SizingMargins = 0, 0, 0, 0\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 8\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_radiobutton_13px.bmp\r\n" +"ImageFile2 = blue_radiobutton_16px.bmp\r\n" +"ImageFile3 = blue_radiobutton_25px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[Button.Radiobutton(Checkeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Radiobutton(Uncheckeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Groupbox]\r\n" +"TextColor = 0 0 0\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_groupbox.bmp\r\n" +"BorderOnly = True\r\n" +"Transparent = True\r\n" + +"[Button.Commandlink]\r\n" +"BgType = ImageFile\r\n" +"BorderSize = 0\r\n" +"ContentMargins = 7, 7, 10, 10\r\n" +"Font = Tahoma, 10\r\n" +"BodyFont = Tahoma, 8\r\n" +"ImageFile = blue_commandlink.bmp\r\n" +"ImageCount = 6\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Stretch\r\n" +"SizingMargins = 5, 5, 24, 24\r\n" +"Transparent = True\r\n" +"TextColor = 0 0 0\r\n" +"MinSize = 10, 5\r\n" + +"[Button.Commandlink(Hot)]\r\n" +"TextColor = 48 150 250\r\n" + +"[Button.Commandlink(Pressed)]\r\n" +"TextColor = 41 121 255\r\n" + +"[Button.Commandlink(Disabled)]\r\n" +"TextColor = 174 174 174\r\n" + +"[Button.CommandlinkGlyph]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageCount = 5\r\n" +"Transparent = True\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"Transparent = True\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_commandlink_glyph_30px.bmp\r\n" +"ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 144\r\n" } +/* Button */ +/* @makedep: blue_button.bmp */ +BLUE_BUTTON_BMP BITMAP "blue_button.bmp" + +/* @makedep: blue_checkbox_13px.bmp */ +BLUE_CHECKBOX_13PX_BMP BITMAP "blue_checkbox_13px.bmp" + +/* @makedep: blue_checkbox_16px.bmp */ +BLUE_CHECKBOX_16PX_BMP BITMAP "blue_checkbox_16px.bmp" + +/* @makedep: blue_checkbox_25px.bmp */ +BLUE_CHECKBOX_25PX_BMP BITMAP "blue_checkbox_25px.bmp" + +/* @makedep: blue_radiobutton_13px.bmp */ +BLUE_RADIOBUTTON_13PX_BMP BITMAP "blue_radiobutton_13px.bmp" + +/* @makedep: blue_radiobutton_16px.bmp */ +BLUE_RADIOBUTTON_16PX_BMP BITMAP "blue_radiobutton_16px.bmp" + +/* @makedep: blue_radiobutton_25px.bmp */ +BLUE_RADIOBUTTON_25PX_BMP BITMAP "blue_radiobutton_25px.bmp" + +/* @makedep: blue_groupbox.bmp */ +BLUE_GROUPBOX_BMP BITMAP "blue_groupbox.bmp" + +/* @makedep: blue_commandlink.bmp */ +BLUE_COMMANDLINK_BMP BITMAP "blue_commandlink.bmp" + +/* @makedep: blue_commandlink_glyph_30px.bmp */ +BLUE_COMMANDLINK_GLYPH_30PX_BMP BITMAP "blue_commandlink_glyph_30px.bmp" + +/* @makedep: blue_commandlink_glyph_45px.bmp */ +BLUE_COMMANDLINK_GLYPH_45PX_BMP BITMAP "blue_commandlink_glyph_45px.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH 5/5] nsi/tests: Add tests for the NDIS ifinfo table.
by Huw Davies 24 Jun '21

24 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/Makefile.in | 5 ++ dlls/nsi/tests/nsi.c | 146 +++++++++++++++++++++++++++++++++++++ include/ifmib.h | 72 ++++++++++++++++++ 3 files changed, 223 insertions(+) create mode 100644 dlls/nsi/tests/Makefile.in create mode 100644 dlls/nsi/tests/nsi.c diff --git a/dlls/nsi/tests/Makefile.in b/dlls/nsi/tests/Makefile.in new file mode 100644 index 00000000000..98129935198 --- /dev/null +++ b/dlls/nsi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = nsi.dll +IMPORTS = nsi uuid iphlpapi + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c new file mode 100644 index 00000000000..96806e444de --- /dev/null +++ b/dlls/nsi/tests/nsi.c @@ -0,0 +1,146 @@ +/* + * Network Store Interface tests + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" + +#include "wine/test.h" + +static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) +{ + return lo <= val && val <= hi; +} + +static void test_ndis_ifinfo( void ) +{ + DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), + sizeof(struct nsi_ndis_ifinfo_rw) }; + struct nsi_ndis_ifinfo_rw *rw_tbl; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn_tbl_2; + struct nsi_ndis_ifinfo_static *stat_tbl; + DWORD err, count, i, rw_size; + NET_LUID *luid_tbl, *luid_tbl_2; + MIB_IF_TABLE2 *table; + + /* Contents of GetIfTable2() keyed by luids */ + + for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) + { + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl, sizeof(*luid_tbl), + (void **)&rw_tbl, rw_sizes[i], (void **)&dyn_tbl, sizeof(*dyn_tbl), + (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); + if (!err) break; + } +todo_wine + ok( !err, "got %d\n", err ); + if (err) return; + rw_size = rw_sizes[i]; + + err = GetIfTable2( &table ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + /* Grab the dyn table again to provide an upper bound for the stats returned from GetIfTable2(). + (The luids must be retrieved again otherwise NsiAllocateAndGetTable() fails). */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl_2, sizeof(*luid_tbl_2), + NULL, 0, (void **)&dyn_tbl_2, sizeof(*dyn_tbl_2), + NULL, 0, &count, 0 ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + for (i = 0; i < count; i++) + { + MIB_IF_ROW2 *row = table->Table + i; + NET_LUID *luid = luid_tbl + i; + struct nsi_ndis_ifinfo_rw *rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + struct nsi_ndis_ifinfo_dynamic *dyn = dyn_tbl + i, *dyn_2 = dyn_tbl_2 + i; + struct nsi_ndis_ifinfo_static *stat = stat_tbl + i; + + ok( row->InterfaceLuid.Value == luid->Value, "%d: mismatch\n", i ); + ok( row->InterfaceIndex == stat->if_index, "%d: mismatch\n", i ); + ok( IsEqualGUID( &row->InterfaceGuid, &stat->if_guid ), "%d: mismatch\n", i ); + ok( !memcmp( row->Alias, rw->alias.String, rw->alias.Length ), "%d: mismatch\n", i ); + ok( lstrlenW( row->Alias ) * 2 == rw->alias.Length, "%d: mismatch\n", i ); + ok( !memcmp( row->Description, stat->descr.String, sizeof(row->Description) ), "%d: mismatch\n", i ); + ok( lstrlenW( row->Description ) * 2 == stat->descr.Length, "%d: mismatch\n", i ); + ok( row->PhysicalAddressLength == rw->phys_addr.Length, "%d: mismatch\n", i ); + ok( !memcmp( row->PhysicalAddress, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "%d: mismatch\n", i ); + ok( row->PhysicalAddressLength == stat->perm_phys_addr.Length, "%d: mismatch\n", i ); + ok( !memcmp( row->PermanentPhysicalAddress, stat->perm_phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "%d: mismatch\n", i ); + ok( row->Mtu == dyn->mtu, "%d: mismatch\n", i ); + ok( row->Type == stat->type, "%d: mismatch\n", i ); + /* TunnelType */ + ok( row->MediaType == stat->media_type, "%d: mismatch\n", i ); + ok( row->PhysicalMediumType == stat->phys_medium_type, "%d: mismatch\n", i ); + ok( row->AccessType == stat->access_type, "%d: mismatch\n", i ); + /* DirectionType */ + ok( row->InterfaceAndOperStatusFlags.HardwareInterface == stat->flags.hw, "%d: mismatch\n", i ); + ok( row->InterfaceAndOperStatusFlags.FilterInterface == stat->flags.filter, "%d: mismatch\n", i ); + ok( row->InterfaceAndOperStatusFlags.ConnectorPresent == stat->conn_present, "%d: mismatch\n", i ); + /* NotAuthenticated */ + ok( row->InterfaceAndOperStatusFlags.NotMediaConnected == dyn->flags.not_media_conn, "%d: mismatch\n", i ); + /* Paused */ + /* LowPower */ + /* EndPointInterface */ + ok( row->OperStatus == dyn->oper_status, "%d: mismatch\n", i ); + ok( row->AdminStatus == rw->admin_status, "%d: mismatch\n", i ); + ok( row->MediaConnectState == dyn->media_conn_state, "%d: status mismatch\n", i ); + ok( IsEqualGUID( &row->NetworkGuid, &rw->network_guid ), "%d: mismatch\n", i ); + ok( row->ConnectionType == stat->conn_type, "%d: mismatch\n", i ); + if (dyn->xmit_speed == ~0ULL) dyn->xmit_speed = 0; + ok( row->TransmitLinkSpeed == dyn->xmit_speed, "%d: mismatch\n", i ); + if (dyn->rcv_speed == ~0ULL) dyn->rcv_speed = 0; + ok( row->ReceiveLinkSpeed == dyn->rcv_speed, "%d: mismatch\n", i ); + ok( bounded( row->InOctets, dyn->in_octets, dyn_2->in_octets ), "%d: mismatch\n", i ); + ok( bounded( row->InUcastPkts, dyn->in_ucast_pkts, dyn_2->in_ucast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->InNUcastPkts, dyn->in_mcast_pkts + dyn->in_bcast_pkts, + dyn_2->in_mcast_pkts + dyn_2->in_bcast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->InDiscards, dyn->in_discards, dyn_2->in_discards ), "%d: mismatch\n", i ); + ok( bounded( row->InErrors, dyn->in_errors, dyn_2->in_errors ), "%d: mismatch\n", i ); + /* InUnknownProtos */ + ok( bounded( row->InUcastOctets, dyn->in_ucast_octs, dyn_2->in_ucast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->InMulticastOctets, dyn->in_mcast_octs, dyn_2->in_mcast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->InBroadcastOctets, dyn->in_bcast_octs, dyn_2->in_bcast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->OutOctets, dyn->out_octets, dyn_2->out_octets ), "%d: mismatch\n", i ); + ok( bounded( row->OutUcastPkts, dyn->out_ucast_pkts, dyn_2->out_ucast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->OutNUcastPkts, dyn->out_mcast_pkts + dyn->out_bcast_pkts, + dyn_2->out_mcast_pkts + dyn_2->out_bcast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->OutDiscards, dyn->out_discards, dyn_2->out_discards ), "%d: mismatch\n", i ); + ok( bounded( row->OutErrors, dyn->out_errors, dyn_2->out_errors ), "%d: mismatch\n", i ); + ok( bounded( row->OutUcastOctets, dyn->out_ucast_octs, dyn_2->out_ucast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->OutMulticastOctets, dyn->out_mcast_octs, dyn_2->out_mcast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->OutBroadcastOctets, dyn->out_bcast_octs, dyn_2->out_bcast_octs ), "%d: mismatch\n", i ); + /* OutQLen */ + } + + FreeMibTable( table ); + NsiFreeTable( luid_tbl_2, NULL, dyn_tbl_2, NULL ); + NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); +} + +START_TEST( nsi ) +{ + test_ndis_ifinfo(); +} diff --git a/include/ifmib.h b/include/ifmib.h index 440ed144037..83f2c090945 100644 --- a/include/ifmib.h +++ b/include/ifmib.h @@ -66,5 +66,77 @@ typedef struct _MIB_IFTABLE MIB_IFROW table[1]; } MIB_IFTABLE, *PMIB_IFTABLE; +/* Undocumented NSI NDIS tables */ +#define NSI_NDIS_IFINFO_TABLE 0 +#define NSI_NDIS_INDEX_LUID_TABLE 2 + +struct nsi_ndis_ifinfo_rw +{ + GUID network_guid; + DWORD admin_status; + IF_COUNTED_STRING alias; /* .Length in bytes not including '\0' */ + IF_PHYSICAL_ADDRESS phys_addr; + USHORT pad; + IF_COUNTED_STRING name2; + DWORD unk; +}; + +struct nsi_ndis_ifinfo_dynamic +{ + DWORD oper_status; + struct + { + DWORD unk : 1; + DWORD not_media_conn : 1; + DWORD unk2 : 30; + } flags; + DWORD media_conn_state; + DWORD unk; + DWORD mtu; + ULONG64 xmit_speed; + ULONG64 rcv_speed; + ULONG64 in_errors; + ULONG64 in_discards; + ULONG64 out_errors; + ULONG64 out_discards; + ULONG64 unk2; + ULONG64 in_octets; + ULONG64 in_ucast_pkts; + ULONG64 in_mcast_pkts; + ULONG64 in_bcast_pkts; + ULONG64 out_octets; + ULONG64 out_ucast_pkts; + ULONG64 out_mcast_pkts; + ULONG64 out_bcast_pkts; + ULONG64 unk3[2]; + ULONG64 in_ucast_octs; + ULONG64 in_mcast_octs; + ULONG64 in_bcast_octs; + ULONG64 out_ucast_octs; + ULONG64 out_mcast_octs; + ULONG64 out_bcast_octs; + ULONG64 unk4; +}; + +struct nsi_ndis_ifinfo_static +{ + DWORD if_index; + IF_COUNTED_STRING descr; + DWORD type; + DWORD access_type; + DWORD unk; + DWORD conn_type; + GUID if_guid; + USHORT conn_present; + IF_PHYSICAL_ADDRESS perm_phys_addr; + struct + { + DWORD hw : 1; + DWORD filter : 1; + DWORD unk : 30; + } flags; + DWORD media_type; + DWORD phys_medium_type; +}; #endif /* __WINE_IFMIB_H */ -- 2.23.0

1 0

[PATCH 4/5] nsi: Add stub implementations of NsiAllocateAndGetTable() and NsiFreeTable().
by Huw Davies 24 Jun '21

24 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/Makefile.in | 3 +++ dlls/nsi/nsi.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 4 ++-- include/netiodef.h | 6 ++++++ 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 dlls/nsi/nsi.c diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in index 634c4011ed9..68126cab6c6 100644 --- a/dlls/nsi/Makefile.in +++ b/dlls/nsi/Makefile.in @@ -2,3 +2,6 @@ MODULE = nsi.dll IMPORTLIB = nsi EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c new file mode 100644 index 00000000000..3d6429a9113 --- /dev/null +++ b/dlls/nsi/nsi.c @@ -0,0 +1,44 @@ +/* + * Network Store Interface + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, + void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, + void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ) +{ + FIXME( "%d %p %d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key_data, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count, unk2 ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) +{ + FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 2d500d30e94..fc2db9e35c1 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -1,5 +1,5 @@ @ stub NsiAllocateAndGetPersistentDataWithMaskTable -@ stub NsiAllocateAndGetTable +@ stdcall NsiAllocateAndGetTable(long ptr long ptr long ptr long ptr long ptr long ptr long) @ stub NsiCancelChangeNotification @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx @@ -7,7 +7,7 @@ @ stub NsiEnumerateObjectsAllParametersEx @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable -@ stub NsiFreeTable +@ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stub NsiGetAllParameters @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask diff --git a/include/netiodef.h b/include/netiodef.h index 3089685bef1..2bc05399b63 100644 --- a/include/netiodef.h +++ b/include/netiodef.h @@ -96,4 +96,10 @@ DEFINE_NPI_MS_MODULEID( NPI_MS_NDIS_MODULEID, 0x11 ); #undef _U #undef __U +/* Undocumented Nsi api */ +DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, + void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, + void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); +void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); + #endif /* __WINE_NETIODEF_H */ -- 2.23.0

1 0

[PATCH 3/5] nsi: Add a stub dll.
by Huw Davies 24 Jun '21

24 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/Makefile.in | 4 ++++ dlls/nsi/nsi.spec | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 dlls/nsi/Makefile.in create mode 100644 dlls/nsi/nsi.spec diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in new file mode 100644 index 00000000000..634c4011ed9 --- /dev/null +++ b/dlls/nsi/Makefile.in @@ -0,0 +1,4 @@ +MODULE = nsi.dll +IMPORTLIB = nsi + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec new file mode 100644 index 00000000000..2d500d30e94 --- /dev/null +++ b/dlls/nsi/nsi.spec @@ -0,0 +1,26 @@ +@ stub NsiAllocateAndGetPersistentDataWithMaskTable +@ stub NsiAllocateAndGetTable +@ stub NsiCancelChangeNotification +@ stub NsiDeregisterChangeNotification +@ stub NsiDeregisterChangeNotificationEx +@ stub NsiEnumerateObjectsAllParameters +@ stub NsiEnumerateObjectsAllParametersEx +@ stub NsiEnumerateObjectsAllPersistentParametersWithMask +@ stub NsiFreePersistentDataWithMaskTable +@ stub NsiFreeTable +@ stub NsiGetAllParameters +@ stub NsiGetAllParametersEx +@ stub NsiGetAllPersistentParametersWithMask +@ stub NsiObjectSecurity +@ stub NsiGetParameter +@ stub NsiGetParameterEx +@ stub NsiRegisterChangeNotification +@ stub NsiRegisterChangeNotificationEx +@ stub NsiRequestChangeNotification +@ stub NsiRequestChangeNotificationEx +@ stub NsiSetAllParameters +@ stub NsiSetAllParametersEx +@ stub NsiSetAllPersistentParametersWithMask +@ stub NsiSetObjectSecurity +@ stub NsiSetParameter +@ stub NsiSetParameterEx -- 2.23.0

1 0

[PATCH 1/5] include: Add netiodef.h.
by Huw Davies 24 Jun '21

24 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- include/Makefile.in | 1 + include/netiodef.h | 68 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 include/netiodef.h diff --git a/include/Makefile.in b/include/Makefile.in index 5b84d7858ff..4a8c261bb8f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -524,6 +524,7 @@ SOURCES = \ netcon.idl \ netfw.idl \ netioapi.h \ + netiodef.h \ netlistmgr.idl \ newdev.h \ nldef.h \ diff --git a/include/netiodef.h b/include/netiodef.h new file mode 100644 index 00000000000..4d8d469b138 --- /dev/null +++ b/include/netiodef.h @@ -0,0 +1,68 @@ +/* + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_NETIODEF_H +#define __WINE_NETIODEF_H + +typedef enum _NPI_MODULEID_TYPE +{ + MIT_GUID = 1, + MIT_IF_LUID +} NPI_MODULEID_TYPE; + +typedef struct _NPI_MODULEID +{ + USHORT Length; + NPI_MODULEID_TYPE Type; + union + { + GUID Guid; + LUID IfLuid; + } DUMMYUNIONNAME; +} NPI_MODULEID; + +typedef const NPI_MODULEID *PNPI_MODULEID; + +#ifdef NONAMELESSUNION +#define _U(x) (x).u +#else +#define _U(x) (x) +#endif + +static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI_MODULEID *mod2 ) +{ + if (mod1->Type == mod2->Type) + { + if (mod1->Type == MIT_GUID) + { +#ifdef __cplusplus + return IsEqualGUID( _U(*mod1).Guid, _U(*mod2).Guid ); +#else + return IsEqualGUID( &_U(*mod1).Guid, &_U(*mod2).Guid ); +#endif + } + else if (mod1->Type == MIT_IF_LUID) + return _U(*mod1).IfLuid.HighPart == _U(*mod2).IfLuid.HighPart && + _U(*mod1).IfLuid.LowPart == _U(*mod2).IfLuid.LowPart; + } + return FALSE; +} + +#undef _U + +#endif /* __WINE_NETIODEF_H */ -- 2.23.0

1 0

[PATCH vkd3d v2] tests: Add offset tests to test_uav_counters().
by Conor McCarthy 24 Jun '21

24 Jun '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 226 +++++++++++++++++++++++++++----------------------- 1 file changed, 123 insertions(+), 103 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index f289a10d..ce6d6b36 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21671,6 +21671,8 @@ static void test_uav_counters(void) 0x00000001, 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0010001a, 0x00000000, 0x0100003e, }; + static const unsigned int counter_offsets[] = {0, 1, 255}; + if (!init_compute_test_context(&context)) return; device = context.device; @@ -21694,9 +21696,6 @@ static void test_uav_counters(void) hr = create_root_signature(device, &root_signature_desc, &context.root_signature); ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); - context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, - shader_bytecode(cs_producer_code, sizeof(cs_producer_code))); - descriptor_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 3); buffer = create_default_buffer(device, 1024, @@ -21706,120 +21705,141 @@ static void test_uav_counters(void) counter_buffer = create_default_buffer(device, 1024, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - memset(&uav_desc, 0, sizeof(uav_desc)); - uav_desc.Format = DXGI_FORMAT_UNKNOWN; - uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; - uav_desc.Buffer.NumElements = 256; - uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); - uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; - ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, - get_cpu_descriptor_handle(&context, descriptor_heap, 0)); - ID3D12Device_CreateUnorderedAccessView(device, out_buffer, NULL, &uav_desc, - get_cpu_descriptor_handle(&context, descriptor_heap, 1)); + for (i = 0; i < ARRAY_SIZE(counter_offsets); ++i) + { + unsigned int j; - counter = 0; - upload_buffer_data(counter_buffer, 0, sizeof(counter), &counter, queue, command_list); - reset_command_list(command_list, context.allocator); - transition_sub_resource_state(command_list, counter_buffer, 0, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + vkd3d_test_set_context("Offset %u", counter_offsets[i]); - /* produce */ - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap); - ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, - ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap)); - ID3D12GraphicsCommandList_Dispatch(command_list, 16, 1, 1); + context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, + shader_bytecode(cs_producer_code, sizeof(cs_producer_code))); - counter = read_uav_counter(&context, counter_buffer, 0); - ok(counter == 64, "Got unexpected value %u.\n", counter); - transition_sub_resource_state(command_list, buffer, 0, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - memcpy(id, rb.data, 64 * sizeof(*id)); - release_resource_readback(&rb); - qsort(id, 64, sizeof(*id), compare_id); - for (i = 0; i < 64; ++i) - { - if (id[i] != i) - break; - } - ok(i == 64, "Got unexpected id %u at %u.\n", id[i], i); + memset(&uav_desc, 0, sizeof(uav_desc)); + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.NumElements = 256; + uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; + uav_desc.Buffer.CounterOffsetInBytes = counter_offsets[i] * sizeof(uint32_t); + ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + get_cpu_descriptor_handle(&context, descriptor_heap, 0)); + ID3D12Device_CreateUnorderedAccessView(device, out_buffer, NULL, &uav_desc, + get_cpu_descriptor_handle(&context, descriptor_heap, 1)); + + counter = 0; + upload_buffer_data(counter_buffer, counter_offsets[i] * sizeof(uint32_t), + sizeof(counter), &counter, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, counter_buffer, 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - reset_command_list(command_list, context.allocator); - transition_sub_resource_state(command_list, buffer, 0, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + /* produce */ + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap)); + ID3D12GraphicsCommandList_Dispatch(command_list, 16, 1, 1); - ID3D12PipelineState_Release(context.pipeline_state); - context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, - shader_bytecode(cs_consumer_code, sizeof(cs_consumer_code))); + counter = read_uav_counter(&context, counter_buffer, uav_desc.Buffer.CounterOffsetInBytes); + ok(counter == 64, "Got unexpected value %u.\n", counter); + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + memcpy(id, rb.data, 64 * sizeof(*id)); + release_resource_readback(&rb); + qsort(id, 64, sizeof(*id), compare_id); + for (j = 0; j < 64; ++j) + { + if (id[j] != j) + break; + } + ok(j == 64, "Got unexpected id %u at %u.\n", id[j], j); - /* consume */ - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap); - ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, - ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap)); - ID3D12GraphicsCommandList_Dispatch(command_list, 16, 1, 1); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - transition_sub_resource_state(command_list, out_buffer, 0, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - counter = read_uav_counter(&context, counter_buffer, 0); - ok(!counter, "Got unexpected value %u.\n", counter); - get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - memcpy(id, rb.data, 64 * sizeof(*id)); - release_resource_readback(&rb); - qsort(id, 64, sizeof(*id), compare_id); - for (i = 0; i < 64; ++i) - { - if (id[i] != i) - break; - } - ok(i == 64, "Got unexpected id %u at %u.\n", id[i], i); + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, + shader_bytecode(cs_consumer_code, sizeof(cs_consumer_code))); - reset_command_list(command_list, context.allocator); - transition_sub_resource_state(command_list, counter_buffer, 0, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - transition_sub_resource_state(command_list, buffer, 0, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - transition_sub_resource_state(command_list, out_buffer, 0, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + /* consume */ + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap)); + ID3D12GraphicsCommandList_Dispatch(command_list, 16, 1, 1); - /* produce on CPU */ - counter = 8; - for (i = 0; i < counter; ++i) - id[i] = 0xdeadbeef; - upload_buffer_data(buffer, 0, counter * sizeof(*id), id, queue, command_list); - reset_command_list(command_list, context.allocator); - upload_buffer_data(counter_buffer, 0, sizeof(counter), &counter, queue, command_list); - reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, out_buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + counter = read_uav_counter(&context, counter_buffer, uav_desc.Buffer.CounterOffsetInBytes); + ok(!counter, "Got unexpected value %u.\n", counter); + get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + memcpy(id, rb.data, 64 * sizeof(*id)); + release_resource_readback(&rb); + qsort(id, 64, sizeof(*id), compare_id); + for (j = 0; j < 64; ++j) + { + if (id[j] != j) + break; + } + ok(j == 64, "Got unexpected id %u at %u.\n", id[j], j); - transition_sub_resource_state(command_list, counter_buffer, 0, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - transition_sub_resource_state(command_list, buffer, 0, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, counter_buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + transition_sub_resource_state(command_list, out_buffer, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - /* consume */ - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap); - ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, - ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap)); - ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); - ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + /* produce on CPU */ + counter = 8; + for (j = 0; j < counter; ++j) + id[j] = 0xdeadbeef; + upload_buffer_data(buffer, 0, counter * sizeof(*id), id, queue, command_list); + reset_command_list(command_list, context.allocator); + upload_buffer_data(counter_buffer, counter_offsets[i] * sizeof(uint32_t), + sizeof(counter), &counter, queue, command_list); + reset_command_list(command_list, context.allocator); - transition_sub_resource_state(command_list, out_buffer, 0, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - counter = read_uav_counter(&context, counter_buffer, 0); - ok(!counter, "Got unexpected value %u.\n", counter); + transition_sub_resource_state(command_list, counter_buffer, 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - for (i = 0; i < 8; ++i) - { - data = get_readback_uint(&rb, i, 0, 0); - ok(data == 0xdeadbeef, "Got data %u at %u.\n", data, i); + /* consume */ + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap)); + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + + transition_sub_resource_state(command_list, out_buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + counter = read_uav_counter(&context, counter_buffer, uav_desc.Buffer.CounterOffsetInBytes); + ok(!counter, "Got unexpected value %u.\n", counter); + + get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (j = 0; j < 8; ++j) + { + data = get_readback_uint(&rb, j, 0, 0); + ok(data == 0xdeadbeef, "Got data %u at %u.\n", data, j); + } + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, out_buffer, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + transition_sub_resource_state(command_list, counter_buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = NULL; } - release_resource_readback(&rb); ID3D12Resource_Release(buffer); ID3D12Resource_Release(out_buffer); -- 2.31.1

2 1

[PATCH vkd3d v4 1/5] vkd3d-shader: Introduce struct vkd3d_shader_register_range.
by Conor McCarthy 24 Jun '21

24 Jun '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 25 ++++++++++++++---------- libs/vkd3d-shader/spirv.c | 8 ++++---- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 9 +++++++-- 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index d2cf87e3..61acf77b 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -654,7 +654,8 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, } reg_data_type = opcode == VKD3D_SM4_OP_DCL_RESOURCE ? VKD3D_DATA_RESOURCE : VKD3D_DATA_UAV; shader_sm4_read_dst_param(priv, &tokens, end, reg_data_type, &semantic->resource.reg); - semantic->resource.register_index = shader_sm4_map_resource_idx(&semantic->resource.reg.reg, priv); + semantic->resource.range.first = shader_sm4_map_resource_idx(&semantic->resource.reg.reg, priv); + semantic->resource.range.last = semantic->resource.range.first; components = *tokens++; for (i = 0; i < VKD3D_VEC4_SIZE; i++) @@ -675,7 +676,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, if (reg_data_type == VKD3D_DATA_UAV) ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; - shader_sm4_read_register_space(priv, &tokens, end, &semantic->resource.register_space); + shader_sm4_read_register_space(priv, &tokens, end, &semantic->resource.range.space); } static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction *ins, @@ -916,9 +917,10 @@ static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); - resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.first = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.last = resource->resource.range.first; ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; - shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); + shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space); } static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction *ins, @@ -929,12 +931,13 @@ static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction * const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); - resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.first = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.last = resource->resource.range.first; ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; resource->byte_stride = *tokens++; if (resource->byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", resource->byte_stride); - shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); + shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space); } static void shader_sm5_read_dcl_tgsm_raw(struct vkd3d_shader_instruction *ins, @@ -967,11 +970,12 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); - resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.first = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.last = resource->resource.range.first; resource->byte_stride = *tokens++; if (resource->byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", resource->byte_stride); - shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); + shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space); } static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *ins, @@ -982,8 +986,9 @@ static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *in const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); - resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); - shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); + resource->resource.range.first = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.last = resource->resource.range.first; + shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space); } static void shader_sm5_read_sync(struct vkd3d_shader_instruction *ins, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0e75b0ae..7a23d315 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2441,8 +2441,8 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility)) continue; - if ((!resource || (combined_sampler->resource_space == resource->register_space - && combined_sampler->resource_index == resource->register_index)) + if ((!resource || (combined_sampler->resource_space == resource->range.space + && combined_sampler->resource_index == resource->range.first)) && (!sampler || (combined_sampler->sampler_space == sampler->register_space && combined_sampler->sampler_index == sampler->register_index))) return true; @@ -5554,8 +5554,8 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp SpvStorageClass storage_class = SpvStorageClassUniformConstant; const struct vkd3d_shader_register *reg = &resource->reg.reg; const struct vkd3d_spirv_resource_type *resource_type_info; - unsigned int register_space = resource->register_space; - unsigned int register_index = resource->register_index; + unsigned int register_space = resource->range.space; + unsigned int register_index = resource->range.first; enum vkd3d_shader_component_type sampled_type; struct vkd3d_symbol resource_symbol; bool is_uav; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 4e355118..c35179a8 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1428,7 +1428,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_ins_modifiers(compiler, &ins->declaration.semantic.resource.reg); vkd3d_string_buffer_printf(buffer, "%s ", compiler->colours.reset); shader_dump_register(compiler, &ins->declaration.semantic.resource.reg.reg); - shader_dump_register_space(compiler, ins->declaration.semantic.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.semantic.resource.range.space); break; case VKD3DSIH_DCL_CONSTANT_BUFFER: @@ -1531,14 +1531,14 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_RESOURCE_RAW: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.raw_resource.resource.reg); - shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.range.space); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg); shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, ""); - shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.range.space); break; case VKD3DSIH_DCL_SAMPLER: @@ -1597,7 +1597,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_uav_flags(compiler, ins->flags); shader_addline(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.raw_resource.resource.reg); - shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.range.space); break; case VKD3DSIH_DCL_UAV_STRUCTURED: @@ -1605,7 +1605,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg); shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, ""); - shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.range.space); break; case VKD3DSIH_DEF: diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 2308b894..df811d37 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -666,8 +666,8 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, - resource->register_index, resource_type, resource_data_type, 0); + vkd3d_shader_scan_add_descriptor(context, type, resource->range.space, + resource->range.first, resource_type, resource_data_type, 0); if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) vkd3d_shader_scan_add_uav_range(context, resource->reg.reg.idx[0].offset, context->scan_descriptor_info->descriptor_count - 1); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6d756e40..cddb3d27 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -636,11 +636,16 @@ struct vkd3d_shader_index_range unsigned int register_count; }; +struct vkd3d_shader_register_range +{ + unsigned int space; + unsigned int first, last; +}; + struct vkd3d_shader_resource { struct vkd3d_shader_dst_param reg; - unsigned int register_space; - unsigned int register_index; + struct vkd3d_shader_register_range range; }; enum vkd3d_decl_usage -- 2.31.1

2 9

[PATCH 1/5] hid: Rewrite HidP_GetSpecificValueCaps using enum_value_caps.
by Rémi Bernon 24 Jun '21

24 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 110 +++++++++++++++-------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 91 +----------------------- 2 files changed, 59 insertions(+), 142 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 301c367d37a..c11a5d66985 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -69,6 +69,7 @@ static NTSTATUS get_value_caps_range( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_ struct caps_filter { BOOLEAN buttons; + BOOLEAN values; USAGE usage_page; USHORT collection; USAGE usage; @@ -78,6 +79,7 @@ static BOOL match_value_caps( const struct hid_value_caps *caps, const struct ca { if (!caps->usage_min && !caps->usage_max) return FALSE; if (filter->buttons && !HID_VALUE_CAPS_IS_BUTTON( caps )) return FALSE; + if (filter->values && HID_VALUE_CAPS_IS_BUTTON( caps )) return FALSE; if (filter->usage_page && filter->usage_page != caps->usage_page) return FALSE; if (filter->collection && filter->collection != caps->link_collection) return FALSE; if (!filter->usage) return TRUE; @@ -247,6 +249,9 @@ NTSTATUS WINAPI HidP_GetCaps( PHIDP_PREPARSED_DATA preparsed_data, HIDP_CAPS *ca caps->NumberInputButtonCaps = preparsed->new_caps.NumberInputButtonCaps; caps->NumberOutputButtonCaps = preparsed->new_caps.NumberOutputButtonCaps; caps->NumberFeatureButtonCaps = preparsed->new_caps.NumberFeatureButtonCaps; + caps->NumberInputValueCaps = preparsed->new_caps.NumberInputValueCaps; + caps->NumberOutputValueCaps = preparsed->new_caps.NumberOutputValueCaps; + caps->NumberFeatureValueCaps = preparsed->new_caps.NumberFeatureValueCaps; return HIDP_STATUS_SUCCESS; } @@ -701,68 +706,67 @@ NTSTATUS WINAPI HidP_GetSpecificButtonCaps( HIDP_REPORT_TYPE report_type, USAGE return enum_value_caps( preparsed, report_type, &filter, get_button_caps, &caps, caps_count ); } -NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, - USAGE UsagePage, USHORT LinkCollection, USAGE Usage, - HIDP_VALUE_CAPS *ValueCaps, USHORT *ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData) +static NTSTATUS get_value_caps( const struct hid_value_caps *caps, void *user ) { - WINE_HIDP_PREPARSED_DATA *data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - USHORT v_count = 0, r_count = 0; - int i,j,u; - - TRACE("(%i, 0x%x, %i, 0x%x, %p %p %p)\n", ReportType, UsagePage, LinkCollection, - Usage, ValueCaps, ValueCapsLength, PreparsedData); - - if (data->magic != HID_MAGIC) - return HIDP_STATUS_INVALID_PREPARSED_DATA; - - switch(ReportType) + HIDP_VALUE_CAPS **iter = user, *dst = *iter; + dst->UsagePage = caps->usage_page; + dst->ReportID = caps->report_id; + dst->LinkCollection = caps->link_collection; + dst->LinkUsagePage = caps->link_usage_page; + dst->LinkUsage = caps->link_usage; + dst->BitField = caps->bit_field; + dst->IsAlias = FALSE; + dst->IsAbsolute = HID_VALUE_CAPS_IS_ABSOLUTE( caps ); + dst->HasNull = HID_VALUE_CAPS_HAS_NULL( caps ); + dst->BitSize = caps->bit_size; + dst->ReportCount = caps->is_range ? 1 : caps->report_count; + dst->UnitsExp = caps->units_exp; + dst->Units = caps->units; + dst->LogicalMin = caps->logical_min; + dst->LogicalMax = caps->logical_max; + dst->PhysicalMin = caps->physical_min; + dst->PhysicalMax = caps->physical_max; + if (!(dst->IsRange = caps->is_range)) { - case HidP_Input: - v_count = data->caps.NumberInputValueCaps; - report = HID_INPUT_REPORTS(data); - break; - case HidP_Output: - v_count = data->caps.NumberOutputValueCaps; - report = HID_OUTPUT_REPORTS(data); - break; - case HidP_Feature: - v_count = data->caps.NumberFeatureValueCaps; - report = HID_FEATURE_REPORTS(data); - break; - default: - return HIDP_STATUS_INVALID_REPORT_TYPE; + dst->NotRange.Usage = caps->usage_min; + dst->NotRange.DataIndex = caps->data_index_min; } - r_count = data->reportCount[ReportType]; - - if (!r_count || !v_count) + else { - *ValueCapsLength = 0; - return HIDP_STATUS_SUCCESS; + dst->Range.UsageMin = caps->usage_min; + dst->Range.UsageMax = caps->usage_max; + dst->Range.DataIndexMin = caps->data_index_min; + dst->Range.DataIndexMax = caps->data_index_max; } - - v_count = min(v_count, *ValueCapsLength); - - u = 0; - for (j = 0; j < r_count && u < v_count; j++) + if (!(dst->IsStringRange = caps->is_string_range)) + dst->NotRange.StringIndex = caps->string_min; + else { - for (i = 0; i < report[j].elementCount && u < v_count; i++) - { - if (elems[report[j].elementIdx + i].caps.BitSize != 1 && - (UsagePage == 0 || UsagePage == elems[report[j].elementIdx + i].caps.UsagePage) && - (LinkCollection == 0 || LinkCollection == elems[report[j].elementIdx + i].caps.LinkCollection) && - (Usage == 0 || Usage == elems[report[j].elementIdx + i].caps.NotRange.Usage)) - { - ValueCaps[u++] = elems[report[j].elementIdx + i].caps; - } - } + dst->Range.StringMin = caps->string_min; + dst->Range.StringMax = caps->string_max; } - TRACE("Matched %i usages\n", u); + if ((dst->IsDesignatorRange = caps->is_designator_range)) + dst->NotRange.DesignatorIndex = caps->designator_min; + else + { + dst->Range.DesignatorMin = caps->designator_min; + dst->Range.DesignatorMax = caps->designator_max; + } + *iter += 1; + return HIDP_STATUS_SUCCESS; +} + +NTSTATUS WINAPI HidP_GetSpecificValueCaps( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, + USAGE usage, HIDP_VALUE_CAPS *caps, USHORT *caps_count, + PHIDP_PREPARSED_DATA preparsed_data ) +{ + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + const struct caps_filter filter = {.values = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; - *ValueCapsLength = u; + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, caps %p, caps_count %p, preparsed_data %p.\n", + report_type, usage_page, collection, usage, caps, caps_count, preparsed_data ); - return HIDP_STATUS_SUCCESS; + return enum_value_caps( preparsed, report_type, &filter, get_value_caps, &caps, caps_count ); } NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 11779daf684..3ce750728ec 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1834,7 +1834,6 @@ static void test_hidp(HANDLE file, int report_id) check_member(caps, expect_hidp_caps[report_id], "%d", FeatureReportByteLength); check_member(caps, expect_hidp_caps[report_id], "%d", NumberLinkCollectionNodes); check_member(caps, expect_hidp_caps[report_id], "%d", NumberInputButtonCaps); - todo_wine check_member(caps, expect_hidp_caps[report_id], "%d", NumberInputValueCaps); todo_wine check_member(caps, expect_hidp_caps[report_id], "%d", NumberInputDataIndices); @@ -1934,15 +1933,12 @@ static void test_hidp(HANDLE file, int report_id) count = ARRAY_SIZE(value_caps); status = HidP_GetValueCaps(HidP_Output, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetValueCaps returned %#x\n", status); status = HidP_GetValueCaps(HidP_Feature + 1, value_caps, &count, preparsed_data); ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetValueCaps returned %#x\n", status); count = 0; status = HidP_GetValueCaps(HidP_Input, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetValueCaps returned %#x\n", status); - todo_wine ok(count == caps.NumberInputValueCaps, "HidP_GetValueCaps returned count %d, expected %d\n", count, caps.NumberInputValueCaps); count = ARRAY_SIZE(value_caps); @@ -1956,61 +1952,18 @@ static void test_hidp(HANDLE file, int report_id) for (i = 0; i < ARRAY_SIZE(expect_value_caps); ++i) { winetest_push_context("value_caps[%d]", i); - todo_wine_if(i == 3) - check_member(value_caps[i], expect_value_caps[i], "%04x", UsagePage); - check_member(value_caps[i], expect_value_caps[i], "%d", ReportID); - check_member(value_caps[i], expect_value_caps[i], "%d", IsAlias); - todo_wine_if(i == 2) - check_member(value_caps[i], expect_value_caps[i], "%d", BitField); - check_member(value_caps[i], expect_value_caps[i], "%d", LinkCollection); - check_member(value_caps[i], expect_value_caps[i], "%04x", LinkUsage); - check_member(value_caps[i], expect_value_caps[i], "%04x", LinkUsagePage); - todo_wine_if(i == 3) - check_member(value_caps[i], expect_value_caps[i], "%d", IsRange); - check_member(value_caps[i], expect_value_caps[i], "%d", IsStringRange); - check_member(value_caps[i], expect_value_caps[i], "%d", IsDesignatorRange); - todo_wine_if(i == 2) - check_member(value_caps[i], expect_value_caps[i], "%d", IsAbsolute); - todo_wine_if(i == 2) - check_member(value_caps[i], expect_value_caps[i], "%d", HasNull); - todo_wine_if(i >= 2) - check_member(value_caps[i], expect_value_caps[i], "%d", BitSize); - todo_wine_if(i == 2) - check_member(value_caps[i], expect_value_caps[i], "%d", ReportCount); - check_member(value_caps[i], expect_value_caps[i], "%d", UnitsExp); - check_member(value_caps[i], expect_value_caps[i], "%d", Units); - todo_wine_if(i >= 3) - check_member(value_caps[i], expect_value_caps[i], "%d", LogicalMin); - todo_wine_if(i >= 2) - check_member(value_caps[i], expect_value_caps[i], "%d", LogicalMax); - check_member(value_caps[i], expect_value_caps[i], "%d", PhysicalMin); - check_member(value_caps[i], expect_value_caps[i], "%d", PhysicalMax); - todo_wine - check_member(value_caps[i], expect_value_caps[i], "%04x", Range.UsageMin); - todo_wine - check_member(value_caps[i], expect_value_caps[i], "%04x", Range.UsageMax); - check_member(value_caps[i], expect_value_caps[i], "%d", Range.StringMin); - check_member(value_caps[i], expect_value_caps[i], "%d", Range.StringMax); - check_member(value_caps[i], expect_value_caps[i], "%d", Range.DesignatorMin); - check_member(value_caps[i], expect_value_caps[i], "%d", Range.DesignatorMax); - todo_wine_if(i >= 2) - check_member(value_caps[i], expect_value_caps[i], "%d", Range.DataIndexMin); - todo_wine_if(i >= 2) - check_member(value_caps[i], expect_value_caps[i], "%d", Range.DataIndexMax); + check_hidp_value_caps(&value_caps[i], &expect_value_caps[i]); winetest_pop_context(); } count = ARRAY_SIZE(value_caps) - 4; status = HidP_GetSpecificValueCaps(HidP_Output, 0, 0, 0, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); status = HidP_GetSpecificValueCaps(HidP_Feature + 1, 0, 0, 0, value_caps, &count, preparsed_data); ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetSpecificValueCaps returned %#x\n", status); count = 0; status = HidP_GetSpecificValueCaps(HidP_Input, 0, 0, 0, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetSpecificValueCaps returned %#x\n", status); - todo_wine ok(count == caps.NumberInputValueCaps, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, caps.NumberInputValueCaps); count = ARRAY_SIZE(value_caps) - 4; @@ -2031,58 +1984,18 @@ static void test_hidp(HANDLE file, int report_id) value_caps + 4, &count, preparsed_data); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetSpecificValueCaps returned %#x\n", status); ok(count == 1, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 1); - - todo_wine - check_member(value_caps[4], value_caps[3], "%04x", UsagePage); - check_member(value_caps[4], value_caps[3], "%d", ReportID); - check_member(value_caps[4], value_caps[3], "%d", IsAlias); - check_member(value_caps[4], value_caps[3], "%d", BitField); - check_member(value_caps[4], value_caps[3], "%d", LinkCollection); - check_member(value_caps[4], value_caps[3], "%04x", LinkUsage); - check_member(value_caps[4], value_caps[3], "%04x", LinkUsagePage); - todo_wine - check_member(value_caps[4], value_caps[3], "%d", IsRange); - check_member(value_caps[4], value_caps[3], "%d", IsStringRange); - check_member(value_caps[4], value_caps[3], "%d", IsDesignatorRange); - check_member(value_caps[4], value_caps[3], "%d", IsAbsolute); - check_member(value_caps[4], value_caps[3], "%d", HasNull); - todo_wine - check_member(value_caps[4], value_caps[3], "%d", BitSize); - check_member(value_caps[4], value_caps[3], "%d", ReportCount); - check_member(value_caps[4], value_caps[3], "%d", UnitsExp); - check_member(value_caps[4], value_caps[3], "%d", Units); - todo_wine - check_member(value_caps[4], value_caps[3], "%d", LogicalMin); - todo_wine - check_member(value_caps[4], value_caps[3], "%d", LogicalMax); - check_member(value_caps[4], value_caps[3], "%d", PhysicalMin); - check_member(value_caps[4], value_caps[3], "%d", PhysicalMax); - todo_wine - check_member(value_caps[4], value_caps[3], "%04x", Range.UsageMin); - todo_wine - check_member(value_caps[4], value_caps[3], "%04x", Range.UsageMax); - check_member(value_caps[4], value_caps[3], "%d", Range.StringMin); - check_member(value_caps[4], value_caps[3], "%d", Range.StringMax); - check_member(value_caps[4], value_caps[3], "%d", Range.DesignatorMin); - check_member(value_caps[4], value_caps[3], "%d", Range.DesignatorMax); - todo_wine - check_member(value_caps[4], value_caps[3], "%d", Range.DataIndexMin); - todo_wine - check_member(value_caps[4], value_caps[3], "%d", Range.DataIndexMax); + check_hidp_value_caps(&value_caps[4], &value_caps[3]); count = 0xdead; status = HidP_GetSpecificValueCaps(HidP_Input, 0xfffe, 0, 0, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); ok(count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0); count = 0xdead; status = HidP_GetSpecificValueCaps(HidP_Input, 0, 0xfffe, 0, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); ok(count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0); count = 0xdead; status = HidP_GetSpecificValueCaps(HidP_Input, 0, 0, 0xfffe, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); ok(count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0); -- 2.32.0

2 6

[PATCH v5] mf/sar: Allow requesting more than a sample per period.
by Giovanni Mascellani 24 Jun '21

24 Jun '21

The IAudioClient implementation from both Windows and winepulse.drv never sets the event more than once per period, which is usually around 10 ms long. Some codecs produce audio samples shorter than 10 ms, so it is critical that the SAR is able to process more than a sample per period. This is not currently the case: a new sample is requested only in audio_renderer_render, which is executed (at most) once per period. This results in the SAR not being able to keep up with the audio client, and eventually underrunning. With this patch the SAR keeps a count of how many frames are currently queued, and a new sample is immediately requested if the internal queue has less than two periods of frames. This patch fixes audio stuttering problems in the logo videos of Borderlands 3, Deep Rock Galactic and Mutant Year Zero. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: Remove some changes that didn't really help the solution and update the description accordingly. v3: Reimplement from scratches, using a different strategy and avoiding manually setting the event. v4: Resent with no changes, because it fails to apply without the first patch. v5: * Zero the count when flushing the queue. * Only request more sample when running. dlls/mf/sar.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index eba822ae0fe..7b7d4918e17 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -101,6 +101,8 @@ struct audio_renderer HANDLE buffer_ready_event; MFWORKITEM_KEY buffer_ready_key; unsigned int frame_size; + unsigned int queued_frames; + unsigned int target_queued_frames; struct list queue; enum stream_state state; unsigned int flags; @@ -234,6 +236,7 @@ static void audio_renderer_release_audio_client(struct audio_renderer *renderer) { release_pending_object(obj); } + renderer->queued_frames = 0; renderer->buffer_ready_key = 0; if (renderer->audio_client) { @@ -1330,6 +1333,13 @@ static HRESULT WINAPI audio_renderer_stream_GetMediaTypeHandler(IMFStreamSink *i static HRESULT stream_queue_sample(struct audio_renderer *renderer, IMFSample *sample) { struct queued_object *object; + DWORD sample_len, sample_frames; + HRESULT hr; + + if (FAILED(hr = IMFSample_GetTotalLength(sample, &sample_len))) + return hr; + + sample_frames = sample_len / renderer->frame_size; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1339,6 +1349,7 @@ static HRESULT stream_queue_sample(struct audio_renderer *renderer, IMFSample *s IMFSample_AddRef(object->u.sample.sample); list_add_tail(&renderer->queue, &object->entry); + renderer->queued_frames += sample_frames; return S_OK; } @@ -1357,9 +1368,17 @@ static HRESULT WINAPI audio_renderer_stream_ProcessSample(IMFStreamSink *iface, return MF_E_STREAMSINK_REMOVED; EnterCriticalSection(&renderer->cs); + if (renderer->state == STREAM_STATE_RUNNING) hr = stream_queue_sample(renderer, sample); renderer->flags &= ~SAR_SAMPLE_REQUESTED; + + if (renderer->queued_frames < renderer->target_queued_frames && renderer->state == STREAM_STATE_RUNNING) + { + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); + renderer->flags |= SAR_SAMPLE_REQUESTED; + } + LeaveCriticalSection(&renderer->cs); return hr; @@ -1428,6 +1447,7 @@ static HRESULT WINAPI audio_renderer_stream_Flush(IMFStreamSink *iface) release_pending_object(obj); } } + renderer->queued_frames = 0; LeaveCriticalSection(&renderer->cs); return hr; @@ -1516,6 +1536,8 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere unsigned int flags; WAVEFORMATEX *wfx; HRESULT hr; + REFERENCE_TIME period; + DWORD samples_per_second; audio_renderer_release_audio_client(renderer); @@ -1543,6 +1565,7 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere flags |= AUDCLNT_STREAMFLAGS_NOPERSIST; hr = IAudioClient_Initialize(renderer->audio_client, AUDCLNT_SHAREMODE_SHARED, flags, 1000000, 0, wfx, &renderer->stream_config.session_id); + samples_per_second = wfx->nSamplesPerSec; CoTaskMemFree(wfx); if (FAILED(hr)) { @@ -1576,6 +1599,13 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere return hr; } + if (FAILED(hr = IAudioClient_GetDevicePeriod(renderer->audio_client, &period, NULL))) + { + WARN("Failed to retrieve device period, hr %#x.\n", hr); + return hr; + } + renderer->target_queued_frames = 2 * period * samples_per_second / 10000000; + if (SUCCEEDED(hr = MFCreateAsyncResult(NULL, &renderer->render_callback, NULL, &result))) { if (FAILED(hr = MFPutWaitingWorkItem(renderer->buffer_ready_event, 0, result, &renderer->buffer_ready_key))) @@ -1789,6 +1819,7 @@ static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResul IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); obj->u.sample.frame_offset += dst_frames; + renderer->queued_frames -= dst_frames; } keep_sample = FAILED(hr) || src_frames > max_frames; -- 2.32.0

1 0

[PATCH 1/6] server: Introduce IOCTL_AFD_WINE_GET_SO_ERROR.
by Zebediah Figura 24 Jun '21

24 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/wine/afd.h | 1 + server/sock.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index 6370e00539f..0ccd248e614 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -162,6 +162,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 71f22845827..f614bf5feaa 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2546,6 +2546,40 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_WINE_GET_SO_ERROR: + { + int error; + socklen_t len = sizeof(error); + unsigned int i; + + if (get_reply_max_size() < sizeof(error)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + if (getsockopt( unix_fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len ) < 0) + { + set_error( sock_get_ntstatus( errno ) ); + return 0; + } + + if (!error) + { + for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i) + { + if (sock->errors[i]) + { + error = sock->errors[i]; + break; + } + } + } + + set_reply_data( &error, sizeof(error) ); + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0; -- 2.30.2

2 7

cypt32:chain started crashing on Jun 17
by Francois Gouget 24 Jun '21

24 Jun '21

The June 16 build crashed on some machines but since June 17 all builds crash on all Windows machines (and time out in Wine): https://test.winehq.org/data/patterns.html#crypt32:chain The best explanation is that some certificate expired on the 17th: * The few June 16 cypt32:chain tests that were run after midnight (i.e. on the 17th) crashed. * And all cypt32:chain tests run since the 17th crash. Does anyone know what to do? -- Francois Gouget <fgouget(a)codeweavers.com>

1 1

An introduction of a potential student contributor
by Weiwen Chen 24 Jun '21

24 Jun '21

Hi everyone, My name is Weiwen Chen, an undergraduate at Fudan University, Department of Physics. I'm interested in open source projects and I have three years' programming experience, mainly in python, c and golang. I have some experience of operating system utilities through the labs of MIT 6.828. I'm a linux user and wine is something good in my daily life. Maybe I'm not as experienced as you, but I'll try my best to do something useful. I applied to the 'Implement robocopy.exe' summer project <https://wiki.winehq.org/Summer_Of_Code#Implement_robocopy.exe>, and have exchanged several emails with Ms. Figura and Mr. Li. (Though I'm not sure whether my application will be accepted! ;)) --- Besides, I want to know how to add a new executable into the `programs/` directory correctly. I'm trying to set up a skeleton program which can be compiled. I created `robocopy/` dir under `programs/`, copied things from `reg/` and modified the `MODULE` variable in `Makefile.in`, added lines below in `configure.ac` and rerun `autoconf` command. WINE_CONFIG_MAKEFILE(programs/robocopy) WINE_CONFIG_MAKEFILE(programs/robocopy/tests) I hope it will generate an executable called `robocopy.exe` which acts like `reg.exe`, but I don't find it under `.wine/drive_c/windows/system32/` or `.wine/drive_c/windows/syswow64/`. Have I missed anything? I wonder how to add a skeleton executable into `programs/` which can be correctly compiled and placed. I staged my code mentioned above under my github fork <https://github.com/ofey404/wine/tree/robocopy>, Wish you all the best Weiwen Chen

3 2

[PATCH v2 3/6] light.msstyles: Add Button parts.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/blue_button.bmp | Bin 0 -> 12198 bytes dlls/light.msstyles/blue_button.svg | 24 +++ dlls/light.msstyles/blue_checkbox_13px.bmp | Bin 0 -> 8166 bytes dlls/light.msstyles/blue_checkbox_13px.svg | 44 +++++ dlls/light.msstyles/blue_checkbox_16px.bmp | Bin 0 -> 12342 bytes dlls/light.msstyles/blue_checkbox_16px.svg | 36 +++++ dlls/light.msstyles/blue_checkbox_25px.bmp | Bin 0 -> 30054 bytes dlls/light.msstyles/blue_checkbox_25px.svg | 40 +++++ dlls/light.msstyles/blue_commandlink.bmp | Bin 0 -> 12990 bytes dlls/light.msstyles/blue_commandlink.svg | 18 +++ .../blue_commandlink_glyph_30px.bmp | Bin 0 -> 18054 bytes .../blue_commandlink_glyph_30px.svg | 19 +++ .../blue_commandlink_glyph_45px.bmp | Bin 0 -> 40554 bytes .../blue_commandlink_glyph_45px.svg | 19 +++ dlls/light.msstyles/blue_groupbox.bmp | Bin 0 -> 1814 bytes dlls/light.msstyles/blue_groupbox.svg | 15 ++ dlls/light.msstyles/blue_radiobutton_13px.bmp | Bin 0 -> 5462 bytes dlls/light.msstyles/blue_radiobutton_13px.svg | 28 ++++ dlls/light.msstyles/blue_radiobutton_16px.bmp | Bin 0 -> 8246 bytes dlls/light.msstyles/blue_radiobutton_16px.svg | 28 ++++ dlls/light.msstyles/blue_radiobutton_25px.bmp | Bin 0 -> 20054 bytes dlls/light.msstyles/blue_radiobutton_25px.svg | 28 ++++ dlls/light.msstyles/light.rc | 151 ++++++++++++++++++ 23 files changed, 450 insertions(+) create mode 100644 dlls/light.msstyles/blue_button.bmp create mode 100644 dlls/light.msstyles/blue_button.svg create mode 100644 dlls/light.msstyles/blue_checkbox_13px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_13px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_16px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_16px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_25px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_25px.svg create mode 100644 dlls/light.msstyles/blue_commandlink.bmp create mode 100644 dlls/light.msstyles/blue_commandlink.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_30px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_30px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_45px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_45px.svg create mode 100644 dlls/light.msstyles/blue_groupbox.bmp create mode 100644 dlls/light.msstyles/blue_groupbox.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_13px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_13px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_16px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_16px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_25px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_25px.svg diff --git a/dlls/light.msstyles/blue_button.bmp b/dlls/light.msstyles/blue_button.bmp new file mode 100644 index 0000000000000000000000000000000000000000..172bfdd932f96a27bddfc1893995239f5447b0bb GIT binary patch literal 12198 zcmeI0F;2rk5Jk-eC~57|t_VV+BSm`dLYasgP$MD%Y3ZC4@eL?!2SIJ0B*OA)nek>s z5<2e~3F%wf9cLrG?0)^#k7jc7dLDGo70oe?GaC0aPJ)Q$Ah@OP-%j1=7HHZ&T!hWy zx@hK?ZSy#?UV|Ag<9x>~&BwE`rm@}+G0gi@$L4*iFlAHimzA^2l2#QhwRpk-*C_!V zpo82AuJ8l=@XHTF<;7yWF`o;)e50)79Nx}H5!F&MNj%-Favn32G9EdPoR_;HUXssR z6<ntzbbt=~cM5*^13w_=yPQwcG|aNBSgls=a=ElVgBk1fI%g);vZ^XW&%U*Ly)%PY z9h-kcgDD$fmYiMIw5n*S#S;#=P6_A$9pp}Mg&*LDV?PX)7nE<Cx~?fc)bh>jaya7b zluQy&_o>WaCg-ueOF}zK3OkKks@7{TW18eUW=SmL#XH=OV{7d5kZV=We$2#YKQBQ) z=m!tL1HK*@EHC1XoyD5@#w^a^h-#^lN$%_g=P~;B=-bPGVDu5463_uU$erK{Km21q ppl^@9J=qt1dv}L<mfq0Miq0FjPDkhf9rkY&{4l&9(6@Je`)>k^jEVpN literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_button.svg b/dlls/light.msstyles/blue_button.svg new file mode 100644 index 00000000000..d1c6bd80e64 --- /dev/null +++ b/dlls/light.msstyles/blue_button.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="22" height="138" version="1.1" viewBox="0 0 5.8208 36.512" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="translate(-40.717 -1.1913)" stroke-width=".26458"> + <g fill="#fff"> + <rect x="40.849" y="1.3236" width="5.5563" height="5.8208" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x="40.849" y="19.58" width="5.5563" height="5.8208" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <g stroke="#3096fa"> + <rect x="40.849" y="25.665" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/> + <rect x="40.849" y="31.751" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/> + <rect x="40.849" y="7.409" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/> + </g> + </g> + <rect x="40.849" y="13.494" width="5.5563" height="5.8208" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_13px.bmp b/dlls/light.msstyles/blue_checkbox_13px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7f55d7571e2894d89d4622d3a05c8f893361e795 GIT binary patch literal 8166 zcmeHL%Wm306oo9BRZIT>R7ENfDX}T4#0sg~D$1gpO7s`H4v!6gP^kn6qCZds39Bpu zS#<>;QUPM08Y<nM>oD#ZjAt54D5-4e_>SkEGh;I+o*TbA`5BMc$6K6}z;oam5RD{o zjzs#%|9Ei^y91|QuNS|%x*A+wURnV8fb%!ZM;s!SJDtumF^*T{Jh&Cs0hWp{#<;$| z-e*2QqE9C>f7co@r(fiI7kQoM5S$%r9<n~SxW}SuT{+KwVV?mBXoi5&Z_H=EQ6&|p zQfdHL0QrFPH!J>-O6f9H4}Cq#c`BwVwvNYF@WtBD=YxG{?E4XYI#Jxa4p(r3YJ}b| z@?0V>=GBQi);wT+lDAY!7FFwN`+)tzJ}V{@i13e=-v;cryK^(XXcz;)0>}r}qHf&S z{O0j+*)Yn~QFs*jW!<Q-j>lK=#k$eggMD#7qE9D^d)MI#PEd`|`$e8h<i)%?amShm ztdDuSY??*Yx^kZVg6A3BHI2jq{y|&qH|E2i{4Ndm`am@W*CQ%~dwqbt{;7DhTCMJ( zhH2yP>C?7%5b{nvN<>jSTMK<-U;=#f(#aa|Yq%bveu`lp1MMl|hjpE-LAwCXOTp=O zyIJ(jfK$=OQP#-)qK&yT;7t4d{)y;QX_yC24wys#es%5q24Wnq2u&XNE@{GgG+;eS z)yN)|Q*A1zw|Z2r-|%9Kg4;s9G)DgfT2GI<G^KP6*CRT66{GT@0qqp^(}qV~nqs;@ zRm1TpRbFS2pV3*`<xyGV<r&;x#-6W|bUdok@Ho)qz?(yFdsIiW(&fRmJ-X6_^=QC) zls$?XrfoHjw|Z2r--senT(^KR>fwpiG(9~kYZi60hU*cv-o&6W(4IoK;Za#*HH`v& z`Rmceg_%WuW}O=@kIEV^k1o!SGCbd}`jO*Nm4?SzUYI%X=D!<;?NJ?#t!tQhJfrQ= zl_so5gMWM4!*AOLwt5tMm%PtK!EFI!U;=o0bWKwOZv?~u1DFCE9$nKEz;WKAXlH>L z;PU922I-9>gC3sG@u-G|2gw0*;Ggz-@biG}(bYVUcCSYr6aLTi1ir(<Pg;kjuU%t3 zc8`YNNAJH0yB1Axp<DCG!#n{^SdRv*N9Fb2*4C}XWPPY{zTJlPXz+Seww7l*z&^*{ OH?@!dbe>0BkNyE918kxI literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_13px.svg b/dlls/light.msstyles/blue_checkbox_13px.svg new file mode 100644 index 00000000000..d7cafa54296 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_13px.svg @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="13" height="156" fill="#000000" version="1.1" viewBox="0 0 13 156" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="none"> + <path d="m0 0h24v24h-24z"/> + <rect x=".5" y=".5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="13.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/> + <path d="m0.5 25.5h24v24h-24z"/> + <rect x=".5" y="26.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="39.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <path d="m4.1723e-7 52h24v24h-24z"/> + <rect x=".5" y="52.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="65.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/> + <path d="m0.5 77.5h24v24h-24z"/> + <rect x=".5" y="78.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="91.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <path d="m-1.9073e-6 104h24v24h-24z"/> + <rect x=".5" y="104.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="117.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/> + <path d="m0.5 129.5h24v24h-24z"/> + <rect x=".5" y="130.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="143.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <path d="m4.8636 60.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z"/> + <g> + <path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/> + <path d="m4.8636 99.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/> + <path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#2979ff"/> + </g> + <path d="m2 110h9v1h-9z"/> + <g> + <path d="m2 123h9v1h-9z" fill="#3096fa"/> + <path d="m2 136h9v1h-9z" fill="#2979ff"/> + <path d="m2 149h9v1h-9z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_16px.bmp b/dlls/light.msstyles/blue_checkbox_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6451eb3aa70932ea32451b5d4a63a29e8c3363cc GIT binary patch literal 12342 zcmeHNzi-+=6b4l)8LFmBrwl<=M1Tx7YLux%)3H)Vw)_EEI)h<h>Xa$sM=B-ijs)2< z1du8<Q>KjBGG&RBB?G~x$@O~&FEIvUpXp$bPx^T0<9+x06Zg)1`L?A;WZJ@K5_kvv z2BMKTK9TVKpSJ@H3L=q4qp^B?eB5d_n<gMUf_zVj3)_Y*)a&)vT&J5QU+{`l2Vkmj zx$cvblNfOU!DXtJxC_Lmc~C*bF@6=UoO1_Xb^4v{&nth{{oBDj=2bL6zN9(QEf5F4 z4JhfCxTIfEOsxtd)dEaFcm(;L4!Lb%qzj_7;aUIWEApwLtb^KB;PNIB-`8T`%RY0N zs^zh&^4LE}eC~@^OJiVPd!EbOter!7KZ)D$!zE5Y_%rU`WJeguyov^-en@kq+k7$( z3k@pkw?+EBFK1S*s@?)jKzM{{RrFKIt!eFkRWFFTg8t##ujoapgW6T$@?H`9YccLK zm#JDFt16HEgT&{)c(pVJ_O<7^%+1<4l=qXk4L@As1cX21{>^mywM<?`1LRAZ!}weG zH9c-YgUGAtm$=YAodLr0zrP(Au=DS%=l5Cp%99wd`SaWVxjz3dp#Gy+$RpsZ+k#Hn ze|zAO7P`Qvm+F|n&keZ->=|$iYycCJgTDi(N8rcMc^UQsxCY|DSaR?ia5w~L{G3*h zxdJYM_gu)<!Cyl8EB?-A6Ug5H=fE3Vxk~)L3Emyh0b*Q-qkS%(X1DQ04`>3ipNf2{ zHw!!fWqR<zC)zGhqRfy#*ZN<y_#eWJ;%?yx@sO+j;Un)mXe~L3e0pzK-W9ox7xnMt zqurb=%O?%oiJT#SD{|?n`nU5%A-#j=M_8$Uk^8WWxbOmH*A(M%|Lk^zZ=@P{KBV!p zk0>TqP<DlWT?%7uO#dVNQhZ5d$MugsB;a=gdycqsME`a^w>im*;`%0h?@&jF?rqq| zE1&#DVSO9^JyA$Cxt}V0Sw}vd1?K^f`d8%->)6E_m1KUff5P}bK=Hp2k*HP49Q{4e zUG+aHezYpu-mtveuV^po-^uS+wH%cpHZx$)fLpVyP1V1hZ&tM(JU^OMeW3rJAD8ib zfx50K#-sh_Om=?1nrT>7?U2ULe%+e30-r13QtW5O^l#^jU!RvmJv;XM-z#eg_}u{K zqB5#~JD=N}WUYhDCVcO#YNkW?Htge-PySeoZTR<aZ`9;|s_>}}%xxB&2SDmyl}~kG z47+AUFAehYzATLYgZ2K8_J4T(rwtm3gy;XkJn(0D{vW*aHu?SE0>=Nm)~?oP{P$FE z$X}@cPdu%w*Gw4y%l{69@Bh7S7>A#q_|slR$REGIvCofN{y)uM82<+-{&!n*`}cn0 hzmWet1L6FI@juQ$;s1Z1C83lH<A;TaALjb~-#-V*m*fBd literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_16px.svg b/dlls/light.msstyles/blue_checkbox_16px.svg new file mode 100644 index 00000000000..946a90bd983 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_16px.svg @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16" height="192" fill="#000000" version="1.1" viewBox="0 0 16 192" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="none"> + <rect x=".5" y=".5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="16.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> + <rect x=".5" y="32.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="48.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="64.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="80.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> + <rect x=".5" y="96.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="112.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="128.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="144.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> + <rect x=".5" y="160.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="176.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <path d="m5.8182 74.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/> + <path d="m5.8182 90.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#3096fa"/> + <path d="m5.8182 106.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#2979ff"/> + <path d="m5.8182 122.91-2.8636-3.1343-0.95454 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/> + <g> + <path d="m2 135h12v2h-12z"/> + <path d="m2 151h12v2h-12z" fill="#3096fa"/> + <path d="m2 167h12v2h-12z" fill="#2979ff"/> + <path d="m2 183h12v2h-12z"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_25px.bmp b/dlls/light.msstyles/blue_checkbox_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c9bae2042b0136e5d8b73170799b2e48e5743a62 GIT binary patch literal 30054 zcmeHPO=ufO6joB~V2XS4rBFf-q4p{vk{f7f6MSgTg<gCxJ>+6?tD&?_q_hXu5MsNg zln~1pw>O_`oF8NY0^>^$_0_)mY#n{{kAyw_-tNq@JG-NqT}{-2M({E_Z{GX9c~2wh zb@$a@e*N&Lg8%vq|BgXEgxtDPC|oIgjH^PSjP<`i2*g+5pSN${UfbH*T6p>L<q?Eg z6vCU|*w`54_%^X+tY_eA(%!*!PsC<p1m=Chg@pOBfh%Khjxa8H-NxK;m}k-Ds{35Y zIm|N`yO4cVdfCoouEJ93O)zB}6_(K3997(oBbfo0t7J}8njYuM|2=>G`t=v8{p8V8 zeZb?O-}6N|Cd>1As;@YYACE=+Ce>9`U$O6QTw_&l0dfRk7UhUN@#fj=%|VWD6I;S6 zJ_AQH*!!r}8jd}_d7tMb%uk-Pqx0b$VO%=<JnN3bJZmmj-RDZqVV=3zh3u=+%XTJn z6_!eGf+^dmu!P>`sN!}U$qcw$C3B+E^f*_+@A=PTR%<v`9lginIARrVQI5&#oa!H{ zuL2%kpIEE02yel!ub$tycD_<xXxGX|ty-Dc62d#LjnA`<n}dXJ3pWkte7W@OyjE_~ zT6?8zwT5dim+t$xk^HF6csF`Eu5PeYzK%ncnWWz3Dwz|NMwKgBpJy&OWnYzEwlkTl zuvB^zOxZ?-CG<8&6}RI^X29htnG=<!m$?dm&zH+qYdES8D2|{$DKE+~*_`|J57k$- z@}h{x7CzxoT}AbkdzPv?v4I}<KHam_&MAtm%J+(6i<Tyi!#t7yajqD4+O7D(c8H@} zeDeQ4aENVmJ$A@d*VqEUafnRlN0%#oj)X-dSMFJA=iavPS*oky#OX;Nai;pNhQl-V z>xjGFXf)nW&x%?b`3(BKeQB0&-n<!x-9ES72H$&Wb}F5YV|8_P05%QD?hh4SnqKk^ zf9HiQ*4MbrF~%848$vP92piqV?NfUoU%h%&<?Ah6e??g6f0*XF3+TSl;nTW`1NuqG z1>_R)Ac_U-CFp2hC+J7H8(mAg=C+AApx@zZzsi2Iv$I#Rw#C<*bmnB6=$zXnIO_HK z2-co5#?bkjd;xa|dE4Xu2l&22M{xQ}#gT3u*U~<~bI37v!8;hY2xi@I5CZ%?$T8u7 z@6UI^L72dv0LK~eKpx9HT%UM9WINp)XKe~tbOuSjjoRDdAWZPgalF%LkCjahI)lJl z=a~P9SZs0-CjWlh#P{gvyW$YI(b0AsQEYJ?;czuv@YxGLW0BmDF0A2PKb$x{>0>|k z!y)GDc-CHLKi<w<!^!;wX<22DMu%ay@7q?qZ8llRRKw{w*uy&muxZ5XDqf}<F6N6q zQ8^CudaiMsV^%HB;JO{mi^ervCk|E_tMc_0ds6gkIP_IabKM0-qZ&@d!79Z`tP##7 ztB%ELIIJykzZ1l!t>Kg$Rc|L)D<*0<He0xgwJq-3q%$YyI67By{P4*L_Wu-bP-+dw zzW-<lzI)vNfX&`e)^IA0=sr}}%-@H17+@54sZS-%wi^z@V~=imz`&XF`)X2axNbRo zp2yw<aL#<JikGP2Y;gEIm9Z&c;S545#aInzi^J!6;>~fqQx@s5vdV!oh_krvV^+Md zhO^1x$Krp#jcu}DM#CD;HV5&@uO4%_ez?y6e}e0WlMkq3-jDror>l3a<9U0X{g%Ck zlb`perIr0PIt;sgvIWmJ+nCH$!|6EK>YV}LHez-w<xDkP%oqEV<G}hFw>fUDjL+b@ z?ay&7+p6Z=KkPw`+M!>g%GX=%7vp{nhxs(uT_8TA8cxLl|4FP}KrSJ%8m_fmTH<~u ztrxeoH5|81#L-$Q?a<nJt(02BwQJ*B!Fst#XD%AQe68ZZdp&|!a34-l!~OpG5PbK1 z|CR9r_WZ80hEs9Kdr6zqKHz`IF?Oj>CC#oI4#GQM{?r4;aez}wt>L=mARe5#3E-R& zR=ZY8)NnR9f_TQKfJJBU68$}~8qO9+z*CwF@JgrcNRO3G4myLa<?=e`32Qi;925(E zzoD;d^Q?9|tl?~P5Rd%oB?ms!L4SMXy^{BnXYTsp{QK&vdwa6p{cVv9hfKOpny48v zKq*Z#aM15*9g_JzoFT_Bu=gPp=Qbo$4QIeH0L%u*Ck~QKHJky*8pl1xNOfDA&y8z1 z4M&yZwJ`cM9L8y`yTE8v!*$@81P0+;LLNY(uO&<<XD1MC4cCEVhvOt_IOwlJw)lDz zW5*h<1IGw_pF&da!$Cg;*@I9#2M}cq*MS3W+86EP5JEh=kklHkOAf#mJP4gR;z_OH zEN}q2FabG(5Kp3pv%~@D!W4wgAW5u-v&aGH!W@KRIfaCM@|HR146bvYu!ghD0r&!a zzimRo8txr%5KrvYV-EK$)$m!W>xYXS)5HYlw(t7k5=qFQ=<(;=|L=wj+cP$GaTupc z*>h)(ptp4IhdxKb!sSY2LO;4(>2oA3dYmg)!x`3at{+aE(Dbn%`{B|vVW#bI&xHT? z^vrga&C11Lo-daxmn-uOm|MDY)z`Ul{cx@y&in(=!LlFw;X0&4yVT2`3Bje^R1O1y zEyf%WS{H#WMy*2*1A#5Z91vO;fh|U@Lk<IhEyf%WS{H#WMy*2*1A#5Z91vO;fh|U@ zLk<IhEyf%WS{H#WMy*2*1A#5Z91vO;fh|U@Lk<IhEyf%WS{H#WMy*2*1A*=O;X41V zUdoUA`*3Cl4EK-SvsANG`Bpu?-|n8JYTg_7erOUDS$4UKBtvuQa-~U7WZC5^k_^pd NBv<ZPs^PQLe*xSO3%>vW literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_25px.svg b/dlls/light.msstyles/blue_checkbox_25px.svg new file mode 100644 index 00000000000..8a32f232c81 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_25px.svg @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="25" height="300" fill="#000000" version="1.1" viewBox="0 0 25 300" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x="1" y="1" width="23" height="23" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> + <path d="m9.4091 116.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z"/> + <path d="m4 211h17v3h-17z"/> + <g fill="none" stroke-width="2"> + <rect x="1" y="26" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> + <rect x="1" y="51" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> + <rect x="1" y="76" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + <rect x="1" y="101" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + <rect x="1" y="126" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> + <rect x="1" y="151" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> + <rect x="1" y="176" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <g> + <path d="m9.4091 141.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#3096fa"/> + <path d="m9.4091 166.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#2979ff"/> + <path d="m9.4091 191.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#aeaeae"/> + </g> + <g fill="none" stroke-width="2"> + <rect x="1" y="201" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + <rect x="1" y="226" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> + <rect x="1" y="251" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> + <rect x="1" y="276" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <g> + <path d="m4 236h17v3h-17z" fill="#3096fa"/> + <path d="m4 261h17v3h-17z" fill="#2979ff"/> + <path d="m4 286h17v3h-17z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink.bmp b/dlls/light.msstyles/blue_commandlink.bmp new file mode 100644 index 0000000000000000000000000000000000000000..929a08af852478eb382bd466fd9497ad07cbe6e3 GIT binary patch literal 12990 zcmeI1F;2rU6o%b}4oDoK%}}9~4oyJf0PGxvnKX1@?2I50SKtP1S{4qKIvLFGq)!S` z9c4g5C4Z%tXW7qg^Yyp=65ri_UaRVJi>nVihg}Yo8YmAXrB-PFx~Q$Hz$JeT$HiN) zDUv|L%n{Q%3D)`h%?NE-nFO)<n4L-grnmKFGGEGgt~lvqUM53~xwqdbb!}dLTU(5@ zF}5Z_4&)$n!g}g~dY~Sf1bU+f-Elug9uV%zG>lyF^*$fOSWB`z4ZI?qZ&7yU4^<rU z4CWeKe`V%zAL`Az!`%MxTqW9X^PCr)7fpSfs2=`2*Jv_inFL6H1W14cNPq->n}B(m zj?H4afoYgIVzz#59%m!?%q*^A^Xxc7K|NxYuzEa4oZN$Xm<$oShjn_+vT=-6iX3VM zkpnr%T4Fu*Ks`_oO#(mkpk4d6^f>It*zf%vEON!$`YI2w`9S1*n0H%PTmF#QJcDN_ wJVOz!o#?y4PI)Ttt^SwEfgEJMTTeaoMh`qgX$qfZ5+DH*AOR8}fqzHf8^!81*Z=?k literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink.svg b/dlls/light.msstyles/blue_commandlink.svg new file mode 100644 index 00000000000..97f72bfd651 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="11" height="294" version="1.1" viewBox="0 0 2.9104 77.788" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="none" stroke-linecap="round" stroke-width=".26458"> + <rect x=".13229" y="13.097" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="26.061" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="51.991" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="64.955" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_30px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_30px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..76789b095575b8d12fdf51ac96b6486d69fe2c27 GIT binary patch literal 18054 zcmeI2O-{m45P<6iJc4lvZ5qnP1GsQ!;sVaX&qml7_e#A)Dcr$R)h@<qv6!#`U;8p$ z_>oKrwDUgr-t;w-y!*$OhoFAl>2aWOqmgP{1-E((f+s!yd3}ib3l12-z`r+8q@#7Q zNmiC3inloaN|RDU%-Lx&ZP?{U@@)FQVT-Htsz!W;3)>g78mCCduNHMyY{nDi9qucb zUX}Oa_I(r`=hJ$PR-RSedYvc+!vF>_fB_6(z}Y~a=j-iuyK+wKkg(tHW960_V$D|O zv|;adJJWs;b}p{Ys~YhYE^J@SpK(n3LA{qI%B$}yeTUg$jXF*3!)=yjQ8S;`>tw~V zs-aWYe8vC<Fn|FJV8GUZEW))c!<8jfW`kH3!%{=c+4FFEWX}ht{h+`WadckSNL433 z!h!9D*Zk(?(4;q$MKn3qHcYQeS}$&AVe~tn#%r`b6U3;7yiOE@VE_XdzyJm?;B0{X zqRz@%Clu@#Wxr_a>bacQ%brH|s9v6!mRA()7j0>dGz?$>0~o*n23!o#54zaub}jv2 gLO<B8gwAHu51!T2>0~c%=?6Q_8Oa#Hz~2pg1CC}%!~g&Q literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_30px.svg b/dlls/light.msstyles/blue_commandlink_glyph_30px.svg new file mode 100644 index 00000000000..9d0e199b42c --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_30px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="30" height="150" version="1.1" viewBox="0 0 7.9375 39.688" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m4.7625 2.1167-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + <path d="m4.7625 10.054-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + <path d="m4.7625 17.992-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#2979ff"/> + <path d="m4.7625 25.929-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#aeaeae"/> + <path d="m4.7625 33.867-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_45px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_45px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a05919387b97f7c43080ff215cc78208d1c58cdd GIT binary patch literal 40554 zcmeI5PiqrF7>5&3^q?Npi;7S|+9Xx8OQq-H-A~X{FDVF~Qf$+D2=rV^jk_VB2HKtq z{g;K_Bv5ZHIhN2%!4F|23GM5<8#mpZ^pI?_=8gOclij4dlP3?8*%^N9<jvc6-y+W6 zBtOQuyyWteOEfaVkCDi0{{N4A&EmX(2N-|>7=Qs7fB_izj||k!<V@YvHYhuFV;DYG zJ)fLq-U}|&F!d6BdVWhXH&G<Yj@NBox719{qT<wT@!WaMaGC#Z%Vdn-5zlQT*Zkc2 zA$=XYE1uibSNz=C5q%lIFPYnBs~K9>$DP+J^m+1ubnb?kocD2?+6fgV9*O5Rv^gKQ zk*xm8>5qHi_SNU<t3rPL^xSyyG$?n-Y_0yf{eATBL&kjeJNN2YQ0B1DYvlDbJHBjr z=JtG^Pd*9zeS_9NZ2d+XuiZZvCLRX;{9&J0Gxg<GTd?~gLpzpw9c+&8v{fIkDR;c# z@EUr~&#Q?Z*VXe{(aSpw<7ehgadGA;4zKWeiu;|e<+W-4zHM^<aMOJaTNr==7=Qs7 zfB_hQ0T_S*7=Qs7fB_hQfp87%?Ci{N*(jIGLy^&MZ*R{s?*$j){nEj~f$)r;qPx4h z>o%{aSjA#dct-DV8y;qxzr3}zB|M|2D08kU+=u)7`@%DNhkHfgK4RbEGkX3WW)<!V zKNp|TGvmC%eZrqbd`8dAa|(Br+jmbHy;7gIuL^VjbZ>7ja7I5MX4^;LjD8Tz+@{Y; zrIOf;p83-3<<jG(%Ke_$jGj4%s^7SVw_;hA*o>ar!?LF>5RadZrCtY#oN>~smzVd& zjyG&x_M209MUU&4x2W)nA3t-OO);}GPvNa4eV*dZGMROn%VwcaKt}IM!4?K!00v+H z24DaNU;qYS00v+H24DaNLN-8|#0)LOhvq(d=AETX{DKS7LZU?Ph2KZd%QG?Sy2EQT zH;YBt5!o5N&Ak{m6z(!*h2KZ-_>Qe9+=ui*_<i&acVflQ9Xn#*;xl?$Ol1As@d{;P z;xl^g_vRJu6K?b3GkWd==ltA>D!1>RGJ1b~t$xbwufp1%(o*pI=m*5iE@FW*`T;SY z(Z?~d89gn=((L8($_=;YrBSgN{jl{L*YH*-Jt{V%=XS7s)fSw-=veA?kecJWRfSjV zc%#Xi$SJ&{$8|i;FDkt9$IlC~6f-yHDVew>eV*b@GuibtU*9$<h5P7TC)mOO48Q;k zzyJ)u01UtY48Q;kzyJ)uK-dPb)_u5!vDSUKe%0EWYq?^rd(}&r&#~5hn0DLiZeXo@ zM~Zj-<A1x4weH(nW$;(9)_rhyot%la?mMv*>=>+dAIw`fXJM`TZfx~-EY`a3%^%K& z0T_S*7=Qs7fB_hQ0T_S*7=Qs7fPo+ekkJRR*7-Te=sS1Sk0X)M_rqd$bs(ef&R4HT zBcpE`{I|J0|1P%u+t^M)M&D~2_MVT7-fN@(`^f0~@6@dk8NF*Fye%^N@Z733BcoT1 S;5iJy01UtY48VY71AhQDzZ!`E literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_45px.svg b/dlls/light.msstyles/blue_commandlink_glyph_45px.svg new file mode 100644 index 00000000000..04825c4669b --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_45px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="45" height="225" version="1.1" viewBox="0 0 11.906 59.531" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m7.1834 3.175-0.57825 0.55959 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/> + <path d="m7.1834 15.081-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/> + <path d="m7.1834 26.988-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#2979ff"/> + <path d="m7.1834 50.8-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/> + <path d="m7.1834 38.894-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_groupbox.bmp b/dlls/light.msstyles/blue_groupbox.bmp new file mode 100644 index 0000000000000000000000000000000000000000..5b8f94cebb6a75f6afa42507d17b114379b759ec GIT binary patch literal 1814 zcmZ?r6=P=r12Z700mNcJECR%g3<^M!f#Crg1H)lH2nGuPiM4Cj%CBF)e)qa{>wW_9 ze+n_kj9nlzf%G0AUA1b}Dxj^D0gxF$^Qu8+1MyF4m<e;ywr$(kL1qH+f0!7xXpots z<}xshh65x;jfTT$I3SlTG)@n+Dkt{>-CaSAG8kkAsEz>DKR~PiG<OdWQ>7jPnF*?g E03>V+W&i*H literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_groupbox.svg b/dlls/light.msstyles/blue_groupbox.svg new file mode 100644 index 00000000000..803e8cb7f34 --- /dev/null +++ b/dlls/light.msstyles/blue_groupbox.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="5.8208mm" height="5.2917mm" version="1.1" viewBox="0 0 5.8208 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="translate(0,-1)"> + <rect x=".13229" y="1.1323" width="5.5563" height="5.0271" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_13px.bmp b/dlls/light.msstyles/blue_radiobutton_13px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..73d8a2e6c89819d23a1ea6b72d591250b0233bb0 GIT binary patch literal 5462 zcmeHLyG|QX5OpLTO_DAhffPvCCc=x5(qN=0W$Z|)@(IRGT7pBvHy~KzBCW9y&j#U& zB9-lLU@5?SfI&RgNH^!)N7&beA}JtZrSaUEIkR`}+#`0951+ogO3CLPe$$W_kTT?1 z>J5HVsW*uKdZ|P@B0pPOTY1PD<OFgJIfm3WH#esv(A2@fK_C1s;z!W4>+9>okO6A= z%Jf5)i8Hwx-`L&VWofa8e&jTm#~^ebIiA5|U4X9%Iiud#*!W1C&SM?Z+uPf9NQr)p z7r=(Z<iXE6Ymn2Oot@XrL2f&W*LG9Ca|E{R56?><?5-uJ%lO{j-XP*vkPd1ZqVK+a zbRSQG=RtlkX&+!d^PPD2EaEksWd`~X?|4qX&TAoljx}|Ge)bJ(557EYtX;fo-{jF3 ze9Zk2XZ(f-d=GL<>|?cB?T0-?n||VhJTSSe6PP;o??8NNZOeKLE~v$~@w}*H)*vU4 zYf(ubL)S!QEXGl>_`VM@7jh&j*;(Wci^cH)spqq0<<Be=XZFzehL{^m<S6~XG$4|r zx*pHq#rI4Bu_ok9YspcahdRcl;jfGNwB)G93;3d<@>HETU*=RSyp<fqx}AV$zT~J_ z$c$jE`h)ZGY_PkQ9LZ7fb#xH%D@aGojY^JUefK`>r`qTCJe712zUWzKOODEWkoT3H z!TJ#QAvubBL|(cD+_}`~qpVx?+hd>gIdGrZeUnFD@Cn?{AC3li;IZ%QqbN=F^PJMI zWIXKa26<rKiM>!K?u&h?WPGjbrXGU}>fTB&@4LCRp6i_Wu5;a6b&ma2rv{zKQD9ui zk-wUoy{t|Ri}mpVYTunKOTX)cI7<Ar>omkq3rFE+95~5QRgdEt{Eh1r5NkrtsBeBa zifhP&eZ)GkcO7fVQH>X{Lt^q|oj4!%JiS;^9Q9Y6b`-B|$<fQ@$q~~Zo|pYYylcr( z99<e6MEnYQor|Rj$<cfFK_AsVf%B~9ib?yRe#ueZgS;<yVg|TFv7$J7qw-qtokLpe z3+rZIVSDVeJ_qh+a^K|97kr4<_Y>kM-a#ICkP`bSs#E<uCvELd<Y-UUIaz04fb*4x zt?LQyZPxso4|%ZPdeq6@k}GFg-}$ZAcmW+1nTNB+zV*Pi6Y$Kpe(Mn<7o&U7wtnjo zyK|qUZ#{B~mVNI0*6X|$^f`oDa`Z8N>mLC}(cbuDn@8iwu*bsDFeqYSwu;T85lGBT znnz=xh{M9s2r6u%w#0cfjJmZRBS-c8_h9GI+wO)}ws|y+id!OK9*v{Io}_s+jEGxF z^Jp9u_TVmJ^Jo|mw`}uh9H~6IZ%^}R;NMJ`IsR%Mwf5RFkJ|9YpEQq}m`x|mqc*JZ si-dX9#B7>#eRLkRVU6E5kD7Q?Kh2~6{{Nn$JvR2!w_bJPfBn|~27<_BApigX literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_13px.svg b/dlls/light.msstyles/blue_radiobutton_13px.svg new file mode 100644 index 00000000000..b46c8b97b1a --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_13px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="13" height="104" version="1.1" viewBox="0 0 13 104" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <path d="m10 58.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z"/> + <g fill="none"> + <ellipse cx="6.5" cy="6.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="19.5" rx="6" ry="6" stroke="#3096fa"/> + <ellipse cx="6.5" cy="32.5" rx="6" ry="6" stroke="#2979ff"/> + <ellipse cx="6.5" cy="45.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="58.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="71.5" rx="6" ry="6" stroke="#3096fa"/> + <ellipse cx="6.5" cy="84.5" rx="6" ry="6" stroke="#2979ff"/> + <ellipse cx="6.5" cy="97.5" rx="6" ry="6" stroke="#aeaeae"/> + </g> + <g> + <path d="m10 71.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#3096fa"/> + <path d="m10 84.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#2979ff"/> + <path d="m10 97.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_16px.bmp b/dlls/light.msstyles/blue_radiobutton_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f7e3d4ca3bd09d235201e7e6a3135beb8239566b GIT binary patch literal 8246 zcmeHMTT5g|5Y~{m59_Y^2@-^zi#q2R*g#m8ut}bx_)GGT3(@g95CkDGUgu~Y@(0uz z^+gaI74j2w`~ykUS1);(nTO8z)j1v8W1mYPgk<A^n(k9oUv*V=HK$A8jJ)jakmn_S zGobfDB~WKaFMjd#c69vw+$VXr{A_J)<+r!D7izWIDd;Ak6O3ibED&LBY;1H@tJM|g zU1FRD4T0B9;vD=L%3yn$x~3hzLskb>_xASSq5Xkg4|Mn(m^NUuf;F~ErP4b@LOu*S z1Zn^4kbglLb-=IDk3hE{uNQh<%;!MLMzHZcF@YbKJ3Bi$=q-XjO+Ma7Y&esr{lNOO z;Fm!SP=R=iM<DCk2ER^S?1c-S?9uM-?y~^Tc$4r~)MdQTy#n1Jp6<VZzosrRz+QvS zK-&Lf%#+qXBp&fQ&^-Yyf+oqsI0{O_4+pxer!sOrfbrbO!F-I3Ibws@FLXU)Pds2Y zl~SF7ZTfKx{w)dfBknC_LH&STUEw<)*n0vU*4w7`!<XFu<+{LaL9cGsueJdh{kTAG zrkJ1o{r#sT?lpOVtP;kWs|5L2f^Gx$wEwIz=DFY0wawL7F0YE&1<)zzCZH2Fo-I>m z!;q&+`7Tw=tw8@0y3=YRI|N?05a-3rjL3?aW$K!Cd~Bu;c~zDABG11X`=AGQYtTC| zZGcx%6S*x_>X7q~wT9u#A@l<OVS6Gg=bt*hjf|Xs%=@8tq1Od=4(}?0<ot^tjI)@} zA=X94D><0Vj6~q>>}fy7GqaM@Vz!~i@^XHFJxatEGjjgbc+Q2czenG_kn@js#(TGx zeJ<yp@j~}XFxV&YKOJ7qzwB!<dyV{^8U7z9ub-3iuO{*ibXix-pPYZx*Jv_6Bj;c0 zNoq1P0L;14Ihe@KN88BA`43{h(De*`5B4?{Kb3d_KN!nxKt~FDD>Bv(>lC%lcRuRN zz9)XY!A9VRFS-9K>#|O<hi3iW*`Ob&#bS0!^7HNBQ$_OkdP-!h_0ah-S5afkM`j7S z4UqP~A$dlvo4U4nbG49fdCmgp6m%2NNo&n1Q)a`Er#A9kt%|$SsyLVJHFvtTIyj^% zIR7Bd+nzf^S<5RdQ`fX3SkJ9Pr>d4edag>Jyo>o~txDl5QhU|?lsxt0hdu3zQ){gi z4on;Ht<v@ia{k+u!mGCD{MPc^tET6)NSwFVoL_+bnCD+?zz_P+TpR3fdW8$FODy8O z1*r(S6&vt_u{77+9M)cByzuQkf89u|*rXp4-<mVaoMN3uYuzpQ@j6!#>l*$rmccj3 zfeT&PBlXjZXYk>hW`(iFuMc?>x%!&%V$St$xJT*nu8-%wdd@ZIO#EMWJ`d~}zS?|& z|JYCD&w)PcY7se|4DxplUMwE@`!%SK8RoCKGBAKWK9?M<y00<+J;nz1ukebobI)}> zL*Ij4eE&N-;oEEM<2n38Zd}$5b9%+S6)fuqb;?@THLRBVo<QeNY+x@W7UY9@mion9 z>X$W!I)%-;S--Rs*zo8Vbf%ae^#jg6h<i;QWr(>F#%ez}G9OrT3H~%dtYuPzd1kGf zy0$s*M7V1#;I8nWz5gRFek1suxe18h%vAS(=<yqYPl1(U@BhH?8xe)oeDMQ0o<)w! zpg-^bz#gT*N8bN|WxRTws4?>XpAsK={|Ej!#rl!=e_%&b;N|;|yjk!6z|Y6nNOk`Y z{5ZyV8xZ&9e{uhROU^&G%l;(w|8~@UF8Z$?)Zc^t|GrlITg3T~2N_cKgz({B|8IyB zr?&n-5o9RX`hP>5I7R#q`u{|bp%8Qa4K4dLssFd5eC}iaZ_f^Ul7CD8Z}-sWCiVYu zSS^d{|Ft~Ls4V?|8l2X#_5WIyX0-MHX>eM{*8gi+n$gz(r@?8RsQzEe<Hn@^KOXzo z|J(8-J^bI)|J&@7m!|)Z!fJk8|F3nDM*0!%|C2CbIeNu={eM`V^d9d2lk~&#aQ`2c zC%wzxb&UQ$Nk1$P_y1ve(mQ(a2mOB%M$6;+f2|WWO8q4C|B=|o{{J8O|6f%8$$z~6 Y``LNC|JNe_|CgeE@UOME<Ntqu01qSLIsgCw literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_16px.svg b/dlls/light.msstyles/blue_radiobutton_16px.svg new file mode 100644 index 00000000000..d9c53d1d2d7 --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_16px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16" height="128" version="1.1" viewBox="0 0 16 128" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <path d="m13 72a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z"/> + <g fill="none"> + <circle cx="8" cy="8" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="24" r="7.5" stroke="#3096fa"/> + <circle cx="8" cy="40" r="7.5" stroke="#2979ff"/> + <circle cx="8" cy="56" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="72" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="88" r="7.5" stroke="#3096fa"/> + <circle cx="8" cy="104" r="7.5" stroke="#2979ff"/> + <circle cx="8" cy="120" r="7.5" stroke="#aeaeae"/> + </g> + <g> + <path d="m13 88a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#3096fa" stroke="#3096fa"/> + <path d="m13 104a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#2979ff"/> + <path d="m13 120a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_25px.bmp b/dlls/light.msstyles/blue_radiobutton_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8cc7b112e961b3d2ae9a45c0fa49597eb53f41d4 GIT binary patch literal 20054 zcmeHPOK()k6*iOb*pOryKmmi$&}}E<?m@hEqpWx+2?9+9Sg?x`i!2kr2Jk<KG=sa{ zND+I)!!}^pvB)OEZ5uCnEV03`o`G&7Rlcw8sp{&-t*YC*pl+#Lx6k7{bxu{CI`l2^ z$3Ok`&wcuH7=LqUJJ9}%wyCclfBX9S!T-;%lBNlPKlAhRTkqbzdmL^0-o1MZ=vUEd z(mzFCMmtWq08|@$a&qzu=w1{og+A0)F^1tMPoDg;4Xgv<)~#E+A;09{uH3nE=L)_b zo1LBA3H}!L{El`NZ3WGYp*k}&^SchPmISOrkYA?`o?oIrqm<fY1v)&Ck1?Hv>?`V_ zy(LZu(LRo!e9A%RG1_lB$)(ZY+jd~j89S~1Fpf@q=3(y_221AV9CT;V+&P~C=6B>9 zS?WRNk=Uua^8?vSLVp3dUmKmdxw*ZdSA}O{-qd4k3zRcD^dIsjZhs?P*5?{=z&~wd zVRs*BdTx9+gtrdeexr+L&JV}3O8ncmZ=aO!%SJ}xvnceYai`IMyI|tRbpScD-i~9u z73x9edt(F7=hLu!bk2{1agDN|mC);WV;vkZe9+DMi1NYMh2A}b0UGxY$Ikqq=K_4D z9{n*i%4BS>4F=ZEF429BzQ$+Jwiv#liA)wd9}R}ACF*`edqXVP_^sg^8tEC^s=<(a zLw)WkJs*f0)3yG9_8=p+8OyA}K<tkaL+0ZKpFtaU_!qjgan8YD9;NMRV4vbM>@68S z*Ezq7j2UC7ueR)uXM%g;=FOYi@T}(q{a=h7*ycWeN4bc$?&cH7pAnrkbADmWmxcBM zG@O*lhjt?TS)`oNVZOt6o(qi4u%TBfmCc|T-yTA)Deppu^K&1Kd#TPIv^ij$H}N4B z^}w4))3JB+F8R>e1D?)-(0$DDkRJQt`2l_Af5!Gb@T_kx2CxqsJLsRI+4*thTA!hJ z8kjmh)W>tjbI|CCKRRxZ=a`n!CYaB_+X4UddCu>o3tz7b*jfUAx54uDaxM--U*|IP z8pG4S2XBP-eYl-?T-O-;DYObOc%INE^Bemr={$cZ*GWHyrvAQvs~R0VuEuiHYAnBi zwu)9u`rK1Bo-b=Y<YMq#88zAW1@tcpra~WTt7<eitR}ySs^Qeg;BH_pIk+ooG=BxY z98>>1uv1MAZqYrzkL9jHZpD$Us)^rwYdH9Q2zu+H^AgWz6w77LhkW>O7CNs)?=5jU zsmS=>CUOIh)np-44F})0tI>fuYp2B@#u2<EKBM`0^=+TcB{DbX;L|K*8go9LpFs@2 zBj1dfdXRf0cB=0DsIh@dnm(F;p+@%E9HPEIuov{I=%mg20_Ch7_z!uBTTa(-dVP-N z*96DbaBB3+ea_sZ;R_veIGXFXc9QuaZ&mP53jVT{;o2R`FA6<?Z`bvLiJM*rX1#HL zjSo}=%hqrh)A@|}$v7}ScATTRYl2ZiFYz9*HJr0PVtp`j_pA-Qf3%Ox56N7N=WPvV zY2p2CuuX4kI5qL*F7e|vdgdR+{o5FW(6ZaGHJr>fZGS|2qiy_S(AIF4mfeP};gWo# zW5qp{%*Vu_t>Lh@9%#FnZRBhXrzY}81%vZ(BY7UMHJlpHUFgcjc;41<NgkyiI2XqA zrv%T|a5{gO+!F5#az~O^lKqi;rg6syPN>QLZFo-RWMshB2+2Orzl-w+``pbZ%-6}- z);RZEOZa|S)0nR&_uCpy?6_x%S)*>hNIAPEk?(+oa{+O}xn=3Y2R9>biEm^1hwXV+ z&(D46aWB<%&pgh2(3*Fdw-X<h+`OxOnaJ;H<UpJsPX0Ax@%8%rNb<kJ9KUycbM+L~ zZ^KUhxpL;mm1}**xKE=c@!>g|at<0jtZVvX;>NfyV;xT5j5&hw?P#3m_^#>TH`d+~ z&r^ft>-D+FI>Y3$28KJ=jb|O3{D_;6eE2R;uWRm~B>(d~;hZzSv9AjKB;{PaEYIqP z{aZJtzCK=`Do)p@3JV*h!fL%#s7e2{UK%QsPq{3(l;wH^?nS{;!1Xqfi>~25R1WS2 z=8}WEvQaKx*_bXK`{~ExPIYT=3wwUwC>5_lZpD$U{ygQc;Si5QkY5*_m$j)O{0<kW z;lQtzi)W$pO6yG(-V&!%?DY7_M_g*9;$!u%j5XZ94{V2DbH+}qKU}Ne>G;%2g?V-B z+ol>0<2;9$&r00&oNts1Gw`#yhJ#+MH1tT@DHWP(xO#c$lF(nM%0XMhefaUKy`Wcx z*LmKt-Y92cL;oRf;+E8KSa%rv8gbCu8t!B15BoqfbJH2WvEJ4{lnedFj?9mu-(1(9 zrVA%!oJ}=cy<A)rdI&$^!yl7_xlW*~*PGs7r9y>R8>Jyz!_}sW=QH7pKb#-q3+C&Z zV3g1&@xK0*t>NtYXv8AQ7sSTaaNIxI2K+N~fw{IdoS|j)1vYFA_j7q@7xhU)U*j|P zukq8+NYB_BH5}$zbU$J}zu~i*I%I1&L(7P-*O3_~^9}X6w$LZ@Q69229Afn#E56{_ z8m?aY`l!aheALT@8^X6W9Bf?Z#s>3&@q>9Zu~D4<R4SYjyrvosG&lFg%uAz&OZLYz z;(jU>PpF&UY%}q%T`$-gPWJgbu^+Or?&cHbYwB@*n)3^L`m$iXP(K{8HJsS-`-6Ny zITIu1J7B#OyhaUIIk*`#?OScC@USiKVtz2D`y3bK>g>5snGa0<pbhGQH!t{YHQa~m z#XaEZ9H`F^C;yr;`g*0$kHW0rzju9e^^oHa8$0NqyYu79wLW9)ry+0Rvz~Si8a?qx z$4$nxyfIans3V^--<b29-!;8dSQa_1izS|?2FusWxi~EG53MQk-y?62xcSJ3@A9~= zW&c!oo`}tw^vn+xo<Edx^|Cz6`-R@S)DA(z@0_3QyHvQ#-`SY6c{cEOgqrj-=vgD! z-{J5Za^`ob&}VH{MZ-V2Q`>^bq3i3z@8Qw!QX$S<x{l_<H$2Mqqv;Rq1mC4Xkp3^C z8H|{o{^+>Hyi0}b`Hc8x47P@YFW2y!eCoSY;Lmkw!`5)XKSmp{)$v^_@YlMuVQV<7 zG4H!n;B$Q%|FiVAh6}w*1^$~ZZP?%8Lhn+6|Da17wuVDq^1e$2{)H}W*cuKtyzf$h z&vnk4F3VgnAGrI&yl+f>mkRlPXzwEJaG%?M6JpIqze^Q6A%B<;I3E4Mn$7$!6^itq z^K&1K`=%~E_bKy%jt~0YyVTyhR4#+yr&q(Jhv+k};nE#%;dEKUwV;H*W~|}DfGHA@ zHC&2z967Rviv#mWMbvN}?KoCM4HpOGk&39{Jlb)rh#D>q$Ria|!+EshSP?Z`9FRvU zqK5Nmhgq^eVrsZBSc*i(8ZHGTo!n&&mk!v%k-Xcx57)a7*RnF2zv??8z58&@L6L8t z^L@CE4yO>ixeu2D<t6hzAnpi6-G}o61(>*Z!uyK6?~r;QE&vf^<Hw0jz)$X9rrd`M zf<y?wmuuon$NO**5J3^#Q8^|yI^Ks10z?Re?!!eu1Vuvk;er4W0-^hG5fDL<(0#Zd zK!iZ(K3oKZS0vdV;rno2kN^|wHu^qX0IDOK_s_5|GTn#k2$Vw9dAD~Tu6G|UWqlZO z?>?M~M0@`^--m1WHl32(%gA;gE*&kMljS~KI!c%mb002@;+KfI59ddS<A(0T#i976 zLigeP+Hu^_eYiLjzZ7$w+@I-qAI`5G#|_<wi$n2Ch3>=owd1&<`*3k6=~A*kg7@Ll z5yG4-_u;~5?GoMGhigYkr}XZ_6?*sK(wB$j^xmb~P_#Yt-lZlX>Ag#BTN*(^?_Fvz lL`?#{cd1R`@P6sNOZA4wGJEe*Z74cE^!{&=|DXR`<bSUMKcWBt literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_25px.svg b/dlls/light.msstyles/blue_radiobutton_25px.svg new file mode 100644 index 00000000000..b9934537557 --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_25px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="25" height="200" version="1.1" viewBox="0 0 25 200" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="none" stroke-width="2"> + <ellipse cx="12.5" cy="12.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="37.5" rx="11.5" ry="11.5" stroke="#3096fa"/> + <ellipse cx="12.5" cy="62.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + <ellipse cx="12.5" cy="87.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="112.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="137.5" rx="11.5" ry="11.5" stroke="#3096fa"/> + <ellipse cx="12.5" cy="162.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + <ellipse cx="12.5" cy="187.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + </g> + <path d="m20 112.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z"/> + <g> + <path d="m20 137.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#3096fa"/> + <path d="m20 162.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#2979ff"/> + <path d="m20 187.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index dccda341b7c..ea138423e8e 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -179,8 +179,159 @@ BLUE_INI TEXTFILE "\r\n; Flat menus\r\n" "FlatMenus = true\r\n" + +"\r\n; Button\r\n" +"[Button.Pushbutton]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 8, 8, 8, 8\r\n" +"SizingType = Stretch\r\n" +"ContentMargins = 3, 3, 3, 3\r\n" +"ImageFile = blue_button.bmp\r\n" +"ImageCount = 6\r\n" +"ImageLayout = Vertical\r\n" +"TextColor = 0 0 0\r\n" +"MinSize = 10, 5\r\n" + +"[Button.Pushbutton(Pressed)]\r\n" +"TextColor = 255 255 255\r\n" + +"[Button.Pushbutton(Disabled)]\r\n" +"TextColor = 166 166 166\r\n" + +"[Button.Checkbox]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = TrueSize\r\n" +"SizingMargins = 0, 0, 0, 0\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 12\r\n" +"MirrorImage = False\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"Transparent = True\r\n" +"ImageFile1 = blue_checkbox_13px.bmp\r\n" +"ImageFile2 = blue_checkbox_16px.bmp\r\n" +"ImageFile3 = blue_checkbox_25px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[Button.Checkbox(Checkeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Checkbox(Uncheckeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Checkbox(Mixeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Radiobutton]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" +"SizingType = TrueSize\r\n" +"SizingMargins = 0, 0, 0, 0\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 8\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_radiobutton_13px.bmp\r\n" +"ImageFile2 = blue_radiobutton_16px.bmp\r\n" +"ImageFile3 = blue_radiobutton_25px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[Button.Radiobutton(Checkeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Radiobutton(Uncheckeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Groupbox]\r\n" +"TextColor = 0 0 0\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_groupbox.bmp\r\n" +"BorderOnly = True\r\n" +"Transparent = True\r\n" + +"[Button.Commandlink]\r\n" +"BgType = ImageFile\r\n" +"BorderSize = 0\r\n" +"ContentMargins = 7, 7, 10, 10\r\n" +"Font = Tahoma, 10\r\n" +"BodyFont = Tahoma, 8\r\n" +"ImageFile = blue_commandlink.bmp\r\n" +"ImageCount = 6\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Stretch\r\n" +"SizingMargins = 5, 5, 24, 24\r\n" +"Transparent = True\r\n" +"TextColor = 0 0 0\r\n" +"MinSize = 10, 5\r\n" + +"[Button.Commandlink(Hot)]\r\n" +"TextColor = 48 150 250\r\n" + +"[Button.Commandlink(Pressed)]\r\n" +"TextColor = 41 121 255\r\n" + +"[Button.Commandlink(Disabled)]\r\n" +"TextColor = 174 174 174\r\n" + +"[Button.CommandlinkGlyph]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageCount = 5\r\n" +"Transparent = True\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"Transparent = True\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_commandlink_glyph_30px.bmp\r\n" +"ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 144\r\n" } +/* All following bitmaps are of 32-bit ARGB format */ + +/* Button */ +/* @makedep: blue_button.bmp */ +BLUE_BUTTON_BMP BITMAP "blue_button.bmp" + +/* @makedep: blue_checkbox_13px.bmp */ +BLUE_CHECKBOX_13PX_BMP BITMAP "blue_checkbox_13px.bmp" + +/* @makedep: blue_checkbox_16px.bmp */ +BLUE_CHECKBOX_16PX_BMP BITMAP "blue_checkbox_16px.bmp" + +/* @makedep: blue_checkbox_25px.bmp */ +BLUE_CHECKBOX_25PX_BMP BITMAP "blue_checkbox_25px.bmp" + +/* @makedep: blue_radiobutton_13px.bmp */ +BLUE_RADIOBUTTON_13PX_BMP BITMAP "blue_radiobutton_13px.bmp" + +/* @makedep: blue_radiobutton_16px.bmp */ +BLUE_RADIOBUTTON_16PX_BMP BITMAP "blue_radiobutton_16px.bmp" + +/* @makedep: blue_radiobutton_25px.bmp */ +BLUE_RADIOBUTTON_25PX_BMP BITMAP "blue_radiobutton_25px.bmp" + +/* @makedep: blue_groupbox.bmp */ +BLUE_GROUPBOX_BMP BITMAP "blue_groupbox.bmp" + +/* @makedep: blue_commandlink.bmp */ +BLUE_COMMANDLINK_BMP BITMAP "blue_commandlink.bmp" + +/* @makedep: blue_commandlink_glyph_30px.bmp */ +BLUE_COMMANDLINK_GLYPH_30PX_BMP BITMAP "blue_commandlink_glyph_30px.bmp" + +/* @makedep: blue_commandlink_glyph_45px.bmp */ +BLUE_COMMANDLINK_GLYPH_45PX_BMP BITMAP "blue_commandlink_glyph_45px.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

2 1

[PATCH 1/6] server: Introduce IOCTL_AFD_WINE_GET_SO_ACCEPTCONN.
by Zebediah Figura 23 Jun '21

23 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/wine/afd.h | 1 + server/sock.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index e497eece0be..4c501872dde 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -159,6 +159,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GETPEERNAME CTL_CODE(FILE_DEVICE_NETWORK, 216, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_DEFER CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index b73fbb98388..71f22845827 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2532,6 +2532,20 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_GET_SO_ACCEPTCONN: + { + int listening = (sock->state == SOCK_LISTENING); + + if (get_reply_max_size() < sizeof(listening)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + set_reply_data( &listening, sizeof(listening) ); + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0; -- 2.30.2

2 8

[PATCH v9 1/4] winevulkan: Support use of extensions which mustn't be exposed.
by Derek Lesho 23 Jun '21

23 Jun '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9ef863837d1..d226057c69e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -120,6 +120,11 @@ UNSUPPORTED_EXTENSIONS = [ "VK_NV_external_memory_win32", ] +# Either internal extensions which aren't present on the win32 platform which +# winevulkan may nonetheless use, or extensions we want to generate headers for +# but not expose to applications (useful for test commits) +UNEXPOSED_EXTENSIONS = {} + # The Vulkan loader provides entry-points for core functionality and important # extensions. Based on vulkan-1.def this amounts to WSI extensions on 1.0.51. CORE_EXTENSIONS = [ @@ -521,8 +526,8 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extensions=[], alias=None): - self.extensions = [] + def __init__(self, _type=None, name=None, params=[], alias=None): + self.extensions = set() self.name = name self.type = _type self.params = params @@ -665,6 +670,10 @@ class VkFunction(object): def needs_private_thunk(self): return self.thunk_type == ThunkType.PRIVATE + def needs_exposing(self): + # The function needs exposed if at-least one extension isn't both UNSUPPORTED and UNEXPOSED + return self.is_required() and (not self.extensions or not self.extensions.issubset(UNEXPOSED_EXTENSIONS)) + def pfn(self, prefix="p", call_conv=None, conv=False): """ Create function pointer. """ @@ -2651,7 +2660,7 @@ class VkGenerator(object): # Create thunks for instance and device functions. # Global functions don't go through the thunks. for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.is_global_func(): @@ -2671,6 +2680,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "device": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2680,6 +2691,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "instance": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2739,7 +2752,7 @@ class VkGenerator(object): f.write("const struct unix_funcs loader_funcs =\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -2758,7 +2771,7 @@ class VkGenerator(object): # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.needs_thunk() and not vk_func.needs_private_thunk(): continue @@ -2857,7 +2870,7 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type != ThunkType.PUBLIC: continue @@ -2866,7 +2879,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_device_dispatch_table[] =\n{\n") for vk_func in self.registry.device_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2874,7 +2887,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_phys_dev_dispatch_table[] =\n{\n") for vk_func in self.registry.phys_dev_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2882,7 +2895,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_instance_dispatch_table[] =\n{\n") for vk_func in self.registry.instance_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2939,7 +2952,7 @@ class VkGenerator(object): f.write("struct unix_funcs\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -3433,7 +3446,7 @@ class VkRegistry(object): # the XML file to handle this, but because of the manner in which we parse the XML # file we pre-populate from <commands> before we check if a command is enabled. if cmd_name in self.funcs: - self.funcs[cmd_name].extensions.append(ext_name) + self.funcs[cmd_name].extensions.add(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": -- 2.31.1

2 4

[PATCH v3] ntdll/tests: Do not write to fs, gs when testing cleared segment regs on x64.
by Paul Gofman 23 Jun '21

23 Jun '21

Fixes the crash in test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51152 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix comment. v3: - actually disabled the test which accidentally did not happen in the v2 update. dlls/ntdll/tests/exception.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 328882c1a23..eff2fd602c0 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2908,13 +2908,30 @@ static const struct exception 0x31, 0xc0, /* xor %eax,%eax */ 0x8e, 0xc0, /* mov %eax,%es */ 0x8e, 0xd8, /* mov %eax,%ds */ +#if 0 + /* It is observed that fs/gs base is reset + on some CPUs on Linux when setting the + segment value even to 0 (regardless of CPU spec + saying otherwise) and it is not currently + handled in Wine. + Disable this part to avoid crashing the test. */ 0x8e, 0xe0, /* mov %eax,%fs */ 0x8e, 0xe8, /* mov %eax,%gs */ +#else + 0x90, 0x90, /* nop */ + 0x90, 0x90, /* nop */ +#endif 0xfa, /* cli */ 0x58, /* pop %rax */ +#if 0 0x8e, 0xe8, /* mov %eax,%gs */ 0x58, /* pop %rax */ 0x8e, 0xe0, /* mov %eax,%fs */ +#else + 0x58, /* pop %rax */ + 0x90, 0x90, /* nop */ + 0x90, 0x90, /* nop */ +#endif 0x58, /* pop %rax */ 0x8e, 0xd8, /* mov %eax,%ds */ 0x58, /* pop %rax */ -- 2.31.1

2 1

[PATCH v2] ntdll/tests: Do not write to fs, gs when testing cleared segment regs on x64.
by Paul Gofman 23 Jun '21

23 Jun '21

Fixes the crash in test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51152 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix comment. dlls/ntdll/tests/exception.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 328882c1a23..2b18853a72d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2908,13 +2908,30 @@ static const struct exception 0x31, 0xc0, /* xor %eax,%eax */ 0x8e, 0xc0, /* mov %eax,%es */ 0x8e, 0xd8, /* mov %eax,%ds */ +#if 1 + /* It is observed that fs/gs base is reset + on some CPUs on Linux when setting the + segment value even to 0 (regardless of CPU spec + saying otherwise) and it is not currently + handled in Wine. + Disable this part to avoid crashing the test. */ 0x8e, 0xe0, /* mov %eax,%fs */ 0x8e, 0xe8, /* mov %eax,%gs */ +#else + 0x90, 0x90, /* nop */ + 0x90, 0x90, /* nop */ +#endif 0xfa, /* cli */ 0x58, /* pop %rax */ +#if 1 0x8e, 0xe8, /* mov %eax,%gs */ 0x58, /* pop %rax */ 0x8e, 0xe0, /* mov %eax,%fs */ +#else + 0x58, /* pop %rax */ + 0x90, 0x90, /* nop */ + 0x90, 0x90, /* nop */ +#endif 0x58, /* pop %rax */ 0x8e, 0xd8, /* mov %eax,%ds */ 0x58, /* pop %rax */ -- 2.31.1

1 0

[PATCH] ntdll/tests: Do not write to fs, gs when testing cleared segment regs on x64.
by Paul Gofman 23 Jun '21

23 Jun '21

Fixes the crash in test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51152 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 328882c1a23..7b83c06a8db 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2908,13 +2908,27 @@ static const struct exception 0x31, 0xc0, /* xor %eax,%eax */ 0x8e, 0xc0, /* mov %eax,%es */ 0x8e, 0xd8, /* mov %eax,%ds */ +#if 0 + /* TODO_WINE: fs/gs base is reset on Linux when setting the + segment value and this is not currently handled. + Disable this part to avoid crashing the test. */ 0x8e, 0xe0, /* mov %eax,%fs */ 0x8e, 0xe8, /* mov %eax,%gs */ +#else + 0x90, 0x90, /* nop */ + 0x90, 0x90, /* nop */ +#endif 0xfa, /* cli */ 0x58, /* pop %rax */ +#if 0 0x8e, 0xe8, /* mov %eax,%gs */ 0x58, /* pop %rax */ 0x8e, 0xe0, /* mov %eax,%fs */ +#else + 0x58, /* pop %rax */ + 0x90, 0x90, /* nop */ + 0x90, 0x90, /* nop */ +#endif 0x58, /* pop %rax */ 0x8e, 0xd8, /* mov %eax,%ds */ 0x58, /* pop %rax */ -- 2.31.1

3 2

[PATCH] ntdll/tests: Fix the test_process_params() size check.
by Francois Gouget 23 Jun '21

23 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Because it all depends on rounding, this failure would only happen in the 64-bit ntdll:env test on the TestBot. Here I could only reproduce it when starting ntdll:env from a Windows process rather than directly from ./wine, both for 32- and 64-bit. --- dlls/ntdll/tests/env.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 9cfbf9eb435..351f8d5df5a 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -456,6 +456,7 @@ static void test_process_params(void) pos = check_string( cur_params, &cur_params->ShellInfo, NULL, pos ); pos = check_string( cur_params, &cur_params->RuntimeInfo, NULL, pos ); /* environment may follow */ + pos = align(pos, sizeof(void *)); str = (WCHAR *)pos; if (pos - (UINT_PTR)cur_params < cur_params->Size) str += get_env_length(str); ok( (char *)str == (char *)cur_params + cur_params->Size, -- 2.20.1

3 4

[PATCH] msvcr120: Add version.rc file.
by Andrey Gusev 23 Jun '21

23 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51244 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/msvcr120/Makefile.in | 2 ++ dlls/msvcr120/version.rc | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 dlls/msvcr120/version.rc diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index 3c949851ff6..aff77ba24ac 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -40,3 +40,5 @@ C_SRCS = \ time.c \ undname.c \ wcs.c + +RC_SRCS = version.rc diff --git a/dlls/msvcr120/version.rc b/dlls/msvcr120/version.rc new file mode 100644 index 00000000000..f29899e48cb --- /dev/null +++ b/dlls/msvcr120/version.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2021 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine CRT library" +#define WINE_FILENAME_STR "msvcr120.dll" +#define WINE_FILEVERSION 12,0,40664,0 +#define WINE_FILEVERSION_STR "12.0.40664.0" + +#include "wine/wine_common_ver.rc" -- 2.31.1

2 1

[PATCH vkd3d 1/2] vkd3d: Remove fixme for UAV counter offsets.
by Conor McCarthy 23 Jun '21

23 Jun '21

The fixme says the offset is ignored, but it is used when creating the Vulkan buffer view for the counter, and works as expected. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a9d4d464..3a66bb15 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2847,9 +2847,6 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ return; } - if (desc->u.Buffer.CounterOffsetInBytes) - FIXME("Ignoring counter offset %"PRIu64".\n", desc->u.Buffer.CounterOffsetInBytes); - flags = vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->u.Buffer.Flags); if (!vkd3d_create_buffer_view_for_resource(device, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, -- 2.31.1

3 3

[PATCH 1/6] hidclass.sys: Support parsing of explicit usage page.
by Rémi Bernon 23 Jun '21

23 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 53 +++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 930dcd52715..646f6eaa492 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -272,7 +272,9 @@ struct hid_parser_state { HIDP_CAPS caps; - USAGE usages[256]; + USAGE usages_page[256]; + USAGE usages_min[256]; + USAGE usages_max[256]; DWORD usages_size; struct hid_value_caps items; @@ -323,6 +325,9 @@ static void reset_local_items( struct hid_parser_state *state ) memset( &state->items, 0, sizeof(state->items) ); copy_global_items( &state->items, &tmp ); copy_collection_items( &state->items, &tmp ); + memset( &state->usages_page, 0, sizeof(state->usages_page) ); + memset( &state->usages_min, 0, sizeof(state->usages_min) ); + memset( &state->usages_max, 0, sizeof(state->usages_max) ); state->usages_size = 0; } @@ -352,14 +357,42 @@ static BOOL parse_global_pop( struct hid_parser_state *state ) return TRUE; } -static BOOL parse_local_usage( struct hid_parser_state *state, USAGE usage ) +static BOOL parse_local_usage( struct hid_parser_state *state, USAGE usage_page, USAGE usage ) { - state->usages[state->usages_size] = usage; + if (!usage_page) usage_page = state->items.usage_page; + if (state->items.is_range) state->usages_size = 0; + state->usages_page[state->usages_size] = usage_page; + state->usages_min[state->usages_size] = usage; + state->usages_max[state->usages_size] = usage; + state->items.usage_min = usage; + state->items.usage_max = usage; state->items.is_range = FALSE; if (state->usages_size++ == 255) ERR( "HID parser usages stack overflow!\n" ); return state->usages_size <= 255; } +static void parse_local_usage_min( struct hid_parser_state *state, USAGE usage_page, USAGE usage ) +{ + if (!usage_page) usage_page = state->items.usage_page; + if (!state->items.is_range) state->usages_max[0] = 0; + state->usages_page[0] = usage_page; + state->usages_min[0] = usage; + state->items.usage_min = usage; + state->items.is_range = TRUE; + state->usages_size = 1; +} + +static void parse_local_usage_max( struct hid_parser_state *state, USAGE usage_page, USAGE usage ) +{ + if (!usage_page) usage_page = state->items.usage_page; + if (!state->items.is_range) state->usages_min[0] = 0; + state->usages_page[0] = usage_page; + state->usages_max[0] = usage; + state->items.usage_max = usage; + state->items.is_range = TRUE; + state->usages_size = 1; +} + static BOOL parse_new_collection( struct hid_parser_state *state ) { if (!array_reserve( &state->stack, &state->stack_size, state->collection_idx )) @@ -377,6 +410,9 @@ static BOOL parse_new_collection( struct hid_parser_state *state ) copy_collection_items( state->stack + state->collection_idx, &state->items ); state->collection_idx++; + state->items.usage_min = state->usages_min[0]; + state->items.usage_max = state->usages_max[0]; + state->collections[state->caps.NumberLinkCollectionNodes] = state->items; state->items.link_collection = state->caps.NumberLinkCollectionNodes; state->items.link_usage_page = state->items.usage_page; @@ -417,8 +453,8 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY list_add_tail( &collection->features, &feature->entry ); feature->type = type; feature->isData = ((state->items.bit_field & INPUT_DATA_CONST) == 0); - if (j < state->usages_size) state->items.usage_min = state->usages[j]; copy_hidp_value_caps( &feature->caps, &state->items ); + if (j < state->usages_size) feature->caps.NotRange.Usage = state->usages_min[j]; feature->caps.ReportCount = 1; if (j + 1 >= state->usages_size) { @@ -508,7 +544,6 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int subcollection->parent = collection; /* Only set our collection once... We do not properly handle composite devices yet. */ - if (state->usages_size) state->items.usage_min = state->usages[state->usages_size - 1]; list_init(&subcollection->features); list_init(&subcollection->collections); parse_collection(size, value, subcollection); @@ -559,15 +594,13 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int break; case SHORT_ITEM(TAG_LOCAL_USAGE, TAG_TYPE_LOCAL): - if (!parse_local_usage( state, value )) return -1; + if (!parse_local_usage( state, value >> 16, value & 0xffff )) return -1; break; case SHORT_ITEM(TAG_LOCAL_USAGE_MINIMUM, TAG_TYPE_LOCAL): - state->items.usage_min = value; - state->items.is_range = TRUE; + parse_local_usage_min( state, value >> 16, value & 0xffff ); break; case SHORT_ITEM(TAG_LOCAL_USAGE_MAXIMUM, TAG_TYPE_LOCAL): - state->items.usage_max = value; - state->items.is_range = TRUE; + parse_local_usage_max( state, value >> 16, value & 0xffff ); break; case SHORT_ITEM(TAG_LOCAL_DESIGNATOR_INDEX, TAG_TYPE_LOCAL): state->items.designator_min = state->items.designator_max = value; -- 2.31.0

3 9

[PATCH 4/4] urlmon/tests: Add some IAuthenticate tests for IMoniker::BindToStorage().
by Dmitry Timoshkov 23 Jun '21

23 Jun '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/urlmon/tests/url.c | 228 +++++++++++++++++++++++++++++----------- 1 file changed, 168 insertions(+), 60 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 69ec00476ff..15a90864aea 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -91,6 +91,7 @@ DEFINE_EXPECT(QueryInterface_IBindStatusCallback); DEFINE_EXPECT(QueryInterface_IBindStatusCallbackEx); DEFINE_EXPECT(QueryInterface_IBindStatusCallbackHolder); DEFINE_EXPECT(QueryInterface_IAuthenticate); +DEFINE_EXPECT(QueryInterface_IAuthenticateEx); DEFINE_EXPECT(QueryInterface_IInternetProtocol); DEFINE_EXPECT(QueryInterface_IWindowForBindingUI); DEFINE_EXPECT(QueryInterface_IHttpSecurity); @@ -148,6 +149,7 @@ DEFINE_EXPECT(GetWindow_IHttpSecurity); DEFINE_EXPECT(GetWindow_IWindowForBindingUI); DEFINE_EXPECT(GetWindow_ICodeInstall); DEFINE_EXPECT(OnSecurityProblem); +DEFINE_EXPECT(Authenticate_Authenticate); static const WCHAR winetest_data_urlW[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', @@ -159,8 +161,9 @@ static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; #define WINEHQ_IP "4.4.81.124" +#define WINEHQ_IPW L"4.4.81.124" static const WCHAR wszWineHQSite[] = L"www.winehq.org"; -static const WCHAR wszWineHQIP[] = L"" WINEHQ_IP; +static const WCHAR wszWineHQIP[] = L"" WINEHQ_IPW; static const CHAR wszIndexHtmlA[] = "index.html"; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0}; static const CHAR dwl_htmlA[] = "dwl.html"; @@ -191,6 +194,10 @@ static BOOL async_switch = FALSE; static BOOL strict_bsc_qi; static DWORD bindtest_flags; static const char *test_file; +static BOOL auth_supported = FALSE; +static BOOL auth_fail = FALSE; +static BOOL auth_ask_for_credentials = FALSE; +static DWORD response_code = 200; static WCHAR file_url[INTERNET_MAX_URL_LENGTH], current_url[INTERNET_MAX_URL_LENGTH]; @@ -203,7 +210,8 @@ static enum { HTTPS_TEST, FTP_TEST, WINETEST_TEST, - WINETEST_SYNC_TEST + WINETEST_SYNC_TEST, + HTTP_BASIC_AUTH_TEST } test_protocol; static enum { @@ -233,7 +241,7 @@ static BOOL proxy_active(void) static BOOL is_urlmon_protocol(int prot) { - return prot == FILE_TEST || prot == HTTP_TEST || prot == HTTPS_TEST || prot == FTP_TEST || prot == MK_TEST; + return prot == FILE_TEST || prot == HTTP_TEST || prot == HTTPS_TEST || prot == FTP_TEST || prot == MK_TEST || prot == HTTP_BASIC_AUTH_TEST; } static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2) @@ -1240,7 +1248,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); - ok(!lstrcmpW(szURL, current_url), "szURL != current_url\n"); + ok(!lstrcmpW(szURL, current_url), "got %s, expected %s\n", debugstr_w(szURL), debugstr_w(current_url)); ok(!dwReserved, "dwReserved=%d, expected 0\n", dwReserved); ok(pszAdditionalHeaders != NULL, "pszAdditionalHeaders == NULL\n"); if(pszAdditionalHeaders) @@ -1256,9 +1264,12 @@ static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD dwR ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); - ok(dwResponseCode == 200, "dwResponseCode=%d, expected 200\n", dwResponseCode); + ok(dwResponseCode == response_code, "dwResponseCode=%d, expected %u\n", dwResponseCode, response_code); ok(szResponseHeaders != NULL, "szResponseHeaders == NULL\n"); - ok(szRequestHeaders == NULL, "szRequestHeaders != NULL\n"); + if (auth_supported) + ok(szRequestHeaders != NULL, "szRequestHeaders == NULL\n"); + else + ok(szRequestHeaders == NULL, "szRequestHeaders != NULL\n"); /* Note: in protocol.c tests, OnResponse pszAdditionalRequestHeaders _is_ NULL */ ok(pszAdditionalRequestHeaders != NULL, "pszAdditionalHeaders == NULL\n"); if(pszAdditionalRequestHeaders) @@ -1437,6 +1448,62 @@ static IServiceProviderVtbl ServiceProviderVtbl = { static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; +static HRESULT WINAPI Authenticate_QueryInterface(IAuthenticate *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IAuthenticateEx)) { + CHECK_EXPECT(QueryInterface_IAuthenticateEx); + *ppv = NULL; + return E_NOINTERFACE; + } + + if(IsEqualGUID(riid, &IID_IAuthenticate)) { + CHECK_EXPECT(QueryInterface_IAuthenticate); + *ppv = iface; + return S_OK; + } + + ok(0, "Unexpected interface requested: %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI Authenticate_AddRef(IAuthenticate *iface) +{ + return 2; +} + +static ULONG WINAPI Authenticate_Release(IAuthenticate *iface) +{ + return 1; +} + +static HRESULT WINAPI Authenticate_Authenticate(IAuthenticate *iface, HWND *hwnd, LPWSTR *user, LPWSTR *pass) +{ + if (winetest_debug > 1) + trace("IAuthenticate::Authenticate()\n"); + + CHECK_EXPECT(Authenticate_Authenticate); + + if(auth_fail) + return E_NOTIMPL; + + if(auth_ask_for_credentials) { + binding_hres = INET_E_DATA_NOT_AVAILABLE; + *hwnd = GetDesktopWindow(); + }else + *hwnd = 0; + *user = *pass = NULL; + return S_OK; +} + +static IAuthenticateVtbl AuthenticateVtbl = { + Authenticate_QueryInterface, + Authenticate_AddRef, + Authenticate_Release, + Authenticate_Authenticate +}; + +static IAuthenticate Authenticate = { &AuthenticateVtbl }; + static IBindStatusCallbackEx objbsc; static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) @@ -1465,7 +1532,7 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) if(download_state == BEFORE_DOWNLOAD && progress != BINDSTATUS_MIMETYPEAVAILABLE && progress != BINDSTATUS_DECODING) ok(status == 0, "progress %u: status = %d\n", progress, status); else - ok(status == HTTP_STATUS_OK, "progress %u: status = %d\n", progress, status); + ok(status == response_code, "progress %u: status = %d, expected %d\n", progress, status, response_code); ok(size == sizeof(DWORD), "size = %d\n", size); } @@ -1513,6 +1580,11 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REF return S_OK; }else if (IsEqualGUID(&IID_IAuthenticate, riid)) { CHECK_EXPECT(QueryInterface_IAuthenticate); + if (auth_supported) + { + *ppv = &Authenticate; + return S_OK; + } return E_NOINTERFACE; }else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) { if(strict_bsc_qi) @@ -1843,6 +1915,7 @@ static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallbackEx *iface, HRES else ok(hresult == E_ABORT, "binding failed: %08x, expected E_ABORT\n", hresult); } else +todo_wine_if(auth_ask_for_credentials) ok(hresult == binding_hres, "binding failed: %08x, expected %08x\n", hresult, binding_hres); ok(szError == NULL, "szError should be NULL\n"); @@ -1873,7 +1946,7 @@ static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallbackEx *iface, HRES ok(IsEqualCLSID(&clsid, &CLSID_FileProtocol), "incorrect protocol CLSID: %s, expected CLSID_FileProtocol\n", wine_dbgstr_guid(&clsid)); - }else if(test_protocol == HTTP_TEST) { + }else if(test_protocol == HTTP_TEST || test_protocol == HTTP_BASIC_AUTH_TEST) { ok(IsEqualCLSID(&clsid, &CLSID_HttpProtocol), "incorrect protocol CLSID: %s, expected CLSID_HttpProtocol\n", wine_dbgstr_guid(&clsid)); @@ -2844,13 +2917,17 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) stopped_obj_binding = FALSE; data_available = FALSE; mime_type[0] = 0; - binding_hres = S_OK; + binding_hres = protocol == HTTP_BASIC_AUTH_TEST ? E_ACCESSDENIED : S_OK; bind_to_object = (flags & BINDTEST_TOOBJECT) != 0; tymed = t; filedwl_api = (flags & BINDTEST_FILEDWLAPI) != 0; post_test = (flags & BINDTEST_HTTPRESPONSE) != 0; switch(protocol) { + case HTTP_BASIC_AUTH_TEST: + lstrcpyW(current_url, L"http://httpbin.org/basic-auth/foo/bar"); + break; + case HTTP_TEST: if(post_test) url_a = "http://test.winehq.org/tests/post.php"; @@ -2890,7 +2967,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) abort_start = (flags & BINDTEST_ABORT_START) != 0; abort_progress = (flags & BINDTEST_ABORT_PROGRESS) != 0; async_switch = (flags & BINDTEST_ASYNC_SWITCH) != 0; - is_async_prot = protocol == HTTP_TEST || protocol == HTTPS_TEST || protocol == FTP_TEST || protocol == WINETEST_TEST; + is_async_prot = protocol == HTTP_TEST || protocol == HTTPS_TEST || protocol == FTP_TEST || protocol == WINETEST_TEST || protocol == HTTP_BASIC_AUTH_TEST; prot_state = 0; ResetEvent(complete_event); @@ -3005,7 +3082,7 @@ static void test_MonikerComposeWith(void) IMoniker_Release(outmon); } -static void test_BindToStorage(int protocol, DWORD flags, DWORD t) +static void test_BindToStorage(int protocol, DWORD flags, DWORD t, DWORD exhres) { IMoniker *mon; HRESULT hres; @@ -3018,6 +3095,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) IBinding *bind; init_bind_test(protocol, flags, t); + binding_hres = exhres; allow_finding_resource = (flags & BINDTEST_ALLOW_FINDINGRESOURCE) != 0; if(no_callback) { @@ -3073,7 +3151,6 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) binding_hres = INET_E_INVALID_CERTIFICATE; } - if(only_check_prot_args) SET_EXPECT(OnStopBinding); if(!no_callback) { @@ -3094,7 +3171,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(tymed != TYMED_FILE || (test_protocol != ABOUT_TEST && test_protocol != ITS_TEST)) SET_EXPECT(UnlockRequest); }else { - if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) { + if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST || test_protocol == HTTP_BASIC_AUTH_TEST) { SET_EXPECT(QueryService_IInternetBindInfo); if(!abort_start) SET_EXPECT(QueryInterface_IHttpNegotiate); @@ -3119,9 +3196,16 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) } if(!no_callback) { if((test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FTP_TEST - || test_protocol == FILE_TEST || test_protocol == WINETEST_TEST) && !abort_start) + || test_protocol == FILE_TEST || test_protocol == WINETEST_TEST || test_protocol == HTTP_BASIC_AUTH_TEST) && !abort_start) SET_EXPECT(OnProgress_SENDINGREQUEST); - if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) { + if(test_protocol == HTTP_BASIC_AUTH_TEST) { + SET_EXPECT(QueryInterface_IAuthenticate); + SET_EXPECT(QueryInterface_IAuthenticateEx); + if (!auth_supported) + SET_EXPECT(QueryService_IAuthenticate); + SET_EXPECT(Authenticate_Authenticate); + } + if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST || test_protocol == HTTP_BASIC_AUTH_TEST) { SET_EXPECT(QueryInterface_IHttpNegotiate); SET_EXPECT(OnResponse); } @@ -3142,7 +3226,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) } hres = IMoniker_BindToStorage(mon, bctx, NULL, tymed == TYMED_ISTREAM ? &IID_IStream : &IID_IUnknown, (void**)&unk); - if ((test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) + if ((test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == HTTP_BASIC_AUTH_TEST) && hres == HRESULT_FROM_WIN32(ERROR_INTERNET_NAME_NOT_RESOLVED)) { skip("Network unreachable, skipping tests\n"); @@ -3183,6 +3267,10 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) invalid_cn_accepted = FALSE; binding_hres = INET_E_INVALID_CERTIFICATE; } + }else if(FAILED(binding_hres)) { +todo_wine_if(auth_ask_for_credentials) + ok(hres == exhres, "IMoniker_BindToStorage failed: %08x, expected %08x\n", hres, exhres); + ok(!unk, "unk = %p, expected NULL\n", unk); }else { ok(hres == S_OK, "IMoniker_BindToStorage failed: %08x\n", hres); ok(unk != NULL, "unk == NULL\n"); @@ -3302,7 +3390,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) CHECK_CALLED(OnDataAvailable); else CHECK_NOT_CALLED(OnDataAvailable); - }else if((tymed != TYMED_FILE || test_protocol != ABOUT_TEST) && !abort_start) + }else if((tymed != TYMED_FILE || test_protocol != ABOUT_TEST) && !abort_start && binding_hres == S_OK) CHECK_CALLED(OnDataAvailable); CHECK_CALLED(OnStopBinding); } @@ -4033,10 +4121,30 @@ START_TEST(url) test_BindToStorage_fail(); trace("synchronous http test (COM not initialised)...\n"); - test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM, S_OK); CoInitialize(NULL); + http_is_first = TRUE; + trace("IAuthenticate test...\n"); + test_BindToStorage(HTTP_BASIC_AUTH_TEST, 0, 0, E_ACCESSDENIED); + + auth_supported = TRUE; + trace("IAuthenticate test (auth_supported)...\n"); + test_BindToStorage(HTTP_BASIC_AUTH_TEST, 0, 0, E_ACCESSDENIED); + + if(winetest_interactive) { /* Press ESC when asked for credentials*/ + auth_ask_for_credentials = TRUE; + response_code = 401; + trace("IAuthenticate interactive test...\n"); + test_BindToStorage(HTTP_BASIC_AUTH_TEST, 0, 0, S_OK); + } + + auth_supported = FALSE; + auth_ask_for_credentials = FALSE; + http_is_first = FALSE; + response_code = 200; + trace("test StdURLMoniker...\n"); test_StdURLMoniker(); @@ -4044,28 +4152,28 @@ START_TEST(url) test_MonikerComposeWith(); trace("synchronous http test...\n"); - test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM, S_OK); trace("emulated synchronous http test (to file)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_FILE); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_FILE, S_OK); trace("synchronous http test (to object)...\n"); test_BindToObject(HTTP_TEST, 0, S_OK); trace("emulated synchronous http test (with cache)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_USE_CACHE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_USE_CACHE, TYMED_ISTREAM, S_OK); trace("emulated synchronous http test (with cache, no read)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_USE_CACHE|BINDTEST_NO_CALLBACK_READ, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_USE_CACHE|BINDTEST_NO_CALLBACK_READ, TYMED_ISTREAM, 0); trace("synchronous http test (with cache, no read)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_USE_CACHE|BINDTEST_NO_CALLBACK_READ, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_USE_CACHE|BINDTEST_NO_CALLBACK_READ, TYMED_ISTREAM, S_OK); trace("synchronous file test...\n"); - test_BindToStorage(FILE_TEST, 0, TYMED_ISTREAM); + test_BindToStorage(FILE_TEST, 0, TYMED_ISTREAM, 0); trace("emulated synchronous file test (to file)...\n"); - test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_FILE); + test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_FILE, S_OK); trace("synchronous file test (to object)...\n"); test_BindToObject(FILE_TEST, 0, S_OK); @@ -4076,31 +4184,31 @@ START_TEST(url) create_html_file(); trace("file test (no callback)...\n"); - test_BindToStorage(FILE_TEST, BINDTEST_NO_CALLBACK, TYMED_ISTREAM); + test_BindToStorage(FILE_TEST, BINDTEST_NO_CALLBACK, TYMED_ISTREAM, S_OK); if(can_do_https()) { trace("synchronous https test (invalid CN, dialog)\n"); onsecurityproblem_hres = S_FALSE; http_is_first = TRUE; - test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); + test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM, S_OK); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; trace("asynchronous https test (invalid CN, fail)\n"); onsecurityproblem_hres = E_FAIL; - test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); + test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM, S_OK); trace("asynchronous https test (invalid CN, accept)\n"); onsecurityproblem_hres = S_OK; - test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); + test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM, S_OK); trace("asynchronous https test (invalid CN, dialog 2)\n"); onsecurityproblem_hres = S_FALSE; - test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); + test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM, S_OK); invalid_cn_accepted = FALSE; trace("asynchronous https test...\n"); - test_BindToStorage(HTTPS_TEST, 0, TYMED_ISTREAM); + test_BindToStorage(HTTPS_TEST, 0, TYMED_ISTREAM, S_OK); }else { win_skip("Skipping https tests\n"); } @@ -4108,39 +4216,39 @@ START_TEST(url) bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; trace("winetest test (async switch)...\n"); - test_BindToStorage(WINETEST_TEST, BINDTEST_EMULATE|BINDTEST_ASYNC_SWITCH, TYMED_ISTREAM); + test_BindToStorage(WINETEST_TEST, BINDTEST_EMULATE|BINDTEST_ASYNC_SWITCH, TYMED_ISTREAM, S_OK); trace("about test (no read)...\n"); - test_BindToStorage(ABOUT_TEST, BINDTEST_NO_CALLBACK_READ, TYMED_ISTREAM); + test_BindToStorage(ABOUT_TEST, BINDTEST_NO_CALLBACK_READ, TYMED_ISTREAM, S_OK); trace("http test...\n"); - test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM, 0); trace("http test (to file)...\n"); - test_BindToStorage(HTTP_TEST, 0, TYMED_FILE); + test_BindToStorage(HTTP_TEST, 0, TYMED_FILE, 0); trace("http test (to object)...\n"); test_BindToObject(HTTP_TEST, 0, S_OK); trace("http test (short response)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE|BINDTEST_ALLOW_FINDINGRESOURCE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE|BINDTEST_ALLOW_FINDINGRESOURCE, TYMED_ISTREAM, S_OK); trace("http test (short response, to object)...\n"); test_BindToObject(HTTP_TEST, 0, S_OK); trace("http test (abort start binding E_NOTIMPL)...\n"); abort_hres = E_NOTIMPL; - test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_START, TYMED_FILE); + test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_START, TYMED_FILE, S_OK); trace("http test (abort start binding E_ABORT)...\n"); abort_hres = E_ABORT; - test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_START, TYMED_FILE); + test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_START, TYMED_FILE, S_OK); trace("http test (abort progress)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_PROGRESS|BINDTEST_ALLOW_FINDINGRESOURCE, TYMED_FILE); + test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_PROGRESS|BINDTEST_ALLOW_FINDINGRESOURCE, TYMED_FILE, S_OK); trace("emulated http test...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM, S_OK); trace("emulated http test (to object)...\n"); test_BindToObject(HTTP_TEST, BINDTEST_EMULATE, S_OK); @@ -4149,67 +4257,67 @@ START_TEST(url) test_BindToObject(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_REDIRECT, S_OK); trace("emulated http test (to file)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_FILE); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_FILE, S_OK); trace("emulated http test (redirect)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_REDIRECT, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_REDIRECT, TYMED_ISTREAM, S_OK); trace("emulated http test (with cache)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_USE_CACHE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_USE_CACHE, TYMED_ISTREAM, S_OK); trace("winetest test (no callback)...\n"); - test_BindToStorage(WINETEST_TEST, BINDTEST_EMULATE|BINDTEST_NO_CALLBACK|BINDTEST_USE_CACHE, TYMED_ISTREAM); + test_BindToStorage(WINETEST_TEST, BINDTEST_EMULATE|BINDTEST_NO_CALLBACK|BINDTEST_USE_CACHE, TYMED_ISTREAM, S_OK); trace("emulated https test...\n"); - test_BindToStorage(HTTPS_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); + test_BindToStorage(HTTPS_TEST, BINDTEST_EMULATE, TYMED_ISTREAM, S_OK); trace("about test...\n"); - test_BindToStorage(ABOUT_TEST, 0, TYMED_ISTREAM); + test_BindToStorage(ABOUT_TEST, 0, TYMED_ISTREAM, S_OK); trace("about test (to file)...\n"); - test_BindToStorage(ABOUT_TEST, 0, TYMED_FILE); + test_BindToStorage(ABOUT_TEST, 0, TYMED_FILE, S_OK); trace("about test (to object)...\n"); test_BindToObject(ABOUT_TEST, 0, S_OK); trace("emulated about test...\n"); - test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); + test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_ISTREAM, S_OK); trace("emulated about test (to file)...\n"); - test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_FILE); + test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_FILE, S_OK); trace("emulated about test (to object)...\n"); test_BindToObject(ABOUT_TEST, BINDTEST_EMULATE, S_OK); trace("emulalated test reporting result in read...\n"); - test_BindToStorage(WINETEST_SYNC_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); + test_BindToStorage(WINETEST_SYNC_TEST, BINDTEST_EMULATE, TYMED_ISTREAM, S_OK); trace("file test...\n"); - test_BindToStorage(FILE_TEST, 0, TYMED_ISTREAM); + test_BindToStorage(FILE_TEST, 0, TYMED_ISTREAM, S_OK); trace("file test (to file)...\n"); - test_BindToStorage(FILE_TEST, 0, TYMED_FILE); + test_BindToStorage(FILE_TEST, 0, TYMED_FILE, S_OK); trace("file test (to object)...\n"); test_BindToObject(FILE_TEST, 0, S_OK); trace("emulated file test...\n"); - test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); + test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_ISTREAM, S_OK); trace("emulated file test (to file)...\n"); - test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_FILE); + test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_FILE, S_OK); trace("emulated file test (to object)...\n"); test_BindToObject(FILE_TEST, BINDTEST_EMULATE, S_OK); trace("emulated its test...\n"); - test_BindToStorage(ITS_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); + test_BindToStorage(ITS_TEST, BINDTEST_EMULATE, TYMED_ISTREAM, S_OK); trace("emulated its test (to file)...\n"); - test_BindToStorage(ITS_TEST, BINDTEST_EMULATE, TYMED_FILE); + test_BindToStorage(ITS_TEST, BINDTEST_EMULATE, TYMED_FILE, S_OK); trace("emulated mk test...\n"); - test_BindToStorage(MK_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); + test_BindToStorage(MK_TEST, BINDTEST_EMULATE, TYMED_ISTREAM, S_OK); trace("test URLDownloadToFile for file protocol...\n"); test_URLDownloadToFile(FILE_TEST, FALSE); @@ -4224,12 +4332,12 @@ START_TEST(url) test_URLDownloadToFile_abort(); trace("test emulated http abort...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_ABORT, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_ABORT, TYMED_ISTREAM, S_OK); bindf |= BINDF_NOWRITECACHE; trace("ftp test...\n"); - test_BindToStorage(FTP_TEST, 0, TYMED_ISTREAM); + test_BindToStorage(FTP_TEST, 0, TYMED_ISTREAM, S_OK); trace("test failures...\n"); test_BindToStorage_fail(); @@ -4238,7 +4346,7 @@ START_TEST(url) only_check_prot_args = TRUE; /* Fail after checking arguments to Protocol_Start */ trace("check emulated http protocol arguments...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM, S_OK); } DeleteFileA(test_file); -- 2.31.1

3 6

[PATCH] mf/session: Fix typo in a trace message.
by Nikolay Sivov 23 Jun '21

23 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 826c31ce121..9e8429fa8ac 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3361,7 +3361,7 @@ static HRESULT WINAPI session_sink_finalizer_callback_Invoke(IMFAsyncCallback *i if (state == (IUnknown *)sink->sink) { if (FAILED(hr = IMFMediaSink_QueryInterface(sink->sink, &IID_IMFFinalizableMediaSink, (void **)&fin_sink))) - WARN("Unexpected, missing IMFFinalizableSink, hr %#x.\n", hr); + WARN("Unexpected, missing IMFFinalizableMediaSink, hr %#x.\n", hr); } else { -- 2.30.2

1 0

[PATCH v3] ntdll: Implement JobObjectBasicProcessIdList for NtQueryInformationJobObject.
by Gabriel Ivăncescu 23 Jun '21

23 Jun '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v3: Enumerate child job pids first. (thanks Paul) dlls/kernel32/tests/process.c | 9 --------- dlls/ntdll/unix/sync.c | 31 ++++++++++++++++++++++++++++--- server/process.c | 34 ++++++++++++++++++++++++++++++++++ server/protocol.def | 9 +++++++++ 4 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 10786c5..83b9a9c 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2698,15 +2698,11 @@ static void test_QueryInformationJobObject(void) pid_list->NumberOfProcessIdsInList = 42; ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[1]), &ret_len); - todo_wine ok(!ret, "QueryInformationJobObject expected failure\n"); - todo_wine expect_eq_d(ERROR_MORE_DATA, GetLastError()); if (ret) { - todo_wine expect_eq_d(42, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(42, pid_list->NumberOfProcessIdsInList); } @@ -2721,17 +2717,12 @@ static void test_QueryInformationJobObject(void) { ULONG_PTR *list = pid_list->ProcessIdList; - todo_wine ok(ret_len == FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[2]), "QueryInformationJobObject returned ret_len=%u\n", ret_len); - todo_wine expect_eq_d(2, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(2, pid_list->NumberOfProcessIdsInList); - todo_wine expect_eq_d(pi[0].dwProcessId, list[0]); - todo_wine expect_eq_d(pi[1].dwProcessId, list[1]); } } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 16635ee..4592e8b 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -781,11 +781,36 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c case JobObjectBasicProcessIdList: { JOBOBJECT_BASIC_PROCESS_ID_LIST *process = info; + DWORD count, i; if (len < sizeof(*process)) return STATUS_INFO_LENGTH_MISMATCH; - memset( process, 0, sizeof(*process) ); - if (ret_len) *ret_len = sizeof(*process); - return STATUS_SUCCESS; + + count = len - FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList); + count /= sizeof(process->ProcessIdList[0]); + + SERVER_START_REQ( query_job_pids ) + { + req->job = wine_server_user_handle(handle); + wine_server_set_reply(req, process->ProcessIdList, count * sizeof(process_id_t)); + if ((ret = wine_server_call(req)) != STATUS_SUCCESS) + return ret; + process->NumberOfAssignedProcesses = reply->count; + process->NumberOfProcessIdsInList = min(count, reply->count); + } + SERVER_END_REQ; + + if (sizeof(process_id_t) < sizeof(process->ProcessIdList[0])) + { + /* start from the end to not overwrite */ + for (i = process->NumberOfProcessIdsInList; i--;) + { + ULONG_PTR id = ((process_id_t*)(&process->ProcessIdList[0]))[i]; + memcpy(&process->ProcessIdList[i], &id, sizeof(id)); + } + } + + if (ret_len) *ret_len = (char*)(&process->ProcessIdList[process->NumberOfProcessIdsInList]) - (char*)process; + return count < process->NumberOfAssignedProcesses ? STATUS_MORE_ENTRIES : STATUS_SUCCESS; } case JobObjectExtendedLimitInformation: { diff --git a/server/process.c b/server/process.c index 5b271b1..1b74e0b 100644 --- a/server/process.c +++ b/server/process.c @@ -286,6 +286,24 @@ static int process_in_job( struct job *job, struct process *process ) return process->job == job; } +static data_size_t query_job_pids( struct job *job, data_size_t count, data_size_t maxcount, process_id_t *pids ) +{ + struct process *process; + struct job *j; + + LIST_FOR_EACH_ENTRY( j, &job->child_job_list, struct job, parent_job_entry ) + count = query_job_pids( j, count, maxcount, pids ); + + LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) + { + if (process->end_time) continue; + if (count < maxcount) pids[count] = process->id; + count++; + } + + return count; +} + static void add_job_process( struct job *job, struct process *process ) { struct job *j, *common_parent; @@ -1739,6 +1757,22 @@ DECL_HANDLER(process_in_job) release_object( process ); } +/* get a list of the pids associated with the job */ +DECL_HANDLER(query_job_pids) +{ + struct job *job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ); + process_id_t *pids; + data_size_t len; + + if (!job) return; + + reply->count = query_job_pids( job, 0, 0, NULL ); + + len = min( get_reply_max_size(), reply->count * sizeof(*pids) ); + if (len && ((pids = set_reply_data_size( len )))) + query_job_pids( job, 0, len / sizeof(*pids), pids ); +} + /* retrieve information about a job */ DECL_HANDLER(get_job_info) { diff --git a/server/protocol.def b/server/protocol.def index b5bc049..b73a2c2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3665,6 +3665,15 @@ struct handle_info @END +/* Query a list of pids associated with the job */ +@REQ(query_job_pids) + obj_handle_t job; /* handle to the job */ +@REPLY + data_size_t count; /* number of processes associated with the job */ + VARARG(pids,uints); /* list of pids */ +@END + + /* Set limit flags on a job */ @REQ(set_job_limits) obj_handle_t handle; /* handle to the job */ -- 2.31.1

1 0

[PATCH v2] ntdll: Implement JobObjectBasicProcessIdList for NtQueryInformationJobObject.
by Gabriel Ivăncescu 23 Jun '21

23 Jun '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Recurse through child jobs and only add active processes. Assign proper value to NumberOfAssignedProcesses. Use memcpy for 64-bit to avoid type aliasing issues. dlls/kernel32/tests/process.c | 9 --------- dlls/ntdll/unix/sync.c | 31 ++++++++++++++++++++++++++++--- server/process.c | 34 ++++++++++++++++++++++++++++++++++ server/protocol.def | 9 +++++++++ 4 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 10786c5..83b9a9c 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2698,15 +2698,11 @@ static void test_QueryInformationJobObject(void) pid_list->NumberOfProcessIdsInList = 42; ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[1]), &ret_len); - todo_wine ok(!ret, "QueryInformationJobObject expected failure\n"); - todo_wine expect_eq_d(ERROR_MORE_DATA, GetLastError()); if (ret) { - todo_wine expect_eq_d(42, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(42, pid_list->NumberOfProcessIdsInList); } @@ -2721,17 +2717,12 @@ static void test_QueryInformationJobObject(void) { ULONG_PTR *list = pid_list->ProcessIdList; - todo_wine ok(ret_len == FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[2]), "QueryInformationJobObject returned ret_len=%u\n", ret_len); - todo_wine expect_eq_d(2, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(2, pid_list->NumberOfProcessIdsInList); - todo_wine expect_eq_d(pi[0].dwProcessId, list[0]); - todo_wine expect_eq_d(pi[1].dwProcessId, list[1]); } } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 16635ee..4592e8b 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -781,11 +781,36 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c case JobObjectBasicProcessIdList: { JOBOBJECT_BASIC_PROCESS_ID_LIST *process = info; + DWORD count, i; if (len < sizeof(*process)) return STATUS_INFO_LENGTH_MISMATCH; - memset( process, 0, sizeof(*process) ); - if (ret_len) *ret_len = sizeof(*process); - return STATUS_SUCCESS; + + count = len - FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList); + count /= sizeof(process->ProcessIdList[0]); + + SERVER_START_REQ( query_job_pids ) + { + req->job = wine_server_user_handle(handle); + wine_server_set_reply(req, process->ProcessIdList, count * sizeof(process_id_t)); + if ((ret = wine_server_call(req)) != STATUS_SUCCESS) + return ret; + process->NumberOfAssignedProcesses = reply->count; + process->NumberOfProcessIdsInList = min(count, reply->count); + } + SERVER_END_REQ; + + if (sizeof(process_id_t) < sizeof(process->ProcessIdList[0])) + { + /* start from the end to not overwrite */ + for (i = process->NumberOfProcessIdsInList; i--;) + { + ULONG_PTR id = ((process_id_t*)(&process->ProcessIdList[0]))[i]; + memcpy(&process->ProcessIdList[i], &id, sizeof(id)); + } + } + + if (ret_len) *ret_len = (char*)(&process->ProcessIdList[process->NumberOfProcessIdsInList]) - (char*)process; + return count < process->NumberOfAssignedProcesses ? STATUS_MORE_ENTRIES : STATUS_SUCCESS; } case JobObjectExtendedLimitInformation: { diff --git a/server/process.c b/server/process.c index 5b271b1..0baf662 100644 --- a/server/process.c +++ b/server/process.c @@ -286,6 +286,24 @@ static int process_in_job( struct job *job, struct process *process ) return process->job == job; } +static data_size_t query_job_pids( struct job *job, data_size_t count, data_size_t maxcount, process_id_t *pids ) +{ + struct process *process; + struct job *j; + + LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) + { + if (process->end_time) continue; + if (count < maxcount) pids[count] = process->id; + count++; + } + + LIST_FOR_EACH_ENTRY( j, &job->child_job_list, struct job, parent_job_entry ) + count = query_job_pids( j, count, maxcount, pids ); + + return count; +} + static void add_job_process( struct job *job, struct process *process ) { struct job *j, *common_parent; @@ -1739,6 +1757,22 @@ DECL_HANDLER(process_in_job) release_object( process ); } +/* get a list of the pids associated with the job */ +DECL_HANDLER(query_job_pids) +{ + struct job *job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ); + process_id_t *pids; + data_size_t len; + + if (!job) return; + + reply->count = query_job_pids( job, 0, 0, NULL ); + + len = min( get_reply_max_size(), reply->count * sizeof(*pids) ); + if (len && ((pids = set_reply_data_size( len )))) + query_job_pids( job, 0, len / sizeof(*pids), pids ); +} + /* retrieve information about a job */ DECL_HANDLER(get_job_info) { diff --git a/server/protocol.def b/server/protocol.def index b5bc049..b73a2c2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3665,6 +3665,15 @@ struct handle_info @END +/* Query a list of pids associated with the job */ +@REQ(query_job_pids) + obj_handle_t job; /* handle to the job */ +@REPLY + data_size_t count; /* number of processes associated with the job */ + VARARG(pids,uints); /* list of pids */ +@END + + /* Set limit flags on a job */ @REQ(set_job_limits) obj_handle_t handle; /* handle to the job */ -- 2.31.1

2 2

[PATCH vkd3d] vkd3d: Return the standard D3D12 resource alignment instead the Vulkan requirement.
by Conor McCarthy 23 Jun '21

23 Jun '21

Some apps, e.g. WoW, ignore a non-standard alignment and use the expected one. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/device.c | 15 ++++++++++++--- libs/vkd3d/resource.c | 6 ++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a63fc92b..941e6d04 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3221,7 +3221,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) { - info->SizeInBytes = desc->Width; + info->SizeInBytes = align(desc->Width, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); info->Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; } else @@ -3235,9 +3235,18 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour requested_alignment = desc->Alignment ? desc->Alignment : D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; info->Alignment = max(info->Alignment, requested_alignment); - } - info->SizeInBytes = align(info->SizeInBytes, info->Alignment); + info->SizeInBytes = align(info->SizeInBytes, info->Alignment); + + /* Pad by the maximum heap offset increase which may be needed to align an offset + * supplied by the calling application to a higher Vulkan requirement. This allows + * us to return the standard D3D12 alignment and adjust resource placement later. */ + if(info->Alignment > requested_alignment) + { + info->SizeInBytes += info->Alignment - requested_alignment; + info->Alignment = requested_alignment; + } + } TRACE("Size %#"PRIx64", alignment %#"PRIx64".\n", info->SizeInBytes, info->Alignment); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a9d4d464..f3ddc9cb 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1901,9 +1901,15 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, VkResult vr; if (d3d12_resource_is_buffer(resource)) + { VK_CALL(vkGetBufferMemoryRequirements(vk_device, resource->u.vk_buffer, &requirements)); + } else + { VK_CALL(vkGetImageMemoryRequirements(vk_device, resource->u.vk_image, &requirements)); + /* Padding in d3d12_device_GetResourceAllocationInfo() leaves room to align the offset. */ + heap_offset = align(heap_offset, requirements.alignment); + } if (heap_offset % requirements.alignment) { -- 2.31.1

2 1

[PATCH resend 1/6] d2d1: Query ID3D11Device1 interface in d2d_device_context_init.
by Rémi Bernon 23 Jun '21

23 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Resending this series as there's been conflicting d2d1 changes. This is only the first part of it. dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/device.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 81a46c8a7ce..b236bf57b6f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -27,7 +27,7 @@ #include <math.h> #define COBJMACROS #include "d2d1_2.h" -#include "d3d11.h" +#include "d3d11_1.h" #ifdef D2D1_INIT_GUID #include "initguid.h" #endif @@ -162,6 +162,7 @@ struct d2d_device_context ID2D1Factory *factory; ID2D1Device *device; ID3D10Device *d3d_device; + ID3D11Device1 *d3d11_device; struct d2d_bitmap *target; ID3D10StateBlock *stateblock; struct d2d_shape_resources shape_resources[D2D_SHAPE_TYPE_COUNT]; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 2a0c094fb74..a03b1f56836 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -287,6 +287,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) context->stateblock->lpVtbl->Release(context->stateblock); if (context->target) ID2D1Bitmap1_Release(&context->target->ID2D1Bitmap1_iface); + ID3D11Device1_Release(context->d3d11_device); ID3D10Device_Release(context->d3d_device); ID2D1Factory_Release(context->factory); ID2D1Device_Release(context->device); @@ -3850,6 +3851,13 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, return hr; } + if (FAILED(hr = IDXGIDevice_QueryInterface(device_impl->dxgi_device, + &IID_ID3D11Device1, (void **)&render_target->d3d11_device))) + { + WARN("Failed to query ID3D11Device1 interface, hr %#x.\n", hr); + goto err; + } + if (FAILED(hr = D3D10StateBlockMaskEnableAll(&state_mask))) { WARN("Failed to create stateblock mask, hr %#x.\n", hr); @@ -4013,6 +4021,8 @@ err: } if (render_target->stateblock) render_target->stateblock->lpVtbl->Release(render_target->stateblock); + if (render_target->d3d11_device) + ID3D11Device1_Release(render_target->d3d11_device); if (render_target->d3d_device) ID3D10Device_Release(render_target->d3d_device); ID2D1Device_Release(render_target->device); -- 2.31.0

2 11

[PATCH 1/2] mf: Complete session_start command even if already started.
by Rémi Bernon 23 Jun '21

23 Jun '21

Seek is not implemented but not completing the command makes pending or later queued commands to not be executed. This partially fixes Guilty Gear Strive being stuck on character selection screen. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Of course implementing seek is probably better, but in the meantime this prevents further commands to be possibly ignored. dlls/mf/session.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 8d9325abc53..08f3f48f030 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -806,6 +806,8 @@ static struct topo_node *session_get_node_by_id(const struct media_session *sess return NULL; } +static void session_command_complete(struct media_session *session); + static void session_start(struct media_session *session, const GUID *time_format, const PROPVARIANT *start_position) { struct media_source *source; @@ -840,6 +842,7 @@ static void session_start(struct media_session *session, const GUID *time_format break; case SESSION_STATE_STARTED: FIXME("Seeking is not implemented.\n"); + session_command_complete(session); break; case SESSION_STATE_CLOSED: IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStarted, &GUID_NULL, -- 2.31.0

2 3

[PATCH 1/5] mf/session: Send failed event when clearing topologies from closed state.
by Nikolay Sivov 23 Jun '21

23 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 8d9325abc53..76c39631bd9 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -502,7 +502,7 @@ static HRESULT session_submit_simple_command(struct media_session *session, enum return hr; } -static void session_clear_topologies(struct media_session *session) +static void session_clear_queued_topologies(struct media_session *session) { struct queued_topology *ptr, *next; @@ -1055,10 +1055,24 @@ static void session_close(struct media_session *session) break; } + session_clear_queued_topologies(session); if (FAILED(hr)) session_set_closed(session, hr); } +static void session_clear_topologies(struct media_session *session) +{ + HRESULT hr = S_OK; + + if (session->state == SESSION_STATE_CLOSED) + hr = MF_E_INVALIDREQUEST; + else + session_clear_queued_topologies(session); + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologiesCleared, + &GUID_NULL, hr, NULL); + session_command_complete(session); +} + static struct media_source *session_get_media_source(struct media_session *session, IMFMediaSource *source) { struct media_source *cur; @@ -1561,7 +1575,7 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF } else if (topology && flags & MFSESSION_SETTOPOLOGY_IMMEDIATE) { - session_clear_topologies(session); + session_clear_queued_topologies(session); session_clear_presentation(session); } @@ -1636,7 +1650,7 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) if (!refcount) { - session_clear_topologies(session); + session_clear_queued_topologies(session); session_clear_presentation(session); session_clear_command_list(session); if (session->presentation.current_topology) @@ -2079,9 +2093,6 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, { case SESSION_CMD_CLEAR_TOPOLOGIES: session_clear_topologies(session); - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologiesCleared, &GUID_NULL, - S_OK, NULL); - session_command_complete(session); break; case SESSION_CMD_SET_TOPOLOGY: session_set_topology(session, op->u.set_topology.flags, op->u.set_topology.topology); -- 2.30.2

1 4

[PATCH v2 6/6] light.msstyles: Add List Box parts.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 8a6f4651e3e..be27a0c71ca 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -333,6 +333,13 @@ BLUE_INI TEXTFILE "[Edit.Edittext(ReadOnly)]\r\n" "FillColor = 245 245 245\r\n" "TextColor = 0 0 0\r\n" + +"\r\n; ListBox\r\n" +"[ListBox]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" } /* All following bitmaps are of 32-bit ARGB format */ -- 2.30.2

1 0

[PATCH v2 5/6] light.msstyles: Add Edit parts.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 186aab3b066..8a6f4651e3e 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -318,6 +318,21 @@ BLUE_INI TEXTFILE "GlyphImageFile = blue_combobutton_glyph.bmp\r\n" "GlyphTransparent = True\r\n" "Transparent = True\r\n" + +"\r\n; Edit\r\n" +"[Edit]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[Edit.Edittext(Disabled)]\r\n" +"FillColor = 245 245 245\r\n" +"TextColor = 166 166 166\r\n" + +"[Edit.Edittext(ReadOnly)]\r\n" +"FillColor = 245 245 245\r\n" +"TextColor = 0 0 0\r\n" } /* All following bitmaps are of 32-bit ARGB format */ -- 2.30.2

1 0

[PATCH v2 4/6] light.msstyles: Add ComboBox parts.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/blue_combobutton.bmp | Bin 0 -> 6774 bytes dlls/light.msstyles/blue_combobutton.svg | 18 ++++++++++ .../light.msstyles/blue_combobutton_glyph.bmp | Bin 0 -> 1174 bytes .../light.msstyles/blue_combobutton_glyph.svg | 28 ++++++++++++++++ dlls/light.msstyles/light.rc | 31 ++++++++++++++++++ 5 files changed, 77 insertions(+) create mode 100644 dlls/light.msstyles/blue_combobutton.bmp create mode 100644 dlls/light.msstyles/blue_combobutton.svg create mode 100644 dlls/light.msstyles/blue_combobutton_glyph.bmp create mode 100644 dlls/light.msstyles/blue_combobutton_glyph.svg diff --git a/dlls/light.msstyles/blue_combobutton.bmp b/dlls/light.msstyles/blue_combobutton.bmp new file mode 100644 index 0000000000000000000000000000000000000000..549aece42a6dad47f94aa39230d8c6c5122a5b52 GIT binary patch literal 6774 zcmeI0v2Gec5Qa$;cdk;Ufg;7B6gisImiu&m7VB)@B8tsBAORhP!Bq;|c_9l(w3#8A z(`Ropv&M>xLz<g^cmMg=U7?YV({JY=d;8B<c~%l1B+ew>^#=0n^-g5{=kdSTPrTA& zHk<Vqi^Xa_pKl~mFtp}I8MZwcuVs8Wolf7|oHuKY)Q^>EHKI2qEURBGmq*I5vFK#F zG?PKy@q9PHJEQhh=Poj+bEj{H3~FC>?jnOaclu_?p!QYgE;6Wdr*DP~YF~BkB7-`2 z`ew)wedzvjE6k>(XK9W0PVL8b643+Ut#zLg;r^^F_Gjb1)ttt|e!3Xmr>6QXIfX)N zn&F)??0i!HAn_-}dHTJ3X3Hzt*Hd27v$eeEYlY*E7yPX}yXWryy8Dath*$f)9K63& zztTnZlK!W)_w9L`Y9Ql>;{L3?9sSw3Z#6&u81=W;^-5wRk%F<=Ue!0su=8yvU)H<p z`Z7&Fhu@F1W_MMOmD%!SUnMN7Pv1Ws>Dg?o=QCZJ$)N6dz8m13QTwWM7a7#K(>Fr~ zwXZsNkwKk1eKTZG`>Jyn8PvJcH$w)suR3>;L7h8&Gh~Q9aDN%y?k1zAq-X8>pY%@I zQ~Q4OIH?EPQ+1!Z?_g-niv8JlL;ugE?{eM$b+P-`_hzf0wz+5~gF4DFKN-}v9?fJ> zM>*yvgWA@knGEVE$NXea+j=yUK^^6opA2eSk7hEcqa5>-L2c{NOa^t7V}3G3cmLPf H#RT(TZA>K7 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_combobutton.svg b/dlls/light.msstyles/blue_combobutton.svg new file mode 100644 index 00000000000..128ab32ce37 --- /dev/null +++ b/dlls/light.msstyles/blue_combobutton.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="20" height="84" version="1.1" viewBox="0 0 5.2917 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <rect x=".39687" y=".39687" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/> + <rect x=".39687" y="5.9531" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#3096fa"/> + <rect x=".39687" y="11.509" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39687" y="17.066" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_combobutton_glyph.bmp b/dlls/light.msstyles/blue_combobutton_glyph.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c427c0dc605dcaa171372af78978a9ce1074d4f7 GIT binary patch literal 1174 zcmd6jKMsO06o)Z!a_|HWj&79272@t4JcSdHhMs|vxN!jf+`&^JCioS>h!7S{l;mss z-usoL-)^txR`YFHH?V*e%&ax5WgVDbmJgc72TPV^Nl_H%sbA!I9)h2ysU&|I%Q90Y z)6GnlI_PS%bJwMJeC?UD$$|IY|7Bg*bpn%Kn1|qlgi$Z_mC1B(X|p{q^jsKtp%=hk zdAVwl++s25rHt&b(zahlLRQ)t^-^j_nM~)U$;P7Rg}ZJQiGi1j9Q>6R-jTqh7v>?D bH%l1xLSMnt3ug&EFVrp!ytFxw{p;TyDj9uq literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_combobutton_glyph.svg b/dlls/light.msstyles/blue_combobutton_glyph.svg new file mode 100644 index 00000000000..75e3b89afdf --- /dev/null +++ b/dlls/light.msstyles/blue_combobutton_glyph.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="10" height="28" version="1.1" viewBox="0 0 2.6458 7.4083" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g> + <path d="m0-1.8521h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> + <path d="m0 3.7042h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> + <path d="m0.39688 0.66961 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" stroke-width=".26458"/> + <path d="m2.1173 0.52917-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" stroke-width=".26458"/> + <g> + <g stroke-width=".26458"> + <path d="m0.39688 2.5217 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/> + <path d="m2.1173 2.3812-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/> + <path d="m0.39688 4.3738 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/> + <path d="m2.1173 4.2333-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/> + </g> + <path d="m0.39688 6.2259 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#aeaeae"/> + <path d="m2.1173 6.0854-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index ea138423e8e..186aab3b066 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -294,6 +294,30 @@ BLUE_INI TEXTFILE "ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n" "MinDpi1 = 96\r\n" "MinDpi2 = 144\r\n" + +"\r\n; ComboBox\r\n" +"[ComboBox]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[ComboBox(Disabled)]\r\n" +"BorderColor = 228 228 228\r\n" +"FillColor = 231 231 231\r\n" + +"[ComboBox.DropDownButton]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_combobutton.bmp\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_combobutton_glyph.bmp\r\n" +"GlyphTransparent = True\r\n" +"Transparent = True\r\n" } /* All following bitmaps are of 32-bit ARGB format */ @@ -332,6 +356,13 @@ BLUE_COMMANDLINK_GLYPH_30PX_BMP BITMAP "blue_commandlink_glyph_30px.bmp" /* @makedep: blue_commandlink_glyph_45px.bmp */ BLUE_COMMANDLINK_GLYPH_45PX_BMP BITMAP "blue_commandlink_glyph_45px.bmp" +/* ComboBox */ +/* @makedep: blue_combobutton.bmp */ +BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" + +/* @makedep: blue_combobutton_glyph.bmp */ +BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH v2 2/6] light.msstyles: Add Blue stub visual style.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Blue is a visual style that uses blue as the main color and contains bitmaps for UI controls. Its system color is the same as Classic Blue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 52 +++++++++++++++++++++++++++++++++ dlls/light.msstyles/resources.h | 6 ++-- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index e0ace9cb52e..dccda341b7c 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -25,12 +25,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* Theme color display names */ STRINGTABLE { + IDS_COLOR_DISPLAY_NAME_BLUE "Blue" IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE "Classic Blue" } /* Theme color tooltips */ STRINGTABLE { + IDS_COLOR_TOOLTIP_BLUE "Blue" IDS_COLOR_TOOLTIP_CLASSIC_BLUE "Classic Blue" } @@ -54,6 +56,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Theme color names */ 1 COLORNAMES { +"Blue\0" "Classic Blue\0" "\0" } @@ -68,6 +71,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Theme ini files */ 1 FILERESNAMES { +"BLUE_INI\0" "CLASSIC_BLUE_INI\0" "\0" } @@ -129,6 +133,54 @@ CLASSIC_BLUE_INI TEXTFILE "FlatMenus = true\r\n" } +/* Blue theme */ +BLUE_INI TEXTFILE +{ +"[Globals]\r\n" +"EdgeLightColor = 255 255 255\r\n" +"EdgeHighLightColor = 255 255 255\r\n" +"EdgeShadowColor = 189 189 189\r\n" +"EdgeDkShadowColor = 158 158 158\r\n" +"EdgeFillColor = 255 255 255\r\n" + +"\r\n[SysMetrics]\r\n" +"; System colors\r\n" +"Scrollbar = 255 255 255\r\n" +"Background = 37 111 149\r\n" +"ActiveCaption = 50 150 250\r\n" +"InactiveCaption = 245 245 245\r\n" +"Menu = 255 255 255\r\n" +"Window = 255 255 255\r\n" +"WindowFrame = 158 158 158\r\n" +"MenuText = 0 0 0\r\n" +"WindowText = 0 0 0\r\n" +"CaptionText = 0 0 0\r\n" +"ActiveBorder = 255 255 255\r\n" +"InactiveBorder = 255 255 255\r\n" +"AppWorkSpace = 128 128 128\r\n" +"Highlight = 48 150 250\r\n" +"HighlightText = 255 255 255\r\n" +"BtnFace = 245 245 245\r\n" +"BtnShadow = 166 166 166\r\n" +"GrayText = 166 166 166\r\n" +"BtnText = 0 0 0\r\n" +"InactiveCaptionText = 100 100 100\r\n" +"BtnHighlight = 255 255 255\r\n" +"DkShadow3d = 106 106 106\r\n" +"Light3d = 227 227 227\r\n" +"InfoText = 0 0 0\r\n" +"InfoBk = 255 255 255\r\n" +"ButtonAlternateFace = 255 255 255\r\n" +"HotTracking = 224 224 224\r\n" +"GradientActiveCaption = 50 150 250\r\n" +"GradientInactiveCaption = 245 245 245\r\n" +"MenuHilight = 48 150 250\r\n" +"MenuBar = 255 255 255\r\n" + +"\r\n; Flat menus\r\n" +"FlatMenus = true\r\n" +} + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" diff --git a/dlls/light.msstyles/resources.h b/dlls/light.msstyles/resources.h index b0a7e7008ce..c37ef2140f1 100644 --- a/dlls/light.msstyles/resources.h +++ b/dlls/light.msstyles/resources.h @@ -18,7 +18,9 @@ #include <winnt.h> -#define IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE 1000 -#define IDS_COLOR_TOOLTIP_CLASSIC_BLUE 2000 +#define IDS_COLOR_DISPLAY_NAME_BLUE 1000 +#define IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE 1001 +#define IDS_COLOR_TOOLTIP_BLUE 2000 +#define IDS_COLOR_TOOLTIP_CLASSIC_BLUE 2001 #define IDS_SIZE_DISPLAY_NAME_NORMAL 3000 #define IDS_SIZE_TOOLTIP_NORMAL 4000 -- 2.30.2

1 0

[PATCH v2 1/6] light.msstyles: Add Classic Blue visual style.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Classic Blue is a visual style that uses blue as the main color and doesn't have bitmaps for UI controls. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 208166~208171. Move from themes/light to dlls/light.msstyles. Save SVGs in optimized SVG instead of Inkscape SVG to save space. configure.ac | 1 + dlls/light.msstyles/Makefile.in | 3 + dlls/light.msstyles/light.msstyles.spec | 1 + dlls/light.msstyles/light.rc | 140 ++++++++++++++++++++++++ dlls/light.msstyles/resources.h | 24 ++++ loader/wine.inf.in | 2 + 6 files changed, 171 insertions(+) create mode 100644 dlls/light.msstyles/Makefile.in create mode 100644 dlls/light.msstyles/light.msstyles.spec create mode 100644 dlls/light.msstyles/light.rc create mode 100644 dlls/light.msstyles/resources.h diff --git a/configure.ac b/configure.ac index f76dd047825..796cd015d17 100644 --- a/configure.ac +++ b/configure.ac @@ -3326,6 +3326,7 @@ WINE_CONFIG_MAKEFILE(dlls/ksproxy.ax) WINE_CONFIG_MAKEFILE(dlls/ksuser) WINE_CONFIG_MAKEFILE(dlls/ktmw32) WINE_CONFIG_MAKEFILE(dlls/l3codeca.acm) +WINE_CONFIG_MAKEFILE(dlls/light.msstyles) WINE_CONFIG_MAKEFILE(dlls/loadperf) WINE_CONFIG_MAKEFILE(dlls/localspl) WINE_CONFIG_MAKEFILE(dlls/localspl/tests) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in new file mode 100644 index 00000000000..d6b7a53d7f8 --- /dev/null +++ b/dlls/light.msstyles/Makefile.in @@ -0,0 +1,3 @@ +MODULE = light.msstyles + +RC_SRCS = light.rc diff --git a/dlls/light.msstyles/light.msstyles.spec b/dlls/light.msstyles/light.msstyles.spec new file mode 100644 index 00000000000..b427b2913c6 --- /dev/null +++ b/dlls/light.msstyles/light.msstyles.spec @@ -0,0 +1 @@ +# no exported entry points diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc new file mode 100644 index 00000000000..e0ace9cb52e --- /dev/null +++ b/dlls/light.msstyles/light.rc @@ -0,0 +1,140 @@ +/* + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +/* Theme color display names */ +STRINGTABLE +{ + IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE "Classic Blue" +} + +/* Theme color tooltips */ +STRINGTABLE +{ + IDS_COLOR_TOOLTIP_CLASSIC_BLUE "Classic Blue" +} + +/* Theme size display names */ +STRINGTABLE +{ + IDS_SIZE_DISPLAY_NAME_NORMAL "Normal" +} + +/* Theme size tooltips */ +STRINGTABLE +{ + IDS_SIZE_TOOLTIP_NORMAL "Normal" +} + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* Theme version */ +1 PACKTHEM_VERSION {0x3} + +/* Theme color names */ +1 COLORNAMES +{ +"Classic Blue\0" +"\0" +} + +/* Theme size names */ +1 SIZENAMES +{ +"NormalSize\0" +"\0" +} + +/* Theme ini files */ +1 FILERESNAMES +{ +"CLASSIC_BLUE_INI\0" +"\0" +} + +/* Theme definition */ +THEMES_INI TEXTFILE +{ +"[documentation]\r\n" +"DisplayName = Light\r\n" +"ToolTip = Light Visual Style\r\n" +} + +/* Light theme definition */ +/* Classic blue theme, no bitmaps */ +CLASSIC_BLUE_INI TEXTFILE +{ +"[Globals]\r\n" +"EdgeLightColor = 255 255 255\r\n" +"EdgeHighLightColor = 255 255 255\r\n" +"EdgeShadowColor = 189 189 189\r\n" +"EdgeDkShadowColor = 158 158 158\r\n" +"EdgeFillColor = 255 255 255\r\n" + +"\r\n[SysMetrics]\r\n" +"; System colors\r\n" +"Scrollbar = 255 255 255\r\n" +"Background = 37 111 149\r\n" +"ActiveCaption = 50 150 250\r\n" +"InactiveCaption = 245 245 245\r\n" +"Menu = 255 255 255\r\n" +"Window = 255 255 255\r\n" +"WindowFrame = 158 158 158\r\n" +"MenuText = 0 0 0\r\n" +"WindowText = 0 0 0\r\n" +"CaptionText = 0 0 0\r\n" +"ActiveBorder = 255 255 255\r\n" +"InactiveBorder = 255 255 255\r\n" +"AppWorkSpace = 128 128 128\r\n" +"Highlight = 48 150 250\r\n" +"HighlightText = 255 255 255\r\n" +"BtnFace = 245 245 245\r\n" +"BtnShadow = 166 166 166\r\n" +"GrayText = 166 166 166\r\n" +"BtnText = 0 0 0\r\n" +"InactiveCaptionText = 100 100 100\r\n" +"BtnHighlight = 255 255 255\r\n" +"DkShadow3d = 106 106 106\r\n" +"Light3d = 227 227 227\r\n" +"InfoText = 0 0 0\r\n" +"InfoBk = 255 255 255\r\n" +"ButtonAlternateFace = 255 255 255\r\n" +"HotTracking = 224 224 224\r\n" +"GradientActiveCaption = 50 150 250\r\n" +"GradientInactiveCaption = 245 245 245\r\n" +"MenuHilight = 48 150 250\r\n" +"MenuBar = 255 255 255\r\n" + +"\r\n; Flat menus\r\n" +"FlatMenus = true\r\n" +} + +/* File version */ +#define WINE_FILEDESCRIPTION_STR "Light Theme" +#define WINE_FILENAME_STR "light.msstyles" +#define WINE_FILEVERSION 1,0,0,1 +#define WINE_FILEVERSION_STR "1.0.0.1" +#define WINE_PRODUCTVERSION 1,0,0,1 +#define WINE_PRODUCTVERSION_STR "1.0.0.1" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/light.msstyles/resources.h b/dlls/light.msstyles/resources.h new file mode 100644 index 00000000000..b0a7e7008ce --- /dev/null +++ b/dlls/light.msstyles/resources.h @@ -0,0 +1,24 @@ +/* + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <winnt.h> + +#define IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE 1000 +#define IDS_COLOR_TOOLTIP_CLASSIC_BLUE 2000 +#define IDS_SIZE_DISPLAY_NAME_NORMAL 3000 +#define IDS_SIZE_TOOLTIP_NORMAL 4000 diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 24da6f3af6b..0eaa75191bd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2658,6 +2658,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- +; Themes +10,Resources\Themes\light,light.msstyles ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- -- 2.30.2

1 0

[PATCH vkd3d v3 6/6] vkd3d-shader: Track register size in components.
by Zebediah Figura 23 Jun '21

23 Jun '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: Fix write_sm1_uniforms(). libs/vkd3d-shader/hlsl.c | 8 ++++---- libs/vkd3d-shader/hlsl.y | 10 ++++----- libs/vkd3d-shader/hlsl_codegen.c | 35 ++++++++++++++++---------------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c36fe602..721458eb 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -111,9 +111,9 @@ struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hls type->dimx = dimx; type->dimy = dimy; if (type_class == HLSL_CLASS_MATRIX) - type->reg_size = hlsl_type_is_row_major(type) ? dimy : dimx; + type->reg_size = (hlsl_type_is_row_major(type) ? dimy : dimx) * 4; else - type->reg_size = 1; + type->reg_size = 4; list_add_tail(&ctx->types, &type->entry); @@ -352,11 +352,11 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, u } case HLSL_CLASS_MATRIX: - type->reg_size = hlsl_type_is_row_major(type) ? type->dimy : type->dimx; + type->reg_size = (hlsl_type_is_row_major(type) ? type->dimy : type->dimx) * 4; break; default: - type->reg_size = 1; + type->reg_size = 4; break; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4355b9a2..828b19a4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -567,7 +567,7 @@ static struct hlsl_ir_load *add_record_load(struct hlsl_ctx *ctx, struct list *i { struct hlsl_ir_constant *c; - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, loc))) + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, loc))) return NULL; list_add_tail(instrs, &c->node.entry); @@ -601,7 +601,7 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in return NULL; } - if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size * 4, loc))) + if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size, loc))) return NULL; list_add_tail(instrs, &c->node.entry); if (!(mul = hlsl_new_binary_expr(ctx, HLSL_IR_BINOP_MUL, index, &c->node))) @@ -663,7 +663,7 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ *modifiers &= ~HLSL_TYPE_MODIFIERS_MASK; if (new_type->type == HLSL_CLASS_MATRIX) - new_type->reg_size = hlsl_type_is_row_major(new_type) ? new_type->dimy : new_type->dimx; + new_type->reg_size = (hlsl_type_is_row_major(new_type) ? new_type->dimy : new_type->dimx) * 4; return new_type; } @@ -738,7 +738,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, type->modifiers, v->loc); else - type->reg_size = hlsl_type_is_row_major(type) ? type->dimy : type->dimx; + type->reg_size = (hlsl_type_is_row_major(type) ? type->dimy : type->dimx) * 4; if ((type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR) && (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)) @@ -1328,7 +1328,7 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru if (hlsl_type_component_count(field->type) == hlsl_type_component_count(node->data_type)) { - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, node->loc))) + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, node->loc))) break; list_add_tail(list, &c->node.entry); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 068fb167..79cae35e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -93,7 +93,7 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; list_add_head(instrs, &load->node.entry); - if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) + if (!(offset = hlsl_new_uint_constant(ctx, field_offset, var->loc))) return; list_add_after(&load->node.entry, &offset->node.entry); @@ -160,7 +160,7 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct list_add_before(&var->scope_entry, &output->scope_entry); list_add_tail(&ctx->extern_vars, &output->extern_entry); - if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) + if (!(offset = hlsl_new_uint_constant(ctx, field_offset, var->loc))) return; list_add_tail(instrs, &offset->node.entry); @@ -291,7 +291,7 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr struct hlsl_ir_load *field_load; struct hlsl_ir_constant *c; - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, instr->loc))) + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, instr->loc))) return false; list_add_before(&instr->entry, &c->node.entry); @@ -714,9 +714,8 @@ static bool is_range_available(struct liveness *liveness, unsigned int first_wri } static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liveness, - unsigned int first_write, unsigned int last_read, unsigned int reg_count) + unsigned int first_write, unsigned int last_read, unsigned int component_count) { - const unsigned int component_count = reg_count * 4; unsigned int i, component_idx; struct hlsl_reg ret = {0}; @@ -738,9 +737,9 @@ static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liv static const char *debug_register(char class, struct hlsl_reg reg, const struct hlsl_type *type) { - if (type->reg_size > 1) + if (type->reg_size > 4) return vkd3d_dbg_sprintf("%c%u-%c%u", class, reg.id, class, - reg.id + type->reg_size - 1); + reg.id + (type->reg_size / 4) - 1); return vkd3d_dbg_sprintf("%c%u%s", class, reg.id, debug_hlsl_writemask(reg.writemask)); } @@ -751,7 +750,7 @@ static void allocate_variable_temp_register(struct hlsl_ctx *ctx, struct hlsl_ir if (!var->reg.allocated && var->last_read) { - if (var->data_type->reg_size > 1) + if (var->data_type->reg_size > 4) var->reg = allocate_range(ctx, liveness, var->first_write, var->last_read, var->data_type->reg_size); else @@ -770,7 +769,7 @@ static void allocate_temp_registers_recurse(struct hlsl_ctx *ctx, struct list *i { if (!instr->reg.allocated && instr->last_read) { - if (instr->data_type->reg_size > 1) + if (instr->data_type->reg_size > 4) instr->reg = allocate_range(ctx, liveness, instr->index, instr->last_read, instr->data_type->reg_size); else @@ -832,23 +831,23 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct list * { struct hlsl_ir_constant *constant = hlsl_ir_constant(instr); const struct hlsl_type *type = instr->data_type; + unsigned int x, y, i, writemask, end_reg; unsigned int reg_size = type->reg_size; - unsigned int x, y, i, writemask; - if (reg_size > 1) + if (reg_size > 4) constant->reg = allocate_range(ctx, liveness, 1, UINT_MAX, reg_size); else constant->reg = allocate_register(ctx, liveness, 1, UINT_MAX, type->dimx); TRACE("Allocated constant @%u to %s.\n", instr->index, debug_register('c', constant->reg, type)); if (!hlsl_array_reserve(ctx, (void **)&defs->values, &defs->size, - constant->reg.id + reg_size, sizeof(*defs->values))) + constant->reg.id + reg_size / 4, sizeof(*defs->values))) return; - if (constant->reg.id + reg_size > defs->count) + end_reg = constant->reg.id + reg_size / 4; + if (end_reg > defs->count) { - memset(&defs->values[defs->count], 0, - sizeof(*defs->values) * (constant->reg.id + reg_size - defs->count)); - defs->count = constant->reg.id + reg_size; + memset(&defs->values[defs->count], 0, sizeof(*defs->values) * (end_reg - defs->count)); + defs->count = end_reg; } assert(type->type <= HLSL_CLASS_LAST_NUMERIC); @@ -931,7 +930,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi { if (var->is_uniform && var->last_read) { - if (var->data_type->reg_size > 1) + if (var->data_type->reg_size > 4) var->reg = allocate_range(ctx, &liveness, 1, UINT_MAX, var->data_type->reg_size); else { @@ -1520,7 +1519,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf { put_dword(buffer, 0); /* name */ put_dword(buffer, D3DXRS_FLOAT4 | (var->reg.id << 16)); - put_dword(buffer, var->data_type->reg_size); + put_dword(buffer, var->data_type->reg_size / 4); put_dword(buffer, 0); /* type */ put_dword(buffer, 0); /* FIXME: default value */ } -- 2.32.0

3 2

[PATCH vkd3d 1/6] vkd3d-shader: Zero-initialize constant definitions.
by Zebediah Figura 23 Jun '21

23 Jun '21

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Resent without changes, as this clashes with a later patch in this series. libs/vkd3d-shader/hlsl_codegen.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 366b8bda..54c91bf8 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -843,7 +843,12 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct list * if (!hlsl_array_reserve(ctx, (void **)&defs->values, &defs->size, constant->reg.id + reg_size, sizeof(*defs->values))) return; - defs->count = max(defs->count, constant->reg.id + reg_size); + if (constant->reg.id + reg_size > defs->count) + { + memset(&defs->values[defs->count], 0, + sizeof(*defs->values) * (constant->reg.id + reg_size - defs->count)); + defs->count = constant->reg.id + reg_size; + } assert(type->type <= HLSL_CLASS_LAST_NUMERIC); -- 2.32.0

3 14

[PATCH 1/6] themes/light: Add Classic Blue visual style.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Classic Blue is a visual style that uses blue as the main color and doesn't have bitmaps for UI controls. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 1 + dlls/setupapi/fakedll.c | 51 +++++++------- loader/wine.inf.in | 2 + themes/light/Makefile.in | 3 + themes/light/light.rc | 140 +++++++++++++++++++++++++++++++++++++++ themes/light/resources.h | 25 +++++++ tools/make_makefiles | 8 +-- tools/makedep.c | 14 ++-- 8 files changed, 209 insertions(+), 35 deletions(-) create mode 100644 themes/light/Makefile.in create mode 100644 themes/light/light.rc create mode 100644 themes/light/resources.h diff --git a/configure.ac b/configure.ac index f76dd047825..4888b70ae20 100644 --- a/configure.ac +++ b/configure.ac @@ -4002,6 +4002,7 @@ WINE_CONFIG_MAKEFILE(programs/wusa) WINE_CONFIG_MAKEFILE(programs/xcopy) WINE_CONFIG_MAKEFILE(programs/xcopy/tests) WINE_CONFIG_MAKEFILE(server) +WINE_CONFIG_MAKEFILE(themes/light) WINE_CONFIG_MAKEFILE(tools,,[test "x$enable_tools" = xno]) WINE_CONFIG_MAKEFILE(tools/sfnt2fon,,[test "x$enable_tools" = xno]) WINE_CONFIG_MAKEFILE(tools/widl,,[test "x$enable_tools" = xno]) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 203d7c393ce..416db544303 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -417,11 +417,22 @@ static const WCHAR *enum_load_path( unsigned int idx ) /* try to load a pre-compiled fake dll */ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) { + static const struct + { + const WCHAR *suffix; + const WCHAR *dir; + } + search_dirs[] = + { + {L".dll", L"\\dlls"}, + {L".exe", L"\\programs"}, + {L".msstyles", L"\\themes"}, + }; const WCHAR *build_dir = _wgetenv( L"WINEBUILDDIR" ); const WCHAR *path; WCHAR *file, *ptr; void *data = NULL; - unsigned int i, pos, len, namelen, maxlen = 0; + unsigned int i, pos, len, namelen, suffixlen, maxlen = 0; WCHAR *p; int res = 0; @@ -441,29 +452,21 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) if (build_dir) { - /* try as a dll */ - ptr = file + pos; - namelen = len + 1; - file[pos + len + 1] = 0; - if (namelen > 4 && !wcsncmp( ptr + namelen - 4, L".dll", 4 )) namelen -= 4; - ptr = prepend( ptr, ptr, namelen ); - ptr = prepend( ptr, L"\\dlls", 5 ); - ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); - if ((res = read_file( ptr, &data, size ))) goto done; - lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size ))) goto done; - - /* now as a program */ - ptr = file + pos; - namelen = len + 1; - file[pos + len + 1] = 0; - if (namelen > 4 && !wcsncmp( ptr + namelen - 4, L".exe", 4 )) namelen -= 4; - ptr = prepend( ptr, ptr, namelen ); - ptr = prepend( ptr, L"\\programs", 9 ); - ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); - if ((res = read_file( ptr, &data, size ))) goto done; - lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size ))) goto done; + for (i = 0; i < ARRAY_SIZE(search_dirs); ++i) + { + ptr = file + pos; + namelen = len + 1; + file[pos + len + 1] = 0; + suffixlen = lstrlenW( search_dirs[i].suffix ); + if (namelen > suffixlen && !wcsncmp( ptr + namelen - suffixlen, search_dirs[i].suffix, suffixlen )) + namelen -= suffixlen; + ptr = prepend( ptr, ptr, namelen ); + ptr = prepend( ptr, search_dirs[i].dir, lstrlenW( search_dirs[i].dir )); + ptr = prepend( ptr, build_dir, lstrlenW( build_dir ) ); + if ((res = read_file( ptr, &data, size ))) goto done; + lstrcpyW( file + pos + len + 1, L".fake" ); + if ((res = read_file( ptr, &data, size ))) goto done; + } } file[pos + len + 1] = 0; diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 24da6f3af6b..0eaa75191bd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2658,6 +2658,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- +; Themes +10,Resources\Themes\light,light.msstyles ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- diff --git a/themes/light/Makefile.in b/themes/light/Makefile.in new file mode 100644 index 00000000000..d6b7a53d7f8 --- /dev/null +++ b/themes/light/Makefile.in @@ -0,0 +1,3 @@ +MODULE = light.msstyles + +RC_SRCS = light.rc diff --git a/themes/light/light.rc b/themes/light/light.rc new file mode 100644 index 00000000000..e0ace9cb52e --- /dev/null +++ b/themes/light/light.rc @@ -0,0 +1,140 @@ +/* + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +/* Theme color display names */ +STRINGTABLE +{ + IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE "Classic Blue" +} + +/* Theme color tooltips */ +STRINGTABLE +{ + IDS_COLOR_TOOLTIP_CLASSIC_BLUE "Classic Blue" +} + +/* Theme size display names */ +STRINGTABLE +{ + IDS_SIZE_DISPLAY_NAME_NORMAL "Normal" +} + +/* Theme size tooltips */ +STRINGTABLE +{ + IDS_SIZE_TOOLTIP_NORMAL "Normal" +} + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* Theme version */ +1 PACKTHEM_VERSION {0x3} + +/* Theme color names */ +1 COLORNAMES +{ +"Classic Blue\0" +"\0" +} + +/* Theme size names */ +1 SIZENAMES +{ +"NormalSize\0" +"\0" +} + +/* Theme ini files */ +1 FILERESNAMES +{ +"CLASSIC_BLUE_INI\0" +"\0" +} + +/* Theme definition */ +THEMES_INI TEXTFILE +{ +"[documentation]\r\n" +"DisplayName = Light\r\n" +"ToolTip = Light Visual Style\r\n" +} + +/* Light theme definition */ +/* Classic blue theme, no bitmaps */ +CLASSIC_BLUE_INI TEXTFILE +{ +"[Globals]\r\n" +"EdgeLightColor = 255 255 255\r\n" +"EdgeHighLightColor = 255 255 255\r\n" +"EdgeShadowColor = 189 189 189\r\n" +"EdgeDkShadowColor = 158 158 158\r\n" +"EdgeFillColor = 255 255 255\r\n" + +"\r\n[SysMetrics]\r\n" +"; System colors\r\n" +"Scrollbar = 255 255 255\r\n" +"Background = 37 111 149\r\n" +"ActiveCaption = 50 150 250\r\n" +"InactiveCaption = 245 245 245\r\n" +"Menu = 255 255 255\r\n" +"Window = 255 255 255\r\n" +"WindowFrame = 158 158 158\r\n" +"MenuText = 0 0 0\r\n" +"WindowText = 0 0 0\r\n" +"CaptionText = 0 0 0\r\n" +"ActiveBorder = 255 255 255\r\n" +"InactiveBorder = 255 255 255\r\n" +"AppWorkSpace = 128 128 128\r\n" +"Highlight = 48 150 250\r\n" +"HighlightText = 255 255 255\r\n" +"BtnFace = 245 245 245\r\n" +"BtnShadow = 166 166 166\r\n" +"GrayText = 166 166 166\r\n" +"BtnText = 0 0 0\r\n" +"InactiveCaptionText = 100 100 100\r\n" +"BtnHighlight = 255 255 255\r\n" +"DkShadow3d = 106 106 106\r\n" +"Light3d = 227 227 227\r\n" +"InfoText = 0 0 0\r\n" +"InfoBk = 255 255 255\r\n" +"ButtonAlternateFace = 255 255 255\r\n" +"HotTracking = 224 224 224\r\n" +"GradientActiveCaption = 50 150 250\r\n" +"GradientInactiveCaption = 245 245 245\r\n" +"MenuHilight = 48 150 250\r\n" +"MenuBar = 255 255 255\r\n" + +"\r\n; Flat menus\r\n" +"FlatMenus = true\r\n" +} + +/* File version */ +#define WINE_FILEDESCRIPTION_STR "Light Theme" +#define WINE_FILENAME_STR "light.msstyles" +#define WINE_FILEVERSION 1,0,0,1 +#define WINE_FILEVERSION_STR "1.0.0.1" +#define WINE_PRODUCTVERSION 1,0,0,1 +#define WINE_PRODUCTVERSION_STR "1.0.0.1" + +#include "wine/wine_common_ver.rc" diff --git a/themes/light/resources.h b/themes/light/resources.h new file mode 100644 index 00000000000..ef75da9f628 --- /dev/null +++ b/themes/light/resources.h @@ -0,0 +1,25 @@ +/* + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <winnt.h> + +#define IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE 1000 +#define IDS_COLOR_TOOLTIP_CLASSIC_BLUE 2000 +#define IDS_SIZE_DISPLAY_NAME_NORMAL 3000 +#define IDS_SIZE_TOOLTIP_NORMAL 4000 + diff --git a/tools/make_makefiles b/tools/make_makefiles index 3abba2da840..fe337c52196 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -439,12 +439,12 @@ sub update_makefiles(@) die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; } - elsif (defined($make{"MODULE"})) # dll or program + elsif (defined($make{"MODULE"})) # dll or program or theme { - (my $name = $file) =~ s/^(dlls|programs)\/(.*)\/Makefile/$2/; + (my $name = $file) =~ s/^(dlls|programs|themes)\/(.*)\/Makefile/$2/; my $dllflags = $make{"EXTRADLLFLAGS"} || ""; if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; } - die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; + die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs|themes)\//; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; if ($file =~ /^programs\//) { @@ -456,7 +456,7 @@ sub update_makefiles(@) { die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ; die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/; - die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.dll"; + die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.dll" || $make{"MODULE"} eq "$name.msstyles"; } if (defined $make{"IMPORTLIB"}) { diff --git a/tools/makedep.c b/tools/makedep.c index db076d0c057..0d1cb5166bb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -208,6 +208,7 @@ struct makefile int is_cross; int is_win16; int is_exe; + int is_msstyles; /* values generated at output time */ struct strarray in_files; @@ -3286,7 +3287,8 @@ static void output_module( struct makefile *make ) char *spec_file = NULL; unsigned int i; - if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + if (!make->is_exe && !make->is_msstyles) + spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 1, 0 )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0, 0 )); add_import_libs( make, &dep_libs, get_default_imports( make ), 0, 0 ); /* dependencies only */ @@ -3319,7 +3321,7 @@ static void output_module( struct makefile *make ) strmake( "d%s/%s", pe_dir, make->module )); output( "%s%s %s.fake:", module_path, dll_ext, module_path ); } - else + else if (!make->is_msstyles) { strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); strarray_add( &make->all_targets, make->module ); @@ -3338,11 +3340,8 @@ static void output_module( struct makefile *make ) output( "\n" ); output_winegcc_command( make, make->is_cross ); if (make->is_cross) output_filename( "-Wl,--wine-builtin" ); - if (spec_file) - { - output_filename( "-shared" ); - output_filename( spec_file ); - } + if (make->is_msstyles || spec_file) output_filename( "-shared" ); + if (spec_file) output_filename( spec_file ); output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->is_cross ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); @@ -4229,6 +4228,7 @@ static void load_sources( struct makefile *make ) make->use_msvcrt = strarray_exists( &make->extradllflags, "-mno-cygwin" ); make->is_exe = strarray_exists( &make->extradllflags, "-mconsole" ) || strarray_exists( &make->extradllflags, "-mwindows" ); + make->is_msstyles = make->module && strendswith( make->module, ".msstyles" ); if (make->module && !make->install_lib.count && !make->install_dev.count) { -- 2.30.2

2 1

[PATCH] kernel32: Implement GetProcessGroupAffinity stub.
by Roman Pišl 23 Jun '21

23 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51322 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ec094c98508..0f474504bfe 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -782,7 +782,7 @@ @ stdcall GetProcessAffinityMask(long ptr ptr) @ stdcall GetProcessDEPPolicy(long ptr ptr) @ stdcall GetProcessFlags(long) -# @ stub GetProcessGroupAffinity +@ stdcall -import GetProcessGroupAffinity(long ptr ptr) @ stdcall -import GetProcessHandleCount(long ptr) @ stdcall -import GetProcessHeap() @ stdcall -import GetProcessHeaps(long ptr) RtlGetProcessHeaps diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9a66c5c2ac0..94a648f65aa 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -623,7 +623,7 @@ @ stdcall GetProcAddress(long str) # @ stub GetProcAddressForCaller # @ stub GetProcessDefaultCpuSets -# @ stub GetProcessGroupAffinity +@ stdcall GetProcessGroupAffinity(long ptr ptr) @ stdcall GetProcessHandleCount(long ptr) @ stdcall -norelay GetProcessHeap() kernelbase_GetProcessHeap @ stdcall -import GetProcessHeaps(long ptr) RtlGetProcessHeaps diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 9e2e359f7dc..d58ac24f6e7 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -804,6 +804,17 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetPriorityClass( HANDLE process ) } +/*********************************************************************** + * GetProcessGroupAffinity (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetProcessGroupAffinity( HANDLE process, USHORT *count, USHORT *array ) +{ + FIXME( "(%p,%p,%p): stub\n", process, count, array ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + + /****************************************************************** * GetProcessHandleCount (kernelbase.@) */ -- 2.30.2

1 0

[PATCH 6/6] themes/light: Add List Box parts.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- themes/light/light.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/themes/light/light.rc b/themes/light/light.rc index 8a6f4651e3e..be27a0c71ca 100644 --- a/themes/light/light.rc +++ b/themes/light/light.rc @@ -333,6 +333,13 @@ BLUE_INI TEXTFILE "[Edit.Edittext(ReadOnly)]\r\n" "FillColor = 245 245 245\r\n" "TextColor = 0 0 0\r\n" + +"\r\n; ListBox\r\n" +"[ListBox]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" } /* All following bitmaps are of 32-bit ARGB format */ -- 2.30.2

1 0

[PATCH 5/6] themes/light: Add Edit parts.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- themes/light/light.rc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/themes/light/light.rc b/themes/light/light.rc index 186aab3b066..8a6f4651e3e 100644 --- a/themes/light/light.rc +++ b/themes/light/light.rc @@ -318,6 +318,21 @@ BLUE_INI TEXTFILE "GlyphImageFile = blue_combobutton_glyph.bmp\r\n" "GlyphTransparent = True\r\n" "Transparent = True\r\n" + +"\r\n; Edit\r\n" +"[Edit]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[Edit.Edittext(Disabled)]\r\n" +"FillColor = 245 245 245\r\n" +"TextColor = 166 166 166\r\n" + +"[Edit.Edittext(ReadOnly)]\r\n" +"FillColor = 245 245 245\r\n" +"TextColor = 0 0 0\r\n" } /* All following bitmaps are of 32-bit ARGB format */ -- 2.30.2

1 0

[PATCH 4/6] themes/light: Add ComboBox parts.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- themes/light/blue_combobutton.bmp | Bin 0 -> 6774 bytes themes/light/blue_combobutton.svg | 101 ++++++++++++++++++++++ themes/light/blue_combobutton_glyph.bmp | Bin 0 -> 1174 bytes themes/light/blue_combobutton_glyph.svg | 106 ++++++++++++++++++++++++ themes/light/light.rc | 31 +++++++ 5 files changed, 238 insertions(+) create mode 100644 themes/light/blue_combobutton.bmp create mode 100644 themes/light/blue_combobutton.svg create mode 100644 themes/light/blue_combobutton_glyph.bmp create mode 100644 themes/light/blue_combobutton_glyph.svg diff --git a/themes/light/blue_combobutton.bmp b/themes/light/blue_combobutton.bmp new file mode 100644 index 0000000000000000000000000000000000000000..549aece42a6dad47f94aa39230d8c6c5122a5b52 GIT binary patch literal 6774 zcmeI0v2Gec5Qa$;cdk;Ufg;7B6gisImiu&m7VB)@B8tsBAORhP!Bq;|c_9l(w3#8A z(`Ropv&M>xLz<g^cmMg=U7?YV({JY=d;8B<c~%l1B+ew>^#=0n^-g5{=kdSTPrTA& zHk<Vqi^Xa_pKl~mFtp}I8MZwcuVs8Wolf7|oHuKY)Q^>EHKI2qEURBGmq*I5vFK#F zG?PKy@q9PHJEQhh=Poj+bEj{H3~FC>?jnOaclu_?p!QYgE;6Wdr*DP~YF~BkB7-`2 z`ew)wedzvjE6k>(XK9W0PVL8b643+Ut#zLg;r^^F_Gjb1)ttt|e!3Xmr>6QXIfX)N zn&F)??0i!HAn_-}dHTJ3X3Hzt*Hd27v$eeEYlY*E7yPX}yXWryy8Dath*$f)9K63& zztTnZlK!W)_w9L`Y9Ql>;{L3?9sSw3Z#6&u81=W;^-5wRk%F<=Ue!0su=8yvU)H<p z`Z7&Fhu@F1W_MMOmD%!SUnMN7Pv1Ws>Dg?o=QCZJ$)N6dz8m13QTwWM7a7#K(>Fr~ zwXZsNkwKk1eKTZG`>Jyn8PvJcH$w)suR3>;L7h8&Gh~Q9aDN%y?k1zAq-X8>pY%@I zQ~Q4OIH?EPQ+1!Z?_g-niv8JlL;ugE?{eM$b+P-`_hzf0wz+5~gF4DFKN-}v9?fJ> zM>*yvgWA@knGEVE$NXea+j=yUK^^6opA2eSk7hEcqa5>-L2c{NOa^t7V}3G3cmLPf H#RT(TZA>K7 literal 0 HcmV?d00001 diff --git a/themes/light/blue_combobutton.svg b/themes/light/blue_combobutton.svg new file mode 100644 index 00000000000..83cbad42cd8 --- /dev/null +++ b/themes/light/blue_combobutton.svg @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="20" + height="84" + viewBox="0 0 5.2916666 22.225" + version="1.1" + id="svg8" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + sodipodi:docname="blue_combobutton.svg" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_combobutton.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.2" + inkscape:cx="-55.876149" + inkscape:cy="19.823541" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + showgrid="true" + units="px" + inkscape:window-width="3840" + inkscape:window-height="2058" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid10" + originx="-6.5565108e-07" + originy="-4.9173833e-07" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.264582;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect12" + width="4.4979162" + height="4.7625008" + x="0.39687434" + y="0.39687434" + rx="0.52916664" + ry="0.52916664" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:0.264582;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect12-3" + width="4.4979162" + height="4.7625012" + x="0.39687434" + y="5.9531245" + rx="0.52916664" + ry="0.52916664" /> + <rect + style="fill:#2979ff;stroke:#2979ff;stroke-width:0.264582;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" + id="rect12-3-6" + width="4.4979162" + height="4.7625017" + x="0.39687434" + y="11.509375" + rx="0.52916664" + ry="0.52916664" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.264582;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect12-36" + width="4.4979162" + height="4.7625008" + x="0.39687434" + y="17.065624" + rx="0.52916664" + ry="0.52916664" /> + </g> +</svg> diff --git a/themes/light/blue_combobutton_glyph.bmp b/themes/light/blue_combobutton_glyph.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c427c0dc605dcaa171372af78978a9ce1074d4f7 GIT binary patch literal 1174 zcmd6jKMsO06o)Z!a_|HWj&79272@t4JcSdHhMs|vxN!jf+`&^JCioS>h!7S{l;mss z-usoL-)^txR`YFHH?V*e%&ax5WgVDbmJgc72TPV^Nl_H%sbA!I9)h2ysU&|I%Q90Y z)6GnlI_PS%bJwMJeC?UD$$|IY|7Bg*bpn%Kn1|qlgi$Z_mC1B(X|p{q^jsKtp%=hk zdAVwl++s25rHt&b(zahlLRQ)t^-^j_nM~)U$;P7Rg}ZJQiGi1j9Q>6R-jTqh7v>?D bH%l1xLSMnt3ug&EFVrp!ytFxw{p;TyDj9uq literal 0 HcmV?d00001 diff --git a/themes/light/blue_combobutton_glyph.svg b/themes/light/blue_combobutton_glyph.svg new file mode 100644 index 00000000000..f27cb4d0dbf --- /dev/null +++ b/themes/light/blue_combobutton_glyph.svg @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="10" + height="28" + viewBox="0 0 2.6458333 7.408334" + version="1.1" + id="svg8" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + sodipodi:docname="blue_combobutton_glyph.svg" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_combobutton_glyph.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="31.678384" + inkscape:cx="-5.501522" + inkscape:cy="11.482504" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + showgrid="true" + units="px" + inkscape:window-width="3840" + inkscape:window-height="2059" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid10" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> + <path + d="m 0,-1.8520833 h 6.35 v 6.35 H 0 Z" + fill="none" + id="path2" + style="stroke-width:0.264583" /> + <path + d="M 0,3.7041667 H 6.35 V 10.054167 H 0 Z" + fill="none" + id="path2-3" + style="stroke-width:0.264583" /> + <path + d="M 0.396875,0.66961251 1.3182396,1.5875 1.4498631,1.4563732 0.52849851,0.53848571 Z" + id="path4-79-8" + style="stroke-width:0.264582" /> + <path + d="M 2.1173348,0.52916667 1.1959703,1.4470542 1.3275939,1.5781809 2.2489584,0.66029351 Z" + id="path4-79-8-5" + style="display:inline;stroke-width:0.264582" /> + <path + d="M 0.396875,2.5216958 1.3182396,3.4395833 1.4498631,3.3084566 0.52849854,2.390569 Z" + id="path4-79-8-2" + style="display:inline;fill:#3096fa;fill-opacity:1;stroke-width:0.264582" /> + <path + d="M 2.1173348,2.38125 1.1959703,3.2991375 1.3275939,3.4302643 2.2489584,2.5123768 Z" + id="path4-79-8-5-9" + style="display:inline;fill:#3096fa;fill-opacity:1;stroke-width:0.264582" /> + <path + d="M 0.396875,4.3737791 1.3182396,5.2916667 1.4498631,5.1605399 0.52849854,4.2426524 Z" + id="path4-79-8-2-1" + style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:0.264582" /> + <path + d="M 2.1173348,4.2333333 1.1959703,5.1512209 1.3275939,5.2823476 2.2489584,4.3644602 Z" + id="path4-79-8-5-9-2" + style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:0.264582" /> + <path + d="M 0.396875,6.2258625 1.3182396,7.14375 1.4498631,7.0126233 0.52849854,6.0947357 Z" + id="path4-79-8-2-1-7" + style="display:inline;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:0.264582;stroke-opacity:1" /> + <path + d="M 2.1173348,6.0854167 1.1959703,7.0033042 1.3275939,7.134431 2.2489584,6.2165435 Z" + id="path4-79-8-5-9-2-0" + style="display:inline;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:0.264582;stroke-opacity:1" /> + </g> +</svg> diff --git a/themes/light/light.rc b/themes/light/light.rc index ea138423e8e..186aab3b066 100644 --- a/themes/light/light.rc +++ b/themes/light/light.rc @@ -294,6 +294,30 @@ BLUE_INI TEXTFILE "ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n" "MinDpi1 = 96\r\n" "MinDpi2 = 144\r\n" + +"\r\n; ComboBox\r\n" +"[ComboBox]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[ComboBox(Disabled)]\r\n" +"BorderColor = 228 228 228\r\n" +"FillColor = 231 231 231\r\n" + +"[ComboBox.DropDownButton]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_combobutton.bmp\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_combobutton_glyph.bmp\r\n" +"GlyphTransparent = True\r\n" +"Transparent = True\r\n" } /* All following bitmaps are of 32-bit ARGB format */ @@ -332,6 +356,13 @@ BLUE_COMMANDLINK_GLYPH_30PX_BMP BITMAP "blue_commandlink_glyph_30px.bmp" /* @makedep: blue_commandlink_glyph_45px.bmp */ BLUE_COMMANDLINK_GLYPH_45PX_BMP BITMAP "blue_commandlink_glyph_45px.bmp" +/* ComboBox */ +/* @makedep: blue_combobutton.bmp */ +BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" + +/* @makedep: blue_combobutton_glyph.bmp */ +BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH 3/6] themes/light: Add Button parts.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- themes/light/blue_button.bmp | Bin 0 -> 12198 bytes themes/light/blue_button.svg | 126 ++++++++++ themes/light/blue_checkbox_13px.bmp | Bin 0 -> 8166 bytes themes/light/blue_checkbox_13px.svg | 236 +++++++++++++++++++ themes/light/blue_checkbox_16px.bmp | Bin 0 -> 12342 bytes themes/light/blue_checkbox_16px.svg | 200 ++++++++++++++++ themes/light/blue_checkbox_25px.bmp | Bin 0 -> 30054 bytes themes/light/blue_checkbox_25px.svg | 200 ++++++++++++++++ themes/light/blue_commandlink.bmp | Bin 0 -> 12990 bytes themes/light/blue_commandlink.svg | 99 ++++++++ themes/light/blue_commandlink_glyph_30px.bmp | Bin 0 -> 18054 bytes themes/light/blue_commandlink_glyph_30px.svg | 83 +++++++ themes/light/blue_commandlink_glyph_45px.bmp | Bin 0 -> 40554 bytes themes/light/blue_commandlink_glyph_45px.svg | 83 +++++++ themes/light/blue_groupbox.bmp | Bin 0 -> 1814 bytes themes/light/blue_groupbox.svg | 72 ++++++ themes/light/blue_radiobutton_13px.bmp | Bin 0 -> 5462 bytes themes/light/blue_radiobutton_13px.svg | 131 ++++++++++ themes/light/blue_radiobutton_16px.bmp | Bin 0 -> 8246 bytes themes/light/blue_radiobutton_16px.svg | 123 ++++++++++ themes/light/blue_radiobutton_25px.bmp | Bin 0 -> 20054 bytes themes/light/blue_radiobutton_25px.svg | 131 ++++++++++ themes/light/light.rc | 151 ++++++++++++ 23 files changed, 1635 insertions(+) create mode 100644 themes/light/blue_button.bmp create mode 100644 themes/light/blue_button.svg create mode 100644 themes/light/blue_checkbox_13px.bmp create mode 100644 themes/light/blue_checkbox_13px.svg create mode 100644 themes/light/blue_checkbox_16px.bmp create mode 100644 themes/light/blue_checkbox_16px.svg create mode 100644 themes/light/blue_checkbox_25px.bmp create mode 100644 themes/light/blue_checkbox_25px.svg create mode 100644 themes/light/blue_commandlink.bmp create mode 100644 themes/light/blue_commandlink.svg create mode 100644 themes/light/blue_commandlink_glyph_30px.bmp create mode 100644 themes/light/blue_commandlink_glyph_30px.svg create mode 100644 themes/light/blue_commandlink_glyph_45px.bmp create mode 100644 themes/light/blue_commandlink_glyph_45px.svg create mode 100644 themes/light/blue_groupbox.bmp create mode 100644 themes/light/blue_groupbox.svg create mode 100644 themes/light/blue_radiobutton_13px.bmp create mode 100644 themes/light/blue_radiobutton_13px.svg create mode 100644 themes/light/blue_radiobutton_16px.bmp create mode 100644 themes/light/blue_radiobutton_16px.svg create mode 100644 themes/light/blue_radiobutton_25px.bmp create mode 100644 themes/light/blue_radiobutton_25px.svg diff --git a/themes/light/blue_button.bmp b/themes/light/blue_button.bmp new file mode 100644 index 0000000000000000000000000000000000000000..172bfdd932f96a27bddfc1893995239f5447b0bb GIT binary patch literal 12198 zcmeI0F;2rk5Jk-eC~57|t_VV+BSm`dLYasgP$MD%Y3ZC4@eL?!2SIJ0B*OA)nek>s z5<2e~3F%wf9cLrG?0)^#k7jc7dLDGo70oe?GaC0aPJ)Q$Ah@OP-%j1=7HHZ&T!hWy zx@hK?ZSy#?UV|Ag<9x>~&BwE`rm@}+G0gi@$L4*iFlAHimzA^2l2#QhwRpk-*C_!V zpo82AuJ8l=@XHTF<;7yWF`o;)e50)79Nx}H5!F&MNj%-Favn32G9EdPoR_;HUXssR z6<ntzbbt=~cM5*^13w_=yPQwcG|aNBSgls=a=ElVgBk1fI%g);vZ^XW&%U*Ly)%PY z9h-kcgDD$fmYiMIw5n*S#S;#=P6_A$9pp}Mg&*LDV?PX)7nE<Cx~?fc)bh>jaya7b zluQy&_o>WaCg-ueOF}zK3OkKks@7{TW18eUW=SmL#XH=OV{7d5kZV=We$2#YKQBQ) z=m!tL1HK*@EHC1XoyD5@#w^a^h-#^lN$%_g=P~;B=-bPGVDu5463_uU$erK{Km21q ppl^@9J=qt1dv}L<mfq0Miq0FjPDkhf9rkY&{4l&9(6@Je`)>k^jEVpN literal 0 HcmV?d00001 diff --git a/themes/light/blue_button.svg b/themes/light/blue_button.svg new file mode 100644 index 00000000000..a124c54ccc4 --- /dev/null +++ b/themes/light/blue_button.svg @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="22" + height="138" + viewBox="0 0 5.8208333 36.5125" + version="1.1" + id="svg8" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + sodipodi:docname="blue_button.svg" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_button.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8" + inkscape:cx="47.618696" + inkscape:cy="60.204175" + inkscape:document-units="px" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + showgrid="true" + units="px" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-width="3840" + inkscape:window-height="2058" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid71" + originx="-0.264583" + originy="-0.2645838" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-40.716637,-1.1912957)"> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:#aeaeae;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect837" + width="5.5562506" + height="5.8208337" + x="40.84893" + y="1.3235872" + ry="0.52916664" + rx="0.52916664" /> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:#aeaeae;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect837-3-7" + width="5.5562506" + height="5.8208337" + x="40.84893" + y="19.579838" + ry="0.52916664" + rx="0.52916664" /> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:#3096fa;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect837-5" + width="5.5562506" + height="5.8208337" + x="40.84893" + y="25.665255" + ry="0.52916664" + rx="0.52916664" /> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:#3096fa;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect837-5-3" + width="5.5562506" + height="5.8208337" + x="40.84893" + y="31.750671" + ry="0.52916664" + rx="0.52916664" /> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:#3096fa;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect837-5-3-7" + width="5.5562506" + height="5.8208337" + x="40.84893" + y="7.4090037" + ry="0.52916664" + rx="0.52916664" /> + <rect + style="fill:#2979ff;fill-opacity:1;stroke:#2979ff;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect837-5-3-7-5" + width="5.5562506" + height="5.8208337" + x="40.84893" + y="13.49442" + ry="0.52916664" + rx="0.52916664" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" /> + </g> +</svg> diff --git a/themes/light/blue_checkbox_13px.bmp b/themes/light/blue_checkbox_13px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7f55d7571e2894d89d4622d3a05c8f893361e795 GIT binary patch literal 8166 zcmeHL%Wm306oo9BRZIT>R7ENfDX}T4#0sg~D$1gpO7s`H4v!6gP^kn6qCZds39Bpu zS#<>;QUPM08Y<nM>oD#ZjAt54D5-4e_>SkEGh;I+o*TbA`5BMc$6K6}z;oam5RD{o zjzs#%|9Ei^y91|QuNS|%x*A+wURnV8fb%!ZM;s!SJDtumF^*T{Jh&Cs0hWp{#<;$| z-e*2QqE9C>f7co@r(fiI7kQoM5S$%r9<n~SxW}SuT{+KwVV?mBXoi5&Z_H=EQ6&|p zQfdHL0QrFPH!J>-O6f9H4}Cq#c`BwVwvNYF@WtBD=YxG{?E4XYI#Jxa4p(r3YJ}b| z@?0V>=GBQi);wT+lDAY!7FFwN`+)tzJ}V{@i13e=-v;cryK^(XXcz;)0>}r}qHf&S z{O0j+*)Yn~QFs*jW!<Q-j>lK=#k$eggMD#7qE9D^d)MI#PEd`|`$e8h<i)%?amShm ztdDuSY??*Yx^kZVg6A3BHI2jq{y|&qH|E2i{4Ndm`am@W*CQ%~dwqbt{;7DhTCMJ( zhH2yP>C?7%5b{nvN<>jSTMK<-U;=#f(#aa|Yq%bveu`lp1MMl|hjpE-LAwCXOTp=O zyIJ(jfK$=OQP#-)qK&yT;7t4d{)y;QX_yC24wys#es%5q24Wnq2u&XNE@{GgG+;eS z)yN)|Q*A1zw|Z2r-|%9Kg4;s9G)DgfT2GI<G^KP6*CRT66{GT@0qqp^(}qV~nqs;@ zRm1TpRbFS2pV3*`<xyGV<r&;x#-6W|bUdok@Ho)qz?(yFdsIiW(&fRmJ-X6_^=QC) zls$?XrfoHjw|Z2r--senT(^KR>fwpiG(9~kYZi60hU*cv-o&6W(4IoK;Za#*HH`v& z`Rmceg_%WuW}O=@kIEV^k1o!SGCbd}`jO*Nm4?SzUYI%X=D!<;?NJ?#t!tQhJfrQ= zl_so5gMWM4!*AOLwt5tMm%PtK!EFI!U;=o0bWKwOZv?~u1DFCE9$nKEz;WKAXlH>L z;PU922I-9>gC3sG@u-G|2gw0*;Ggz-@biG}(bYVUcCSYr6aLTi1ir(<Pg;kjuU%t3 zc8`YNNAJH0yB1Axp<DCG!#n{^SdRv*N9Fb2*4C}XWPPY{zTJlPXz+Seww7l*z&^*{ OH?@!dbe>0BkNyE918kxI literal 0 HcmV?d00001 diff --git a/themes/light/blue_checkbox_13px.svg b/themes/light/blue_checkbox_13px.svg new file mode 100644 index 00000000000..e14d56aaabf --- /dev/null +++ b/themes/light/blue_checkbox_13px.svg @@ -0,0 +1,236 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + viewBox="0 0 13 156" + fill="#000000" + width="13" + height="156" + version="1.1" + id="svg6" + sodipodi:docname="light_checkbox_13px.svg" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_checkbox_13px.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <metadata + id="metadata12"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs10" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="3840" + inkscape:window-height="2058" + id="namedview8" + showgrid="true" + inkscape:zoom="8.3108615" + inkscape:cx="-55.367254" + inkscape:cy="89.486562" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg6" + inkscape:document-rotation="0"> + <inkscape:grid + type="xygrid" + id="grid849" /> + </sodipodi:namedview> + <path + d="M 0,0 H 24 V 24 H 0 Z" + fill="none" + id="path2" + inkscape:export-xdpi="49.919998" + inkscape:export-ydpi="49.919998" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843" + width="12" + height="12.000003" + x="0.5" + y="0.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-6" + width="12" + height="12.000003" + x="0.49999851" + y="13.499998" + rx="2" + ry="2" /> + <path + d="M 0.49999851,25.5 H 24.499999 v 24 H 0.49999851 Z" + fill="none" + id="path2-7" + inkscape:export-xdpi="49.919998" + inkscape:export-ydpi="49.919998" /> + <rect + style="fill:none;stroke:#2979ff;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-5" + width="12" + height="12.000003" + x="0.50000042" + y="26.499998" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-6-3" + width="12" + height="12.000003" + x="0.49999851" + y="39.5" + rx="2" + ry="2" /> + <path + d="M 4.1723251e-7,52 H 24 V 76 H 4.1723251e-7 Z" + fill="none" + id="path2-5" + inkscape:export-xdpi="49.919998" + inkscape:export-ydpi="49.919998" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-62" + width="12" + height="12.000003" + x="0.50000042" + y="52.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-6-9" + width="12" + height="12.000003" + x="0.49999851" + y="65.5" + rx="2" + ry="2" /> + <path + d="M 0.49999942,77.5 H 24.499999 v 24 H 0.49999942 Z" + fill="none" + id="path2-7-1" + inkscape:export-xdpi="49.919998" + inkscape:export-ydpi="49.919998" /> + <rect + style="fill:none;stroke:#2979ff;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-5-2" + width="12" + height="12.000003" + x="0.50000042" + y="78.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-6-3-7" + width="12" + height="12.000003" + x="0.49999851" + y="91.5" + rx="2" + ry="2" /> + <path + d="M -1.9073486e-6,104 H 23.999998 v 24 H -1.9073486e-6 Z" + fill="none" + id="path2-5-0" + inkscape:export-xdpi="49.919998" + inkscape:export-ydpi="49.919998" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-62-9" + width="12" + height="12.000003" + x="0.49999809" + y="104.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-6-9-3" + width="12" + height="12.000003" + x="0.49999809" + y="117.5" + rx="2" + ry="2" /> + <path + d="M 0.49999709,129.5 H 24.499997 v 24 H 0.49999709 Z" + fill="none" + id="path2-7-1-6" + inkscape:export-xdpi="49.919998" + inkscape:export-ydpi="49.919998" /> + <rect + style="fill:none;stroke:#2979ff;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-5-2-0" + width="12" + height="12.000003" + x="0.49999809" + y="130.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-6-3-7-6" + width="12" + height="12.000003" + x="0.49999809" + y="143.5" + rx="2" + ry="2" /> + <path + d="M 4.8636363,60.537313 2.7159091,58.343283 2,59.074627 4.8636363,62 11,55.731343 10.284091,55 Z" + id="path4" + style="stroke-width:0.999998" /> + <path + d="M 4.8636363,73.537313 2.7159091,71.343283 2,72.074627 4.8636363,75 11,68.731343 10.284091,68 Z" + id="path4-26" + style="fill:#3096fa;fill-opacity:1;stroke:none;stroke-width:0.999998;stroke-opacity:1" /> + <path + d="M 4.8636362,99.537313 2.7159095,97.343283 2,98.074627 4.8636362,101 11,94.731343 10.284091,94 Z" + id="path4-1" + style="fill:#aeaeae;fill-opacity:1;stroke-width:0.999998" /> + <path + d="M 4.8636362,86.53731 2.7159095,84.34328 2,85.07463 4.8636362,88 11,81.73134 10.284091,81 Z" + id="path4-8" + style="fill:#2979ff;fill-opacity:1;stroke-width:0.999998" /> + <path + d="m 2,110 h 9 v 1 H 2 Z" + id="path4-79" + style="stroke-width:0.999998" /> + <path + d="m 2,123 h 9 v 1 H 2 Z" + id="path4-79-0" + style="stroke-width:0.999998;fill:#3096fa;fill-opacity:1" /> + <path + d="m 2,136 h 9 v 1 H 2 Z" + id="path4-79-2" + style="stroke-width:0.999998;fill:#2979ff;fill-opacity:1" /> + <path + d="m 2,149 h 9 v 1 H 2 Z" + id="path4-79-3" + style="stroke-width:0.999998;fill:#aeaeae;fill-opacity:1" /> +</svg> diff --git a/themes/light/blue_checkbox_16px.bmp b/themes/light/blue_checkbox_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6451eb3aa70932ea32451b5d4a63a29e8c3363cc GIT binary patch literal 12342 zcmeHNzi-+=6b4l)8LFmBrwl<=M1Tx7YLux%)3H)Vw)_EEI)h<h>Xa$sM=B-ijs)2< z1du8<Q>KjBGG&RBB?G~x$@O~&FEIvUpXp$bPx^T0<9+x06Zg)1`L?A;WZJ@K5_kvv z2BMKTK9TVKpSJ@H3L=q4qp^B?eB5d_n<gMUf_zVj3)_Y*)a&)vT&J5QU+{`l2Vkmj zx$cvblNfOU!DXtJxC_Lmc~C*bF@6=UoO1_Xb^4v{&nth{{oBDj=2bL6zN9(QEf5F4 z4JhfCxTIfEOsxtd)dEaFcm(;L4!Lb%qzj_7;aUIWEApwLtb^KB;PNIB-`8T`%RY0N zs^zh&^4LE}eC~@^OJiVPd!EbOter!7KZ)D$!zE5Y_%rU`WJeguyov^-en@kq+k7$( z3k@pkw?+EBFK1S*s@?)jKzM{{RrFKIt!eFkRWFFTg8t##ujoapgW6T$@?H`9YccLK zm#JDFt16HEgT&{)c(pVJ_O<7^%+1<4l=qXk4L@As1cX21{>^mywM<?`1LRAZ!}weG zH9c-YgUGAtm$=YAodLr0zrP(Au=DS%=l5Cp%99wd`SaWVxjz3dp#Gy+$RpsZ+k#Hn ze|zAO7P`Qvm+F|n&keZ->=|$iYycCJgTDi(N8rcMc^UQsxCY|DSaR?ia5w~L{G3*h zxdJYM_gu)<!Cyl8EB?-A6Ug5H=fE3Vxk~)L3Emyh0b*Q-qkS%(X1DQ04`>3ipNf2{ zHw!!fWqR<zC)zGhqRfy#*ZN<y_#eWJ;%?yx@sO+j;Un)mXe~L3e0pzK-W9ox7xnMt zqurb=%O?%oiJT#SD{|?n`nU5%A-#j=M_8$Uk^8WWxbOmH*A(M%|Lk^zZ=@P{KBV!p zk0>TqP<DlWT?%7uO#dVNQhZ5d$MugsB;a=gdycqsME`a^w>im*;`%0h?@&jF?rqq| zE1&#DVSO9^JyA$Cxt}V0Sw}vd1?K^f`d8%->)6E_m1KUff5P}bK=Hp2k*HP49Q{4e zUG+aHezYpu-mtveuV^po-^uS+wH%cpHZx$)fLpVyP1V1hZ&tM(JU^OMeW3rJAD8ib zfx50K#-sh_Om=?1nrT>7?U2ULe%+e30-r13QtW5O^l#^jU!RvmJv;XM-z#eg_}u{K zqB5#~JD=N}WUYhDCVcO#YNkW?Htge-PySeoZTR<aZ`9;|s_>}}%xxB&2SDmyl}~kG z47+AUFAehYzATLYgZ2K8_J4T(rwtm3gy;XkJn(0D{vW*aHu?SE0>=Nm)~?oP{P$FE z$X}@cPdu%w*Gw4y%l{69@Bh7S7>A#q_|slR$REGIvCofN{y)uM82<+-{&!n*`}cn0 hzmWet1L6FI@juQ$;s1Z1C83lH<A;TaALjb~-#-V*m*fBd literal 0 HcmV?d00001 diff --git a/themes/light/blue_checkbox_16px.svg b/themes/light/blue_checkbox_16px.svg new file mode 100644 index 00000000000..cbfe5f019c3 --- /dev/null +++ b/themes/light/blue_checkbox_16px.svg @@ -0,0 +1,200 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + viewBox="0 0 16 192" + fill="#000000" + width="16" + height="192" + version="1.1" + id="svg6" + sodipodi:docname="blue_checkbox_16px.svg" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_checkbox_16px.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <metadata + id="metadata12"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs10" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="2672" + inkscape:window-height="1823" + id="namedview8" + showgrid="true" + inkscape:zoom="5.8766665" + inkscape:cx="0.38490295" + inkscape:cy="107.15953" + inkscape:window-x="803" + inkscape:window-y="154" + inkscape:window-maximized="0" + inkscape:current-layer="svg6" + inkscape:document-rotation="0"> + <inkscape:grid + type="xygrid" + id="grid849" /> + </sodipodi:namedview> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843" + width="15.000003" + height="15.000004" + x="0.49999848" + y="0.49999854" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-3" + width="15.000003" + height="15.000004" + x="0.49999851" + y="16.499998" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#2979ff;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-53" + width="15.000003" + height="15.000004" + x="0.49999851" + y="32.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-3-5" + width="15.000003" + height="15.000004" + x="0.49999851" + y="48.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-629" + width="15.000003" + height="15.000004" + x="0.49999851" + y="64.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-3-1" + width="15.000003" + height="15.000004" + x="0.49999851" + y="80.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#2979ff;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-53-2" + width="15.000003" + height="15.000004" + x="0.49999851" + y="96.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-3-5-7" + width="15.000003" + height="15.000004" + x="0.49999851" + y="112.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-0" + width="15.000003" + height="15.000004" + x="0.49999851" + y="128.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-3-9" + width="15.000003" + height="15.000004" + x="0.49999851" + y="144.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#2979ff;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-53-3" + width="15.000003" + height="15.000004" + x="0.49999851" + y="160.5" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-3-5-6" + width="15.000003" + height="15.000004" + x="0.49999851" + y="176.5" + rx="2" + ry="2" /> + <path + d="M 5.8181813,74.910447 2.9545453,71.776118 2,72.820895 5.8181813,77 14,68.044775 13.045454,67 Z" + id="path4-0" + style="stroke-width:0.999998" /> + <path + d="M 5.8181813,90.910447 2.9545453,87.776118 2,88.820895 5.8181813,93 14,84.044775 13.045454,83 Z" + id="path4-0-6" + style="stroke-width:0.999998;stroke:none;stroke-opacity:1;fill:#3096fa;fill-opacity:1" /> + <path + d="M 5.8181813,106.91045 2.9545453,103.77612 2,104.8209 5.8181813,109 14,100.04478 13.045454,99 Z" + id="path4-0-2" + style="stroke-width:0.999998;fill:#2979ff;fill-opacity:1" /> + <path + d="M 5.818181,122.91045 2.954545,119.77612 2,120.82089 5.818181,125 14,116.04478 13.045454,115 Z" + id="path4-0-61" + style="stroke-width:0.999998" /> + <path + d="M 1.9999999,135 H 14 v 2 H 1.9999999 Z" + id="path4-79-8" + style="stroke-width:0.999997" /> + <path + d="m 2,151 h 12 v 2 H 2 Z" + id="path4-79-8-7" + style="stroke-width:0.999997;fill:#3096fa;fill-opacity:1" /> + <path + d="M 1.9999999,167 H 14 v 2 H 1.9999999 Z" + id="path4-79-8-9" + style="stroke-width:0.999997;fill:#2979ff;fill-opacity:1" /> + <path + d="m 2,183 h 12 v 2 H 2 Z" + id="path4-79-8-2" + style="stroke-width:0.999997" /> +</svg> diff --git a/themes/light/blue_checkbox_25px.bmp b/themes/light/blue_checkbox_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c9bae2042b0136e5d8b73170799b2e48e5743a62 GIT binary patch literal 30054 zcmeHPO=ufO6joB~V2XS4rBFf-q4p{vk{f7f6MSgTg<gCxJ>+6?tD&?_q_hXu5MsNg zln~1pw>O_`oF8NY0^>^$_0_)mY#n{{kAyw_-tNq@JG-NqT}{-2M({E_Z{GX9c~2wh zb@$a@e*N&Lg8%vq|BgXEgxtDPC|oIgjH^PSjP<`i2*g+5pSN${UfbH*T6p>L<q?Eg z6vCU|*w`54_%^X+tY_eA(%!*!PsC<p1m=Chg@pOBfh%Khjxa8H-NxK;m}k-Ds{35Y zIm|N`yO4cVdfCoouEJ93O)zB}6_(K3997(oBbfo0t7J}8njYuM|2=>G`t=v8{p8V8 zeZb?O-}6N|Cd>1As;@YYACE=+Ce>9`U$O6QTw_&l0dfRk7UhUN@#fj=%|VWD6I;S6 zJ_AQH*!!r}8jd}_d7tMb%uk-Pqx0b$VO%=<JnN3bJZmmj-RDZqVV=3zh3u=+%XTJn z6_!eGf+^dmu!P>`sN!}U$qcw$C3B+E^f*_+@A=PTR%<v`9lginIARrVQI5&#oa!H{ zuL2%kpIEE02yel!ub$tycD_<xXxGX|ty-Dc62d#LjnA`<n}dXJ3pWkte7W@OyjE_~ zT6?8zwT5dim+t$xk^HF6csF`Eu5PeYzK%ncnWWz3Dwz|NMwKgBpJy&OWnYzEwlkTl zuvB^zOxZ?-CG<8&6}RI^X29htnG=<!m$?dm&zH+qYdES8D2|{$DKE+~*_`|J57k$- z@}h{x7CzxoT}AbkdzPv?v4I}<KHam_&MAtm%J+(6i<Tyi!#t7yajqD4+O7D(c8H@} zeDeQ4aENVmJ$A@d*VqEUafnRlN0%#oj)X-dSMFJA=iavPS*oky#OX;Nai;pNhQl-V z>xjGFXf)nW&x%?b`3(BKeQB0&-n<!x-9ES72H$&Wb}F5YV|8_P05%QD?hh4SnqKk^ zf9HiQ*4MbrF~%848$vP92piqV?NfUoU%h%&<?Ah6e??g6f0*XF3+TSl;nTW`1NuqG z1>_R)Ac_U-CFp2hC+J7H8(mAg=C+AApx@zZzsi2Iv$I#Rw#C<*bmnB6=$zXnIO_HK z2-co5#?bkjd;xa|dE4Xu2l&22M{xQ}#gT3u*U~<~bI37v!8;hY2xi@I5CZ%?$T8u7 z@6UI^L72dv0LK~eKpx9HT%UM9WINp)XKe~tbOuSjjoRDdAWZPgalF%LkCjahI)lJl z=a~P9SZs0-CjWlh#P{gvyW$YI(b0AsQEYJ?;czuv@YxGLW0BmDF0A2PKb$x{>0>|k z!y)GDc-CHLKi<w<!^!;wX<22DMu%ay@7q?qZ8llRRKw{w*uy&muxZ5XDqf}<F6N6q zQ8^CudaiMsV^%HB;JO{mi^ervCk|E_tMc_0ds6gkIP_IabKM0-qZ&@d!79Z`tP##7 ztB%ELIIJykzZ1l!t>Kg$Rc|L)D<*0<He0xgwJq-3q%$YyI67By{P4*L_Wu-bP-+dw zzW-<lzI)vNfX&`e)^IA0=sr}}%-@H17+@54sZS-%wi^z@V~=imz`&XF`)X2axNbRo zp2yw<aL#<JikGP2Y;gEIm9Z&c;S545#aInzi^J!6;>~fqQx@s5vdV!oh_krvV^+Md zhO^1x$Krp#jcu}DM#CD;HV5&@uO4%_ez?y6e}e0WlMkq3-jDror>l3a<9U0X{g%Ck zlb`perIr0PIt;sgvIWmJ+nCH$!|6EK>YV}LHez-w<xDkP%oqEV<G}hFw>fUDjL+b@ z?ay&7+p6Z=KkPw`+M!>g%GX=%7vp{nhxs(uT_8TA8cxLl|4FP}KrSJ%8m_fmTH<~u ztrxeoH5|81#L-$Q?a<nJt(02BwQJ*B!Fst#XD%AQe68ZZdp&|!a34-l!~OpG5PbK1 z|CR9r_WZ80hEs9Kdr6zqKHz`IF?Oj>CC#oI4#GQM{?r4;aez}wt>L=mARe5#3E-R& zR=ZY8)NnR9f_TQKfJJBU68$}~8qO9+z*CwF@JgrcNRO3G4myLa<?=e`32Qi;925(E zzoD;d^Q?9|tl?~P5Rd%oB?ms!L4SMXy^{BnXYTsp{QK&vdwa6p{cVv9hfKOpny48v zKq*Z#aM15*9g_JzoFT_Bu=gPp=Qbo$4QIeH0L%u*Ck~QKHJky*8pl1xNOfDA&y8z1 z4M&yZwJ`cM9L8y`yTE8v!*$@81P0+;LLNY(uO&<<XD1MC4cCEVhvOt_IOwlJw)lDz zW5*h<1IGw_pF&da!$Cg;*@I9#2M}cq*MS3W+86EP5JEh=kklHkOAf#mJP4gR;z_OH zEN}q2FabG(5Kp3pv%~@D!W4wgAW5u-v&aGH!W@KRIfaCM@|HR146bvYu!ghD0r&!a zzimRo8txr%5KrvYV-EK$)$m!W>xYXS)5HYlw(t7k5=qFQ=<(;=|L=wj+cP$GaTupc z*>h)(ptp4IhdxKb!sSY2LO;4(>2oA3dYmg)!x`3at{+aE(Dbn%`{B|vVW#bI&xHT? z^vrga&C11Lo-daxmn-uOm|MDY)z`Ul{cx@y&in(=!LlFw;X0&4yVT2`3Bje^R1O1y zEyf%WS{H#WMy*2*1A#5Z91vO;fh|U@Lk<IhEyf%WS{H#WMy*2*1A#5Z91vO;fh|U@ zLk<IhEyf%WS{H#WMy*2*1A#5Z91vO;fh|U@Lk<IhEyf%WS{H#WMy*2*1A*=O;X41V zUdoUA`*3Cl4EK-SvsANG`Bpu?-|n8JYTg_7erOUDS$4UKBtvuQa-~U7WZC5^k_^pd NBv<ZPs^PQLe*xSO3%>vW literal 0 HcmV?d00001 diff --git a/themes/light/blue_checkbox_25px.svg b/themes/light/blue_checkbox_25px.svg new file mode 100644 index 00000000000..291bb88f352 --- /dev/null +++ b/themes/light/blue_checkbox_25px.svg @@ -0,0 +1,200 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + viewBox="0 0 25 300" + fill="#000000" + width="25" + height="300" + version="1.1" + id="svg6" + sodipodi:docname="blue_checkbox_25px.svg" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_checkbox_25px.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <metadata + id="metadata12"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs10" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="3840" + inkscape:window-height="2058" + id="namedview8" + showgrid="true" + inkscape:zoom="4.1554308" + inkscape:cx="16.294886" + inkscape:cy="158.44949" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg6" + inkscape:document-rotation="0"> + <inkscape:grid + type="xygrid" + id="grid844" /> + </sodipodi:namedview> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843" + width="23" + height="22.99999" + x="0.99999994" + y="1" + rx="2" + ry="2" /> + <path + d="M 9.4090904,116.86568 5.3522729,112.16418 4.0000008,113.73133 9.4090904,120 21,106.56715 19.647726,105 Z" + id="path4-0-3" + style="stroke-width:0.999997" /> + <path + d="M 4.0000008,211 H 21 v 3 H 4.0000008 Z" + id="path4-79-8" + style="stroke-width:0.999996" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-6" + width="23" + height="22.99999" + x="1" + y="26" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#2979ff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-7" + width="23" + height="22.99999" + x="1" + y="51" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-6-5" + width="23" + height="22.99999" + x="1" + y="76" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-35" + width="23" + height="22.99999" + x="1" + y="101" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-6-6" + width="23" + height="22.99999" + x="1" + y="126" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#2979ff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-7-2" + width="23" + height="22.99999" + x="1" + y="151" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-6-5-9" + width="23" + height="22.99999" + x="1" + y="176" + rx="2" + ry="2" /> + <path + d="M 9.4090896,141.86568 5.3522721,137.16418 4,138.73133 9.4090896,145 21,131.56715 19.647726,130 Z" + id="path4-0-3-9" + style="stroke-width:0.999997;fill:#3096fa;fill-opacity:1" /> + <path + d="M 9.40909,166.86568 5.3522721,162.16418 4,163.73133 9.40909,170 21,156.56715 19.647726,155 Z" + id="path4-0-3-9-3" + style="stroke-width:0.999997;fill:#2979ff;fill-opacity:1" /> + <path + d="M 9.40909,191.86568 5.352272,187.16418 4,188.73133 9.40909,195 21,181.56715 19.647726,180 Z" + id="path4-0-3-9-6" + style="stroke-width:0.999997;fill:#aeaeae;fill-opacity:1" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-06" + width="23" + height="22.99999" + x="1" + y="201" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-6-2" + width="23" + height="22.99999" + x="1" + y="226" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#2979ff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect843-7-6" + width="23" + height="22.99999" + x="1" + y="251" + rx="2" + ry="2" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" + id="rect843-6-5-1" + width="23" + height="22.99999" + x="1" + y="276" + rx="2" + ry="2" /> + <path + d="M 4.0000008,236 H 21 v 3 H 4.0000008 Z" + id="path4-79-8-8" + style="stroke-width:0.999996;fill:#3096fa;fill-opacity:1" /> + <path + d="M 4.000001,261 H 21 v 3 H 4.000001 Z" + id="path4-79-8-79" + style="stroke-width:0.999996;fill:#2979ff;fill-opacity:1" /> + <path + d="m 4,286 h 16.999999 v 3 H 4 Z" + id="path4-79-8-20" + style="stroke-width:0.999996;fill:#aeaeae;fill-opacity:1" /> +</svg> diff --git a/themes/light/blue_commandlink.bmp b/themes/light/blue_commandlink.bmp new file mode 100644 index 0000000000000000000000000000000000000000..929a08af852478eb382bd466fd9497ad07cbe6e3 GIT binary patch literal 12990 zcmeI1F;2rU6o%b}4oDoK%}}9~4oyJf0PGxvnKX1@?2I50SKtP1S{4qKIvLFGq)!S` z9c4g5C4Z%tXW7qg^Yyp=65ri_UaRVJi>nVihg}Yo8YmAXrB-PFx~Q$Hz$JeT$HiN) zDUv|L%n{Q%3D)`h%?NE-nFO)<n4L-grnmKFGGEGgt~lvqUM53~xwqdbb!}dLTU(5@ zF}5Z_4&)$n!g}g~dY~Sf1bU+f-Elug9uV%zG>lyF^*$fOSWB`z4ZI?qZ&7yU4^<rU z4CWeKe`V%zAL`Az!`%MxTqW9X^PCr)7fpSfs2=`2*Jv_inFL6H1W14cNPq->n}B(m zj?H4afoYgIVzz#59%m!?%q*^A^Xxc7K|NxYuzEa4oZN$Xm<$oShjn_+vT=-6iX3VM zkpnr%T4Fu*Ks`_oO#(mkpk4d6^f>It*zf%vEON!$`YI2w`9S1*n0H%PTmF#QJcDN_ wJVOz!o#?y4PI)Ttt^SwEfgEJMTTeaoMh`qgX$qfZ5+DH*AOR8}fqzHf8^!81*Z=?k literal 0 HcmV?d00001 diff --git a/themes/light/blue_commandlink.svg b/themes/light/blue_commandlink.svg new file mode 100644 index 00000000000..951fb247ddb --- /dev/null +++ b/themes/light/blue_commandlink.svg @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="11" + height="294" + viewBox="0 0 2.9104166 77.787504" + version="1.1" + id="svg8" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + sodipodi:docname="blue_commandlink.svg" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_commandlink.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="4.2040816" + inkscape:cx="-17.637445" + inkscape:cy="190.4271" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + showgrid="true" + units="px" + inkscape:window-width="3840" + inkscape:window-height="2058" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid833" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <rect + style="fill:none;stroke:#3096fa;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect844-3" + width="2.6456137" + height="12.699781" + x="0.1322915" + y="13.096875" + ry="0.52916664" + rx="0.52916664" /> + <rect + style="fill:none;stroke:#2979ff;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect844-3-6" + width="2.6456139" + height="12.699782" + x="0.1322915" + y="26.061459" + ry="0.52916664" + rx="0.52916664" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect844-3-6-5" + width="2.6456141" + height="12.699783" + x="0.1322915" + y="51.990627" + ry="0.52916664" + rx="0.52916664" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect844-3-6-5-3" + width="2.6456141" + height="12.699783" + x="0.1322915" + y="64.955208" + ry="0.52916664" + rx="0.52916664" /> + </g> +</svg> diff --git a/themes/light/blue_commandlink_glyph_30px.bmp b/themes/light/blue_commandlink_glyph_30px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..76789b095575b8d12fdf51ac96b6486d69fe2c27 GIT binary patch literal 18054 zcmeI2O-{m45P<6iJc4lvZ5qnP1GsQ!;sVaX&qml7_e#A)Dcr$R)h@<qv6!#`U;8p$ z_>oKrwDUgr-t;w-y!*$OhoFAl>2aWOqmgP{1-E((f+s!yd3}ib3l12-z`r+8q@#7Q zNmiC3inloaN|RDU%-Lx&ZP?{U@@)FQVT-Htsz!W;3)>g78mCCduNHMyY{nDi9qucb zUX}Oa_I(r`=hJ$PR-RSedYvc+!vF>_fB_6(z}Y~a=j-iuyK+wKkg(tHW960_V$D|O zv|;adJJWs;b}p{Ys~YhYE^J@SpK(n3LA{qI%B$}yeTUg$jXF*3!)=yjQ8S;`>tw~V zs-aWYe8vC<Fn|FJV8GUZEW))c!<8jfW`kH3!%{=c+4FFEWX}ht{h+`WadckSNL433 z!h!9D*Zk(?(4;q$MKn3qHcYQeS}$&AVe~tn#%r`b6U3;7yiOE@VE_XdzyJm?;B0{X zqRz@%Clu@#Wxr_a>bacQ%brH|s9v6!mRA()7j0>dGz?$>0~o*n23!o#54zaub}jv2 gLO<B8gwAHu51!T2>0~c%=?6Q_8Oa#Hz~2pg1CC}%!~g&Q literal 0 HcmV?d00001 diff --git a/themes/light/blue_commandlink_glyph_30px.svg b/themes/light/blue_commandlink_glyph_30px.svg new file mode 100644 index 00000000000..b2f1d64bd60 --- /dev/null +++ b/themes/light/blue_commandlink_glyph_30px.svg @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="30" + height="150" + viewBox="0 0 7.9374998 39.687501" + version="1.1" + id="svg8" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + sodipodi:docname="blue_commandlink_glyph_30px.svg" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_commandlink_glyph_30px.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="3.959798" + inkscape:cx="7.1826261" + inkscape:cy="129.0317" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + showgrid="true" + units="px" + inkscape:window-width="3840" + inkscape:window-height="2058" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid10" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <path + d="m 4.7624997,2.1166667 -0.373063,0.373063 1.211792,1.214437 h -4.278312 v 0.529167 h 4.278312 l -1.214437,1.214437 0.375708,0.373063 1.852083,-1.852084 z" + id="path4" + style="fill:#3096fa;fill-opacity:1;stroke-width:0.264583" /> + <path + d="m 4.7624993,10.054167 -0.373063,0.373063 1.211792,1.214437 H 1.3229167 v 0.529167 h 4.2783116 l -1.214437,1.214437 0.375708,0.373063 1.852083,-1.852084 z" + id="path4-6" + style="fill:#3096fa;fill-opacity:1;stroke-width:0.264583" /> + <path + d="m 4.7624993,17.991667 -0.373063,0.373063 1.211792,1.214437 H 1.3229167 v 0.529167 h 4.2783116 l -1.214437,1.214437 0.375708,0.373063 1.852083,-1.852084 z" + id="path4-6-7" + style="fill:#2979ff;fill-opacity:1;stroke-width:0.264583" /> + <path + d="m 4.7624997,25.929167 -0.373063,0.373063 1.211792,1.214437 h -4.278312 v 0.529167 h 4.278312 l -1.214437,1.214437 0.375708,0.373063 1.852083,-1.852084 z" + id="path4-6-7-5" + style="fill:#aeaeae;fill-opacity:1;stroke-width:0.264583" /> + <path + d="m 4.7624987,33.866667 -0.373063,0.373063 1.211792,1.214437 h -4.278311 v 0.529167 h 4.278311 l -1.214437,1.214437 0.375708,0.373063 1.852083,-1.852084 z" + id="path4-6-3" + style="fill:#3096fa;fill-opacity:1;stroke-width:0.264583" /> + </g> +</svg> diff --git a/themes/light/blue_commandlink_glyph_45px.bmp b/themes/light/blue_commandlink_glyph_45px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a05919387b97f7c43080ff215cc78208d1c58cdd GIT binary patch literal 40554 zcmeI5PiqrF7>5&3^q?Npi;7S|+9Xx8OQq-H-A~X{FDVF~Qf$+D2=rV^jk_VB2HKtq z{g;K_Bv5ZHIhN2%!4F|23GM5<8#mpZ^pI?_=8gOclij4dlP3?8*%^N9<jvc6-y+W6 zBtOQuyyWteOEfaVkCDi0{{N4A&EmX(2N-|>7=Qs7fB_izj||k!<V@YvHYhuFV;DYG zJ)fLq-U}|&F!d6BdVWhXH&G<Yj@NBox719{qT<wT@!WaMaGC#Z%Vdn-5zlQT*Zkc2 zA$=XYE1uibSNz=C5q%lIFPYnBs~K9>$DP+J^m+1ubnb?kocD2?+6fgV9*O5Rv^gKQ zk*xm8>5qHi_SNU<t3rPL^xSyyG$?n-Y_0yf{eATBL&kjeJNN2YQ0B1DYvlDbJHBjr z=JtG^Pd*9zeS_9NZ2d+XuiZZvCLRX;{9&J0Gxg<GTd?~gLpzpw9c+&8v{fIkDR;c# z@EUr~&#Q?Z*VXe{(aSpw<7ehgadGA;4zKWeiu;|e<+W-4zHM^<aMOJaTNr==7=Qs7 zfB_hQ0T_S*7=Qs7fB_hQfp87%?Ci{N*(jIGLy^&MZ*R{s?*$j){nEj~f$)r;qPx4h z>o%{aSjA#dct-DV8y;qxzr3}zB|M|2D08kU+=u)7`@%DNhkHfgK4RbEGkX3WW)<!V zKNp|TGvmC%eZrqbd`8dAa|(Br+jmbHy;7gIuL^VjbZ>7ja7I5MX4^;LjD8Tz+@{Y; zrIOf;p83-3<<jG(%Ke_$jGj4%s^7SVw_;hA*o>ar!?LF>5RadZrCtY#oN>~smzVd& zjyG&x_M209MUU&4x2W)nA3t-OO);}GPvNa4eV*dZGMROn%VwcaKt}IM!4?K!00v+H z24DaNU;qYS00v+H24DaNLN-8|#0)LOhvq(d=AETX{DKS7LZU?Ph2KZd%QG?Sy2EQT zH;YBt5!o5N&Ak{m6z(!*h2KZ-_>Qe9+=ui*_<i&acVflQ9Xn#*;xl?$Ol1As@d{;P z;xl^g_vRJu6K?b3GkWd==ltA>D!1>RGJ1b~t$xbwufp1%(o*pI=m*5iE@FW*`T;SY z(Z?~d89gn=((L8($_=;YrBSgN{jl{L*YH*-Jt{V%=XS7s)fSw-=veA?kecJWRfSjV zc%#Xi$SJ&{$8|i;FDkt9$IlC~6f-yHDVew>eV*b@GuibtU*9$<h5P7TC)mOO48Q;k zzyJ)u01UtY48Q;kzyJ)uK-dPb)_u5!vDSUKe%0EWYq?^rd(}&r&#~5hn0DLiZeXo@ zM~Zj-<A1x4weH(nW$;(9)_rhyot%la?mMv*>=>+dAIw`fXJM`TZfx~-EY`a3%^%K& z0T_S*7=Qs7fB_hQ0T_S*7=Qs7fPo+ekkJRR*7-Te=sS1Sk0X)M_rqd$bs(ef&R4HT zBcpE`{I|J0|1P%u+t^M)M&D~2_MVT7-fN@(`^f0~@6@dk8NF*Fye%^N@Z733BcoT1 S;5iJy01UtY48VY71AhQDzZ!`E literal 0 HcmV?d00001 diff --git a/themes/light/blue_commandlink_glyph_45px.svg b/themes/light/blue_commandlink_glyph_45px.svg new file mode 100644 index 00000000000..5f1ac481278 --- /dev/null +++ b/themes/light/blue_commandlink_glyph_45px.svg @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="45" + height="225" + viewBox="0 0 11.90625 59.53125" + version="1.1" + id="svg8" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + sodipodi:docname="blue_commandlink_glyph_45px.svg" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_commandlink_glyph_45px.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="5.6568542" + inkscape:cx="13.155944" + inkscape:cy="122.16084" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + showgrid="true" + units="px" + inkscape:window-width="3840" + inkscape:window-height="2058" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid10" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <path + d="M 7.1834384,3.175 6.6051906,3.7345949 8.4834687,5.5562506 H 1.8520834 V 6.3500004 H 8.4834687 L 6.6010909,8.1716561 7.1834384,8.73125 10.054167,5.9531245 Z" + id="path4" + style="fill:#3096fa;fill-opacity:1;stroke-width:0.264583" /> + <path + d="m 7.1834383,15.08125 -0.578247,0.559595 1.878278,1.821656 h -6.631386 v 0.793749 h 6.631386 l -1.882378,1.821656 0.582347,0.559594 2.8707287,-2.778126 z" + id="path4-3" + style="fill:#3096fa;fill-opacity:1;stroke-width:0.264583" /> + <path + d="m 7.1834383,26.9875 -0.578247,0.559595 1.878278,1.821656 H 1.8520833 V 30.1625 h 6.631386 l -1.882378,1.821656 0.582347,0.559594 2.8707287,-2.778126 z" + id="path4-3-6" + style="fill:#2979ff;fill-opacity:1;stroke-width:0.264583" /> + <path + d="m 7.1834383,50.8 -0.578247,0.559595 1.878278,1.821656 H 1.8520833 V 53.975 h 6.631386 l -1.882378,1.821656 0.582347,0.559594 2.8707287,-2.778126 z" + id="path4-3-6-7" + style="fill:#3096fa;fill-opacity:1;stroke-width:0.264583" /> + <path + d="m 7.183438,38.89375 -0.578247,0.559595 1.878278,1.821656 H 1.8520833 V 42.06875 H 8.483469 L 6.601091,43.890406 7.183438,44.45 10.054167,41.671874 Z" + id="path4-3-6-5" + style="fill:#aeaeae;fill-opacity:1;stroke-width:0.264583" /> + </g> +</svg> diff --git a/themes/light/blue_groupbox.bmp b/themes/light/blue_groupbox.bmp new file mode 100644 index 0000000000000000000000000000000000000000..5b8f94cebb6a75f6afa42507d17b114379b759ec GIT binary patch literal 1814 zcmZ?r6=P=r12Z700mNcJECR%g3<^M!f#Crg1H)lH2nGuPiM4Cj%CBF)e)qa{>wW_9 ze+n_kj9nlzf%G0AUA1b}Dxj^D0gxF$^Qu8+1MyF4m<e;ywr$(kL1qH+f0!7xXpots z<}xshh65x;jfTT$I3SlTG)@n+Dkt{>-CaSAG8kkAsEz>DKR~PiG<OdWQ>7jPnF*?g E03>V+W&i*H literal 0 HcmV?d00001 diff --git a/themes/light/blue_groupbox.svg b/themes/light/blue_groupbox.svg new file mode 100644 index 00000000000..f6a6383092b --- /dev/null +++ b/themes/light/blue_groupbox.svg @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="5.8208332mm" + height="5.2916665mm" + viewBox="0 0 5.8208332 5.2916665" + version="1.1" + id="svg8" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + sodipodi:docname="blue_groupbox.svg" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_groupbox.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="63.356768" + inkscape:cx="10.242895" + inkscape:cy="8.0187475" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + showgrid="true" + inkscape:window-width="3840" + inkscape:window-height="2058" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid8" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1)"> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.264583" + id="rect832" + width="5.5562501" + height="5.0270839" + x="0.1322915" + y="1.1322916" + rx="0.52916664" + ry="0.52916664" /> + </g> +</svg> diff --git a/themes/light/blue_radiobutton_13px.bmp b/themes/light/blue_radiobutton_13px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..73d8a2e6c89819d23a1ea6b72d591250b0233bb0 GIT binary patch literal 5462 zcmeHLyG|QX5OpLTO_DAhffPvCCc=x5(qN=0W$Z|)@(IRGT7pBvHy~KzBCW9y&j#U& zB9-lLU@5?SfI&RgNH^!)N7&beA}JtZrSaUEIkR`}+#`0951+ogO3CLPe$$W_kTT?1 z>J5HVsW*uKdZ|P@B0pPOTY1PD<OFgJIfm3WH#esv(A2@fK_C1s;z!W4>+9>okO6A= z%Jf5)i8Hwx-`L&VWofa8e&jTm#~^ebIiA5|U4X9%Iiud#*!W1C&SM?Z+uPf9NQr)p z7r=(Z<iXE6Ymn2Oot@XrL2f&W*LG9Ca|E{R56?><?5-uJ%lO{j-XP*vkPd1ZqVK+a zbRSQG=RtlkX&+!d^PPD2EaEksWd`~X?|4qX&TAoljx}|Ge)bJ(557EYtX;fo-{jF3 ze9Zk2XZ(f-d=GL<>|?cB?T0-?n||VhJTSSe6PP;o??8NNZOeKLE~v$~@w}*H)*vU4 zYf(ubL)S!QEXGl>_`VM@7jh&j*;(Wci^cH)spqq0<<Be=XZFzehL{^m<S6~XG$4|r zx*pHq#rI4Bu_ok9YspcahdRcl;jfGNwB)G93;3d<@>HETU*=RSyp<fqx}AV$zT~J_ z$c$jE`h)ZGY_PkQ9LZ7fb#xH%D@aGojY^JUefK`>r`qTCJe712zUWzKOODEWkoT3H z!TJ#QAvubBL|(cD+_}`~qpVx?+hd>gIdGrZeUnFD@Cn?{AC3li;IZ%QqbN=F^PJMI zWIXKa26<rKiM>!K?u&h?WPGjbrXGU}>fTB&@4LCRp6i_Wu5;a6b&ma2rv{zKQD9ui zk-wUoy{t|Ri}mpVYTunKOTX)cI7<Ar>omkq3rFE+95~5QRgdEt{Eh1r5NkrtsBeBa zifhP&eZ)GkcO7fVQH>X{Lt^q|oj4!%JiS;^9Q9Y6b`-B|$<fQ@$q~~Zo|pYYylcr( z99<e6MEnYQor|Rj$<cfFK_AsVf%B~9ib?yRe#ueZgS;<yVg|TFv7$J7qw-qtokLpe z3+rZIVSDVeJ_qh+a^K|97kr4<_Y>kM-a#ICkP`bSs#E<uCvELd<Y-UUIaz04fb*4x zt?LQyZPxso4|%ZPdeq6@k}GFg-}$ZAcmW+1nTNB+zV*Pi6Y$Kpe(Mn<7o&U7wtnjo zyK|qUZ#{B~mVNI0*6X|$^f`oDa`Z8N>mLC}(cbuDn@8iwu*bsDFeqYSwu;T85lGBT znnz=xh{M9s2r6u%w#0cfjJmZRBS-c8_h9GI+wO)}ws|y+id!OK9*v{Io}_s+jEGxF z^Jp9u_TVmJ^Jo|mw`}uh9H~6IZ%^}R;NMJ`IsR%Mwf5RFkJ|9YpEQq}m`x|mqc*JZ si-dX9#B7>#eRLkRVU6E5kD7Q?Kh2~6{{Nn$JvR2!w_bJPfBn|~27<_BApigX literal 0 HcmV?d00001 diff --git a/themes/light/blue_radiobutton_13px.svg b/themes/light/blue_radiobutton_13px.svg new file mode 100644 index 00000000000..c7a1bf17d5b --- /dev/null +++ b/themes/light/blue_radiobutton_13px.svg @@ -0,0 +1,131 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="104" + viewBox="0 0 13 104" + width="13" + version="1.1" + id="svg108" + sodipodi:docname="blue_radiobutton_13px.svg" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_radiobutton_13px.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)"> + <metadata + id="metadata114"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs112" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="3840" + inkscape:window-height="2058" + id="namedview110" + showgrid="true" + inkscape:zoom="10.753916" + inkscape:cx="27.137008" + inkscape:cy="49.83377" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg108" + inkscape:document-rotation="0"> + <inkscape:grid + type="xygrid" + id="grid842" /> + </sodipodi:namedview> + <path + id="circle106" + d="M 10,58.500001 A 3.5000001,3.5000003 0 0 1 6.5000002,62 3.5000001,3.5000003 0 0 1 3.0000001,58.500001 3.5000001,3.5000003 0 0 1 6.5000002,55 3.5000001,3.5000003 0 0 1 10,58.500001 Z" + style="stroke-width:0.999996" /> + <ellipse + style="fill:none;stroke:#aeaeae;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843" + cx="6.5" + cy="6.5000014" + rx="6" + ry="6.0000014" /> + <ellipse + style="fill:none;stroke:#3096fa;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-3" + cx="6.5" + cy="19.500002" + rx="6" + ry="6.0000014" /> + <ellipse + style="fill:none;stroke:#2979ff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-6" + cx="6.5" + cy="32.5" + rx="6" + ry="6.0000014" /> + <ellipse + style="fill:none;stroke:#aeaeae;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-3-7" + cx="6.5" + cy="45.5" + rx="6" + ry="6.0000014" /> + <ellipse + style="fill:none;stroke:#aeaeae;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-5" + cx="6.5" + cy="58.5" + rx="6" + ry="6.0000014" /> + <ellipse + style="fill:none;stroke:#3096fa;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-3-3" + cx="6.5" + cy="71.500008" + rx="6" + ry="6.0000014" /> + <ellipse + style="fill:none;stroke:#2979ff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-6-5" + cx="6.5" + cy="84.500008" + rx="6" + ry="6.0000014" /> + <ellipse + style="fill:none;stroke:#aeaeae;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-3-7-6" + cx="6.5" + cy="97.500008" + rx="6" + ry="6.0000014" /> + <path + id="circle106-2" + d="M 10,71.500001 A 3.5000001,3.5000003 0 0 1 6.5,75 3.5000001,3.5000003 0 0 1 3,71.500001 3.5000001,3.5000003 0 0 1 6.5,68 3.5000001,3.5000003 0 0 1 10,71.500001 Z" + style="stroke-width:0.999996;fill:#3096fa;fill-opacity:1" /> + <path + id="circle106-2-9" + d="M 10,84.500001 A 3.5000001,3.5000003 0 0 1 6.5,88 3.5000001,3.5000003 0 0 1 3,84.500001 3.5000001,3.5000003 0 0 1 6.5,81 3.5000001,3.5000003 0 0 1 10,84.500001 Z" + style="stroke-width:0.999996;fill:#2979ff;fill-opacity:1" /> + <path + id="circle106-2-1" + d="M 10,97.500001 A 3.5000001,3.5000003 0 0 1 6.5,101 3.5000001,3.5000003 0 0 1 3,97.500001 3.5000001,3.5000003 0 0 1 6.5,94 3.5000001,3.5000003 0 0 1 10,97.500001 Z" + style="stroke-width:0.999996;fill:#aeaeae;fill-opacity:1" /> +</svg> diff --git a/themes/light/blue_radiobutton_16px.bmp b/themes/light/blue_radiobutton_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f7e3d4ca3bd09d235201e7e6a3135beb8239566b GIT binary patch literal 8246 zcmeHMTT5g|5Y~{m59_Y^2@-^zi#q2R*g#m8ut}bx_)GGT3(@g95CkDGUgu~Y@(0uz z^+gaI74j2w`~ykUS1);(nTO8z)j1v8W1mYPgk<A^n(k9oUv*V=HK$A8jJ)jakmn_S zGobfDB~WKaFMjd#c69vw+$VXr{A_J)<+r!D7izWIDd;Ak6O3ibED&LBY;1H@tJM|g zU1FRD4T0B9;vD=L%3yn$x~3hzLskb>_xASSq5Xkg4|Mn(m^NUuf;F~ErP4b@LOu*S z1Zn^4kbglLb-=IDk3hE{uNQh<%;!MLMzHZcF@YbKJ3Bi$=q-XjO+Ma7Y&esr{lNOO z;Fm!SP=R=iM<DCk2ER^S?1c-S?9uM-?y~^Tc$4r~)MdQTy#n1Jp6<VZzosrRz+QvS zK-&Lf%#+qXBp&fQ&^-Yyf+oqsI0{O_4+pxer!sOrfbrbO!F-I3Ibws@FLXU)Pds2Y zl~SF7ZTfKx{w)dfBknC_LH&STUEw<)*n0vU*4w7`!<XFu<+{LaL9cGsueJdh{kTAG zrkJ1o{r#sT?lpOVtP;kWs|5L2f^Gx$wEwIz=DFY0wawL7F0YE&1<)zzCZH2Fo-I>m z!;q&+`7Tw=tw8@0y3=YRI|N?05a-3rjL3?aW$K!Cd~Bu;c~zDABG11X`=AGQYtTC| zZGcx%6S*x_>X7q~wT9u#A@l<OVS6Gg=bt*hjf|Xs%=@8tq1Od=4(}?0<ot^tjI)@} zA=X94D><0Vj6~q>>}fy7GqaM@Vz!~i@^XHFJxatEGjjgbc+Q2czenG_kn@js#(TGx zeJ<yp@j~}XFxV&YKOJ7qzwB!<dyV{^8U7z9ub-3iuO{*ibXix-pPYZx*Jv_6Bj;c0 zNoq1P0L;14Ihe@KN88BA`43{h(De*`5B4?{Kb3d_KN!nxKt~FDD>Bv(>lC%lcRuRN zz9)XY!A9VRFS-9K>#|O<hi3iW*`Ob&#bS0!^7HNBQ$_OkdP-!h_0ah-S5afkM`j7S z4UqP~A$dlvo4U4nbG49fdCmgp6m%2NNo&n1Q)a`Er#A9kt%|$SsyLVJHFvtTIyj^% zIR7Bd+nzf^S<5RdQ`fX3SkJ9Pr>d4edag>Jyo>o~txDl5QhU|?lsxt0hdu3zQ){gi z4on;Ht<v@ia{k+u!mGCD{MPc^tET6)NSwFVoL_+bnCD+?zz_P+TpR3fdW8$FODy8O z1*r(S6&vt_u{77+9M)cByzuQkf89u|*rXp4-<mVaoMN3uYuzpQ@j6!#>l*$rmccj3 zfeT&PBlXjZXYk>hW`(iFuMc?>x%!&%V$St$xJT*nu8-%wdd@ZIO#EMWJ`d~}zS?|& z|JYCD&w)PcY7se|4DxplUMwE@`!%SK8RoCKGBAKWK9?M<y00<+J;nz1ukebobI)}> zL*Ij4eE&N-;oEEM<2n38Zd}$5b9%+S6)fuqb;?@THLRBVo<QeNY+x@W7UY9@mion9 z>X$W!I)%-;S--Rs*zo8Vbf%ae^#jg6h<i;QWr(>F#%ez}G9OrT3H~%dtYuPzd1kGf zy0$s*M7V1#;I8nWz5gRFek1suxe18h%vAS(=<yqYPl1(U@BhH?8xe)oeDMQ0o<)w! zpg-^bz#gT*N8bN|WxRTws4?>XpAsK={|Ej!#rl!=e_%&b;N|;|yjk!6z|Y6nNOk`Y z{5ZyV8xZ&9e{uhROU^&G%l;(w|8~@UF8Z$?)Zc^t|GrlITg3T~2N_cKgz({B|8IyB zr?&n-5o9RX`hP>5I7R#q`u{|bp%8Qa4K4dLssFd5eC}iaZ_f^Ul7CD8Z}-sWCiVYu zSS^d{|Ft~Ls4V?|8l2X#_5WIyX0-MHX>eM{*8gi+n$gz(r@?8RsQzEe<Hn@^KOXzo z|J(8-J^bI)|J&@7m!|)Z!fJk8|F3nDM*0!%|C2CbIeNu={eM`V^d9d2lk~&#aQ`2c zC%wzxb&UQ$Nk1$P_y1ve(mQ(a2mOB%M$6;+f2|WWO8q4C|B=|o{{J8O|6f%8$$z~6 Y``LNC|JNe_|CgeE@UOME<Ntqu01qSLIsgCw literal 0 HcmV?d00001 diff --git a/themes/light/blue_radiobutton_16px.svg b/themes/light/blue_radiobutton_16px.svg new file mode 100644 index 00000000000..c5e0cb548be --- /dev/null +++ b/themes/light/blue_radiobutton_16px.svg @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="128" + viewBox="0 0 16 128" + width="16" + version="1.1" + id="svg108" + sodipodi:docname="blue_radiobutton_16px.svg" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_radiobutton_16px.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)"> + <metadata + id="metadata114"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs112" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="3840" + inkscape:window-height="2058" + id="namedview110" + showgrid="true" + inkscape:zoom="10.753916" + inkscape:cx="40.759201" + inkscape:cy="63.767148" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg108" + inkscape:document-rotation="0"> + <inkscape:grid + type="xygrid" + id="grid842" /> + </sodipodi:namedview> + <path + id="circle106-3" + d="M 13,72.000002 A 5.0000002,5.0000004 0 0 1 8,77 5.0000002,5.0000004 0 0 1 3,72.000002 5.0000002,5.0000004 0 0 1 8,67 a 5.0000002,5.0000004 0 0 1 5,5.000002 z" + style="stroke-width:0.999996" /> + <circle + style="fill:none;stroke:#aeaeae;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843" + cx="8" + cy="8" + r="7.5" /> + <circle + style="fill:none;stroke:#3096fa;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-67" + cx="8" + cy="24" + r="7.5" /> + <circle + style="fill:none;stroke:#2979ff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-53" + cx="8" + cy="40" + r="7.5" /> + <circle + style="fill:none;stroke:#aeaeae;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-67-5" + cx="8" + cy="56" + r="7.5" /> + <circle + style="fill:none;stroke:#aeaeae;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-62" + cx="8" + cy="72" + r="7.5" /> + <circle + style="fill:none;stroke:#3096fa;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-67-9" + cx="8" + cy="88" + r="7.5" /> + <circle + style="fill:none;stroke:#2979ff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-53-1" + cx="8" + cy="104" + r="7.5" /> + <circle + style="fill:none;stroke:#aeaeae;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-67-5-2" + cx="8" + cy="120" + r="7.5" /> + <path + id="circle106-3-7" + d="M 13,88 A 5.0000002,5.0000004 0 0 1 8,92.999998 5.0000002,5.0000004 0 0 1 3,88 5.0000002,5.0000004 0 0 1 8,82.999998 5.0000002,5.0000004 0 0 1 13,88 Z" + style="stroke-width:0.999996;stroke:#3096fa;stroke-opacity:1;fill:#3096fa;fill-opacity:1" /> + <path + id="circle106-3-0" + d="m 13,104 a 5.0000002,5.0000004 0 0 1 -5,5 5.0000002,5.0000004 0 0 1 -5,-5 5.0000002,5.0000004 0 0 1 5,-5 5.0000002,5.0000004 0 0 1 5,5 z" + style="stroke-width:0.999996;fill:#2979ff;fill-opacity:1" /> + <path + id="circle106-3-9" + d="m 13,120 a 5.0000002,5.0000004 0 0 1 -5,5 5.0000002,5.0000004 0 0 1 -5,-5 5.0000002,5.0000004 0 0 1 5,-5 5.0000002,5.0000004 0 0 1 5,5 z" + style="stroke-width:0.999996;fill:#aeaeae;fill-opacity:1" /> +</svg> diff --git a/themes/light/blue_radiobutton_25px.bmp b/themes/light/blue_radiobutton_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8cc7b112e961b3d2ae9a45c0fa49597eb53f41d4 GIT binary patch literal 20054 zcmeHPOK()k6*iOb*pOryKmmi$&}}E<?m@hEqpWx+2?9+9Sg?x`i!2kr2Jk<KG=sa{ zND+I)!!}^pvB)OEZ5uCnEV03`o`G&7Rlcw8sp{&-t*YC*pl+#Lx6k7{bxu{CI`l2^ z$3Ok`&wcuH7=LqUJJ9}%wyCclfBX9S!T-;%lBNlPKlAhRTkqbzdmL^0-o1MZ=vUEd z(mzFCMmtWq08|@$a&qzu=w1{og+A0)F^1tMPoDg;4Xgv<)~#E+A;09{uH3nE=L)_b zo1LBA3H}!L{El`NZ3WGYp*k}&^SchPmISOrkYA?`o?oIrqm<fY1v)&Ck1?Hv>?`V_ zy(LZu(LRo!e9A%RG1_lB$)(ZY+jd~j89S~1Fpf@q=3(y_221AV9CT;V+&P~C=6B>9 zS?WRNk=Uua^8?vSLVp3dUmKmdxw*ZdSA}O{-qd4k3zRcD^dIsjZhs?P*5?{=z&~wd zVRs*BdTx9+gtrdeexr+L&JV}3O8ncmZ=aO!%SJ}xvnceYai`IMyI|tRbpScD-i~9u z73x9edt(F7=hLu!bk2{1agDN|mC);WV;vkZe9+DMi1NYMh2A}b0UGxY$Ikqq=K_4D z9{n*i%4BS>4F=ZEF429BzQ$+Jwiv#liA)wd9}R}ACF*`edqXVP_^sg^8tEC^s=<(a zLw)WkJs*f0)3yG9_8=p+8OyA}K<tkaL+0ZKpFtaU_!qjgan8YD9;NMRV4vbM>@68S z*Ezq7j2UC7ueR)uXM%g;=FOYi@T}(q{a=h7*ycWeN4bc$?&cH7pAnrkbADmWmxcBM zG@O*lhjt?TS)`oNVZOt6o(qi4u%TBfmCc|T-yTA)Deppu^K&1Kd#TPIv^ij$H}N4B z^}w4))3JB+F8R>e1D?)-(0$DDkRJQt`2l_Af5!Gb@T_kx2CxqsJLsRI+4*thTA!hJ z8kjmh)W>tjbI|CCKRRxZ=a`n!CYaB_+X4UddCu>o3tz7b*jfUAx54uDaxM--U*|IP z8pG4S2XBP-eYl-?T-O-;DYObOc%INE^Bemr={$cZ*GWHyrvAQvs~R0VuEuiHYAnBi zwu)9u`rK1Bo-b=Y<YMq#88zAW1@tcpra~WTt7<eitR}ySs^Qeg;BH_pIk+ooG=BxY z98>>1uv1MAZqYrzkL9jHZpD$Us)^rwYdH9Q2zu+H^AgWz6w77LhkW>O7CNs)?=5jU zsmS=>CUOIh)np-44F})0tI>fuYp2B@#u2<EKBM`0^=+TcB{DbX;L|K*8go9LpFs@2 zBj1dfdXRf0cB=0DsIh@dnm(F;p+@%E9HPEIuov{I=%mg20_Ch7_z!uBTTa(-dVP-N z*96DbaBB3+ea_sZ;R_veIGXFXc9QuaZ&mP53jVT{;o2R`FA6<?Z`bvLiJM*rX1#HL zjSo}=%hqrh)A@|}$v7}ScATTRYl2ZiFYz9*HJr0PVtp`j_pA-Qf3%Ox56N7N=WPvV zY2p2CuuX4kI5qL*F7e|vdgdR+{o5FW(6ZaGHJr>fZGS|2qiy_S(AIF4mfeP};gWo# zW5qp{%*Vu_t>Lh@9%#FnZRBhXrzY}81%vZ(BY7UMHJlpHUFgcjc;41<NgkyiI2XqA zrv%T|a5{gO+!F5#az~O^lKqi;rg6syPN>QLZFo-RWMshB2+2Orzl-w+``pbZ%-6}- z);RZEOZa|S)0nR&_uCpy?6_x%S)*>hNIAPEk?(+oa{+O}xn=3Y2R9>biEm^1hwXV+ z&(D46aWB<%&pgh2(3*Fdw-X<h+`OxOnaJ;H<UpJsPX0Ax@%8%rNb<kJ9KUycbM+L~ zZ^KUhxpL;mm1}**xKE=c@!>g|at<0jtZVvX;>NfyV;xT5j5&hw?P#3m_^#>TH`d+~ z&r^ft>-D+FI>Y3$28KJ=jb|O3{D_;6eE2R;uWRm~B>(d~;hZzSv9AjKB;{PaEYIqP z{aZJtzCK=`Do)p@3JV*h!fL%#s7e2{UK%QsPq{3(l;wH^?nS{;!1Xqfi>~25R1WS2 z=8}WEvQaKx*_bXK`{~ExPIYT=3wwUwC>5_lZpD$U{ygQc;Si5QkY5*_m$j)O{0<kW z;lQtzi)W$pO6yG(-V&!%?DY7_M_g*9;$!u%j5XZ94{V2DbH+}qKU}Ne>G;%2g?V-B z+ol>0<2;9$&r00&oNts1Gw`#yhJ#+MH1tT@DHWP(xO#c$lF(nM%0XMhefaUKy`Wcx z*LmKt-Y92cL;oRf;+E8KSa%rv8gbCu8t!B15BoqfbJH2WvEJ4{lnedFj?9mu-(1(9 zrVA%!oJ}=cy<A)rdI&$^!yl7_xlW*~*PGs7r9y>R8>Jyz!_}sW=QH7pKb#-q3+C&Z zV3g1&@xK0*t>NtYXv8AQ7sSTaaNIxI2K+N~fw{IdoS|j)1vYFA_j7q@7xhU)U*j|P zukq8+NYB_BH5}$zbU$J}zu~i*I%I1&L(7P-*O3_~^9}X6w$LZ@Q69229Afn#E56{_ z8m?aY`l!aheALT@8^X6W9Bf?Z#s>3&@q>9Zu~D4<R4SYjyrvosG&lFg%uAz&OZLYz z;(jU>PpF&UY%}q%T`$-gPWJgbu^+Or?&cHbYwB@*n)3^L`m$iXP(K{8HJsS-`-6Ny zITIu1J7B#OyhaUIIk*`#?OScC@USiKVtz2D`y3bK>g>5snGa0<pbhGQH!t{YHQa~m z#XaEZ9H`F^C;yr;`g*0$kHW0rzju9e^^oHa8$0NqyYu79wLW9)ry+0Rvz~Si8a?qx z$4$nxyfIans3V^--<b29-!;8dSQa_1izS|?2FusWxi~EG53MQk-y?62xcSJ3@A9~= zW&c!oo`}tw^vn+xo<Edx^|Cz6`-R@S)DA(z@0_3QyHvQ#-`SY6c{cEOgqrj-=vgD! z-{J5Za^`ob&}VH{MZ-V2Q`>^bq3i3z@8Qw!QX$S<x{l_<H$2Mqqv;Rq1mC4Xkp3^C z8H|{o{^+>Hyi0}b`Hc8x47P@YFW2y!eCoSY;Lmkw!`5)XKSmp{)$v^_@YlMuVQV<7 zG4H!n;B$Q%|FiVAh6}w*1^$~ZZP?%8Lhn+6|Da17wuVDq^1e$2{)H}W*cuKtyzf$h z&vnk4F3VgnAGrI&yl+f>mkRlPXzwEJaG%?M6JpIqze^Q6A%B<;I3E4Mn$7$!6^itq z^K&1K`=%~E_bKy%jt~0YyVTyhR4#+yr&q(Jhv+k};nE#%;dEKUwV;H*W~|}DfGHA@ zHC&2z967Rviv#mWMbvN}?KoCM4HpOGk&39{Jlb)rh#D>q$Ria|!+EshSP?Z`9FRvU zqK5Nmhgq^eVrsZBSc*i(8ZHGTo!n&&mk!v%k-Xcx57)a7*RnF2zv??8z58&@L6L8t z^L@CE4yO>ixeu2D<t6hzAnpi6-G}o61(>*Z!uyK6?~r;QE&vf^<Hw0jz)$X9rrd`M zf<y?wmuuon$NO**5J3^#Q8^|yI^Ks10z?Re?!!eu1Vuvk;er4W0-^hG5fDL<(0#Zd zK!iZ(K3oKZS0vdV;rno2kN^|wHu^qX0IDOK_s_5|GTn#k2$Vw9dAD~Tu6G|UWqlZO z?>?M~M0@`^--m1WHl32(%gA;gE*&kMljS~KI!c%mb002@;+KfI59ddS<A(0T#i976 zLigeP+Hu^_eYiLjzZ7$w+@I-qAI`5G#|_<wi$n2Ch3>=owd1&<`*3k6=~A*kg7@Ll z5yG4-_u;~5?GoMGhigYkr}XZ_6?*sK(wB$j^xmb~P_#Yt-lZlX>Ag#BTN*(^?_Fvz lL`?#{cd1R`@P6sNOZA4wGJEe*Z74cE^!{&=|DXR`<bSUMKcWBt literal 0 HcmV?d00001 diff --git a/themes/light/blue_radiobutton_25px.svg b/themes/light/blue_radiobutton_25px.svg new file mode 100644 index 00000000000..c41e37620a4 --- /dev/null +++ b/themes/light/blue_radiobutton_25px.svg @@ -0,0 +1,131 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="200" + viewBox="0 0 25 200" + width="25" + version="1.1" + id="svg108" + sodipodi:docname="blue_radiobutton_25px.svg" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_radiobutton_25px.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)"> + <metadata + id="metadata114"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs112" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="3840" + inkscape:window-height="2058" + id="namedview110" + showgrid="true" + inkscape:zoom="3.8020835" + inkscape:cx="78.030601" + inkscape:cy="57.301732" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg108" + inkscape:document-rotation="0"> + <inkscape:grid + type="xygrid" + id="grid842" /> + </sodipodi:namedview> + <ellipse + style="fill:none;stroke:#aeaeae;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843" + cx="12.5" + cy="12.499995" + rx="11.5" + ry="11.499995" /> + <ellipse + style="fill:none;stroke:#3096fa;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-3" + cx="12.5" + cy="37.499996" + rx="11.5" + ry="11.499995" /> + <ellipse + style="fill:none;stroke:#2979ff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-6" + cx="12.5" + cy="62.499996" + rx="11.5" + ry="11.499995" /> + <ellipse + style="fill:none;stroke:#aeaeae;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-3-7" + cx="12.5" + cy="87.5" + rx="11.5" + ry="11.499995" /> + <ellipse + style="fill:none;stroke:#aeaeae;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-5" + cx="12.5" + cy="112.49999" + rx="11.5" + ry="11.499995" /> + <ellipse + style="fill:none;stroke:#3096fa;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-3-3" + cx="12.5" + cy="137.5" + rx="11.5" + ry="11.499995" /> + <ellipse + style="fill:none;stroke:#2979ff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-6-5" + cx="12.5" + cy="162.5" + rx="11.5" + ry="11.499995" /> + <ellipse + style="fill:none;stroke:#aeaeae;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path843-3-7-6" + cx="12.5" + cy="187.5" + rx="11.5" + ry="11.499995" /> + <path + id="circle106-3-2" + d="M 20,112.5 A 7.5000003,7.5000006 0 0 1 12.5,120 7.5000003,7.5000006 0 0 1 4.9999999,112.5 7.5000003,7.5000006 0 0 1 12.5,105 7.5000003,7.5000006 0 0 1 20,112.5 Z" + style="stroke-width:0.999996" /> + <path + id="circle106-3-2-9" + d="M 20,137.5 A 7.5000003,7.5000006 0 0 1 12.5,145 7.5000003,7.5000006 0 0 1 5,137.5 7.5000003,7.5000006 0 0 1 12.5,130 7.5000003,7.5000006 0 0 1 20,137.5 Z" + style="stroke-width:0.999996;fill:#3096fa;fill-opacity:1" /> + <path + id="circle106-3-2-1" + d="M 20,162.5 A 7.5000003,7.5000006 0 0 1 12.5,170 7.5000003,7.5000006 0 0 1 5,162.5 7.5000003,7.5000006 0 0 1 12.5,155 7.5000003,7.5000006 0 0 1 20,162.5 Z" + style="stroke-width:0.999996;fill:#2979ff;fill-opacity:1" /> + <path + id="circle106-3-2-1-2" + d="M 20,187.5 A 7.5000003,7.5000006 0 0 1 12.5,195 7.5000003,7.5000006 0 0 1 5,187.5 7.5000003,7.5000006 0 0 1 12.5,180 7.5000003,7.5000006 0 0 1 20,187.5 Z" + style="stroke-width:0.999996;stroke:none;stroke-opacity:1;fill:#aeaeae;fill-opacity:1" /> +</svg> diff --git a/themes/light/light.rc b/themes/light/light.rc index dccda341b7c..ea138423e8e 100644 --- a/themes/light/light.rc +++ b/themes/light/light.rc @@ -179,8 +179,159 @@ BLUE_INI TEXTFILE "\r\n; Flat menus\r\n" "FlatMenus = true\r\n" + +"\r\n; Button\r\n" +"[Button.Pushbutton]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 8, 8, 8, 8\r\n" +"SizingType = Stretch\r\n" +"ContentMargins = 3, 3, 3, 3\r\n" +"ImageFile = blue_button.bmp\r\n" +"ImageCount = 6\r\n" +"ImageLayout = Vertical\r\n" +"TextColor = 0 0 0\r\n" +"MinSize = 10, 5\r\n" + +"[Button.Pushbutton(Pressed)]\r\n" +"TextColor = 255 255 255\r\n" + +"[Button.Pushbutton(Disabled)]\r\n" +"TextColor = 166 166 166\r\n" + +"[Button.Checkbox]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = TrueSize\r\n" +"SizingMargins = 0, 0, 0, 0\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 12\r\n" +"MirrorImage = False\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"Transparent = True\r\n" +"ImageFile1 = blue_checkbox_13px.bmp\r\n" +"ImageFile2 = blue_checkbox_16px.bmp\r\n" +"ImageFile3 = blue_checkbox_25px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[Button.Checkbox(Checkeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Checkbox(Uncheckeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Checkbox(Mixeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Radiobutton]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" +"SizingType = TrueSize\r\n" +"SizingMargins = 0, 0, 0, 0\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 8\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_radiobutton_13px.bmp\r\n" +"ImageFile2 = blue_radiobutton_16px.bmp\r\n" +"ImageFile3 = blue_radiobutton_25px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[Button.Radiobutton(Checkeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Radiobutton(Uncheckeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Groupbox]\r\n" +"TextColor = 0 0 0\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_groupbox.bmp\r\n" +"BorderOnly = True\r\n" +"Transparent = True\r\n" + +"[Button.Commandlink]\r\n" +"BgType = ImageFile\r\n" +"BorderSize = 0\r\n" +"ContentMargins = 7, 7, 10, 10\r\n" +"Font = Tahoma, 10\r\n" +"BodyFont = Tahoma, 8\r\n" +"ImageFile = blue_commandlink.bmp\r\n" +"ImageCount = 6\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Stretch\r\n" +"SizingMargins = 5, 5, 24, 24\r\n" +"Transparent = True\r\n" +"TextColor = 0 0 0\r\n" +"MinSize = 10, 5\r\n" + +"[Button.Commandlink(Hot)]\r\n" +"TextColor = 48 150 250\r\n" + +"[Button.Commandlink(Pressed)]\r\n" +"TextColor = 41 121 255\r\n" + +"[Button.Commandlink(Disabled)]\r\n" +"TextColor = 174 174 174\r\n" + +"[Button.CommandlinkGlyph]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageCount = 5\r\n" +"Transparent = True\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"Transparent = True\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_commandlink_glyph_30px.bmp\r\n" +"ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 144\r\n" } +/* All following bitmaps are of 32-bit ARGB format */ + +/* Button */ +/* @makedep: blue_button.bmp */ +BLUE_BUTTON_BMP BITMAP "blue_button.bmp" + +/* @makedep: blue_checkbox_13px.bmp */ +BLUE_CHECKBOX_13PX_BMP BITMAP "blue_checkbox_13px.bmp" + +/* @makedep: blue_checkbox_16px.bmp */ +BLUE_CHECKBOX_16PX_BMP BITMAP "blue_checkbox_16px.bmp" + +/* @makedep: blue_checkbox_25px.bmp */ +BLUE_CHECKBOX_25PX_BMP BITMAP "blue_checkbox_25px.bmp" + +/* @makedep: blue_radiobutton_13px.bmp */ +BLUE_RADIOBUTTON_13PX_BMP BITMAP "blue_radiobutton_13px.bmp" + +/* @makedep: blue_radiobutton_16px.bmp */ +BLUE_RADIOBUTTON_16PX_BMP BITMAP "blue_radiobutton_16px.bmp" + +/* @makedep: blue_radiobutton_25px.bmp */ +BLUE_RADIOBUTTON_25PX_BMP BITMAP "blue_radiobutton_25px.bmp" + +/* @makedep: blue_groupbox.bmp */ +BLUE_GROUPBOX_BMP BITMAP "blue_groupbox.bmp" + +/* @makedep: blue_commandlink.bmp */ +BLUE_COMMANDLINK_BMP BITMAP "blue_commandlink.bmp" + +/* @makedep: blue_commandlink_glyph_30px.bmp */ +BLUE_COMMANDLINK_GLYPH_30PX_BMP BITMAP "blue_commandlink_glyph_30px.bmp" + +/* @makedep: blue_commandlink_glyph_45px.bmp */ +BLUE_COMMANDLINK_GLYPH_45PX_BMP BITMAP "blue_commandlink_glyph_45px.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH 2/6] themes/light: Add Blue stub visual style.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Blue is a visual style that uses blue as the main color and contains bitmaps for UI controls. Its system color is the same as Classic Blue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- themes/light/light.rc | 52 ++++++++++++++++++++++++++++++++++++++++ themes/light/resources.h | 7 +++--- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/themes/light/light.rc b/themes/light/light.rc index e0ace9cb52e..dccda341b7c 100644 --- a/themes/light/light.rc +++ b/themes/light/light.rc @@ -25,12 +25,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* Theme color display names */ STRINGTABLE { + IDS_COLOR_DISPLAY_NAME_BLUE "Blue" IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE "Classic Blue" } /* Theme color tooltips */ STRINGTABLE { + IDS_COLOR_TOOLTIP_BLUE "Blue" IDS_COLOR_TOOLTIP_CLASSIC_BLUE "Classic Blue" } @@ -54,6 +56,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Theme color names */ 1 COLORNAMES { +"Blue\0" "Classic Blue\0" "\0" } @@ -68,6 +71,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Theme ini files */ 1 FILERESNAMES { +"BLUE_INI\0" "CLASSIC_BLUE_INI\0" "\0" } @@ -129,6 +133,54 @@ CLASSIC_BLUE_INI TEXTFILE "FlatMenus = true\r\n" } +/* Blue theme */ +BLUE_INI TEXTFILE +{ +"[Globals]\r\n" +"EdgeLightColor = 255 255 255\r\n" +"EdgeHighLightColor = 255 255 255\r\n" +"EdgeShadowColor = 189 189 189\r\n" +"EdgeDkShadowColor = 158 158 158\r\n" +"EdgeFillColor = 255 255 255\r\n" + +"\r\n[SysMetrics]\r\n" +"; System colors\r\n" +"Scrollbar = 255 255 255\r\n" +"Background = 37 111 149\r\n" +"ActiveCaption = 50 150 250\r\n" +"InactiveCaption = 245 245 245\r\n" +"Menu = 255 255 255\r\n" +"Window = 255 255 255\r\n" +"WindowFrame = 158 158 158\r\n" +"MenuText = 0 0 0\r\n" +"WindowText = 0 0 0\r\n" +"CaptionText = 0 0 0\r\n" +"ActiveBorder = 255 255 255\r\n" +"InactiveBorder = 255 255 255\r\n" +"AppWorkSpace = 128 128 128\r\n" +"Highlight = 48 150 250\r\n" +"HighlightText = 255 255 255\r\n" +"BtnFace = 245 245 245\r\n" +"BtnShadow = 166 166 166\r\n" +"GrayText = 166 166 166\r\n" +"BtnText = 0 0 0\r\n" +"InactiveCaptionText = 100 100 100\r\n" +"BtnHighlight = 255 255 255\r\n" +"DkShadow3d = 106 106 106\r\n" +"Light3d = 227 227 227\r\n" +"InfoText = 0 0 0\r\n" +"InfoBk = 255 255 255\r\n" +"ButtonAlternateFace = 255 255 255\r\n" +"HotTracking = 224 224 224\r\n" +"GradientActiveCaption = 50 150 250\r\n" +"GradientInactiveCaption = 245 245 245\r\n" +"MenuHilight = 48 150 250\r\n" +"MenuBar = 255 255 255\r\n" + +"\r\n; Flat menus\r\n" +"FlatMenus = true\r\n" +} + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" diff --git a/themes/light/resources.h b/themes/light/resources.h index ef75da9f628..c37ef2140f1 100644 --- a/themes/light/resources.h +++ b/themes/light/resources.h @@ -18,8 +18,9 @@ #include <winnt.h> -#define IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE 1000 -#define IDS_COLOR_TOOLTIP_CLASSIC_BLUE 2000 +#define IDS_COLOR_DISPLAY_NAME_BLUE 1000 +#define IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE 1001 +#define IDS_COLOR_TOOLTIP_BLUE 2000 +#define IDS_COLOR_TOOLTIP_CLASSIC_BLUE 2001 #define IDS_SIZE_DISPLAY_NAME_NORMAL 3000 #define IDS_SIZE_TOOLTIP_NORMAL 4000 - -- 2.30.2

1 0

[PATCH] ntoskrnl.exe: Implement Ke(Initialize|Insert|Remove)DeviceQueue.
by Rémi Bernon 22 Jun '21

22 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- MSDN says that the cancel spinlock has to be held whenever these device queues are used, when setting cancel routines, but it's not clear to me why, as IRP cancellation has apparently no effect on these functions behavior (I initially thought they should check and not queue cancelled IRPs, but it looks like they don't). dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 +- dlls/ntoskrnl.exe/sync.c | 41 ++++++++++++ dlls/ntoskrnl.exe/tests/driver.c | 96 +++++++++++++++++++++++++++++ include/ddk/wdm.h | 4 ++ 4 files changed, 144 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 5fdaa922f45..c1244a42146 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -567,7 +567,7 @@ @ stub KeI386SetGdtSelector @ stub KeIcacheFlushCount @ stdcall KeInitializeApc(ptr ptr long ptr ptr ptr long ptr) -@ stub KeInitializeDeviceQueue +@ stdcall KeInitializeDeviceQueue(ptr) @ stdcall KeInitializeDpc(ptr ptr ptr) @ stdcall KeInitializeEvent(ptr long long) @ stub KeInitializeInterrupt @@ -579,7 +579,7 @@ @ stdcall KeInitializeTimer(ptr) @ stdcall KeInitializeTimerEx(ptr long) @ stub KeInsertByKeyDeviceQueue -@ stub KeInsertDeviceQueue +@ stdcall KeInsertDeviceQueue(ptr ptr) @ stub KeInsertHeadQueue @ stdcall KeInsertQueue(ptr ptr) @ stub KeInsertQueueApc @@ -617,7 +617,7 @@ @ stdcall KeReleaseSpinLockFromDpcLevel(ptr) @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy -@ stub KeRemoveDeviceQueue +@ stdcall KeRemoveDeviceQueue(ptr) @ stub KeRemoveEntryDeviceQueue @ stub KeRemoveQueue @ stub KeRemoveQueueDpc diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 445c8d890ab..9063608be4a 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1362,3 +1362,44 @@ BOOLEAN WINAPI KeSetTimer(KTIMER *timer, LARGE_INTEGER duetime, KDPC *dpc) return KeSetTimerEx(timer, duetime, 0, dpc); } + +void WINAPI KeInitializeDeviceQueue( KDEVICE_QUEUE *queue ) +{ + TRACE( "queue %p.\n", queue ); + + KeInitializeSpinLock( &queue->Lock ); + InitializeListHead( &queue->DeviceListHead ); + queue->Busy = FALSE; + queue->Type = IO_TYPE_DEVICE_QUEUE; + queue->Size = sizeof(*queue); +} + +BOOLEAN WINAPI KeInsertDeviceQueue( KDEVICE_QUEUE *queue, KDEVICE_QUEUE_ENTRY *entry ) +{ + KIRQL irql; + + TRACE( "queue %p, entry %p.\n", queue, entry ); + + KeAcquireSpinLock( &queue->Lock, &irql ); + if ((entry->Inserted = queue->Busy)) InsertTailList( &queue->DeviceListHead, &entry->DeviceListEntry ); + queue->Busy = TRUE; + KeReleaseSpinLock( &queue->Lock, irql ); + + return entry->Inserted; +} + +KDEVICE_QUEUE_ENTRY * WINAPI KeRemoveDeviceQueue( KDEVICE_QUEUE *queue ) +{ + LIST_ENTRY *entry = NULL; + KIRQL irql; + + TRACE( "queue %p.\n", queue ); + + KeAcquireSpinLock( &queue->Lock, &irql ); + if (IsListEmpty( &queue->DeviceListHead )) queue->Busy = FALSE; + else entry = RemoveHeadList( &queue->DeviceListHead ); + KeReleaseSpinLock( &queue->Lock, irql ); + + if (!entry) return NULL; + return CONTAINING_RECORD( entry, KDEVICE_QUEUE_ENTRY, DeviceListEntry ); +} diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index f1c72d8fdaf..3446dc8e529 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -141,6 +141,101 @@ static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) IoFreeIrp(irp); } +static int cancel_queue_cnt; + +static void WINAPI cancel_queued_irp(DEVICE_OBJECT *device, IRP *irp) +{ + IoReleaseCancelSpinLock(irp->CancelIrql); + ok(irp->Cancel == TRUE, "Cancel = %x\n", irp->Cancel); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); + irp->IoStatus.Status = STATUS_CANCELLED; + irp->IoStatus.Information = 0; + cancel_queue_cnt++; +} + +static void test_queue(void) +{ + KDEVICE_QUEUE_ENTRY *entry; + KDEVICE_QUEUE queue; + BOOLEAN ret; + KIRQL irql; + IRP *irp; + + irp = IoAllocateIrp(1, FALSE); + + memset(&queue, 0xcd, sizeof(queue)); + KeInitializeDeviceQueue(&queue); + ok(!queue.Busy, "unexpected Busy state\n"); + ok(queue.Size == sizeof(queue), "unexpected Size %x\n", queue.Size); + ok(queue.Type == IO_TYPE_DEVICE_QUEUE, "unexpected Type %x\n", queue.Type); + + ret = KeInsertDeviceQueue(&queue, &irp->Tail.Overlay.DeviceQueueEntry); + ok(!ret, "expected KeInsertDeviceQueue to not insert IRP\n"); + ok(queue.Busy, "expected Busy state\n"); + + entry = KeRemoveDeviceQueue(&queue); + ok(!entry, "expected KeRemoveDeviceQueue to return NULL\n"); + ok(!queue.Busy, "unexpected Busy state\n"); + + ret = KeInsertDeviceQueue(&queue, &irp->Tail.Overlay.DeviceQueueEntry); + ok(!ret, "expected KeInsertDeviceQueue to not insert IRP\n"); + ok(queue.Busy, "expected Busy state\n"); + + ret = KeInsertDeviceQueue(&queue, &irp->Tail.Overlay.DeviceQueueEntry); + ok(ret, "expected KeInsertDeviceQueue to insert IRP\n"); + ok(queue.Busy, "expected Busy state\n"); + + entry = KeRemoveDeviceQueue(&queue); + ok(entry != NULL, "expected KeRemoveDeviceQueue to return non-NULL\n"); + ok(CONTAINING_RECORD(entry, IRP, Tail.Overlay.DeviceQueueEntry) == irp, "unexpected IRP returned\n"); + ok(queue.Busy, "expected Busy state\n"); + + entry = KeRemoveDeviceQueue(&queue); + ok(entry == NULL, "expected KeRemoveDeviceQueue to return NULL\n"); + ok(!queue.Busy, "unexpected Busy state\n"); + + IoCancelIrp(irp); + ok(irp->Cancel, "unexpected non-cancelled state\n"); + + ret = KeInsertDeviceQueue(&queue, &irp->Tail.Overlay.DeviceQueueEntry); + ok(!ret, "expected KeInsertDeviceQueue to not insert IRP\n"); + ok(queue.Busy, "expected Busy state\n"); + ret = KeInsertDeviceQueue(&queue, &irp->Tail.Overlay.DeviceQueueEntry); + ok(ret, "expected KeInsertDeviceQueue to insert IRP\n"); + ok(queue.Busy, "expected Busy state\n"); + + entry = KeRemoveDeviceQueue(&queue); + ok(entry != NULL, "expected KeRemoveDeviceQueue to return non-NULL\n"); + ok(CONTAINING_RECORD(entry, IRP, Tail.Overlay.DeviceQueueEntry) == irp, "unexpected IRP returned\n"); + ok(queue.Busy, "expected Busy state\n"); + ok(irp->Cancel, "unexpected non-cancelled state\n"); + + IoFreeIrp(irp); + + irp = IoAllocateIrp(1, FALSE); + + IoAcquireCancelSpinLock(&irql); + IoSetCancelRoutine(irp, cancel_queued_irp); + IoReleaseCancelSpinLock(irql); + + ret = KeInsertDeviceQueue(&queue, &irp->Tail.Overlay.DeviceQueueEntry); + ok(ret, "expected KeInsertDeviceQueue to insert IRP\n"); + ok(queue.Busy, "expected Busy state\n"); + + IoCancelIrp(irp); + ok(irp->Cancel, "unexpected non-cancelled state\n"); + ok(cancel_queue_cnt, "expected cancel routine to be called\n"); + + entry = KeRemoveDeviceQueue(&queue); + ok(entry != NULL, "expected KeRemoveDeviceQueue to return non-NULL\n"); + ok(CONTAINING_RECORD(entry, IRP, Tail.Overlay.DeviceQueueEntry) == irp, "unexpected IRP returned\n"); + ok(irp->Cancel, "unexpected non-cancelled state\n"); + ok(cancel_queue_cnt, "expected cancel routine to be called\n"); + ok(queue.Busy, "expected Busy state\n"); + + IoFreeIrp(irp); +} + static void test_mdl_map(void) { char buffer[20] = "test buffer"; @@ -2126,6 +2221,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_init_funcs(); test_load_driver(); test_sync(); + test_queue(); test_version(); test_stack_callout(); test_lookaside_list(); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 447833c4bc9..9bc3305471c 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -397,6 +397,7 @@ typedef struct _WAIT_CONTEXT_BLOCK { #define IO_TYPE_ERROR_LOG 0x0b #define IO_TYPE_ERROR_MESSAGE 0x0c #define IO_TYPE_DEVICE_OBJECT_EXTENSION 0x0d +#define IO_TYPE_DEVICE_QUEUE 0x14 typedef struct _DEVICE_OBJECT { CSHORT Type; @@ -1750,6 +1751,7 @@ void WINAPI KeEnterCriticalRegion(void); void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE,PVOID); ULONG WINAPI KeGetCurrentProcessorNumber(void); PKTHREAD WINAPI KeGetCurrentThread(void); +void WINAPI KeInitializeDeviceQueue(KDEVICE_QUEUE*); void WINAPI KeInitializeDpc(KDPC*,PKDEFERRED_ROUTINE,void*); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN); void WINAPI KeInitializeMutex(PRKMUTEX,ULONG); @@ -1757,6 +1759,7 @@ void WINAPI KeInitializeSemaphore(PRKSEMAPHORE,LONG,LONG); void WINAPI KeInitializeSpinLock(KSPIN_LOCK*); void WINAPI KeInitializeTimerEx(PKTIMER,TIMER_TYPE); void WINAPI KeInitializeTimer(KTIMER*); +BOOLEAN WINAPI KeInsertDeviceQueue(KDEVICE_QUEUE*,KDEVICE_QUEUE_ENTRY*); void WINAPI KeLeaveCriticalRegion(void); ULONG WINAPI KeQueryActiveProcessorCountEx(USHORT); KAFFINITY WINAPI KeQueryActiveProcessors(void); @@ -1769,6 +1772,7 @@ LONG WINAPI KeReleaseMutex(PRKMUTEX,BOOLEAN); LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); void WINAPI KeReleaseSpinLock(KSPIN_LOCK*,KIRQL); void WINAPI KeReleaseSpinLockFromDpcLevel(KSPIN_LOCK*); +KDEVICE_QUEUE_ENTRY * WINAPI KeRemoveDeviceQueue(KDEVICE_QUEUE*); LONG WINAPI KeResetEvent(PRKEVENT); void WINAPI KeRevertToUserAffinityThread(void); void WINAPI KeRevertToUserAffinityThreadEx(KAFFINITY affinity); -- 2.31.0

2 4

[PATCH vkd3d v2 6/6] vkd3d-shader: Track register size in components.
by Zebediah Figura 22 Jun '21

22 Jun '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Fix handling of matrices and arrays in hlsl_type_clone(). libs/vkd3d-shader/hlsl.c | 8 ++++---- libs/vkd3d-shader/hlsl.y | 10 +++++----- libs/vkd3d-shader/hlsl_codegen.c | 33 ++++++++++++++++---------------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c36fe602..721458eb 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -111,9 +111,9 @@ struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hls type->dimx = dimx; type->dimy = dimy; if (type_class == HLSL_CLASS_MATRIX) - type->reg_size = hlsl_type_is_row_major(type) ? dimy : dimx; + type->reg_size = (hlsl_type_is_row_major(type) ? dimy : dimx) * 4; else - type->reg_size = 1; + type->reg_size = 4; list_add_tail(&ctx->types, &type->entry); @@ -352,11 +352,11 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, u } case HLSL_CLASS_MATRIX: - type->reg_size = hlsl_type_is_row_major(type) ? type->dimy : type->dimx; + type->reg_size = (hlsl_type_is_row_major(type) ? type->dimy : type->dimx) * 4; break; default: - type->reg_size = 1; + type->reg_size = 4; break; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4355b9a2..828b19a4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -567,7 +567,7 @@ static struct hlsl_ir_load *add_record_load(struct hlsl_ctx *ctx, struct list *i { struct hlsl_ir_constant *c; - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, loc))) + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, loc))) return NULL; list_add_tail(instrs, &c->node.entry); @@ -601,7 +601,7 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in return NULL; } - if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size * 4, loc))) + if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size, loc))) return NULL; list_add_tail(instrs, &c->node.entry); if (!(mul = hlsl_new_binary_expr(ctx, HLSL_IR_BINOP_MUL, index, &c->node))) @@ -663,7 +663,7 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ *modifiers &= ~HLSL_TYPE_MODIFIERS_MASK; if (new_type->type == HLSL_CLASS_MATRIX) - new_type->reg_size = hlsl_type_is_row_major(new_type) ? new_type->dimy : new_type->dimx; + new_type->reg_size = (hlsl_type_is_row_major(new_type) ? new_type->dimy : new_type->dimx) * 4; return new_type; } @@ -738,7 +738,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, type->modifiers, v->loc); else - type->reg_size = hlsl_type_is_row_major(type) ? type->dimy : type->dimx; + type->reg_size = (hlsl_type_is_row_major(type) ? type->dimy : type->dimx) * 4; if ((type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR) && (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)) @@ -1328,7 +1328,7 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru if (hlsl_type_component_count(field->type) == hlsl_type_component_count(node->data_type)) { - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, node->loc))) + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, node->loc))) break; list_add_tail(list, &c->node.entry); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 068fb167..dcd127ea 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -93,7 +93,7 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; list_add_head(instrs, &load->node.entry); - if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) + if (!(offset = hlsl_new_uint_constant(ctx, field_offset, var->loc))) return; list_add_after(&load->node.entry, &offset->node.entry); @@ -160,7 +160,7 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct list_add_before(&var->scope_entry, &output->scope_entry); list_add_tail(&ctx->extern_vars, &output->extern_entry); - if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) + if (!(offset = hlsl_new_uint_constant(ctx, field_offset, var->loc))) return; list_add_tail(instrs, &offset->node.entry); @@ -291,7 +291,7 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr struct hlsl_ir_load *field_load; struct hlsl_ir_constant *c; - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, instr->loc))) + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, instr->loc))) return false; list_add_before(&instr->entry, &c->node.entry); @@ -714,9 +714,8 @@ static bool is_range_available(struct liveness *liveness, unsigned int first_wri } static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liveness, - unsigned int first_write, unsigned int last_read, unsigned int reg_count) + unsigned int first_write, unsigned int last_read, unsigned int component_count) { - const unsigned int component_count = reg_count * 4; unsigned int i, component_idx; struct hlsl_reg ret = {0}; @@ -738,9 +737,9 @@ static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liv static const char *debug_register(char class, struct hlsl_reg reg, const struct hlsl_type *type) { - if (type->reg_size > 1) + if (type->reg_size > 4) return vkd3d_dbg_sprintf("%c%u-%c%u", class, reg.id, class, - reg.id + type->reg_size - 1); + reg.id + (type->reg_size / 4) - 1); return vkd3d_dbg_sprintf("%c%u%s", class, reg.id, debug_hlsl_writemask(reg.writemask)); } @@ -751,7 +750,7 @@ static void allocate_variable_temp_register(struct hlsl_ctx *ctx, struct hlsl_ir if (!var->reg.allocated && var->last_read) { - if (var->data_type->reg_size > 1) + if (var->data_type->reg_size > 4) var->reg = allocate_range(ctx, liveness, var->first_write, var->last_read, var->data_type->reg_size); else @@ -770,7 +769,7 @@ static void allocate_temp_registers_recurse(struct hlsl_ctx *ctx, struct list *i { if (!instr->reg.allocated && instr->last_read) { - if (instr->data_type->reg_size > 1) + if (instr->data_type->reg_size > 4) instr->reg = allocate_range(ctx, liveness, instr->index, instr->last_read, instr->data_type->reg_size); else @@ -832,23 +831,23 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct list * { struct hlsl_ir_constant *constant = hlsl_ir_constant(instr); const struct hlsl_type *type = instr->data_type; + unsigned int x, y, i, writemask, end_reg; unsigned int reg_size = type->reg_size; - unsigned int x, y, i, writemask; - if (reg_size > 1) + if (reg_size > 4) constant->reg = allocate_range(ctx, liveness, 1, UINT_MAX, reg_size); else constant->reg = allocate_register(ctx, liveness, 1, UINT_MAX, type->dimx); TRACE("Allocated constant @%u to %s.\n", instr->index, debug_register('c', constant->reg, type)); if (!hlsl_array_reserve(ctx, (void **)&defs->values, &defs->size, - constant->reg.id + reg_size, sizeof(*defs->values))) + constant->reg.id + reg_size / 4, sizeof(*defs->values))) return; - if (constant->reg.id + reg_size > defs->count) + end_reg = constant->reg.id + reg_size / 4; + if (end_reg > defs->count) { - memset(&defs->values[defs->count], 0, - sizeof(*defs->values) * (constant->reg.id + reg_size - defs->count)); - defs->count = constant->reg.id + reg_size; + memset(&defs->values[defs->count], 0, sizeof(*defs->values) * (end_reg - defs->count)); + defs->count = end_reg; } assert(type->type <= HLSL_CLASS_LAST_NUMERIC); @@ -931,7 +930,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi { if (var->is_uniform && var->last_read) { - if (var->data_type->reg_size > 1) + if (var->data_type->reg_size > 4) var->reg = allocate_range(ctx, &liveness, 1, UINT_MAX, var->data_type->reg_size); else { -- 2.32.0

1 0

[PATCH] ntoskrnl.exe: Send IRP_MN_SURPRISE_REMOVAL to the device stack first.
by Rémi Bernon 22 Jun '21

22 Jun '21

Instead of sending both IRP_MN_SURPRISE_REMOVAL and IRP_MN_REMOVE_DEVICE to all children first, which may have pending IRPs sent to their parent PDO driver, which need to be cancelled before IRP_MN_REMOVE_DEVICE can complete. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/pnp.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index e425712d738..0b4e4ef4613 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -350,12 +350,26 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) start_device( device, set, &sp_device ); } +static void send_surprise_removal( DEVICE_OBJECT *device ) +{ + struct wine_device *impl = CONTAINING_RECORD(device, struct wine_device, device_obj); + ULONG i; + + if (impl->children) + for (i = 0; i < impl->children->Count; ++i) + send_surprise_removal( impl->children->Objects[i] ); + + send_pnp_irp( device, IRP_MN_SURPRISE_REMOVAL ); +} + static void remove_device( DEVICE_OBJECT *device ) { struct wine_device *wine_device = CONTAINING_RECORD(device, struct wine_device, device_obj); TRACE("Removing device %p.\n", device); + send_surprise_removal( device ); + if (wine_device->children) { ULONG i; @@ -363,7 +377,6 @@ static void remove_device( DEVICE_OBJECT *device ) remove_device( wine_device->children->Objects[i] ); } - send_pnp_irp( device, IRP_MN_SURPRISE_REMOVAL ); send_pnp_irp( device, IRP_MN_REMOVE_DEVICE ); } -- 2.31.0

2 2

[PATCH] devenum: Register IEEE float for Direct Sound default device.
by Rémi Bernon 22 Jun '21

22 Jun '21

This fixes Planet Coaster missing intro audio, which outputs IEEE float audio and for which quartz is looking for a filter. It ends up trying ACM filters, but that doesn't support IEEE float to PCM conversion. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/devenum/createdevenum.c | 12 +++++---- dlls/devenum/tests/devenum.c | 49 ++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 8e9cf56eb09..97855b12b81 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -481,7 +481,7 @@ static BOOL CALLBACK register_dsound_devices(GUID *guid, const WCHAR *desc, cons static const WCHAR defaultW[] = L"Default DirectSound Device"; IPropertyBag *prop_bag = NULL; REGFILTERPINS2 rgpins = {0}; - REGPINTYPES rgtypes = {0}; + REGPINTYPES rgtypes[2] = {}; REGFILTER2 rgf = {0}; WCHAR clsid[CHARS_IN_GUID]; VARIANT var; @@ -512,10 +512,12 @@ static BOOL CALLBACK register_dsound_devices(GUID *guid, const WCHAR *desc, cons rgf.rgPins2 = &rgpins; rgpins.dwFlags = REG_PINFLAG_B_RENDERER; /* FIXME: native registers many more formats */ - rgpins.nMediaTypes = 1; - rgpins.lpMediaType = &rgtypes; - rgtypes.clsMajorType = &MEDIATYPE_Audio; - rgtypes.clsMinorType = &MEDIASUBTYPE_PCM; + rgpins.nMediaTypes = 2; + rgpins.lpMediaType = rgtypes; + rgtypes[0].clsMajorType = &MEDIATYPE_Audio; + rgtypes[0].clsMinorType = &MEDIASUBTYPE_PCM; + rgtypes[1].clsMajorType = &MEDIATYPE_Audio; + rgtypes[1].clsMinorType = &MEDIASUBTYPE_IEEE_FLOAT; write_filter_data(prop_bag, &rgf); diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 3e0d6f57dc3..cb3b810a30e 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -28,6 +28,7 @@ #include "mmddk.h" #include "vfw.h" #include "setupapi.h" +#include "wine/fil_data.h" #include "wine/test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -775,13 +776,18 @@ end: static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *module, void *context) { + BOOL has_pcm = FALSE, has_ieee_float = FALSE; IParseDisplayName *parser; IPropertyBag *prop_bag; + IAMFilterData *filter; + REGFILTER2 **rgf2; IMoniker *mon; WCHAR buffer[200]; WCHAR name[200]; VARIANT var; + BYTE *data; HRESULT hr; + int i; if (guid) { @@ -849,6 +855,49 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, L"FilterData", &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IAMFilterData, + (void **)&filter); + ok(hr == S_OK, "CoCreateInstance failed: %#x\n", hr); + + ok(V_ARRAY(&var)->rgsabound[0].cElements == 664, "got rgsabound[0].cElements %d\n", + V_ARRAY(&var)->rgsabound[0].cElements); + + hr = SafeArrayAccessData(V_ARRAY(&var), (void **)&data); + ok(hr == S_OK, "SafeArrayAccessData failed: %#x\n", hr); + hr = IAMFilterData_ParseFilterData(filter, data, V_ARRAY(&var)->rgsabound[0].cElements, + (BYTE **)&rgf2); + ok(hr == S_OK, "IAMFilterData_ParseFilterData failed: %#x\n", hr); + + ok(rgf2[0]->dwVersion == 2, "got version %d\n", rgf2[0]->dwVersion); + ok(rgf2[0]->dwMerit == MERIT_PREFERRED, "got merit %d\n", rgf2[0]->dwMerit); + ok(rgf2[0]->cPins2 == 1, "got pins count %d\n", rgf2[0]->cPins2); + ok(rgf2[0]->rgPins2 != NULL, "got NULL pins\n"); + ok(rgf2[0]->rgPins2[0].dwFlags, "got pins[0] flags %x\n", rgf2[0]->rgPins2[0].dwFlags); + ok(rgf2[0]->rgPins2[0].nMediaTypes, "got pins[0] media type count %d\n", + rgf2[0]->rgPins2[0].nMediaTypes); + ok(rgf2[0]->rgPins2[0].lpMediaType != NULL, "got pins[0] NULL media types\n"); + + for (i = 0; i < rgf2[0]->rgPins2[0].nMediaTypes; ++i) + { + GUID major = *rgf2[0]->rgPins2[0].lpMediaType[i].clsMajorType; + GUID minor = *rgf2[0]->rgPins2[0].lpMediaType[i].clsMinorType; + ok(IsEqualGUID(&major, &MEDIATYPE_Audio), "unexpected media type %s\n", wine_dbgstr_guid(&major)); + if (IsEqualGUID(&minor, &MEDIASUBTYPE_PCM)) has_pcm = TRUE; + if (IsEqualGUID(&minor, &MEDIASUBTYPE_IEEE_FLOAT)) has_ieee_float = TRUE; + } + + ok(has_pcm, "expected PCM media type\n"); + ok(has_ieee_float, "expected IEEE float media type\n"); + + CoTaskMemFree(rgf2); + IAMFilterData_Release(filter); + hr = SafeArrayUnaccessData(V_ARRAY(&var)); + ok(hr == S_OK, "SafeArrayUnaccessData failed: %#x\n", hr); + VariantClear(&var); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); -- 2.31.0

3 3

[PATCH 1/5] ws2_32: Use Win32 getsockname() and getpeername() in SO_BSP_STATE.
by Zebediah Figura 22 Jun '21

22 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/socket.c | 106 +++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 65 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 44c0690d535..71537e6a2d8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2118,75 +2118,51 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return ret; case WS_SO_BSP_STATE: { - int req_size, addr_size; + CSADDR_INFO *csinfo = (CSADDR_INFO *)optval; WSAPROTOCOL_INFOW infow; - CSADDR_INFO *csinfo; + int addr_size; - ret = ws_protocol_info(s, TRUE, &infow, &addr_size); - if (ret) + if (!ws_protocol_info( s, TRUE, &infow, &addr_size )) + return -1; + + if (infow.iAddressFamily == WS_AF_INET) + addr_size = sizeof(struct sockaddr_in); + else if (infow.iAddressFamily == WS_AF_INET6) + addr_size = sizeof(struct sockaddr_in6); + else { - if (infow.iAddressFamily == WS_AF_INET) - addr_size = sizeof(struct sockaddr_in); - else if (infow.iAddressFamily == WS_AF_INET6) - addr_size = sizeof(struct sockaddr_in6); - else - { - FIXME("Family %d is unsupported for SO_BSP_STATE\n", infow.iAddressFamily); - SetLastError(WSAEAFNOSUPPORT); - return SOCKET_ERROR; - } - - req_size = sizeof(CSADDR_INFO) + addr_size * 2; - if (*optlen < req_size) - { - ret = 0; - SetLastError(WSAEFAULT); - } - else - { - union generic_unix_sockaddr uaddr; - socklen_t uaddrlen; - - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - - csinfo = (CSADDR_INFO*) optval; - - /* Check if the sock is bound */ - if (is_fd_bound(fd, &uaddr, &uaddrlen) == 1) - { - csinfo->LocalAddr.lpSockaddr = - (LPSOCKADDR) (optval + sizeof(CSADDR_INFO)); - ws_sockaddr_u2ws(&uaddr.addr, csinfo->LocalAddr.lpSockaddr, &addr_size); - csinfo->LocalAddr.iSockaddrLength = addr_size; - } - else - { - csinfo->LocalAddr.lpSockaddr = NULL; - csinfo->LocalAddr.iSockaddrLength = 0; - } - - /* Check if the sock is connected */ - if (!getpeername(fd, &uaddr.addr, &uaddrlen) && - is_sockaddr_bound(&uaddr.addr, uaddrlen)) - { - csinfo->RemoteAddr.lpSockaddr = - (LPSOCKADDR) (optval + sizeof(CSADDR_INFO) + addr_size); - ws_sockaddr_u2ws(&uaddr.addr, csinfo->RemoteAddr.lpSockaddr, &addr_size); - csinfo->RemoteAddr.iSockaddrLength = addr_size; - } - else - { - csinfo->RemoteAddr.lpSockaddr = NULL; - csinfo->RemoteAddr.iSockaddrLength = 0; - } - - csinfo->iSocketType = infow.iSocketType; - csinfo->iProtocol = infow.iProtocol; - release_sock_fd( s, fd ); - } + FIXME( "family %d is unsupported for SO_BSP_STATE\n", infow.iAddressFamily ); + SetLastError( WSAEAFNOSUPPORT ); + return -1; } - return ret ? 0 : SOCKET_ERROR; + + if (*optlen < sizeof(CSADDR_INFO) + addr_size * 2) + { + ret = 0; + SetLastError( WSAEFAULT ); + return -1; + } + + csinfo->LocalAddr.lpSockaddr = (struct WS_sockaddr *)(csinfo + 1); + csinfo->RemoteAddr.lpSockaddr = (struct WS_sockaddr *)((char *)(csinfo + 1) + addr_size); + + csinfo->LocalAddr.iSockaddrLength = addr_size; + if (WS_getsockname( s, csinfo->LocalAddr.lpSockaddr, &csinfo->LocalAddr.iSockaddrLength ) < 0) + { + csinfo->LocalAddr.lpSockaddr = NULL; + csinfo->LocalAddr.iSockaddrLength = 0; + } + + csinfo->RemoteAddr.iSockaddrLength = addr_size; + if (WS_getpeername( s, csinfo->RemoteAddr.lpSockaddr, &csinfo->RemoteAddr.iSockaddrLength ) < 0) + { + csinfo->RemoteAddr.lpSockaddr = NULL; + csinfo->RemoteAddr.iSockaddrLength = 0; + } + + csinfo->iSocketType = infow.iSocketType; + csinfo->iProtocol = infow.iProtocol; + return 0; } case WS_SO_DONTLINGER: { -- 2.30.2

2 5

[PATCH 3/4] wininet: Set error to ERROR_CANCELLED on IDCANCEL in the user/password dialog.
by Dmitry Timoshkov 22 Jun '21

22 Jun '21

This matches behaviour observed under Windows, otherwise urlmon IAuthenticate interactive test infinitely asks for user credentials after pressing Esc. Probably proxy user/password dialog should do the same, however this needs a confirmation with a test case. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/dialogs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index a425534fa87..34698554f37 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -346,7 +346,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( } if( wParam == IDCANCEL ) { - EndDialog( hdlg, 0 ); + EndDialog( hdlg, ERROR_CANCELLED ); return TRUE; } break; -- 2.31.1

1 0

[PATCH 2/4] urlmon: Handle HTTP_STATUS_DENIED error.
by Dmitry Timoshkov 22 Jun '21

22 Jun '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/urlmon/http.c | 64 +++++++++++++++++++++++++++++++----------- dlls/urlmon/protocol.c | 16 +++++++++++ 2 files changed, 64 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index bee226bd474..d001278c794 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -128,7 +128,7 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) IHttpSecurity *http_security; BOOL security_problem; DWORD dlg_flags; - HWND hwnd; + HWND hwnd = 0; DWORD res; HRESULT hres; @@ -160,6 +160,36 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) return E_ABORT; } + if(error == HTTP_STATUS_DENIED || error == ERROR_ACCESS_DENIED) { + IAuthenticate *auth; + + hres = IServiceProvider_QueryService(serv_prov, &IID_IAuthenticate, &IID_IAuthenticate, + (void**)&auth); + if(SUCCEEDED(hres)) { + LPWSTR user = NULL, pass = NULL; + + hres = IAuthenticate_Authenticate(auth, &hwnd, &user, &pass); + IAuthenticate_Release(auth); + + if(FAILED(hres)) { + IServiceProvider_Release(serv_prov); + return E_ACCESSDENIED; + } + + if(!hwnd) { + InternetSetOptionW(This->base.request, INTERNET_OPTION_USERNAME, user, 0); + InternetSetOptionW(This->base.request, INTERNET_OPTION_PASSWORD, pass, 0); + CoTaskMemFree(user); + CoTaskMemFree(pass); + IServiceProvider_Release(serv_prov); + return user ? RPC_E_RETRY : E_ACCESSDENIED; + } + } + + error = ERROR_SUCCESS; + /* fall through to InternetErrorDlg */ + } + if(security_problem) { hres = IServiceProvider_QueryService(serv_prov, &IID_IHttpSecurity, &IID_IHttpSecurity, (void**)&http_security); @@ -210,24 +240,26 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) } /* fallthrough */ default: - hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI, (void**)&wfb_ui); - if(SUCCEEDED(hres)) { - const IID *iid_reason; - - if(security_problem) - iid_reason = &IID_IHttpSecurity; - else if(error == ERROR_INTERNET_INCORRECT_PASSWORD) - iid_reason = &IID_IAuthenticate; - else - iid_reason = &IID_IWindowForBindingUI; + if(!hwnd) { + hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI, (void**)&wfb_ui); + if(SUCCEEDED(hres)) { + const IID *iid_reason; + + if(security_problem) + iid_reason = &IID_IHttpSecurity; + else if(error == ERROR_INTERNET_INCORRECT_PASSWORD) + iid_reason = &IID_IAuthenticate; + else + iid_reason = &IID_IWindowForBindingUI; + + hres = IWindowForBindingUI_GetWindow(wfb_ui, iid_reason, &hwnd); + IWindowForBindingUI_Release(wfb_ui); + } - hres = IWindowForBindingUI_GetWindow(wfb_ui, iid_reason, &hwnd); - IWindowForBindingUI_Release(wfb_ui); + if(FAILED(hres)) hwnd = NULL; } - if(FAILED(hres)) hwnd = NULL; - - dlg_flags = FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS | FLAGS_ERROR_UI_FLAGS_GENERATE_DATA; + dlg_flags = FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS | FLAGS_ERROR_UI_FLAGS_GENERATE_DATA | FLAGS_ERROR_UI_FILTER_FOR_ERRORS; if(This->base.bindf & BINDF_NO_UI) dlg_flags |= FLAGS_ERROR_UI_FLAGS_NO_UI; diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 2acffdc1ffe..4825eac82cc 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -220,6 +220,22 @@ static void WINAPI internet_status_callback(HINTERNET internet, DWORD_PTR contex IInternetProtocol_Release(protocol->protocol); break; + case INTERNET_STATUS_RESPONSE_RECEIVED: + { + DWORD status, size; + + TRACE("%p INTERNET_STATUS_RESPONSE_RECEIVED (%u bytes)\n", protocol, *(const DWORD *)status_info); + + size = sizeof(status); + if (HttpQueryInfoW(protocol->request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, 0)) + { + TRACE("request status: %u\n", status); + if (status == HTTP_STATUS_DENIED) /* FIXME: other errors */ + protocol->flags |= FLAG_ERROR; + } + break; + } + default: WARN("Unhandled Internet status callback %d\n", internet_status); } -- 2.31.1

1 0

[PATCH 1/4] urlmon: Implement IAuthenticate::Authenticate() in the BSC interface.
by Dmitry Timoshkov 22 Jun '21

22 Jun '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/urlmon/bindctx.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 406232467c3..80ffe339fff 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -490,8 +490,22 @@ static HRESULT WINAPI BSCAuthenticate_Authenticate(IAuthenticate *iface, HWND *phwnd, LPWSTR *pszUsername, LPWSTR *pszPassword) { BindStatusCallback *This = impl_from_IAuthenticate(iface); - FIXME("(%p)->(%p %p %p)\n", This, phwnd, pszUsername, pszPassword); - return E_NOTIMPL; + IAuthenticate *auth; + HRESULT hres = E_NOTIMPL; + + TRACE("(%p)->(%p %p %p)\n", This, phwnd, pszUsername, pszPassword); + + if(This->callback) + hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IAuthenticate, (void**)&auth); + if(FAILED(hres) && This->serv_prov) + hres = IServiceProvider_QueryService(This->serv_prov, &IID_IAuthenticate, &IID_IAuthenticate, + (void**)&auth); + if(SUCCEEDED(hres)) { + hres = IAuthenticate_Authenticate(auth, phwnd, pszUsername, pszPassword); + IAuthenticate_Release(auth); + } + + return hres; } static const IAuthenticateVtbl BSCAuthenticateVtbl = { -- 2.31.1

1 0

[PATCH vkd3d v3 1/3] vkd3d-shader: Read descriptor register ranges for resources.
by Conor McCarthy 22 Jun '21

22 Jun '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 32 ++++++++++++++++-------- libs/vkd3d-shader/spirv.c | 21 ++++++++-------- libs/vkd3d-shader/trace.c | 10 ++++---- libs/vkd3d-shader/vkd3d_shader_main.c | 4 +-- libs/vkd3d-shader/vkd3d_shader_private.h | 9 +++++-- 5 files changed, 46 insertions(+), 30 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index d2cf87e3..89971477 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -630,6 +630,18 @@ static unsigned int shader_sm4_map_resource_idx(struct vkd3d_shader_register *re return reg->idx[0].offset; } +static void shader_sm4_read_descriptor_register_range(struct vkd3d_sm4_data *priv, const DWORD **ptr, + const DWORD *end, struct vkd3d_shader_register *reg, struct vkd3d_descriptor_register_range *range) +{ + shader_sm4_read_register_space(priv, ptr, end, &range->space); + range->first = reg->idx[shader_is_sm_5_1(priv) ? 1 : 0].offset; + range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 0].offset; + if (range->last < range->first) + { + FIXME("Invalid register range [%u:%u].\n", range->first, range->last); + } +} + static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) @@ -654,7 +666,6 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, } reg_data_type = opcode == VKD3D_SM4_OP_DCL_RESOURCE ? VKD3D_DATA_RESOURCE : VKD3D_DATA_UAV; shader_sm4_read_dst_param(priv, &tokens, end, reg_data_type, &semantic->resource.reg); - semantic->resource.register_index = shader_sm4_map_resource_idx(&semantic->resource.reg.reg, priv); components = *tokens++; for (i = 0; i < VKD3D_VEC4_SIZE; i++) @@ -675,7 +686,8 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, if (reg_data_type == VKD3D_DATA_UAV) ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; - shader_sm4_read_register_space(priv, &tokens, end, &semantic->resource.register_space); + shader_sm4_read_descriptor_register_range(priv, &tokens, end, &semantic->resource.reg.reg, + &semantic->resource.range); } static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction *ins, @@ -916,9 +928,9 @@ static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); - resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; - shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); + shader_sm4_read_descriptor_register_range(priv, &tokens, end, + &resource->resource.reg.reg, &resource->resource.range); } static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction *ins, @@ -929,12 +941,12 @@ static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction * const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); - resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; resource->byte_stride = *tokens++; if (resource->byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", resource->byte_stride); - shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); + shader_sm4_read_descriptor_register_range(priv, &tokens, end, + &resource->resource.reg.reg, &resource->resource.range); } static void shader_sm5_read_dcl_tgsm_raw(struct vkd3d_shader_instruction *ins, @@ -967,11 +979,11 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); - resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); resource->byte_stride = *tokens++; if (resource->byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", resource->byte_stride); - shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); + shader_sm4_read_descriptor_register_range(priv, &tokens, end, + &resource->resource.reg.reg, &resource->resource.range); } static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *ins, @@ -982,8 +994,8 @@ static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *in const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); - resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); - shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); + shader_sm4_read_descriptor_register_range(priv, &tokens, end, + &resource->resource.reg.reg, &resource->resource.range); } static void shader_sm5_read_sync(struct vkd3d_shader_instruction *ins, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0e75b0ae..f34a6a1d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1932,8 +1932,7 @@ struct vkd3d_symbol_register_data struct vkd3d_symbol_resource_data { - unsigned int register_space; - unsigned int register_index; + struct vkd3d_descriptor_register_range range; enum vkd3d_shader_component_type sampled_type; uint32_t type_id; const struct vkd3d_spirv_resource_type *resource_type_info; @@ -2441,8 +2440,8 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility)) continue; - if ((!resource || (combined_sampler->resource_space == resource->register_space - && combined_sampler->resource_index == resource->register_index)) + if ((!resource || (combined_sampler->resource_space == resource->range.space + && combined_sampler->resource_index == resource->range.first)) && (!sampler || (combined_sampler->sampler_space == sampler->register_space && combined_sampler->sampler_index == sampler->register_index))) return true; @@ -5533,8 +5532,9 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX ? 0 : current->sampler_space, current->sampler_index); symbol.id = var_id; - symbol.info.resource.register_space = resource_space; - symbol.info.resource.register_index = resource_index; + symbol.info.resource.range.space = resource_space; + symbol.info.resource.range.first = resource_index; + symbol.info.resource.range.last = resource_index; symbol.info.resource.sampled_type = sampled_type; symbol.info.resource.type_id = image_type_id; symbol.info.resource.resource_type_info = resource_type_info; @@ -5554,8 +5554,8 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp SpvStorageClass storage_class = SpvStorageClassUniformConstant; const struct vkd3d_shader_register *reg = &resource->reg.reg; const struct vkd3d_spirv_resource_type *resource_type_info; - unsigned int register_space = resource->register_space; - unsigned int register_index = resource->register_index; + unsigned int register_space = resource->range.space; + unsigned int register_index = resource->range.first; enum vkd3d_shader_component_type sampled_type; struct vkd3d_symbol resource_symbol; bool is_uav; @@ -5657,8 +5657,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp vkd3d_symbol_make_resource(&resource_symbol, reg); resource_symbol.id = var_id; - resource_symbol.info.resource.register_space = register_space; - resource_symbol.info.resource.register_index = register_index; + resource_symbol.info.resource.range = resource->range; resource_symbol.info.resource.sampled_type = sampled_type; resource_symbol.info.resource.type_id = type_id; resource_symbol.info.resource.resource_type_info = resource_type_info; @@ -7673,7 +7672,7 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil image->image_type_id, image->id, SpvMemoryAccessMaskNone) : 0; image->image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource_reg, - symbol->info.resource.register_space, symbol->info.resource.register_index, image->resource_type_info, + symbol->info.resource.range.space, symbol->info.resource.range.first, image->resource_type_info, image->sampled_type, image->structure_stride || image->raw, depth_comparison); if (sampled) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 4e355118..c35179a8 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1428,7 +1428,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_ins_modifiers(compiler, &ins->declaration.semantic.resource.reg); vkd3d_string_buffer_printf(buffer, "%s ", compiler->colours.reset); shader_dump_register(compiler, &ins->declaration.semantic.resource.reg.reg); - shader_dump_register_space(compiler, ins->declaration.semantic.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.semantic.resource.range.space); break; case VKD3DSIH_DCL_CONSTANT_BUFFER: @@ -1531,14 +1531,14 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_RESOURCE_RAW: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.raw_resource.resource.reg); - shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.range.space); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg); shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, ""); - shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.range.space); break; case VKD3DSIH_DCL_SAMPLER: @@ -1597,7 +1597,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_uav_flags(compiler, ins->flags); shader_addline(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.raw_resource.resource.reg); - shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.range.space); break; case VKD3DSIH_DCL_UAV_STRUCTURED: @@ -1605,7 +1605,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg); shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, ""); - shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.range.space); break; case VKD3DSIH_DEF: diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 2308b894..df811d37 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -666,8 +666,8 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, - resource->register_index, resource_type, resource_data_type, 0); + vkd3d_shader_scan_add_descriptor(context, type, resource->range.space, + resource->range.first, resource_type, resource_data_type, 0); if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) vkd3d_shader_scan_add_uav_range(context, resource->reg.reg.idx[0].offset, context->scan_descriptor_info->descriptor_count - 1); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6d756e40..e4beef15 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -636,11 +636,16 @@ struct vkd3d_shader_index_range unsigned int register_count; }; +struct vkd3d_descriptor_register_range +{ + unsigned int space; + unsigned int first, last; +}; + struct vkd3d_shader_resource { struct vkd3d_shader_dst_param reg; - unsigned int register_space; - unsigned int register_index; + struct vkd3d_descriptor_register_range range; }; enum vkd3d_decl_usage -- 2.31.1

1 2

[PATCH v3] mf/sar: Allow requesting more than a sample per period.
by Giovanni Mascellani 22 Jun '21

22 Jun '21

The IAudioClient implementation from both Windows and winepulse.drv never sets the event more than once per period, which is usually around 10 ms long. Some codecs produce audio samples shorter than 10 ms, so it is critical that the SAR is able to process more than a sample per period. This is not currently the case: a new sample is requested only in audio_renderer_render, which is executed (at most) once per period. This results in the SAR not being able to keep up with the audio client, and eventually underrunning. With this patch the SAR keeps a count of how many frames are currently queued, and a new sample is immediately requested if the internal queue has less than two periods of frames. This patch fixes audio stuttering problems in the logo videos of Borderlands 3, Deep Rock Galactic and Mutant Year Zero. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: Remove some changes that didn't really help the solution and update the description accordingly. v3: Reimplement from scratches, using a different strategy and avoiding manually setting the event. This patch supersedes 208098. dlls/mf/sar.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index eba822ae0fe..e39dc09146a 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -101,6 +101,8 @@ struct audio_renderer HANDLE buffer_ready_event; MFWORKITEM_KEY buffer_ready_key; unsigned int frame_size; + unsigned int queued_frames; + unsigned int target_queued_frames; struct list queue; enum stream_state state; unsigned int flags; @@ -1330,6 +1332,13 @@ static HRESULT WINAPI audio_renderer_stream_GetMediaTypeHandler(IMFStreamSink *i static HRESULT stream_queue_sample(struct audio_renderer *renderer, IMFSample *sample) { struct queued_object *object; + DWORD sample_len, sample_frames; + HRESULT hr; + + if (FAILED(hr = IMFSample_GetTotalLength(sample, &sample_len))) + return hr; + + sample_frames = sample_len / renderer->frame_size; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1339,6 +1348,7 @@ static HRESULT stream_queue_sample(struct audio_renderer *renderer, IMFSample *s IMFSample_AddRef(object->u.sample.sample); list_add_tail(&renderer->queue, &object->entry); + renderer->queued_frames += sample_frames; return S_OK; } @@ -1359,7 +1369,10 @@ static HRESULT WINAPI audio_renderer_stream_ProcessSample(IMFStreamSink *iface, EnterCriticalSection(&renderer->cs); if (renderer->state == STREAM_STATE_RUNNING) hr = stream_queue_sample(renderer, sample); - renderer->flags &= ~SAR_SAMPLE_REQUESTED; + if (renderer->queued_frames < renderer->target_queued_frames) + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); + else + renderer->flags &= ~SAR_SAMPLE_REQUESTED; LeaveCriticalSection(&renderer->cs); return hr; @@ -1516,6 +1529,8 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere unsigned int flags; WAVEFORMATEX *wfx; HRESULT hr; + REFERENCE_TIME period; + DWORD samples_per_second; audio_renderer_release_audio_client(renderer); @@ -1543,6 +1558,7 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere flags |= AUDCLNT_STREAMFLAGS_NOPERSIST; hr = IAudioClient_Initialize(renderer->audio_client, AUDCLNT_SHAREMODE_SHARED, flags, 1000000, 0, wfx, &renderer->stream_config.session_id); + samples_per_second = wfx->nSamplesPerSec; CoTaskMemFree(wfx); if (FAILED(hr)) { @@ -1576,6 +1592,13 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere return hr; } + if (FAILED(hr = IAudioClient_GetDevicePeriod(renderer->audio_client, &period, NULL))) + { + WARN("Failed to retrieve device period, hr %#x.\n", hr); + return hr; + } + renderer->target_queued_frames = 2 * period * samples_per_second / 10000000; + if (SUCCEEDED(hr = MFCreateAsyncResult(NULL, &renderer->render_callback, NULL, &result))) { if (FAILED(hr = MFPutWaitingWorkItem(renderer->buffer_ready_event, 0, result, &renderer->buffer_ready_key))) @@ -1789,6 +1812,7 @@ static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResul IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); obj->u.sample.frame_offset += dst_frames; + renderer->queued_frames -= dst_frames; } keep_sample = FAILED(hr) || src_frames > max_frames; -- 2.32.0

2 1

[PATCH] wined3d: Add decompression information for BC4_UNORM.
by Henri Verbeet 22 Jun '21

22 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 153 ++++++++++++++++++++++++++++++ dlls/d3d11/tests/d3d11.c | 155 +++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 81 +++++++++++++++- 3 files changed, 387 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index cc30b439d2b..1eee482cc8f 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18935,6 +18935,158 @@ static void test_unbound_streams(void) release_test_context(&test_context); } +static void test_texture_compressed_3d(void) +{ + struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE3D_DESC texture_desc; + ID3D10SamplerState *sampler_state; + unsigned int idx, r0, r1, x, y, z; + D3D10_SAMPLER_DESC sampler_desc; + ID3D10ShaderResourceView *srv; + struct resource_readback rb; + ID3D10Texture3D *texture; + DWORD colour, expected; + ID3D10PixelShader *ps; + ID3D10Device *device; + DWORD *texture_data; + BOOL equal = TRUE; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture3D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + return t.Sample(s, position.xyz / float3(640, 480, 1)); + } +#endif + 0x43425844, 0x27b15ae8, 0xbebf46f7, 0x6cd88d8d, 0x5118de51, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000070f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04002858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101072, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100072, 0x00000000, 0x00101246, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x3f800000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100246, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + + static const unsigned int block_indices[] = + { + 0, 1, 3, 2, + 6, 7, 5, 4, + 0, 1, 3, 2, + 6, 7, 5, 4, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Simply test all combinations of r0 and r1. */ + texture_data = heap_alloc(256 * 256 * sizeof(UINT64)); + for (r1 = 0; r1 < 256; ++r1) + { + for (r0 = 0; r0 < 256; ++r0) + { + /* bits = block_indices[] */ + texture_data[(r1 * 256 + r0) * 2 + 0] = 0xe4c80000 | (r1 << 8) | r0; + texture_data[(r1 * 256 + r0) * 2 + 1] = 0x97e4c897; + } + } + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = 64 * sizeof(UINT64); + resource_data.SysMemSlicePitch = 64 * resource_data.SysMemPitch; + + texture_desc.Width = 256; + texture_desc.Height = 256; + texture_desc.Depth = 16; + texture_desc.MipLevels = 1; + texture_desc.Format = DXGI_FORMAT_BC4_UNORM; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture3D(device, &texture_desc, &resource_data, &texture); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + heap_free(texture_data); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D10Device_PSSetShader(device, ps); + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + ID3D10Device_PSSetSamplers(device, 0, 1, &sampler_state); + + for (z = 0; z < 16; ++z) + { + draw_quad_z(&test_context, (z * 2.0f + 1.0f) / 32.0f); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (y = 0; y < 256; ++y) + { + for (x = 0; x < 256; ++x) + { + idx = z * 64 * 64 + (y / 4) * 64 + (x / 4); + r0 = idx % 256; + r1 = idx / 256; + + switch (block_indices[(y % 4) * 4 + (x % 4)]) + { + case 0: expected = r0; break; + case 1: expected = r1; break; + case 2: expected = r0 > r1 ? (12 * r0 + 2 * r1 + 7) / 14 : (8 * r0 + 2 * r1 + 5) / 10; break; + case 3: expected = r0 > r1 ? (10 * r0 + 4 * r1 + 7) / 14 : (6 * r0 + 4 * r1 + 5) / 10; break; + case 4: expected = r0 > r1 ? ( 8 * r0 + 6 * r1 + 7) / 14 : (4 * r0 + 6 * r1 + 5) / 10; break; + case 5: expected = r0 > r1 ? ( 6 * r0 + 8 * r1 + 7) / 14 : (2 * r0 + 8 * r1 + 5) / 10; break; + case 6: expected = r0 > r1 ? ( 4 * r0 + 10 * r1 + 7) / 14 : 0x00; break; + case 7: expected = r0 > r1 ? ( 2 * r0 + 12 * r1 + 7) / 14 : 0xff; break; + default: expected = ~0u; break; + } + expected |= 0xff000000; + colour = get_readback_color(&rb, (x * 640 + 128) / 256, (y * 480 + 128) / 256); + if (!(equal = compare_color(colour, expected, 2))) + break; + } + if (!equal) + break; + } + release_resource_readback(&rb); + if (!equal) + break; + } + ok(equal, "Got unexpected colour 0x%08x at (%u, %u, %u), expected 0x%08x.\n", colour, x, y, z, expected); + + ID3D10PixelShader_Release(ps); + ID3D10SamplerState_Release(sampler_state); + ID3D10ShaderResourceView_Release(srv); + ID3D10Texture3D_Release(texture); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -19060,6 +19212,7 @@ START_TEST(d3d10core) queue_test(test_independent_blend); queue_test(test_dual_source_blend); queue_test(test_unbound_streams); + queue_test(test_texture_compressed_3d); run_queued_tests(); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ae48e9748c9..2d66f9bde73 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33285,6 +33285,160 @@ static void test_deferred_context_map(void) release_test_context(&test_context); } +static void test_texture_compressed_3d(void) +{ + struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE3D_DESC texture_desc; + ID3D11SamplerState *sampler_state; + unsigned int idx, r0, r1, x, y, z; + D3D11_SAMPLER_DESC sampler_desc; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture3D *texture; + DWORD colour, expected; + ID3D11PixelShader *ps; + ID3D11Device *device; + DWORD *texture_data; + BOOL equal = TRUE; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture3D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + return t.Sample(s, position.xyz / float3(640, 480, 1)); + } +#endif + 0x43425844, 0x27b15ae8, 0xbebf46f7, 0x6cd88d8d, 0x5118de51, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000070f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04002858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101072, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100072, 0x00000000, 0x00101246, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x3f800000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100246, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + + static const unsigned int block_indices[] = + { + 0, 1, 3, 2, + 6, 7, 5, 4, + 0, 1, 3, 2, + 6, 7, 5, 4, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Simply test all combinations of r0 and r1. */ + texture_data = heap_alloc(256 * 256 * sizeof(UINT64)); + for (r1 = 0; r1 < 256; ++r1) + { + for (r0 = 0; r0 < 256; ++r0) + { + /* bits = block_indices[] */ + texture_data[(r1 * 256 + r0) * 2 + 0] = 0xe4c80000 | (r1 << 8) | r0; + texture_data[(r1 * 256 + r0) * 2 + 1] = 0x97e4c897; + } + } + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = 64 * sizeof(UINT64); + resource_data.SysMemSlicePitch = 64 * resource_data.SysMemPitch; + + texture_desc.Width = 256; + texture_desc.Height = 256; + texture_desc.Depth = 16; + texture_desc.MipLevels = 1; + texture_desc.Format = DXGI_FORMAT_BC4_UNORM; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture3D(device, &texture_desc, &resource_data, &texture); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + heap_free(texture_data); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); + + for (z = 0; z < 16; ++z) + { + draw_quad_z(&test_context, (z * 2.0f + 1.0f) / 32.0f); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (y = 0; y < 256; ++y) + { + for (x = 0; x < 256; ++x) + { + idx = z * 64 * 64 + (y / 4) * 64 + (x / 4); + r0 = idx % 256; + r1 = idx / 256; + + switch (block_indices[(y % 4) * 4 + (x % 4)]) + { + case 0: expected = r0; break; + case 1: expected = r1; break; + case 2: expected = r0 > r1 ? (12 * r0 + 2 * r1 + 7) / 14 : (8 * r0 + 2 * r1 + 5) / 10; break; + case 3: expected = r0 > r1 ? (10 * r0 + 4 * r1 + 7) / 14 : (6 * r0 + 4 * r1 + 5) / 10; break; + case 4: expected = r0 > r1 ? ( 8 * r0 + 6 * r1 + 7) / 14 : (4 * r0 + 6 * r1 + 5) / 10; break; + case 5: expected = r0 > r1 ? ( 6 * r0 + 8 * r1 + 7) / 14 : (2 * r0 + 8 * r1 + 5) / 10; break; + case 6: expected = r0 > r1 ? ( 4 * r0 + 10 * r1 + 7) / 14 : 0x00; break; + case 7: expected = r0 > r1 ? ( 2 * r0 + 12 * r1 + 7) / 14 : 0xff; break; + default: expected = ~0u; break; + } + expected |= 0xff000000; + colour = get_readback_color(&rb, (x * 640 + 128) / 256, (y * 480 + 128) / 256, 0); + if (!(equal = compare_color(colour, expected, 2))) + break; + } + if (!equal) + break; + } + release_resource_readback(&rb); + if (!equal) + break; + } + ok(equal, "Got unexpected colour 0x%08x at (%u, %u, %u), expected 0x%08x.\n", colour, x, y, z, expected); + + ID3D11PixelShader_Release(ps); + ID3D11SamplerState_Release(sampler_state); + ID3D11ShaderResourceView_Release(srv); + ID3D11Texture3D_Release(texture); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -33457,6 +33611,7 @@ START_TEST(d3d11) queue_test(test_deferred_context_rendering); queue_test(test_deferred_context_map); queue_test(test_unbound_streams); + queue_test(test_texture_compressed_3d); run_queued_tests(); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6e388e66862..4019dd4d812 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -568,6 +568,84 @@ static void decompress_bc1(const BYTE *src, BYTE *dst, unsigned int src_row_pitc dst_slice_pitch, width, height, depth, WINED3DFMT_BC1_UNORM); } +static void build_rgtc_colour_table(uint8_t red0, uint8_t red1, uint8_t colour_table[8]) +{ + unsigned int i; + + colour_table[0] = red0; + colour_table[1] = red1; + if (red0 <= red1) + { + for (i = 0; i < 4; ++i) + { + colour_table[i + 2] = ((8 - 2 * i) * red0 + (2 + 2 * i) * red1 + 5) / 10; + } + colour_table[6] = 0x00; + colour_table[7] = 0xff; + } + else + { + for (i = 0; i < 6; ++i) + { + colour_table[i + 2] = ((12 - 2 * i) * red0 + (2 + 2 * i) * red1 + 7) / 14; + } + } +} + +static void decompress_rgtc_block(const uint8_t *src, uint8_t *dst, + unsigned int width, unsigned int height, unsigned int dst_row_pitch) +{ + const uint64_t *s = (const uint64_t *)src; + uint8_t red0, red1, red_idx; + uint8_t colour_table[8]; + unsigned int x, y; + uint32_t *dst_row; + uint64_t bits; + + red0 = s[0] & 0xff; + red1 = (s[0] >> 8) & 0xff; + bits = s[0] >> 16; + build_rgtc_colour_table(red0, red1, colour_table); + + for (y = 0; y < height; ++y) + { + dst_row = (uint32_t *)&dst[y * dst_row_pitch]; + for (x = 0; x < width; ++x) + { + red_idx = (bits >> (y * 12 + x * 3)) & 0x7; + /* Decompressing to bgra32 is perhaps not ideal for RGTC formats. + * It's convenient though. */ + dst_row[x] = 0xff000000 | (colour_table[red_idx] << 16); + } + } +} + +static void decompress_bc4(const uint8_t *src, uint8_t *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + unsigned int block_w, block_h, x, y, z; + const uint8_t *src_row, *src_slice; + uint8_t *dst_row, *dst_slice; + + for (z = 0; z < depth; ++z) + { + src_slice = &src[z * src_slice_pitch]; + dst_slice = &dst[z * dst_slice_pitch]; + for (y = 0; y < height; y += 4) + { + src_row = &src_slice[(y / 4) * src_row_pitch]; + dst_row = &dst_slice[y * dst_row_pitch]; + for (x = 0; x < width; x += 4) + { + block_w = min(width - x, 4); + block_h = min(height - y, 4); + decompress_rgtc_block(&src_row[(x / 4) * 8], &dst_row[x * 4], block_w, block_h, dst_row_pitch); + } + } + } +} + static const struct wined3d_format_decompress_info { enum wined3d_format_id id; @@ -585,6 +663,7 @@ format_decompress_info[] = {WINED3DFMT_BC1_UNORM, decompress_bc1}, {WINED3DFMT_BC2_UNORM, decompress_bc2}, {WINED3DFMT_BC3_UNORM, decompress_bc3}, + {WINED3DFMT_BC4_UNORM, decompress_bc4}, }; struct wined3d_format_block_info @@ -3683,8 +3762,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; format = get_format_gl_internal(adapter, WINED3DFMT_ATI2N); format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - format = get_format_gl_internal(adapter, WINED3DFMT_BC4_UNORM); - format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; format = get_format_gl_internal(adapter, WINED3DFMT_BC4_SNORM); format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; format = get_format_gl_internal(adapter, WINED3DFMT_BC5_UNORM); -- 2.20.1

2 1

[PATCH 1/5] wined3d: Do not call wined3d_buffer_get_memory() in wined3d_buffer_init_data().
by Zebediah Figura 22 Jun '21

22 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This is scuffed, but ultimately this code path should go away anyway, and be replaced by an unconditional update_sub_resource. dlls/wined3d/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 12d038c0120..6cfeb4f510d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1041,7 +1041,6 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_sub_resource_data *data) { struct wined3d_resource *resource = &buffer->resource; - struct wined3d_bo_address bo; struct wined3d_box box; if (buffer->flags & WINED3D_BUFFER_USE_BO) @@ -1052,8 +1051,7 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, } else { - wined3d_buffer_get_memory(buffer, &bo, WINED3D_LOCATION_SYSMEM); - memcpy(bo.addr, data->data, resource->size); + memcpy(buffer->resource.heap_memory, data->data, resource->size); wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_SYSMEM); } -- 2.30.2

2 9

[PATCH 1/2] mf/sar: Query for current padding before requesting sample buffer.
by Giovanni Mascellani 22 Jun '21

22 Jun '21

According to both MSDN and our impementation, GetBufferSize returns the size of the buffer, but it doesn't guarantee that all of it is available. In order to know how much of it is available, the caller must also call GetCurrentPadding and subtract that number to the buffer size. Failing to do so might result in GetBuffer returning an error. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mf/sar.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 77cbfcb21da..eba822ae0fe 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1751,7 +1751,7 @@ static HRESULT WINAPI audio_renderer_render_callback_GetParameters(IMFAsyncCallb static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResult *result) { - unsigned int src_frames, dst_frames, max_frames, src_len; + unsigned int src_frames, dst_frames, max_frames, pad_frames, src_len; struct queued_object *obj, *obj2; BOOL keep_sample = FALSE; IMFMediaBuffer *buffer; @@ -1775,20 +1775,24 @@ static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResul { if (SUCCEEDED(IAudioClient_GetBufferSize(renderer->audio_client, &max_frames))) { - src_frames -= obj->u.sample.frame_offset; - dst_frames = min(src_frames, max_frames); - - if (SUCCEEDED(hr = IAudioRenderClient_GetBuffer(renderer->audio_render_client, dst_frames, &dst))) + if (SUCCEEDED(IAudioClient_GetCurrentPadding(renderer->audio_client, &pad_frames))) { - memcpy(dst, src + obj->u.sample.frame_offset * renderer->frame_size, - dst_frames * renderer->frame_size); + max_frames -= pad_frames; + src_frames -= obj->u.sample.frame_offset; + dst_frames = min(src_frames, max_frames); - IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); + if (SUCCEEDED(hr = IAudioRenderClient_GetBuffer(renderer->audio_render_client, dst_frames, &dst))) + { + memcpy(dst, src + obj->u.sample.frame_offset * renderer->frame_size, + dst_frames * renderer->frame_size); - obj->u.sample.frame_offset += dst_frames; - } + IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); - keep_sample = FAILED(hr) || src_frames > max_frames; + obj->u.sample.frame_offset += dst_frames; + } + + keep_sample = FAILED(hr) || src_frames > max_frames; + } } } IMFMediaBuffer_Unlock(buffer); -- 2.32.0

2 5

[PATCH v3 2/2] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
by Alistair Leslie-Hughes 22 Jun '21

22 Jun '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 40 +++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 6f4f118257f..a200e40451e 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1055,8 +1055,44 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %p, %d, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable, + pbWaveData, dwPlayOffset, nLoopCount, ppWave); + + fact_wavebank.dwFlagsAndDuration = entry.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + ret = FACTAudioEngine_PrepareInMemoryWave(This->fact_engine, dwFlags, fact_wavebank, + pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave); + if(ret != 0 || !fwave) + { + ERR("Failed to CreateWave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, -- 2.30.2

1 0

[PATCH v3 1/2] xactengine3_7: Implement IXACT3Engine PrepareStreamingWave
by Alistair Leslie-Hughes 22 Jun '21

22 Jun '21

I've already sent them once, some feedback would be appreciated. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 55 +++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 231ef753f22..6f4f118257f 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1066,8 +1066,59 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTStreamingParameters fakeParms; + wrap_readfile_struct *fake; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %d, %p, %d, %d, %p)\n", This, dwFlags, &entry, &streamingParams, + dwAlignment, pdwSeekTable, dwPlayOffset, nLoopCount, ppWave); + + fake = (wrap_readfile_struct*) CoTaskMemAlloc( + sizeof(wrap_readfile_struct)); + fake->engine = This; + fake->file = streamingParams.file; + fakeParms.file = fake; + fakeParms.flags = streamingParams.flags; + fakeParms.offset = streamingParams.offset; + fakeParms.packetSize = streamingParams.packetSize; + + fact_wavebank.dwFlagsAndDuration = entry.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + /* FAudio Prototype is incorrect and shouldn't take a buffer as an parameter, + * passing through NULL to ensure it's not used. + */ + ret = FACTAudioEngine_PrepareStreamingWave(This->fact_engine, dwFlags, fact_wavebank, fakeParms, + dwAlignment, pdwSeekTable, NULL, dwPlayOffset, nLoopCount, &fwave); + + if(ret != 0 || !fwave) + { + ERR("Failed to CreateWave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, -- 2.30.2

1 0

[PATCH v2 2/2 resend] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
by Alistair Leslie-Hughes 22 Jun '21

22 Jun '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 39 +++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 913cabe1e48..a3a0e490024 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -974,8 +974,43 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %p, %d, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable, + pbWaveData, dwPlayOffset, nLoopCount, ppWave); + + fact_wavebank.dwFlagsAndDuration = entry.u.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + ret = FACTAudioEngine_PrepareInMemoryWave(This->fact_engine, dwFlags, fact_wavebank, + pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave); + if(ret != 0 || !fwave) + { + ERR("Failed to create a wave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, -- 2.30.0

2 1

[PATCH v2 1/2 resend] xactengine3_7: Implement IXACT3Engine PrepareStreamingWave
by Alistair Leslie-Hughes 22 Jun '21

22 Jun '21

I've already sent them once, some feedback would be appreciated. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 54 +++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 8b9ee33ab5c..913cabe1e48 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -985,8 +985,58 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTStreamingParameters fakeParms; + wrap_readfile_struct *fake; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %d, %p, %d, %d, %p)\n", This, dwFlags, &entry, &streamingParams, + dwAlignment, pdwSeekTable, dwPlayOffset, nLoopCount, ppWave); + + fake = (wrap_readfile_struct*) CoTaskMemAlloc( + sizeof(wrap_readfile_struct)); + fake->engine = This; + fake->file = streamingParams.file; + fakeParms.file = fake; + fakeParms.flags = streamingParams.flags; + fakeParms.offset = streamingParams.offset; + fakeParms.packetSize = streamingParams.packetSize; + + fact_wavebank.dwFlagsAndDuration = entry.u.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + /* FAudio Prototype is incorrect and shouldn't take a buffer as an parameter, + * passing through NULL to ensure it's not used. + */ + ret = FACTAudioEngine_PrepareStreamingWave(This->fact_engine, dwFlags, fact_wavebank, fakeParms, + dwAlignment, pdwSeekTable, NULL, dwPlayOffset, nLoopCount, &fwave); + + if(ret != 0 || !fwave) + { + ERR("Failed to create a wave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, -- 2.30.0

2 1

[PATCH v2] mf/sar: Process the queue as soon as a sample is available.
by Giovanni Mascellani 22 Jun '21

22 Jun '21

The IAudioClient implementation from both Windows and winepulse.drv never sets the event more than once per period, which is usually around 10 ms long. Some codecs produce audio samples shorter than 10 ms, which currently result into the SAR not being able to keep up with the audio client, because the SAR never requests more than a sample per event cycle. This patch causes the event to be set each time a sample is received; this way the queue is immediately processed, and if required a new sample is immediately requested, instead of having to wait for the next IAudioClient period. Of course it would be even better if the codecs didn't generate too short samples, because they uselessly require more CPU cycles, but we should handle them properly anyway. This patch fixes audio stuttering problems in the logo videos of Borderlands 3, Deep Rock Galactic and Mutant Year Zero. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: Remove some changes that didn't really help the solution and update the description accordingly. dlls/mf/sar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index eba822ae0fe..6218eec54bb 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1360,6 +1360,7 @@ static HRESULT WINAPI audio_renderer_stream_ProcessSample(IMFStreamSink *iface, if (renderer->state == STREAM_STATE_RUNNING) hr = stream_queue_sample(renderer, sample); renderer->flags &= ~SAR_SAMPLE_REQUESTED; + SetEvent(renderer->buffer_ready_event); LeaveCriticalSection(&renderer->cs); return hr; -- 2.32.0

1 1

[PATCH resend v2] winevulkan: Fix bit field struct members.
by Georg Lehmann 22 Jun '21

22 Jun '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b7d57b8218d..e8534cbd5f5 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1078,7 +1078,7 @@ class VkHandle(object): class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, - dyn_array_len=None, optional=False, values=None, object_type=None): + dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None): self.const = const self.struct_fwd_decl = struct_fwd_decl self.name = name @@ -1090,6 +1090,7 @@ class VkMember(object): self.optional = optional self.values = values self.object_type = object_type + self.bit_width = bit_width def __eq__(self, other): """ Compare member based on name against a string. @@ -1116,6 +1117,7 @@ class VkMember(object): member_type = None pointer = None array_len = None + bit_width = None values = member.get("values") @@ -1161,8 +1163,14 @@ class VkMember(object): object_type = member.get("objecttype", None) + # Some members are bit field values: + # <member><type>uint32_t</type> <name>mask</name>:8</member> + if name_elem.tail and name_elem.tail[0] == ':': + LOGGER.debug("Found bit field") + bit_width = int(name_elem.tail[1:]) + return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, - array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values, object_type=object_type) + array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values, object_type=object_type, bit_width=bit_width) def copy(self, input, output, direction, conv): """ Helper method for use by conversion logic to generate a C-code statement to copy this member. @@ -1267,6 +1275,9 @@ class VkMember(object): if self.is_static_array(): text += "[{0}]".format(self.array_len) + if self.is_bit_field(): + text += ":{}".format(self.bit_width) + return text def get_conversions(self): @@ -1344,6 +1355,9 @@ class VkMember(object): return self.object_type != None and self.type == "uint64_t" + def is_bit_field(self): + return self.bit_width is not None + def needs_alignment(self): """ Check if this member needs alignment for 64-bit data. Various structures need alignment on 64-bit variables due -- 2.32.0

1 0

[PATCH] pdh/tests: Skip a test that crashes on Windows 10 >= 2004.
by Francois Gouget 22 Jun '21

22 Jun '21

Starting with Windows 10 2004 PdhMakeCounterPathA() does not check the query handle before using it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes the crashes on Windows 10 >= 2004. https://test.winehq.org/data/patterns.html#pdh:pdh I have kept the PdhMakeCounterPathA/W() handle check in Wine for backward compatibility though I doubt applications actually depend on that. Let me know if the check should be removed. --- dlls/pdh/tests/pdh.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 8165f32f50a..928714475bb 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -867,9 +867,11 @@ static void test_PdhMakeCounterPathA(void) ret = PdhMakeCounterPathA(NULL, NULL, &buflen, 0); ok(ret == PDH_INVALID_ARGUMENT, "PdhMakeCounterPathA failed 0x%08x\n", ret); + if (0) { /* Crashes on Windows 10 >= 2004 */ buflen = 0; ret = PdhMakeCounterPathA(NULL, buffer, &buflen, 0); ok(ret == PDH_INVALID_ARGUMENT, "PdhMakeCounterPathA failed 0x%08x\n", ret); + } buflen = sizeof(buffer); memset(&e, 0, sizeof(e)); -- 2.20.1

1 0

[PATCH] pdh: Update PdhAddEnglishCounterA/W() to match Windows 10 >= 2004.
by Francois Gouget 22 Jun '21

22 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes two failures on Windows 10 >= 2004. https://test.winehq.org/data/patterns.html#pdh:pdh --- dlls/pdh/pdh_main.c | 6 ++++-- dlls/pdh/tests/pdh.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 73d4fef2a14..3840b9d0288 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -284,7 +284,8 @@ PDH_STATUS WINAPI PdhAddEnglishCounterA( PDH_HQUERY query, LPCSTR path, { TRACE("%p %s %lx %p\n", query, debugstr_a(path), userdata, counter); - if (!query) return PDH_INVALID_ARGUMENT; + if (!counter) return PDH_INVALID_ARGUMENT; + if (!query) return PDH_INVALID_HANDLE; return PdhAddCounterA( query, path, userdata, counter ); } @@ -296,7 +297,8 @@ PDH_STATUS WINAPI PdhAddEnglishCounterW( PDH_HQUERY query, LPCWSTR path, { TRACE("%p %s %lx %p\n", query, debugstr_w(path), userdata, counter); - if (!query) return PDH_INVALID_ARGUMENT; + if (!counter) return PDH_INVALID_ARGUMENT; + if (!query) return PDH_INVALID_HANDLE; return PdhAddCounterW( query, path, userdata, counter ); } diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 71603f8c6ba..8165f32f50a 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -240,7 +240,8 @@ static void test_PdhAddEnglishCounterA( void ) ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterA failed 0x%08x\n", ret); ret = pPdhAddEnglishCounterA( NULL, "\\System\\System Up Time", 0, &counter ); - ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterA failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_HANDLE || broken(ret == PDH_INVALID_ARGUMENT) /* win10 <= 1909 */, + "PdhAddEnglishCounterA failed 0x%08x\n", ret); ret = pPdhAddEnglishCounterA( query, NULL, 0, &counter ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterA failed 0x%08x\n", ret); @@ -281,7 +282,8 @@ static void test_PdhAddEnglishCounterW( void ) ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n", ret); ret = pPdhAddEnglishCounterW( NULL, system_uptime, 0, &counter ); - ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_HANDLE || broken(ret == PDH_INVALID_ARGUMENT) /* win10 <= 1909 */, + "PdhAddEnglishCounterW failed 0x%08x\n", ret); ret = pPdhAddEnglishCounterW( query, NULL, 0, &counter ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n", ret); -- 2.20.1

1 0

[PATCH] msxml3: return S_FALSE from IXMLDOMNamedNodeMap::nextNode() when there are no attributes
by Damjan Jovanovic 22 Jun '21

22 Jun '21

Currently Wine return S_FALSE when IXMLDOMNamedNodeMap::nextNode() has run out of attributes to return, but when an XML node has no attributes at all, it returns S_OK despite setting the nextNode output parameter to NULL, causing the caller to crash when it accesses this pointer. Return S_FALSE in this case instead. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50603 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/msxml3/element.c | 2 ++ dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+)

2 1

[PATCH 6/6] comctl32/trackbar: Update control parts when style changed.
by Zhiyi Zhang 22 Jun '21

22 Jun '21

Fix trackbar draws incorrectly after changing style. For example, adding TBS_BOTH should cause a total repaint. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/trackbar.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 1859cf0f516..ce6a20c6c63 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1502,6 +1502,19 @@ TRACKBAR_InitializeThumb (TRACKBAR_INFO *infoPtr) return 0; } +static void TRACKBAR_RecalculateAll (TRACKBAR_INFO *infoPtr) +{ + if (infoPtr->dwStyle & TBS_FIXEDLENGTH) + { + TRACKBAR_CalcChannel(infoPtr); + TRACKBAR_UpdateThumb(infoPtr); + } + else + { + TRACKBAR_InitializeThumb(infoPtr); + } + TRACKBAR_AlignBuddies(infoPtr); +} static LRESULT TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) @@ -1677,14 +1690,7 @@ TRACKBAR_SetFocus (TRACKBAR_INFO *infoPtr) static LRESULT TRACKBAR_Size (TRACKBAR_INFO *infoPtr) { - if (infoPtr->dwStyle & TBS_FIXEDLENGTH) - { - TRACKBAR_CalcChannel(infoPtr); - TRACKBAR_UpdateThumb(infoPtr); - } - else - TRACKBAR_InitializeThumb(infoPtr); - TRACKBAR_AlignBuddies (infoPtr); + TRACKBAR_RecalculateAll(infoPtr); TRACKBAR_InvalidateAll(infoPtr); return 0; @@ -1697,7 +1703,8 @@ TRACKBAR_StyleChanged (TRACKBAR_INFO *infoPtr, WPARAM wStyleType, if (wStyleType != GWL_STYLE) return 0; infoPtr->dwStyle = lpss->styleNew; - + TRACKBAR_RecalculateAll(infoPtr); + TRACKBAR_InvalidateAll(infoPtr); return 0; } -- 2.30.2

1 0

[PATCH 5/6] comctl32/toolbar: Don't use outside theme handles.
by Zhiyi Zhang 22 Jun '21

22 Jun '21

Fix Spy++ Toolbar buttons have artifacts. Spy++ first creates a Toolbar window, then calls OpenThemeData(hwnd, "Rebar") with the Toolbar window. Then when the Toolbar control uses the theme handle from GetWindowTheme(), it gets a Rebar theme the next time it draws, thus drawing wrong theme parts. According the tests, not all of the common controls have such behaviors. Some of them do have theme handles opened by their window and then use that theme handle afterwards even it's changed from the outside. However, for other controls, the behaviors are not very consistent across all Windows versions. Also no applications depend on such behaviors for other controls yet. So, only modify the Toolbar control for now. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 2 -- dlls/comctl32/toolbar.c | 36 ++++++++++++++++------------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index d6ee358b04a..87b4611d056 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2641,7 +2641,6 @@ static void test_visual(void) ok(ret, "TB_ADDBUTTONSA failed.\n"); theme = pGetWindowTheme(toolbar); - todo_wine ok(!theme, "Expected theme not opened by window.\n"); toolbar_dc = GetDC(toolbar); @@ -2672,7 +2671,6 @@ static void test_visual(void) BitBlt(mem_dc2, 0, 0, width, height, toolbar_dc, 0, 0, SRCCOPY); ret = equal_dc(mem_dc1, mem_dc2, width, height); - todo_wine ok(ret, "Expected same content.\n"); pCloseThemeData(theme); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index a8777ae5480..2585e11530e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -142,6 +142,7 @@ typedef struct INT iListGap; /* default gap between text and image for toolbar with list style */ HFONT hDefaultFont; HFONT hFont; /* text font */ + HTHEME hTheme; /* theme */ HIMAGELIST himlInt; /* image list created internally */ PIMLENTRY *himlDef; /* default image list array */ INT cimlDef; /* default image list array count */ @@ -780,7 +781,7 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, INT left, I } else if (tbcd->nmcd.uItemState & CDIS_CHECKED || ((tbcd->nmcd.uItemState & CDIS_HOT) - && ((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)))) + && ((infoPtr->dwStyle & TBSTYLE_FLAT) || infoPtr->hTheme))) { /* if hot, attempt to draw with hot image list, if fails, use default image list */ @@ -900,7 +901,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, INT oldBkMode; DWORD dwItemCustDraw; DWORD dwItemCDFlag; - HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + HTHEME theme = infoPtr->hTheme; rc = btnPtr->rect; rcArrow = rc; @@ -1053,8 +1054,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, ((tbcd.nmcd.uItemState & CDIS_CHECKED) || (tbcd.nmcd.uItemState & CDIS_INDETERMINATE))) TOOLBAR_DrawPattern (&rc, &tbcd); - if (((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) - && (tbcd.nmcd.uItemState & CDIS_HOT)) + if (((infoPtr->dwStyle & TBSTYLE_FLAT) || theme) && (tbcd.nmcd.uItemState & CDIS_HOT)) { if ( dwItemCDFlag & TBCDRF_HILITEHOTTRACK ) { @@ -3506,7 +3506,7 @@ TOOLBAR_GetHotImageList (const TOOLBAR_INFO *infoPtr, WPARAM wParam) static LRESULT TOOLBAR_GetHotItem (const TOOLBAR_INFO *infoPtr) { - if (!((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf))) + if (!((infoPtr->dwStyle & TBSTYLE_FLAT) || infoPtr->hTheme)) return -1; if (infoPtr->nHotItem < 0) @@ -5313,8 +5313,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0); infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectW (&logFont); - - OpenThemeData (hwnd, themeClass); + infoPtr->hTheme = OpenThemeData (NULL, themeClass); TOOLBAR_CheckStyle (infoPtr); @@ -5358,8 +5357,8 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) /* delete default font */ DeleteObject (infoPtr->hDefaultFont); - - CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); + + CloseThemeData (infoPtr->hTheme); /* free toolbar info data */ SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); @@ -5375,7 +5374,6 @@ TOOLBAR_EraseBackground (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) NMTBCUSTOMDRAW tbcd; INT ret = FALSE; DWORD ntfret; - HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); DWORD dwEraseCustDraw = 0; /* the app has told us not to redraw the toolbar */ @@ -5405,7 +5403,7 @@ TOOLBAR_EraseBackground (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) /* If the toolbar is "transparent" then pass the WM_ERASEBKGND up * to my parent for processing. */ - if (theme || (infoPtr->dwStyle & TBSTYLE_TRANSPARENT)) { + if (infoPtr->hTheme || (infoPtr->dwStyle & TBSTYLE_TRANSPARENT)) { POINT pt, ptorig; HDC hdc = (HDC)wParam; HWND parent; @@ -5957,7 +5955,7 @@ TOOLBAR_MouseMove (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if ((infoPtr->dwStyle & TBSTYLE_TOOLTIPS) && (infoPtr->hwndToolTip == NULL)) TOOLBAR_TooltipCreateControl(infoPtr); - if ((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) { + if ((infoPtr->dwStyle & TBSTYLE_FLAT) || infoPtr->hTheme) { /* fill in the TRACKMOUSEEVENT struct */ trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); trackinfo.dwFlags = TME_QUERY; @@ -5985,8 +5983,7 @@ TOOLBAR_MouseMove (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) nHit = TOOLBAR_InternalHitTest (infoPtr, &pt, &button); - if (((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) - && (!infoPtr->bAnchor || button)) + if (((infoPtr->dwStyle & TBSTYLE_FLAT) || infoPtr->hTheme) && (!infoPtr->bAnchor || button)) TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE); if (infoPtr->nOldHit != nHit) @@ -6550,12 +6547,11 @@ TOOLBAR_SysColorChange (void) /* update theme after a WM_THEMECHANGED message */ -static LRESULT theme_changed (HWND hwnd) +static LRESULT theme_changed (TOOLBAR_INFO *infoPtr) { - HTHEME theme = GetWindowTheme (hwnd); - CloseThemeData (theme); - OpenThemeData (hwnd, themeClass); - InvalidateRect (hwnd, NULL, TRUE); + CloseThemeData (infoPtr->hTheme); + infoPtr->hTheme = OpenThemeData (NULL, themeClass); + InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); return 0; } @@ -6945,7 +6941,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SysColorChange (); case WM_THEMECHANGED: - return theme_changed (hwnd); + return theme_changed (infoPtr); /* case WM_WININICHANGE: */ -- 2.30.2

1 0

[PATCH 4/6] comctl32/toolbar: Test that toolbar shouldn't use outside theme handles.
by Zhiyi Zhang 22 Jun '21

22 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 114 ++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 9cfdcc689d9..d6ee358b04a 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -46,7 +46,10 @@ static INT (WINAPI *pImageList_GetImageCount)(HIMAGELIST); static BOOL (WINAPI *pImageList_GetIconSize)(HIMAGELIST, int *, int *); static HIMAGELIST (WINAPI *pImageList_LoadImageA)(HINSTANCE, LPCSTR, int, int, COLORREF, UINT, UINT); +static HRESULT (WINAPI *pCloseThemeData)(HTHEME); static BOOL (WINAPI *pIsThemeActive)(VOID); +static HTHEME (WINAPI *pGetWindowTheme)(HWND); +static HTHEME (WINAPI *pOpenThemeData)(HWND, LPCWSTR); static BOOL is_theme_active; @@ -139,6 +142,40 @@ static void MakeButton(TBBUTTON *p, int idCommand, int fsStyle, int nString) { p->iString = nString; } +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + +static BOOL equal_dc(HDC hdc1, HDC hdc2, int width, int height) +{ + int x, y; + + for (x = 0; x < width; ++x) + { + for (y = 0; y < height; ++y) + { + if (GetPixel(hdc1, x, y) != GetPixel(hdc2, x, y)) + return FALSE; + } + } + + return TRUE; +} + static void *alloced_str; static LRESULT parent_wnd_notify(LPARAM lParam) @@ -2574,6 +2611,79 @@ static void test_imagelist(void) DestroyWindow(hwnd); } +static void test_visual(void) +{ + HBITMAP mem_bitmap1, mem_bitmap2; + HDC mem_dc1, mem_dc2, toolbar_dc; + TBBUTTON tbbutton; + int width, height; + HTHEME theme; + HWND toolbar; + RECT rect; + BOOL ret; + + if (!is_theme_active) + { + skip("Theming is not active, skipping visual tests.\n"); + return; + } + + /* Test that toolbar shouldn't use outside theme handles */ + toolbar = CreateWindowA(TOOLBARCLASSNAMEA, "", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hMainWnd, 0, 0, NULL); + ok(!!toolbar, "Failed to create a toolbar window.\n"); + + /* Toolbar needs data for it to show */ + memset(&tbbutton, 0, sizeof(tbbutton)); + tbbutton.fsState = TBSTATE_ENABLED; + tbbutton.iString = (INT_PTR)"test"; + SendMessageA(toolbar, TB_BUTTONSTRUCTSIZE, sizeof(tbbutton), 0); + ret = SendMessageA(toolbar, TB_ADDBUTTONSA, 1, (LPARAM)&tbbutton); + ok(ret, "TB_ADDBUTTONSA failed.\n"); + + theme = pGetWindowTheme(toolbar); + todo_wine + ok(!theme, "Expected theme not opened by window.\n"); + + toolbar_dc = GetDC(toolbar); + GetClientRect(toolbar, &rect); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + + ret = RedrawWindow(toolbar, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW | RDW_UPDATENOW); + ok(ret, "RedrawWindow failed.\n"); + flush_events(); + + mem_dc1 = CreateCompatibleDC(toolbar_dc); + mem_bitmap1 = CreateCompatibleBitmap(toolbar_dc, width, height); + SelectObject(mem_dc1, mem_bitmap1); + BitBlt(mem_dc1, 0, 0, width, height, toolbar_dc, 0, 0, SRCCOPY); + + if (theme) + pCloseThemeData(theme); + theme = pOpenThemeData(toolbar, L"Rebar"); + ok(!!theme, "OpenThemeData failed.\n"); + + ret = RedrawWindow(toolbar, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW | RDW_UPDATENOW); + ok(ret, "RedrawWindow failed.\n"); + + mem_dc2 = CreateCompatibleDC(toolbar_dc); + mem_bitmap2 = CreateCompatibleBitmap(toolbar_dc, width, height); + SelectObject(mem_dc2, mem_bitmap2); + BitBlt(mem_dc2, 0, 0, width, height, toolbar_dc, 0, 0, SRCCOPY); + + ret = equal_dc(mem_dc1, mem_dc2, width, height); + todo_wine + ok(ret, "Expected same content.\n"); + + pCloseThemeData(theme); + DeleteObject(mem_bitmap2); + DeleteObject(mem_bitmap1); + DeleteDC(mem_dc2); + DeleteDC(mem_dc1); + ReleaseDC(toolbar, toolbar_dc); + DestroyWindow(toolbar); +} + static void init_functions(void) { HMODULE hComCtl32, hUxtheme; @@ -2590,7 +2700,10 @@ static void init_functions(void) #undef X #define X(f) p##f = (void*)GetProcAddress(hUxtheme, #f) + X(GetWindowTheme); X(IsThemeActive); + X(OpenThemeData); + X(CloseThemeData); #undef X } @@ -2649,6 +2762,7 @@ START_TEST(toolbar) return; test_create(TRUE); + test_visual(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { -- 2.30.2

1 0

[PATCH 3/6] comctl32/toolbar: Remove a redundant theme handle check in TOOLBAR_NCCreate().
by Zhiyi Zhang 22 Jun '21

22 Jun '21

This is a no-op. In TOOLBAR_NCCreate(), GetWindowTheme() always returns NULL because the theme handle is not open by OpenThemeData() by that time. Also tests show that TBSTYLE_TRANSPARENT is not added when theming is active. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 81 ++++++++++++++++++++++++++++++----- dlls/comctl32/toolbar.c | 3 +- 2 files changed, 71 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index b7e03c3e378..9cfdcc689d9 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -26,11 +26,13 @@ #include "winuser.h" #include "winnls.h" #include "winreg.h" -#include "commctrl.h" +#include "commctrl.h" +#include "uxtheme.h" #include "resources.h" #include "wine/test.h" +#include "v6util.h" #include "msg.h" @@ -44,6 +46,10 @@ static INT (WINAPI *pImageList_GetImageCount)(HIMAGELIST); static BOOL (WINAPI *pImageList_GetIconSize)(HIMAGELIST, int *, int *); static HIMAGELIST (WINAPI *pImageList_LoadImageA)(HINSTANCE, LPCSTR, int, int, COLORREF, UINT, UINT); +static BOOL (WINAPI *pIsThemeActive)(VOID); + +static BOOL is_theme_active; + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND hMainWnd; @@ -2203,7 +2209,7 @@ static LRESULT CALLBACK cbt_hook_proc(int code, WPARAM wParam, LPARAM lParam) return CallNextHookEx(g_tbhook, code, wParam, lParam); } -static void test_create(void) +static void test_create(BOOL v6) { HWND hwnd, tooltip; DWORD style; @@ -2217,16 +2223,32 @@ static void test_create(void) hwnd = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hMainWnd, (HMENU)5, GetModuleHandleA(NULL), NULL); - CHECK_CALLED(g_hook_create); - CHECK_CALLED(g_hook_WM_NCCREATE); - CHECK_CALLED(g_hook_WM_CREATE); + if (v6) + { + expect(called_g_hook_create, FALSE); + expect(called_g_hook_WM_NCCREATE, FALSE); + expect(called_g_hook_WM_CREATE, FALSE); + } + else + { + CHECK_CALLED(g_hook_create); + CHECK_CALLED(g_hook_WM_NCCREATE); + CHECK_CALLED(g_hook_WM_CREATE); + } style = GetWindowLongA(hwnd, GWL_STYLE); - ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%08x\n", style); + if (v6) + { + ok(!(style & TBSTYLE_TOOLTIPS), "got 0x%08x\n", style); + } + else + { + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%08x\n", style); - tooltip = (HWND)SendMessageA(hwnd, TB_GETTOOLTIPS, 0, 0); - ok(tooltip != NULL, "got %p\n", tooltip); - ok(GetParent(tooltip) == hMainWnd, "got %p, %p\n", hMainWnd, hwnd); + tooltip = (HWND)SendMessageA(hwnd, TB_GETTOOLTIPS, 0, 0); + ok(tooltip != NULL, "got %p\n", tooltip); + ok(GetParent(tooltip) == hMainWnd, "got %p, %p\n", hMainWnd, hwnd); + } DestroyWindow(hwnd); UnhookWindowsHook(WH_CBT, cbt_hook_proc); @@ -2243,6 +2265,24 @@ static void test_create(void) ok((style & TBSTYLE_TRANSPARENT) == TBSTYLE_TRANSPARENT, "got 0x%08x\n", style); DestroyWindow(hwnd); + + if (!is_theme_active) + { + skip("Theming is not active, skipping following tests.\n"); + return; + } + + hwnd = CreateWindowA(TOOLBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS + | TBSTYLE_TOOLTIPS | TBSTYLE_GROUP, 0, 0, 0, 0, hMainWnd, (HMENU)5, + GetModuleHandleA(NULL), NULL); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(!(style & TBSTYLE_TRANSPARENT), "got 0x%08x\n", style); + + style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); + ok(!(style & TBSTYLE_TRANSPARENT), "got 0x%08x\n", style); + + DestroyWindow(hwnd); } typedef struct { @@ -2536,7 +2576,10 @@ static void test_imagelist(void) static void init_functions(void) { - HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + HMODULE hComCtl32, hUxtheme; + + hComCtl32 = LoadLibraryA("comctl32.dll"); + hUxtheme = LoadLibraryA("uxtheme.dll"); #define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); X(CreateToolbarEx); @@ -2545,17 +2588,26 @@ static void init_functions(void) X(ImageList_LoadImageA); X(ImageList_Destroy); #undef X + +#define X(f) p##f = (void*)GetProcAddress(hUxtheme, #f) + X(IsThemeActive); +#undef X } START_TEST(toolbar) { + ULONG_PTR ctx_cookie; WNDCLASSA wc; + HANDLE ctx; MSG msg; RECT rc; init_msg_sequences(sequences, NUM_MSG_SEQUENCES); init_functions(); + if (pIsThemeActive) + is_theme_active = pIsThemeActive(); + wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; wc.cbWndExtra = 0; @@ -2586,17 +2638,24 @@ START_TEST(toolbar) test_getstring(); test_tooltip(); test_get_set_style(); - test_create(); + test_create(FALSE); test_TB_GET_SET_EXTENDEDSTYLE(); test_noresize(); test_save(); test_drawtext_flags(); test_imagelist(); + if (!load_v6_module(&ctx_cookie, &ctx)) + return; + + test_create(TRUE); + PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg); DispatchMessageA(&msg); } DestroyWindow(hMainWnd); + + unload_v6_module(ctx_cookie, ctx); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 1aeb499c45f..a8777ae5480 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6104,8 +6104,7 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, const CREATESTRUCTW *lpcs) * (Guy Albertelli 9/2001) * */ - if (((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) - && !(lpcs->style & TBSTYLE_TRANSPARENT)) + if ((infoPtr->dwStyle & TBSTYLE_FLAT) && !(lpcs->style & TBSTYLE_TRANSPARENT)) styleadd |= TBSTYLE_TRANSPARENT; if (!(lpcs->style & (CCS_TOP | CCS_NOMOVEY))) { styleadd |= CCS_TOP; /* default to top */ -- 2.30.2

1 0

[PATCH 2/6] comctl32/treeview: Draw parent background before drawing control parts.
by Zhiyi Zhang 22 Jun '21

22 Jun '21

Fix residual glyphs on background when drawing treeview buttons with themes that contains transparent button glyphs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/treeview.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 98cf5489f2b..f4a387dd0d2 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2901,6 +2901,7 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, HDC hdc, const RECT *rc) HWND hwnd = infoPtr->hwnd; RECT rect = *rc; TREEVIEW_ITEM *item; + HTHEME theme; if (infoPtr->clientHeight == 0 || infoPtr->clientWidth == 0) { @@ -2917,6 +2918,12 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, HDC hdc, const RECT *rc) return; } + if (infoPtr->dwStyle & TVS_HASBUTTONS && (theme = GetWindowTheme(infoPtr->hwnd))) + { + if (IsThemeBackgroundPartiallyTransparent(theme, TVP_GLYPH, 0)) + DrawThemeParentBackground(infoPtr->hwnd, hdc, NULL); + } + for (item = infoPtr->root->firstChild; item != NULL; item = TREEVIEW_GetNextListItem(infoPtr, item)) -- 2.30.2

1 0

[PATCH 1/6] comctl32/theme_scrollbar: Draw parent background before drawing control parts.
by Zhiyi Zhang 22 Jun '21

22 Jun '21

Control parts may be transparent, thus they need to be drawn on top of parent window background. Otherwise, black artifacts may occur. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/theme_scrollbar.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index 304ff5bacbc..7cc59bbd1e5 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -332,6 +332,8 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) else state = SZB_RIGHTALIGN; + if (IsThemeBackgroundPartiallyTransparent(theme, SBP_SIZEBOX, state)) + DrawThemeParentBackground(hwnd, dc, NULL); DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, &r, NULL); } else { SCROLLINFO si; @@ -365,6 +367,8 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) } } + DrawThemeParentBackground(hwnd, dc, NULL); + if (vertical) { SIZE upsize, downsize; int uparrowstate, downarrowstate; -- 2.30.2

1 0

[PATCH 2/2] winecfg: Set buddy window for the size up-down control only once.
by Zhiyi Zhang 22 Jun '21

22 Jun '21

Fix the size up-down control becoming smaller every time the apply button is pressed in the Desktop Integration tab. UDM_SETBUDDY always shrinks the buddy window for a up-down control according to tests. And a PSN_SETACTIVE notification is sent every time the apply button is pressed, thus init_dialog() gets called again and sends an extra UDM_SETBUDDY message. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winecfg/theme.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index b38b2ff26d6..687ea571311 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -434,6 +434,12 @@ static void enable_size_and_color_controls (HWND dialog, BOOL enable) } static void init_dialog (HWND dialog) +{ + SendDlgItemMessageW(dialog, IDC_SYSPARAM_SIZE_UD, UDM_SETBUDDY, + (WPARAM)GetDlgItem(dialog, IDC_SYSPARAM_SIZE), 0); +} + +static void update_dialog (HWND dialog) { updating_ui = TRUE; @@ -452,7 +458,6 @@ static void init_dialog (HWND dialog) } theme_dirty = FALSE; - SendDlgItemMessageW(dialog, IDC_SYSPARAM_SIZE_UD, UDM_SETBUDDY, (WPARAM)GetDlgItem(dialog, IDC_SYSPARAM_SIZE), 0); SendDlgItemMessageW(dialog, IDC_SYSPARAM_SIZE_UD, UDM_SETRANGE, 0, MAKELONG(100, 8)); updating_ui = FALSE; @@ -1197,6 +1202,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) update_shell_folder_listview(hDlg); read_sysparams(hDlg); init_mime_types(hDlg); + init_dialog(hDlg); break; case WM_DESTROY: @@ -1349,7 +1355,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; } case PSN_SETACTIVE: { - init_dialog (hDlg); + update_dialog(hDlg); break; } } -- 2.30.2

1 0

[PATCH 1/2] comctl32/tests: Add UDS_SETBUDDY tests.
by Zhiyi Zhang 22 Jun '21

22 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/updown.c | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index d0fff562499..a58ea899dc9 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -973,6 +973,42 @@ static void test_updown_pos_notifications(void) DestroyWindow(updown); } +static void test_UDS_SETBUDDY(void) +{ + static const int start_width = 100, start_height = 100; + int width, height, updown_width; + HWND updown; + RECT rect; + BOOL ret; + + updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT | UDS_ARROWKEYS, g_edit); + ret = SetWindowPos(g_edit, 0, 100, 100, start_width, start_height, SWP_NOACTIVATE | SWP_NOZORDER); + ok(ret, "SetWindowPos failed, error %u.\n", GetLastError()); + ret = GetWindowRect(g_edit, &rect); + ok(ret, "GetWindowRect failed, error %u.\n", GetLastError()); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + ok(width == start_width, "Expected width %d, got %d.\n", start_width, width); + ok(height == start_height, "Expected height %d, got %d.\n", start_height, height); + + SendMessageA(updown, UDM_SETBUDDY, (WPARAM)g_edit, 0); + ret = GetWindowRect(g_edit, &rect); + ok(ret, "GetWindowRect failed, error %u.\n", GetLastError()); + updown_width = start_width - (rect.right - rect.left); + ok(updown_width > 0, "Expected updown width > 0, got %d.\n", updown_width); + + SendMessageA(updown, UDM_SETBUDDY, (WPARAM)g_edit, 0); + ret = GetWindowRect(g_edit, &rect); + ok(ret, "GetWindowRect failed, error %u.\n", GetLastError()); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + ok(width == start_width - 2 * updown_width, "Expected width %d, got %d.\n", + start_width - 2 * updown_width, width); + ok(height == start_height, "Expected height %d, got %d.\n", start_height, height); + + DestroyWindow(updown); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1002,6 +1038,7 @@ START_TEST(updown) test_updown_buddy(); test_updown_base(); test_updown_unicode(); + test_UDS_SETBUDDY(); test_UDS_SETBUDDYINT(); test_CreateUpDownControl(); test_updown_pos_notifications(); -- 2.30.2

1 0

[PATCH] gdi32: Only family_name that are equal should not return true immediately while comparing face.
by Jiangyi Chen 22 Jun '21

22 Jun '21

2 1

[PATCH 1/6] ntoskrnl.exe/tests: Return success from IOCTL_HID_GET_STRING.
by Rémi Bernon 22 Jun '21

22 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series should hopefully not interfere with the other hidclass.sys, but I'm actually sending it to get some feedback about PATCH 4. Here's a bit of context: Implementing support for reports in the HID test driver, instead of returning STATUS_NOT_IMPLEMENTED, prevent spurious reboots on Windows when reading the reports, so it has to be done. However, returning input reports immediately in non-polled mode makes Windows loop forever on device initialization, probably trying to drain any input report buffer. So we have to keep them as pending until they are read. This then causes a lock-up on Wine, unless we properly cancel the IRPs on device removal. But the lock-up happens before the minidriver gets notified of the removal, unless PATCH 4 is there. dlls/ntoskrnl.exe/tests/driver_hid.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index acb51d99816..01a3747cd29 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -386,7 +386,9 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(!in_size, "got input size %u\n", in_size); ok(out_size == 128, "got output size %u\n", out_size); - ret = STATUS_NOT_IMPLEMENTED; + memcpy(irp->UserBuffer, L"Wine Test", sizeof(L"Wine Test")); + irp->IoStatus.Information = sizeof(L"Wine Test"); + ret = STATUS_SUCCESS; break; default: -- 2.31.0

3 16

[WineHQ] Fix the CodeWeavers and CrossOver case.
by Francois Gouget 22 Jun '21

22 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- templates/de/irc.template | 4 ++-- templates/en/irc.template | 4 ++-- templates/fr/about.template | 2 +- templates/ko/irc.template | 4 ++-- templates/nl/irc.template | 4 ++-- templates/zh-cn/irc.template | 2 +- wwn/en/wn20150116_383.xml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-)

1 0

[WineHQ] Fix the case of PayPal.
by Francois Gouget 22 Jun '21

22 Jun '21

1 0

[WineHQ] README: Fix some spelling issues.
by Francois Gouget 22 Jun '21

22 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- README | 6 +++--- images/shots/README | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index bca104cf..0b3100cb 100644 --- a/README +++ b/README @@ -28,15 +28,15 @@ For example, http://www.example.com/winehq_org/new_page is templates/en/new_page.template You can nest templates into subdirs. -The following varables can be used in templates. +The following variables can be used in templates. {$root} : relative path back to root of website {$base_url} : full URL of main website, as defined in winehq.conf {$self} : same as $_SERVER['PHP_SELF'] in PHP {$request_uri} : same as $_SERVER['REQUEST_URI'] in PHP -You can also add global vars to include/globals.conf and they will be availbe as -{$config_[key]} where [key] is the name you defined in globals.conf +You can also add global vars to include/globals.conf and they will be available +as {$config_[key]} where [key] is the name you defined in globals.conf Translating: ----------------------------------------------------------------------- diff --git a/images/shots/README b/images/shots/README index 65d05ab7..a15975b9 100644 --- a/images/shots/README +++ b/images/shots/README @@ -2,7 +2,7 @@ Screen Shots How To Place thumnail of 200x150 in this dir. Place Full Size image in ./full dir. -Place desription XML in ./desc dir. +Place description XML in ./desc dir. Images must be named incrementally as such. -- 2.20.1

1 0

[PATCH v2] winevulkan: Fix bit field struct members.
by Georg Lehmann 21 Jun '21

21 Jun '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b7d57b8218d..e8534cbd5f5 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1078,7 +1078,7 @@ class VkHandle(object): class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, - dyn_array_len=None, optional=False, values=None, object_type=None): + dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None): self.const = const self.struct_fwd_decl = struct_fwd_decl self.name = name @@ -1090,6 +1090,7 @@ class VkMember(object): self.optional = optional self.values = values self.object_type = object_type + self.bit_width = bit_width def __eq__(self, other): """ Compare member based on name against a string. @@ -1116,6 +1117,7 @@ class VkMember(object): member_type = None pointer = None array_len = None + bit_width = None values = member.get("values") @@ -1161,8 +1163,14 @@ class VkMember(object): object_type = member.get("objecttype", None) + # Some members are bit field values: + # <member><type>uint32_t</type> <name>mask</name>:8</member> + if name_elem.tail and name_elem.tail[0] == ':': + LOGGER.debug("Found bit field") + bit_width = int(name_elem.tail[1:]) + return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, - array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values, object_type=object_type) + array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values, object_type=object_type, bit_width=bit_width) def copy(self, input, output, direction, conv): """ Helper method for use by conversion logic to generate a C-code statement to copy this member. @@ -1267,6 +1275,9 @@ class VkMember(object): if self.is_static_array(): text += "[{0}]".format(self.array_len) + if self.is_bit_field(): + text += ":{}".format(self.bit_width) + return text def get_conversions(self): @@ -1344,6 +1355,9 @@ class VkMember(object): return self.object_type != None and self.type == "uint64_t" + def is_bit_field(self): + return self.bit_width is not None + def needs_alignment(self): """ Check if this member needs alignment for 64-bit data. Various structures need alignment on 64-bit variables due -- 2.32.0

2 1

[PATCH] shell32: Add IApplicationDocumentLists stub (resend)
by André Zwing 21 Jun '21

21 Jun '21

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/shell32/shell32_classes.idl | 6 ++ dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellole.c | 1 + dlls/shell32/shellpath.c | 112 +++++++++++++++++++++++++++++++ include/shobjidl.idl | 31 +++++++++ 5 files changed, 151 insertions(+) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index f2c5ed4a766..22ef49ae5c7 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -74,6 +74,12 @@ coclass KnownFolderManager { interface IKnownFolderManager; } uuid(86c14003-4d6b-4ef3-a7b4-0506663b2e68) ] coclass ApplicationDestinations { interface IApplicationDestinations; } +[ + helpstring("Application Document List"), + threading(apartment), + uuid(86bec222-30f2-47e0-9f25-60d11cd75c28) +] coclass ApplicationDocumentLists { interface IApplicationDocumentLists; } + [ helpstring("Shell Drag and Drop Helper"), threading(apartment), diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index da50e19de46..99e5d0d4288 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -112,6 +112,7 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ApplicationDocumentLists_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, IUnknown **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 64ae59fd283..9870afe162e 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -68,6 +68,7 @@ static const struct { {&CLSID_ApplicationAssociationRegistration, ApplicationAssociationRegistration_Constructor}, {&CLSID_ApplicationDestinations, ApplicationDestinations_Constructor}, + {&CLSID_ApplicationDocumentLists, ApplicationDocumentLists_Constructor}, {&CLSID_AutoComplete, IAutoComplete_Constructor}, {&CLSID_ControlPanel, IControlPanel_Constructor}, {&CLSID_DragDropHelper, IDropTargetHelper_Constructor}, diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 005e905baaa..f7bbcdc10ab 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1178,6 +1178,118 @@ HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, return hr; } +typedef struct +{ + IApplicationDocumentLists IApplicationDocumentLists_iface; + LONG ref; +} IApplicationDocumentListsImpl; + +static inline IApplicationDocumentListsImpl *impl_from_IApplicationDocumentLists( IApplicationDocumentLists *iface ) +{ + return CONTAINING_RECORD(iface, IApplicationDocumentListsImpl, IApplicationDocumentLists_iface); +} + +static HRESULT WINAPI ApplicationDocumentLists_QueryInterface(IApplicationDocumentLists *iface, + REFIID riid, LPVOID *ppv) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IApplicationDocumentLists, riid)) + { + *ppv = &This->IApplicationDocumentLists_iface; + IUnknown_AddRef((IUnknown*)*ppv); + + TRACE("Returning IApplicationDocumentLists: %p\n", *ppv); + return S_OK; + } + + *ppv = NULL; + FIXME("(%p)->(%s, %p) interface not supported.\n", This, debugstr_guid(riid), ppv); + + return E_NOINTERFACE; +} + +static ULONG WINAPI ApplicationDocumentLists_AddRef(IApplicationDocumentLists *iface) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + return ref; +} + +static ULONG WINAPI ApplicationDocumentLists_Release(IApplicationDocumentLists *iface) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + if (ref == 0) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI ApplicationDocumentLists_SetAppID(IApplicationDocumentLists *iface, + const WCHAR *appid) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + + FIXME("(%p, %s) stub!\n", This, debugstr_w(appid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationDocumentLists_GetList(IApplicationDocumentLists *iface, + uint list_type, uint item_count, + REFIID riid, void **obj) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + + FIXME("(%p, %u, %u, %s, %p): stub\n", This, list_type, item_count, debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IApplicationDocumentListsVtbl ApplicationDocumentListsVtbl = +{ + ApplicationDocumentLists_QueryInterface, + ApplicationDocumentLists_AddRef, + ApplicationDocumentLists_Release, + ApplicationDocumentLists_SetAppID, + ApplicationDocumentLists_GetList +}; + +HRESULT WINAPI ApplicationDocumentLists_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) +{ + IApplicationDocumentListsImpl *This; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv); + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(This = SHAlloc(sizeof(*This)))) + return E_OUTOFMEMORY; + + This->IApplicationDocumentLists_iface.lpVtbl = &ApplicationDocumentListsVtbl; + This->ref = 0; + + hr = IUnknown_QueryInterface(&This->IApplicationDocumentLists_iface, riid, ppv); + if (FAILED(hr)) + SHFree(This); + + return hr; +} + typedef struct { const KNOWNFOLDERID *id; diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 52e0c5c9db1..92e4da36c77 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3485,6 +3485,29 @@ interface IApplicationDestinations : IUnknown HRESULT RemoveAllDestinations(); } +[ + object, + uuid(3c594f9f-9f30-47a1-979a-c9e83d3d0a06), + pointer_default(unique) +] +interface IApplicationDocumentLists : IUnknown +{ + typedef [v1_enum] enum APPDOCLISTTYPE + { + ADLT_RECENT = 0, + ADLT_FREQUENT = 1, + } APPDOCLISTTYPE; + + HRESULT SetAppID( + [in] LPCWSTR pszAppID); + + HRESULT GetList( + [in] APPDOCLISTTYPE list_type, + [in] UINT item_count, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); +} + [ uuid(6332debf-87b5-4670-90c0-5e57b408a49e), object, @@ -3825,6 +3848,14 @@ library ShellObjects interface IApplicationDestinations; } + [ + uuid(86bec222-30f2-47e0-9f25-60d11cd75c28) + ] + coclass ApplicationDocumentLists + { + interface IApplicationDocumentLists; + } + [ uuid(00021401-0000-0000-c000-000000000046) ] -- 2.25.1

1 0

[PATCH v2 1/4] jscript: Don't list LexicalDeclaration in Statement.
by Paul Gofman 21 Jun '21

21 Jun '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - simplify test (use 'if (true)' insted of 'with'); - remove 'ClassDeclaration' from TODO list. dlls/jscript/compile.c | 8 ++-- dlls/jscript/parser.h | 16 ++++---- dlls/jscript/parser.y | 81 ++++++++++++++++------------------------ dlls/mshtml/tests/es5.js | 12 ++++++ 4 files changed, 57 insertions(+), 60 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0862ba39b62..1c4085dc64a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2448,7 +2448,7 @@ static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source, UINT64 s return S_OK; } -static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, function_expression_t *func_expr, +static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, function_expression_t *func_expr, BOOL from_eval, function_code_t *func) { function_expression_t *iter; @@ -2506,7 +2506,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, return E_OUTOFMEMORY; } - hres = visit_block_statement(ctx, NULL, source->statement); + hres = visit_block_statement(ctx, NULL, source ? source->head : NULL); if(FAILED(hres)) return hres; @@ -2547,7 +2547,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, ctx->current_function_expr = ctx->func_head; off = ctx->code_off; - hres = compile_block_statement(ctx, NULL, source->statement); + hres = compile_block_statement(ctx, NULL, source ? source->head : NULL); if(FAILED(hres)) return hres; @@ -2563,7 +2563,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, func->instr_off = off; for(iter = ctx->func_head, i=0; iter; iter = iter->next, i++) { - hres = compile_function(ctx, iter->source_elements, iter, FALSE, func->funcs+i); + hres = compile_function(ctx, iter->statement_list, iter, FALSE, func->funcs+i); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index c92a3f8bdbd..4553280517c 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -16,9 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -typedef struct _source_elements_t source_elements_t; typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; + +typedef struct _statement_list_t { + statement_t *head; + statement_t *tail; +} statement_list_t; + struct _bytecode_t; typedef struct { @@ -36,7 +41,7 @@ typedef struct _parser_ctx_t { script_ctx_t *script; struct _compiler_ctx_t *compiler; - source_elements_t *source; + statement_list_t *source; BOOL nl; BOOL implicit_nl_semicolon; BOOL is_html; @@ -290,17 +295,12 @@ typedef struct _parameter_t { struct _parameter_t *next; } parameter_t; -struct _source_elements_t { - statement_t *statement; - statement_t *statement_tail; -}; - typedef struct _function_expression_t { expression_t expr; const WCHAR *identifier; const WCHAR *event_target; parameter_t *parameter_list; - source_elements_t *source_elements; + statement_list_t *statement_list; const WCHAR *src_str; DWORD src_len; unsigned func_id; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 4bac8c65d0c..3f5f93fcc0c 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -31,11 +31,6 @@ static void set_error(parser_ctx_t*,unsigned,HRESULT); static BOOL explicit_error(parser_ctx_t*,void*,WCHAR); static BOOL allow_auto_semicolon(parser_ctx_t*); -typedef struct _statement_list_t { - statement_t *head; - statement_t *tail; -} statement_list_t; - static literal_t *new_string_literal(parser_ctx_t*,jsstr_t*); static literal_t *new_null_literal(parser_ctx_t*); @@ -121,7 +116,7 @@ static parameter_list_t *parameter_list_add(parser_ctx_t*,parameter_list_t*,cons static void *new_expression(parser_ctx_t *ctx,expression_type_t,size_t); static expression_t *new_function_expression(parser_ctx_t*,const WCHAR*,parameter_list_t*, - source_elements_t*,const WCHAR*,const WCHAR*,DWORD); + statement_list_t*,const WCHAR*,const WCHAR*,DWORD); static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expression_t*,expression_t*); static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*); static expression_t *new_conditional_expression(parser_ctx_t*,expression_t*,expression_t*,expression_t*); @@ -133,9 +128,6 @@ static expression_t *new_literal_expression(parser_ctx_t*,literal_t*); static expression_t *new_array_literal_expression(parser_ctx_t*,element_list_t*,int); static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t*); -static source_elements_t *new_source_elements(parser_ctx_t*); -static source_elements_t *source_elements_add_statement(source_elements_t*,statement_t*); - #define YYLTYPE unsigned #define YYLLOC_DEFAULT(Cur, Rhs, N) Cur = YYRHSLOC((Rhs), (N) ? 1 : 0) @@ -144,7 +136,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %lex-param { parser_ctx_t *ctx } %parse-param { parser_ctx_t *ctx } %define api.pure -%start Program +%start Script %union { int ival; @@ -160,7 +152,6 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state struct _parameter_list_t *parameter_list; struct _property_list_t *property_list; property_definition_t *property_definition; - source_elements_t *source_elements; statement_t *statement; struct _statement_list_t *statement_list; struct _variable_list_t *variable_list; @@ -179,9 +170,11 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %token <literal> tNumericLiteral tBooleanLiteral %token <str> tStringLiteral -%type <source_elements> SourceElements -%type <source_elements> FunctionBody +%type <statement_list> FunctionBody +%type <statement_list> ScriptBody +%type <statement_list> FunctionStatementList %type <statement> Statement +%type <statement> Declaration %type <statement> Block %type <statement> LexicalDeclaration %type <statement> VariableStatement @@ -198,6 +191,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <statement> ThrowStatement %type <statement> TryStatement %type <statement> Finally +%type <statement> StatementListItem %type <statement_list> StatementList StatementList_opt %type <parameter_list> FormalParameterList FormalParameterList_opt %type <expr> Expression Expression_opt Expression_err @@ -252,19 +246,21 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %% -/* ECMA-262 3rd Edition 14 */ -Program - : SourceElements HtmlComment { ctx->source = $1; } +/* ECMA-262 10th Edition 15.1 */ +Script + : ScriptBody HtmlComment { ctx->source = $1; } + +/* ECMA-262 10th Edition 15.1 */ +ScriptBody + : StatementList_opt { $$ = $1; } HtmlComment : tHTMLCOMMENT | /* empty */ -/* ECMA-262 3rd Edition 14 */ -SourceElements - : /* empty */ { $$ = new_source_elements(ctx); } - | SourceElements Statement - { $$ = source_elements_add_statement($1, $2); } +/* ECMA-262 10th Edition 14.1 */ +FunctionStatementList + : StatementList_opt { $$ = $1; } /* ECMA-262 3rd Edition 13 */ FunctionExpression @@ -275,9 +271,9 @@ FunctionExpression | kFUNCTION tIdentifier kDCOL tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, $4, $6, $9, $2, ctx->begin + @1, @10 - @1 + 1); } -/* ECMA-262 3rd Edition 13 */ +/* ECMA-262 10th Edition 14.1 */ FunctionBody - : SourceElements { $$ = $1; } + : FunctionStatementList { $$ = $1; } /* ECMA-262 3rd Edition 13 */ FormalParameterList @@ -293,7 +289,6 @@ FormalParameterList_opt /* ECMA-262 3rd Edition 12 */ Statement : Block { $$ = $1; } - | LexicalDeclaration { $$ = $1; } | VariableStatement { $$ = $1; } | EmptyStatement { $$ = $1; } | FunctionExpression { $$ = new_expression_statement(ctx, @$, $1); } @@ -309,10 +304,19 @@ Statement | ThrowStatement { $$ = $1; } | TryStatement { $$ = $1; } -/* ECMA-262 3rd Edition 12.2 */ +/* ECMA-262 10th Edition 13. TODO: HoistableDeclaration */ +Declaration + : LexicalDeclaration { $$ = $1; } + +/* ECMA-262 10th Edition 13.2 */ +StatementListItem + : Statement { $$ = $1; } + | Declaration { $$ = $1; } + +/* ECMA-262 10th Edition 13.2 */ StatementList - : Statement { $$ = new_statement_list(ctx, $1); } - | StatementList Statement + : StatementListItem { $$ = new_statement_list(ctx, $1); } + | StatementList StatementListItem { $$ = statement_list_add($1, $2); } /* ECMA-262 3rd Edition 12.2 */ @@ -1404,13 +1408,13 @@ static parameter_list_t *parameter_list_add(parser_ctx_t *ctx, parameter_list_t } static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *identifier, parameter_list_t *parameter_list, - source_elements_t *source_elements, const WCHAR *event_target, const WCHAR *src_str, DWORD src_len) + statement_list_t *statement_list, const WCHAR *event_target, const WCHAR *src_str, DWORD src_len) { function_expression_t *ret = new_expression(ctx, EXPR_FUNC, sizeof(*ret)); ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; - ret->source_elements = source_elements; + ret->statement_list = statement_list; ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len; @@ -1553,25 +1557,6 @@ static expression_t *new_literal_expression(parser_ctx_t *ctx, literal_t *litera return &ret->expr; } -static source_elements_t *new_source_elements(parser_ctx_t *ctx) -{ - source_elements_t *ret = parser_alloc(ctx, sizeof(source_elements_t)); - - memset(ret, 0, sizeof(*ret)); - - return ret; -} - -static source_elements_t *source_elements_add_statement(source_elements_t *source_elements, statement_t *statement) -{ - if(source_elements->statement_tail) - source_elements->statement_tail = source_elements->statement_tail->next = statement; - else - source_elements->statement = source_elements->statement_tail = statement; - - return source_elements; -} - static statement_list_t *new_statement_list(parser_ctx_t *ctx, statement_t *statement) { statement_list_t *ret = parser_alloc_tmp(ctx, sizeof(statement_list_t)); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 03663917177..19de053911b 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1318,6 +1318,18 @@ sync_test("declaration_let", function() { } ok(a == 3, "a != 3"); + + var except = false + + try + { + eval('if (true) let a = 3'); + } + catch (e) + { + except = true; + } + ok(except, "with({w:9}) let a = 3: expected exception."); }); sync_test("let scope instances", function() { -- 2.31.1

3 9

[PATCH] urlmon: Handle failure using HTTP Basic authentication scheme by asking user/password.
by Dmitry Timoshkov 21 Jun '21

21 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34964 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/urlmon/http.c | 10 ++++++++++ dlls/urlmon/protocol.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.h | 1 + 3 files changed, 49 insertions(+) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index bee226bd474..241e630c338 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -231,6 +231,9 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) if(This->base.bindf & BINDF_NO_UI) dlg_flags |= FLAGS_ERROR_UI_FLAGS_NO_UI; + if(!error) + dlg_flags |= FLAGS_ERROR_UI_FILTER_FOR_ERRORS; + res = InternetErrorDlg(hwnd, This->base.request, error, dlg_flags, NULL); hres = res == ERROR_INTERNET_FORCE_RETRY || res == ERROR_SUCCESS ? RPC_E_RETRY : internet_error_to_hres(error); } @@ -989,3 +992,10 @@ HRESULT HttpSProtocol_Construct(IUnknown *outer, void **ppv) return create_http_protocol(TRUE, outer, ppv); } + +void handle_basic_auth_error(Protocol *prot) +{ + HttpProtocol *This = impl_from_Protocol(prot); + + handle_http_error(This, ERROR_SUCCESS); +} diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 2acffdc1ffe..4600a6ccb75 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -220,6 +220,44 @@ static void WINAPI internet_status_callback(HINTERNET internet, DWORD_PTR contex IInternetProtocol_Release(protocol->protocol); break; + case INTERNET_STATUS_RESPONSE_RECEIVED: + { + DWORD status, size; + + TRACE("%p INTERNET_STATUS_RESPONSE_RECEIVED (%u bytes)\n", protocol, *(const DWORD *)status_info); + + size = sizeof(status); + if (HttpQueryInfoW(protocol->request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, 0)) + { + TRACE("request status: %u\n", status); + if (status == HTTP_STATUS_DENIED) + { + WCHAR auth[2048]; + DWORD idx; + BOOL is_basic = FALSE; + + TRACE("=> HTTP_STATUS_DENIED\n"); + + size = ARRAY_SIZE(auth); + idx = 0; + while (HttpQueryInfoW(protocol->request, HTTP_QUERY_WWW_AUTHENTICATE, auth, &size, &idx)) + { + static const WCHAR basicW[] = {'B','a','s','i','c'}; /* Note: not nul-terminated */ + + TRACE("WWW_AUTHENTICATE: %s\n", debugstr_w(auth)); + + is_basic = !wcsnicmp(auth, basicW, ARRAY_SIZE(basicW)); + + size = ARRAY_SIZE(auth); + } + + if (is_basic) + handle_basic_auth_error(protocol); + } + } + break; + } + default: WARN("Unhandled Internet status callback %d\n", internet_status); } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 691c63e3b42..77c506db66d 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -228,6 +228,7 @@ tls_data_t *get_tls_data(void) DECLSPEC_HIDDEN; void unregister_notif_wnd_class(void) DECLSPEC_HIDDEN; HWND get_notif_hwnd(void) DECLSPEC_HIDDEN; void release_notif_hwnd(HWND) DECLSPEC_HIDDEN; +void handle_basic_auth_error(Protocol*) DECLSPEC_HIDDEN; const char *debugstr_bindstatus(ULONG) DECLSPEC_HIDDEN; -- 2.31.1

3 7

[PATCH 1/4] jscript: Don't list LexicalDeclaration in Statement.
by Paul Gofman 21 Jun '21

21 Jun '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/jscript/compile.c | 8 ++-- dlls/jscript/parser.h | 16 ++++---- dlls/jscript/parser.y | 81 ++++++++++++++++------------------------ dlls/mshtml/tests/es5.js | 12 ++++++ 4 files changed, 57 insertions(+), 60 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0862ba39b62..1c4085dc64a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2448,7 +2448,7 @@ static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source, UINT64 s return S_OK; } -static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, function_expression_t *func_expr, +static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, function_expression_t *func_expr, BOOL from_eval, function_code_t *func) { function_expression_t *iter; @@ -2506,7 +2506,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, return E_OUTOFMEMORY; } - hres = visit_block_statement(ctx, NULL, source->statement); + hres = visit_block_statement(ctx, NULL, source ? source->head : NULL); if(FAILED(hres)) return hres; @@ -2547,7 +2547,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, ctx->current_function_expr = ctx->func_head; off = ctx->code_off; - hres = compile_block_statement(ctx, NULL, source->statement); + hres = compile_block_statement(ctx, NULL, source ? source->head : NULL); if(FAILED(hres)) return hres; @@ -2563,7 +2563,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, func->instr_off = off; for(iter = ctx->func_head, i=0; iter; iter = iter->next, i++) { - hres = compile_function(ctx, iter->source_elements, iter, FALSE, func->funcs+i); + hres = compile_function(ctx, iter->statement_list, iter, FALSE, func->funcs+i); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index c92a3f8bdbd..4553280517c 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -16,9 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -typedef struct _source_elements_t source_elements_t; typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; + +typedef struct _statement_list_t { + statement_t *head; + statement_t *tail; +} statement_list_t; + struct _bytecode_t; typedef struct { @@ -36,7 +41,7 @@ typedef struct _parser_ctx_t { script_ctx_t *script; struct _compiler_ctx_t *compiler; - source_elements_t *source; + statement_list_t *source; BOOL nl; BOOL implicit_nl_semicolon; BOOL is_html; @@ -290,17 +295,12 @@ typedef struct _parameter_t { struct _parameter_t *next; } parameter_t; -struct _source_elements_t { - statement_t *statement; - statement_t *statement_tail; -}; - typedef struct _function_expression_t { expression_t expr; const WCHAR *identifier; const WCHAR *event_target; parameter_t *parameter_list; - source_elements_t *source_elements; + statement_list_t *statement_list; const WCHAR *src_str; DWORD src_len; unsigned func_id; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 4bac8c65d0c..5cc088d017e 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -31,11 +31,6 @@ static void set_error(parser_ctx_t*,unsigned,HRESULT); static BOOL explicit_error(parser_ctx_t*,void*,WCHAR); static BOOL allow_auto_semicolon(parser_ctx_t*); -typedef struct _statement_list_t { - statement_t *head; - statement_t *tail; -} statement_list_t; - static literal_t *new_string_literal(parser_ctx_t*,jsstr_t*); static literal_t *new_null_literal(parser_ctx_t*); @@ -121,7 +116,7 @@ static parameter_list_t *parameter_list_add(parser_ctx_t*,parameter_list_t*,cons static void *new_expression(parser_ctx_t *ctx,expression_type_t,size_t); static expression_t *new_function_expression(parser_ctx_t*,const WCHAR*,parameter_list_t*, - source_elements_t*,const WCHAR*,const WCHAR*,DWORD); + statement_list_t*,const WCHAR*,const WCHAR*,DWORD); static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expression_t*,expression_t*); static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*); static expression_t *new_conditional_expression(parser_ctx_t*,expression_t*,expression_t*,expression_t*); @@ -133,9 +128,6 @@ static expression_t *new_literal_expression(parser_ctx_t*,literal_t*); static expression_t *new_array_literal_expression(parser_ctx_t*,element_list_t*,int); static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t*); -static source_elements_t *new_source_elements(parser_ctx_t*); -static source_elements_t *source_elements_add_statement(source_elements_t*,statement_t*); - #define YYLTYPE unsigned #define YYLLOC_DEFAULT(Cur, Rhs, N) Cur = YYRHSLOC((Rhs), (N) ? 1 : 0) @@ -144,7 +136,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %lex-param { parser_ctx_t *ctx } %parse-param { parser_ctx_t *ctx } %define api.pure -%start Program +%start Script %union { int ival; @@ -160,7 +152,6 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state struct _parameter_list_t *parameter_list; struct _property_list_t *property_list; property_definition_t *property_definition; - source_elements_t *source_elements; statement_t *statement; struct _statement_list_t *statement_list; struct _variable_list_t *variable_list; @@ -179,9 +170,11 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %token <literal> tNumericLiteral tBooleanLiteral %token <str> tStringLiteral -%type <source_elements> SourceElements -%type <source_elements> FunctionBody +%type <statement_list> FunctionBody +%type <statement_list> ScriptBody +%type <statement_list> FunctionStatementList %type <statement> Statement +%type <statement> Declaration %type <statement> Block %type <statement> LexicalDeclaration %type <statement> VariableStatement @@ -198,6 +191,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <statement> ThrowStatement %type <statement> TryStatement %type <statement> Finally +%type <statement> StatementListItem %type <statement_list> StatementList StatementList_opt %type <parameter_list> FormalParameterList FormalParameterList_opt %type <expr> Expression Expression_opt Expression_err @@ -252,19 +246,21 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %% -/* ECMA-262 3rd Edition 14 */ -Program - : SourceElements HtmlComment { ctx->source = $1; } +/* ECMA-262 10th Edition 15.1 */ +Script + : ScriptBody HtmlComment { ctx->source = $1; } + +/* ECMA-262 10th Edition 15.1 */ +ScriptBody + : StatementList_opt { $$ = $1; } HtmlComment : tHTMLCOMMENT | /* empty */ -/* ECMA-262 3rd Edition 14 */ -SourceElements - : /* empty */ { $$ = new_source_elements(ctx); } - | SourceElements Statement - { $$ = source_elements_add_statement($1, $2); } +/* ECMA-262 10th Edition 14.1 */ +FunctionStatementList + : StatementList_opt { $$ = $1; } /* ECMA-262 3rd Edition 13 */ FunctionExpression @@ -275,9 +271,9 @@ FunctionExpression | kFUNCTION tIdentifier kDCOL tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, $4, $6, $9, $2, ctx->begin + @1, @10 - @1 + 1); } -/* ECMA-262 3rd Edition 13 */ +/* ECMA-262 10th Edition 14.1 */ FunctionBody - : SourceElements { $$ = $1; } + : FunctionStatementList { $$ = $1; } /* ECMA-262 3rd Edition 13 */ FormalParameterList @@ -293,7 +289,6 @@ FormalParameterList_opt /* ECMA-262 3rd Edition 12 */ Statement : Block { $$ = $1; } - | LexicalDeclaration { $$ = $1; } | VariableStatement { $$ = $1; } | EmptyStatement { $$ = $1; } | FunctionExpression { $$ = new_expression_statement(ctx, @$, $1); } @@ -309,10 +304,19 @@ Statement | ThrowStatement { $$ = $1; } | TryStatement { $$ = $1; } -/* ECMA-262 3rd Edition 12.2 */ +/* ECMA-262 10th Edition 13. TODO: HoistableDeclaration, ClassDeclaration */ +Declaration + : LexicalDeclaration { $$ = $1; } + +/* ECMA-262 10th Edition 13.2 */ +StatementListItem + : Statement { $$ = $1; } + | Declaration { $$ = $1; } + +/* ECMA-262 10th Edition 13.2 */ StatementList - : Statement { $$ = new_statement_list(ctx, $1); } - | StatementList Statement + : StatementListItem { $$ = new_statement_list(ctx, $1); } + | StatementList StatementListItem { $$ = statement_list_add($1, $2); } /* ECMA-262 3rd Edition 12.2 */ @@ -1404,13 +1408,13 @@ static parameter_list_t *parameter_list_add(parser_ctx_t *ctx, parameter_list_t } static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *identifier, parameter_list_t *parameter_list, - source_elements_t *source_elements, const WCHAR *event_target, const WCHAR *src_str, DWORD src_len) + statement_list_t *statement_list, const WCHAR *event_target, const WCHAR *src_str, DWORD src_len) { function_expression_t *ret = new_expression(ctx, EXPR_FUNC, sizeof(*ret)); ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; - ret->source_elements = source_elements; + ret->statement_list = statement_list; ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len; @@ -1553,25 +1557,6 @@ static expression_t *new_literal_expression(parser_ctx_t *ctx, literal_t *litera return &ret->expr; } -static source_elements_t *new_source_elements(parser_ctx_t *ctx) -{ - source_elements_t *ret = parser_alloc(ctx, sizeof(source_elements_t)); - - memset(ret, 0, sizeof(*ret)); - - return ret; -} - -static source_elements_t *source_elements_add_statement(source_elements_t *source_elements, statement_t *statement) -{ - if(source_elements->statement_tail) - source_elements->statement_tail = source_elements->statement_tail->next = statement; - else - source_elements->statement = source_elements->statement_tail = statement; - - return source_elements; -} - static statement_list_t *new_statement_list(parser_ctx_t *ctx, statement_t *statement) { statement_list_t *ret = parser_alloc_tmp(ctx, sizeof(statement_list_t)); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 03663917177..3467698e159 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1318,6 +1318,18 @@ sync_test("declaration_let", function() { } ok(a == 3, "a != 3"); + + var except = false + + try + { + eval('with({w:9}) let a = 3'); + } + catch (e) + { + except = true; + } + ok(except, "with({w:9}) let a = 3: expected exception."); }); sync_test("let scope instances", function() { -- 2.31.1

3 6

[PATCH v2 resend 1/2] user32/tests: Add more tests of SetClipboardData().
by Jactry Zeng 21 Jun '21

21 Jun '21

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/user32/tests/clipboard.c | 79 ++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index c8de860f8cc..ea6081a4bb4 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1851,10 +1851,14 @@ static void test_data_handles(void) { BOOL r; char *ptr; - HANDLE h, text; + HANDLE h, text, metafile; HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); BITMAPINFO bmi; void *bits; + PALETTEENTRY entry; + BYTE buffer[1024]; + HENHMETAFILE emf; + int result; ok( hwnd != 0, "window creation failed\n" ); format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); @@ -1967,6 +1971,79 @@ static void test_data_handles(void) r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); + r = open_clipboard( hwnd ); + ok( r, "Open clipboard failed: %#x.\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#x.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_BITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_BITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + result = GetDIBits( GetDC(0), h, 0, 0, NULL, &bmi, 0 ); + todo_wine ok( !!result && result != ERROR_INVALID_PARAMETER, "GetDIBits failed: %#x.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_DSPBITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_DSPBITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok( !GetDIBits( GetDC(0), h, 0, 0, 0, &bmi, 0 ), "GetDIBits returned unexpected value.\n" ); + + palette = CreatePalette( &logpalette ); + h = SetClipboardData( CF_PALETTE, palette ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + ok( !!DeleteObject( palette ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_PALETTE ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + todo_wine ok( !!GetPaletteEntries( h, 0, 1, &entry ), "GetPaletteEntries %p failed.\n", h ); + todo_wine ok( entry.peRed == 0x12 && entry.peGreen == 0x34 && entry.peBlue == 0x56, + "Got wrong color (%02x, %02x, %02x).\n", entry.peRed, entry.peGreen, entry.peBlue ); + + emf = create_emf(); + h = SetClipboardData( CF_ENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_ENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + emf = create_emf(); + h = SetClipboardData( CF_DSPENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_DSPENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + metafile = create_metafile(); + h = SetClipboardData( CF_METAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_METAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + metafile = create_metafile(); + h = SetClipboardData( CF_DSPMETAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_DSPMETAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#x.\n", GetLastError() ); + r = CloseClipboard(); + ok( r, "CloseClipboard failed: %#x.\n", GetLastError() ); + DestroyWindow( hwnd ); } -- 2.30.2

1 1

[PATCH 2/2] msvcrt: Match native cosf results in -Pi/4 - Pi/4 range.
by Piotr Caban 21 Jun '21

21 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] msvcrt: Match native sinf results in -Pi/4 - Pi/4 range.
by Piotr Caban 21 Jun '21

21 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

1 0

[PATCH] winevulkan: Fix bit field struct members.
by Georg Lehmann 21 Jun '21

21 Jun '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9ef863837d1..87ac7d93823 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1086,7 +1086,7 @@ class VkHandle(object): class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, - dyn_array_len=None, optional=False, values=None): + dyn_array_len=None, optional=False, values=None, bit_width=None): self.const = const self.struct_fwd_decl = struct_fwd_decl self.name = name @@ -1097,6 +1097,7 @@ class VkMember(object): self.dyn_array_len = dyn_array_len self.optional = optional self.values = values + self.bit_width = bit_width def __eq__(self, other): """ Compare member based on name against a string. @@ -1123,6 +1124,7 @@ class VkMember(object): member_type = None pointer = None array_len = None + bit_width = None values = member.get("values") @@ -1166,8 +1168,14 @@ class VkMember(object): # Remove brackets around length array_len = name_elem.tail.strip("[]") + # Some members are bit field values: + # <member><type>uint32_t</type> <name>mask</name>:8</member> + if name_elem.tail and name_elem.tail[0] == ':': + LOGGER.debug("Found bit field") + bit_width = int(name_elem.tail[1:]) + return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, - array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values) + array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values, bit_width=bit_width) def copy(self, input, output, direction, conv): """ Helper method for use by conversion logic to generate a C-code statement to copy this member. @@ -1267,6 +1275,9 @@ class VkMember(object): if self.is_static_array(): text += "[{0}]".format(self.array_len) + if self.is_bit_field(): + text += ":{}".format(self.bit_width) + return text def get_conversions(self): @@ -1337,6 +1348,9 @@ class VkMember(object): def is_union(self): return self.type_info["category"] == "union" + def is_bit_field(self): + return self.bit_width is not None + def needs_alignment(self): """ Check if this member needs alignment for 64-bit data. Various structures need alignment on 64-bit variables due -- 2.32.0

1 0

[PATCH 5/5] uxtheme: Check window handle for SetWindowTheme().
by Zhiyi Zhang 21 Jun '21

21 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 4 ++++ dlls/uxtheme/tests/system.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 49742c947a0..33e407fdf82 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -690,6 +690,10 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, HRESULT hr; TRACE("(%p,%s,%s)\n", hwnd, debugstr_w(pszSubAppName), debugstr_w(pszSubIdList)); + + if (!hwnd) + return E_HANDLE; + hr = UXTHEME_SetWindowProperty(hwnd, atSubAppName, pszSubAppName); if(SUCCEEDED(hr)) hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 7ec72e30259..869dbe2cdc9 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -104,7 +104,6 @@ static void test_SetWindowTheme(void) HWND hWnd; hRes = SetWindowTheme(NULL, NULL, NULL); -todo_wine ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); /* Only do the bare minimum to get a valid hwnd */ -- 2.30.2

1 0

[PATCH 4/5] uxtheme: Check window handle for GetWindowTheme().
by Zhiyi Zhang 21 Jun '21

21 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 7 +++++++ dlls/uxtheme/tests/system.c | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 1c25f38d5d9..49742c947a0 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -669,6 +669,13 @@ HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR classlist) HTHEME WINAPI GetWindowTheme(HWND hwnd) { TRACE("(%p)\n", hwnd); + + if (!hwnd) + { + SetLastError(E_HANDLE); + return NULL; + } + return GetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme)); } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index a5d962d17a3..7ec72e30259 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -81,10 +81,7 @@ static void test_GetWindowTheme(void) SetLastError(0xdeadbeef); hTheme = GetWindowTheme(NULL); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_HANDLE, - "Expected E_HANDLE, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", GetLastError() ); /* Only do the bare minimum to get a valid hwnd */ hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); -- 2.30.2

1 0

[PATCH 3/5] uxtheme: Set last error code for OpenThemeDataEx().
by Zhiyi Zhang 21 Jun '21

21 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 2 + dlls/uxtheme/tests/system.c | 103 ++++++++++-------------------------- 2 files changed, 29 insertions(+), 76 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index aaef03f0205..1c25f38d5d9 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -642,6 +642,8 @@ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) if(IsWindow(hwnd)) SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme); TRACE(" = %p\n", hTheme); + + SetLastError(hTheme ? ERROR_SUCCESS : E_PROP_ID_UNSUPPORTED); return hTheme; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 3f259d08f79..a5d962d17a3 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -165,28 +165,21 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); hTheme = OpenThemeData(NULL, szInvalidClassList); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_PROP_ID_UNSUPPORTED, - "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected 0x%08x, got 0x%08x\n", + E_PROP_ID_UNSUPPORTED, GetLastError() ); SetLastError(0xdeadbeef); hTheme = OpenThemeData(NULL, szClassList); if (bThemeActive) { ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); } else { ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_PROP_ID_UNSUPPORTED, - "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected 0x%08x, got 0x%08x\n", + E_PROP_ID_UNSUPPORTED, GetLastError() ); } /* Only do the bare minimum to get a valid hdc */ @@ -203,20 +196,16 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); hTheme = OpenThemeData(hWnd, szInvalidClassList); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_PROP_ID_UNSUPPORTED, - "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected 0x%08x, got 0x%08x\n", + E_PROP_ID_UNSUPPORTED, GetLastError() ); if (!bThemeActive) { SetLastError(0xdeadbeef); hTheme = OpenThemeData(hWnd, szButtonClassList); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_PROP_ID_UNSUPPORTED, - "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected 0x%08x, got 0x%08x\n", + E_PROP_ID_UNSUPPORTED, GetLastError() ); skip("No active theme, skipping rest of OpenThemeData tests\n"); return; } @@ -226,27 +215,18 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); hTheme = OpenThemeData(hWnd, szButtonClassList); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); /* Test with bUtToN instead of Button */ SetLastError(0xdeadbeef); hTheme = OpenThemeData(hWnd, szButtonClassList2); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); SetLastError(0xdeadbeef); hTheme = OpenThemeData(hWnd, szClassList); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); /* GetWindowTheme should return the last handle opened by OpenThemeData */ SetLastError(0xdeadbeef); @@ -318,28 +298,21 @@ static void test_OpenThemeDataEx(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(NULL, szInvalidClassList, 0); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_PROP_ID_UNSUPPORTED, - "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected 0x%08x, got 0x%08x\n", + E_PROP_ID_UNSUPPORTED, GetLastError() ); SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(NULL, szClassList, 0); if (bThemeActive) { ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); } else { ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_PROP_ID_UNSUPPORTED, - "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected 0x%08x, got 0x%08x\n", + E_PROP_ID_UNSUPPORTED, GetLastError() ); } /* Only do the bare minimum to get a valid hdc */ @@ -356,20 +329,16 @@ static void test_OpenThemeDataEx(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(hWnd, szInvalidClassList, 0); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_PROP_ID_UNSUPPORTED, - "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected 0x%08x, got 0x%08x\n", + E_PROP_ID_UNSUPPORTED, GetLastError() ); if (!bThemeActive) { SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, 0); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_PROP_ID_UNSUPPORTED, - "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected 0x%08x, got 0x%08x\n", + E_PROP_ID_UNSUPPORTED, GetLastError() ); skip("No active theme, skipping rest of OpenThemeDataEx tests\n"); return; } @@ -379,51 +348,33 @@ static void test_OpenThemeDataEx(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, 0); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, OTD_FORCE_RECT_SIZING); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, OTD_NONCLIENT); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, 0x3); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); /* Test with bUtToN instead of Button */ SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(hWnd, szButtonClassList2, 0); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(hWnd, szClassList, 0); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); DestroyWindow(hWnd); } -- 2.30.2

1 0

[PATCH 2/5] uxtheme: Fall back to default class if the specified subclass is not found.
by Zhiyi Zhang 21 Jun '21

21 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50113 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 4 ++++ dlls/uxtheme/tests/system.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index a37e532500a..aaef03f0205 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -634,6 +634,10 @@ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) if (pszUseClassList) hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList); + + /* Fall back to default class if the specified subclass is not found */ + if (!hTheme) + hTheme = MSSTYLES_OpenThemeClass(NULL, pszUseClassList); } if(IsWindow(hwnd)) SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index ae4de902730..3f259d08f79 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -127,7 +127,7 @@ todo_wine ok(hRes == S_OK, "Expected S_OK, got 0x%08x.\n", hRes); hTheme = OpenThemeData(hWnd, L"Button"); - todo_wine ok(!!hTheme, "OpenThemeData failed.\n"); + ok(!!hTheme, "OpenThemeData failed.\n"); CloseThemeData(hTheme); } else -- 2.30.2

1 0

[PATCH 1/5] uxtheme/tests: Test SetWindowTheme() with a non-existent subclass.
by Zhiyi Zhang 21 Jun '21

21 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 5b6c91dc481..ae4de902730 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -102,6 +102,7 @@ static void test_GetWindowTheme(void) static void test_SetWindowTheme(void) { + HTHEME hTheme; HRESULT hRes; HWND hWnd; @@ -110,12 +111,30 @@ todo_wine ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); /* Only do the bare minimum to get a valid hwnd */ - hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); + hWnd = CreateWindowExA(0, "button", "test", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); ok(hWnd != NULL, "Failed to create a test window.\n"); hRes = SetWindowTheme(hWnd, NULL, NULL); ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); + if (IsThemeActive()) + { + hTheme = OpenThemeData(hWnd, L"Button"); + ok(!!hTheme, "OpenThemeData failed.\n"); + CloseThemeData(hTheme); + + hRes = SetWindowTheme(hWnd, L"deadbeef", NULL); + ok(hRes == S_OK, "Expected S_OK, got 0x%08x.\n", hRes); + + hTheme = OpenThemeData(hWnd, L"Button"); + todo_wine ok(!!hTheme, "OpenThemeData failed.\n"); + CloseThemeData(hTheme); + } + else + { + skip("No active theme, skipping rest of SetWindowTheme tests.\n"); + } + DestroyWindow(hWnd); } -- 2.30.2

1 0

[PATCH] winex11.drv: Cache the current mode for detached outputs.
by Zhiyi Zhang 21 Jun '21

21 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index c3af35d8ec3..e3fa7a6e1d6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1390,6 +1390,7 @@ static void xrandr14_free_modes( DEVMODEW *modes ) static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) { + struct current_mode *mode_ptr = NULL; XRRScreenResources *screen_resources; XRROutputInfo *output_info = NULL; RROutput output = (RROutput)id; @@ -1406,13 +1407,15 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) continue; if (!current_modes[mode_idx].loaded) + { + mode_ptr = &current_modes[mode_idx]; break; + } memcpy( mode, &current_modes[mode_idx].mode, sizeof(*mode) ); LeaveCriticalSection( &current_modes_section ); return TRUE; } - LeaveCriticalSection( &current_modes_section ); screen_resources = xrandr_get_screen_resources(); if (!screen_resources) @@ -1473,21 +1476,15 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) mode->u1.s2.dmPosition.y = crtc_info->y - primary.top; ret = TRUE; - EnterCriticalSection( &current_modes_section ); - for (mode_idx = 0; mode_idx < current_mode_count; ++mode_idx) +done: + if (ret && mode_ptr) { - if (current_modes[mode_idx].id != id) - continue; - - memcpy( &current_modes[mode_idx].mode, mode, sizeof(*mode) ); - current_modes[mode_idx].mode.dmSize = sizeof(*mode); - current_modes[mode_idx].mode.dmDriverExtra = 0; - current_modes[mode_idx].loaded = TRUE; - break; + memcpy( &mode_ptr->mode, mode, sizeof(*mode) ); + mode_ptr->mode.dmSize = sizeof(*mode); + mode_ptr->mode.dmDriverExtra = 0; + mode_ptr->loaded = TRUE; } LeaveCriticalSection( &current_modes_section ); - -done: if (crtc_info) pXRRFreeCrtcInfo( crtc_info ); if (output_info) -- 2.30.2

1 0

[PATCH] gdi32: Quiet a noisy FIXME.
by Zhiyi Zhang 21 Jun '21

21 Jun '21

"fixme:font:get_name_record_codepage encoding 20 not handled, platform 1." always shows up. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 5a22f61cbd3..069ffaabf56 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -344,7 +344,7 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_MAC_ENCODING_THAI: return 10021; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); + WARN( "encoding %u not handled, platform %d.\n", encoding, platform ); break; } break; -- 2.30.2

1 0

[PATCH 1/6] winevulkan: Update to VK spec version 1.2.182.
by Georg Lehmann 21 Jun '21

21 Jun '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9ef863837d1..f758a58c935 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.178" +VK_XML_VERSION = "1.2.182" WINE_VK_VERSION = (1, 2) # Filenames to create. @@ -108,6 +108,7 @@ UNSUPPORTED_EXTENSIONS = [ # Extensions for other platforms "VK_EXT_external_memory_dma_buf", "VK_EXT_image_drm_format_modifier", + "VK_EXT_physical_device_drm", "VK_KHR_external_fence_fd", "VK_KHR_external_memory_fd", "VK_KHR_external_semaphore_fd", @@ -115,6 +116,9 @@ UNSUPPORTED_EXTENSIONS = [ # Extensions which require callback handling "VK_EXT_device_memory_report", + # Extensions which are broken + "VK_HUAWEI_subpass_shading", # https://github.com/KhronosGroup/Vulkan-Docs/issues/1564 + # Deprecated extensions "VK_NV_external_memory_capabilities", "VK_NV_external_memory_win32", -- 2.32.0

1 5

[PATCH 1/3] include: Add MFP_POSITIONTYPE_100NS symbol.
by Nikolay Sivov 21 Jun '21

21 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfuuid/mfplay.c | 4 ++++ include/mfplay.idl | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/mfuuid/mfplay.c b/dlls/mfuuid/mfplay.c index 1d28306fe4f..d73e52607c4 100644 --- a/dlls/mfuuid/mfplay.c +++ b/dlls/mfuuid/mfplay.c @@ -17,5 +17,9 @@ */ #include "evr.h" + +#undef EXTERN_GUID +#define EXTERN_GUID DEFINE_GUID + #include "initguid.h" #include "mfplay.h" diff --git a/include/mfplay.idl b/include/mfplay.idl index 7d4345e69e7..42591439a0b 100644 --- a/include/mfplay.idl +++ b/include/mfplay.idl @@ -197,6 +197,8 @@ cpp_quote("#define MFP_GET_ERROR_EVENT(hdr) __MFP_CAST_EVENT(h cpp_quote("#define MFP_GET_PLAYBACK_ENDED_EVENT(hdr) __MFP_CAST_EVENT(hdr, PLAYBACK_ENDED)") cpp_quote("#define MFP_GET_ACQUIRE_USER_CREDENTIAL_EVENT(hdr) __MFP_CAST_EVENT(hdr, ACQUIRE_USER_CREDENTIAL)") +cpp_quote("EXTERN_GUID(MFP_POSITIONTYPE_100NS, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0);") + [ object, uuid(766c8ffb-5fdb-4fea-a28d-b912996f51bd), -- 2.30.2

1 2

[PATCH 1/6] ws2_32/tests: Avoid some more test failures on Vista.
by Zebediah Figura 20 Jun '21

20 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f67bc4efae5..b171e6c03e1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3816,6 +3816,9 @@ static void test_fionread_siocatmark(void) ret = recv(client, buffer, 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask_todo(client, POLLRDBAND, POLLRDBAND); + check_fionread_siocatmark_todo(client, 2, FALSE); ret = recv(client, buffer, 5, 0); @@ -3831,6 +3834,9 @@ static void test_fionread_siocatmark(void) ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDBAND, POLLRDBAND); + ret = 1; ret = setsockopt(client, SOL_SOCKET, SO_OOBINLINE, (char *)&ret, sizeof(ret)); ok(!ret, "got error %u\n", WSAGetLastError()); @@ -3845,6 +3851,9 @@ static void test_fionread_siocatmark(void) ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDNORM, POLLRDNORM); + check_fionread_siocatmark(client, 1, TRUE); closesocket(client); -- 2.30.2

2 6

[PATCH] iphlpapi: fix the usage of Linux's unprivileged ICMP sockets
by Damjan Jovanovic 20 Jun '21

20 Jun '21

Linux's unprivileged ICMP sockets are completely broken in Wine, and radically differ from MacOS's. Linux doesn't provide IP headers but reports some of the IP header data in the recvmsg() ancillary data, overwrites icmp_id with its own value (a "port" number you can bind() to but can't getsockname()), and on error MSG_ERRQUEUE reads the offending packet's ICMP instead of the reply's while ancillary data provides some of the reply's ICMP fields. This patch fixes these issues and gets Linux's parody implementation to a largely functional level. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8332 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/iphlpapi/icmp.c | 173 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 168 insertions(+), 5 deletions(-)

1 0

[PATCH 1/6] ws2_32/tests: Avoid some more test failures on Vista.
by Zebediah Figura 20 Jun '21

20 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f67bc4efae5..13a5a8687b0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3816,6 +3816,9 @@ static void test_fionread_siocatmark(void) ret = recv(client, buffer, 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDBAND, POLLRDBAND); + check_fionread_siocatmark_todo(client, 2, FALSE); ret = recv(client, buffer, 5, 0); @@ -3831,6 +3834,9 @@ static void test_fionread_siocatmark(void) ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDBAND, POLLRDBAND); + ret = 1; ret = setsockopt(client, SOL_SOCKET, SO_OOBINLINE, (char *)&ret, sizeof(ret)); ok(!ret, "got error %u\n", WSAGetLastError()); @@ -3845,6 +3851,9 @@ static void test_fionread_siocatmark(void) ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDNORM, POLLRDNORM); + check_fionread_siocatmark(client, 1, TRUE); closesocket(client); -- 2.30.2

2 9

[WineHQ] fr: Add a closing parenthesis.
by Francois Gouget 19 Jun '21

19 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- templates/fr/home.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[WineHQ] php: Fix the spelling of PHP comments.
by Francois Gouget 19 Jun '21

19 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/incl.php | 4 ++-- include/utils.php | 2 +- include/wwn.php | 2 +- site.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/incl.php b/include/incl.php index 4a528614..443bde2c 100644 --- a/include/incl.php +++ b/include/incl.php @@ -84,7 +84,7 @@ else $avail = array_map("strtolower", $avail); foreach ($avail as $inLang) { - // check to see if langage is available + // check to see if language is available if (in_array($inLang, $GLOBALS['config']->languages)) { debug("global", "lang from browser: {$inLang}"); @@ -92,7 +92,7 @@ else break; } - // check to see if variation of langage is available + // check to see if variation of language is available if (strlen($inLang) > 2) { $inLangAlt = substr($inLang, 0, 2); diff --git a/include/utils.php b/include/utils.php index 4876bd89..7052f67e 100644 --- a/include/utils.php +++ b/include/utils.php @@ -357,7 +357,7 @@ function array_finder ($array, $filter) return $ret; } -// sort a multi-dimentional array by one of the keys +// sort a multi-dimensional array by one of the keys function array_qsort (&$array, $column=0, $order=SORT_ASC, $first=0, $last= -2) { // $array - the array to be sorted diff --git a/include/wwn.php b/include/wwn.php index d13957ec..9231be81 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -21,7 +21,7 @@ class wwn private $map_array; private $inquote = 0; - // constuctor + // constructor public function __construct () { $this->summary = array(); diff --git a/site.php b/site.php index e108f779..1c4be8ce 100644 --- a/site.php +++ b/site.php @@ -56,7 +56,7 @@ if (isset($_SERVER['PATH_INFO'])) $_SERVER['PHP_SELF'] = str_replace($page_params, '', $_SERVER['PHP_SELF']); $_SERVER['PHP_SELF'] = preg_replace('/\/\/$/', '/', $_SERVER['PHP_SELF']); - // don't contine the loop, this is the end page + // don't continue the loop, this is the end page unset($page_params); break; } -- 2.20.1

1 0

[WineHQ] css: Fix the spelling of a comment.
by Francois Gouget 19 Jun '21

19 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- css/styles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 6dbda392..cf76dcc2 100644 --- a/css/styles.css +++ b/css/styles.css @@ -125,7 +125,7 @@ SPAN.link:active { color: #FF0000; text-decoration: none; } /* blockquote */ blockquote { font-size: inherit; } -/* horizonal rules */ +/* horizontal rules */ HR { border-top: 1px solid #d4d4d4; } /* DIV styles */ @@ -612,4 +612,4 @@ BODY.rtl { margin-left: 10px; } -} \ No newline at end of file +} -- 2.20.1

1 0

[WineHQ] js: Fix the spelling of a comment.
by Francois Gouget 19 Jun '21

19 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- js/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/utils.js b/js/utils.js index a07fe62d..0aeb0efd 100644 --- a/js/utils.js +++ b/js/utils.js @@ -1,5 +1,5 @@ /* - Misc JavaScipt for WineHQ + Misc JavaScript for WineHQ */ // load the vars passed on the `src` line -- 2.20.1

1 0

[WineHQ] include: Fix the spelling of a comment.
by Francois Gouget 19 Jun '21

19 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/htaccess.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index dbb7adf3..8de6b96d 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -89,7 +89,7 @@ RedirectMatch ^/(FAQ|Faq)$ https://wiki.winehq.org/FAQ RedirectMatch ^/(BUGS|Bugs|bugs)$ https://bugs.winehq.org/ RedirectMatch ^/(TROUBLE|Trouble|trouble)$ https://wiki.winehq.org/FAQ -# redirect soure website +# redirect source website RedirectMatch ^/WineAPI(.*)$ https://source.winehq.org/WineAPI$1 RedirectMatch ^/source(.*)$ https://source.winehq.org/source$1 RedirectMatch ^/cvsweb(.*)$ https://cvs.winehq.org/cvsweb$1 -- 2.20.1

1 0

[PATCH 4/4] shell32/tests: Add tests to show relative known folder paths match SHGetKnownFolderPath
by Andrew Eikum 19 Jun '21

19 Jun '21

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/shell32/tests/shellpath.c | 64 ++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 4c9b9693983..504812bad5d 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -291,6 +291,18 @@ static const char *getFolderName(int folder) } } +LPWSTR wcscasestr( LPCWSTR str, LPCWSTR sub ) +{ + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && towlower(*p1) == towlower(*p2)) { p1++; p2++; } + if (!*p2) return (WCHAR *)str; + str++; + } + return NULL; +} + /* Standard CSIDL values (and their flags) uses only two less-significant bytes */ #define NO_CSIDL 0x10000 #define WINE_ATTRIBUTES_OPTIONAL 0x20000 @@ -1964,10 +1976,11 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId HRESULT hr; int csidl, expectedCsidl, ret; KNOWNFOLDER_DEFINITION kfd; - IKnownFolder *folder; + IKnownFolder *folder, *kf_parent; WCHAR sName[1024]; BOOL found = FALSE; unsigned int i; + WCHAR *ikf_path, *gkfp_path, *ikf_parent_path; for (i = 0; i < ARRAY_SIZE(known_folders); ++i) { @@ -2019,10 +2032,57 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId ok_(__FILE__, known_folder->line)(!(kfd.kfdFlags & (~known_folder->definitionFlags)), "invalid known folder flags for %s: 0x%08x expected, but 0x%08x retrieved\n", known_folder->sFolderId, known_folder->definitionFlags, kfd.kfdFlags); + gkfp_path = NULL; + hr = pSHGetKnownFolderPath(folderId, KF_FLAG_DEFAULT, NULL, &gkfp_path); + if(SUCCEEDED(hr)) + { + ikf_path = NULL; + hr = IKnownFolder_GetPath(folder, KF_FLAG_DEFAULT, &ikf_path); + ok_(__FILE__, known_folder->line)(hr == S_OK, "IKnownFolder::GetPath failed: 0x%08x\n", hr); + ok_(__FILE__, known_folder->line)(ikf_path != NULL, "SHGetKnownFolderPath gave NULL path\n"); + + /* IKnownFolder::GetPath and SHGetKnownFolderPath should be the same */ + ok_(__FILE__, known_folder->line)(lstrcmpW(gkfp_path, ikf_path) == 0, "Got different paths: %s vs %s\n", + debugstr_w(gkfp_path), debugstr_w(ikf_path)); + + if(kfd.pszRelativePath) + { + /* RelativePath should be a substring of the path */ + ok_(__FILE__, known_folder->line)(wcscasestr(ikf_path, kfd.pszRelativePath) != NULL, + "KNOWNFOLDER_DEFINITION.pszRelativePath %s is not a substring of full path %s\n", + debugstr_w(kfd.pszRelativePath), debugstr_w(ikf_path)); + + hr = IKnownFolderManager_GetFolder(mgr, &kfd.fidParent, &kf_parent); + ok_(__FILE__, known_folder->line)(hr == S_OK, "IKnownFolderManager::GetFolder(parent) failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)) + { + ikf_parent_path = NULL; + hr = IKnownFolder_GetPath(kf_parent, KF_FLAG_DEFAULT, &ikf_parent_path); + ok_(__FILE__, known_folder->line)(hr == S_OK, "IKnownFolder::GetPath(parent) failed: 0x%08x\n", hr); + + /* Parent path + pszRelativePath should give the full path */ + ok_(__FILE__, known_folder->line)(memcmp(ikf_parent_path, ikf_path, lstrlenW(ikf_parent_path) * sizeof(WCHAR)) == 0, + "Full path %s does not start with parent path %s\n", + debugstr_w(ikf_path), debugstr_w(ikf_parent_path)); + ok_(__FILE__, known_folder->line)(*(ikf_path + lstrlenW(ikf_parent_path)) == '\\', + "Missing slash\n"); + ok_(__FILE__, known_folder->line)(wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0, + "Full path %s does not end with relative path %s\n", + debugstr_w(ikf_path), debugstr_w(kfd.pszRelativePath)); + + CoTaskMemFree(ikf_parent_path); + IKnownFolder_Release(kf_parent); + } + } + + CoTaskMemFree(ikf_path); + CoTaskMemFree(gkfp_path); + } FreeKnownFolderDefinitionFields(&kfd); } - IKnownFolder_Release(folder); + IKnownFolder_Release(folder); } break; -- 2.31.1

2 2

[PATCH 2/2] ntdll: Validate directory path when the path name ends with a dos device name.
by Akihiro Sagawa 19 Jun '21

19 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51291 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/path.c | 91 +++++++++++++++++++++++++++++++++++------ dlls/ntdll/tests/path.c | 2 - 2 files changed, 78 insertions(+), 15 deletions(-)

1 0

[PATCH 1/2] ntdll/tests: Expand path name tests with path + device name.
by Akihiro Sagawa 19 Jun '21

19 Jun '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/tests/path.c | 44 +++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 19 deletions(-)

1 0

Wine staging 6.11 release
by Alistair Leslie-Hughes 19 Jun '21

19 Jun '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.11 (578 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * msvcrt: Calculate sinh/cosh/exp/pow with higher precision. * ntdll: Do not allow to deallocate thread stack for current thread. Added: * None Updated: * Various patchsets to remove compiler warnings. Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v5 1/6] jscript: Factor local_ref_scopes_t structure out of function_code_t.
by Paul Gofman 18 Jun '21

18 Jun '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/jscript/compile.c | 14 +++++++++----- dlls/jscript/engine.c | 10 +++++----- dlls/jscript/engine.h | 9 +++++++-- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 2a17639641f..46efd53cdb5 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2379,10 +2379,14 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, if(FAILED(hres)) return hres; - func->locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->locals)); - if(!func->locals) + func->local_scope_count = 1; + func->local_scopes = compiler_alloc(ctx->code, func->local_scope_count * sizeof(*func->local_scopes)); + if(!func->local_scopes) return E_OUTOFMEMORY; - func->locals_cnt = ctx->locals_cnt; + func->local_scopes[0].locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->local_scopes[0].locals)); + if(!func->local_scopes[0].locals) + return E_OUTOFMEMORY; + func->local_scopes[0].locals_cnt = ctx->locals_cnt; func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); if(!func->variables) @@ -2390,8 +2394,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, i = 0; WINE_RB_FOR_EACH_ENTRY(local, &ctx->locals, function_local_t, entry) { - func->locals[i].name = local->name; - func->locals[i].ref = local->ref; + func->local_scopes[0].locals[i].name = local->name; + func->local_scopes[0].locals[i].ref = local->ref; if(local->ref >= 0) { func->variables[local->ref].name = local->name; func->variables[local->ref].func_id = -1; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e0a6e10e98b..c6ca3a9c10d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -578,13 +578,12 @@ static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame, BO frame->base_scope->frame = NULL; - for(i = 0; i < frame->function->locals_cnt; i++) { - hres = jsdisp_propput_name(frame->variable_obj, frame->function->locals[i].name, - ctx->stack[local_off(frame, frame->function->locals[i].ref)]); + for(i = 0; i < frame->function->local_scopes[0].locals_cnt; i++) { + hres = jsdisp_propput_name(frame->variable_obj, frame->function->local_scopes[0].locals[i].name, + ctx->stack[local_off(frame, frame->function->local_scopes[0].locals[i].ref)]); if(FAILED(hres)) return hres; } - return S_OK; } @@ -630,7 +629,8 @@ static int __cdecl local_ref_cmp(const void *key, const void *ref) local_ref_t *lookup_local(const function_code_t *function, const WCHAR *identifier) { - return bsearch(identifier, function->locals, function->locals_cnt, sizeof(*function->locals), local_ref_cmp); + return bsearch(identifier, function->local_scopes[0].locals, function->local_scopes[0].locals_cnt, + sizeof(*function->local_scopes[0].locals), local_ref_cmp); } /* ECMA-262 3rd Edition 10.1.4 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 442e7334c41..a94f1f211e4 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -147,6 +147,11 @@ typedef struct { #define INVALID_LOCAL_REF 0x7fffffff +typedef struct { + unsigned locals_cnt; + local_ref_t *locals; +} local_ref_scopes_t; + typedef struct _function_code_t { BSTR name; int local_ref; @@ -168,8 +173,8 @@ typedef struct _function_code_t { unsigned param_cnt; BSTR *params; - unsigned locals_cnt; - local_ref_t *locals; + local_ref_scopes_t *local_scopes; + unsigned local_scope_count; bytecode_t *bytecode; } function_code_t; -- 2.31.1

3 15

[PATCH 1/2] mfplay: Create media item on player creation, when url is specified.
by Nikolay Sivov 18 Jun '21

18 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 29 +++++++++++++++++++++++++++++ dlls/mfplay/tests/mfplay.c | 20 ++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index f6cb81de436..0bbe59f4c90 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1911,14 +1911,26 @@ static const IMFAsyncCallbackVtbl media_player_session_events_callback_vtbl = media_player_session_events_callback_Invoke, }; +/*********************************************************************** + * MFPCreateMediaPlayer (mfplay.@) + */ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, IMFPMediaPlayerCallback *callback, HWND window, IMFPMediaPlayer **player) { struct media_player *object; + IMFPMediaItem *item; HRESULT hr; TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, window, player); + if (!player) + return E_POINTER; + + *player = NULL; + + if (!url && start_playback) + return E_INVALIDARG; + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1950,6 +1962,23 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C 0, mfplay_instance, NULL); } + if (url) + { + if (FAILED(hr = media_player_create_item_from_url(object, url, TRUE, 0, &item))) + { + WARN("Failed to create media item, hr %#x.\n", hr); + goto failed; + } + + hr = IMFPMediaPlayer_SetMediaItem(&object->IMFPMediaPlayer_iface, item); + IMFPMediaItem_Release(item); + if (FAILED(hr)) + { + WARN("Failed to set media item, hr %#x.\n", hr); + goto failed; + } + } + *player = &object->IMFPMediaPlayer_iface; return S_OK; diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index f11973ef939..a2d6da54f3e 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -87,6 +87,26 @@ static void test_create_player(void) HWND window; HRESULT hr; + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = MFPCreateMediaPlayer(NULL, TRUE, 0, NULL, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + player = (void *)0xdeadbeef; + hr = MFPCreateMediaPlayer(NULL, TRUE, 0, NULL, NULL, &player); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!player, "Unexpected pointer %p.\n", player); + + hr = MFPCreateMediaPlayer(L"doesnotexist.mp4", FALSE, 0, &callback, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = MFPCreateMediaPlayer(L"doesnotexist.mp4", FALSE, 0, &callback, NULL, &player); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); + + hr = MFPCreateMediaPlayer(NULL, TRUE, 0, &callback, NULL, &player); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.30.2

1 1

[PATCH 1/6] wined3d: Do not call wined3d_buffer_get_memory() in wined3d_buffer_init_data().
by Zebediah Figura 18 Jun '21

18 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This is scuffed, but ultimately this code path should go away anyway, and be replaced by an unconditional update_sub_resource. dlls/wined3d/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 12d038c0120..6cfeb4f510d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1041,7 +1041,6 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_sub_resource_data *data) { struct wined3d_resource *resource = &buffer->resource; - struct wined3d_bo_address bo; struct wined3d_box box; if (buffer->flags & WINED3D_BUFFER_USE_BO) @@ -1052,8 +1051,7 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, } else { - wined3d_buffer_get_memory(buffer, &bo, WINED3D_LOCATION_SYSMEM); - memcpy(bo.addr, data->data, resource->size); + memcpy(buffer->resource.heap_memory, data->data, resource->size); wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_SYSMEM); } -- 2.30.2

3 7

[PATCH vkd3d 1/5] vkd3d-shader: Write SM1 subtraction instructions.
by Zebediah Figura 18 Jun '21

18 Jun '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index afa096b0..7395772f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1733,6 +1733,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, write_sm1_binary_op(ctx, buffer, D3DSIO_MUL, &instr->reg, &arg1->reg, &arg2->reg); break; + case HLSL_IR_BINOP_SUB: + write_sm1_binary_op(ctx, buffer, D3DSIO_SUB, &instr->reg, &arg1->reg, &arg2->reg); + break; + case HLSL_IR_UNOP_NEG: write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, D3DSPSM_NEG); break; -- 2.31.1

4 16

[PATCH] winecoreaudio: Remove workarounds for Mac OS X 10.4 and 10.5.
by Brendan Shanks 18 Jun '21

18 Jun '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Also remove the check for AudioToolbox/AudioConverter.h, the only user of that macro was removed in d9ed4ee992b0b277dacf87d05cc0b69bcd06b90c ("l3codeca.acm: Remove the Mac OS AudioToolbox backend.") configure.ac | 18 ++---------------- dlls/winecoreaudio.drv/audiounit.c | 20 -------------------- dlls/winecoreaudio.drv/mmdevdrv.c | 22 ---------------------- 3 files changed, 2 insertions(+), 58 deletions(-) diff --git a/configure.ac b/configure.ac index ade04399af0..f76dd047825 100644 --- a/configure.ac +++ b/configure.ac @@ -431,9 +431,6 @@ AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ AL/al.h \ ApplicationServices/ApplicationServices.h \ - AudioToolbox/AudioConverter.h \ - AudioUnit/AudioUnit.h \ - AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ CommonCrypto/CommonCryptor.h \ @@ -800,21 +797,10 @@ case $host_os in AC_CHECK_FUNCS(SSLCopyPeerCertificates) LIBS="$ac_save_LIBS" fi - if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" + if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" then - if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" - then - AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") - else - dnl CoreServices needed by AudioUnit - AC_SUBST(COREAUDIO_LIBS,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") - fi + AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} - dnl Check for the AUGraphAddNode function - ac_save_LIBS="$LIBS" - LIBS="$LIBS $COREAUDIO_LIBS" - AC_CHECK_FUNCS(AUGraphAddNode) - LIBS="$ac_save_LIBS" fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index a3c190870ad..030ff4d090a 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -22,9 +22,6 @@ #define ULONG CoreFoundation_ULONG #define HRESULT CoreFoundation_HRESULT -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -#include <CoreServices/CoreServices.h> -#endif #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> #undef ULONG @@ -50,23 +47,6 @@ #include "coreaudio.h" #include "wine/debug.h" -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager types for compatibility's sake */ -typedef ComponentDescription AudioComponentDescription; -#endif - -#ifndef HAVE_AUGRAPHADDNODE -static inline OSStatus AUGraphAddNode(AUGraph graph, const AudioComponentDescription *desc, AUNode *node) -{ - return AUGraphNewNode(graph, desc, 0, NULL, node); -} - -static inline OSStatus AUGraphNodeInfo(AUGraph graph, AUNode node, AudioComponentDescription *desc, AudioUnit *au) -{ - return AUGraphGetNodeInfo(graph, node, desc, 0, NULL, au); -} -#endif - WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index bc153d92511..f07f4bae5fb 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -72,28 +72,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager functions for OSX 10.5 */ -typedef Component AudioComponent; -typedef ComponentDescription AudioComponentDescription; -typedef ComponentInstance AudioComponentInstance; - -static inline AudioComponent AudioComponentFindNext(AudioComponent ac, AudioComponentDescription *desc) -{ - return FindNextComponent(ac, desc); -} - -static inline OSStatus AudioComponentInstanceNew(AudioComponent ac, AudioComponentInstance *aci) -{ - return OpenAComponent(ac, aci); -} - -static inline OSStatus AudioComponentInstanceDispose(AudioComponentInstance aci) -{ - return CloseComponent(aci); -} -#endif - #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; -- 2.31.1

2 1

[PATCH 1/2] reg: Support the use of registry views during the 'add' operation
by Hugh McMaster 18 Jun '21

18 Jun '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/add.c | 22 ++++++++++++++++++---- programs/reg/tests/add.c | 32 ++++++++++++++++---------------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index fb0ee2a03fd..269fa30e5e1 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -158,7 +158,7 @@ static BOOL get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, return TRUE; } -static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, +static int run_add(HKEY root, WCHAR *path, REGSAM sam, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { HKEY hkey; @@ -167,7 +167,7 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, LONG rc; if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, NULL, &hkey, &dispos)) + KEY_READ|KEY_WRITE|sam, NULL, &hkey, &dispos)) { output_message(STRING_ACCESS_DENIED); return 1; @@ -229,6 +229,7 @@ int reg_add(int argc, WCHAR *argvW[]) HKEY root; WCHAR *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; BOOL value_empty = FALSE, force = FALSE; + REGSAM sam = 0; int i; if (!parse_registry_key(argvW[2], &root, &path)) @@ -249,8 +250,18 @@ int reg_add(int argc, WCHAR *argvW[]) value_empty = TRUE; continue; } - else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64")) + else if (!lstrcmpiW(str, L"reg:32")) + { + if (sam & KEY_WOW64_32KEY) goto invalid; + sam |= KEY_WOW64_32KEY; + continue; + } + else if (!lstrcmpiW(str, L"reg:64")) + { + if (sam & KEY_WOW64_64KEY) goto invalid; + sam |= KEY_WOW64_64KEY; continue; + } else if (!str[0] || str[1]) goto invalid; @@ -286,7 +297,10 @@ int reg_add(int argc, WCHAR *argvW[]) if (value_name && value_empty) goto invalid; - return run_add(root, path, value_name, value_empty, type, separator, data, force); + if (sam == (KEY_WOW64_32KEY|KEY_WOW64_64KEY)) + goto invalid; + + return run_add(root, path, sam, value_name, value_empty, type, separator, data, force); invalid: output_message(STRING_INVALID_SYNTAX); diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 264693ab349..3b4a895d0c5 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -277,13 +277,13 @@ static void test_command_syntax(void) /* Test registry view */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v abc /d 123 /f /reg:32 /reg:32", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v abc /d 123 /f /reg:32 /reg:64", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v abc /d 123 /f /reg:64 /reg:64", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } static void test_key_formats(void) @@ -914,12 +914,12 @@ static void test_registry_view_win64(void) run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine32 /d Test /f /reg:32", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); - todo_wine verify_reg(hkey, "Wine32", REG_SZ, "Test", 5, 0); - todo_wine close_key(hkey); - todo_wine delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + verify_reg(hkey, "Wine32", REG_SZ, "Test", 5, 0); + close_key(hkey); + delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); /* Try adding to the 64-bit registry view (64-bit Windows) */ run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine64 /d Test /f /reg:64", &r); @@ -958,16 +958,16 @@ static void test_registry_view_wow64(void) run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine64 /d Test /f /reg:64", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); - todo_wine verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); - todo_wine close_key(hkey); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + close_key(hkey); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); - todo_wine verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); - todo_wine close_key(hkey); - todo_wine delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + close_key(hkey); + delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); } START_TEST(add) -- 2.32.0

1 1

[PATCH v4 1/6] jscript: Factor local_ref_scopes_t structure out of function_code_t.
by Paul Gofman 18 Jun '21

18 Jun '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/jscript/compile.c | 14 +++++++++----- dlls/jscript/engine.c | 10 +++++----- dlls/jscript/engine.h | 9 +++++++-- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 2a17639641f..46efd53cdb5 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2379,10 +2379,14 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, if(FAILED(hres)) return hres; - func->locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->locals)); - if(!func->locals) + func->local_scope_count = 1; + func->local_scopes = compiler_alloc(ctx->code, func->local_scope_count * sizeof(*func->local_scopes)); + if(!func->local_scopes) return E_OUTOFMEMORY; - func->locals_cnt = ctx->locals_cnt; + func->local_scopes[0].locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->local_scopes[0].locals)); + if(!func->local_scopes[0].locals) + return E_OUTOFMEMORY; + func->local_scopes[0].locals_cnt = ctx->locals_cnt; func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); if(!func->variables) @@ -2390,8 +2394,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, i = 0; WINE_RB_FOR_EACH_ENTRY(local, &ctx->locals, function_local_t, entry) { - func->locals[i].name = local->name; - func->locals[i].ref = local->ref; + func->local_scopes[0].locals[i].name = local->name; + func->local_scopes[0].locals[i].ref = local->ref; if(local->ref >= 0) { func->variables[local->ref].name = local->name; func->variables[local->ref].func_id = -1; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e0a6e10e98b..c6ca3a9c10d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -578,13 +578,12 @@ static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame, BO frame->base_scope->frame = NULL; - for(i = 0; i < frame->function->locals_cnt; i++) { - hres = jsdisp_propput_name(frame->variable_obj, frame->function->locals[i].name, - ctx->stack[local_off(frame, frame->function->locals[i].ref)]); + for(i = 0; i < frame->function->local_scopes[0].locals_cnt; i++) { + hres = jsdisp_propput_name(frame->variable_obj, frame->function->local_scopes[0].locals[i].name, + ctx->stack[local_off(frame, frame->function->local_scopes[0].locals[i].ref)]); if(FAILED(hres)) return hres; } - return S_OK; } @@ -630,7 +629,8 @@ static int __cdecl local_ref_cmp(const void *key, const void *ref) local_ref_t *lookup_local(const function_code_t *function, const WCHAR *identifier) { - return bsearch(identifier, function->locals, function->locals_cnt, sizeof(*function->locals), local_ref_cmp); + return bsearch(identifier, function->local_scopes[0].locals, function->local_scopes[0].locals_cnt, + sizeof(*function->local_scopes[0].locals), local_ref_cmp); } /* ECMA-262 3rd Edition 10.1.4 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 442e7334c41..a94f1f211e4 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -147,6 +147,11 @@ typedef struct { #define INVALID_LOCAL_REF 0x7fffffff +typedef struct { + unsigned locals_cnt; + local_ref_t *locals; +} local_ref_scopes_t; + typedef struct _function_code_t { BSTR name; int local_ref; @@ -168,8 +173,8 @@ typedef struct _function_code_t { unsigned param_cnt; BSTR *params; - unsigned locals_cnt; - local_ref_t *locals; + local_ref_scopes_t *local_scopes; + unsigned local_scope_count; bytecode_t *bytecode; } function_code_t; -- 2.31.1

3 11

[PATCH] uiribbon: Add stubs for IUIImageFromBitmap.
by Vijay Kiran Kamuju 18 Jun '21

18 Jun '21

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/uiribbon/Makefile.in | 1 + dlls/uiribbon/main.c | 1 + dlls/uiribbon/uiimage.c | 110 +++++++++++++++++++++++++++++++ dlls/uiribbon/uiribbon_private.h | 6 ++ 4 files changed, 118 insertions(+) create mode 100644 dlls/uiribbon/uiimage.c diff --git a/dlls/uiribbon/Makefile.in b/dlls/uiribbon/Makefile.in index f41b4d4a55a..56d9c3ec93c 100644 --- a/dlls/uiribbon/Makefile.in +++ b/dlls/uiribbon/Makefile.in @@ -5,6 +5,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c \ + uiimage.c \ uiribbon.c IDL_SRCS = uiribbon_classes.idl diff --git a/dlls/uiribbon/main.c b/dlls/uiribbon/main.c index a76c349ad96..7f86d48f9b7 100644 --- a/dlls/uiribbon/main.c +++ b/dlls/uiribbon/main.c @@ -77,6 +77,7 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { { &CLSID_UIRibbonFramework, UIRibbonFrameworkImpl_Create }, + { &CLSID_UIRibbonImageFromBitmapFactory, UIRibbonImageFromBitmapFactoryImpl_Create }, }; static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, void **ppobj) diff --git a/dlls/uiribbon/uiimage.c b/dlls/uiribbon/uiimage.c new file mode 100644 index 00000000000..6f10159cbaa --- /dev/null +++ b/dlls/uiribbon/uiimage.c @@ -0,0 +1,110 @@ +/* + * Copyright 2021 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +#define COBJMACROS + +#include "uiribbon_private.h" + +#include <stdio.h> + +WINE_DEFAULT_DEBUG_CHANNEL(uiribbon); + +static inline UIRibbonImageFromBitmapFactoryImpl *impl_from_IUIImageFromBitmap(IUIImageFromBitmap *iface) +{ + return CONTAINING_RECORD(iface, UIRibbonImageFromBitmapFactoryImpl, IUIImageFromBitmap_iface); +} + +/*** IUnknown methods ***/ + +static HRESULT WINAPI UIRibbonImageFromBitmapFactoryImpl_QueryInterface(IUIImageFromBitmap *iface, REFIID riid, void **ppvObject) +{ + UIRibbonImageFromBitmapFactoryImpl *This = impl_from_IUIImageFromBitmap(iface); + + TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IUIImageFromBitmap)) + { + IUnknown_AddRef(iface); + *ppvObject = &This->IUIImageFromBitmap_iface; + return S_OK; + } + + ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); + return E_NOINTERFACE; +} + +static ULONG WINAPI UIRibbonImageFromBitmapFactoryImpl_AddRef(IUIImageFromBitmap *iface) +{ + UIRibbonImageFromBitmapFactoryImpl *This = impl_from_IUIImageFromBitmap(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + + return ref; +} + +static ULONG WINAPI UIRibbonImageFromBitmapFactoryImpl_Release(IUIImageFromBitmap *iface) +{ + UIRibbonImageFromBitmapFactoryImpl *This = impl_from_IUIImageFromBitmap(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +/*** IUIImageFromBitmap methods ***/ + +static HRESULT WINAPI UIRibbonImageFromBitmapFactoryImpl_CreateImage(IUIImageFromBitmap *iface, HBITMAP bitmap, UI_OWNERSHIP options, IUIImage **image) +{ + FIXME("(%p %d %p): stub!\n", bitmap, options, image); + + return E_NOTIMPL; +} + +static const IUIImageFromBitmapVtbl IUIImageFromBitmap_Vtbl = +{ + UIRibbonImageFromBitmapFactoryImpl_QueryInterface, + UIRibbonImageFromBitmapFactoryImpl_AddRef, + UIRibbonImageFromBitmapFactoryImpl_Release, + UIRibbonImageFromBitmapFactoryImpl_CreateImage +}; + +HRESULT UIRibbonImageFromBitmapFactoryImpl_Create(IUnknown *pUnkOuter, void **ppObj) +{ + UIRibbonImageFromBitmapFactoryImpl *object; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(UIRibbonImageFromBitmapFactoryImpl)); + if (!object) + return E_OUTOFMEMORY; + + object->IUIImageFromBitmap_iface.lpVtbl = &IUIImageFromBitmap_Vtbl; + object->ref = 1; + + *ppObj = &object->IUIImageFromBitmap_iface; + + return S_OK; +} diff --git a/dlls/uiribbon/uiribbon_private.h b/dlls/uiribbon/uiribbon_private.h index 9d7481533d0..b9334e43bbd 100644 --- a/dlls/uiribbon/uiribbon_private.h +++ b/dlls/uiribbon/uiribbon_private.h @@ -26,7 +26,13 @@ typedef struct { LONG ref; } UIRibbonFrameworkImpl; +typedef struct { + IUIImageFromBitmap IUIImageFromBitmap_iface; + LONG ref; +} UIRibbonImageFromBitmapFactoryImpl; + HRESULT UIRibbonFrameworkImpl_Create(IUnknown *pUnkOuter, void **ppObj) DECLSPEC_HIDDEN; +HRESULT UIRibbonImageFromBitmapFactoryImpl_Create(IUnknown *pUnkOuter, void **ppObj) DECLSPEC_HIDDEN; #endif /* __UIRIBBON_PRIVATE_INCLUDED__ */ -- 2.31.0

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel