- wine-devel - winehq.org

[website] German translation for release 6.15
by Julian Rüger 23 Aug '21

23 Aug '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.14
by Julian Rüger 23 Aug '21

23 Aug '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.13
by Julian Rüger 23 Aug '21

23 Aug '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH vkd3d 1/8] vkd3d-shader/hlsl: Use vkd3d_make_u32() in more places.
by Zebediah Figura 23 Aug '21

23 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9f5c18dd..38c71626 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -163,9 +163,9 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b } } - type->bytecode_offset = put_u32(buffer, sm4_class(type) | (sm4_base_type(type) << 16)); - put_u32(buffer, type->dimy | (type->dimx << 16)); - put_u32(buffer, array_size | (field_count << 16)); + type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(sm4_class(type), sm4_base_type(type))); + put_u32(buffer, vkd3d_make_u32(type->dimy, type->dimx)); + put_u32(buffer, vkd3d_make_u32(array_size, field_count)); put_u32(buffer, fields_offset); if (profile->major_version >= 5) @@ -207,7 +207,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) cbuffer_position = put_u32(&buffer, 0); put_u32(&buffer, cbuffer_count); /* bound resource count */ resource_position = put_u32(&buffer, 0); - put_u32(&buffer, (target_types[profile->type] << 16) | (profile->major_version << 8) | profile->minor_version); + put_u32(&buffer, vkd3d_make_u32(vkd3d_make_u16(profile->minor_version, profile->major_version), + target_types[profile->type])); put_u32(&buffer, 0); /* FIXME: compilation flags */ creator_position = put_u32(&buffer, 0); @@ -371,7 +372,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) VKD3D_SM4_LIB, }; - put_u32(&buffer, (shader_types[profile->type] << 16) | (profile->major_version << 4) | profile->minor_version); + put_u32(&buffer, vkd3d_make_u32((profile->major_version << 4) | profile->minor_version, shader_types[profile->type])); put_u32(&buffer, 0); /* FIXME: instruction token count */ dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size); -- 2.32.0

5 27

[PATCH] services/tests: Vista+ returns fixed 1024x768 WinDisc monitor information.
by Francois Gouget 23 Aug '21

23 Aug '21

Unlike Windows XP which returned the actual display information to non-interactive services. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/user32/sysparams.c | 4 ++-- programs/services/tests/service.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 24e39206746..00282ff27ee 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3980,12 +3980,12 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) /* Fallback to report one monitor */ if (handle == NULLDRV_DEFAULT_HMONITOR) { - RECT default_rect = {0, 0, 640, 480}; + RECT default_rect = {0, 0, 1024, 768}; info->rcMonitor = default_rect; info->rcWork = default_rect; info->dwFlags = MONITORINFOF_PRIMARY; if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, L"\\\\.\\DISPLAY1" ); + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, L"\\\\.\\WinDisc" ); return TRUE; } diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index aa9878b9769..64b7209a293 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -148,15 +148,15 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR r = GetMonitorInfoA(hmon, (MONITORINFO*)&mi); service_ok(r, "GetMonitorInfo failed.\n"); - service_ok(mi.rcMonitor.left == 0 && mi.rcMonitor.top == 0 && mi.rcMonitor.right >= 640 && mi.rcMonitor.bottom >= 480, + service_ok(mi.rcMonitor.left == 0 && mi.rcMonitor.top == 0 && mi.rcMonitor.right == 1024 && mi.rcMonitor.bottom == 768, "Unexpected monitor rcMonitor values: {%d,%d,%d,%d}\n", mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); - service_ok(mi.rcWork.left == 0 && mi.rcWork.top == 0 && mi.rcWork.right >= 640 && mi.rcWork.bottom >= 480, + service_ok(mi.rcWork.left == 0 && mi.rcWork.top == 0 && mi.rcWork.right == 1024 && mi.rcWork.bottom == 768, "Unexpected monitor rcWork values: {%d,%d,%d,%d}\n", mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); - service_ok(!strcmp(mi.szDevice, "WinDisc") || !strcmp(mi.szDevice, "\\\\.\\DISPLAY1"), + service_ok(!strcmp(mi.szDevice, "\\\\.\\WinDisc"), "Unexpected szDevice received: %s\n", mi.szDevice); service_ok(mi.dwFlags == MONITORINFOF_PRIMARY, "Unexpected secondary monitor info.\n"); -- 2.20.1

2 2

[PATCH] nsiproxy: Include netinet/in.h in udp.c
by Gerald Pfeifer 23 Aug '21

23 Aug '21

This is necessary to define struct in_addr which is used by netinet/ip.h on FreeBSD. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/udp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 9f9966815c2..190eb7f21f5 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -38,6 +38,10 @@ #include <sys/socketvar.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + #ifdef HAVE_NETINET_IP_H #include <netinet/ip.h> #endif -- 2.31.1

2 1

[PATCH v2 1/7] winebus.sys: Create the SDL bus thread in main.c.
by Rémi Bernon 23 Aug '21

23 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 211939-211944 v2: Move the threads first, introduce the unixlib next. Use a new unixlib style interface directly from the start but share the entry point table directly instead of using __wine_unix_call. dlls/winebus.sys/bus.h | 6 +- dlls/winebus.sys/bus_sdl.c | 150 +++++++++++++++---------------------- dlls/winebus.sys/main.c | 85 ++++++++++++++++++--- 3 files changed, 139 insertions(+), 102 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 3e53b9c53f1..c5b93b769c9 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -30,10 +30,12 @@ typedef int(*enum_func)(DEVICE_OBJECT *device, void *context); /* Buses */ NTSTATUS udev_driver_init(void) DECLSPEC_HIDDEN; NTSTATUS iohid_driver_init(void) DECLSPEC_HIDDEN; -NTSTATUS sdl_driver_init(void) DECLSPEC_HIDDEN; void udev_driver_unload( void ) DECLSPEC_HIDDEN; void iohid_driver_unload( void ) DECLSPEC_HIDDEN; -void sdl_driver_unload( void ) DECLSPEC_HIDDEN; + +extern NTSTATUS sdl_bus_init(void *) DECLSPEC_HIDDEN; +extern NTSTATUS sdl_bus_wait(void *) DECLSPEC_HIDDEN; +extern NTSTATUS sdl_bus_stop(void *) DECLSPEC_HIDDEN; /* Native device function table */ typedef struct diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 84e3ef20664..02509f1560c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -63,7 +63,6 @@ static const WCHAR sdl_busidW[] = {'S','D','L','J','O','Y',0}; static DWORD map_controllers = 0; static void *sdl_handle = NULL; -static HANDLE deviceloop_handle; static UINT quit_event = -1; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL @@ -889,68 +888,15 @@ static void sdl_load_mappings(void) } } -static DWORD CALLBACK deviceloop_thread(void *args) +NTSTATUS sdl_bus_init(void *args) { - HANDLE init_done = args; - SDL_Event event; - - if (pSDL_Init(SDL_INIT_GAMECONTROLLER|SDL_INIT_HAPTIC) < 0) - { - ERR("Can't init SDL: %s\n", pSDL_GetError()); - return STATUS_UNSUCCESSFUL; - } - - pSDL_JoystickEventState(SDL_ENABLE); - pSDL_GameControllerEventState(SDL_ENABLE); - - /* Process mappings */ - if (pSDL_GameControllerAddMapping != NULL) sdl_load_mappings(); - - SetEvent(init_done); - - while (1) { - while (pSDL_WaitEvent(&event) != 0) { - if (event.type == quit_event) { - TRACE("Device thread exiting\n"); - return 0; - } - process_device_event(&event); - } - } -} - -void sdl_driver_unload( void ) -{ - SDL_Event event; - - TRACE("Unload Driver\n"); - - if (!deviceloop_handle) - return; - - quit_event = pSDL_RegisterEvents(1); - if (quit_event == -1) { - ERR("error registering quit event\n"); - return; - } - - event.type = quit_event; - if (pSDL_PushEvent(&event) != 1) { - ERR("error pushing quit event\n"); - return; - } - - WaitForSingleObject(deviceloop_handle, INFINITE); - CloseHandle(deviceloop_handle); - dlclose(sdl_handle); -} + static const WCHAR controller_modeW[] = {'M','a','p',' ','C','o','n','t','r','o','l','l','e','r','s',0}; + static const UNICODE_STRING controller_mode = {sizeof(controller_modeW) - sizeof(WCHAR), sizeof(controller_modeW), (WCHAR*)controller_modeW}; -static BOOL sdl_initialize(void) -{ if (!(sdl_handle = dlopen(SONAME_LIBSDL2, RTLD_NOW))) { WARN("could not load %s\n", SONAME_LIBSDL2); - return FALSE; + return STATUS_UNSUCCESSFUL; } #define LOAD_FUNCPTR(f) \ if ((p##f = dlsym(sdl_handle, #f)) == NULL) \ @@ -1000,63 +946,85 @@ static BOOL sdl_initialize(void) pSDL_JoystickGetProduct = dlsym(sdl_handle, "SDL_JoystickGetProduct"); pSDL_JoystickGetProductVersion = dlsym(sdl_handle, "SDL_JoystickGetProductVersion"); pSDL_JoystickGetVendor = dlsym(sdl_handle, "SDL_JoystickGetVendor"); - return TRUE; + + if (pSDL_Init(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) < 0) + { + ERR("could not init SDL: %s\n", pSDL_GetError()); + goto failed; + } + + if ((quit_event = pSDL_RegisterEvents(1)) == -1) + { + ERR("error registering quit event\n"); + goto failed; + } + + pSDL_JoystickEventState(SDL_ENABLE); + pSDL_GameControllerEventState(SDL_ENABLE); + + map_controllers = check_bus_option(&controller_mode, 1); + + /* Process mappings */ + if (pSDL_GameControllerAddMapping != NULL) sdl_load_mappings(); + + return STATUS_SUCCESS; failed: dlclose(sdl_handle); sdl_handle = NULL; - return FALSE; + return STATUS_UNSUCCESSFUL; } -NTSTATUS sdl_driver_init(void) +NTSTATUS sdl_bus_wait(void *args) { - static const WCHAR controller_modeW[] = {'M','a','p',' ','C','o','n','t','r','o','l','l','e','r','s',0}; - static const UNICODE_STRING controller_mode = {sizeof(controller_modeW) - sizeof(WCHAR), sizeof(controller_modeW), (WCHAR*)controller_modeW}; + SDL_Event event; - HANDLE events[2]; - DWORD result; + do + { + if (pSDL_WaitEvent(&event) != 0) process_device_event(&event); + else WARN("SDL_WaitEvent failed: %s\n", pSDL_GetError()); + } while (event.type != quit_event); - if (!sdl_handle && !sdl_initialize()) return STATUS_UNSUCCESSFUL; + TRACE("SDL main loop exiting\n"); + dlclose(sdl_handle); + sdl_handle = NULL; + return STATUS_SUCCESS; +} - map_controllers = check_bus_option(&controller_mode, 1); +NTSTATUS sdl_bus_stop(void *args) +{ + SDL_Event event; - if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) - { - WARN("CreateEvent failed\n"); - return STATUS_UNSUCCESSFUL; - } - if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, events[0], 0, NULL))) - { - WARN("CreateThread failed\n"); - CloseHandle(events[0]); - return STATUS_UNSUCCESSFUL; - } + if (!sdl_handle) return STATUS_SUCCESS; - result = WaitForMultipleObjects(2, events, FALSE, INFINITE); - CloseHandle(events[0]); - if (result == WAIT_OBJECT_0) + event.type = quit_event; + if (pSDL_PushEvent(&event) != 1) { - TRACE("Initialization successful\n"); - deviceloop_handle = events[1]; - return STATUS_SUCCESS; + ERR("error pushing quit event\n"); + return STATUS_UNSUCCESSFUL; } - CloseHandle(events[1]); - dlclose(sdl_handle); - sdl_handle = NULL; - return STATUS_UNSUCCESSFUL; + return STATUS_SUCCESS; } #else -NTSTATUS sdl_driver_init(void) +NTSTATUS sdl_bus_init(void *args) { + WARN("SDL support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; } -void sdl_driver_unload( void ) +NTSTATUS sdl_bus_wait(void *args) { - TRACE("Stub: Unload Driver\n"); + WARN("SDL support not compiled in!\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS sdl_bus_stop(void *args) +{ + WARN("SDL support not compiled in!\n"); + return STATUS_NOT_IMPLEMENTED; } #endif /* SONAME_LIBSDL2 */ diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index e372ec6db3f..6be5e677bba 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -618,6 +618,74 @@ static void keyboard_device_create(void) IoInvalidateDeviceRelations(bus_pdo, BusRelations); } +static DWORD bus_count; +static HANDLE bus_thread[16]; + +struct bus_main_params +{ + const WCHAR *name; + + HANDLE init_done; + NTSTATUS (*init_func)(void *args); + + NTSTATUS (*wait_func)(void *args); +}; + +static DWORD CALLBACK bus_main_thread(void *args) +{ + struct bus_main_params bus = *(struct bus_main_params *)args; + NTSTATUS status; + + TRACE("%s main loop starting\n", debugstr_w(bus.name)); + status = bus.init_func(NULL); + SetEvent(bus.init_done); + TRACE("%s main loop started\n", debugstr_w(bus.name)); + + if (status) WARN("%s bus init returned status %#x\n", debugstr_w(bus.name), status); + else status = bus.wait_func(NULL); + + if (status) WARN("%s bus wait returned status %#x\n", debugstr_w(bus.name), status); + else TRACE("%s main loop exited\n", debugstr_w(bus.name)); + return status; +} + +static NTSTATUS bus_main_thread_start(struct bus_main_params *bus) +{ + DWORD i = bus_count++; + + if (!(bus->init_done = CreateEventW(NULL, FALSE, FALSE, NULL))) + { + ERR("failed to create %s bus init done event.\n", debugstr_w(bus->name)); + bus_count--; + return STATUS_UNSUCCESSFUL; + } + + if (!(bus_thread[i] = CreateThread(NULL, 0, bus_main_thread, bus, 0, NULL))) + { + ERR("failed to create %s bus thread.\n", debugstr_w(bus->name)); + CloseHandle(bus->init_done); + bus_count--; + return STATUS_UNSUCCESSFUL; + } + + WaitForSingleObject(bus->init_done, INFINITE); + CloseHandle(bus->init_done); + return STATUS_SUCCESS; +} + +static NTSTATUS sdl_driver_init(void) +{ + static const WCHAR bus_name[] = {'S','D','L',0}; + struct bus_main_params bus = + { + .name = bus_name, + .init_func = sdl_bus_init, + .wait_func = sdl_bus_wait, + }; + + return bus_main_thread_start(&bus); +} + static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { static const WCHAR SDL_enabledW[] = {'E','n','a','b','l','e',' ','S','D','L',0}; @@ -634,16 +702,12 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) mouse_device_create(); keyboard_device_create(); - if (check_bus_option(&SDL_enabled, 1)) + if (!check_bus_option(&SDL_enabled, 1) || sdl_driver_init()) { - if (sdl_driver_init() == STATUS_SUCCESS) - { - irp->IoStatus.Status = STATUS_SUCCESS; - break; - } + udev_driver_init(); + iohid_driver_init(); } - udev_driver_init(); - iohid_driver_init(); + irp->IoStatus.Status = STATUS_SUCCESS; break; case IRP_MN_SURPRISE_REMOVAL: @@ -652,7 +716,10 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_REMOVE_DEVICE: udev_driver_unload(); iohid_driver_unload(); - sdl_driver_unload(); + sdl_bus_stop(NULL); + + WaitForMultipleObjects(bus_count, bus_thread, TRUE, INFINITE); + while (bus_count--) CloseHandle(bus_thread[bus_count]); irp->IoStatus.Status = STATUS_SUCCESS; IoSkipCurrentIrpStackLocation(irp); -- 2.33.0

1 7

[PATCH 2/2] iphlpapi: Use the correct physical address.
by Huw Davies 23 Aug '21

23 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51642 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7d75ce5af3a..47c8a507e38 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1280,9 +1280,9 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD aa[i].FriendlyName = (WCHAR *)str_ptr; str_ptr += sizeof(rw[i].alias.String); } - aa[i].PhysicalAddressLength = rw->phys_addr.Length; + aa[i].PhysicalAddressLength = rw[i].phys_addr.Length; if (aa[i].PhysicalAddressLength > sizeof(aa[i].PhysicalAddress)) aa[i].PhysicalAddressLength = 0; - memcpy( aa[i].PhysicalAddress, rw->phys_addr.Address, aa[i].PhysicalAddressLength ); + memcpy( aa[i].PhysicalAddress, rw[i].phys_addr.Address, aa[i].PhysicalAddressLength ); aa[i].Mtu = dyn[i].mtu; aa[i].IfType = stat[i].type; aa[i].OperStatus = dyn[i].oper_status; -- 2.23.0

1 0

[PATCH 1/2] iphlpapi: Don't truncate 64-bit ptrs.
by Huw Davies 23 Aug '21

23 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51620 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51626 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 408ac14bd1b..7d75ce5af3a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -864,7 +864,8 @@ ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRESSES *src ) { char *ptr; - DWORD len, align = sizeof(ULONGLONG) - 1; + DWORD len; + UINT_PTR align = sizeof(ULONGLONG) - 1; struct address_entry_copy_params params; while (src) -- 2.23.0

1 0

[PATCH 2/2] winewrapper: Add dlls/ntdll to the library path so macOS can find ntdll.so.
by Huw Davies 23 Aug '21

23 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/winewrapper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winewrapper b/tools/winewrapper index 2206d7c4446..93d44bcd06c 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -69,9 +69,9 @@ if [ "`uname -s`" = "Darwin" ] then if [ -n "$DYLD_LIBRARY_PATH" ] then - DYLD_LIBRARY_PATH="$topdir/libs/wine:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="$topdir/libs/wine:$topdir/dlls/ntdll:$DYLD_LIBRARY_PATH" else - DYLD_LIBRARY_PATH="$topdir/libs/wine" + DYLD_LIBRARY_PATH="$topdir/libs/wine:$topdir/dlls/ntdll" fi export DYLD_LIBRARY_PATH else -- 2.23.0

1 0

[PATCH 1/2] winegcc: Add a @loader_path to help the macOS loader find ntdll.so.
by Huw Davies 23 Aug '21

23 Aug '21

On macOS unixlibs that link to ntdll.so currently fail to load. It appears the macOS loader needs to be able to locate the file even if the library is already loaded. This patch changes the LC_ID_DYLIB name of ntdll.so to "@loader_path/ntdll.so" so that when other unixlibs link against this they will insert that name into their LC_LOAD_DYLIB entry for ntdll.so. While changing only ntdll.so is necessary, for simplicity this patch changes all unixlibs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51632 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/winegcc/winegcc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 426336e4536..710f6dc900d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -492,6 +492,11 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, opts->image_base ); } if (opts->strip) strarray_add( flags, "-Wl,-x" ); + if (opts->unix_lib) + { + strarray_add( flags, "-install_name" ); + strarray_add( flags, strmake( "@loader_path/%s.so", output_name ) ); + } strarray_addall( link_args, flags ); return link_args; -- 2.23.0

1 0

[PATCH 5/5] light.msstyles: Add TrueSizeScalingType property to TrueSize sizing parts.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

When SizingType property value is TrueSize, theme part images are scaled only when TrueSizeScalingType property value is DPI or Size. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 5c67480f69a..76adf8f8398 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -207,6 +207,7 @@ BLUE_INI TEXTFILE "ImageCount = 12\r\n" "MirrorImage = False\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "Transparent = True\r\n" "ImageFile1 = blue_checkbox_13px.bmp\r\n" @@ -242,6 +243,7 @@ BLUE_INI TEXTFILE "ContentMargins = 0, 0, 0, 0\r\n" "ImageCount = 8\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_radiobutton_13px.bmp\r\n" "ImageFile2 = blue_radiobutton_16px.bmp\r\n" @@ -304,6 +306,7 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "ImageLayout = Vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "Transparent = True\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_commandlink_glyph_30px.bmp\r\n" @@ -556,6 +559,7 @@ BLUE_INI TEXTFILE "[ScrollBar.SizeBox]\r\n" "BgType = ImageFile\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "ImageCount = 2\r\n" "SizingType = TrueSize\r\n" "Transparent = True\r\n" @@ -654,6 +658,7 @@ BLUE_INI TEXTFILE "ContentMargins = 0, 0, 0, 0\r\n" "BgType = ImageFile\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "ImageCount = 2\r\n" "SizingType = TrueSize\r\n" "Transparent = True\r\n" @@ -860,6 +865,7 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "SizingType = TrueSize\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = 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" @@ -875,6 +881,7 @@ BLUE_INI TEXTFILE "SizingType = TrueSize\r\n" "ImageLayout = Vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = 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" @@ -890,6 +897,7 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "ImageLayout = Vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = 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" @@ -905,6 +913,7 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "ImageLayout = Vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = 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" @@ -937,6 +946,7 @@ BLUE_INI TEXTFILE "[Tooltip.Close]\r\n" "BgType = ImageFile\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "ImageCount = 3\r\n" "SizingType = TrueSize\r\n" "ImageLayout = Vertical\r\n" @@ -968,6 +978,7 @@ BLUE_INI TEXTFILE "ImageCount = 2\r\n" "ImageLayout = vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_treeview_expand_collapse_9px.bmp\r\n" "ImageFile2 = blue_treeview_expand_collapse_11px.bmp\r\n" -- 2.30.2

1 0

