- wine-devel - winehq.org

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

23 Jun '21

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

2 1

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

23 Jun '21

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

1 0

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

23 Jun '21

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

3 2

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

23 Jun '21

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

3 4

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

23 Jun '21

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

2 1

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

23 Jun '21

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

3 3

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

23 Jun '21

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

3 9

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

23 Jun '21

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

3 6

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

23 Jun '21

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

1 0

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

23 Jun '21

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

1 0

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

23 Jun '21

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

2 2

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

23 Jun '21

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

2 1

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

23 Jun '21

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

2 11

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

23 Jun '21

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

2 3

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

23 Jun '21

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

1 4

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

23 Jun '21

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

1 0

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

23 Jun '21

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

1 0

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

23 Jun '21

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

1 0

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

23 Jun '21

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

1 0

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

23 Jun '21

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

1 0

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

23 Jun '21

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

3 2

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

23 Jun '21

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

3 14

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

23 Jun '21

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

2 1

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

23 Jun '21

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

1 0

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

23 Jun '21

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

1 0

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

23 Jun '21

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

1 0

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

23 Jun '21

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

1 0

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

23 Jun '21

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

1 0

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

23 Jun '21

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

1 0

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

22 Jun '21

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

2 4

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

22 Jun '21

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

1 0

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

22 Jun '21

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

2 2

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

22 Jun '21

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

3 3

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

22 Jun '21

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

2 5

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

22 Jun '21

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

1 0

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

22 Jun '21

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

1 0

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

22 Jun '21

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

1 0

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

22 Jun '21

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

1 2

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

22 Jun '21

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

2 1

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

22 Jun '21

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

2 1

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

22 Jun '21

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

2 9

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

22 Jun '21

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

2 5

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

22 Jun '21

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

1 0

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

22 Jun '21

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

1 0

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

22 Jun '21

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

2 1

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

22 Jun '21

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

2 1

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

22 Jun '21

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

1 1

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

22 Jun '21

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

1 0

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

22 Jun '21

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

1 0

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

22 Jun '21

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

1 0

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