- Wine-Devel - list.winehq.org

[PATCH vkd3d 04/10] include: Reintroduce hidden visibility for GUID definitions.
by Henri Verbeet March 1, 2022

March 1, 2022

This was dropped by d27fee64ab51c60078215f461a797edd32bc8871, presumably because the default visibility was switched to "hidden". However, this is part of a public header, and external users may not share our symbol visibility defaults. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_windows.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index c1aa9f27..8398d403 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -127,18 +127,18 @@ typedef GUID IID; # ifdef INITGUID # ifndef __cplusplus # define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - const GUID name; \ + const GUID name DECLSPEC_HIDDEN; \ const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 }} # else # define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name; \ + EXTERN_C const GUID name DECLSPEC_HIDDEN; \ EXTERN_C const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 }} # endif # else # define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name; + EXTERN_C const GUID name DECLSPEC_HIDDEN; # endif /* INITGUID */ /* __uuidof emulation */ @@ -239,6 +239,17 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; #endif /* _WIN32 */ +/* Define DECLSPEC_HIDDEN */ +#ifndef DECLSPEC_HIDDEN +# if defined(__MINGW32__) +# define DECLSPEC_HIDDEN +# elif defined(__GNUC__) +# define DECLSPEC_HIDDEN __attribute__((visibility("hidden"))) +# else +# define DECLSPEC_HIDDEN +# endif +#endif /* DECLSPEC_HIDDEN */ + /* Define min() & max() macros */ #ifndef NOMINMAX # ifndef min -- 2.20.1

1 0

[PATCH vkd3d 03/10] vkd3d-shader/spirv: Pass vkd3d-shader formatting options to vkd3d_spirv_binary_to_text().
by Henri Verbeet March 1, 2022

March 1, 2022