[PATCH 4/5] light.msstyles: Add more TreeView HiDPI images.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 8 +++- .../blue_treeview_expand_collapse_10px.bmp | Bin 938 -> 0 bytes .../blue_treeview_expand_collapse_11px.bmp | Bin 0 -> 1106 bytes ...=> blue_treeview_expand_collapse_11px.svg} | 8 ++-- .../blue_treeview_expand_collapse_13px.bmp | Bin 0 -> 1490 bytes ...=> blue_treeview_expand_collapse_13px.svg} | 8 ++-- .../blue_treeview_expand_collapse_15px.bmp | Bin 1938 -> 0 bytes .../blue_treeview_expand_collapse_16px.bmp | Bin 0 -> 2186 bytes .../blue_treeview_expand_collapse_16px.svg | 14 +++++++ .../blue_treeview_expand_collapse_18px.bmp | Bin 0 -> 2730 bytes .../blue_treeview_expand_collapse_18px.svg | 16 ++++++++ .../blue_treeview_expand_collapse_20px.bmp | Bin 0 -> 3338 bytes .../blue_treeview_expand_collapse_20px.svg | 16 ++++++++ .../blue_treeview_expand_collapse_23px.bmp | Bin 0 -> 4370 bytes .../blue_treeview_expand_collapse_23px.svg | 16 ++++++++ dlls/light.msstyles/light.rc | 36 ++++++++++++++---- 16 files changed, 102 insertions(+), 20 deletions(-) delete mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_11px.bmp rename dlls/light.msstyles/{blue_treeview_expand_collapse_15px.svg => blue_treeview_expand_collapse_11px.svg} (54%) create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_13px.bmp rename dlls/light.msstyles/{blue_treeview_expand_collapse_10px.svg => blue_treeview_expand_collapse_13px.svg} (54%) delete mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_16px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_18px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_20px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_23px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index fe7760f8082..265d984bb52 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -97,6 +97,10 @@ SVG_SRCS = \ 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_11px.svg \ + blue_treeview_expand_collapse_13px.svg \ + blue_treeview_expand_collapse_16px.svg \ + blue_treeview_expand_collapse_18px.svg \ + blue_treeview_expand_collapse_20px.svg \ + blue_treeview_expand_collapse_23px.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 deleted file mode 100644 index 31860c071b5e1f8a4e151da24c9b3063e286b3f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_11px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_11px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ca04c0d291fc37479da3b6e7c21741c61ec5074b GIT binary patch literal 1106 zcmbu;K?;IE6b9h2f}kK;wTPgO-~oa{h*oVpNf6Ygh0ADPi?(foP%%O90%6cCqB=uu zrvFufPL2u<{XXWs&q)_*BfZ4lYl-U|sUi(TVI5XP4e0W-IAfn5O}IAHCqE>k@%`Hj zB_BUls_|T_To&=pG%s4(%Y2fRd6`Y}X;$=EHtO@((C4-PI?J*)p68YGoCC{|lWCf* zEKk<9?J4RFwV&q6(j2viT#*^)TuHhov^1mVKmwe<^L?K_m)MG08sI%^=v|O~3}O?t zj^i}3KjQ2I&aTTWOc$Z&T^NQ@5FPC?<2YxGdPfFHChU<#&hYK9C#!H<*L5qhIrU#w Cztr~t literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg similarity index 54% rename from dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg rename to dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg index d219da9b6f4..59df40cb0e4 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg @@ -1,5 +1,5 @@ <?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#"> +<svg id="bitmap:11-32" width="11" height="22" version="1.1" viewBox="0 0 2.9104 5.8209" 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=""> @@ -9,8 +9,6 @@ </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> + <path d="m0.66143 2.6368 1.5026-1.1842-1.5026-1.1842z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26456 5.5563h2.1167v-2.1167z" fill="#3096fa" stroke-width=".19844"/> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_13px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_13px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..9edaf18e26b4b5158398e2ca307a90b2127a62de GIT binary patch literal 1490 zcmcJPziPuU5XP1NOOvH!Ng?zR@(fwpB}-nVLzhrAmMn!p3MLsl6jRxoA!JB120E2M zpCwt;@6rgwA<Hr}!k<rf_x&VWU=K&%4RIP%+$T^Q>OmE8D{6@M=RT&^&_euORMW$| z@q^V2n%09{moXjY19^NMXrEj=7jZ6zYCbNH@o_#Tk1JwaTnNLtP{!uUForA3{I@?z zl4q@TrOdiuG_;80m_Dtbab{MCD$BA~2t*9_Xr^iUj`;>$r-&nlJoHZBUXXubjjoR~ zjPW3Ugnq#FO^rv+P#-mVzfbNpxy{h?A)i8f>~mv0JQ@a`no??sd<R`~pPds!XAJ)b n&R`Ap%I>@7#6Vl<Es7%N-;#60VEvhtvdVjTIhd!so?ZV1Nxc7- literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg similarity index 54% rename from dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg rename to dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg index 370531f67bc..f63653a8430 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg @@ -1,5 +1,5 @@ <?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#"> +<svg id="bitmap:13-32" width="13" height="26" version="1.1" viewBox="0 0 3.4396 6.8792" 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=""> @@ -9,8 +9,6 @@ </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> + <path d="m0.92604 3.1357 1.5306-1.4107-1.5306-1.4107z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 6.35h2.3813v-2.3813z" fill="#3096fa" stroke-width=".19844"/> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp deleted file mode 100644 index 8f55669d86dd1d01a1188c6a2cb5beee25381c34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_16px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ab9813146d6dab88842b00214be7ad7446b89fb3 GIT binary patch literal 2186 zcmZ?r?c!hngDxOh1H=MAtN_G}K$00qGeG4*Oa%DPzyLuYq5n?qLB$9;;#e%iDWkip zpHmGQeoZs@PYlN8IAYDfr5_|tj2Za!6JrJ;{e;XQMn66?h}DnF3{v!CGlNw9=w^_k zAK46Y^~21dME_vcyLRo``I|Ry<|5aP>(;IN55!kCY}lYhju{~R>({SO0Mf63IG$89 zK>9&?)~s2h0c2kSnzd->&Yj%Engi1hQom}|Do!AO77$+t`bU=-Gm!Pe)C0xhfcP~K zr^3W=(b)8Z)Dr6-T>3#~0OiDh_!TfrR)F}}051KM*bhuou|RWQ1MN-2W+$>3vi<Yt z&*uR0Cjv3a;lFX?Ms=XRi{!*Vl6&)!-9`)><bEK&1`IE4V$`Fn0l62L?s(9}X~_ow DJIPeq literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg new file mode 100644 index 00000000000..caf7ddf36b5 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:16-32" width="16" height="32" version="1.1" viewBox="0 0 4.2333 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> + <path d="m0.92602 3.969 2.2916-1.7207-2.2916-1.7207z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.52914 7.9375h2.9104v-2.9104z" fill="#3096fa" stroke-width=".19844"/> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_18px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_18px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ed6ba251404c7859d402cad390a54b4d0d686f29 GIT binary patch literal 2730 zcmeIxJqp4w6bJB#F6!ps?BF1X&@*&#a`6D-<m%w+;Owr0lQ@RbcI`C;@eX<db*TTR z7DDOAYtli%(ARvt<VTWHdn6m;Rn~Yf5iLX)Q4t+cMcw)2(Nsz(#QUMK&>oH#N|M#A zv1WbGq}#??-M3cAiM(BNtvrYF9E;;{EUuGh6>+kxqE4En<0M(SPTVqaRLj(ftTLRx zVSWRy>+XXfXqrlJLd3~&oW6+#<KcPU6!nE_U5gxAi~aP_KEgWaoHKIBl2X>u-yzPv z?+<8<TT~}ngRu$XioMOEvAjCTp*2O%ndXp%TpMvgNa|;mG^dRHz&5&{GQL;QbHwk8 Y?ngPtJf7$FVU+TJ>HY`Yeg4wCClAF{T>t<8 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg new file mode 100644 index 00000000000..727a373970a --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:18-32" width="18" height="36" version="1.1" viewBox="0 0 4.7624 9.525" 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="matrix(2 0 0 2.0707 .13123 -.34848)"> + <path d="m0.66082 2.3416 1.1469-0.83167-1.1469-0.83167z" fill="none" stroke="#aeaeae" stroke-width=".13001"/> + <path d="m0.46353 4.5126h1.4552v-1.4055z" fill="#3096fa" stroke-width=".097511"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_20px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_20px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..30982d5d41380915caa2201148c10626791e7b8c GIT binary patch literal 3338 zcmeI!yGp}Q9LMoUb&+-ubQcHFt-I(@1P68T5!6j|ad2_yC=TMFg0E0W)7VZr6#5Jb zinAB6FW?2@_pd$lk|sGPIfH|tznt`3J~>HG)0Wo93(n7W%>Ix}k~uQsOglNsa-Lmi z3moV7B`rZ|Wn(|oC81(8q5ZEmzn>S&9~Z^IG;!CH#*Fi%&D2ctOidln#MJe4O%qSY zH1(3qG+vyU){8Q;c*D%B-k@p2>osk8%CzbITj4uUtya&P&8D@V8N7g8HyVwJ@Y&33 zu)fF%xhJ#cLjMSiPpR=dZ;Rts*L9csdzigbo{Yj;;QbTXGgG>~d%cc1L)|U*CEHlH zr{2+^C!;ErN}hV3wCeS`{FTw(hIuj=Ge_GI^L(V7*9D_IHJ<iO@`k&r>f*{IPsY}2 zwMF{9kexV7+H^eTwj>_qZdR|eF57r(NmktaY<?cT?-#hXE9TU~ozj_?>N9x%aAZB- zQD$Dx81j94CI{+#rlp!6);7m&O09Jkbsh|PUY(K$V&i!guqJM7Jx|l#cXhqr07>y| literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg new file mode 100644 index 00000000000..e6b567d5e94 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:20-32" width="20" height="40" version="1.1" viewBox="0 0 5.2916 10.583" 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="matrix(2 0 0 2.0707 .13123 -.34848)"> + <path d="m0.52855 2.5873 1.4194-1.1412-1.4194-1.1412z" fill="none" stroke="#aeaeae" stroke-width=".13001"/> + <path d="m0.19896 5.0236h1.8521v-1.7888z" fill="#3096fa" stroke-width=".097512"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_23px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_23px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3c42111b2dfd36a9bc3d201e27bde024a2a51626 GIT binary patch literal 4370 zcmeI!ze^io7{Kw1wxCk522s(a6sHz6(52uOhfcOoJLo^)Kj7fvaAU}>;FO`I!;$0? z0&WgcXu*z!4z(bN7V{_g1FqjkbCBfT_uls|m(7<vxy$oB@8{lJ?vfPO@>9<JDD%8a z%o0mP&UxXCvMoL5DKY}bd3Z=AD8Bo+9ceKno*3$n<=!)Jy;pE=_6tGU=+&aH2Jxd> zG?UhkO6p7+UoEM#Nqx1V&nEHpioRm&>xKA=jUO+>S51EWY;!fvH_tYA=zQ}`yAG9a zH`A`G-?y7(-_`Bg&$90feft^7I>k>m<FPwD1D@x}UyY%RdcA&#KRFB>J0N~Ho6W_n zecW5$_qW(yv0cs57hAkqt+vAcKVl~<KeRjkOJ4utI0uZUgC3*X7K_jI8MaUU8!<D8 z-*1Z*1VIkprS`X4t-em{tL)ICwn4Os4`D9JHqI7@^}nU(Qr<@rS9(ph^l<IZ(|1CA z<?|SqoXxPY#i>*(WAuI|e&Ek#X^SOm#{MJMQI>YA)tbgVCOq~hva<1(i8G?)y6%XL zD?Rkz-}AbD-v1|h+I-in>w0u~oh|ndwH@Ld_l<6TTwY~&u8A+yzS~|Cs$=xqSPQK4 zC;3FzvdQk;gBQ4&e9wmKX04m-xAEVr){rKLcSn>lPaBQKt2Bmg4zB!O9&w)Yx}LOo J)|<(1%zsjeaS;Fj literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg new file mode 100644 index 00000000000..6bd39dbfc67 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:23-32" width="23" height="46" version="1.1" viewBox="0 0 6.0853 12.17" 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="matrix(2 0 0 2.0707 .13123 -.34848)"> + <path d="m0.66084 2.9897 1.6823-1.3432-1.6823-1.3432z" fill="none" stroke="#aeaeae" stroke-width=".13001"/> + <path d="m0.33125 5.6625h2.1166v-2.0444z" fill="#3096fa" stroke-width=".097511"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index cd5245f702f..5c67480f69a 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -970,11 +970,19 @@ BLUE_INI TEXTFILE "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" +"ImageFile2 = blue_treeview_expand_collapse_11px.bmp\r\n" +"ImageFile3 = blue_treeview_expand_collapse_13px.bmp\r\n" +"ImageFile4 = blue_treeview_expand_collapse_16px.bmp\r\n" +"ImageFile5 = blue_treeview_expand_collapse_18px.bmp\r\n" +"ImageFile6 = blue_treeview_expand_collapse_20px.bmp\r\n" +"ImageFile7 = blue_treeview_expand_collapse_23px.bmp\r\n" "MinDpi1 = 96\r\n" -"MinDpi2 = 133\r\n" -"MinDpi3 = 150\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" } /* Button */ @@ -1275,11 +1283,23 @@ BLUE_TRACKBAR_THUMB_UP_21PX_BMP BITMAP "blue_trackbar_thumb_up_21px.bmp" /* @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_11px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_11PX_BMP BITMAP "blue_treeview_expand_collapse_11px.bmp" -/* @makedep: blue_treeview_expand_collapse_15px.bmp */ -BLUE_TREEVIEW_EXPAND_COLLAPSE_15PX_BMP BITMAP "blue_treeview_expand_collapse_15px.bmp" +/* @makedep: blue_treeview_expand_collapse_13px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_13PX_BMP BITMAP "blue_treeview_expand_collapse_13px.bmp" + +/* @makedep: blue_treeview_expand_collapse_16px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_16PX_BMP BITMAP "blue_treeview_expand_collapse_16px.bmp" + +/* @makedep: blue_treeview_expand_collapse_18px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_18PX_BMP BITMAP "blue_treeview_expand_collapse_18px.bmp" + +/* @makedep: blue_treeview_expand_collapse_20px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_20PX_BMP BITMAP "blue_treeview_expand_collapse_20px.bmp" + +/* @makedep: blue_treeview_expand_collapse_23px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_23PX_BMP BITMAP "blue_treeview_expand_collapse_23px.bmp" /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" -- 2.30.2

1 0

[PATCH 3/5] light.msstyles: Add Tooltip HiDPI images.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 8 +++- dlls/light.msstyles/blue_tooltip_close.bmp | Bin 3402 -> 0 bytes dlls/light.msstyles/blue_tooltip_close.svg | 17 -------- .../blue_tooltip_close_16px.bmp | Bin 0 -> 3210 bytes .../blue_tooltip_close_16px.svg | 17 ++++++++ .../blue_tooltip_close_20px.bmp | Bin 0 -> 4938 bytes .../blue_tooltip_close_20px.svg | 17 ++++++++ .../blue_tooltip_close_24px.bmp | Bin 0 -> 7050 bytes .../blue_tooltip_close_24px.svg | 17 ++++++++ .../blue_tooltip_close_28px.bmp | Bin 0 -> 9546 bytes .../blue_tooltip_close_28px.svg | 17 ++++++++ .../blue_tooltip_close_32px.bmp | Bin 0 -> 12426 bytes .../blue_tooltip_close_32px.svg | 17 ++++++++ .../blue_tooltip_close_36px.bmp | Bin 0 -> 15690 bytes .../blue_tooltip_close_36px.svg | 17 ++++++++ .../blue_tooltip_close_40px.bmp | Bin 0 -> 19338 bytes .../blue_tooltip_close_40px.svg | 17 ++++++++ dlls/light.msstyles/light.rc | 38 ++++++++++++++++-- 18 files changed, 161 insertions(+), 21 deletions(-) delete mode 100644 dlls/light.msstyles/blue_tooltip_close.bmp delete mode 100644 dlls/light.msstyles/blue_tooltip_close.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_16px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_16px.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_20px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_20px.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_24px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_24px.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_28px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_28px.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_32px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_32px.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_36px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_36px.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_40px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_40px.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 847962e6680..fe7760f8082 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -75,7 +75,13 @@ SVG_SRCS = \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_separator_horizontal.svg \ blue_toolbar_separator_vertical.svg \ - blue_tooltip_close.svg \ + blue_tooltip_close_16px.svg \ + blue_tooltip_close_20px.svg \ + blue_tooltip_close_24px.svg \ + blue_tooltip_close_28px.svg \ + blue_tooltip_close_32px.svg \ + blue_tooltip_close_36px.svg \ + blue_tooltip_close_40px.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 deleted file mode 100644 index 82adf7e5cc1d7e306225f7c7954ef38a29b4c141..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/dlls/light.msstyles/blue_tooltip_close.svg b/dlls/light.msstyles/blue_tooltip_close.svg deleted file mode 100644 index 4a0e66448bc..00000000000 --- a/dlls/light.msstyles/blue_tooltip_close.svg +++ /dev/null @@ -1,17 +0,0 @@ -<?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/blue_tooltip_close_16px.bmp b/dlls/light.msstyles/blue_tooltip_close_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3180921ac29fecbf0fc46b05b4c92054da45db67 GIT binary patch literal 3210 zcmbtTK~6$35UtUr3kfJe6XOja(E}I|Sr|87#jPjcECd#?11_Qd7|#It9HGvX&bNKP z{WN@HZ9DVc%=FEl{_FT$nctZHf6%(1)uVNy?$jym%KG{E|I<qC|JbDaqqp~eU)t%c z1p8?!m93Qe?v`9pLq?@CN4ObPm2J~v7%pKA$L7s8_MTJB`)FEIV}ac%_4TmFa_xmZ z62rqdT*>D7AqM&+uW)5Y9KQu^F|Ne$^kJPut3-V{j+c{rL+?41SMtaBRef=}b?W!( zwmtG}&=)tahlBolzJL~o{3T7C7%5z-Glb<isxv>I4dO44=<iyo-`3zpH=o*iHM-I? zLutR^rS36DxOCREwka_zcWXH&FP%5`o<DbVbpAQMgWU}~+RQ)LbFsUx0ZhRa4EVhm zRX*YK9>RreE(gz`59=gaCFvWegL~t>2Xo>bYBv0;zPS84^+R6MBd|rk55Rf-1z$;v zL;irKMT``#=o7+HZ&tL9o}ZUn-5~xl^vz3N+_{cHTdyClb!$4EHfgPBCC~qCHtSiA za5dexDKRXUvCJ`fY2Vm;PX6fp6Q=86cazD)%s<$3vAgdEOu-cl_`MiaKH>8o!i8)u z2hX4n>m*tw=^Lnnb@twaIq?oP8-7(^Tz;MUA+PBX*rMMD;Jp5VucXBxe?ZeBMhaK- f31P{`GjR0$EEbCfX}%17^O6^LTgQ4npSS)1w*yU5 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_16px.svg b/dlls/light.msstyles/blue_tooltip_close_16px.svg new file mode 100644 index 00000000000..1b2c048585a --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_16px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:16-32" width="16" height="48" version="1.1" viewBox="0 0 4.2333 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.2332 0.42636-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#aeaeae"/> + <path d="m4.2332 4.6597-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#ff1744"/> + <path d="m4.2332 8.893-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_20px.bmp b/dlls/light.msstyles/blue_tooltip_close_20px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f84b4be814a946e52a97e63e35247b9d6ef45694 GIT binary patch literal 4938 zcmbu>T}}cq5C`xYJ%JkJ(S!KJM@&q7@hS$Mzyy5Ky8u`45Wscn{JWjCw%c~5Z0wfp zGQaIkTk7QX<<7X{o6ajL_f(#!T$x96P4&+$osz>E)BWL&ojkw2Cts;F+zj47Qx}e( zgSSMDh=qaUyfEfOy+k>Fb#0pSX%ob+$=m*2Yt7JdeL}kFXfbnEC+f_ar7@+J#MD|P zv(?I(Jg35O<nK!Bc-$|s@XX{L8|Qq^;&;}rBdkY`MUCsBHc8%+cl2urv2i|Y{VZAB z7pW<+q^8EInJreyJTHT>406vgwfbK^Ke}%_v%%tLIn!Il%pUBDO7s4KSQyY}W4oZw z7G*xN>iuInwi}M0j_i6qwp+f|nxW;4k##w1F>@AYRAbgGjVZMxrq(K%aXw}~_Z(BJ zlXyR;!f~t_@%=$l*{{${^3^!!VGdb5@3rfQ;;<gw8uT@;leX|(a-Wla1^J5eS?g!X z;^#|Ei6u2PR?Td&N+x;Bek_CBb4;xc^GW05e)FB#VDYnHvW2$8;jr56cFp?-Vqw7A z@AnHT7KPf?`v=8sg7`JLTfWwsq2&#?f3%o63-63WW7e!rl$laXVrs3D8Rvs+)&DyK z@or9$gIZ<f`gw^3lj8fi>aC_ZpR-y`tVfPTjq9N{&P%DL`1l?B+{a^7Tkj={`ye$X lmekZ(HM7MknUs$unLPLV+;dE=j`HdD4{xe1ewH_#^$Qcgd0hYi literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_20px.svg b/dlls/light.msstyles/blue_tooltip_close_20px.svg new file mode 100644 index 00000000000..9fcc2c42a6f --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_20px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:20-32" width="20" height="60" version="1.1" viewBox="0 0 5.2916 15.875" 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.2916 0.53295-0.53293-0.53295-2.1129 2.1129-2.1129-2.1129-0.53294 0.53295 2.1129 2.1129-2.1129 2.1129 0.53294 0.53295 2.1129-2.1129 2.1129 2.1129 0.53293-0.53295-2.1129-2.1129z" fill="#aeaeae"/> + <path d="m5.2916 5.8246-0.53293-0.53295-2.1129 2.1129-2.1129-2.1129-0.53294 0.53295 2.1129 2.1129-2.1129 2.1129 0.53294 0.53295 2.1129-2.1129 2.1129 2.1129 0.53293-0.53295-2.1129-2.1129z" fill="#ff1744"/> + <path d="m5.2916 11.116-0.53293-0.53295-2.1129 2.1129-2.1129-2.1129-0.53294 0.53295 2.1129 2.1129-2.1129 2.1129 0.53294 0.53295 2.1129-2.1129 2.1129 2.1129 0.53293-0.53295-2.1129-2.1129z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_24px.bmp b/dlls/light.msstyles/blue_tooltip_close_24px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6df29c0f3c7943940009b72cc0f25d3e80ac538e GIT binary patch literal 7050 zcmcJRO_CBZ6vt!f5kycoE~$b!grm;r!i`sP>j~y46i{3MID>o)3-?sPCF1+1^O`1= zG<h#QsR`+%$?yNZhUEU|(?{dl6Mg=nKA`@c`YZFvyr$9k_jtTCYfSZrC42w)>-Xhd z-qV}t*Y+c0_A6ulzKgyVErJ0Sm}r|JJs+u)<@<v%&+n^s&F8-!F*crcBG#Cmp#?Vg zoz4$uH|?!C;Q5&Bx52v5k1M;`&IZG2D>ZJhInEl5T((9-%9dzo**O}e>?@71-Y}1> zA$OV<%{kW}#zqZl_}G)w=ztA=G~ONAo@8^33Vd*JiR7}2{6_8ewnp<I@S}~5e4uGH za@duETtmW^YG~NG8YS!;jh8+jyFA~o>gsIF;jZ!!8qe#pyTetimKU}$p9gmIwQpAs zeXIPPWwtS3fCVO2A3oS2&5zVA^~2*^tG@sI7}y>$HlB4NtuZ~X{2YAyt#5Z4Kd=XT zn=G)sKignk<VRq)vy*r=qeSBtn=_-)$YpCZq-=?XmYt(f%5G|e^@e$D4Y}iek};8U zuD{~{N7&M$QP;P`=J30Tcz0rZ3!7u4_5pE;<ubM=&2PePXKNxK*?zRKIX7C39JW?N z!j@`i*tr@d>>Lf8Va>A(^(U=2=wMG+yI^;Dz6W)6CceA>c#U<*-Juz)FMYdYHrA)p z>1aNmuc)hjXPJ!=46wk&oW>!|kJK&o!)!KF-+v~PNskyC&pOdKrVhKo=Dwq6u^-q& z9ebIB(Zz(uZLlu#Be0wKHG|mDR%zT~BL`?2ja+u6Ak&btB^p|Gjz%dv&<N`d^VpiW zo}rV-IoBV?x(3-U>DZ!C%!VzAcz0rZ3!7u4_QA&`mdn_hD8C82ovn#{Wc$&^=GxF| u<gm3G61G%B!_L(xVdrR2u3q$f?DBjM>gv2$EZqIaYphG|4neGz%>EA#R|S9o literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_24px.svg b/dlls/light.msstyles/blue_tooltip_close_24px.svg new file mode 100644 index 00000000000..4564e4991f2 --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_24px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:24-32" width="24" height="72" version="1.1" viewBox="0 0 6.35 19.05" 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="matrix(1.5,0,0,1.5,1.1e-4,0)" stroke-width=".11759"> + <path d="M 4.2332,0.42636 3.80686,0 2.11656,1.6903 0.42626,0 -9e-5,0.42636 1.69021,2.11666 -9e-5,3.80696 0.42626,4.23332 2.11656,2.54302 3.80686,4.23332 4.2332,3.80696 2.5429,2.11666 Z" fill="#aeaeae"/> + <path d="m4.2332 4.6597-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#ff1744"/> + <path d="m4.2332 8.893-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_28px.bmp b/dlls/light.msstyles/blue_tooltip_close_28px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1f156a94a8a0a5d681cf9e9727ff0e9bb139e6a1 GIT binary patch literal 9546 zcmciHPj1>k6b5itp;t&)bkRk7f?lA?A62T<O+~wCj?ryT&>OHtSV$n?2=oA5mdgOr z^nK%b#Bq#0Gw%bGVZso-pWoQ?JXUVMe12c}*Kc|MCGCy0k+fIE+u}<4Kkwx2#mf~% z^@DHR?WeClU;IhWz@YW}jSO!~Y2RDFHVq;sV#C18NqXC<G|6OpkoKb*XS{D^3b(ru zdr_G_FId|4@;f0<pBG|jT=bYj97A*5nCG*+)I-e2YSx%$pQY!CVa8evGu5(~xmJ#8 zwNgx$6=SlkqltRdT%Y*dHb$ruaD6V#__~hK*VeKgr?o$6p20fisI|A58?nZBTIw3> zZGG-r>-?Fnm#%BR^?Vxg?6Nd}mKkHQ%oNLN=2*F=#Y#09R;<aiV$4hL2mO8*`@%ES zc|Ui0Uy=Rp-`CX)cyl7=qs|Dghxu>zWEI87!VT_kTzNlqr2FO5(IO^d!@%e_d47=3 zQ)y1xK^pDeayN7%iMK=ShikVu=2cnn(DsZxLtgt3Q)8Fm7@FgzJnMPYyu;nK^VbK{ z?6dUDGR#<uVWwIZGuO&7tyYT3vSLiOrRIrsi}l)Evy?gkH{{ZcuQdbxaV_g{TKf)@ zZq;)1wYOHId~WiYR^xjtol{f2t<U`>ua~ZC{>1sr&a=zX{8?s<#WGVYtC?fvnieb7 zWLU8#(~2>r7L|?qM5*&9>O>j#yJ}KvZ<srOU%`I&L*e}MgExn6qWeRg7e){B;l|C> zLd?x(Ggz<Jr8N5U17adJ3|RB|{A#sYO{F<$hvjlfySGTJk;L4E*bB`oe1?a%XXJ?( zh*gh`Ji{?O8<)Q^<=Mzf^EgOc|NOu-`z)M8yclMzRf#q;)v}nmR*q@4QcRW=W3nwZ z+tzJZ$IUfMsS|KRF3tG5j?o|2vL2_k?=b0BEk~`r&vKJvq1E^vOI=gFt<U`>ua~ZC z{>1sr&a=zX{8?s<#WGVYtC?fvnieb7WLU8#(~2>%N0WN1bpk!5&bQSGSlI8@Ols{7 ZbEo%}#dtjS&kw<zNN)81KLm58)_;ze#<l<e literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_28px.svg b/dlls/light.msstyles/blue_tooltip_close_28px.svg new file mode 100644 index 00000000000..214eb8780a9 --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_28px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:28-32" width="28" height="84" version="1.1" viewBox="0 0 7.4083 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 transform="matrix(1.75 0 0 1.75 .0001325 0)" stroke-width=".093313"> + <path d="M 4.2332,0.42636 3.80686,0 2.11656,1.6903 0.42626,0 -9e-5,0.42636 1.69021,2.11666 -9e-5,3.80696 0.42626,4.23332 2.11656,2.54302 3.80686,4.23332 4.2332,3.80696 2.5429,2.11666 Z" fill="#aeaeae"/> + <path d="m4.2332 4.6597-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#ff1744"/> + <path d="m4.2332 8.893-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_32px.bmp b/dlls/light.msstyles/blue_tooltip_close_32px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c830714715a8ad11f1b9cd33b3ecb0bd82d7010e GIT binary patch literal 12426 zcmc(iv5pfl5QZ0lfF~eVUO`90BcR*?N)aI;(en<pJi)z0`c;yRQshZUMZsevsmzSy z**JS^kL?*NtMkpC?Va!U*dCv!^QVuEeV*X=Zz%UrenNQxZ!f_%t{q=5k7=6o4_2A! z*YCeBZE0_>g5Cbin`Xa+@;cZ>+<?B3fh_;o&!GMQ1xB~uHO=2Qeyh&AWp5ng1oqq6 z?-d*Q6*OG2iQzQZm{Xl^x1dE~E-V{;`M&Ah&G(+-LiJ>Yb1^z@&-cH#ZVqr=C~HV% z)9T{-=d4N27mb_PWV!EBG;lsbYz+-kwnT##yF`OFJ4Zt;_LYWE{=oWJn?n9V9nmpT zKJhK&EpDCD_)=}Mh6-%b$ZDv_Mhz+alpICl$+0Y(=3jVbjcH0|SI}VDu{{=R6Yjt0 zxZPUg`joB*&ac0}xxTp?IDbBy)(iJdss_%_7+Xt&ge}#e!7kOH$<EbKgPo({=JyZ0 z`yHWB?nJA6j*Z56cn2g6%Iwj(@YsDj#-Y>yzlHpxwQ*>{y1VbC?aRc>AMeca#|I-k zGcG=dZ|EBt$nx8!cV_lDF$XB-^E<Pfy*KLjf6Jbj4Kkpdpx7ArY}cl)VZcUyuL0vh zT;D!S%vNJA&<FbRefRHfzTt0*3u&`fIv0U)_r5>f8+-rf`jxB)&L^>H9diA1G;qF# zY)uWNYz+-kwnT##yF`OFJ4Zt;wyz<SKd?U5hT6!F#Ky+h=dyE7eU@7!T>slt4VW`S z``h<d^3G|f$ws{?{G2?Q69bM->p*&DjcH0{*U*6M*dB|u;kRSsNv(^Go7NiFr*u7V ze*Hbh_0845`SaNnOYWOg4V<4bww4A7TdF~WU8+HoovWb+J4eH<?;q~|b)?*hmU0V? zLuvyt9^L`125mNJA86>=)b8TY#r8M#EwxTV3o(9n|KDsj^VMp#Y};0JX2i6iZ)70L z@7HzRY`tC|pcp7Sc+~Iz$OhjV$2fttF&MCsudZRhCWh63@o-G4w-)NR8gt=dz6~(! zd_x<><w^t8i{>IQZer{fi-o=abNx!z1Lu?2v<|ucIT|=$L$;=dQnrQ$DO;jJi(R5Y zo1LSf7Tec=xhRl7wy`$UMt&rg86)Kr-}bph!u7w+(4fvH9SIt$u~9<`KPOMpxKeBa zo9171W{qjdV5@6Dc5IKu+VI=4@ub!<<F;#!>r=WOIKTcG%Jt3F!1?pp6ie=#R1KV; zF}9Wl30tZ`gI%gYlbx%f20KRs<d2))KivK6IQaiU^&AVtcz6dS4XW(GT=Z;e$2h=T Tbg}(SeM_y2LkqF)@BjY+-`XP* literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_32px.svg b/dlls/light.msstyles/blue_tooltip_close_32px.svg new file mode 100644 index 00000000000..cf07f1835c8 --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_32px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:32-32" width="32" height="96" version="1.1" viewBox="0 0 8.4666 25.4" 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="matrix(2 0 0 2 .00014667 0)" stroke-width=".066145"> + <path d="M 4.2332,0.42636 3.80686,0 2.11656,1.6903 0.42626,0 -9e-5,0.42636 1.69021,2.11666 -9e-5,3.80696 0.42626,4.23332 2.11656,2.54302 3.80686,4.23332 4.2332,3.80696 2.5429,2.11666 Z" fill="#aeaeae"/> + <path d="m4.2332 4.6597-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#ff1744"/> + <path d="m4.2332 8.893-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_36px.bmp b/dlls/light.msstyles/blue_tooltip_close_36px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a2db16910aeb3d47f4dd8b3a8670bbb2993227c0 GIT binary patch literal 15690 zcmd6u!H&}~5QdH50jeUj2sm)y0V*VJAfYa+m5{jb9Nf6>6YwaN+TN=iIQP;Eg_mg6 zM+h@%X4lQe&dhjhCEBdJ_W1w5jFY$;Y3JX*esaz63x40h`3}w>a6WNw-BW0Pe}rF; zj@r5N502FH+wVUgg$#5&3y$xn&h0Db{=N@}m=B;AdZM>~>?Y8+g%hrJe{$~62Y)or z=lu-44z1_Txqr{kJ{K&=Q-JA$g*;oPCSTO&x5qqd*Q^m}H`nd^;b&YsKX2V}<F(^@ zapO|%B&mlqUc#o;*3OHurD~?m_t~tpEOab1tgg+Pg}5}jnmOdhX(jrSSdMonhU3GD z3F&M4qwjfq|A+Q~O#2RALo^57y$1g_-f#Ny$Yv_QLVSZv1zA|@R*+{fH*_BrU}Ccr zU>ei&9?eU;E}R&89#UF~k0e&Zq|w*R;jpFXrp)bQv(U59KsGBK3oT0)%DYxmJCA&0 ztyEhYAM*~4aXq+kAs<OU$7^i$gt66IFy9wU1->Vs=f&FX9_mpzhDXD+DN`FeJGM+v z^P$=p^*eX_rk;Mes;l{{x>)@Xz0ecAA4r`0JgFzpzlF1g^K|{P&R##fc~Q^6>(F}c zu3y(p{jkG=JlUB#EacfRfq&I9P(QWD9BbFE(J|mz1z3s6bnUoa+&KT9lYW+ZNaH0u zT5avT7+b1l>U^KgO3OmWLc{9XtXYUlqpO)iew<dKFNx)NhhjKBoS2Zlrhni)kMIA` z9*||<!D|@E0qrq<Yr5a`<x#+torU-qOvPB3>sE}1ksG>yvNH)-vNMh8c^}A2vo4$% zdLB|*iH{^!!=%yI%;B)5=%&o=W3$k+&_FgT9Sbc>7RtL;Q#+4*W35zM8Xxlxjd4A= zaUmZ`KgVlq^@Oq2TQJ`prtIGn(6h64_w^_o!vmRauIf#R+Su9go~feR81-YjSS+Ti z)v8)9m&NLb=!Kr>?X#@c>k0I4;jH02L0tCwA$ZQf>(F}cpl#}h9Tw!t&eUNc&xQ&7 ztCoTKsXgXcyLOF^0naMHN=&9}$MxdI`S+akv(!TxFX7Q@Yv;w-QZ-ZO`)pQP7CIIh zR@Y|DLR=bM%^dRMv=V(uEXO+(!|~z7g!DE21Mhi!|A+Q~Ec*^#!$1ybkMUd6{iZLE z0;cRN#K&MN#==~;Vmyr8(EXF0Nx+hwX-v=iKwg@4;l$AMkkU$gB(WMMjlO0Mhb=`n zWo{pvg`R~5vRUa^Xj!sQ-nE+AdE^^wrP|W?n0IK5>%ol+`AGUXUL&k0__d$x`yl2s nkf%@$DEs$>9;SO1T7O{1JZ)ef&t4nzJh4WG^{4iKbDjGSZgXOz literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_36px.svg b/dlls/light.msstyles/blue_tooltip_close_36px.svg new file mode 100644 index 00000000000..9881bff0a43 --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_36px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:36-32" width="36" height="108" version="1.1" viewBox="0 0 9.5249 28.575" 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="matrix(2.25 0 0 2.25 .00016917 0)" stroke-width=".055432"> + <path d="M 4.2332,0.42636 3.80686,0 2.11656,1.6903 0.42626,0 -9e-5,0.42636 1.69021,2.11666 -9e-5,3.80696 0.42626,4.23332 2.11656,2.54302 3.80686,4.23332 4.2332,3.80696 2.5429,2.11666 Z" fill="#aeaeae"/> + <path d="m4.2332 4.6597-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#ff1744"/> + <path d="m4.2332 8.893-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_40px.bmp b/dlls/light.msstyles/blue_tooltip_close_40px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..91cbb58b98c162c9ba5b84b0402459dad30ea679 GIT binary patch literal 19338 zcmd6sO^(w*5QUB441^_1&M^eBKy0`QSrCa`q*)ASN#-(Su4B5Al+!WYomW3yo(NNs z`_+4&+xGY;58t1@4X4jj`u}%YKBeVXTHXvFhqtK?mvQ=f{fxtK{zt3Ehp#_=UdOO+ z@0zmXb{LM2O-a{5$|i===eS8@Y3onRpOT{Qy1%<?{tNB0>~q7m0AtR^bHt2Awm`-b zTh7=T@4c_lY*d#W66UYcOsU=isLj&$Nm#8J*8Uc&m$#Qs&g$*y>F4R?z0JMYnA75K z>E(Q+YH~C^2un>P$&+Ynd7AY|E~3$7qdj-?`QD;bgYMf@j6rNX&mzWPHWA}OY{Ur7 z;X-^68=oV=j3TyRMipBS<LUX7vr3hoUuh|g@w!gW*LUYFJH{kh{##(FnmkR9hS8E^ z=|xyQ{5?EMte(D}Uc~C{=jqvljrWh$+uF|@t*Xt?_O)1QW6~_CzLqOlk7lAeNj9oQ zvS0iAN!r#TV|G17=R>P2%_G0xWzQSNKsL_L8Ru-QIWaE4#`(lpV;hFgt8x2fHFml` zV}^RAY+@)W*6+v7dNq!x<--_0hbebA<*&w@-#>2H7GRvQo#*JnSY!)itguatcgDwc z$9;`vqq@>@t6e9}l<Kuy)ThnT_DNW+8P@(5tCzQzPtNM?>FMX`<-N_l*qGDeZ|UWH zq-t_BJqSxpBgvC!Yk8XWNG_t$WTQQI^ZDMQR6AbFbAA<L5F2xf7=zhFj0>?5BQ%E# z@j+~Sjs!D`*n$~VY(b3le46<9+2y}V<A{dOFVA{+-m+s%qV-_Z<Y{^|td<;0FT(2K z@8MBm_4M`hB35rdPtP7~ynn3T)_&$_Rc(g0uf<XulV(ZvwOq-1G!xZHvQaIP{o3D8 z(zX^Ev+F53A6i{y9_#O*1KD_+W{fv%lZM{mFTghCpWopZ*+}#J{Jh=o_ly1hLD|H> zym>tw4x6-$mnHo7kHog){KR-OhcmWt#++@=SYZoeEV1Q`t?`Sl+rCD#QC)t#TE9y( zrFsjWHcQ(lVYOyh`&+DD-d;XAtGB18pQo4iHuqv<PK&>#m-CUT$<g#6EH#ZJPok~m zY1SjTh(?o*_5k^OZ&9k<uH`wuk}-shIfaa&Y(mCG*oYCF!$tT&Ha<r}8HH@2j7qi; z#>Do>&n~4(<A{dOFV70h+jNXcv>uF_JWY>=)skcBMOZ!jJv>URp1z)5#Om$m>Dhyg z_m9=v+Rq%Vs?E^$wODFn(k!XImMdA0W}-StHmXIk({(g|uglkQuG2LO&6Mg|jQpOr i!q}aSx243$Y^<3vhOu#e&Nydd&4n?Xjq{0d&h`%jAC;m2 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_40px.svg b/dlls/light.msstyles/blue_tooltip_close_40px.svg new file mode 100644 index 00000000000..a13b9ee7149 --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_40px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:40-32" width="40" height="120" version="1.1" viewBox="0 0 10.583 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="matrix(2.5 0 0 2.5 .00019167 0)" stroke-width=".047328"> + <path d="M 4.2332,0.42636 3.80686,0 2.11656,1.6903 0.42626,0 -9e-5,0.42636 1.69021,2.11666 -9e-5,3.80696 0.42626,4.23332 2.11656,2.54302 3.80686,4.23332 4.2332,3.80696 2.5429,2.11666 Z" fill="#aeaeae"/> + <path d="m4.2332 4.6597-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#ff1744"/> + <path d="m4.2332 8.893-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 9db8903412d..cd5245f702f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -936,10 +936,24 @@ BLUE_INI TEXTFILE "\r\n; Tooltip\r\n" "[Tooltip.Close]\r\n" "BgType = ImageFile\r\n" -"ImageFile = blue_tooltip_close.bmp\r\n" +"ImageSelectType = Dpi\r\n" "ImageCount = 3\r\n" "SizingType = TrueSize\r\n" "ImageLayout = Vertical\r\n" +"ImageFile1 = blue_tooltip_close_16px.bmp\r\n" +"ImageFile2 = blue_tooltip_close_20px.bmp\r\n" +"ImageFile3 = blue_tooltip_close_24px.bmp\r\n" +"ImageFile4 = blue_tooltip_close_28px.bmp\r\n" +"ImageFile5 = blue_tooltip_close_32px.bmp\r\n" +"ImageFile6 = blue_tooltip_close_36px.bmp\r\n" +"ImageFile7 = blue_tooltip_close_40px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" "\r\n; TreeView\r\n" "[TreeView]\r\n" @@ -1190,8 +1204,26 @@ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropd 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" +/* @makedep: blue_tooltip_close_16px.bmp */ +BLUE_TOOLTIP_CLOSE_16PX_BMP BITMAP "blue_tooltip_close_16px.bmp" + +/* @makedep: blue_tooltip_close_20px.bmp */ +BLUE_TOOLTIP_CLOSE_20PX_BMP BITMAP "blue_tooltip_close_20px.bmp" + +/* @makedep: blue_tooltip_close_24px.bmp */ +BLUE_TOOLTIP_CLOSE_24PX_BMP BITMAP "blue_tooltip_close_24px.bmp" + +/* @makedep: blue_tooltip_close_28px.bmp */ +BLUE_TOOLTIP_CLOSE_28PX_BMP BITMAP "blue_tooltip_close_28px.bmp" + +/* @makedep: blue_tooltip_close_32px.bmp */ +BLUE_TOOLTIP_CLOSE_32PX_BMP BITMAP "blue_tooltip_close_32px.bmp" + +/* @makedep: blue_tooltip_close_36px.bmp */ +BLUE_TOOLTIP_CLOSE_36PX_BMP BITMAP "blue_tooltip_close_36px.bmp" + +/* @makedep: blue_tooltip_close_40px.bmp */ +BLUE_TOOLTIP_CLOSE_40PX_BMP BITMAP "blue_tooltip_close_40px.bmp" /* TrackBar */ /* @makedep: blue_trackbar_thumb_horizontal.bmp */ -- 2.30.2

1 0

[PATCH 2/5] light.msstyles: Add Scroll Bar gripper HiDPI images.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 8 ++- ...=> blue_scrollbar_resizebox_grip_16px.bmp} | Bin 2314 -> 2186 bytes ...=> blue_scrollbar_resizebox_grip_16px.svg} | 4 +- .../blue_scrollbar_resizebox_grip_20px.bmp | Bin 0 -> 3338 bytes .../blue_scrollbar_resizebox_grip_20px.svg | 26 ++++++++ .../blue_scrollbar_resizebox_grip_24px.bmp | Bin 0 -> 4746 bytes .../blue_scrollbar_resizebox_grip_24px.svg | 26 ++++++++ .../blue_scrollbar_resizebox_grip_28px.bmp | Bin 0 -> 6410 bytes .../blue_scrollbar_resizebox_grip_28px.svg | 26 ++++++++ .../blue_scrollbar_resizebox_grip_32px.bmp | Bin 0 -> 8330 bytes .../blue_scrollbar_resizebox_grip_32px.svg | 26 ++++++++ .../blue_scrollbar_resizebox_grip_36px.bmp | Bin 0 -> 10506 bytes .../blue_scrollbar_resizebox_grip_36px.svg | 26 ++++++++ .../blue_scrollbar_resizebox_grip_40px.bmp | Bin 0 -> 12938 bytes .../blue_scrollbar_resizebox_grip_40px.svg | 26 ++++++++ dlls/light.msstyles/light.rc | 56 ++++++++++++++++-- 16 files changed, 216 insertions(+), 8 deletions(-) rename dlls/light.msstyles/{blue_scrollbar_resizebox_grip.bmp => blue_scrollbar_resizebox_grip_16px.bmp} (55%) rename dlls/light.msstyles/{blue_scrollbar_resizebox_grip.svg => blue_scrollbar_resizebox_grip_16px.svg} (85%) create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 3b33058fdef..847962e6680 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -42,7 +42,13 @@ SVG_SRCS = \ blue_scrollbar_arrow_glyphs_7px.svg \ blue_scrollbar_arrow_glyphs_9px.svg \ blue_scrollbar_arrows.svg \ - blue_scrollbar_resizebox_grip.svg \ + blue_scrollbar_resizebox_grip_16px.svg \ + blue_scrollbar_resizebox_grip_20px.svg \ + blue_scrollbar_resizebox_grip_24px.svg \ + blue_scrollbar_resizebox_grip_28px.svg \ + blue_scrollbar_resizebox_grip_32px.svg \ + blue_scrollbar_resizebox_grip_36px.svg \ + blue_scrollbar_resizebox_grip_40px.svg \ blue_scrollbar_shaft_horizontal.svg \ blue_scrollbar_shaft_vertical.svg \ blue_scrollbar_thumb_horizontal.svg \ diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_16px.bmp similarity index 55% rename from dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp rename to dlls/light.msstyles/blue_scrollbar_resizebox_grip_16px.bmp index 6bc433536ddf5adfba071bea14e246fb9e41b33a..24c0e9114e2e8311c99211541b01c004740397ff 100644 GIT binary patch delta 48 rcmeAY>Jn6O^6lba0D~?dSp&ohKr8^nj6fDMkY?bR7$~yQB8US3pI`<U delta 51 ucmeAY>=IIO^5x=W0D~?dSp&ohKr9Hvj6fDMkZ$0Z7$~yQB8X$+ga!bmJO{e~ diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_16px.svg similarity index 85% rename from dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg rename to dlls/light.msstyles/blue_scrollbar_resizebox_grip_16px.svg index 5c31233d422..f736ba75a1c 100644 --- a/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_16px.svg @@ -1,5 +1,5 @@ <?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#"> +<svg id="bitmap:32-32" width="32" height="16" version="1.1" viewBox="0 0 8.4667 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=""> @@ -9,7 +9,7 @@ </cc:Work> </rdf:RDF> </metadata> - <g fill="#bdbdbd" stroke-width="0"> + <g transform="translate(0 -.26463)" 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"/> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..80f8ab73ad3e3ace8f8eba336a25cf9bc5afc2fe GIT binary patch literal 3338 zcmZ?r<>F-kgDxOh1H>9YECR%g3<?a)K)QhkNML~f3=9wilKJoC9#o8>gn$4G0r^pB z>W0AHy?g(IFw9g!d}7t1n*-BFDvfRqAwJA}Lh8`vVfsetfeiulctPjGT!$`>&WEX^ zHjQo%Iv-{qx;Q!?rf!rT+#!G~-f)T2+c&t}flHj;?i;mlGz3ONU^E1VY6t)T(*B|c literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.svg new file mode 100644 index 00000000000..9e3289560eb --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:40-32" width="40" height="20" version="1.1" viewBox="0 0 10.583 5.2916" 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 -.26463)" fill="#bdbdbd" stroke-width="0"> + <rect x="4.2333" y="4.4979" width=".52917" height=".52917"/> + <rect x="3.175" y="4.4979" width=".52917" height=".52917"/> + <rect x="2.1167" y="4.4979" width=".52917" height=".52917"/> + <rect x="3.175" y="3.4396" width=".52917" height=".52917"/> + <rect x="4.2333" y="3.4396" width=".52917" height=".52917"/> + <rect x="4.2333" y="2.3813" width=".52917" height=".52917"/> + <rect x="5.8209" y="2.3813" width=".52917" height=".52917"/> + <rect x="6.8792" y="4.4979" width=".52917" height=".52917"/> + <rect x="5.8209" y="4.498" width=".52917" height=".52917"/> + <rect x="5.8209" y="3.4396" width=".52917" height=".52917"/> + <rect x="6.8792" y="3.4396" width=".52917" height=".52917"/> + <rect x="7.9375" y="4.4979" width=".52917" height=".52917"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..cdcf712b11afcb657c9f72d4d7fe93f09f6bf0f7 GIT binary patch literal 4746 zcmeHF!41MN40Ht(^u?1An4uqD{d5(+OwgS&TX29=KbB=9s-kjH+)I2{+q!lb=U$#` z*5_U0qH)sb<SYk8dGqbKtSa)_Emeo>bX&OC=@^qy^+OJnQYr#t;oi{8d0e&zYGpCn z$I_vf#YJ<d@hL|8SUU8yxM&VFi2HFM`|Y#(wVle&lht$nwH;vnZ#!W9<LKdW&}@y~ cj2^f3-01Jk=y7<TNC)Tu9iRhr;9neg03EPm)c^nh literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.svg new file mode 100644 index 00000000000..d84102732ec --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:48-32" width="48" height="24" version="1.1" viewBox="0 0 12.7 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 transform="matrix(1.5 0 0 1.5 -.1323 -.52924)" fill="#bdbdbd" stroke-width="0"> + <rect x="3.4396" y="3.7042" width=".52917" height=".52917"/> + <rect x="2.5577" y="3.7042" width=".52917" height=".52917"/> + <rect x="1.6757" y="3.7042" width=".52917" height=".52917"/> + <rect x="2.5577" y="2.8223" width=".52917" height=".52917"/> + <rect x="3.4396" y="2.8223" width=".52917" height=".52917"/> + <rect x="3.4396" y="1.9403" width=".52917" height=".52917"/> + <rect x="4.6743" y="1.9403" width=".52917" height=".52917"/> + <rect x="5.5563" y="3.7042" width=".52917" height=".52917"/> + <rect x="4.6743" y="3.7042" width=".52917" height=".52917"/> + <rect x="4.6743" y="2.8223" width=".52917" height=".52917"/> + <rect x="5.5563" y="2.8223" width=".52917" height=".52917"/> + <rect x="6.4382" y="3.7042" width=".52917" height=".52917"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4799cf5192529ed576f0360fa4d751863c4825d4 GIT binary patch literal 6410 zcmeH_F%H5o3`LFT#0fxR;26wZm{_<9YX@fTl(VHS=ufp=TOv|~e$>Qj{*U$Zl<|Hz z$!ENEopfGxo^|fzB73c`qb{paMZVvn)baLst}GiH!-h`z{|S^*Dkg4=|D}3+o|f%_ zUcau<9F`AREG@c+9<6FLhvh>iON;KI2P+9g31r_^)*sE$%9qWX^|#6$?VHV;^+$8i wM*>j-)*HlGPlKoT>fOQ9dcPO)d3W$MoM$Bg5+DH*AOR8}0TLhq66lM-48=cU?f?J) literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.svg new file mode 100644 index 00000000000..89841e4d662 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:56-32" width="56" height="28" version="1.1" viewBox="0 0 14.817 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 transform="matrix(1.5 0 0 1.5 -.1323 -.52924)" fill="#bdbdbd" stroke-width="0"> + <rect x="4.1451" y="4.4098" width=".52917" height=".52917"/> + <rect x="3.2632" y="4.4098" width=".52917" height=".52917"/> + <rect x="2.3812" y="4.4098" width=".52917" height=".52917"/> + <rect x="3.2632" y="3.5279" width=".52917" height=".52917"/> + <rect x="4.1451" y="3.5279" width=".52917" height=".52917"/> + <rect x="4.1451" y="2.6459" width=".52917" height=".52917"/> + <rect x="5.3799" y="2.6458" width=".52917" height=".52917"/> + <rect x="6.2619" y="4.4097" width=".52917" height=".52917"/> + <rect x="5.3799" y="4.4097" width=".52917" height=".52917"/> + <rect x="5.3799" y="3.5278" width=".52917" height=".52917"/> + <rect x="6.2619" y="3.5278" width=".52917" height=".52917"/> + <rect x="7.1438" y="4.4097" width=".52917" height=".52917"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..d3f1cfbbc799f4f85ecc74e5f4754ca209399e8c GIT binary patch literal 8330 zcmeH_!3~2j3`JA5gD^_PrKeuHO0S)OoibZ+sJ;XT$HY<;B7H<K_&etNDf4@o!gek4 z{K<OCnq=MNd6&3-<aoGJ2>&~0)BO5;5AunR$B7!2kbp%X#+ddC_4{0YxAK<m?T5at zVy!Q&9{x1FHjjR-W34Z(9zHd_HjjR-W34Z(9zHd_HjjRcB+!F^_q=-d^_a2rPwyPw zeI+kFH18bVeLZF@{nI;#cVEd1H4?ZA0quOlpQWR2)M(9T>7&jK-`0GVjy|JCYd%XK cb#D450TLhq5+DH*AOR8}0TLhq61WC|6_ucH&;S4c literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.svg new file mode 100644 index 00000000000..44cf59cb260 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:64-32" width="64" height="32" version="1.1" viewBox="0 0 16.933 8.4666" 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="matrix(2 0 0 2 -1.8779e-5 -.52927)" 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_resizebox_grip_36px.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e76f511f3fe00890d79af83dc0505b230cf62c26 GIT binary patch literal 10506 zcmeH}F%H5o3`K)r;uH)FaE&gouy7UD4$R!CXDcb_OO=Xc#Y@!isyeRx9oK$pq;|Lc zIeo5IUi)m<Y{zVybV%FmpQpSmt}&(WJt<>%xjz;uPGINg$PlPOU>JsRZt7tko1VS6 zr$_6lZY^Khx0SE{Exk0ZdbNFN-&Vfnu=LWn>ecq8eOvjO!_rIRs)vU_iv*(QA-ZpE z45M>K_rd4)f7aT#sNd*!5Z$Nu;vw+Q1g!HTCZ4XmR=qdBr?<*Qb9wW7y6Uv*z4<-8 jRW8g00SG_<0uX=z1Rwwb2tWV=5P$##AOHaftcSoGrTlR1 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.svg new file mode 100644 index 00000000000..1fd06a9f818 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:72-32" width="72" height="36" version="1.1" viewBox="0 0 19.05 9.5249" 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="matrix(2 0 0 2 -1.8779e-5 -.52927)" fill="#bdbdbd" stroke-width="0"> + <rect x="3.9687" y="4.2333" width=".52917" height=".52917"/> + <rect x="3.1749" y="4.2333" width=".52917" height=".52917"/> + <rect x="2.3812" y="4.2333" width=".52917" height=".52917"/> + <rect x="3.1749" y="3.4395" width=".52917" height=".52917"/> + <rect x="3.9687" y="3.4395" width=".52917" height=".52917"/> + <rect x="3.9687" y="2.6458" width=".52917" height=".52917"/> + <rect x="5.027" y="2.6459" width=".52917" height=".52917"/> + <rect x="5.8208" y="4.2334" width=".52917" height=".52917"/> + <rect x="5.027" y="4.2334" width=".52917" height=".52917"/> + <rect x="5.027" y="3.4396" width=".52917" height=".52917"/> + <rect x="5.8208" y="3.4396" width=".52917" height=".52917"/> + <rect x="6.6145" y="4.2334" width=".52917" height=".52917"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f2becdbaf72972b9d8f2e728373fedfee1522a73 GIT binary patch literal 12938 zcmeH{I}XA?3`7^fK`5y?LK-S0#8qfH0e8yT!Um8sO5+%tEy9bk;Kbw4ydvHCaV)Rv zQGf6CT<SU0vnl(st^ehdAH(SyN_pSotD!qxZ&Pkrv|A=a1px^B0fD~nhxt+4^W6CC z$$PY!vvlq+<LJ&-z3y&lqj{axDvs`K)vFIn8_nyiR&jJ^t6qIr+Gt*9wTh!VTlMP0 z(nj+-ix>hBfIyT$<~J#`SJYRl`b^K6y;}K?&dKzg*(>U+Reh%C%wDbhN9SaE&g>QS zMLh%{0D&k0>zk(iJzA|>bL?T_(XN@9dh;;xXm!S#V-FLLcFoMxn}>-<t22lp009U< c00Izz00bZa0SG_<0uX=z1Rwwb2z*1}3Br`i;{X5v literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.svg new file mode 100644 index 00000000000..793a7e1abe0 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:80-32" width="80" height="40" version="1.1" viewBox="0 0 21.167 10.583" 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="matrix(2 0 0 2 -1.8779e-5 -.52927)" fill="#bdbdbd" stroke-width="0"> + <rect x="4.2333" y="4.498" width=".66145" height=".66145"/> + <rect x="3.175" y="4.4979" width=".66145" height=".66145"/> + <rect x="2.1167" y="4.4979" width=".66145" height=".66145"/> + <rect x="3.175" y="3.4396" width=".66145" height=".66145"/> + <rect x="4.2334" y="3.4396" width=".66145" height=".66145"/> + <rect x="4.2333" y="2.3813" width=".66145" height=".66145"/> + <rect x="5.6886" y="4.498" width=".66145" height=".66145"/> + <rect x="5.6886" y="3.4396" width=".66145" height=".66145"/> + <rect x="5.6886" y="2.3813" width=".66145" height=".66145"/> + <rect x="6.7469" y="4.4979" width=".66145" height=".66145"/> + <rect x="6.7469" y="3.4396" width=".66145" height=".66145"/> + <rect x="7.8052" y="4.4979" width=".66145" height=".66145"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 3e6df6ea6a5..9db8903412d 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -554,12 +554,26 @@ BLUE_INI TEXTFILE "ImageLayout = Vertical\r\n" "[ScrollBar.SizeBox]\r\n" -"ImageFile = blue_scrollbar_resizebox_grip.bmp\r\n" "BgType = ImageFile\r\n" +"ImageSelectType = Dpi\r\n" "ImageCount = 2\r\n" "SizingType = TrueSize\r\n" "Transparent = True\r\n" "VAlign = Bottom\r\n" +"ImageFile1 = blue_scrollbar_resizebox_grip_16px.bmp\r\n" +"ImageFile2 = blue_scrollbar_resizebox_grip_20px.bmp\r\n" +"ImageFile3 = blue_scrollbar_resizebox_grip_24px.bmp\r\n" +"ImageFile4 = blue_scrollbar_resizebox_grip_28px.bmp\r\n" +"ImageFile5 = blue_scrollbar_resizebox_grip_32px.bmp\r\n" +"ImageFile6 = blue_scrollbar_resizebox_grip_36px.bmp\r\n" +"ImageFile7 = blue_scrollbar_resizebox_grip_40px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" "\r\n; Spin\r\n" "[Spin]\r\n" @@ -638,13 +652,27 @@ BLUE_INI TEXTFILE "[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" +"ImageSelectType = Dpi\r\n" "ImageCount = 2\r\n" "SizingType = TrueSize\r\n" "Transparent = True\r\n" "VAlign = Bottom\r\n" +"; Same as scrollbar resize box gripper \r\n" +"ImageFile1 = blue_scrollbar_resizebox_grip_16px.bmp\r\n" +"ImageFile2 = blue_scrollbar_resizebox_grip_20px.bmp\r\n" +"ImageFile3 = blue_scrollbar_resizebox_grip_24px.bmp\r\n" +"ImageFile4 = blue_scrollbar_resizebox_grip_28px.bmp\r\n" +"ImageFile5 = blue_scrollbar_resizebox_grip_32px.bmp\r\n" +"ImageFile6 = blue_scrollbar_resizebox_grip_36px.bmp\r\n" +"ImageFile7 = blue_scrollbar_resizebox_grip_40px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" "\r\n; Tab\r\n" "[Tab]\r\n" @@ -1058,8 +1086,26 @@ 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_resizebox_grip_16px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_16PX_BMP BITMAP "blue_scrollbar_resizebox_grip_16px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip_20px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_20PX_BMP BITMAP "blue_scrollbar_resizebox_grip_20px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip_24px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_24PX_BMP BITMAP "blue_scrollbar_resizebox_grip_24px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip_28px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_28PX_BMP BITMAP "blue_scrollbar_resizebox_grip_28px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip_32px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_32PX_BMP BITMAP "blue_scrollbar_resizebox_grip_32px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip_36px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_36PX_BMP BITMAP "blue_scrollbar_resizebox_grip_36px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip_40px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_40PX_BMP BITMAP "blue_scrollbar_resizebox_grip_40px.bmp" /* @makedep: blue_scrollbar_shaft_horizontal.bmp */ BLUE_SCROLLBAR_SHAFT_HORIZONTAL_BMP BITMAP "blue_scrollbar_shaft_horizontal.bmp" -- 2.30.2

1 0

[PATCH 1/5] light.msstyles: Add more Button HiDPI images.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- These HiDPI images are added so that UI parts can render with crisp images instead of blurry scaled images. DPIs up to 240 (250% 96 DPI) are supported. For even higher DPI settings, they still need to use scaled images. However, they will scale from 240 DPI images so they will be less blurry. The reason there is a limit on 240 DPI is that theme file format v3 supports MinDpi1~5, later versions added MinDpi6~7. So for every 25% DPI increase from 96, a MinDpi property is used. On Windows, uxtheme only reports images with the currently available monitor DPIs so only a limited set of MinDPI properties are used. Due to the lack of documentation of how HiDPI images are packed in theme file format v4, such dynamic DPI image reporting is not implemented. Instead, MinDpi6~7 support will be added by later uxtheme patches. dlls/light.msstyles/Makefile.in | 13 +++ dlls/light.msstyles/blue_checkbox_19px.bmp | Bin 0 -> 17466 bytes dlls/light.msstyles/blue_checkbox_19px.svg | 48 +++++++++++ dlls/light.msstyles/blue_checkbox_22px.bmp | Bin 0 -> 23370 bytes dlls/light.msstyles/blue_checkbox_22px.svg | 50 +++++++++++ dlls/light.msstyles/blue_checkbox_28px.bmp | Bin 0 -> 37770 bytes dlls/light.msstyles/blue_checkbox_28px.svg | 40 +++++++++ dlls/light.msstyles/blue_checkbox_31px.bmp | Bin 0 -> 46266 bytes dlls/light.msstyles/blue_checkbox_31px.svg | 46 ++++++++++ .../blue_commandlink_glyph_37px.bmp | Bin 0 -> 27518 bytes .../blue_commandlink_glyph_37px.svg | 19 ++++ .../blue_commandlink_glyph_52px.bmp | Bin 0 -> 54218 bytes .../blue_commandlink_glyph_52px.svg | 19 ++++ .../blue_commandlink_glyph_60px.bmp | Bin 0 -> 72138 bytes .../blue_commandlink_glyph_60px.svg | 19 ++++ .../blue_commandlink_glyph_67px.bmp | Bin 0 -> 89918 bytes .../blue_commandlink_glyph_67px.svg | 19 ++++ .../blue_commandlink_glyph_75px.bmp | Bin 0 -> 112638 bytes .../blue_commandlink_glyph_75px.svg | 19 ++++ dlls/light.msstyles/blue_radiobutton_19px.bmp | Bin 0 -> 11690 bytes dlls/light.msstyles/blue_radiobutton_19px.svg | 28 ++++++ dlls/light.msstyles/blue_radiobutton_22px.bmp | Bin 0 -> 15626 bytes dlls/light.msstyles/blue_radiobutton_22px.svg | 28 ++++++ dlls/light.msstyles/blue_radiobutton_28px.bmp | Bin 0 -> 25226 bytes dlls/light.msstyles/blue_radiobutton_28px.svg | 28 ++++++ dlls/light.msstyles/blue_radiobutton_31px.bmp | Bin 0 -> 30890 bytes dlls/light.msstyles/blue_radiobutton_31px.svg | 28 ++++++ dlls/light.msstyles/light.rc | 81 ++++++++++++++++-- 28 files changed, 477 insertions(+), 8 deletions(-) create mode 100644 dlls/light.msstyles/blue_checkbox_19px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_19px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_22px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_22px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_28px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_28px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_31px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_31px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_37px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_37px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_52px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_52px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_60px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_60px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_67px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_67px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_75px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_75px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_19px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_19px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_22px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_22px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_28px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_28px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_31px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_31px.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 3205d1b28f9..3b33058fdef 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -6,12 +6,21 @@ SVG_SRCS = \ blue_button.svg \ blue_checkbox_13px.svg \ blue_checkbox_16px.svg \ + blue_checkbox_19px.svg \ + blue_checkbox_22px.svg \ blue_checkbox_25px.svg \ + blue_checkbox_28px.svg \ + blue_checkbox_31px.svg \ blue_combobutton.svg \ blue_combobutton_glyph.svg \ blue_commandlink.svg \ blue_commandlink_glyph_30px.svg \ + blue_commandlink_glyph_37px.svg \ blue_commandlink_glyph_45px.svg \ + blue_commandlink_glyph_52px.svg \ + blue_commandlink_glyph_60px.svg \ + blue_commandlink_glyph_67px.svg \ + blue_commandlink_glyph_75px.svg \ blue_groupbox.svg \ blue_header.svg \ blue_header_item.svg \ @@ -21,7 +30,11 @@ SVG_SRCS = \ blue_progress_track_vertical.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ + blue_radiobutton_19px.svg \ + blue_radiobutton_22px.svg \ blue_radiobutton_25px.svg \ + blue_radiobutton_28px.svg \ + blue_radiobutton_31px.svg \ blue_rebar_background.svg \ blue_rebar_chevron.svg \ blue_rebar_gripper_horizontal.svg \ diff --git a/dlls/light.msstyles/blue_checkbox_19px.bmp b/dlls/light.msstyles/blue_checkbox_19px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..005d8148040fa29a76fe40367fd9396a0689e6f4 GIT binary patch literal 17466 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 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_19px.svg b/dlls/light.msstyles/blue_checkbox_19px.svg new file mode 100644 index 00000000000..9e45a9c8048 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_19px.svg @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:19-32" width="19" height="228" fill="#000000" version="1.1" viewBox="0 0 19 228" 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="matrix(.95 0 0 .9499 .051376 .05137)" fill="none" stroke-width="1.0527"> + <path d="m2.9e-6 0h36.923v36.965h-36.923z"/> + <rect x=".47226" y=".47227" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> + <rect x=".47226" y="20.474" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#3096fa"/> + <path d="m0.76923 39.275h36.923v36.965h-36.923z"/> + <rect x=".47227" y="40.477" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#2979ff"/> + <rect x=".47227" y="60.479" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> + <path d="m3.5e-6 80.09h36.923v36.965h-36.923z"/> + <path d="m0.76923 119.36h36.923v36.965h-36.923z"/> + <path d="m0 160.18h36.923v36.965h-36.923z"/> + <path d="m0.76923 199.45h36.923v36.965h-36.923z"/> + <path d="m4.1802e-6 80.009h36.923v36.965h-36.923z"/> + <rect x=".47227" y="80.481" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> + <rect x=".47227" y="100.48" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#3096fa"/> + <path d="m0.76923 119.28h36.923v36.965h-36.923z"/> + <rect x=".47227" y="120.49" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#2979ff"/> + <rect x=".47227" y="140.49" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> + <path d="m3.8669e-6 160.02h36.923v36.965h-36.923z"/> + <rect x=".47227" y="160.49" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> + <rect x=".47227" y="180.49" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#3096fa"/> + <path d="m0.76923 199.29h36.923v36.965h-36.923z"/> + <rect x=".47227" y="200.49" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#2979ff"/> + <rect x=".47227" y="220.5" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> + </g> + <path d="m7.1363 88.91-3.1023-3.1343-1.0341 1.0447 4.1363 4.1791 8.8637-8.9553-1.0341-1.0447z" stroke-width=".99999"/> + <g transform="matrix(1.4616 0 0 1.463 .051379 .05137)" stroke-width=".46768"> + <path d="m4.8475 73.723-2.1226-2.1423-0.70752 0.71411 2.83 2.8565 6.0645-6.121-0.70752-0.71411z" fill="#3096fa"/> + <path d="m4.8475 99.697-2.1226-2.1423-0.70752 0.71411 2.83 2.8565 6.0645-6.121-0.70752-0.71411z" fill="#aeaeae"/> + <path d="m4.8475 86.71-2.1226-2.1423-0.70752 0.71412 2.83 2.8565 6.0645-6.121-0.70752-0.71411z" fill="#2979ff"/> + </g> + <path d="m3 161h13v1h-13z"/> + <g transform="matrix(1.4616 0 0 1.463 .051379 -.37608)" stroke-width=".46768"> + <path d="m2.0174 123.29h8.8945v0.68351h-8.8945z" fill="#3096fa"/> + <path d="m2.0174 136.28h8.8945v0.68351h-8.8945z" fill="#2979ff"/> + <path d="m2.0174 149.26h8.8945v0.68351h-8.8945z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_22px.bmp b/dlls/light.msstyles/blue_checkbox_22px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8b072c13265e17dae870cae1ce30e7e1141a51c2 GIT binary patch literal 23370 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 N$jN#&&69G+{{u0LOQQe) literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_22px.svg b/dlls/light.msstyles/blue_checkbox_22px.svg new file mode 100644 index 00000000000..67d005ab6f8 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_22px.svg @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:22-32" width="22" height="264" fill="#000000" version="1.1" viewBox="0 0 22 264" 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="matrix(1.1 0 0 1.1001 .043576 .04358)" fill="none"> + <path d="m2.9e-6 0h36.923v36.965h-36.923z" stroke-width=".90907"/> + <rect transform="scale(1,-1)" x=".86945" y="-19.05" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> + <rect x=".86945" y="20.868" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#3096fa" stroke-width="1.8181"/> + <path d="m0.76923 39.275h36.923v36.965h-36.923z" stroke-width=".90907"/> + <rect x=".86945" y="40.867" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#2979ff" stroke-width="1.8181"/> + <rect x=".86945" y="60.865" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> + <g stroke-width=".90907"> + <path d="m3.5e-6 80.09h36.923v36.965h-36.923z"/> + <path d="m0.76923 119.36h36.923v36.965h-36.923z"/> + <path d="m0 160.18h36.923v36.965h-36.923z"/> + <path d="m0.76923 199.45h36.923v36.965h-36.923z"/> + <path d="m1.2896e-6 79.978h36.923v36.965h-36.923z"/> + </g> + <rect x=".86945" y="80.864" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> + <rect x=".86945" y="100.86" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#3096fa" stroke-width="1.8181"/> + <path d="m0.76923 119.25h36.923v36.965h-36.923z" stroke-width=".90907"/> + <rect x=".86945" y="120.86" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#2979ff" stroke-width="1.8181"/> + <rect x=".86945" y="140.86" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> + <path d="m1.2654e-6 159.96h36.923v36.965h-36.923z" stroke-width=".90907"/> + <rect x=".86945" y="160.86" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> + <rect x=".86945" y="180.86" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#3096fa" stroke-width="1.8181"/> + <path d="m0.76923 199.23h36.923v36.965h-36.923z" stroke-width=".90907"/> + <rect x=".86945" y="200.85" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#2979ff" stroke-width="1.8181"/> + <rect x=".86945" y="220.85" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> + </g> + <path d="m8.4545 102.7-3.3409-3.4478-1.1136 1.1493 4.4546 4.5971 9.5454-9.8507-1.1136-1.1493z"/> + <g transform="matrix(1.5767 0 0 1.6944 .79522 .04358)" stroke-width=".36133"> + <path d="m4.8579 73.573-2.1189-2.0348-0.70632 0.67828 2.8252 2.7131 6.0541-5.8139-0.70631-0.67828z" fill="#3096fa"/> + <path d="m4.8579 99.541-2.1189-2.0348-0.70632 0.67828 2.8252 2.7132 6.0541-5.8139-0.70631-0.67828z" fill="#aeaeae"/> + <path d="m4.8579 86.557-2.1189-2.0348-0.70632 0.67828 2.8252 2.7131 6.0541-5.8139-0.70631-0.67828z" fill="#2979ff"/> + </g> + <path d="m4 186h14v2h-14z"/> + <g transform="matrix(1.5385 0 0 1.6944 1 -.16794)" stroke-width=".36579"> + <path d="m1.95 122.86h9.1v1.1804h-9.1z" fill="#3096fa"/> + <path d="m1.95 135.84h9.1v1.1804h-9.1z" fill="#2979ff"/> + <path d="m1.95 148.83h9.1v1.1804h-9.1z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_28px.bmp b/dlls/light.msstyles/blue_checkbox_28px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8911e3159873641a1f6c603eef6bafbd995b803c GIT binary patch literal 37770 zcmeI5TWnlM8OQCWNoZQ4yySt93LY%QYghKJ0)jLbOr?N8RH=ZpJkUxl5+Fef2t;BB zkRRgs#zk^`ZG?EDNLHLUN}I+aN}9Y8k+=4RJV9c|(1+$Bm+r3Z;r~B7vp#!#cFt|a zMC=^p%b9a#=KG!bpUckp%(wg8^Ft?_yk!Xg{|dGf_Cj-0Q*+a2n>H{<<}<mvh^D5> zKkgFGef66^U(Jh`dOT2UdU|@(%*@P*GiT1+f(c7@8-DwIEL)r!zp`Cq3#1POnr>{9 zzNK#SST8eu<;s<y)W&$dy}ge~9^3198I^T<W)v_`-RT(+B;%$|Pv3K(=Gm8aKM(a$ z;$@UBw7RZ+p%pUjbi9lL2C6$f1A=7SY%o39N8__{Pe$45R;O>tSipKnrj0zGBYX{A zxNu=J$_&H)9Z@#R@zD1$S)#Xnljv^i7u~trFk#8y8w|2~+D=$vgdDrSU2Xg8p74wr zXxo0-rg^NFy>xGvwef@KZF<b7q2pyee@@Sg3f5L{<m(fE-f1>zR92^_?>P|i{7e2k zf7E!jSC*MAot|b0wO$;rR*$S(PS30g*4A$@J=sSS;#ljmwJMm~qHp<JUJyrfL#Ch6 z8h?Z0^_I<&xu_|Z^|NBpV~{o7zNt7~7$}eD=S$;xVZ-Q~439O|*>8gp=CcSE*teNi z9`CR=ekhN1?yE374VRe~md6ji_Bvk1Tc6KQr)NeHebt?wJ~0d=b$a5uT`_4q+z6i0 z&xj}<kHw@#@tALV(dlWLMSqTGR#m6x|Bs&4{@_^N+W4Ui-|SC#{oaZEps#OX^w}Bo zTLeptv}`Vp=Z8vT`Nd$qv2FM!gZ+8VDZ;ymKG?r3zVD##<C4{HkrR9;Ll)m5t=Ie| zk3}Be37Wm@YP|(Dbi7)9l5ROYlPab!@ATB`lQdVOCti1OR;w}d4($=*C6y{xc}@Fb z)lXW;@scX0FYol!>ytFMf%H^;wDp+3bO*X}E>W;wYHQn@Qv@F8Op$Gi<F$+Pm!_ts zHiB~;W^??&*a|QHfoqtpb_M+ofaS$MoIQKCE9pHIxBTqv?0(rM>gvTKaI6%!e$sMb z^A#JJ2hHDLtV>cIRrw@(g7qqF1txG!F?1>M5|@WIy$p_bJ&`BvNK#-N9@_FE{4Yrc zR%hOnX}0x8NtjVQ_&WqEN&j=+JW3&&v3*MJTS41@5SOXr!QVmHL+SSt?vp2!U!*r+ z|6gR@GBo(E%G0fNJotD=`nxtaH}_=Fk9^*qlV!>%|E*w|;I@v3HarDiqtI|`u%6nc zzTjMx%p%s`P<df%9WShW*gonE&Sk{}|7&68xX%QSe$JmizXiOjl6fD@F76L5rg-#A z-NCy~Ca&3g{4B7^qi?ip8+bR!gxx)T`t;}gOq1<XesMmxgY|)Aeu(umD$fRwzR#UI zw*#8ql+3HPdGwF-_cVC#f%}>D;3<ZGZA(u-!=G+2-aM}-oZr2E4NRut`-}3LT||0N zrq$=SwKbj#zvZ(YJlo@kMa8PbKeYCV?$%ot=S!`|KXj9od|qy<Iz71o)RS=?tzR;E zjre_uBklX-@!i2%#v`;_8$a-Us!xxG=OO;&4aU{@&q<PW5<S6s722;z{Zow};_|?F z8CE&J>Yh28OFVvv!-IY=g0&>uHG}ObnO+e+xkTfKD4sadb_l*p(*K+{XOnRQJ-Jg= zW_Mfc@q>;Bp9kUdq4ax6{A_1+{2&fDZNUDwWZp8`9Bcfb<#p%Yk^ZiUUv#V)KZx(| z-iTwGm1WA}Xlvy7LCfoHe+s@vMQ=;p@q?#tciTnDEaF+O9Y5%JaqlbYjC<vBmD$r) zcl=<2$Kw*cySG5wtCD#i+IEE<uPI)I*|HUSUYE>!jD-s_P4X(t{5J4zNakH}Y*)?r z!8FffcDHN??*ot7llu@lSH}-FcpmeYyLNzgQ!=aL2U|RkdF+{|!Fx{}%T>n@HhE+Q z7sm@Kl5IPnXC?ljd)MA<UhCJ!^I(s6&35M)gD@!5Sz``j)NdWG^yfV$`=T-Gq$-1U zfmMxv$oG{e^0$o5j|#+5aLyTH5h}43`952mpkEo+A>$tk*2WJi{-HSDc?ZW(iATWP zu=-b6wjACMzP2_z4|Dx~!s{!os!8-LO?18n?K$UMlqU+mPQ#4LD~%OiQP-0?-(Vh1 z%8bK<elLNs<h5(OFoX4!VxrAIPQr}h6-V=j;JZZsm`6FsIh#T>HDmjfWUhdjX#61S zaeisd{ZO9FA1sY`KJ@Y@IxmSob$vp$MNA*wP@2fUCF?HZ{*66;sK-Nl-mc^ou8FDL zTNF#Jv2P=uwX?E*xj0t%w#uuw*6AsRJD$XKa#H+p*C*@N_vXZQzAKrfkH<QmuUD4) zbv#`?f1ddLo+rS&ESbfn$^6&-`Tn#C9{o{ooX@M0`2ae1`8g_WibsE9<O^HDyDpjc z!s6^q@;v4r^4m%ig&UH2w=`K;Gk%bHYwic7LDIDtDQt(&_od&DaDNt*57X^ae(#?w z>;Uhk$HaM6`)%>)|G`MdPVlZg94*w0A7s0Y>8aWhwzk>6M(0)IA13m9!?ZB5uRK}U z<6SR|6Ijpqhw=Qd*T)7EpF<12Yu0Go1^c=1Kg`c<yq9GB!*RTi_@}M+EYi0Z|A6;7 zCv0(oe&xF(?|l{Wtc@Rh^OvgMnPv0)TX~HK+uGo~pF)y>Ecbo_JzoQ71tws>Nz07M zdj<ZNC5t>-;_(CO#JOI+gJMfCGET!LWt!Ws!xAkK?Rx>vN-+Aq2-^&6hP?^nKI;2J zSnNf^`wE<V45Qz_!m8s3r1@3Ze}*aM_mGaYXn1eK0sXPRvu6B&eH&qCVJt(v55poC z4Ug|QMqqWv56I)+GA_W#r0&}B1M=fsFD#~8cuwDiky(V*9X}w?1dnd0H+3iT0qo1L z&_$zXXnD;}zW4bXjLiG6HSZs=&s6*9ipw_G-(h6lg?%1Yvlwij^1B_0_hDpy1gnl8 zkT%^uy5#aH*gs%o^1N0T3++?BcOt>(#HZB`t}XKXm}=Vbs!|w9`1JJRAJAue)`;T} zC%*Yh{{feCiLA|83i$q=Z~l^s^RU6DZ!gwDjvp8&p!(T1c#J{l_pxj+!hH6Ft90BK za;lB&!u8_+{Ri(jZ1(5r8||uTuj8dZl}^v}+J)70dWNZzexK7by>?+Wot|N;q~GWC zOs`#7O{Zs=D(UwH^t3*HK;LYi?4OafZsQ03y?mX<5A$TPKVSJx1}{!P&I?O5A1Z2| z)oT1hB_<)NyrF#W_a7F#d0>c9NPh+DYl<Ve19Gm}s)km-zqRY}HFMh>Pk)j$x%{qO zr>91sgjr6{gn~sBcX~z$lrY=rnNYBZ;!e*9ff8mrJrfERQ9Ph$r9Wu%_a9c{VgHxE z|4?bCofruAa|gY#!}|RGgD?J}Fkow5R?si!#H)E=j8TZV%u;8UM+*nY=J)-oW8gKL z+F?XR`c@pZcDxADG}%s1jW{W?oSrE}(^PSKYQ#yA<@8J;nx=}=QzK4_ET?A*(KJ>3 zdam{dZT|j4<@dnIf(@xYn(ej!_a9U{Z7|jETBzTD;JXOCXR$ediN4o;{u0`C0$lHX z71Gw?Wqk1uRSh+lvym*ct7iU^5vLj_j;9ePMV8Yug=m^8PEU<EDYBfNDMZs$ae8XR pNs;CBOd*=4N(1R>ef|>rno>{p2iI->5?BN4G=FJ<V+PJ&`Y%4bW`+O& literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_28px.svg b/dlls/light.msstyles/blue_checkbox_28px.svg new file mode 100644 index 00000000000..35e78c0d6ef --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_28px.svg @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:28-32" width="28" height="336" fill="#000000" version="1.1" viewBox="0 0 28 336" 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=".99999" y="1" width="26" height="26" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> + <path d="m10.045 130.87-4.534-4.7014-1.5114 1.5672 6.0454 6.2686 12.955-13.433-1.5114-1.5672z"/> + <path d="m4 237h20v2h-20z"/> + <g transform="matrix(1.1398 0 0 1.1208 -.13981 -.12081)" fill="none" stroke-width="1.7695"> + <rect x="1.0074" y="25.975" width="22.796" height="23.213" rx="1.7547" ry="1.7844" stroke="#3096fa"/> + <rect x="1.0074" y="50.957" width="22.796" height="23.213" rx="1.7547" ry="1.7844" stroke="#2979ff"/> + <rect x="1.0074" y="75.939" width="22.796" height="23.213" rx="1.7547" ry="1.7844" stroke="#aeaeae"/> + <rect x="1.0074" y="100.92" width="22.811" height="23.198" rx="1.7547" ry="1.7844" fill="none" stroke="#aeaeae"/> + <rect x="1.0148" y="125.9" width="22.796" height="23.213" rx="1.7547" ry="1.7844" stroke="#3096fa"/> + <rect x="1.0148" y="150.88" width="22.796" height="23.213" rx="1.7547" ry="1.7844" stroke="#2979ff"/> + <rect x="1.0148" y="175.86" width="22.796" height="23.213" rx="1.7547" ry="1.7844" stroke="#aeaeae"/> + </g> + <g transform="matrix(1.1304 0 0 1.1208 -.13044 -.12081)" stroke-width=".78927"> + <path d="m9.0017 141.85-4.0109-4.1947-1.337 1.3983 5.3479 5.593 11.46-11.985-1.337-1.3983z" fill="#3096fa"/> + <path d="m9.0017 166.83-4.0109-4.1947-1.337 1.3983 5.3479 5.593 11.46-11.985-1.337-1.3983z" fill="#2979ff"/> + <path d="m9.0017 191.81-4.0109-4.1947-1.337 1.3983 5.3479 5.593 11.46-11.985-1.337-1.3983z" fill="#aeaeae"/> + </g> + <g transform="matrix(1.1304 0 0 1.1208 -.13044 -.12081)" fill="none" stroke-width="1.7768"> + <rect x="1.0038" y="200.85" width="23" height="23.198" rx="1.7692" ry="1.7844" fill="none" stroke="#aeaeae"/> + <rect x="1.0113" y="225.83" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#3096fa"/> + <rect x="1.0113" y="250.81" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#2979ff"/> + <rect x="1.0113" y="275.79" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#aeaeae"/> + </g> + <g transform="matrix(1.1765 0 0 1.1208 -.70588 -.12081)"> + <path d="m4 236.54h17v1.7844h-17z" fill="#3096fa" stroke-width=".77367"/> + <path d="m4 261.53h17v1.7844h-17z" fill="#2979ff" stroke-width=".77367"/> + <path d="m4 286.51h17v1.7844h-17z" fill="#aeaeae" stroke-width=".77367"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_31px.bmp b/dlls/light.msstyles/blue_checkbox_31px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..eab02f44485bfc8ec3811f0d5b9e89eed276f225 GIT binary patch literal 46266 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 G9QrjU(2gnq literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_31px.svg b/dlls/light.msstyles/blue_checkbox_31px.svg new file mode 100644 index 00000000000..731c5af121a --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_31px.svg @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:31-32" width="31" height="372" fill="#000000" version="1.1" viewBox="0 0 31 372" 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="29" height="29" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> + <path d="m11.682 144.66-5.0112-5.0148-1.6705 1.6717 6.6816 6.6864 14.318-14.328-1.6705-1.6717z"/> + <path d="m5 262h21v3h-21z"/> + <g transform="matrix(1.2787 0 0 1.2336 -.27878 -.23525)" fill="none" stroke-width="1.5924"> + <g> + <rect x="1.0142" y="26.116" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> + <rect x="1.0142" y="51.246" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> + <rect x="1.0142" y="76.375" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> + </g> + <rect x="1.0142" y="101.5" width="22.68" height="23.508" rx="1.5641" ry="1.6213" fill="none" stroke="#aeaeae"/> + <g> + <rect x="1.0284" y="126.62" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> + <rect x="1.0284" y="151.75" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> + <rect x="1.0284" y="176.88" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> + </g> + </g> + <g transform="matrix(1.2494 0 0 1.2335 .4349 -.23356)" stroke-width=".6481"> + <path d="m9.0017 142.59-4.0109-4.0654-1.337 1.3552 5.3479 5.4206 11.46-11.616-1.337-1.3552z" fill="#3096fa"/> + <path d="m9.0017 167.72-4.0109-4.0654-1.337 1.3552 5.3479 5.4206 11.46-11.616-1.337-1.3552z" fill="#2979ff"/> + <path d="m9.0017 192.85-4.0109-4.0654-1.337 1.3552 5.3479 5.4206 11.46-11.616-1.337-1.3552z" fill="#aeaeae"/> + </g> + <g transform="matrix(1.2522 0 0 1.2335 -.2522 -.23356)" fill="none" stroke-width="1.6092"> + <rect x="1.006" y="202.04" width="23.16" height="23.509" rx="1.5972" ry="1.6213" fill="none" stroke="#aeaeae"/> + <g> + <rect x="1.0205" y="227.16" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#3096fa"/> + <rect x="1.0205" y="252.29" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#2979ff"/> + <rect x="1.0205" y="277.42" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#aeaeae"/> + </g> + </g> + <g transform="matrix(1.3032 0 0 1.2335 -.88963 -.23356)" stroke-width=".70069"> + <path d="m4.5192 237.72h16.114v2.432h-16.114z" fill="#3096fa"/> + <path d="m4.5192 262.85h16.114v2.432h-16.114z" fill="#2979ff"/> + <path d="m4.5192 287.98h16.114v2.432h-16.114z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_37px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_37px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..027f93edf2e8d36d6c34767dbebda8e7a9e1890a GIT binary patch literal 27518 zcmeI4&rj4q6vx---{1i*CLr#D&=$SmL68e4IGE^3z3D*{FDA0P5aZdSuw6NcH$Z+K zJ#o>0!UQ-%B;ki~g|@KI@9a*26hgO4*FNLh_~<U3PCxsZnRa}k(?9s;MXK_8ho7T} z>xeIiOQ~zA%h>*UjvuF9luA|qsXf#`aR1e*A|b!H60%=*ivckp2E@SMHQ<d~cU{|> zqPKl4F41nmG+o==L6BQCKN8{Al<@0!(P#$GT7^k**~a^Xkt(O(FLbxU*M`sK*~Tyj zF870FfN5KEmBILw1D97Y?xF4WG}nP+n-4f}?c3H6m^{tpctvA?1D9K{o`9*WxqhNu zZ`Z?x<5yx1S2JNOnm?S0Tj{7=CyrNjG$Ov%!PH1kn@*uS6O}2>@{Vmhf@{A&mAry^ zC(in#*0o>g8UzoUap!%odcafC{qfK#8V{p>r#Q<yW1XE~+0s0?A6qZutUqd9`xCcX z(1+H29?v%OQR|4aJQcgHg5|r<gY9^n_19CEzV}w=Pqz7q!~98o53gwUAwF}NXV&9Z zju8W5Kn#chF(3xSfEW-1wHTP6pYKIXFE1~%$gwUgESTWgMG#_=h!W4S&dkg-gJn%K z(cIkJSS@ZFU1n)%sTE8cJ{PvxMxV2m`e$cnyTG!oxysnG$g!et^?_wia~)vIBFBpU zGz1n;b2;$GBF74@$6!+Jr^aFl(NjzN2g~5Nm6*dteTqrNCVWNCv7R{IuP4?m+<gmr z2>T2scAmnRqwEj%r^Us^M02b-{~(;R8FygmMflgJLtL*C&9Un1_!gMd*eHYNS(NsU zyDZM%0*-afL-?GF`y5f~!~M4jeR|dB!TZGL1z<4{JDQ2b{7E?lPY>E_ipxARN;^wg zF(3xSfEW-1Vn7Ut0WlE80OiuXl*>$W`TGLOcbMSWMG#^Vk543?W2KR{X0WVjCUCVU z{(mXe#+2=71=GecSDHnRm4-VEFl}qDGWr;c94lqhePG(tTnChGXOUy2T*nZYJk8}$ zKFuP>O8LwaFrob_W3hyGtSiTg@v;(cWL(WeVBDl!TjU(;(ec&qrmi*dMm7^U#~QCA z<^1BFqTEZu%2K}l5txqq(?~ke94n2a2f@Q;+^O*e9*na}Up$1bM02b(obCk6mgXtr z`k82sl}2y2fMs3t5O@;JvC``sO<-9);$bi^(D&XQ&BS8<RGF((`!<{BrNXXNvR@2{ z0Wly3#DEwO17bi7)N8=AtzJCK%_hgH*9zFx&)?ziFp|%)o?0uQV6n)to?0uQXtBt# zvRx|x&nwDW0kvN#0&4}7)U(XBAAMXBW4W=<!1G)yAaahCqo?Cmy!bm=E8u*G%-0G~ zYdj>HV?AT7fJAewr7^1sPF4}swMH1s3j%8eu$VuoUSI9oeAc8oe<aFYF(3xSfEW-1 zVn7Ut0Wna&0m-q3yOSJixTBLLB*%KvM)>=GWIa~NvHH1`+P0Eo4Rn3Uu?B<$K1z-? dASCcna;yO%XMB_#>lsqyS7Ja6h=Kpiz#nOTm`eZv literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_37px.svg b/dlls/light.msstyles/blue_commandlink_glyph_37px.svg new file mode 100644 index 00000000000..34aa72aba74 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_37px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:37-32" width="37" height="185" version="1.1" viewBox="0 0 9.7896 48.949" 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="matrix(1.25 0 0 1.25 -.066217 -1.3229)" stroke-width=".16933"> + <path d="m4.7625 2.9633-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#3096fa"/> + <path d="m4.7625 10.795-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#3096fa"/> + <path d="m4.7625 18.627-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#2979ff"/> + <path d="m4.7625 26.459-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#aeaeae"/> + <path d="m4.7625 34.29-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_52px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_52px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a50aeeff00a066b21322c6fd8ea7951dfb8b0270 GIT binary patch literal 54218 zcmeI5%Wl&^7=;7$9jfkF#sT38Wm^eVy-RF(gjOmKz$S@UM8JkS0_@QC6?$Fw4cPJ$ z-S?V=YB)~fC}R%-DN~1kbfQkjPAZSjH{-cD$NlG@{P<bwz24&Y3#3O#Q@2W`Tcx|D zJJ^0a_#B%fFI_72f0Fm~{PNT1BOm_L=F~s^75|6?NPq-LfCNZ@1W14cNI(*SPOLUN zEfr~vC57-;rxmV4&oz>UrftcZ^w#VQbe#9JBzk%&{32OX_q$r`#Nnl(sii)P))a+H zIZd(pB>7V6w!&raG(`_ra++G|qv(3-X;N3l^%RBgC2RT>S689O(A19AJJFiHt2K+J z<d&Y(7s@y;EJf-BWevuqe%_A4mo5cmk3Wh1cBGoFG)?0Cvt_nh>WxD^lWlJ;_1cw| zB9G%!AJ_G046@IAsvnAM8?MUg+UBJ~=R4MQgU~s4H?A(APrfkvWua@JZv0>lI?fC& zvD%Wjp3^(`r=jCCqve}KEomQO+z*M>j$|!EO;L5DcW<Xzx}CnqoCHXK1W14cNPq-L zfCNZ@1W14cNPq-LfCNZ@1W14cNWd+DgM))jB=|?Qc>n1B{{A}BHIhbxe^jofy}i8| zXgD8eN%Uyc6a1rcH9^B7(&eZoY{Ne)R}<=FDXR(ZiT01~?(Q!8rU`mhvYN0j+CMtb zbcMXvKO{NYo@oCl&VLm;3{BV<?H|SUv}V!d+&>C-$3-RRIYAn>yJQ<>JN1udk3Wfh zjKfV=Gp<RTf3{5MapoT_s;wpEKu4~<;XRT5QRwlek3$_K<EqhLL!Zbo$TshRHj(~O z)In}u3N0e%J2>y$x&it`&au(|E<n!((&*SJat(BNcsK_=XQNuM5C5pV_1w|X(KK|N zj%vX+{G;-;r1KS=|LFY?_($bxNj2fR-+->|X0u8EXbOcn36KB@kN^pg011!)36KB@ zkN^pg011!)36KB@kN^odCZKEOP2C70gews5AJw(Wx~>P;NE&HdvL@8Y3^be%v?O|v z%3p+QT7-^ELsKpIELu~oyp+>a4@7>qopvp{QC{{=Q|;bLPE#!q>8BXhQ(x1Sc|BD` zdUuAJ8kJS(F*Vi8qWz=LvzF6T3!M8$QO0qB=>%mB#-%~t2%P#ybH~q?SHym!(oEat zxcPsfrye--j~3Y0l6GxtZzBDp+M_;Bdo%{w=RFmX{!y&!^7B%m^Bt^(^6Lhnb8KA; z7SNYn7-NCZHIS}X=Ah%u(9)=ENnFqA#{FsNI5o7?gKrYGr1KQxen=zOk*sB?sUB>g zj<z-b|7ePYISG&e36KB@kN^pg011!)36KB@kN^pg011!)36KB@I46J@XU`C`E%qk1 zna}a-qv}`5_0*3;nTg#fG~Qu)AzEW=A|7S>xy0NW`&4MW(3HP5Hm%Tju0u_|*umkY z8FN!+yxmljEw*zf3PpQjf7#>LJNLw*9ZWW!cwBvz)}xEuY}ZOpV&A*?^^t12sGH;% zzO^@3T>f^PqWXisorjChed@2f9*w6y&3Am7kN#l|B=UJPYy5hweI%|?t?}!HueXi( z^(}>XEb^Zb?rHKwi;MA>#~=X`AOR8}0TLhq5+DH*AOR8}0TLhq5+DH*AOR8}ftw&e z|L9Fn9sihmYjy_yjB~>?BmDcUKYVwJc!zSo*Rp=MP5<cl7l7j<_~fTZ(e(W;>dNRN zV){o@KL1NzlwZs@KcCsI=^u5$!?7RME5CA4{e{hQ*^ZTSKY0;)tYeT+zrR=h(I{N% z#F=MHgg!50eMU>@^Gwz?kkIvl)julqc|iI{ix@4&FJtH*<^LZYA104L0wh2JBtQZr MKmsH{0yjk9H|x&3X8-^I literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_52px.svg b/dlls/light.msstyles/blue_commandlink_glyph_52px.svg new file mode 100644 index 00000000000..9065e1c1836 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_52px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:52-32" width="52" height="260" version="1.1" viewBox="0 0 13.758 68.793" 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="matrix(1.73 0 0 1.73 -.17208 .042322)" stroke-width=".088403"> + <path d="m4.8558 2.1167-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#3096fa"/> + <path d="m4.8558 10.07-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#3096fa"/> + <path d="m4.8558 18.022-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#2979ff"/> + <path d="m4.8558 25.975-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#aeaeae"/> + <path d="m4.8558 33.928-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_60px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_60px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1fc32a765cd121767b7e8f4e260d1ac46d9b87bc GIT binary patch literal 72138 zcmeI4y>8nu6h<AiFVU@I5)`pyuN{gkox1c@x;Tk}cq}?6@=N6BJ^C*8ZfQ_S+ZSLX z2asYhx+ISgf{IPk_dE9!Nh@M5fBgM)GO~|9rp!(GYRVV$)XC`c=z}@_wtw9mI*)oZ z+Wpw)>dWsxe>pF<I{etG6^$SO0SG_<0uX=z1Rwwb2tWV=5b#A{bDu42@zuYkeyz^3 z$ZA`vWp=A6w!UMjit${uN*!~a%VIJ$I@h9A>X`G4=H0n$b4{N69zllf4{zh`VIAo2 z)A9EEcw5#0+G<~Ol{TGjJU%qL{cAhk6#4JIM-XiqB_1DI`)1d*zw+*4V)Qk>PeiPB zCHa&ZtzBKCtNq@?<W*N%j*cd&ye`MN8IRKNFk0&v=Nx;&SIc}R^QzP_Uyrq#-RteK z=GE$SA69cJT3y{7LjVF0fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P(3~ z1fHLtZ*2)%MZ4%9A0HP_PfxWiv1>LOZ$zuqF>5y3rbg#lv`UTUcIQSYt;q9k{IdSW z+o8C&U7UCuZ?|(wc&&!;wyXiP)xO4UZ93g}d}wz2S9sj}{y~Krx8J2qT)k@@dW19I z6(>g5>Hu@J4xOAMKA*g9*I3bc_~GFpPvv|?D;_>#2vqUblss&Ko3Uy3axG!6N2^GN zry$(x?M8cabIu`bd(BB`J*1!KAOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z z1Rwwb2tXiA0`>Lz!j>?j?-un|>(yCZ+cG<ide5ZMIN$0Ny|#`x&nBN!qj%lV9C4n} zyg!#CKcC4ndG0pTh0_{u<85DVZL9^{wa}2qp4KF4^?I70RqMSz>-`>LwR$~h^))86 z?YF)@n;72B?-TKAT{ZlL*0y$0*>3M)@~SdBZx1S|yw1*ZGcKj!VYHfSl>M)p-hQU_ z_s;t2bk>|-<G$|x-}UxL^ZL>uTg{1ReW{(_ApijgKmY;|fB*y_009U<00Izz00bZa z0SG_<0uX=z1Rwwb2tXiQ0@X6RwIy5y?IYjZXN$7PYFlF0T-|3kqE+gcHJ8O?YILqe ztJG+2e}06}l05ImFY9l-9fD)q$B4J_c6+yk)p7`L%Njsi?Q7iDrqhkbhi12bZO5A; z?|uKEHjNUG53NIwZspy@#OPazMyb&{bY_nGeDa#rQF?ee&XYM`(TazU8wLk|cbSlf zE$nKU&twfDwY?racp^Lo;9hT!an3n}&T39Y>mmI-2LT8`00Izz00bZa0SG_<0uX=z z1Rwwb2tWV=5P$##AOHafKmY<^64?H|JM#M&Bs1>)3_k8>me0{pSH*ZP_o+y2^=pXD zM+`&kPw=6mOP^?Fzfl*zgwz&q<L!|A+9g)J{XX87b&s~%*V<E?PB$JOn%(}j9s9V4 zSer(P$A{J~<Ef9f`+a7O|3?zBR`yEzFw%g1vR5+Fy^<;IZBA&PSxS5AQqpRt0QL{| o|Nk@woLXP~X!Z}jiiQ^;009U<00Izz00bZa0SG_<0-Xr_18edjo&W#< literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_60px.svg b/dlls/light.msstyles/blue_commandlink_glyph_60px.svg new file mode 100644 index 00000000000..39c0b268689 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_60px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:60-32" width="60" height="300" version="1.1" viewBox="0 0 15.875 79.376" 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="matrix(2 0 0 2 -.00011333 -1.3333e-5)" stroke-width=".066145"> + <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_67px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_67px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..feda4b6f2333839485908487353dfe763cd86c33 GIT binary patch literal 89918 zcmeI*&raJ&9Kdl?_8sVQV*j*|mJ)|*uX|_@ds?luQm?xYvDykM4lKvLf}K>oz!eo} z(OwsL366*asNe-w1USsj*q+3WY$ug$)#3N8YV3qGjz9j*jAthP^~KLW{yyQDKY#0G zMK3S)@{4|I!kKX<_4Yr%g}>LEu|LXj!oTJ@_2Q>r|A_r^q|L8JdKE81009ILKmY** z5I_I{1Q0*~0R#|0;PV93+vi{3`i+0PE%(vq{mc9HYV~e@>ehFU^`dV4`sIzcSi4_G zINH&~9gKx!4;=@8S%dicuIZk4y~XcG6TKg=Qp%ao27cVZZp-zkH?2W@9eBKb{@wjJ z^P?R_7$4~#x_vq8O7!p=t$1AYxAEv(m^MbB$Ex!{8*C;W!uA#q>tNS9KKy6jj#d-h zk5{SO_;5QyJ+{)zi$IU<SCiV}i+Je$o>XvYXT*l-!<=3>-I+3KhMau{eW!~4zH`04 z@J-Pk6+PBb&chKF<z0vAxTs=%ahemaV%pcB-$p;h!6B>x^ZN0U#x+6*#=CHcm5Zk9 zrL`H7#y^92$Z(J}ZxWS@jkI_W=ioKganSQ484kCednIW;@y>VOq{V}N{!@3O{<!GA zR+Zl`Z9X-KhgRcBl|Oe`pDp2G%7st|>l=9-N_VgxtPwx}0R#|0009ILKmY**5I_I{ z1Q0*~0R#|0009ILKmY**5I_I{1Q0-=Sb>ipKThxN?jGv(Y_ab=Uhk%le@Z(X>qY71 zN-rXF#B6VGKa4pT3$t8G^w`_mTZ@k0I@tBa`}glf<y2BiP3-LK_!%DJ;=_1oi)Mz$ zxvo!y<q*On-r^054_&ti%OMoRM=PVeoZ%6)v$lN^=drrF`as9VCh-y0B6!4WQ^y(R zp|4Fu<q(QIw$jRru1h;*dgy(gRB&mhSwzpZwaH8}qKbKxvrk)>S8i?MV}F0Y@EkGY zXc2wpqhg|=|1M){aaKmXp)IOdU!3NgqjnkPqaPjB*&5caO1UnN`fK9*Cpd&<lm7c? z4pPRsOg!X_e~KCJGY+~<@G{y?9E8o642cIZ^8!(Ov5`?O#5kB%L)Q;084lv+%?9R` z?O4FohYue_=7<^a5bF?LT{%wVaUeAwtOIKV5I_I{1Q0*~0R#|0009ILKmY**5I_I{ z1Q0*~0R#|0009ILKmY**5GY4Ly`G&`%TEr}@|>vu-)&G+y_ug<%e7;@D7{>&*YhHC z#Hc@?K8!gS3$Y&RO>HeYe(PY@7i#ILtQ;VYGod}2=^k_Ecm(AniVvY4%X6*F_*j{j zl@rC3mrRe^nZm=?rDiS9W7T<}k9#w{yx=k5LVSeRVYbYisinuFa-t|xUY2TG194$J zI^sNDIg?+?L-!X?s<+hI8L?qv<Ww!q%?$SWig=u}PaB(6TzAyUY~eX##?-=`pQ9pT zA^sj?YEeo%TfMr%)L*(zNVci*aw?`hQS?)SVv9pqdj$@8<2*w8twSAzjQ@q@qUNX9 zm2$?pqImFd2*!ak9OTTK<i~?BhvnKvdbz+Ma=DT;pQw*{B_kd_Nt<ULm{+!aj4QSL zRAi2r0S~bbcB~-sIFuR>)`2ww2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag zfB*srAb<b@2$Uo6-+E*E)^`uO8+F+^V&2V9X@_IIs2jh2dE+h0%n{@L@X$IK3&|cg zUVY6P#MgJed(rh4W#x!b&cv->Z^j+$_FdCG$0IB&#srVPMbG2yb6GiJOnLDdEn7yC z>&96ZkDzS{T?BgQoEQ4oH<NK;%MBh$7d-G7QeOOL;&SHbnAl3jg{?o_PPar4z0Z>h zF6|5p)6TT7o9;{*J?NZ$#@e^ud8x{Co$K|5!gIuosf9TwM@7fRcv|RowuE{^TU4>W zIL$dn?J~+o(J@xU`<dKp+CltvsG`3XgcA;7sR|tO#=C^{-$Mu2Ppc~>jdS4;D;G`I zBOdhlUWS9D`J<>@Y^22l4q?Afl7p!w?)>^nT08{vW-a$oSd+;3sbcfWJrmEpx@k3J z=7@=V2zId1AH~Ok)OfHCtPwx}0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY** z5I_I{1Q0-=9DyiD%wgAGm@Q`y<MFPE@A8@Nu8||AcR!=F@3`8C&CL-b?Ypi)j+pd& zMI^?@(0ho;A=IlsB;8A7>yDxEA><yjga<iuEQb@s2OfP7?p5wtm<{gTPH+tOC?U5& z@)K0+Q4}BKi0S8_AV*A;)3bLkTJ~dd#3XHwiZ0zFoP*x=adloxj+p3NkRv82A98Z@ zaXlW^fH=e)$Pp9vQ}Y~zjB|zKIqBn{lE$|Jhm71PILONhk{1t><^`hqL42+p(|VF4 zCcK6)KNIuHw$CXzH%h`ou!D^da>Q5()(9Yg00IagfB*srAb<b@2q1s}0)qno1KiPq A>Hq)$ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_67px.svg b/dlls/light.msstyles/blue_commandlink_glyph_67px.svg new file mode 100644 index 00000000000..3bec4747060 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_67px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:67-32" width="67" height="335" version="1.1" viewBox="0 0 17.727 88.637" 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="matrix(2.3333 0 0 2.3333 -.17651 -.1764)" stroke-width=".048596"> + <path d="m4.6737 2.0033-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#3096fa"/> + <path d="m4.6737 9.6007-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#3096fa"/> + <path d="m4.6737 17.198-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#2979ff"/> + <path d="m4.6737 24.796-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#aeaeae"/> + <path d="m4.6738 32.393-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_75px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_75px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0d12720c412be39cd4b1f00c1a2bdb872c236bef GIT binary patch literal 112638 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 V00IagfB*srAb<b@2q0hx{15l2nOOh; literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_75px.svg b/dlls/light.msstyles/blue_commandlink_glyph_75px.svg new file mode 100644 index 00000000000..f24c34fe6b6 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_75px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:75-32" width="75" height="375" version="1.1" viewBox="0 0 19.844 99.22" 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="matrix(2.5 0 0 2.5 .13215 -5e-5)" stroke-width=".042333"> + <path d="m4.7625 2.1167-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#3096fa"/> + <path d="m4.7625 10.054-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#3096fa"/> + <path d="m4.7625 17.992-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#2979ff"/> + <path d="m4.7625 25.929-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#aeaeae"/> + <path d="m4.7625 33.867-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_19px.bmp b/dlls/light.msstyles/blue_radiobutton_19px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a8f0d8e369e091c4a70bc0738a13df37ea5213d3 GIT binary patch literal 11690 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 HC$8gvq=Xj^ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_19px.svg b/dlls/light.msstyles/blue_radiobutton_19px.svg new file mode 100644 index 00000000000..116c68b5fdc --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_19px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:19-32" width="19" height="152" version="1.1" viewBox="0 0 19 152" 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="m15 85.5a5.5 5.5 0 0 1-5.5 5.5 5.5 5.5 0 0 1-5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" stroke-width=".99999"/> + <g transform="matrix(1.2106 0 0 1.189 -.18477 -.17782)" fill="none" stroke-width=".83352"> + <ellipse cx="8" cy="8.1396" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> + <ellipse cx="8" cy="24.12" rx="7.4306" ry="7.5733" stroke="#3096fa"/> + <ellipse cx="8" cy="40.1" rx="7.4306" ry="7.5733" stroke="#2979ff"/> + <ellipse cx="8" cy="56.08" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> + <ellipse cx="8" cy="72.06" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> + <ellipse cx="8" cy="88.04" rx="7.4306" ry="7.5733" stroke="#3096fa"/> + <ellipse cx="8" cy="104.02" rx="7.4306" ry="7.5733" stroke="#2979ff"/> + <ellipse cx="8" cy="120" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> + </g> + <g transform="matrix(1.0159 0 0 1.1881 1.3728 -.10631)"> + <path d="m12.967 88.044a5 4.2482 0 0 1-5 4.2482 5 4.2482 0 0 1-5-4.2482 5 4.2482 0 0 1 5-4.2482 5 4.2482 0 0 1 5 4.2482z" fill="#3096fa" stroke="#3096fa" stroke-width=".76202"/> + <path d="m13.414 104.04a5.414 4.6292 0 0 1-5.414 4.6292 5.414 4.6292 0 0 1-5.414-4.6292 5.414 4.6292 0 0 1 5.414-4.6292 5.414 4.6292 0 0 1 5.414 4.6292z" fill="#2979ff" stroke-width=".76202"/> + <path d="m13.414 120.03a5.414 4.6292 0 0 1-5.414 4.6292 5.414 4.6292 0 0 1-5.414-4.6292 5.414 4.6292 0 0 1 5.414-4.6292 5.414 4.6292 0 0 1 5.414 4.6292z" fill="#aeaeae" stroke-width=".76203"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_22px.bmp b/dlls/light.msstyles/blue_radiobutton_22px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..580b466b2c9fedc9626edd2f66e8d1b5acde1e0e GIT binary patch literal 15626 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 Zf!OcI%*`U_Zhkk^_`MUR%j2G}{x8-y9Pt1E literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_22px.svg b/dlls/light.msstyles/blue_radiobutton_22px.svg new file mode 100644 index 00000000000..45993de1038 --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_22px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:22-32" width="22" height="176" version="1.1" viewBox="0 0 22 176" 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"> + <circle cx="11" cy="11" r="10" stroke="#aeaeae"/> + <circle cx="11" cy="33" r="10" stroke="#3096fa"/> + <circle cx="11" cy="55" r="10" stroke="#2979ff"/> + <circle cx="11" cy="77" r="10" stroke="#aeaeae"/> + <circle cx="11" cy="99" r="10" stroke="#aeaeae"/> + <circle cx="11" cy="121" r="10" stroke="#3096fa"/> + <circle cx="11.055" cy="143" r="10" stroke="#2979ff"/> + <circle cx="11" cy="165" r="10" stroke="#aeaeae"/> + </g> + <path d="m17 99a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z"/> + <g transform="translate(0 -16)"> + <path d="m17 137a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" fill="#3096fa"/> + <path d="m17 159a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" fill="#2979ff"/> + <path d="m17 181a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_28px.bmp b/dlls/light.msstyles/blue_radiobutton_28px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4329d94e6ed6e87d8279e8e2482ede00ec4c9db3 GIT binary patch literal 25226 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 E7wh(kHvj+t literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_28px.svg b/dlls/light.msstyles/blue_radiobutton_28px.svg new file mode 100644 index 00000000000..fc52dd57e08 --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_28px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:28-32" width="28" height="224" version="1.1" viewBox="0 0 28 224" 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"> + <circle cx="14" cy="14" r="13" stroke="#aeaeae"/> + <circle cx="14" cy="42" r="13" stroke="#3096fa"/> + <circle cx="14" cy="70" r="13" stroke="#2979ff"/> + <circle cx="14" cy="98" r="13" stroke="#aeaeae"/> + <circle cx="14" cy="126" r="13" stroke="#aeaeae"/> + <circle cx="14" cy="154" r="13" stroke="#3096fa"/> + <circle cx="14" cy="182" r="13" stroke="#2979ff"/> + <circle cx="14" cy="210" r="13" stroke="#aeaeae"/> + </g> + <path d="m22 126a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z"/> + <g transform="matrix(1.0667 0 0 1 1.6667 20.5)" stroke-width=".9375"> + <path d="m19.062 133.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" fill="#3096fa"/> + <path d="m19.062 161.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" fill="#2979ff"/> + <path d="m19.062 189.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_31px.bmp b/dlls/light.msstyles/blue_radiobutton_31px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..159e5cb68b30cceabb3be64feecb9ca97fb3074b GIT binary patch literal 30890 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 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_31px.svg b/dlls/light.msstyles/blue_radiobutton_31px.svg new file mode 100644 index 00000000000..5dddadd4ee7 --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_31px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:31-32" width="31" height="248" version="1.1" viewBox="0 0 31 248" 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"> + <circle cx="15.5" cy="15.5" r="14.5" stroke="#aeaeae"/> + <circle cx="15.5" cy="46.5" r="14.5" stroke="#3096fa"/> + <circle cx="15.5" cy="77.5" r="14.5" stroke="#2979ff"/> + <circle cx="15.5" cy="108.5" r="14.5" stroke="#aeaeae"/> + <circle cx="15.5" cy="139.5" r="14.5" stroke="#aeaeae"/> + <circle cx="15.5" cy="170.5" r="14.5" stroke="#3096fa"/> + <circle cx="15.5" cy="201.5" r="14.5" stroke="#2979ff"/> + <circle cx="15.5" cy="232.5" r="14.5" stroke="#aeaeae"/> + </g> + <path d="m25 139.5a9.5 9.5 0 0 1-9.5 9.5 9.5 9.5 0 0 1-9.5-9.5 9.5 9.5 0 0 1 9.5-9.5 9.5 9.5 0 0 1 9.5 9.5z"/> + <g transform="matrix(1.0667 0 0 1 3.6666 40.5)" stroke-width=".9375"> + <path d="m19.999 130a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" fill="#3096fa"/> + <path d="m19.999 161a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" fill="#2979ff"/> + <path d="m19.999 192a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index bddf183132c..3e6df6ea6a5 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -211,10 +211,18 @@ BLUE_INI TEXTFILE "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" +"ImageFile3 = blue_checkbox_19px.bmp\r\n" +"ImageFile4 = blue_checkbox_22px.bmp\r\n" +"ImageFile5 = blue_checkbox_25px.bmp\r\n" +"ImageFile6 = blue_checkbox_28px.bmp\r\n" +"ImageFile7 = blue_checkbox_31px.bmp\r\n" "MinDpi1 = 96\r\n" -"MinDpi2 = 118\r\n" -"MinDpi3 = 185\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" "[Button.Checkbox(Checkeddisabled)]\r\n" "TextColor = 189 189 189\r\n" @@ -237,10 +245,18 @@ BLUE_INI TEXTFILE "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" +"ImageFile3 = blue_radiobutton_19px.bmp\r\n" +"ImageFile4 = blue_radiobutton_22px.bmp\r\n" +"ImageFile5 = blue_radiobutton_25px.bmp\r\n" +"ImageFile6 = blue_radiobutton_28px.bmp\r\n" +"ImageFile7 = blue_radiobutton_31px.bmp\r\n" "MinDpi1 = 96\r\n" -"MinDpi2 = 118\r\n" -"MinDpi3 = 185\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" "[Button.Radiobutton(Checkeddisabled)]\r\n" "TextColor = 189 189 189\r\n" @@ -291,9 +307,19 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_commandlink_glyph_30px.bmp\r\n" -"ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n" +"ImageFile2 = blue_commandlink_glyph_37px.bmp\r\n" +"ImageFile3 = blue_commandlink_glyph_45px.bmp\r\n" +"ImageFile4 = blue_commandlink_glyph_52px.bmp\r\n" +"ImageFile5 = blue_commandlink_glyph_60px.bmp\r\n" +"ImageFile6 = blue_commandlink_glyph_67px.bmp\r\n" +"ImageFile7 = blue_commandlink_glyph_75px.bmp\r\n" "MinDpi1 = 96\r\n" -"MinDpi2 = 144\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" "\r\n; ComboBox\r\n" "[ComboBox]\r\n" @@ -919,18 +945,42 @@ 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_19px.bmp */ +BLUE_CHECKBOX_19PX_BMP BITMAP "blue_checkbox_19px.bmp" + +/* @makedep: blue_checkbox_22px.bmp */ +BLUE_CHECKBOX_22PX_BMP BITMAP "blue_checkbox_22px.bmp" + /* @makedep: blue_checkbox_25px.bmp */ BLUE_CHECKBOX_25PX_BMP BITMAP "blue_checkbox_25px.bmp" +/* @makedep: blue_checkbox_28px.bmp */ +BLUE_CHECKBOX_28PX_BMP BITMAP "blue_checkbox_28px.bmp" + +/* @makedep: blue_checkbox_31px.bmp */ +BLUE_CHECKBOX_31PX_BMP BITMAP "blue_checkbox_31px.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_19px.bmp */ +BLUE_RADIOBUTTON_19PX_BMP BITMAP "blue_radiobutton_19px.bmp" + +/* @makedep: blue_radiobutton_22px.bmp */ +BLUE_RADIOBUTTON_22PX_BMP BITMAP "blue_radiobutton_22px.bmp" + /* @makedep: blue_radiobutton_25px.bmp */ BLUE_RADIOBUTTON_25PX_BMP BITMAP "blue_radiobutton_25px.bmp" +/* @makedep: blue_radiobutton_28px.bmp */ +BLUE_RADIOBUTTON_28PX_BMP BITMAP "blue_radiobutton_28px.bmp" + +/* @makedep: blue_radiobutton_31px.bmp */ +BLUE_RADIOBUTTON_31PX_BMP BITMAP "blue_radiobutton_31px.bmp" + /* @makedep: blue_groupbox.bmp */ BLUE_GROUPBOX_BMP BITMAP "blue_groupbox.bmp" @@ -940,9 +990,24 @@ 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_37px.bmp */ +BLUE_COMMANDLINK_GLYPH_37PX_BMP BITMAP "blue_commandlink_glyph_37px.bmp" + /* @makedep: blue_commandlink_glyph_45px.bmp */ BLUE_COMMANDLINK_GLYPH_45PX_BMP BITMAP "blue_commandlink_glyph_45px.bmp" +/* @makedep: blue_commandlink_glyph_52px.bmp */ +BLUE_COMMANDLINK_GLYPH_52PX_BMP BITMAP "blue_commandlink_glyph_52px.bmp" + +/* @makedep: blue_commandlink_glyph_60px.bmp */ +BLUE_COMMANDLINK_GLYPH_60PX_BMP BITMAP "blue_commandlink_glyph_60px.bmp" + +/* @makedep: blue_commandlink_glyph_67px.bmp */ +BLUE_COMMANDLINK_GLYPH_67PX_BMP BITMAP "blue_commandlink_glyph_67px.bmp" + +/* @makedep: blue_commandlink_glyph_75px.bmp */ +BLUE_COMMANDLINK_GLYPH_75PX_BMP BITMAP "blue_commandlink_glyph_75px.bmp" + /* ComboBox */ /* @makedep: blue_combobutton.bmp */ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" -- 2.30.2