Instead of making the caller convert them. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0e3dbf08..03405add 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -81,7 +81,8 @@ static uint32_t get_binary_to_text_options(enum vkd3d_shader_compile_option_form } static enum vkd3d_result vkd3d_spirv_binary_to_text(const struct vkd3d_shader_code *spirv, - enum vkd3d_shader_spirv_environment environment, uint32_t options, struct vkd3d_shader_code *out) + enum vkd3d_shader_spirv_environment environment, + enum vkd3d_shader_compile_option_formatting_flags formatting, struct vkd3d_shader_code *out) { spv_diagnostic diagnostic = NULL; spv_text text = NULL; @@ -92,7 +93,7 @@ static enum vkd3d_result vkd3d_spirv_binary_to_text(const struct vkd3d_shader_co context = spvContextCreate(spv_target_env_from_vkd3d(environment)); if (!(spvret = spvBinaryToText(context, spirv->code, spirv->size / sizeof(uint32_t), - options, &text, &diagnostic))) + get_binary_to_text_options(formatting), &text, &diagnostic))) { void *code = vkd3d_malloc(text->length); if (code) @@ -121,11 +122,11 @@ static enum vkd3d_result vkd3d_spirv_binary_to_text(const struct vkd3d_shader_co static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_spirv_environment environment) { - const static uint32_t options - = SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES | SPV_BINARY_TO_TEXT_OPTION_INDENT; + static const enum vkd3d_shader_compile_option_formatting_flags formatting + = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; struct vkd3d_shader_code text; - if (!vkd3d_spirv_binary_to_text(spirv, environment, options, &text)) + if (!vkd3d_spirv_binary_to_text(spirv, environment, formatting, &text)) { vkd3d_shader_trace_text(text.code, text.size); vkd3d_shader_free_shader_code(&text); @@ -154,12 +155,9 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, #else -static uint32_t get_binary_to_text_options(enum vkd3d_shader_compile_option_formatting_flags formatting) -{ - return 0; -} static enum vkd3d_result vkd3d_spirv_binary_to_text(const struct vkd3d_shader_code *spirv, - enum vkd3d_shader_spirv_environment environment, uint32_t options, struct vkd3d_shader_code *out) + enum vkd3d_shader_spirv_environment environment, + enum vkd3d_shader_compile_option_formatting_flags formatting, struct vkd3d_shader_code *out) { return VKD3D_ERROR; } @@ -9978,8 +9976,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, { struct vkd3d_shader_code text; enum vkd3d_shader_spirv_environment environment = vkd3d_dxbc_compiler_get_target_environment(compiler); - if (vkd3d_spirv_binary_to_text(spirv, environment, - get_binary_to_text_options(compiler->formatting), &text) != VKD3D_OK) + if (vkd3d_spirv_binary_to_text(spirv, environment, compiler->formatting, &text) != VKD3D_OK) return VKD3D_ERROR; *spirv = text; } -- 2.20.1

1 0

[PATCH vkd3d 02/10] tests: Properly compare integers in compare_id().
by Henri Verbeet March 1, 2022

March 1, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index eb6217bc..5067dd97 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22535,7 +22535,7 @@ static unsigned int read_uav_counter(const struct test_context *context, static int compare_id(const void *a, const void *b) { - return *(int *)a - *(int *)b; + return vkd3d_u32_compare(*(uint32_t *)a, *(uint32_t *)b); } static void test_uav_counters(void) -- 2.20.1

1 0

[PATCH vkd3d 01/10] vkd3d: Properly compare integers in compare_descriptor_range().
by Henri Verbeet March 1, 2022

March 1, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ffd92d1a..2d3954d2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -835,10 +835,10 @@ static int compare_descriptor_range(const void *a, const void *b) const struct d3d12_root_descriptor_table_range *range_a = a, *range_b = b; int ret; - if ((ret = range_a->type - range_b->type)) + if ((ret = vkd3d_u32_compare(range_a->type, range_b->type))) return ret; - if ((ret = range_a->offset - range_b->offset)) + if ((ret = vkd3d_u32_compare(range_a->offset, range_b->offset))) return ret; return (range_a->descriptor_count == UINT_MAX) - (range_b->descriptor_count == UINT_MAX); -- 2.20.1

1 0

[PATCH] wusa: Use CRT allocation functions.
by Hans Leidekker March 1, 2022

March 1, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/wusa/main.c | 72 ++++++++++++++++++++-------------------- programs/wusa/manifest.c | 52 ++++++++++++++--------------- programs/wusa/wusa.h | 35 +++---------------- 3 files changed, 66 insertions(+), 93 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index b3ab6ac523c..74dfeb68d5f 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -54,12 +54,12 @@ struct installer_state static void * CDECL cabinet_alloc(ULONG cb) { - return heap_alloc(cb); + return malloc(cb); } static void CDECL cabinet_free(void *pv) { - heap_free(pv); + free(pv); } static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) @@ -134,7 +134,7 @@ static WCHAR *path_combine(const WCHAR *path, const WCHAR *filename) if (!path || !filename) return NULL; length = lstrlenW(path) + lstrlenW(filename) + 2; - if (!(result = heap_alloc(length * sizeof(WCHAR)))) return NULL; + if (!(result = malloc(length * sizeof(WCHAR)))) return NULL; lstrcpyW(result, path); if (result[0] && result[lstrlenW(result) - 1] != '\\') lstrcatW(result, L"\\"); @@ -146,7 +146,7 @@ static WCHAR *get_uncompressed_path(PFDINOTIFICATION pfdin) { WCHAR *file = strdupAtoW(pfdin->psz1); WCHAR *path = path_combine(pfdin->pv, file); - heap_free(file); + free(file); return path; } @@ -187,7 +187,7 @@ static BOOL create_parent_directory(const WCHAR *filename) ret = create_directory(path); done: - heap_free(path); + free(path); return ret; } @@ -209,7 +209,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfd handle = CreateFileW(file, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs, NULL); } - heap_free(file); + free(file); return (handle != INVALID_HANDLE_VALUE) ? (INT_PTR)handle : -1; } @@ -257,7 +257,7 @@ static BOOL extract_cabinet(const WCHAR *filename, const WCHAR *destination) if ((filenameA = strdupWtoA(filename))) { ret = FDICopy(hfdi, filenameA, NULL, 0, cabinet_notify, NULL, (void *)destination); - heap_free(filenameA); + free(filenameA); } FDIDestroy(hfdi); @@ -271,18 +271,18 @@ static const WCHAR *create_temp_directory(struct installer_state *state) WCHAR tmp[MAX_PATH]; if (!GetTempPathW(ARRAY_SIZE(tmp), tmp)) return NULL; - if (!(entry = heap_alloc(sizeof(*entry)))) return NULL; - if (!(entry->path = heap_alloc((MAX_PATH + 20) * sizeof(WCHAR)))) + if (!(entry = malloc(sizeof(*entry)))) return NULL; + if (!(entry->path = malloc((MAX_PATH + 20) * sizeof(WCHAR)))) { - heap_free(entry); + free(entry); return NULL; } for (;;) { if (!GetTempFileNameW(tmp, L"msu", ++id, entry->path)) { - heap_free(entry->path); - heap_free(entry); + free(entry->path); + free(entry); return NULL; } if (CreateDirectoryW(entry->path, NULL)) break; @@ -300,7 +300,7 @@ static BOOL delete_directory(const WCHAR *path) if (!(full_path = path_combine(path, L"*"))) return FALSE; search = FindFirstFileW(full_path, &data); - heap_free(full_path); + free(full_path); if (search != INVALID_HANDLE_VALUE) { @@ -313,7 +313,7 @@ static BOOL delete_directory(const WCHAR *path) delete_directory(full_path); else DeleteFileW(full_path); - heap_free(full_path); + free(full_path); } while (FindNextFileW(search, &data)); FindClose(search); @@ -332,8 +332,8 @@ static void installer_cleanup(struct installer_state *state) { list_remove(&tempdir->entry); delete_directory(tempdir->path); - heap_free(tempdir->path); - heap_free(tempdir); + free(tempdir->path); + free(tempdir); } LIST_FOR_EACH_ENTRY_SAFE(assembly, assembly2, &state->assemblies, struct assembly_entry, entry) { @@ -377,11 +377,11 @@ static BOOL load_assemblies_from_cab(const WCHAR *filename, struct installer_sta FIXME("Cabinet uses proprietary msdelta file compression which is not (yet) supported\n"); FIXME("Installation of msu file will most likely fail\n"); } - heap_free(path); + free(path); if (!(path = path_combine(temp_path, L"*"))) return FALSE; search = FindFirstFileW(path, &data); - heap_free(path); + free(path); if (search != INVALID_HANDLE_VALUE) { @@ -393,7 +393,7 @@ static BOOL load_assemblies_from_cab(const WCHAR *filename, struct installer_sta if (!(path = path_combine(temp_path, data.cFileName))) continue; if ((assembly = load_manifest(path))) list_add_tail(&state->assemblies, &assembly->entry); - heap_free(path); + free(path); } while (FindNextFileW(search, &data)); FindClose(search); @@ -439,13 +439,13 @@ static BOOL strbuf_init(struct strbuf *buf) { buf->pos = 0; buf->len = 64; - buf->buf = heap_alloc(buf->len * sizeof(WCHAR)); + buf->buf = malloc(buf->len * sizeof(WCHAR)); return buf->buf != NULL; } static void strbuf_free(struct strbuf *buf) { - heap_free(buf->buf); + free(buf->buf); buf->buf = NULL; } @@ -461,7 +461,7 @@ static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) if (buf->pos + len + 1 > buf->len) { new_len = max(buf->pos + len + 1, buf->len * 2); - new_buf = heap_realloc(buf->buf, new_len * sizeof(WCHAR)); + new_buf = realloc(buf->buf, new_len * sizeof(WCHAR)); if (!new_buf) { strbuf_free(buf); @@ -548,10 +548,10 @@ static WCHAR *expand_expression(struct assembly_entry *assembly, const WCHAR *ex if (!(key = strdupWn(pos, next - pos))) goto error; value = lookup_expression(assembly, key); - heap_free(key); + free(key); if (!value) goto error; strbuf_append(&buf, value, ~0U); - heap_free(value); + free(value); } strbuf_append(&buf, pos, ~0U); @@ -597,9 +597,9 @@ static BOOL install_files_copy(struct assembly_entry *assembly, const WCHAR *sou } error: - heap_free(target_path); - heap_free(target); - heap_free(source); + free(target_path); + free(target); + free(source); return ret; } @@ -620,7 +620,7 @@ static BOOL install_files(struct assembly_entry *assembly, BOOL dryrun) if (!(ret = install_files_copy(assembly, source_path, fileop, dryrun))) break; } - heap_free(source_path); + free(source_path); return ret; } @@ -667,7 +667,7 @@ static BOOL install_registry_string(struct assembly_entry *assembly, HKEY key, s ret = FALSE; } - heap_free(value); + free(value); return ret; } @@ -725,7 +725,7 @@ static BOOL install_registry_multisz(struct assembly_entry *assembly, HKEY key, ret = FALSE; } - heap_free(value); + free(value); return ret; } @@ -755,7 +755,7 @@ static BYTE *parse_hex(const WCHAR *input, DWORD *size) if (length & 1) return NULL; length >>= 1; - if (!(output = heap_alloc(length))) return NULL; + if (!(output = malloc(length))) return NULL; for (p = output; *input; input += 2) { number[0] = input[0]; @@ -781,7 +781,7 @@ static BOOL install_registry_binary(struct assembly_entry *assembly, HKEY key, s ret = FALSE; } - heap_free(value); + free(value); return ret; } @@ -954,7 +954,7 @@ static BOOL install_msu(const WCHAR *filename, struct installer_state *state) /* load all manifests from contained cabinet archives */ if (!(path = path_combine(temp_path, L"*.cab"))) goto done; search = FindFirstFileW(path, &data); - heap_free(path); + free(path); if (search != INVALID_HANDLE_VALUE) { @@ -965,7 +965,7 @@ static BOOL install_msu(const WCHAR *filename, struct installer_state *state) if (!(path = path_combine(temp_path, data.cFileName))) continue; if (!load_assemblies_from_cab(path, state)) ERR("Failed to load all manifests from %s, ignoring\n", debugstr_w(path)); - heap_free(path); + free(path); } while (FindNextFileW(search, &data)); FindClose(search); @@ -974,7 +974,7 @@ static BOOL install_msu(const WCHAR *filename, struct installer_state *state) /* load all update descriptions */ if (!(path = path_combine(temp_path, L"*.xml"))) goto done; search = FindFirstFileW(path, &data); - heap_free(path); + free(path); if (search != INVALID_HANDLE_VALUE) { @@ -984,7 +984,7 @@ static BOOL install_msu(const WCHAR *filename, struct installer_state *state) if (!(path = path_combine(temp_path, data.cFileName))) continue; if (!load_update(path, &state->updates)) ERR("Failed to load all updates from %s, ignoring\n", debugstr_w(path)); - heap_free(path); + free(path); } while (FindNextFileW(search, &data)); FindClose(search); diff --git a/programs/wusa/manifest.c b/programs/wusa/manifest.c index e80c11998ce..efd2845c7e2 100644 --- a/programs/wusa/manifest.c +++ b/programs/wusa/manifest.c @@ -32,28 +32,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(wusa); static struct dependency_entry *alloc_dependency(void) { - struct dependency_entry *entry = heap_alloc_zero(sizeof(*entry)); + struct dependency_entry *entry = calloc(1, sizeof(*entry)); if (!entry) ERR("Failed to allocate memory for dependency\n"); return entry; } static struct fileop_entry *alloc_fileop(void) { - struct fileop_entry *entry = heap_alloc_zero(sizeof(*entry)); + struct fileop_entry *entry = calloc(1, sizeof(*entry)); if (!entry) ERR("Failed to allocate memory for fileop\n"); return entry; } static struct registrykv_entry *alloc_registrykv(void) { - struct registrykv_entry *entry = heap_alloc_zero(sizeof(*entry)); + struct registrykv_entry *entry = calloc(1, sizeof(*entry)); if (!entry) ERR("Failed to allocate memory for registrykv\n"); return entry; } static struct registryop_entry *alloc_registryop(void) { - struct registryop_entry *entry = heap_alloc_zero(sizeof(*entry)); + struct registryop_entry *entry = calloc(1, sizeof(*entry)); if (!entry) ERR("Failed to allocate memory for registryop\n"); else { @@ -64,7 +64,7 @@ static struct registryop_entry *alloc_registryop(void) static struct assembly_entry *alloc_assembly(void) { - struct assembly_entry *entry = heap_alloc_zero(sizeof(*entry)); + struct assembly_entry *entry = calloc(1, sizeof(*entry)); if (!entry) ERR("Failed to allocate memory for assembly\n"); else { @@ -77,39 +77,39 @@ static struct assembly_entry *alloc_assembly(void) static void clear_identity(struct assembly_identity *entry) { - heap_free(entry->name); - heap_free(entry->version); - heap_free(entry->architecture); - heap_free(entry->language); - heap_free(entry->pubkey_token); + free(entry->name); + free(entry->version); + free(entry->architecture); + free(entry->language); + free(entry->pubkey_token); } void free_dependency(struct dependency_entry *entry) { clear_identity(&entry->identity); - heap_free(entry); + free(entry); } static void free_fileop(struct fileop_entry *entry) { - heap_free(entry->source); - heap_free(entry->target); - heap_free(entry); + free(entry->source); + free(entry->target); + free(entry); } static void free_registrykv(struct registrykv_entry *entry) { - heap_free(entry->name); - heap_free(entry->value_type); - heap_free(entry->value); - heap_free(entry); + free(entry->name); + free(entry->value_type); + free(entry->value); + free(entry); } static void free_registryop(struct registryop_entry *entry) { struct registrykv_entry *keyvalue, *keyvalue2; - heap_free(entry->key); + free(entry->key); LIST_FOR_EACH_ENTRY_SAFE(keyvalue, keyvalue2, &entry->keyvalues, struct registrykv_entry, entry) { @@ -117,7 +117,7 @@ static void free_registryop(struct registryop_entry *entry) free_registrykv(keyvalue); } - heap_free(entry); + free(entry); } void free_assembly(struct assembly_entry *entry) @@ -126,8 +126,8 @@ void free_assembly(struct assembly_entry *entry) struct fileop_entry *fileop, *fileop2; struct registryop_entry *registryop, *registryop2; - heap_free(entry->filename); - heap_free(entry->displayname); + free(entry->filename); + free(entry->displayname); clear_identity(&entry->identity); LIST_FOR_EACH_ENTRY_SAFE(dependency, dependency2, &entry->dependencies, struct dependency_entry, entry) @@ -146,7 +146,7 @@ void free_assembly(struct assembly_entry *entry) free_registryop(registryop); } - heap_free(entry); + free(entry); } static WCHAR *get_xml_attribute(IXMLDOMElement *root, const WCHAR *name) @@ -304,7 +304,7 @@ static BOOL read_dependent_assembly(IXMLDOMElement *root, struct assembly_identi error: if (child) IXMLDOMElement_Release(child); - heap_free(dependency_type); + free(dependency_type); return ret; } @@ -498,7 +498,7 @@ static BOOL read_registry_keys(IXMLDOMElement *child, WCHAR *tagname, void *cont free_registryop(entry); } - heap_free(keyname); + free(keyname); return FALSE; } @@ -622,7 +622,7 @@ static BOOL read_servicing(IXMLDOMElement *child, WCHAR *tagname, void *context) else FIXME("action %s not supported\n", debugstr_w(action)); - heap_free(action); + free(action); return ret; } diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h index dcd784e7649..da679a27f07 100644 --- a/programs/wusa/wusa.h +++ b/programs/wusa/wusa.h @@ -78,29 +78,6 @@ void free_dependency(struct dependency_entry *entry) DECLSPEC_HIDDEN; struct assembly_entry *load_manifest(const WCHAR *filename) DECLSPEC_HIDDEN; BOOL load_update(const WCHAR *filename, struct list *update_list) DECLSPEC_HIDDEN; -static void *heap_alloc(size_t len) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static void *heap_alloc_zero(size_t len) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static void *heap_realloc(void *mem, size_t len) __WINE_ALLOC_SIZE(2); -static inline void *heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline char *strdupWtoA(const WCHAR *str) { char *ret = NULL; @@ -108,8 +85,7 @@ static inline char *strdupWtoA(const WCHAR *str) if (!str) return ret; len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); - if ((ret = heap_alloc(len))) - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len, NULL, NULL); + if ((ret = malloc(len))) WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len, NULL, NULL); return ret; } @@ -120,8 +96,7 @@ static inline WCHAR *strdupAtoW(const char *str) if (!str) return ret; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - if ((ret = heap_alloc(len * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + if ((ret = malloc(len * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); return ret; } @@ -129,8 +104,7 @@ static inline WCHAR *strdupW(const WCHAR *str) { WCHAR *ret; if (!str) return NULL; - ret = heap_alloc((lstrlenW(str) + 1) * sizeof(WCHAR)); - if (ret) lstrcpyW(ret, str); + if ((ret = malloc((lstrlenW(str) + 1) * sizeof(WCHAR)))) lstrcpyW(ret, str); return ret; } @@ -138,8 +112,7 @@ static inline WCHAR *strdupWn(const WCHAR *str, DWORD len) { WCHAR *ret; if (!str) return NULL; - ret = heap_alloc((len + 1) * sizeof(WCHAR)); - if (ret) + if ((ret = malloc((len + 1) * sizeof(WCHAR)))) { memcpy(ret, str, len * sizeof(WCHAR)); ret[len] = 0; -- 2.30.2

1 0

[PATCH 1/5] include: Add Windows.Gaming.Input.IGameControllerInputSink interface definition.
by Rémi Bernon March 1, 2022

March 1, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- The Xusb interfaces aren't really required as I don't intend to use them in the implementation, but I'll use the IIDs to check how the providers are supposed to be implemented. include/windows.gaming.input.custom.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index fe20ce3d0cc..93e5866a324 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -34,6 +34,7 @@ namespace Windows.Gaming.Input.Custom { typedef enum XusbDeviceSubtype XusbDeviceSubtype; typedef enum XusbDeviceType XusbDeviceType; typedef struct GameControllerVersionInfo GameControllerVersionInfo; + interface IGameControllerInputSink; interface IGameControllerProvider; interface ICustomGameControllerFactory; interface IGameControllerFactoryManagerStatics; @@ -72,6 +73,16 @@ namespace Windows.Gaming.Input.Custom { UINT16 Revision; }; + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + uuid(1ff6f922-c640-4c78-a820-9a715c558bcb) + ] + interface IGameControllerInputSink : IInspectable + { + HRESULT OnInputResumed([in] UINT64 timestamp); + HRESULT OnInputSuspended([in] UINT64 timestamp); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), uuid(e6d73982-2996-4559-b16c-3e57d46e58d6) -- 2.34.1

1 4

[PATCH 1/5] include: Add some helpers to define IInspectable forwarded methods.
by Rémi Bernon March 1, 2022

March 1, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This should greatly reduce the burden of implementing WinRT classes. None of the WinRT interfaces are using inheritance, and classes very often implement several interfaces, all deriving from IInspectable, and even if a v2 interface only adds a single method, it doesn't derive from the v1, and instead requires to reimplement the IInspectable methods and forward them to the default interface. In addition, it looks like they also used COM aggregation extensively, and in these cases the forward has to be done to an outer IInspectable pointer. include/inspectable.idl | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/inspectable.idl b/include/inspectable.idl index 847d21da608..8b233e3da94 100644 --- a/include/inspectable.idl +++ b/include/inspectable.idl @@ -39,3 +39,47 @@ interface IInspectable : IUnknown } typedef [unique] IInspectable *LPINSPECTABLE; + +cpp_quote("#ifdef __WINESRC__") +cpp_quote("#define DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \\") +cpp_quote(" static inline impl_type *impl_from( iface_type *iface ) \\") +cpp_quote(" { \\") +cpp_quote(" return CONTAINING_RECORD( iface, impl_type, iface_mem ); \\") +cpp_quote(" } \\") +cpp_quote(" static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \\") +cpp_quote(" } \\") +cpp_quote(" static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_AddRef( (IInspectable *)(expr) ); \\") +cpp_quote(" } \\") +cpp_quote(" static ULONG WINAPI pfx##_Release( iface_type *iface ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_Release( (IInspectable *)(expr) ); \\") +cpp_quote(" } \\") +cpp_quote(" static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \\") +cpp_quote(" } \\") +cpp_quote(" static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \\") +cpp_quote(" } \\") +cpp_quote(" static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \\") +cpp_quote(" }") +cpp_quote("#define DEFINE_IINSPECTABLE_OUTER_PFX( pfx, impl_pfx, iface_type, impl_type, outer ) \\") +cpp_quote(" DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_pfx##_from_##iface_type, \\") +cpp_quote(" iface_type##_iface, impl_pfx##_from_##iface_type( iface )->outer )") +cpp_quote("#define DEFINE_IINSPECTABLE_OUTER( pfx, iface_type, impl_type, outer ) \\") +cpp_quote(" DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_from_##iface_type, \\") +cpp_quote(" iface_type##_iface, impl_from_##iface_type( iface )->outer )") +cpp_quote("#define DEFINE_IINSPECTABLE_PFX( pfx, impl_pfx, iface_type, impl_type, member ) \\") +cpp_quote(" DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_pfx##_from_##iface_type, \\") +cpp_quote(" iface_type##_iface, &impl_pfx##_from_##iface_type( iface )->member )") +cpp_quote("#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, member ) \\") +cpp_quote(" DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_from_##iface_type, \\") +cpp_quote(" iface_type##_iface, &impl_from_##iface_type( iface )->member )") +cpp_quote("#endif") -- 2.34.1

1 4

[PATCH v2 2/2] winex11.drv: Support _NET_WM_FULLSCREEN_MONITORS.
by Zhiyi Zhang March 1, 2022

March 1, 2022

Support _NET_WM_FULLSCREEN_MONITORS for fullscreen windows spanning multiple monitors. This property is used to hint the window managers which monitors a fullscreen window should cover. Window managers make a fullscreen window spanning multiple monitors cover only the primary monitor when this property is absent. Fix Project Cars 2/3 incorrect game window size when the triple-screen mode is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 3 +- dlls/winex11.drv/window.c | 38 ++++++++++++++++ dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 81 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrandr.c | 5 +++ 6 files changed, 129 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 63c18cd9948..7642a84ef1e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9295,7 +9295,8 @@ static void test_fullscreen(void) flush_events(TRUE); GetWindowRect(hwnd, &rc); - todo_wine + /* FVWM used by TestBot doesn't support _NET_WM_FULLSCREEN_MONITORS */ + todo_wine_if(!EqualRect(&rc, &virtual_rect)) ok(EqualRect(&rc, &virtual_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 36fb41ac710..b6b3507e88f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -965,6 +965,42 @@ void update_user_time( Time time ) XUnlockDisplay( gdi_display ); } +/* Update _NET_WM_FULLSCREEN_MONITORS when _NET_WM_STATE_FULLSCREEN is set to support fullscreen + * windows spanning multiple monitors */ +static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data ) +{ + long monitors[4] = {0}; + XEvent xev; + + if (!(data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN)) || is_virtual_desktop()) + return; + + /* No need to set _NET_WM_FULLSCREEN_MONITORS when it covers only the primary monitor */ + xinerama_get_fullscreen_monitors( &data->whole_rect, monitors ); + if (monitors[0] == 0 && monitors[1] == 0 && monitors[2] == 0 && monitors[3] == 0) + return; + + if (!data->mapped) + { + XChangeProperty( data->display, data->whole_window, x11drv_atom(_NET_WM_FULLSCREEN_MONITORS), + XA_CARDINAL, 32, PropModeReplace, (unsigned char *)monitors, 4 ); + } + else + { + xev.xclient.type = ClientMessage; + xev.xclient.window = data->whole_window; + xev.xclient.message_type = x11drv_atom(_NET_WM_FULLSCREEN_MONITORS); + xev.xclient.serial = 0; + xev.xclient.display = data->display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + xev.xclient.data.l[4] = 1; + memcpy( xev.xclient.data.l, monitors, sizeof(monitors) ); + XSendEvent( data->display, root_window, False, + SubstructureRedirectMask | SubstructureNotifyMask, &xev ); + } +} + /*********************************************************************** * update_net_wm_states */ @@ -1045,6 +1081,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) } } data->net_wm_state = new_state; + update_net_wm_fullscreen_monitors( data ); } /*********************************************************************** @@ -1137,6 +1174,7 @@ static void map_window( HWND hwnd, DWORD new_style ) data->mapped = TRUE; data->iconic = (new_style & WS_MINIMIZE) != 0; + update_net_wm_fullscreen_monitors( data ); } release_win_data( data ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f389f3e0836..363435a2cf6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -490,6 +490,7 @@ enum x11drv_atoms XATOM__NET_SYSTEM_TRAY_OPCODE, XATOM__NET_SYSTEM_TRAY_S0, XATOM__NET_SYSTEM_TRAY_VISUAL, + XATOM__NET_WM_FULLSCREEN_MONITORS, XATOM__NET_WM_ICON, XATOM__NET_WM_MOVERESIZE, XATOM__NET_WM_NAME, @@ -704,6 +705,7 @@ extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_work_area( const RECT *monitor_rect ) DECLSPEC_HIDDEN; +extern void xinerama_get_fullscreen_monitors( const RECT *rect, long *indices ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; #define DEPTH_COUNT 3 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 32beb84a009..7896afcb780 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -162,6 +162,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_SYSTEM_TRAY_OPCODE", "_NET_SYSTEM_TRAY_S0", "_NET_SYSTEM_TRAY_VISUAL", + "_NET_WM_FULLSCREEN_MONITORS", "_NET_WM_ICON", "_NET_WM_MOVERESIZE", "_NET_WM_NAME", diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index b707574a0ab..568044e4230 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -42,6 +42,14 @@ static MONITORINFOEXW default_monitor = { '\\','\\','.','\\','D','I','S','P','L','A','Y','1',0 } /* szDevice */ }; +static CRITICAL_SECTION xinerama_section; +static CRITICAL_SECTION_DEBUG xinerama_critsect_debug = +{ + 0, 0, &xinerama_section, + {&xinerama_critsect_debug.ProcessLocksList, &xinerama_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": xinerama_section")} +}; +static CRITICAL_SECTION xinerama_section = {&xinerama_critsect_debug, -1, 0, 0, 0, 0}; static MONITORINFOEXW *monitors; static int nb_monitors; @@ -119,6 +127,64 @@ static inline int query_screens(void) #endif /* SONAME_LIBXINERAMA */ +/* Get xinerama monitor indices required for _NET_WM_FULLSCREEN_MONITORS */ +void xinerama_get_fullscreen_monitors( const RECT *rect, long *indices ) +{ + RECT window_rect, intersect_rect, monitor_rect; + POINT offset; + INT i; + + EnterCriticalSection( &xinerama_section ); + if (nb_monitors == 1) + { + memset( indices, 0, sizeof(*indices) * 4 ); + goto done; + } + + /* Convert window rectangle to root coordinates */ + offset = virtual_screen_to_root( rect->left, rect->top ); + window_rect.left = offset.x; + window_rect.top = offset.y; + window_rect.right = window_rect.left + rect->right - rect->left; + window_rect.bottom = window_rect.top + rect->bottom - rect->top; + + /* Compare to xinerama monitor rectangles in root coordinates */ + offset.x = INT_MAX; + offset.y = INT_MAX; + for (i = 0; i < nb_monitors; ++i) + { + offset.x = min( offset.x, monitors[i].rcMonitor.left ); + offset.y = min( offset.y, monitors[i].rcMonitor.top ); + } + + indices[0] = -1; + indices[1] = -1; + indices[2] = -1; + indices[3] = -1; + for (i = 0; i < nb_monitors; ++i) + { + SetRect( &monitor_rect, monitors[i].rcMonitor.left - offset.x, + monitors[i].rcMonitor.top - offset.y, monitors[i].rcMonitor.right - offset.x, + monitors[i].rcMonitor.bottom - offset.y ); + IntersectRect( &intersect_rect, &window_rect, &monitor_rect ); + if (EqualRect( &intersect_rect, &monitor_rect )) + { + if (indices[0] == -1 || monitors[i].rcMonitor.top < monitors[indices[0]].rcMonitor.top) + indices[0] = i; + if (indices[1] == -1 || monitors[i].rcMonitor.bottom > monitors[indices[1]].rcMonitor.bottom) + indices[1] = i; + if (indices[2] == -1 || monitors[i].rcMonitor.left < monitors[indices[2]].rcMonitor.left) + indices[2] = i; + if (indices[3] == -1 || monitors[i].rcMonitor.right > monitors[indices[3]].rcMonitor.right) + indices[3] = i; + } + } + +done: + LeaveCriticalSection( &xinerama_section ); + TRACE( "fullsceen monitors: %ld,%ld,%ld,%ld.\n", indices[0], indices[1], indices[2], indices[3] ); +} + static BOOL xinerama_get_gpus( struct gdi_gpu **new_gpus, int *count ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; @@ -154,9 +220,13 @@ static BOOL xinerama_get_adapters( ULONG_PTR gpu_id, struct gdi_adapter **new_ad return FALSE; /* Being lazy, actual adapter count may be less */ + EnterCriticalSection( &xinerama_section ); adapters = heap_calloc( nb_monitors, sizeof(*adapters) ); if (!adapters) + { + LeaveCriticalSection( &xinerama_section ); return FALSE; + } primary_index = primary_monitor; if (primary_index >= nb_monitors) @@ -201,6 +271,7 @@ static BOOL xinerama_get_adapters( ULONG_PTR gpu_id, struct gdi_adapter **new_ad *new_adapters = adapters; *count = index; + LeaveCriticalSection( &xinerama_section ); return TRUE; } @@ -220,6 +291,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne INT index = 0; INT i; + EnterCriticalSection( &xinerama_section ); + for (i = first; i < nb_monitors; i++) { if (i == first @@ -230,7 +303,10 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne monitor = heap_calloc( monitor_count, sizeof(*monitor) ); if (!monitor) + { + LeaveCriticalSection( &xinerama_section ); return FALSE; + } for (i = first; i < nb_monitors; i++) { @@ -254,6 +330,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne *new_monitors = monitor; *count = monitor_count; + LeaveCriticalSection( &xinerama_section ); return TRUE; } @@ -272,6 +349,8 @@ void xinerama_init( unsigned int width, unsigned int height ) if (is_virtual_desktop()) return; + EnterCriticalSection( &xinerama_section ); + SetRect( &rect, 0, 0, width, height ); if (!query_screens()) { @@ -295,6 +374,8 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + LeaveCriticalSection( &xinerama_section ); + handler.name = "Xinerama"; handler.priority = 100; handler.get_gpus = xinerama_get_gpus; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fb7a4405a1e..71b76bda0fb 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1181,6 +1181,8 @@ static void xrandr14_free_monitors( struct gdi_monitor *monitors, int count ) static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) { + RECT rect; + xrandr14_invalidate_current_mode_cache(); if (hwnd == GetDesktopWindow() && GetWindowThreadProcessId( hwnd, NULL ) == GetCurrentThreadId()) { @@ -1191,6 +1193,9 @@ static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) init_registry_display_settings(); } + /* Update xinerama monitors for xinerama_get_fullscreen_monitors() */ + rect = get_host_primary_monitor_rect(); + xinerama_init( rect.right - rect.left, rect.bottom - rect.top ); return FALSE; } -- 2.32.0

2 1

[PATCH v2 1/2] user32/tests: Test creating a fullscreen window spanning multiple monitors.
by Zhiyi Zhang March 1, 2022

March 1, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 227889 and 227890. Fix a test failure for 2/2. dlls/user32/tests/win.c | 44 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d6087873f21..63c18cd9948 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9126,12 +9126,12 @@ static void test_fullscreen(void) static const DWORD t_ex_style[] = { 0, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW }; + RECT rc, virtual_rect, expected_rect; WNDCLASSA cls; int timeout; HWND hwnd; int i, j; POINT pt; - RECT rc; HMONITOR hmon; LRESULT ret; @@ -9278,6 +9278,48 @@ static void test_fullscreen(void) DestroyWindow(hwnd); UnregisterClassA("fullscreen_class", GetModuleHandleA(NULL)); + + /* Test fullscreen windows spanning multiple monitors */ + if (GetSystemMetrics(SM_CMONITORS) > 1) + { + /* Test windows covering all monitors */ + virtual_rect.left = GetSystemMetrics(SM_XVIRTUALSCREEN); + virtual_rect.top = GetSystemMetrics(SM_YVIRTUALSCREEN); + virtual_rect.right = virtual_rect.left + GetSystemMetrics(SM_CXVIRTUALSCREEN); + virtual_rect.bottom = virtual_rect.top + GetSystemMetrics(SM_CYVIRTUALSCREEN); + + hwnd = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, virtual_rect.left, + virtual_rect.top, virtual_rect.right - virtual_rect.left, + virtual_rect.bottom - virtual_rect.top, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed, error %#x.\n", GetLastError()); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rc, &virtual_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&rc)); + DestroyWindow(hwnd); + + /* Test windows covering one monitor and 1 pixel larger on available sides */ + expected_rect = mi.rcMonitor; + InflateRect(&expected_rect, 1, 1); + IntersectRect(&expected_rect, &expected_rect, &virtual_rect); + hwnd = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, expected_rect.left, + expected_rect.top, expected_rect.right - expected_rect.left, + expected_rect.bottom - expected_rect.top, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed, error %#x.\n", GetLastError()); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rc, &expected_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&expected_rect), wine_dbgstr_rect(&rc)); + DestroyWindow(hwnd); + } + else + { + skip("This test requires at least two monitors.\n"); + } } static BOOL test_thick_child_got_minmax; -- 2.32.0

2 1

[PATCH 2/2] uxtheme: Search parts of any state in IsThemePartDefined().
by Zhiyi Zhang March 1, 2022

March 1, 2022

Tests show that IsThemePartDefined() doesn't use state ID to search parts. If a part of any state is present, the part is considered as defined. For example, disabled state of part EditText of class Edit is present in theme files but there is no default state for part EditText. So IsThemePartDefined(theme, EP_EDITTEXT, 0) failed previously and it should succeed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52581 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 30 ++++++++++++++++++++++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/system.c | 6 +++--- dlls/uxtheme/tests/system.c | 13 +++---------- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 7d3ee72efe8..9e5a79a1c69 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -452,6 +452,36 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST return cur; } +/*********************************************************************** + * MSSTYLES_FindPart + * + * Find a part + * + * PARAMS + * tc Class to search + * iPartId Part ID to find + * + * RETURNS + * The part found, or NULL + */ +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) +{ + PTHEME_PARTSTATE cur = tc->partstate; + + while (cur) + { + if (cur->iPartId == iPartId) + return cur; + + cur = cur->next; + } + + if (tc->overrides) + return MSSTYLES_FindPart(tc->overrides, iPartId); + + return NULL; +} + /*********************************************************************** * MSSTYLES_FindPartState * diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 12292cefae4..67f81315d7a 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -95,6 +95,7 @@ BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPE BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId) DECLSPEC_HIDDEN; PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) DECLSPEC_HIDDEN; UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) DECLSPEC_HIDDEN; +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) DECLSPEC_HIDDEN; PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 8333d6b99ce..908451f0fe8 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -809,9 +809,9 @@ BOOL WINAPI IsThemePartDefined(HTHEME hTheme, int iPartId, int iStateId) SetLastError(E_HANDLE); return FALSE; } - if(MSSTYLES_FindPartState(hTheme, iPartId, iStateId, NULL)) - return TRUE; - return FALSE; + + SetLastError(NO_ERROR); + return !iStateId && MSSTYLES_FindPart(hTheme, iPartId); } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 59631f01fe9..dd118f5ab37 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -300,7 +300,6 @@ static void test_IsThemePartDefined(void) int state; BOOL defined; DWORD error; - BOOL todo; } tests[] = { @@ -311,7 +310,7 @@ static void test_IsThemePartDefined(void) {L"Button", BP_PUSHBUTTON, PBS_NORMAL, FALSE, NO_ERROR}, {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, FALSE, NO_ERROR}, {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, FALSE, NO_ERROR}, - {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR, TRUE}, + {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR}, {L"Edit", EP_EDITTEXT, ETS_NORMAL, FALSE, NO_ERROR}, {L"Edit", EP_EDITTEXT, ETS_FOCUSED, FALSE, NO_ERROR}, }; @@ -337,9 +336,7 @@ static void test_IsThemePartDefined(void) SetLastError(0xdeadbeef); ret = IsThemePartDefined(theme, tests[i].part, tests[i].state); error = GetLastError(); - todo_wine_if(tests[i].todo) ok(ret == tests[i].defined, "Expected %d.\n", tests[i].defined); - todo_wine_if(error == 0xdeadbeef && tests[i].error == NO_ERROR) ok(error == tests[i].error, "Expected %#x, got %#x.\n", tests[i].error, error); if (theme) @@ -589,12 +586,8 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); bTPDefined = IsThemePartDefined(hTheme, 0 , 0); todo_wine - { - ok( bTPDefined == FALSE, "Expected FALSE\n"); - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); - } + ok( bTPDefined == FALSE, "Expected FALSE\n" ); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); DestroyWindow(hWnd); } -- 2.32.0

1 0