1 0

[PATCH v3 2/2] kernelbase: Don't add a backslash to the second path if not needed.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/kernelbase/path.c | 7 ++++--- dlls/kernelbase/tests/path.c | 18 +++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 9387705e963..a9105341fad 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -401,7 +401,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl { SIZE_T combined_length, length2; WCHAR *combined_path; - BOOL from_path2 = FALSE; + BOOL add_backslash = FALSE; HRESULT hr; TRACE("%s %s %#x %p\n", wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags, out); @@ -419,7 +419,8 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl { path1 = path2; path2 = NULL; - from_path2 = TRUE; + add_backslash = (is_drive_spec(path1) && !path1[2]) + || (is_prefixed_disk(path1) && !path1[6]); } length2 = path2 ? lstrlenW(path2) : 0; @@ -435,7 +436,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl lstrcpyW(combined_path, path1); PathCchStripPrefix(combined_path, combined_length); - if (from_path2) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); + if (add_backslash) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); if (path2 && path2[0]) { diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index f8712679eae..af511f500f3 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -426,7 +426,6 @@ struct combine_test const CHAR *path1; const CHAR *path2; const CHAR *result; - BOOL todo; }; static const struct combine_test combine_tests[] = @@ -474,21 +473,21 @@ static const struct combine_test combine_tests[] = /* Second path is fully qualified */ {"X:\\", "C:", "C:\\"}, {"X:\\", "C:\\", "C:\\"}, - {"X:\\", "C:\\a", "C:\\a", TRUE}, + {"X:\\", "C:\\a", "C:\\a"}, {"X:\\", "\\\\", "\\\\"}, - {"X:\\", "\\\\a", "\\\\a", TRUE}, + {"X:\\", "\\\\a", "\\\\a"}, {"X:\\", "\\\\?\\C:", "C:\\"}, {"X:\\", "\\\\?\\C:\\", "C:\\"}, - {"X:\\", "\\\\?\\C:\\a", "C:\\a", TRUE}, - {"X:\\", "\\\\?\\UNC", "\\\\?\\UNC", TRUE}, + {"X:\\", "\\\\?\\C:\\a", "C:\\a"}, + {"X:\\", "\\\\?\\UNC", "\\\\?\\UNC"}, {"X:\\", "\\\\?\\UNC\\", "\\\\"}, - {"X:\\", "\\\\?\\UNC\\a", "\\\\a", TRUE}, + {"X:\\", "\\\\?\\UNC\\a", "\\\\a"}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", - "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", TRUE}, + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}"}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\"}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", - "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", TRUE}, + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a"}, /* Canonicalization */ {"C:\\a", ".\\b", "C:\\a\\b"}, @@ -547,7 +546,6 @@ static void test_PathAllocCombine(void) if (SUCCEEDED(hr)) { WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); - todo_wine_if(t->todo) ok(!lstrcmpA(resultA, t->result), "combine %s %s expect result %s, got %s\n", t->path1, t->path2, t->result, resultA); LocalFree(resultW); @@ -611,7 +609,6 @@ static void test_PathCchCombine(void) hr = pPathCchCombine(output, ARRAY_SIZE(output), p1, p2); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); } @@ -680,7 +677,6 @@ static void test_PathCchCombineEx(void) hr = pPathCchCombineEx(output, MAX_PATH, p1, p2, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); } -- 2.30.2

1 0

[PATCH v3 1/2] kernelbase/tests: Add more tests for combining the second path.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Supersede 212136~212137. Add more tests and some style changes. dlls/kernelbase/tests/path.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 8d85542612f..f8712679eae 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -426,6 +426,7 @@ struct combine_test const CHAR *path1; const CHAR *path2; const CHAR *result; + BOOL todo; }; static const struct combine_test combine_tests[] = @@ -473,12 +474,21 @@ static const struct combine_test combine_tests[] = /* Second path is fully qualified */ {"X:\\", "C:", "C:\\"}, {"X:\\", "C:\\", "C:\\"}, + {"X:\\", "C:\\a", "C:\\a", TRUE}, {"X:\\", "\\\\", "\\\\"}, + {"X:\\", "\\\\a", "\\\\a", TRUE}, {"X:\\", "\\\\?\\C:", "C:\\"}, {"X:\\", "\\\\?\\C:\\", "C:\\"}, + {"X:\\", "\\\\?\\C:\\a", "C:\\a", TRUE}, + {"X:\\", "\\\\?\\UNC", "\\\\?\\UNC", TRUE}, {"X:\\", "\\\\?\\UNC\\", "\\\\"}, + {"X:\\", "\\\\?\\UNC\\a", "\\\\a", TRUE}, + {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", TRUE}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\"}, + {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", TRUE}, /* Canonicalization */ {"C:\\a", ".\\b", "C:\\a\\b"}, @@ -537,6 +547,7 @@ static void test_PathAllocCombine(void) if (SUCCEEDED(hr)) { WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); + todo_wine_if(t->todo) ok(!lstrcmpA(resultA, t->result), "combine %s %s expect result %s, got %s\n", t->path1, t->path2, t->result, resultA); LocalFree(resultW); @@ -600,6 +611,7 @@ static void test_PathCchCombine(void) hr = pPathCchCombine(output, ARRAY_SIZE(output), p1, p2); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); } @@ -668,6 +680,7 @@ static void test_PathCchCombineEx(void) hr = pPathCchCombineEx(output, MAX_PATH, p1, p2, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); } -- 2.30.2

1 0

[PATCH 1/2] kernel32/tests: Don't allow the pre-Vista locale results.
by Francois Gouget 22 Aug '21

22 Aug '21

This simplifies the Get*Format() tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 40 +++++++++++------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4625283035c..d738089064f 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -479,9 +479,8 @@ static void test_GetTimeFormatA(void) STRINGSA("m1s2m3s4", ""); /* TIME_NOMINUTESORSECONDS/complex format */ ret = GetTimeFormatA(lcid, TIME_NOMINUTESORSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == strlen(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok( !strcmp( buffer, "" ) || broken( !strcmp( buffer, "4" )), /* win9x */ - "Expected '', got '%s'\n", buffer ); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENA; EXPECT_EQA; STRINGSA("", "8:56 AM"); /* TIME_NOSECONDS/Default format */ ret = GetTimeFormatA(lcid, NUO|TIME_NOSECONDS, &curtime, NULL, buffer, ARRAY_SIZE(buffer)); @@ -497,14 +496,12 @@ static void test_GetTimeFormatA(void) STRINGSA("h.@:m.@:s.@:tt", "8.@:56AM"); /* Multiple delimiters */ ret = GetTimeFormatA(lcid, TIME_NOSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok( !strcmp( buffer, "8.@:56AM" ) || broken( !strcmp( buffer, "8.@:56.@:AM" )) /* win9x */, - "Expected '8.@:56AM', got '%s'\n", buffer ); + EXPECT_LENA; EXPECT_EQA; STRINGSA("s1s2s3", ""); /* Duplicate tokens */ ret = GetTimeFormatA(lcid, TIME_NOSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == strlen(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok( !strcmp( buffer, "" ) || broken( !strcmp( buffer, "3" )), /* win9x */ - "Expected '', got '%s'\n", buffer ); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENA; EXPECT_EQA; STRINGSA("t/tt", "A/AM"); /* AM time marker */ ret = GetTimeFormatA(lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); @@ -829,7 +826,6 @@ static void test_GetDateFormatA(void) LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); LCID lcid_ru = MAKELCID(MAKELANGID(LANG_RUSSIAN, SUBLANG_NEUTRAL), SORT_DEFAULT); char buffer[BUFFER_SIZE], input[BUFFER_SIZE], Expected[BUFFER_SIZE]; - char Broken[BUFFER_SIZE]; char short_day[10], month[10], genitive_month[10]; memset(&curtime, 2, sizeof(SYSTEMTIME)); /* Invalid time */ @@ -947,21 +943,15 @@ static void test_GetDateFormatA(void) STRINGSA("MMMMdd", ""); sprintf(Expected, "%s04", genitive_month); - sprintf(Broken, "%s04", month); ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || - broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, - "Expected '%s', got '%s'\n", Expected, buffer); + EXPECT_EQA; STRINGSA("MMMMdd ddd", ""); sprintf(Expected, "%s04 %s", genitive_month, short_day); - sprintf(Broken, "%s04 %s", month, short_day); ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || - broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, - "Expected '%s', got '%s'\n", Expected, buffer); + EXPECT_EQA; STRINGSA("dd dddMMMM", ""); sprintf(Expected, "04 %s%s", short_day, month); @@ -971,22 +961,16 @@ static void test_GetDateFormatA(void) STRINGSA("dd dddMMMM ddd MMMMdd", ""); sprintf(Expected, "04 %s%s %s %s04", short_day, month, short_day, genitive_month); - sprintf(Broken, "04 %s%s %s %s04", short_day, month, short_day, month); ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || - broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, - "Expected '%s', got '%s'\n", Expected, buffer); + EXPECT_EQA; /* with literal part */ STRINGSA("ddd',' MMMM dd", ""); sprintf(Expected, "%s, %s 04", short_day, genitive_month); - sprintf(Broken, "%s, %s 04", short_day, month); ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || - broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, - "Expected '%s', got '%s'\n", Expected, buffer); + EXPECT_EQA; } static void test_GetDateFormatEx(void) @@ -1221,7 +1205,7 @@ static void test_GetCurrencyFormatA(void) SetLastError(0xdeadbeef); ret = GetCurrencyFormatA(lcid, NUO, input, &format, buffer, ARRAY_SIZE(buffer)); ok( !ret, "Expected ret == 0, got %d\n", ret); - ok( GetLastError() == ERROR_INVALID_FLAGS || GetLastError() == ERROR_INVALID_PARAMETER, + ok( GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); STRINGSA("2353",""); /* Invalid format --> Error */ @@ -1477,7 +1461,7 @@ static void test_GetNumberFormatA(void) SetLastError(0xdeadbeef); ret = GetNumberFormatA(lcid, NUO, input, &format, buffer, ARRAY_SIZE(buffer)); ok( !ret, "Expected ret == 0, got %d\n", ret); - ok( GetLastError() == ERROR_INVALID_FLAGS || GetLastError() == ERROR_INVALID_PARAMETER, + ok( GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); STRINGSA("2353",""); /* Invalid format --> Error */ @@ -1662,7 +1646,7 @@ static void test_GetNumberFormatEx(void) STRINGSW("2353",""); /* Format and flags given --> Error */ ret = pGetNumberFormatEx(enW, NUO, input, &format, buffer, ARRAY_SIZE(buffer)); ok( !ret, "Expected ret == 0, got %d\n", ret); - ok( GetLastError() == ERROR_INVALID_FLAGS || GetLastError() == ERROR_INVALID_PARAMETER, + ok( GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); STRINGSW("2353",""); /* Invalid format --> Error */ -- 2.20.1

1 1

[PATCH] wineusb.sys: Fix a potential buffer overflow in add_usb_device().
by Francois Gouget 22 Aug '21

22 Aug '21

name needs to be able to hold 15 characters plus an unsigned int, potentially up to 10 characters even if it is unlikely, plus the trailing nul character. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- From: static const WCHAR formatW[] = {'\\','D','e','v','i','c','e','\\','U','S','B','P','D','O','-','%','u',0}; ... sprintfW(name, formatW, name_index++); --- dlls/wineusb.sys/wineusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index fae297915fc..a7156899379 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -94,7 +94,7 @@ static void add_usb_device(libusb_device *libusb_device) DEVICE_OBJECT *device_obj; UNICODE_STRING string; NTSTATUS status; - WCHAR name[20]; + WCHAR name[26]; int ret; libusb_get_device_descriptor(libusb_device, &device_desc); -- 2.20.1

1 0

[PATCH] avifil32: Fix a ASCII / ANSI mixup in comments.
by Francois Gouget 22 Aug '21

22 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/avifil32/api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 5a9985424e7..0494bfc59e4 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -203,7 +203,7 @@ HRESULT WINAPI AVIFileOpenA(PAVIFILE *ppfile, LPCSTR szFile, UINT uMode, if (ppfile == NULL || szFile == NULL) return AVIERR_BADPARAM; - /* convert ASCII string to Unicode and call unicode function */ + /* convert the ANSI string to Unicode and call the Unicode function */ len = MultiByteToWideChar(CP_ACP, 0, szFile, -1, NULL, 0); if (len <= 0) return AVIERR_BADPARAM; @@ -1515,7 +1515,7 @@ HRESULT WINAPI AVISaveVA(LPCSTR szFile, CLSID *pclsidHandler, if (szFile == NULL || ppavi == NULL || plpOptions == NULL) return AVIERR_BADPARAM; - /* convert ASCII string to Unicode and call Unicode function */ + /* convert the ANSI string to Unicode and call the Unicode function */ len = MultiByteToWideChar(CP_ACP, 0, szFile, -1, NULL, 0); if (len <= 0) return AVIERR_BADPARAM; -- 2.20.1

1 0

[PATCH] kernel32/tests: Don't skip the CompareStringA() tests on Windows.
by Francois Gouget 22 Aug '21

22 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Found another if (0)... --- dlls/kernel32/tests/locale.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c65c2cce3f2..4625283035c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1903,9 +1903,13 @@ static void test_CompareStringA(void) ret = lstrcmpA(NULL, ""); ok (ret == -1 || broken(ret == -2) /* win9x */, "lstrcmpA(NULL, \"\") should return -1, got %d\n", ret); - - if (0) { /* this requires collation table patch to make it MS compatible */ + + /* this requires collation table patch to make it MS compatible */ + if (strcmp(winetest_platform, "wine") == 0) + skip("in Wine due to the lack of a compatible collation table\n"); + else + { ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "'o", -1, "-o", -1 ); ok(ret == CSTR_LESS_THAN, "'o vs -o expected CSTR_LESS_THAN, got %d\n", ret); -- 2.20.1

1 0

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

22 Aug '21

This let's Cablabel S3 Lite 1.4.0.2 start, otherwise it shows a msgbox with the error and freezes. 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 2ffd608f645..0c656a570e3 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

[tools] winetest: Add support for Windows 10 21H1.
by Francois Gouget 22 Aug '21

22 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Some bits were missing which is why 21H1 did not appear on the website. Then I forgot to send this patch and wondered why it was not getting applied :-( This patch modifies winetest.conf. If the website uses a copy of that file it will need to be updated too. That should be sufficient to get 21H1 to appear on future builds. Note: I have put 21H1 in the win10L category because it will get the miscellaneous locale configurations eventually. That means it goes next to 2004 for now. Here are instructions to fix the past builds: 1. 21H1 was not yet known on the 13th which led to the "unknown" category. To get those back where they should be: for u in data/7f1446*/unknown_*;do w=$(echo "$u" | sed -e 's/unknown_/win21H1_/'); mv "$u" "$w"; done 2. Force gather to update the index pages to take the win21H1 reports into account. (technically only the builds from the 13th onward need an update but the list is getting long so it's simpler and not that time consuming to just do them all). gather --update-all 3. Update the main index pages build-index build-patterns Adjusting the paths to the scripts as appropriate... --- winetest/build-patterns | 2 +- winetest/winetest.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index a11c3de10..2ee5d5bdd 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -426,7 +426,7 @@ my %platform_order = ( win1709 => 1709, win1803 => 1803, win1809 => 1809, win1903 => 1903, win1909 => 1909, win2004 => 2004, - win2009 => 2009, + win2009 => 2009, win21H1 => 2101, win10 => 2100, # for backward compatibility wine => 3000, linux => 3001, mac => 3001, bsd => 3002, solaris => 3003 diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 5ac2261a1..3db146a9f 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -50,7 +50,7 @@ $fixed_threshold = 0.99; { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, { name => "Win1909+", ids => [ "win1909" ] }, { name => "Win10", ids => [ "win2009", "win10" ] }, # win10 for backward compatibility - { name => "Win10L", ids => [ "win2004" ] }, + { name => "Win10L", ids => [ "win2004", "win21H1" ] }, { name => "Other", ids => [ "unknown" ] }, { name => "Linux", ids => [ "linux" ] }, { name => "Mac", ids => [ "mac" ] }, -- 2.20.1

1 0

[PATCH] dbghelp: fix the annoying failure about 'wrong name EntryPoint'
by Eric Pouech 21 Aug '21

21 Aug '21

Regression was introduced in d614ac46718311f49541b32ac726c17a06077ae1 by allowing to return the symbol with the lowest address in the module even if the requested address was strictly below. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/symbol.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index b2b4d578910..570e2adb8b6 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -893,11 +893,7 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) high = module->num_sorttab; symt_get_address(&module->addr_sorttab[0]->symt, &ref_addr); - if (addr <= ref_addr) - { - low = symt_get_best_at(module, 0); - return module->addr_sorttab[low]; - } + if (addr < ref_addr) return NULL; if (high) {

1 0

[PATCH 1/2] server: Remove support for waiting on an IRP object.
by Zebediah Figura 21 Aug '21

21 Aug '21

This was initially used to let the client wait on IRP completion; c56c42ff79515a79b1913d31e21d6fecd7c11ef5 changed it to use the async handle instead. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/device.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/server/device.c b/server/device.c index 6400751e339..b669921a003 100644 --- a/server/device.c +++ b/server/device.c @@ -57,7 +57,6 @@ struct irp_call }; static void irp_call_dump( struct object *obj, int verbose ); -static int irp_call_signaled( struct object *obj, struct wait_queue_entry *entry ); static void irp_call_destroy( struct object *obj ); static const struct object_ops irp_call_ops = @@ -65,10 +64,10 @@ static const struct object_ops irp_call_ops = sizeof(struct irp_call), /* size */ &no_type, /* type */ irp_call_dump, /* dump */ - add_queue, /* add_queue */ - remove_queue, /* remove_queue */ - irp_call_signaled, /* signaled */ - no_satisfied, /* satisfied */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ default_map_access, /* map_access */ @@ -335,13 +334,6 @@ static void irp_call_dump( struct object *obj, int verbose ) fprintf( stderr, "IRP call file=%p\n", irp->file ); } -static int irp_call_signaled( struct object *obj, struct wait_queue_entry *entry ) -{ - struct irp_call *irp = (struct irp_call *)obj; - - return !irp->file; /* file is cleared once the irp has completed */ -} - static void irp_call_destroy( struct object *obj ) { struct irp_call *irp = (struct irp_call *)obj; @@ -411,7 +403,6 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, release_object( irp->async ); irp->async = NULL; } - wake_up( &irp->obj, 0 ); release_object( irp ); /* no longer on the device queue */ release_object( file ); -- 2.30.2

1 1

[PATCH 1/2] user32/tests: Add tests for monochrome icons
by Fabian Maurer 21 Aug '21

21 Aug '21

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/cursoricon.c | 84 ++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index f84312f3ea2..dbe2b3a57f0 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -3094,6 +3094,89 @@ static void test_copy_image(void) } } +/* The test the logic for the same function in user32 */ +static HBITMAP create_masked_bitmap( int width, int height, const void *and, const void *xor ) +{ + HDC dc = CreateCompatibleDC( 0 ); + HBITMAP bitmap; + int line_size = width/8; + const char* and2 = (const char*)and; + const char* xor2 = (const char*)xor; + char buffer[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 2] = {0}; + + BITMAPINFO *bitmap_info = (BITMAPINFO*)buffer; + bitmap_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmap_info->bmiHeader.biWidth = width; + bitmap_info->bmiHeader.biHeight = height * 2; + bitmap_info->bmiHeader.biPlanes = 1; + bitmap_info->bmiHeader.biBitCount = 1; + bitmap_info->bmiColors[1].rgbRed = 255; + bitmap_info->bmiColors[1].rgbGreen = 255; + bitmap_info->bmiColors[1].rgbBlue = 255; + + bitmap = CreateBitmap( width, height * 2, 1, 1, NULL ); + + for (int i = 0; i < height; i++) + { + SetDIBits( dc, bitmap, height - i - 1, 1, &xor2[i*line_size], bitmap_info, FALSE ); + SetDIBits( dc, bitmap, 2*height - i - 1, 1, &and2[i*line_size], bitmap_info, FALSE ); + } + DeleteDC( dc ); + return bitmap; +} + +static void check_monochrome_icon(HICON icon, int draw_flag, int line, BOOL todo) +{ + HDC dc = CreateCompatibleDC(0); + HBITMAP canvas = CreateCompatibleBitmap(dc, 32, 32); + + SelectObject(dc, canvas); + + DrawIconEx(dc, 0, 0, icon, 16, 16, 0, NULL, draw_flag); + + for (int i = 0; i < 16; i++) + { + COLORREF color = GetPixel(dc, i, 8); + int expect = i % 2 == 0 ? 0 : 0xFFFFFF; + todo_wine_if(todo && (i%2 != 0)) + ok_(__FILE__,line)(color == expect, "At index %d got %x\n", i, color); + } + DeleteObject(canvas); + DeleteDC(dc); +} + +static void test_monochrome_icon_creation(void) +{ + HCURSOR cursor; + HICON icon; + ICONINFO iconinfo = {0}; + static const unsigned char monochrome_bits[] = + { + 0xFF, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x55, 0x55, 0x00, 0x00, 0xAA, 0xAA, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xAA, 0xAA, 0x00, 0x00, + 0x55, 0x55, 0x00, 0x00, 0xAA, 0xAA, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + }; + + iconinfo.fIcon = 1; + iconinfo.hbmMask = create_masked_bitmap(16, 16, monochrome_bits, &monochrome_bits[32]); + + cursor = CreateCursor(0, 8, 8, 16, 16, monochrome_bits, &monochrome_bits[32]); + ok(cursor != NULL, "CreateCursor failed\n"); + check_monochrome_icon(cursor, DI_NORMAL, __LINE__, TRUE); + DestroyCursor(cursor); + + icon = CreateIcon(0, 16, 16, 1, 1, monochrome_bits, &monochrome_bits[32]); + ok(icon != NULL, "CreateIcon failed\n"); + check_monochrome_icon(icon, DI_NORMAL, __LINE__, TRUE); + DestroyIcon(icon); + + icon = CreateIconIndirect(&iconinfo); + ok(icon != NULL, "CreateIconIndirect failed\n"); + check_monochrome_icon(icon, DI_NORMAL, __LINE__, FALSE); + DestroyIcon(icon); +} + START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); @@ -3130,6 +3213,7 @@ START_TEST(cursoricon) test_DestroyCursor(); test_PrivateExtractIcons(); test_monochrome_icon(); + test_monochrome_icon_creation(); do_parent(); test_child_process(); finish_child_process(); -- 2.33.0

2 3

[PATCH 1/2] d3d10/effect: Handle geometry shader variables declared with stream output.
by Nikolay Sivov 21 Aug '21

21 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This change allows effects with such variables to be parsed at all, next step to make it actually useful would be to parse declaration string to D3D10_SO_DECLARATION_ENTRY[] array. Since GetShaderDesc() is not implemented, for testing purposes declaration string could be checked via +d3d10 traces. Also worth noting that compiler seems to do only mask validation for declaration string, meaning that successful compilation does not mean that effect will be successfully created. Effect parsing then does further validation by checking semantics. dlls/d3d10/d3d10_private.h | 7 + dlls/d3d10/effect.c | 37 +++- dlls/d3d10/tests/effect.c | 397 ++++++++++++++++++++----------------- 3 files changed, 252 insertions(+), 189 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 8d48231d971..80761e5b706 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -53,6 +53,11 @@ enum d3d10_effect_object_type D3D10_EOT_SAMPLE_MASK = 0xb, }; +enum d3d10_effect_object_type_flags +{ + D3D10_EOT_FLAG_GS_SO = 0x1, +}; + enum d3d10_effect_object_operation { D3D10_EOO_VALUE = 1, @@ -111,6 +116,7 @@ struct d3d10_effect_shader_variable unsigned int resource_count; struct d3d10_effect_shader_resource *resources; + char *stream_output_declaration; }; struct d3d10_effect_state_object_variable @@ -154,6 +160,7 @@ struct d3d10_effect_type char *name; D3D10_SHADER_VARIABLE_TYPE basetype; D3D10_SHADER_VARIABLE_CLASS type_class; + unsigned int type_flags; DWORD id; struct wine_rb_entry entry; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3040cb63528..e234aa0fea6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -790,6 +790,8 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse break; case D3D10_SVT_GEOMETRYSHADER: + if (v->type->type_flags & D3D10_EOT_FLAG_GS_SO) + FIXME("Create geometry shader with stream output.\n"); hr = ID3D10Device_CreateGeometryShader(device, ptr, dxbc_size, &v->u.shader.shader.gs); if (FAILED(hr)) return hr; break; @@ -816,8 +818,10 @@ static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c, BOOL is_column_ } } -static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) +static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, DWORD *flags) { + *flags = 0; + if(is_object) { switch (t) @@ -829,6 +833,9 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 5: return D3D10_SVT_PIXELSHADER; case 6: return D3D10_SVT_VERTEXSHADER; case 7: return D3D10_SVT_GEOMETRYSHADER; + case 8: + *flags = D3D10_EOT_FLAG_GS_SO; + return D3D10_SVT_GEOMETRYSHADER; case 10: return D3D10_SVT_TEXTURE1D; case 11: return D3D10_SVT_TEXTURE1DARRAY; @@ -865,9 +872,9 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type *t) { + DWORD typeinfo, type_flags; const char *ptr; DWORD unknown0; - DWORD typeinfo; unsigned int i; if (offset >= data_size || !require_space(offset, 6, sizeof(DWORD), data_size)) @@ -915,7 +922,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->member_count = 0; t->column_count = (typeinfo & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (typeinfo & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; - t->basetype = d3d10_variable_type((typeinfo & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE); + t->basetype = d3d10_variable_type((typeinfo & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE, &type_flags); t->type_class = d3d10_variable_class((typeinfo & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT, typeinfo & D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK); TRACE("Type description: %#x.\n", typeinfo); @@ -940,8 +947,9 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->member_count = 0; t->column_count = 0; t->row_count = 0; - t->basetype = d3d10_variable_type(typeinfo, TRUE); + t->basetype = d3d10_variable_type(typeinfo, TRUE, &type_flags); t->type_class = D3D10_SVC_OBJECT; + t->type_flags = type_flags; TRACE("Type description: %#x.\n", typeinfo); TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); @@ -1503,8 +1511,8 @@ static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, D3D_SHADER_VARIABLE_TYPE out_type, UINT out_base, UINT out_size, void *out_data) { D3D_SHADER_VARIABLE_TYPE in_type; + DWORD t, value, type_flags; const char *ptr; - DWORD t, value; DWORD count, i; if (offset >= data_size || !require_space(offset, 1, sizeof(count), data_size)) @@ -1532,7 +1540,7 @@ static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, read_dword(&ptr, &t); read_dword(&ptr, &value); - in_type = d3d10_variable_type(t, FALSE); + in_type = d3d10_variable_type(t, FALSE, &type_flags); TRACE("\t%s: %#x.\n", debug_d3d10_shader_variable_type(in_type), value); switch (out_type) @@ -2129,7 +2137,7 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, TRACE("Shader type is %s\n", debug_d3d10_shader_variable_type(v->type->basetype)); for (i = 0; i < max(v->type->element_count, 1); ++i) { - DWORD shader_offset; + DWORD shader_offset, sodecl_offset; struct d3d10_effect_variable *var; if (!v->type->element_count) @@ -2146,6 +2154,21 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_shader(data, data_size, shader_offset, var))) return hr; + + if (v->type->type_flags & D3D10_EOT_FLAG_GS_SO) + { + read_dword(ptr, &sodecl_offset); + TRACE("Stream output declaration at offset %#x.\n", sodecl_offset); + + if (!fx10_copy_string(data, data_size, sodecl_offset, + &var->u.shader.stream_output_declaration)) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + + TRACE("Stream output declaration: %s.\n", debugstr_a(var->u.shader.stream_output_declaration)); + } } break; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index e67eb188328..1c3d754eaf1 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2533,6 +2533,10 @@ GeometryShader g0 = NULL; VertexShader v[2] = { CompileShader( vs_4_0, VS() ), CompileShader( vs_4_0, VS2() ) }; PixelShader p = CompileShader( ps_4_0, PS() ); GeometryShader g = CompileShader( gs_4_0, GS() ); +GeometryShader g_so = ConstructGSWithSO +( + CompileShader( gs_4_0, GS()), "SV_POSITION.x" +); technique10 Render { pass P0 {} @@ -2580,186 +2584,202 @@ technique10 Render } } #endif -static DWORD fx_local_shader[] = { -0x43425844, 0x95577e13, 0xab5facae, 0xd06d9eab, 0x8b127be0, 0x00000001, 0x00001652, 0x00000001, -0x00000024, 0x30315846, 0x00001626, 0xfeff1001, 0x00000000, 0x00000000, 0x00000006, 0x00000000, -0x00000000, 0x00000000, 0x00000001, 0x0000138a, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000d, 0x00000006, 0x00000000, 0x74726556, -0x68537865, 0x72656461, 0x00000400, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000600, 0x00307600, 0x65786950, 0x6168536c, 0x00726564, 0x00000030, 0x00000002, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x47003070, 0x656d6f65, 0x53797274, 0x65646168, -0x005b0072, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x30670000, -0x00000400, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000600, 0xb4007600, -0x44000001, 0x02434258, 0x5f11b96d, 0x31cdd883, 0xade81d9f, 0x014d6a2d, 0xb4000000, 0x05000001, -0x34000000, 0x8c000000, 0xc0000000, 0xf4000000, 0x38000000, 0x52000001, 0x50464544, 0x00000000, -0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00fffe04, 0x1c000001, 0x4d000000, 0x6f726369, -0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, -0x392e3632, 0x322e3235, 0x00343438, 0x49ababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, -0x00000000, 0x00000000, 0x03000000, 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, -0x4fababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, -0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, -0x0f000100, 0x5f000000, 0xf2030000, 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, -0x36000000, 0xf2050000, 0x00001020, 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, -0x02000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xb4000000, 0x44000001, 0xa4434258, -0x42e88ad3, 0xcc4b1ab5, 0x5f89bf37, 0x0139edfb, 0xb4000000, 0x05000001, 0x34000000, 0x8c000000, -0xc0000000, 0xf4000000, 0x38000000, 0x52000001, 0x50464544, 0x00000000, 0x00000000, 0x00000000, -0x1c000000, 0x00000000, 0x00fffe04, 0x1c000001, 0x4d000000, 0x6f726369, 0x74666f73, 0x29522820, -0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3632, 0x322e3235, -0x00343438, 0x49ababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x00000000, -0x02000000, 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, 0x4fababab, 0x2c4e4753, -0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, -0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, 0x0f000100, 0x5f000000, -0xf2030000, 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, 0x2b000000, 0xf2050000, -0x00001020, 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, 0x02000000, 0x00000000, -0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x70000000, 0x0001b000, 0x42584400, 0xf9269a43, 0xf17ba57f, -0x6d728d8a, 0x599e9d79, 0x000001ff, 0x0001b000, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, -0x0000f400, 0x00013400, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, -0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, -0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, -0x475349ab, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, -0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, -0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, -0x67726154, 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, -0x00000000, 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, -0x80000000, 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x10006700, 0x44000002, 0x5c434258, 0x7482cd04, 0xb6d82978, 0xe48192f2, 0x01eec6be, -0x10000000, 0x05000002, 0x34000000, 0x8c000000, 0xc0000000, 0xf4000000, 0x94000000, 0x52000001, -0x50464544, 0x00000000, 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00475304, 0x1c000001, -0x4d000000, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, -0x656c6970, 0x2e392072, 0x392e3632, 0x322e3235, 0x00343438, 0x49ababab, 0x2c4e4753, 0x01000000, -0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, 0x5300000f, -0x4f505f56, 0x49544953, 0x4f004e4f, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, -0x01000000, 0x03000000, 0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, -0x98524448, 0x40000000, 0x26000200, 0x61000000, 0xf2050000, 0x03002010, 0x00000000, 0x01000000, -0x5d000000, 0x5c010018, 0x67010028, 0xf2040000, 0x00001020, 0x01000000, 0x5e000000, 0x03020000, -0x36000000, 0xf2060000, 0x00001020, 0x46000000, 0x0000201e, 0x00000000, 0x13000000, 0x36010000, -0xf2060000, 0x00001020, 0x46000000, 0x0100201e, 0x00000000, 0x13000000, 0x36010000, 0xf2060000, -0x00001020, 0x46000000, 0x0200201e, 0x00000000, 0x13000000, 0x09010000, 0x3e010000, 0x53010000, -0x74544154, 0x08000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, -0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x03000000, 0x05000000, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x52000000, 0x65646e65, -0x30500072, 0x00315000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, -0x00000001, 0x00000002, 0x00000000, 0x01003250, 0x02000000, 0x00000000, 0x01000000, 0x02000000, -0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x50000000, 0x01b00033, 0x58440000, 0x269a4342, -0x7ba57ff9, 0x728d8af1, 0x9e9d796d, 0x0001ff59, 0x01b00000, 0x00050000, 0x00340000, 0x008c0000, -0x00c00000, 0x00f40000, 0x01340000, 0x44520000, 0x00504645, 0x00000000, 0x00000000, 0x00000000, -0x001c0000, 0x04000000, 0x0100ffff, 0x001c0000, 0x694d0000, 0x736f7263, 0x2074666f, 0x20295228, -0x4c534c48, 0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e36, 0x38322e32, -0xab003434, 0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00010000, -0x00030000, 0x00000000, 0x000f0000, 0x56530000, 0x534f505f, 0x4f495449, 0x534f004e, 0x002c4e47, -0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, 0x000f0000, -0x56530000, 0x7261545f, 0x00746567, 0x4853abab, 0x00385244, 0x00400000, 0x000e0000, 0x00650000, -0x20f20300, 0x00000010, 0x00360000, 0x20f20800, 0x00000010, 0x40020000, 0x00000000, 0x00003f80, -0x00003f80, 0x00000000, 0x003e3f80, 0x54530100, 0x00745441, 0x00020000, 0x00000000, 0x00000000, -0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x083e0000, 0x00000000, 0x01b40000, 0x58440000, 0x6d024342, 0x835f11b9, -0x9f31cdd8, 0x2dade81d, 0x00014d6a, 0x01b40000, 0x00050000, 0x00340000, 0x008c0000, 0x00c00000, -0x00f40000, 0x01380000, 0x44520000, 0x00504645, 0x00000000, 0x00000000, 0x00000000, 0x001c0000, -0x04000000, 0x0100fffe, 0x001c0000, 0x694d0000, 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, -0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e36, 0x38322e32, 0xab003434, -0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00000000, 0x00030000, -0x00000000, 0x0f0f0000, 0x4f500000, 0x49544953, 0xab004e4f, 0x534fabab, 0x002c4e47, 0x00010000, -0x00080000, 0x00200000, 0x00000000, 0x00010000, 0x00030000, 0x00000000, 0x000f0000, 0x56530000, -0x534f505f, 0x4f495449, 0x4853004e, 0x003c5244, 0x00400000, 0x000f0001, 0x005f0000, 0x10f20300, -0x00000010, 0x00670000, 0x20f20400, 0x00000010, 0x00010000, 0x00360000, 0x20f20500, 0x00000010, -0x1e460000, 0x00000010, 0x003e0000, 0x54530100, 0x00745441, 0x00020000, 0x00000000, 0x00000000, -0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x09fa0000, 0x00000000, 0x02100000, 0x58440000, 0x045c4342, 0x787482cd, -0xf2b6d829, 0xbee48192, 0x0001eec6, 0x02100000, 0x00050000, 0x00340000, 0x008c0000, 0x00c00000, -0x00f40000, 0x01940000, 0x44520000, 0x00504645, 0x00000000, 0x00000000, 0x00000000, 0x001c0000, -0x04000000, 0x01004753, 0x001c0000, 0x694d0000, 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, -0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e36, 0x38322e32, 0xab003434, -0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00010000, 0x00030000, -0x00000000, 0x0f0f0000, 0x56530000, 0x534f505f, 0x4f495449, 0x534f004e, 0x002c4e47, 0x00010000, -0x00080000, 0x00200000, 0x00000000, 0x00010000, 0x00030000, 0x00000000, 0x000f0000, 0x56530000, -0x534f505f, 0x4f495449, 0x4853004e, 0x00985244, 0x00400000, 0x00260002, 0x00610000, 0x10f20500, -0x00030020, 0x00000000, 0x00010000, 0x185d0000, 0x285c0100, 0x00670100, 0x20f20400, 0x00000010, -0x00010000, 0x005e0000, 0x00030200, 0x00360000, 0x20f20600, 0x00000010, 0x1e460000, 0x00000020, -0x00000000, 0x00130000, 0x00360100, 0x20f20600, 0x00000010, 0x1e460000, 0x00010020, 0x00000000, -0x00130000, 0x00360100, 0x20f20600, 0x00000010, 0x1e460000, 0x00020020, 0x00000000, 0x00130000, -0x00090100, 0x003e0100, 0x54530100, 0x00745441, 0x00080000, 0x00000000, 0x00000000, 0x00020000, -0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00010000, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00050000, 0x00030000, 0x00000000, 0x00000000, -0x00000000, 0x0bba0000, 0x00000000, 0x34500000, 0x0001b000, 0x42584400, 0xf9269a43, 0xf17ba57f, -0x6d728d8a, 0x599e9d79, 0x000001ff, 0x0001b000, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, -0x0000f400, 0x00013400, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, -0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, -0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, -0x475349ab, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, -0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, -0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, -0x67726154, 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, -0x00000000, 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, -0x80000000, 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x000dd900, 0x00000000, 0x0001b400, 0x42584400, 0x8ad3a443, 0x1ab542e8, 0xbf37cc4b, -0xedfb5f89, 0x00000139, 0x0001b400, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, 0x0000f400, -0x00013800, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0xfe040000, -0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, -0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, 0x475349ab, -0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000200, 0x00000000, -0x000f0f00, 0x534f5000, 0x4f495449, 0xabab004e, 0x47534fab, 0x00002c4e, 0x00000100, 0x00000800, -0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, -0x4e4f4954, 0x44485300, 0x00003c52, 0x01004000, 0x00000f00, 0x00005f00, 0x1010f203, 0x00000000, -0x00006700, 0x1020f204, 0x00000000, 0x00000100, 0x00002b00, 0x1020f205, 0x00000000, 0x101e4600, -0x00000000, 0x00003e00, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000200, -0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x000f9500, 0x00000000, 0x00021000, 0x42584400, 0xcd045c43, 0x29787482, 0x92f2b6d8, -0xc6bee481, 0x000001ee, 0x00021000, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, 0x0000f400, -0x00019400, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0x53040000, -0x00010047, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, -0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, 0x475349ab, -0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, -0x000f0f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, 0x00000800, -0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, -0x4e4f4954, 0x44485300, 0x00009852, 0x02004000, 0x00002600, 0x00006100, 0x2010f205, 0x00000300, -0x00000000, 0x00000100, 0x00185d00, 0x00285c01, 0x00006701, 0x1020f204, 0x00000000, 0x00000100, -0x00005e00, 0x00000302, 0x00003600, 0x1020f206, 0x00000000, 0x201e4600, 0x00000000, 0x00000000, -0x00001300, 0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000100, 0x00000000, 0x00001300, -0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000200, 0x00000000, 0x00001300, 0x00000901, -0x00003e01, 0x41545301, 0x00007454, 0x00000800, 0x00000000, 0x00000000, 0x00000200, 0x00000000, -0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, -0x00000300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000300, 0x00000500, 0x00000300, 0x00000000, 0x00000000, 0x00000000, -0x00115500, 0x00000000, 0x00355000, 0xa5003650, 0x00000000, 0x50000000, 0x00a50037, 0x00010000, -0x002d0000, 0x00110000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, 0x00580000, 0x003c0000, -0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, 0x00860000, 0x006a0000, 0x00000000, 0xffff0000, -0x0000ffff, 0x00000000, 0x00a50000, 0x00890000, 0x00000000, 0xffff0000, 0x00a7ffff, 0x025f0000, -0x00000000, 0x04170000, 0x003c0000, 0x00000000, 0xffff0000, 0x0419ffff, 0x00000000, 0x05cd0000, -0x006a0000, 0x00000000, 0xffff0000, 0x05cfffff, 0x00000000, 0x07e30000, 0x00080000, 0x00000000, -0x07ea0000, 0x00000000, 0x00000000, 0x07ed0000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, -0x00010000, 0x07f00000, 0x00060000, 0x00000000, 0x00010000, 0x07fc0000, 0x00080000, 0x00000000, -0x00010000, 0x08080000, 0x08140000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00010000, -0x08170000, 0x00060000, 0x00000000, 0x00010000, 0x08230000, 0x00080000, 0x00000000, 0x00010000, -0x082f0000, 0x083b0000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x09f20000, -0x00060000, 0x00000000, 0x00070000, 0x0bb20000, 0x00080000, 0x00000000, 0x00070000, 0x0dce0000, -0x0dd60000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x0f8d0000, 0x00060000, -0x00000000, 0x00070000, 0x114d0000, 0x00080000, 0x00000000, 0x00070000, 0x13690000, 0x13710000, -0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x00580000, 0x00060000, 0x00000000, -0x00020000, 0x002d0000, 0x00080000, 0x00000000, 0x00020000, 0x00860000, 0x13740000, 0x00030000, -0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x04170000, 0x00060000, 0x00000000, 0x00030000, -0x13770000, 0x00080000, 0x00000000, 0x00020000, 0x05cd0000, 0x137f0000, 0x00030000, 0x00000000, -0x00070000, 0x00000000, 0x00020000, 0x04170000, 0x00060000, 0x00000000, 0x00030000, 0x13820000, -0x00080000, 0x00000000, 0x00020000, 0x05cd0000, 0x00000000, +static DWORD fx_local_shader[] = +{ + 0x43425844, 0x0a74ff0f, 0xea10b516, 0x8be88332, 0x2a273ca7, 0x00000001, 0x0000182d, 0x00000001, + 0x00000024, 0x30315846, 0x00001801, 0xfeff1001, 0x00000000, 0x00000000, 0x00000007, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00001549, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000e, 0x00000006, 0x00000000, 0x74726556, + 0x68537865, 0x72656461, 0x00000400, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000600, 0x00307600, 0x65786950, 0x6168536c, 0x00726564, 0x00000030, 0x00000002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x47003070, 0x656d6f65, 0x53797274, 0x65646168, + 0x005b0072, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x30670000, + 0x00000400, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000600, 0xa8007600, + 0x44000001, 0x92434258, 0xa75ea3fc, 0x13affa34, 0x46be1a21, 0x0104d04a, 0xa8000000, 0x05000001, + 0x34000000, 0x80000000, 0xb4000000, 0xe8000000, 0x2c000000, 0x52000001, 0x44464544, 0x00000000, + 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00fffe04, 0x1c000001, 0x4d000000, 0x6f726369, + 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, + 0x4900312e, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x00000000, 0x03000000, + 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, 0x4fababab, 0x2c4e4753, 0x01000000, + 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, 0x53000000, + 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, 0x0f000100, 0x5f000000, 0xf2030000, + 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, 0x36000000, 0xf2050000, 0x00001020, + 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, 0x02000000, 0x00000000, 0x00000000, + 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0xa8000000, 0x44000001, 0x84434258, 0xa05ac55b, 0x929a6a46, 0x4f0df40a, + 0x01a2fea3, 0xa8000000, 0x05000001, 0x34000000, 0x80000000, 0xb4000000, 0xe8000000, 0x2c000000, + 0x52000001, 0x44464544, 0x00000000, 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00fffe04, + 0x1c000001, 0x4d000000, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, + 0x6d6f4320, 0x656c6970, 0x30312072, 0x4900312e, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, + 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, + 0x4fababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, + 0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, + 0x0f000100, 0x5f000000, 0xf2030000, 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, + 0x2b000000, 0xf2050000, 0x00001020, 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, + 0x02000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x70000000, 0x0001a400, 0x42584400, + 0xf4813443, 0xb6605b8e, 0xc69999b8, 0xcb75f1b5, 0x000001eb, 0x0001a400, 0x00000500, 0x00003400, + 0x00008000, 0x0000b400, 0x0000e800, 0x00012800, 0x45445200, 0x00004446, 0x00000000, 0x00000000, + 0x00000000, 0x00001c00, 0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, + 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x312e3031, 0x47534900, + 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, + 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, 0x00000800, + 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x67726154, + 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, 0x00000000, + 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, 0x80000000, + 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, 0x00000000, + 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x04006700, 0x44000002, 0x23434258, 0x6e8e325e, 0x5f0774e8, 0xbfe636e1, 0x01d3f67a, 0x04000000, + 0x05000002, 0x34000000, 0x80000000, 0xb4000000, 0xe8000000, 0x88000000, 0x52000001, 0x44464544, + 0x00000000, 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00475304, 0x1c000001, 0x4d000000, + 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, + 0x30312072, 0x4900312e, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, + 0x03000000, 0x00000000, 0x0f000000, 0x5300000f, 0x4f505f56, 0x49544953, 0x4f004e4f, 0x2c4e4753, + 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, + 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x98524448, 0x40000000, 0x26000200, 0x61000000, + 0xf2050000, 0x03002010, 0x00000000, 0x01000000, 0x5d000000, 0x5c010018, 0x67010028, 0xf2040000, + 0x00001020, 0x01000000, 0x5e000000, 0x03020000, 0x36000000, 0xf2060000, 0x00001020, 0x46000000, + 0x0000201e, 0x00000000, 0x13000000, 0x36010000, 0xf2060000, 0x00001020, 0x46000000, 0x0100201e, + 0x00000000, 0x13000000, 0x36010000, 0xf2060000, 0x00001020, 0x46000000, 0x0200201e, 0x00000000, + 0x13000000, 0x09010000, 0x3e010000, 0x53010000, 0x74544154, 0x08000000, 0x00000000, 0x00000000, + 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03000000, 0x05000000, 0x03000000, 0x00000000, + 0x00000000, 0x00000000, 0x5b000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x08000000, 0x67000000, 0x006f735f, 0x00000204, 0x43425844, 0x8e325e23, 0x0774e86e, 0xe636e15f, + 0xd3f67abf, 0x00000001, 0x00000204, 0x00000005, 0x00000034, 0x00000080, 0x000000b4, 0x000000e8, + 0x00000188, 0x46454452, 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0x47530400, + 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, + 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x00000098, + 0x00020040, 0x00000026, 0x05000061, 0x002010f2, 0x00000003, 0x00000000, 0x00000001, 0x0100185d, + 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0200005e, 0x00000003, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, + 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, 0x00000000, + 0x00201e46, 0x00000002, 0x00000000, 0x01000013, 0x01000009, 0x0100003e, 0x54415453, 0x00000074, + 0x00000008, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, + 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x505f5653, 0x5449534f, 0x2e4e4f49, + 0x65520078, 0x7265646e, 0x00305000, 0x01003150, 0x02000000, 0x00000000, 0x01000000, 0x02000000, + 0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x50000000, 0x00010032, 0x00020000, 0x00000000, + 0x00010000, 0x00020000, 0x00000000, 0x00010000, 0x00020000, 0x00000000, 0x33500000, 0x0001a400, + 0x42584400, 0xf4813443, 0xb6605b8e, 0xc69999b8, 0xcb75f1b5, 0x000001eb, 0x0001a400, 0x00000500, + 0x00003400, 0x00008000, 0x0000b400, 0x0000e800, 0x00012800, 0x45445200, 0x00004446, 0x00000000, + 0x00000000, 0x00000000, 0x00001c00, 0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, + 0x28207466, 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x312e3031, + 0x47534900, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, + 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, + 0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, + 0x67726154, 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, + 0x00000000, 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, + 0x80000000, 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, + 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x000a4500, 0x00000000, 0x0001a800, 0x42584400, 0xa3fc9243, 0xfa34a75e, 0x1a2113af, + 0xd04a46be, 0x00000104, 0x0001a800, 0x00000500, 0x00003400, 0x00008000, 0x0000b400, 0x0000e800, + 0x00012c00, 0x45445200, 0x00004446, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0xfe040000, + 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, + 0x43207265, 0x69706d6f, 0x2072656c, 0x312e3031, 0x47534900, 0x00002c4e, 0x00000100, 0x00000800, + 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x000f0f00, 0x534f5000, 0x4f495449, + 0xabab004e, 0x47534fab, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, + 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x44485300, 0x00003c52, + 0x01004000, 0x00000f00, 0x00005f00, 0x1010f203, 0x00000000, 0x00006700, 0x1020f204, 0x00000000, + 0x00000100, 0x00003600, 0x1020f205, 0x00000000, 0x101e4600, 0x00000000, 0x00003e00, 0x41545301, + 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000000, + 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000bf500, 0x00000000, + 0x00020400, 0x42584400, 0x325e2343, 0x74e86e8e, 0x36e15f07, 0xf67abfe6, 0x000001d3, 0x00020400, + 0x00000500, 0x00003400, 0x00008000, 0x0000b400, 0x0000e800, 0x00018800, 0x45445200, 0x00004446, + 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0x53040000, 0x00010047, 0x00001c00, 0x63694d00, + 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, + 0x312e3031, 0x47534900, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, + 0x00000300, 0x00000000, 0x000f0f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, + 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000f00, + 0x5f565300, 0x49534f50, 0x4e4f4954, 0x44485300, 0x00009852, 0x02004000, 0x00002600, 0x00006100, + 0x2010f205, 0x00000300, 0x00000000, 0x00000100, 0x00185d00, 0x00285c01, 0x00006701, 0x1020f204, + 0x00000000, 0x00000100, 0x00005e00, 0x00000302, 0x00003600, 0x1020f206, 0x00000000, 0x201e4600, + 0x00000000, 0x00000000, 0x00001300, 0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000100, + 0x00000000, 0x00001300, 0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000200, 0x00000000, + 0x00001300, 0x00000901, 0x00003e01, 0x41545301, 0x00007454, 0x00000800, 0x00000000, 0x00000000, + 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000300, 0x00000500, 0x00000300, 0x00000000, + 0x00000000, 0x00000000, 0x000da900, 0x00000000, 0x00345000, 0x000001a4, 0x43425844, 0x8ef48134, + 0xb8b6605b, 0xb5c69999, 0xebcb75f1, 0x00000001, 0x000001a4, 0x00000005, 0x00000034, 0x00000080, + 0x000000b4, 0x000000e8, 0x00000128, 0x46454452, 0x00000044, 0x00000000, 0x00000000, 0x00000000, + 0x0000001c, 0xffff0400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, + 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, + 0x52444853, 0x00000038, 0x00000040, 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, + 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + 0x54415453, 0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, + 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000fbc, + 0x00000000, 0x000001a8, 0x43425844, 0x5ac55b84, 0x9a6a46a0, 0x0df40a92, 0xa2fea34f, 0x00000001, + 0x000001a8, 0x00000005, 0x00000034, 0x00000080, 0x000000b4, 0x000000e8, 0x0000012c, 0x46454452, + 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0xfffe0400, 0x00000100, 0x0000001c, + 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, + 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, + 0x00000000, 0x00000002, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, 0x0000000f, + 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0500002b, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x54415453, 0x00000074, 0x00000002, + 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000116c, 0x00000000, 0x00000204, 0x43425844, + 0x8e325e23, 0x0774e86e, 0xe636e15f, 0xd3f67abf, 0x00000001, 0x00000204, 0x00000005, 0x00000034, + 0x00000080, 0x000000b4, 0x000000e8, 0x00000188, 0x46454452, 0x00000044, 0x00000000, 0x00000000, + 0x00000000, 0x0000001c, 0x47530400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, + 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x52444853, 0x00000098, 0x00020040, 0x00000026, 0x05000061, 0x002010f2, 0x00000003, + 0x00000000, 0x00000001, 0x0100185d, 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x0200005e, 0x00000003, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, + 0x01000013, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x01000013, + 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000002, 0x00000000, 0x01000013, 0x01000009, + 0x0100003e, 0x54415453, 0x00000074, 0x00000008, 0x00000000, 0x00000000, 0x00000002, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000003, 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, + 0x00001320, 0x00000000, 0x50003550, 0x00a50036, 0x00000000, 0x37500000, 0x0000a500, 0x00000100, + 0x00002d00, 0x00001100, 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00005800, 0x00003c00, + 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00008600, 0x00006a00, 0x00000000, 0xffffff00, + 0x000000ff, 0x00000000, 0x0000a500, 0x00008900, 0x00000000, 0xffffff00, 0x0000a7ff, 0x00025300, + 0x00000000, 0x0003ff00, 0x00003c00, 0x00000000, 0xffffff00, 0x000401ff, 0x00000000, 0x0005a900, + 0x00006a00, 0x00000000, 0xffffff00, 0x0005abff, 0x00000000, 0x0007cf00, 0x0007b300, 0x00000000, + 0xffffff00, 0x0007d4ff, 0x0009dc00, 0x00000000, 0x0009ea00, 0x00000800, 0x00000000, 0x0009f100, + 0x00000000, 0x00000000, 0x0009f400, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000100, + 0x0009f700, 0x00000600, 0x00000000, 0x00000100, 0x000a0300, 0x00000800, 0x00000000, 0x00000100, + 0x000a0f00, 0x000a1b00, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000100, 0x000a1e00, + 0x00000600, 0x00000000, 0x00000100, 0x000a2a00, 0x00000800, 0x00000000, 0x00000100, 0x000a3600, + 0x000a4200, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000700, 0x000bed00, 0x00000600, + 0x00000000, 0x00000700, 0x000da100, 0x00000800, 0x00000000, 0x00000700, 0x000fb100, 0x000fb900, + 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000700, 0x00116400, 0x00000600, 0x00000000, + 0x00000700, 0x00131800, 0x00000800, 0x00000000, 0x00000700, 0x00152800, 0x00153000, 0x00000300, + 0x00000000, 0x00000700, 0x00000000, 0x00000200, 0x00005800, 0x00000600, 0x00000000, 0x00000200, + 0x00002d00, 0x00000800, 0x00000000, 0x00000200, 0x00008600, 0x00153300, 0x00000300, 0x00000000, + 0x00000700, 0x00000000, 0x00000200, 0x0003ff00, 0x00000600, 0x00000000, 0x00000300, 0x00153600, + 0x00000800, 0x00000000, 0x00000200, 0x0005a900, 0x00153e00, 0x00000300, 0x00000000, 0x00000700, + 0x00000000, 0x00000200, 0x0003ff00, 0x00000600, 0x00000000, 0x00000300, 0x00154100, 0x00000800, + 0x00000000, 0x00000200, 0x0005a900, 0x00000000, }; static void test_effect_local_shader(void) @@ -2776,7 +2796,8 @@ static void test_effect_local_shader(void) D3D10_EFFECT_TYPE_DESC typedesc; D3D10_EFFECT_DESC effect_desc; ID3D10EffectShaderVariable *null_shader, *null_anon_vs, *null_anon_ps, *null_anon_gs, - *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs; + *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs; + D3D10_EFFECT_SHADER_DESC shaderdesc; ID3D10Device *device; ULONG refcount; @@ -2796,7 +2817,7 @@ static void test_effect_local_shader(void) effect_desc.ConstantBuffers); ok(effect_desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", effect_desc.SharedConstantBuffers); - ok(effect_desc.GlobalVariables == 6, "Unexpected global variables count %u.\n", + ok(effect_desc.GlobalVariables == 7, "Unexpected global variables count %u.\n", effect_desc.GlobalVariables); ok(effect_desc.SharedGlobalVariables == 0, "Unexpected shared global variables count %u.\n", effect_desc.SharedGlobalVariables); @@ -3614,6 +3635,18 @@ if (0) ok(typedesc.UnpackedSize == 0x0, "UnpackedSize is %#x, expected 0x0\n", typedesc.UnpackedSize); ok(typedesc.Stride == 0x0, "Stride is %#x, expected 0x0\n", typedesc.Stride); + /* Geometry shader with stream output */ + v = effect->lpVtbl->GetVariableByName(effect, "g_so"); + gs = v->lpVtbl->AsShader(v); + hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); +todo_wine + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + if (hr == S_OK) + { + ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); + ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); + } + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); -- 2.32.0

4 4

[PATCH 00/11] Series short description
by Eric Pouech 21 Aug '21

21 Aug '21

The following series updates pdb information and enhances tools/winedump. Most information details comes from https://github.com/Microsoft/microsoft-pdb. --- Eric Pouech (11): tools/winedump: move string conversion of machine and language into dedicated helpers tools/winedump: added more supported languages from .pdb COMPILE records tools/winedump: added a bunch of new CPU definitions for PDB tools/winedump: now properly displaying function attributes in function/methods codeview records tools/winedump: enhanced dumping function attributes for CodeView tools/winedump: added some new bits in UDT's property field dbghelp, tools/winedump: Added proper support for S_OBJNAME records include/wine/mscvpdb.h: made len and id type/symbol fields unsigned (as it's supposed to be) dbghelp, tools/winedump: update support for S_COMPILE* records include/wine/mscvpdb.h: added typedef:s for type-id references tools/winedump: fix public and data/proc ref definitions of Codeview records dlls/dbghelp/msc.c | 64 ++--- include/cvconst.h | 92 ++++++ include/wine/mscvpdb.h | 625 +++++++++++++++++++++++------------------ tools/winedump/msc.c | 340 ++++++++++++++++------ 4 files changed, 718 insertions(+), 403 deletions(-)

1 11

[PATCH] wineusb.sys: Remove device from the device list on PDO removal
by Torge Matthies 21 Aug '21

21 Aug '21

Fixes a crash when shutting down a prefix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51479 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wineusb.sys/wineusb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index fae297915fc..28a36b9f380 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -413,12 +413,15 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) break; case IRP_MN_REMOVE_DEVICE: + EnterCriticalSection(&wineusb_cs); remove_pending_irps(device); libusb_unref_device(device->libusb_device); libusb_close(device->handle); + list_remove(&device->entry); IoDeleteDevice(device->device_obj); + LeaveCriticalSection(&wineusb_cs); ret = STATUS_SUCCESS; break; -- 2.32.0

2 2

[PATCH 1/4] ntoskrnl: Dereference the device children in IoDeleteDevice().
by Zebediah Figura 21 Aug '21

21 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d20b39efe15..b0ac64e8b51 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1628,9 +1628,17 @@ void WINAPI IoDeleteDevice( DEVICE_OBJECT *device ) { struct wine_device *wine_device = CONTAINING_RECORD(device, struct wine_device, device_obj); DEVICE_OBJECT **prev = &device->DriverObject->DeviceObject; + DEVICE_RELATIONS *children; + unsigned int i; + while (*prev && *prev != device) prev = &(*prev)->NextDevice; if (*prev) *prev = (*prev)->NextDevice; - ExFreePool( wine_device->children ); + if ((children = wine_device->children)) + { + for (i = 0; i < children->Count; ++i) + ObDereferenceObject( children->Objects[i] ); + ExFreePool( children ); + } ObDereferenceObject( device ); } } -- 2.30.2

1 3

[PATCH v2 2/2] kernelbase/tests: Add more tests for second path.
by Daniel Lehman 20 Aug '21

20 Aug '21

1 0

[PATCH v2 1/2] kernelbase: Don't add a backslash to the second path if not needed.
by Daniel Lehman 20 Aug '21

20 Aug '21

1 0

[PATCH] d3dx10_43/tests: Test all attributes of glyph textures.
by Nikolay Sivov 20 Aug '21

20 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 90339b1853c..7ed77a6406c 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2352,15 +2352,22 @@ todo_wine ID3D10Resource_Release(resource); ID3D10Texture2D_GetDesc(texture, &texture_desc); + ok(texture_desc.Width == 256, "Unexpected width %u.\n", texture_desc.Width); + ok(texture_desc.Height == 256, "Unexpected height %u.\n", texture_desc.Height); + ok(texture_desc.MipLevels == 5, "Unexpected miplevels %u.\n", texture_desc.MipLevels); + ok(texture_desc.ArraySize == 1, "Unexpected array size %u.\n", texture_desc.ArraySize); ok(texture_desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", texture_desc.Format); + ok(texture_desc.SampleDesc.Count == 1, "Unexpected samples count %u.\n", + texture_desc.SampleDesc.Count); + ok(texture_desc.SampleDesc.Quality == 0, "Unexpected quality level %u.\n", + texture_desc.SampleDesc.Quality); ok(texture_desc.Usage == 0, "Unexpected usage %#x.\n", texture_desc.Usage); - ok(texture_desc.Width == 256, "Unexpected width %u.\n", texture_desc.Width); - ok(texture_desc.Height == 256, "Unexpected height %u.\n", texture_desc.Height); - ok(texture_desc.CPUAccessFlags == 0, "Unexpected access flags %#x.\n", - texture_desc.CPUAccessFlags); ok(texture_desc.BindFlags == D3D10_BIND_SHADER_RESOURCE, "Unexpected bind flags %#x.\n", texture_desc.BindFlags); + ok(texture_desc.CPUAccessFlags == 0, "Unexpected access flags %#x.\n", + texture_desc.CPUAccessFlags); + ok(texture_desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", texture_desc.MiscFlags); count = GetGlyphOutlineW(hdc, glyph, GGO_GLYPH_INDEX | GGO_METRICS, &glyph_metrics, 0, NULL, &mat); ok(count != GDI_ERROR, "Unexpected count %#x.\n", count); -- 2.32.0

2 1

[PATCH] d3dx10_42/tests: Enable tests.
by Nikolay Sivov 20 Aug '21

20 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure.ac | 1 + dlls/d3dx10_42/tests/Makefile.in | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 dlls/d3dx10_42/tests/Makefile.in diff --git a/configure.ac b/configure.ac index a143f6d3d2a..70c0e981d5e 100644 --- a/configure.ac +++ b/configure.ac @@ -3095,6 +3095,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_42/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx11_42) diff --git a/dlls/d3dx10_42/tests/Makefile.in b/dlls/d3dx10_42/tests/Makefile.in new file mode 100644 index 00000000000..c3965b7c3f2 --- /dev/null +++ b/dlls/d3dx10_42/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_42.dll +IMPORTS = d3dx10_42 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.32.0

2 1

[v2 PATCH 1/2] d3d10/effect: Handle geometry shader variables declared with stream output.
by Matteo Bruni 20 Aug '21

20 Aug '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2 (Matteo): Tiny fixups. Hopefully without breaking it this time around... dlls/d3d10/d3d10_private.h | 7 + dlls/d3d10/effect.c | 38 +++- dlls/d3d10/tests/effect.c | 398 ++++++++++++++++++++----------------- 3 files changed, 254 insertions(+), 189 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 8d48231d971..249d4ea384a 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -53,6 +53,11 @@ enum d3d10_effect_object_type D3D10_EOT_SAMPLE_MASK = 0xb, }; +enum d3d10_effect_object_type_flags +{ + D3D10_EOT_FLAG_GS_SO = 0x1, +}; + enum d3d10_effect_object_operation { D3D10_EOO_VALUE = 1, @@ -111,6 +116,7 @@ struct d3d10_effect_shader_variable unsigned int resource_count; struct d3d10_effect_shader_resource *resources; + char *stream_output_declaration; }; struct d3d10_effect_state_object_variable @@ -154,6 +160,7 @@ struct d3d10_effect_type char *name; D3D10_SHADER_VARIABLE_TYPE basetype; D3D10_SHADER_VARIABLE_CLASS type_class; + unsigned int flags; DWORD id; struct wine_rb_entry entry; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3040cb63528..0ee63ed41d5 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -790,6 +790,8 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse break; case D3D10_SVT_GEOMETRYSHADER: + if (v->type->flags & D3D10_EOT_FLAG_GS_SO) + FIXME("Create geometry shader with stream output.\n"); hr = ID3D10Device_CreateGeometryShader(device, ptr, dxbc_size, &v->u.shader.shader.gs); if (FAILED(hr)) return hr; break; @@ -816,8 +818,10 @@ static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c, BOOL is_column_ } } -static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) +static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, DWORD *flags) { + *flags = 0; + if(is_object) { switch (t) @@ -829,6 +833,9 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 5: return D3D10_SVT_PIXELSHADER; case 6: return D3D10_SVT_VERTEXSHADER; case 7: return D3D10_SVT_GEOMETRYSHADER; + case 8: + *flags = D3D10_EOT_FLAG_GS_SO; + return D3D10_SVT_GEOMETRYSHADER; case 10: return D3D10_SVT_TEXTURE1D; case 11: return D3D10_SVT_TEXTURE1DARRAY; @@ -865,9 +872,9 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type *t) { + DWORD typeinfo, type_flags; const char *ptr; DWORD unknown0; - DWORD typeinfo; unsigned int i; if (offset >= data_size || !require_space(offset, 6, sizeof(DWORD), data_size)) @@ -915,7 +922,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->member_count = 0; t->column_count = (typeinfo & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (typeinfo & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; - t->basetype = d3d10_variable_type((typeinfo & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE); + t->basetype = d3d10_variable_type((typeinfo & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE, &type_flags); t->type_class = d3d10_variable_class((typeinfo & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT, typeinfo & D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK); TRACE("Type description: %#x.\n", typeinfo); @@ -940,12 +947,14 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->member_count = 0; t->column_count = 0; t->row_count = 0; - t->basetype = d3d10_variable_type(typeinfo, TRUE); + t->basetype = d3d10_variable_type(typeinfo, TRUE, &type_flags); t->type_class = D3D10_SVC_OBJECT; + t->flags = type_flags; TRACE("Type description: %#x.\n", typeinfo); TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); + TRACE("\tflags: %#x.\n", t->flags); break; case 3: @@ -1503,8 +1512,8 @@ static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, D3D_SHADER_VARIABLE_TYPE out_type, UINT out_base, UINT out_size, void *out_data) { D3D_SHADER_VARIABLE_TYPE in_type; + DWORD t, value, type_flags; const char *ptr; - DWORD t, value; DWORD count, i; if (offset >= data_size || !require_space(offset, 1, sizeof(count), data_size)) @@ -1532,7 +1541,7 @@ static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, read_dword(&ptr, &t); read_dword(&ptr, &value); - in_type = d3d10_variable_type(t, FALSE); + in_type = d3d10_variable_type(t, FALSE, &type_flags); TRACE("\t%s: %#x.\n", debug_d3d10_shader_variable_type(in_type), value); switch (out_type) @@ -2129,7 +2138,7 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, TRACE("Shader type is %s\n", debug_d3d10_shader_variable_type(v->type->basetype)); for (i = 0; i < max(v->type->element_count, 1); ++i) { - DWORD shader_offset; + DWORD shader_offset, sodecl_offset; struct d3d10_effect_variable *var; if (!v->type->element_count) @@ -2146,6 +2155,21 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_shader(data, data_size, shader_offset, var))) return hr; + + if (v->type->flags & D3D10_EOT_FLAG_GS_SO) + { + read_dword(ptr, &sodecl_offset); + TRACE("Stream output declaration at offset %#x.\n", sodecl_offset); + + if (!fx10_copy_string(data, data_size, sodecl_offset, + &var->u.shader.stream_output_declaration)) + { + ERR("Failed to copy stream output declaration.\n"); + return E_OUTOFMEMORY; + } + + TRACE("Stream output declaration: %s.\n", debugstr_a(var->u.shader.stream_output_declaration)); + } } break; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index e67eb188328..53e2d52c496 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2533,6 +2533,10 @@ GeometryShader g0 = NULL; VertexShader v[2] = { CompileShader( vs_4_0, VS() ), CompileShader( vs_4_0, VS2() ) }; PixelShader p = CompileShader( ps_4_0, PS() ); GeometryShader g = CompileShader( gs_4_0, GS() ); +GeometryShader g_so = ConstructGSWithSO +( + CompileShader( gs_4_0, GS()), "SV_POSITION.x" +); technique10 Render { pass P0 {} @@ -2580,186 +2584,202 @@ technique10 Render } } #endif -static DWORD fx_local_shader[] = { -0x43425844, 0x95577e13, 0xab5facae, 0xd06d9eab, 0x8b127be0, 0x00000001, 0x00001652, 0x00000001, -0x00000024, 0x30315846, 0x00001626, 0xfeff1001, 0x00000000, 0x00000000, 0x00000006, 0x00000000, -0x00000000, 0x00000000, 0x00000001, 0x0000138a, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000d, 0x00000006, 0x00000000, 0x74726556, -0x68537865, 0x72656461, 0x00000400, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000600, 0x00307600, 0x65786950, 0x6168536c, 0x00726564, 0x00000030, 0x00000002, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x47003070, 0x656d6f65, 0x53797274, 0x65646168, -0x005b0072, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x30670000, -0x00000400, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000600, 0xb4007600, -0x44000001, 0x02434258, 0x5f11b96d, 0x31cdd883, 0xade81d9f, 0x014d6a2d, 0xb4000000, 0x05000001, -0x34000000, 0x8c000000, 0xc0000000, 0xf4000000, 0x38000000, 0x52000001, 0x50464544, 0x00000000, -0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00fffe04, 0x1c000001, 0x4d000000, 0x6f726369, -0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, -0x392e3632, 0x322e3235, 0x00343438, 0x49ababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, -0x00000000, 0x00000000, 0x03000000, 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, -0x4fababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, -0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, -0x0f000100, 0x5f000000, 0xf2030000, 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, -0x36000000, 0xf2050000, 0x00001020, 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, -0x02000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xb4000000, 0x44000001, 0xa4434258, -0x42e88ad3, 0xcc4b1ab5, 0x5f89bf37, 0x0139edfb, 0xb4000000, 0x05000001, 0x34000000, 0x8c000000, -0xc0000000, 0xf4000000, 0x38000000, 0x52000001, 0x50464544, 0x00000000, 0x00000000, 0x00000000, -0x1c000000, 0x00000000, 0x00fffe04, 0x1c000001, 0x4d000000, 0x6f726369, 0x74666f73, 0x29522820, -0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3632, 0x322e3235, -0x00343438, 0x49ababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x00000000, -0x02000000, 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, 0x4fababab, 0x2c4e4753, -0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, -0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, 0x0f000100, 0x5f000000, -0xf2030000, 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, 0x2b000000, 0xf2050000, -0x00001020, 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, 0x02000000, 0x00000000, -0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x70000000, 0x0001b000, 0x42584400, 0xf9269a43, 0xf17ba57f, -0x6d728d8a, 0x599e9d79, 0x000001ff, 0x0001b000, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, -0x0000f400, 0x00013400, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, -0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, -0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, -0x475349ab, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, -0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, -0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, -0x67726154, 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, -0x00000000, 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, -0x80000000, 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x10006700, 0x44000002, 0x5c434258, 0x7482cd04, 0xb6d82978, 0xe48192f2, 0x01eec6be, -0x10000000, 0x05000002, 0x34000000, 0x8c000000, 0xc0000000, 0xf4000000, 0x94000000, 0x52000001, -0x50464544, 0x00000000, 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00475304, 0x1c000001, -0x4d000000, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, -0x656c6970, 0x2e392072, 0x392e3632, 0x322e3235, 0x00343438, 0x49ababab, 0x2c4e4753, 0x01000000, -0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, 0x5300000f, -0x4f505f56, 0x49544953, 0x4f004e4f, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, -0x01000000, 0x03000000, 0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, -0x98524448, 0x40000000, 0x26000200, 0x61000000, 0xf2050000, 0x03002010, 0x00000000, 0x01000000, -0x5d000000, 0x5c010018, 0x67010028, 0xf2040000, 0x00001020, 0x01000000, 0x5e000000, 0x03020000, -0x36000000, 0xf2060000, 0x00001020, 0x46000000, 0x0000201e, 0x00000000, 0x13000000, 0x36010000, -0xf2060000, 0x00001020, 0x46000000, 0x0100201e, 0x00000000, 0x13000000, 0x36010000, 0xf2060000, -0x00001020, 0x46000000, 0x0200201e, 0x00000000, 0x13000000, 0x09010000, 0x3e010000, 0x53010000, -0x74544154, 0x08000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, -0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x03000000, 0x05000000, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x52000000, 0x65646e65, -0x30500072, 0x00315000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, -0x00000001, 0x00000002, 0x00000000, 0x01003250, 0x02000000, 0x00000000, 0x01000000, 0x02000000, -0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x50000000, 0x01b00033, 0x58440000, 0x269a4342, -0x7ba57ff9, 0x728d8af1, 0x9e9d796d, 0x0001ff59, 0x01b00000, 0x00050000, 0x00340000, 0x008c0000, -0x00c00000, 0x00f40000, 0x01340000, 0x44520000, 0x00504645, 0x00000000, 0x00000000, 0x00000000, -0x001c0000, 0x04000000, 0x0100ffff, 0x001c0000, 0x694d0000, 0x736f7263, 0x2074666f, 0x20295228, -0x4c534c48, 0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e36, 0x38322e32, -0xab003434, 0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00010000, -0x00030000, 0x00000000, 0x000f0000, 0x56530000, 0x534f505f, 0x4f495449, 0x534f004e, 0x002c4e47, -0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, 0x000f0000, -0x56530000, 0x7261545f, 0x00746567, 0x4853abab, 0x00385244, 0x00400000, 0x000e0000, 0x00650000, -0x20f20300, 0x00000010, 0x00360000, 0x20f20800, 0x00000010, 0x40020000, 0x00000000, 0x00003f80, -0x00003f80, 0x00000000, 0x003e3f80, 0x54530100, 0x00745441, 0x00020000, 0x00000000, 0x00000000, -0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x083e0000, 0x00000000, 0x01b40000, 0x58440000, 0x6d024342, 0x835f11b9, -0x9f31cdd8, 0x2dade81d, 0x00014d6a, 0x01b40000, 0x00050000, 0x00340000, 0x008c0000, 0x00c00000, -0x00f40000, 0x01380000, 0x44520000, 0x00504645, 0x00000000, 0x00000000, 0x00000000, 0x001c0000, -0x04000000, 0x0100fffe, 0x001c0000, 0x694d0000, 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, -0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e36, 0x38322e32, 0xab003434, -0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00000000, 0x00030000, -0x00000000, 0x0f0f0000, 0x4f500000, 0x49544953, 0xab004e4f, 0x534fabab, 0x002c4e47, 0x00010000, -0x00080000, 0x00200000, 0x00000000, 0x00010000, 0x00030000, 0x00000000, 0x000f0000, 0x56530000, -0x534f505f, 0x4f495449, 0x4853004e, 0x003c5244, 0x00400000, 0x000f0001, 0x005f0000, 0x10f20300, -0x00000010, 0x00670000, 0x20f20400, 0x00000010, 0x00010000, 0x00360000, 0x20f20500, 0x00000010, -0x1e460000, 0x00000010, 0x003e0000, 0x54530100, 0x00745441, 0x00020000, 0x00000000, 0x00000000, -0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x09fa0000, 0x00000000, 0x02100000, 0x58440000, 0x045c4342, 0x787482cd, -0xf2b6d829, 0xbee48192, 0x0001eec6, 0x02100000, 0x00050000, 0x00340000, 0x008c0000, 0x00c00000, -0x00f40000, 0x01940000, 0x44520000, 0x00504645, 0x00000000, 0x00000000, 0x00000000, 0x001c0000, -0x04000000, 0x01004753, 0x001c0000, 0x694d0000, 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, -0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e36, 0x38322e32, 0xab003434, -0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00010000, 0x00030000, -0x00000000, 0x0f0f0000, 0x56530000, 0x534f505f, 0x4f495449, 0x534f004e, 0x002c4e47, 0x00010000, -0x00080000, 0x00200000, 0x00000000, 0x00010000, 0x00030000, 0x00000000, 0x000f0000, 0x56530000, -0x534f505f, 0x4f495449, 0x4853004e, 0x00985244, 0x00400000, 0x00260002, 0x00610000, 0x10f20500, -0x00030020, 0x00000000, 0x00010000, 0x185d0000, 0x285c0100, 0x00670100, 0x20f20400, 0x00000010, -0x00010000, 0x005e0000, 0x00030200, 0x00360000, 0x20f20600, 0x00000010, 0x1e460000, 0x00000020, -0x00000000, 0x00130000, 0x00360100, 0x20f20600, 0x00000010, 0x1e460000, 0x00010020, 0x00000000, -0x00130000, 0x00360100, 0x20f20600, 0x00000010, 0x1e460000, 0x00020020, 0x00000000, 0x00130000, -0x00090100, 0x003e0100, 0x54530100, 0x00745441, 0x00080000, 0x00000000, 0x00000000, 0x00020000, -0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00010000, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00050000, 0x00030000, 0x00000000, 0x00000000, -0x00000000, 0x0bba0000, 0x00000000, 0x34500000, 0x0001b000, 0x42584400, 0xf9269a43, 0xf17ba57f, -0x6d728d8a, 0x599e9d79, 0x000001ff, 0x0001b000, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, -0x0000f400, 0x00013400, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, -0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, -0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, -0x475349ab, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, -0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, -0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, -0x67726154, 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, -0x00000000, 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, -0x80000000, 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x000dd900, 0x00000000, 0x0001b400, 0x42584400, 0x8ad3a443, 0x1ab542e8, 0xbf37cc4b, -0xedfb5f89, 0x00000139, 0x0001b400, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, 0x0000f400, -0x00013800, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0xfe040000, -0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, -0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, 0x475349ab, -0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000200, 0x00000000, -0x000f0f00, 0x534f5000, 0x4f495449, 0xabab004e, 0x47534fab, 0x00002c4e, 0x00000100, 0x00000800, -0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, -0x4e4f4954, 0x44485300, 0x00003c52, 0x01004000, 0x00000f00, 0x00005f00, 0x1010f203, 0x00000000, -0x00006700, 0x1020f204, 0x00000000, 0x00000100, 0x00002b00, 0x1020f205, 0x00000000, 0x101e4600, -0x00000000, 0x00003e00, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000200, -0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x000f9500, 0x00000000, 0x00021000, 0x42584400, 0xcd045c43, 0x29787482, 0x92f2b6d8, -0xc6bee481, 0x000001ee, 0x00021000, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, 0x0000f400, -0x00019400, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0x53040000, -0x00010047, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, -0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, 0x475349ab, -0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, -0x000f0f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, 0x00000800, -0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, -0x4e4f4954, 0x44485300, 0x00009852, 0x02004000, 0x00002600, 0x00006100, 0x2010f205, 0x00000300, -0x00000000, 0x00000100, 0x00185d00, 0x00285c01, 0x00006701, 0x1020f204, 0x00000000, 0x00000100, -0x00005e00, 0x00000302, 0x00003600, 0x1020f206, 0x00000000, 0x201e4600, 0x00000000, 0x00000000, -0x00001300, 0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000100, 0x00000000, 0x00001300, -0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000200, 0x00000000, 0x00001300, 0x00000901, -0x00003e01, 0x41545301, 0x00007454, 0x00000800, 0x00000000, 0x00000000, 0x00000200, 0x00000000, -0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, -0x00000300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000300, 0x00000500, 0x00000300, 0x00000000, 0x00000000, 0x00000000, -0x00115500, 0x00000000, 0x00355000, 0xa5003650, 0x00000000, 0x50000000, 0x00a50037, 0x00010000, -0x002d0000, 0x00110000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, 0x00580000, 0x003c0000, -0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, 0x00860000, 0x006a0000, 0x00000000, 0xffff0000, -0x0000ffff, 0x00000000, 0x00a50000, 0x00890000, 0x00000000, 0xffff0000, 0x00a7ffff, 0x025f0000, -0x00000000, 0x04170000, 0x003c0000, 0x00000000, 0xffff0000, 0x0419ffff, 0x00000000, 0x05cd0000, -0x006a0000, 0x00000000, 0xffff0000, 0x05cfffff, 0x00000000, 0x07e30000, 0x00080000, 0x00000000, -0x07ea0000, 0x00000000, 0x00000000, 0x07ed0000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, -0x00010000, 0x07f00000, 0x00060000, 0x00000000, 0x00010000, 0x07fc0000, 0x00080000, 0x00000000, -0x00010000, 0x08080000, 0x08140000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00010000, -0x08170000, 0x00060000, 0x00000000, 0x00010000, 0x08230000, 0x00080000, 0x00000000, 0x00010000, -0x082f0000, 0x083b0000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x09f20000, -0x00060000, 0x00000000, 0x00070000, 0x0bb20000, 0x00080000, 0x00000000, 0x00070000, 0x0dce0000, -0x0dd60000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x0f8d0000, 0x00060000, -0x00000000, 0x00070000, 0x114d0000, 0x00080000, 0x00000000, 0x00070000, 0x13690000, 0x13710000, -0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x00580000, 0x00060000, 0x00000000, -0x00020000, 0x002d0000, 0x00080000, 0x00000000, 0x00020000, 0x00860000, 0x13740000, 0x00030000, -0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x04170000, 0x00060000, 0x00000000, 0x00030000, -0x13770000, 0x00080000, 0x00000000, 0x00020000, 0x05cd0000, 0x137f0000, 0x00030000, 0x00000000, -0x00070000, 0x00000000, 0x00020000, 0x04170000, 0x00060000, 0x00000000, 0x00030000, 0x13820000, -0x00080000, 0x00000000, 0x00020000, 0x05cd0000, 0x00000000, +static DWORD fx_local_shader[] = +{ + 0x43425844, 0x0a74ff0f, 0xea10b516, 0x8be88332, 0x2a273ca7, 0x00000001, 0x0000182d, 0x00000001, + 0x00000024, 0x30315846, 0x00001801, 0xfeff1001, 0x00000000, 0x00000000, 0x00000007, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00001549, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000e, 0x00000006, 0x00000000, 0x74726556, + 0x68537865, 0x72656461, 0x00000400, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000600, 0x00307600, 0x65786950, 0x6168536c, 0x00726564, 0x00000030, 0x00000002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x47003070, 0x656d6f65, 0x53797274, 0x65646168, + 0x005b0072, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x30670000, + 0x00000400, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000600, 0xa8007600, + 0x44000001, 0x92434258, 0xa75ea3fc, 0x13affa34, 0x46be1a21, 0x0104d04a, 0xa8000000, 0x05000001, + 0x34000000, 0x80000000, 0xb4000000, 0xe8000000, 0x2c000000, 0x52000001, 0x44464544, 0x00000000, + 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00fffe04, 0x1c000001, 0x4d000000, 0x6f726369, + 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, + 0x4900312e, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x00000000, 0x03000000, + 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, 0x4fababab, 0x2c4e4753, 0x01000000, + 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, 0x53000000, + 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, 0x0f000100, 0x5f000000, 0xf2030000, + 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, 0x36000000, 0xf2050000, 0x00001020, + 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, 0x02000000, 0x00000000, 0x00000000, + 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0xa8000000, 0x44000001, 0x84434258, 0xa05ac55b, 0x929a6a46, 0x4f0df40a, + 0x01a2fea3, 0xa8000000, 0x05000001, 0x34000000, 0x80000000, 0xb4000000, 0xe8000000, 0x2c000000, + 0x52000001, 0x44464544, 0x00000000, 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00fffe04, + 0x1c000001, 0x4d000000, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, + 0x6d6f4320, 0x656c6970, 0x30312072, 0x4900312e, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, + 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, + 0x4fababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, + 0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, + 0x0f000100, 0x5f000000, 0xf2030000, 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, + 0x2b000000, 0xf2050000, 0x00001020, 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, + 0x02000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x70000000, 0x0001a400, 0x42584400, + 0xf4813443, 0xb6605b8e, 0xc69999b8, 0xcb75f1b5, 0x000001eb, 0x0001a400, 0x00000500, 0x00003400, + 0x00008000, 0x0000b400, 0x0000e800, 0x00012800, 0x45445200, 0x00004446, 0x00000000, 0x00000000, + 0x00000000, 0x00001c00, 0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, + 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x312e3031, 0x47534900, + 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, + 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, 0x00000800, + 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x67726154, + 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, 0x00000000, + 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, 0x80000000, + 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, 0x00000000, + 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x04006700, 0x44000002, 0x23434258, 0x6e8e325e, 0x5f0774e8, 0xbfe636e1, 0x01d3f67a, 0x04000000, + 0x05000002, 0x34000000, 0x80000000, 0xb4000000, 0xe8000000, 0x88000000, 0x52000001, 0x44464544, + 0x00000000, 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00475304, 0x1c000001, 0x4d000000, + 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, + 0x30312072, 0x4900312e, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, + 0x03000000, 0x00000000, 0x0f000000, 0x5300000f, 0x4f505f56, 0x49544953, 0x4f004e4f, 0x2c4e4753, + 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, + 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x98524448, 0x40000000, 0x26000200, 0x61000000, + 0xf2050000, 0x03002010, 0x00000000, 0x01000000, 0x5d000000, 0x5c010018, 0x67010028, 0xf2040000, + 0x00001020, 0x01000000, 0x5e000000, 0x03020000, 0x36000000, 0xf2060000, 0x00001020, 0x46000000, + 0x0000201e, 0x00000000, 0x13000000, 0x36010000, 0xf2060000, 0x00001020, 0x46000000, 0x0100201e, + 0x00000000, 0x13000000, 0x36010000, 0xf2060000, 0x00001020, 0x46000000, 0x0200201e, 0x00000000, + 0x13000000, 0x09010000, 0x3e010000, 0x53010000, 0x74544154, 0x08000000, 0x00000000, 0x00000000, + 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03000000, 0x05000000, 0x03000000, 0x00000000, + 0x00000000, 0x00000000, 0x5b000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x08000000, 0x67000000, 0x006f735f, 0x00000204, 0x43425844, 0x8e325e23, 0x0774e86e, 0xe636e15f, + 0xd3f67abf, 0x00000001, 0x00000204, 0x00000005, 0x00000034, 0x00000080, 0x000000b4, 0x000000e8, + 0x00000188, 0x46454452, 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0x47530400, + 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, + 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x00000098, + 0x00020040, 0x00000026, 0x05000061, 0x002010f2, 0x00000003, 0x00000000, 0x00000001, 0x0100185d, + 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0200005e, 0x00000003, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, + 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, 0x00000000, + 0x00201e46, 0x00000002, 0x00000000, 0x01000013, 0x01000009, 0x0100003e, 0x54415453, 0x00000074, + 0x00000008, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, + 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x505f5653, 0x5449534f, 0x2e4e4f49, + 0x65520078, 0x7265646e, 0x00305000, 0x01003150, 0x02000000, 0x00000000, 0x01000000, 0x02000000, + 0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x50000000, 0x00010032, 0x00020000, 0x00000000, + 0x00010000, 0x00020000, 0x00000000, 0x00010000, 0x00020000, 0x00000000, 0x33500000, 0x0001a400, + 0x42584400, 0xf4813443, 0xb6605b8e, 0xc69999b8, 0xcb75f1b5, 0x000001eb, 0x0001a400, 0x00000500, + 0x00003400, 0x00008000, 0x0000b400, 0x0000e800, 0x00012800, 0x45445200, 0x00004446, 0x00000000, + 0x00000000, 0x00000000, 0x00001c00, 0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, + 0x28207466, 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x312e3031, + 0x47534900, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, + 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, + 0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, + 0x67726154, 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, + 0x00000000, 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, + 0x80000000, 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, + 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x000a4500, 0x00000000, 0x0001a800, 0x42584400, 0xa3fc9243, 0xfa34a75e, 0x1a2113af, + 0xd04a46be, 0x00000104, 0x0001a800, 0x00000500, 0x00003400, 0x00008000, 0x0000b400, 0x0000e800, + 0x00012c00, 0x45445200, 0x00004446, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0xfe040000, + 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, + 0x43207265, 0x69706d6f, 0x2072656c, 0x312e3031, 0x47534900, 0x00002c4e, 0x00000100, 0x00000800, + 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x000f0f00, 0x534f5000, 0x4f495449, + 0xabab004e, 0x47534fab, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, + 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x44485300, 0x00003c52, + 0x01004000, 0x00000f00, 0x00005f00, 0x1010f203, 0x00000000, 0x00006700, 0x1020f204, 0x00000000, + 0x00000100, 0x00003600, 0x1020f205, 0x00000000, 0x101e4600, 0x00000000, 0x00003e00, 0x41545301, + 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000000, + 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000bf500, 0x00000000, + 0x00020400, 0x42584400, 0x325e2343, 0x74e86e8e, 0x36e15f07, 0xf67abfe6, 0x000001d3, 0x00020400, + 0x00000500, 0x00003400, 0x00008000, 0x0000b400, 0x0000e800, 0x00018800, 0x45445200, 0x00004446, + 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0x53040000, 0x00010047, 0x00001c00, 0x63694d00, + 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, + 0x312e3031, 0x47534900, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, + 0x00000300, 0x00000000, 0x000f0f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, + 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000f00, + 0x5f565300, 0x49534f50, 0x4e4f4954, 0x44485300, 0x00009852, 0x02004000, 0x00002600, 0x00006100, + 0x2010f205, 0x00000300, 0x00000000, 0x00000100, 0x00185d00, 0x00285c01, 0x00006701, 0x1020f204, + 0x00000000, 0x00000100, 0x00005e00, 0x00000302, 0x00003600, 0x1020f206, 0x00000000, 0x201e4600, + 0x00000000, 0x00000000, 0x00001300, 0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000100, + 0x00000000, 0x00001300, 0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000200, 0x00000000, + 0x00001300, 0x00000901, 0x00003e01, 0x41545301, 0x00007454, 0x00000800, 0x00000000, 0x00000000, + 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000300, 0x00000500, 0x00000300, 0x00000000, + 0x00000000, 0x00000000, 0x000da900, 0x00000000, 0x00345000, 0x000001a4, 0x43425844, 0x8ef48134, + 0xb8b6605b, 0xb5c69999, 0xebcb75f1, 0x00000001, 0x000001a4, 0x00000005, 0x00000034, 0x00000080, + 0x000000b4, 0x000000e8, 0x00000128, 0x46454452, 0x00000044, 0x00000000, 0x00000000, 0x00000000, + 0x0000001c, 0xffff0400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, + 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, + 0x52444853, 0x00000038, 0x00000040, 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, + 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + 0x54415453, 0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, + 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000fbc, + 0x00000000, 0x000001a8, 0x43425844, 0x5ac55b84, 0x9a6a46a0, 0x0df40a92, 0xa2fea34f, 0x00000001, + 0x000001a8, 0x00000005, 0x00000034, 0x00000080, 0x000000b4, 0x000000e8, 0x0000012c, 0x46454452, + 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0xfffe0400, 0x00000100, 0x0000001c, + 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, + 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, + 0x00000000, 0x00000002, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, 0x0000000f, + 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0500002b, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x54415453, 0x00000074, 0x00000002, + 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000116c, 0x00000000, 0x00000204, 0x43425844, + 0x8e325e23, 0x0774e86e, 0xe636e15f, 0xd3f67abf, 0x00000001, 0x00000204, 0x00000005, 0x00000034, + 0x00000080, 0x000000b4, 0x000000e8, 0x00000188, 0x46454452, 0x00000044, 0x00000000, 0x00000000, + 0x00000000, 0x0000001c, 0x47530400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, + 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x52444853, 0x00000098, 0x00020040, 0x00000026, 0x05000061, 0x002010f2, 0x00000003, + 0x00000000, 0x00000001, 0x0100185d, 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x0200005e, 0x00000003, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, + 0x01000013, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x01000013, + 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000002, 0x00000000, 0x01000013, 0x01000009, + 0x0100003e, 0x54415453, 0x00000074, 0x00000008, 0x00000000, 0x00000000, 0x00000002, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000003, 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, + 0x00001320, 0x00000000, 0x50003550, 0x00a50036, 0x00000000, 0x37500000, 0x0000a500, 0x00000100, + 0x00002d00, 0x00001100, 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00005800, 0x00003c00, + 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00008600, 0x00006a00, 0x00000000, 0xffffff00, + 0x000000ff, 0x00000000, 0x0000a500, 0x00008900, 0x00000000, 0xffffff00, 0x0000a7ff, 0x00025300, + 0x00000000, 0x0003ff00, 0x00003c00, 0x00000000, 0xffffff00, 0x000401ff, 0x00000000, 0x0005a900, + 0x00006a00, 0x00000000, 0xffffff00, 0x0005abff, 0x00000000, 0x0007cf00, 0x0007b300, 0x00000000, + 0xffffff00, 0x0007d4ff, 0x0009dc00, 0x00000000, 0x0009ea00, 0x00000800, 0x00000000, 0x0009f100, + 0x00000000, 0x00000000, 0x0009f400, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000100, + 0x0009f700, 0x00000600, 0x00000000, 0x00000100, 0x000a0300, 0x00000800, 0x00000000, 0x00000100, + 0x000a0f00, 0x000a1b00, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000100, 0x000a1e00, + 0x00000600, 0x00000000, 0x00000100, 0x000a2a00, 0x00000800, 0x00000000, 0x00000100, 0x000a3600, + 0x000a4200, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000700, 0x000bed00, 0x00000600, + 0x00000000, 0x00000700, 0x000da100, 0x00000800, 0x00000000, 0x00000700, 0x000fb100, 0x000fb900, + 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000700, 0x00116400, 0x00000600, 0x00000000, + 0x00000700, 0x00131800, 0x00000800, 0x00000000, 0x00000700, 0x00152800, 0x00153000, 0x00000300, + 0x00000000, 0x00000700, 0x00000000, 0x00000200, 0x00005800, 0x00000600, 0x00000000, 0x00000200, + 0x00002d00, 0x00000800, 0x00000000, 0x00000200, 0x00008600, 0x00153300, 0x00000300, 0x00000000, + 0x00000700, 0x00000000, 0x00000200, 0x0003ff00, 0x00000600, 0x00000000, 0x00000300, 0x00153600, + 0x00000800, 0x00000000, 0x00000200, 0x0005a900, 0x00153e00, 0x00000300, 0x00000000, 0x00000700, + 0x00000000, 0x00000200, 0x0003ff00, 0x00000600, 0x00000000, 0x00000300, 0x00154100, 0x00000800, + 0x00000000, 0x00000200, 0x0005a900, 0x00000000, }; static void test_effect_local_shader(void) @@ -2776,7 +2796,8 @@ static void test_effect_local_shader(void) D3D10_EFFECT_TYPE_DESC typedesc; D3D10_EFFECT_DESC effect_desc; ID3D10EffectShaderVariable *null_shader, *null_anon_vs, *null_anon_ps, *null_anon_gs, - *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs; + *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs; + D3D10_EFFECT_SHADER_DESC shaderdesc; ID3D10Device *device; ULONG refcount; @@ -2796,7 +2817,7 @@ static void test_effect_local_shader(void) effect_desc.ConstantBuffers); ok(effect_desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", effect_desc.SharedConstantBuffers); - ok(effect_desc.GlobalVariables == 6, "Unexpected global variables count %u.\n", + ok(effect_desc.GlobalVariables == 7, "Unexpected global variables count %u.\n", effect_desc.GlobalVariables); ok(effect_desc.SharedGlobalVariables == 0, "Unexpected shared global variables count %u.\n", effect_desc.SharedGlobalVariables); @@ -3614,6 +3635,19 @@ if (0) ok(typedesc.UnpackedSize == 0x0, "UnpackedSize is %#x, expected 0x0\n", typedesc.UnpackedSize); ok(typedesc.Stride == 0x0, "Stride is %#x, expected 0x0\n", typedesc.Stride); + /* Geometry shader with stream output */ + v = effect->lpVtbl->GetVariableByName(effect, "g_so"); + gs = v->lpVtbl->AsShader(v); + hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); +todo_wine + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + if (hr == S_OK) + { + ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); + ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x"), "Unexpected stream output declaration %s.\n", + shaderdesc.SODecl); + } + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); -- 2.26.3

1 0

[PATCH v2 1/4] winex11.drv: Only return vulkan functions if the host function is available.
by Georg Lehmann 20 Aug '21

20 Aug '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winex11.drv/vulkan.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index bdc287afeea..1bbdba2ce1d 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -435,12 +435,25 @@ static VkResult X11DRV_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, return pvkGetDeviceGroupSurfacePresentModesKHR(device, x11_surface->surface, flags); } +static const char *wine_vk_native_fn_name(const char *name) +{ + if (!strcmp(name, "vkCreateWin32SurfaceKHR")) + return "vkCreateXlibSurfaceKHR"; + if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) + return "vkGetPhysicalDeviceXlibPresentationSupportKHR"; + + return name; +} + static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) { void *proc_addr; TRACE("%p, %s\n", device, debugstr_a(name)); + if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) return proc_addr; @@ -453,6 +466,9 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); + if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) return proc_addr; -- 2.33.0

2 7

[PATCH 11/11] concrt140: Don't forward to msvcr120.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/concrt140/Makefile.in | 6 + dlls/concrt140/concrt140.c | 102 +++++ dlls/concrt140/concrt140.spec | 676 +++++++++++++++++----------------- 3 files changed, 446 insertions(+), 338 deletions(-) create mode 100644 dlls/concrt140/concrt140.c

1 0

[PATCH 10/11] msvcrt: Simplify throw_exception helper.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 12 ++++-------- dlls/msvcrt/heap.c | 2 +- dlls/msvcrt/msvcrt.h | 5 +---- 3 files changed, 6 insertions(+), 13 deletions(-)

1 0

[PATCH 09/11] msvcrt: Move improper_scheduler_detach to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 52 +++++++++++++++++++++++++++++++--- dlls/msvcrt/cpp.c | 59 --------------------------------------- dlls/msvcrt/msvcrt.h | 3 -- 3 files changed, 48 insertions(+), 66 deletions(-)

1 0

[PATCH 08/11] msvcrt: Move improper_scheduler_attach to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 45 +++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cpp.c | 43 ------------------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 43 insertions(+), 46 deletions(-)

1 0

[PATCH 07/11] msvcrt: Move invalid_scheduler_policy_thread_specification to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 45 +++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cpp.c | 43 ------------------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 43 insertions(+), 46 deletions(-)

1 0

[PATCH 06/11] msvcrt: Move invalid_scheduler_policy_value to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 76 ++++++++++++++++++++++++++++++++------- dlls/msvcrt/cpp.c | 43 ---------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 64 insertions(+), 56 deletions(-)

1 0

[PATCH 05/11] msvcrt: Move invalid_scheduler_policy_key to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 66 ++++++++++++++++++++++++++++++++++----- dlls/msvcrt/cpp.c | 43 ------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 58 insertions(+), 52 deletions(-)

1 0

[PATCH 04/11] msvcrt: Move scheduler_resource_allocation_error to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 66 +++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cpp.c | 64 ------------------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 63 insertions(+), 68 deletions(-)

1 0

[PATCH 03/11] msvcrt: Move improper_lock implementation to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 76 ++++++++++++++++++++++++++++++++++----- dlls/msvcrt/cpp.c | 39 -------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 67 insertions(+), 49 deletions(-)

1 0

[PATCH 02/11] msvcrt: Introduce macro for creating exception class.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 192 ++++++---------------------------------- dlls/msvcrt/cppexcept.h | 101 +++++++++++++++++++-- 2 files changed, 121 insertions(+), 172 deletions(-)

1 0

[PATCH 01/11] msvcrt: Rename exception::what() implementation to exception_what.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/cpp.c | 30 +++++++++++++++--------------- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrtd/msvcrtd.spec | 4 ++-- 10 files changed, 36 insertions(+), 36 deletions(-)

1 0

[PATCH 8/8] gdi32: Use NtGdiGetOutlineTextMetricsInternalW for GetOutlineTextMetrics.
by Jacek Caban 20 Aug '21

20 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 188 ++-------------------------------------------- dlls/gdi32/text.c | 182 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 183 deletions(-)

2 1

[PATCH 7/8] gdi32: Use NtGdiHfontCreate for CreateFont* functions.
by Jacek Caban 20 Aug '21

20 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 129 +------------------------------------------ dlls/gdi32/text.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 126 deletions(-)

2 1

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