March 2021 - Wine-devel - list.winehq.org

[PATCH] ntdll: Fix off-by-one error when resolving forwarded ordinals.
by Mark Harmstone 24 Mar '21

24 Mar '21

The value after the hash is 1-based, but find_ordinal_export expects a 0-based value - compare with other calls to this function elsewhere in the file. Ordinal forwards are pretty rare, which is presumably why it hasn't been spotted before now. Signed-off-by: Mark Harmstone <mark(a)harmstone.com> --- dlls/ntdll/loader.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1f8c67e6ba1..3a90d0b0856 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -642,9 +642,11 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) { const char *name = end + 1; - if (*name == '#') /* ordinal */ - proc = find_ordinal_export( wm->ldr.DllBase, exports, exp_size, atoi(name+1), load_path ); - else + + if (*name == '#') { /* ordinal */ + proc = find_ordinal_export( wm->ldr.DllBase, exports, exp_size, + atoi(name+1) - exports->Base, load_path ); + } else proc = find_named_export( wm->ldr.DllBase, exports, exp_size, name, -1, load_path ); } -- 2.26.3

1 0

[PATCH 1/2] widl: Clarify declaration type names vs (reference) type names.
by Rémi Bernon 24 Mar '21

24 Mar '21

Declaration type names prefer unqualified names whereas reference type names prefer fully qualified names. This also skips the enum / struct / union type prefix in WinRT mode, when writing C++ interfaces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This also fixes issues with C++ code, when some interface uses a type from another namespace. Currently widl isn't using qualified names for C++ interfaces although it should. It's not as clean as I'd like it to be, but I think write_type_left is used in too many places and in too many different contexts to have a clean fix without undergoing a big refactor. The "winrt_mode && name_type == NAME_DEFAULT" condition in particular only matches C++ generated code in WinRT, because WinRT doesn't support most other cases where NAME_DEFAULT is used, but it's a pretty ugly. tools/widl/header.c | 18 +++++++++++------- tools/widl/typetree.c | 8 ++++---- tools/widl/typetree.h | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index a5e5d6c6fb3..89e0ddf436e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -342,11 +342,12 @@ static void write_pointer_left(FILE *h, type_t *ref) void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, int declonly, int write_callconv) { type_t *t = ds->type; - const char *name; + const char *decl_name, *name; char *args; if (!h) return; + decl_name = type_get_decl_name(t, name_type); name = type_get_name(t, name_type); if (ds->func_specifier & FUNCTION_SPECIFIER_INLINE) @@ -361,7 +362,7 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i case TYPE_ENUM: if (!declonly && !t->written) { assert(t->defined); - if (name) fprintf(h, "enum %s {\n", name); + if (decl_name) fprintf(h, "enum %s {\n", decl_name); else fprintf(h, "enum {\n"); t->written = TRUE; indentation++; @@ -369,13 +370,14 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i indent(h, -1); fprintf(h, "}"); } + else if (winrt_mode && name_type == NAME_DEFAULT && name) fprintf(h, "%s", name); else fprintf(h, "enum %s", name ? name : ""); break; case TYPE_STRUCT: case TYPE_ENCAPSULATED_UNION: if (!declonly && !t->written) { assert(t->defined); - if (name) fprintf(h, "struct %s {\n", name); + if (decl_name) fprintf(h, "struct %s {\n", decl_name); else fprintf(h, "struct {\n"); t->written = TRUE; indentation++; @@ -386,12 +388,13 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i indent(h, -1); fprintf(h, "}"); } + else if (winrt_mode && name_type == NAME_DEFAULT && name) fprintf(h, "%s", name); else fprintf(h, "struct %s", name ? name : ""); break; case TYPE_UNION: if (!declonly && !t->written) { assert(t->defined); - if (t->name) fprintf(h, "union %s {\n", t->name); + if (decl_name) fprintf(h, "union %s {\n", decl_name); else fprintf(h, "union {\n"); t->written = TRUE; indentation++; @@ -399,7 +402,8 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i indent(h, -1); fprintf(h, "}"); } - else fprintf(h, "union %s", t->name ? t->name : ""); + else if (winrt_mode && name_type == NAME_DEFAULT && name) fprintf(h, "%s", name); + else fprintf(h, "union %s", name ? name : ""); break; case TYPE_POINTER: { @@ -485,13 +489,13 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i case TYPE_INTERFACE: case TYPE_MODULE: case TYPE_COCLASS: - fprintf(h, "%s", type_get_qualified_name(t, name_type)); + fprintf(h, "%s", type_get_name(t, name_type)); break; case TYPE_RUNTIMECLASS: fprintf(h, "%s", type_get_name(type_runtimeclass_get_default_iface(t, TRUE), name_type)); break; case TYPE_DELEGATE: - fprintf(h, "%s", type_get_qualified_name(type_delegate_get_iface(t), name_type)); + fprintf(h, "%s", type_get_name(type_delegate_get_iface(t), name_type)); break; case TYPE_VOID: fprintf(h, "void"); diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index a4e1696d2af..c9daaaf8b4b 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -81,7 +81,7 @@ static const var_t *find_arg(const var_list_t *args, const char *name) return NULL; } -const char *type_get_name(const type_t *type, enum name_type name_type) +const char *type_get_decl_name(const type_t *type, enum name_type name_type) { switch(name_type) { case NAME_DEFAULT: @@ -94,13 +94,13 @@ const char *type_get_name(const type_t *type, enum name_type name_type) return NULL; } -const char *type_get_qualified_name(const type_t *type, enum name_type name_type) +const char *type_get_name(const type_t *type, enum name_type name_type) { switch(name_type) { case NAME_DEFAULT: - return type->qualified_name; + return type->qualified_name ? type->qualified_name : type->name; case NAME_C: - return type->c_name; + return type->c_name ? type->c_name : type->name; } assert(0); diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index db723817266..8f5e1ebdac5 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -77,8 +77,8 @@ type_t *type_parameterized_type_specialize_partial(type_t *type, typeref_list_t type_t *type_parameterized_type_specialize_declare(type_t *type, typeref_list_t *params); type_t *type_parameterized_type_specialize_define(type_t *type); int type_is_equal(const type_t *type1, const type_t *type2); +const char *type_get_decl_name(const type_t *type, enum name_type name_type); const char *type_get_name(const type_t *type, enum name_type name_type); -const char *type_get_qualified_name(const type_t *type, enum name_type name_type); char *gen_name(void); extern int is_attr(const attr_list_t *list, enum attr_type t); -- 2.30.2

1 2

[PATCH v2 1/6] reg: Use malloc() instead of heap_xalloc()
by Hugh McMaster 23 Mar '21

23 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/add.c | 9 ++++----- programs/reg/delete.c | 2 +- programs/reg/export.c | 21 ++++++++++----------- programs/reg/import.c | 17 ++++++++--------- programs/reg/query.c | 20 ++++++++++---------- programs/reg/reg.c | 20 ++++---------------- programs/reg/reg.h | 2 +- 7 files changed, 38 insertions(+), 53 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 054023df7ab..ef6f467db34 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -17,7 +17,6 @@ */ #include <errno.h> -#include <stdlib.h> #include "reg.h" static DWORD wchar_get_type(const WCHAR *type_name) @@ -64,7 +63,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW case REG_EXPAND_SZ: { *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); - out_data = heap_xalloc(*reg_count); + out_data = malloc(*reg_count); lstrcpyW((LPWSTR)out_data,data); break; } @@ -80,7 +79,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW break; } *reg_count = sizeof(DWORD); - out_data = heap_xalloc(*reg_count); + out_data = malloc(*reg_count); ((LPDWORD)out_data)[0] = val; break; } @@ -89,7 +88,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW BYTE hex0, hex1; int i = 0, destByteIndex = 0, datalen = lstrlenW(data); *reg_count = ((datalen + datalen % 2) / 2) * sizeof(BYTE); - out_data = heap_xalloc(*reg_count); + out_data = malloc(*reg_count); if(datalen % 2) { hex1 = hexchar_to_byte(data[i++]); @@ -116,7 +115,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW case REG_MULTI_SZ: { int i, destindex, len = lstrlenW(data); - WCHAR *buffer = heap_xalloc((len + 2) * sizeof(WCHAR)); + WCHAR *buffer = malloc((len + 2) * sizeof(WCHAR)); for (i = 0, destindex = 0; i < len; i++, destindex++) { diff --git a/programs/reg/delete.c b/programs/reg/delete.c index e0730e5c12f..ba3e7dbab7b 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -65,7 +65,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, WCHAR *value_name; LONG rc; - value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); + value_name = malloc(max_value_len * sizeof(WCHAR)); while (1) { diff --git a/programs/reg/export.c b/programs/reg/export.c index 8ce1945a693..741b2539931 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -17,7 +17,6 @@ */ #include <stdio.h> -#include <stdlib.h> #include "reg.h" static void write_file(HANDLE hFile, const WCHAR *str) @@ -42,7 +41,7 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) escape_count++; } - buf = heap_xalloc((str_len + escape_count + 1) * sizeof(WCHAR)); + buf = malloc((str_len + escape_count + 1) * sizeof(WCHAR)); for (i = 0, pos = 0; i < str_len; i++, pos++) { @@ -87,7 +86,7 @@ static size_t export_value_name(HANDLE hFile, WCHAR *name, size_t len) if (name && *name) { WCHAR *str = escape_string(name, len, &line_len); - WCHAR *buf = heap_xalloc((line_len + 4) * sizeof(WCHAR)); + WCHAR *buf = malloc((line_len + 4) * sizeof(WCHAR)); line_len = swprintf(buf, line_len + 4, quoted_fmt, str); write_file(hFile, buf); heap_free(buf); @@ -111,7 +110,7 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) if (size) len = size / sizeof(WCHAR) - 1; str = escape_string(data, len, &line_len); - *buf = heap_xalloc((line_len + 3) * sizeof(WCHAR)); + *buf = malloc((line_len + 3) * sizeof(WCHAR)); swprintf(*buf, line_len + 3, fmt, str); heap_free(str); } @@ -120,7 +119,7 @@ static void export_dword_data(WCHAR **buf, DWORD *data) { static const WCHAR fmt[] = {'d','w','o','r','d',':','%','0','8','x',0}; - *buf = heap_xalloc(15 * sizeof(WCHAR)); + *buf = malloc(15 * sizeof(WCHAR)); swprintf(*buf, 15, fmt, *data); } @@ -137,7 +136,7 @@ static size_t export_hex_data_type(HANDLE hFile, DWORD type) } else { - WCHAR *buf = heap_xalloc(15 * sizeof(WCHAR)); + WCHAR *buf = malloc(15 * sizeof(WCHAR)); line_len = swprintf(buf, 15, hexp_fmt, type); write_file(hFile, buf); heap_free(buf); @@ -160,7 +159,7 @@ static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, if (!size) return; num_commas = size - 1; - *buf = heap_xalloc(size * 3 * sizeof(WCHAR)); + *buf = malloc(size * 3 * sizeof(WCHAR)); for (i = 0, pos = 0; i < size; i++) { @@ -228,7 +227,7 @@ static void export_key_name(HANDLE hFile, WCHAR *name) static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; WCHAR *buf; - buf = heap_xalloc((lstrlenW(name) + 7) * sizeof(WCHAR)); + buf = malloc((lstrlenW(name) + 7) * sizeof(WCHAR)); swprintf(buf, lstrlenW(name) + 7, fmt, name); write_file(hFile, buf); heap_free(buf); @@ -247,8 +246,8 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) export_key_name(hFile, path); - value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); - data = heap_xalloc(max_data_bytes); + value_name = malloc(max_value_len * sizeof(WCHAR)); + data = malloc(max_data_bytes); i = 0; for (;;) @@ -281,7 +280,7 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) heap_free(data); heap_free(value_name); - subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); + subkey_name = malloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = lstrlenW(path); diff --git a/programs/reg/import.c b/programs/reg/import.c index 13e54e6a69a..a3a115ffb4f 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -18,7 +18,6 @@ #include <errno.h> #include <stdio.h> -#include <stdlib.h> #include "reg.h" #include <wine/debug.h> @@ -31,7 +30,7 @@ static WCHAR *GetWideString(const char *strA) WCHAR *strW; int len = MultiByteToWideChar(CP_ACP, 0, strA, -1, NULL, 0); - strW = heap_xalloc(len * sizeof(WCHAR)); + strW = malloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, strA, -1, strW, len); return strW; } @@ -45,7 +44,7 @@ static WCHAR *GetWideStringN(const char *strA, int size, DWORD *len) WCHAR *strW; *len = MultiByteToWideChar(CP_ACP, 0, strA, size, NULL, 0); - strW = heap_xalloc(*len * sizeof(WCHAR)); + strW = malloc(*len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, strA, size, strW, *len); return strW; } @@ -383,7 +382,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) if (res == ERROR_SUCCESS) { - parser->key_name = heap_xalloc((lstrlenW(path) + 1) * sizeof(WCHAR)); + parser->key_name = malloc((lstrlenW(path) + 1) * sizeof(WCHAR)); lstrcpyW(parser->key_name, path); } else @@ -482,7 +481,7 @@ static WCHAR *header_state(struct parser *parser, WCHAR *pos) if (!parser->is_unicode) { - header = heap_xalloc((lstrlenW(line) + 3) * sizeof(WCHAR)); + header = malloc((lstrlenW(line) + 3) * sizeof(WCHAR)); header[0] = parser->two_wchars[0]; header[1] = parser->two_wchars[1]; lstrcpyW(header + 2, line); @@ -646,7 +645,7 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) goto invalid; /* copy the value name in case we need to parse multiple lines and the buffer is overwritten */ - parser->value_name = heap_xalloc((lstrlenW(val_name) + 1) * sizeof(WCHAR)); + parser->value_name = malloc((lstrlenW(val_name) + 1) * sizeof(WCHAR)); lstrcpyW(parser->value_name, val_name); set_state(parser, DATA_START); @@ -757,7 +756,7 @@ static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos) { WCHAR *line = pos; - parser->data = heap_xalloc(sizeof(DWORD)); + parser->data = malloc(sizeof(DWORD)); if (!convert_hex_to_dword(line, parser->data)) goto invalid; @@ -886,7 +885,7 @@ static WCHAR *get_lineA(FILE *fp) if (!size) { size = REG_VAL_BUF_SIZE; - buf = heap_xalloc(size); + buf = malloc(size); *buf = 0; next = buf; } @@ -941,7 +940,7 @@ static WCHAR *get_lineW(FILE *fp) if (!size) { size = REG_VAL_BUF_SIZE; - buf = heap_xalloc(size * sizeof(WCHAR)); + buf = malloc(size * sizeof(WCHAR)); *buf = 0; next = buf; } diff --git a/programs/reg/query.c b/programs/reg/query.c index b24edb2f0b2..02ea03c947c 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -41,7 +41,7 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) { case REG_SZ: case REG_EXPAND_SZ: - buffer = heap_xalloc(size_bytes); + buffer = malloc(size_bytes); lstrcpyW(buffer, (WCHAR *)src); break; case REG_NONE: @@ -50,7 +50,7 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) WCHAR *ptr; static const WCHAR fmt[] = {'%','0','2','X',0}; - buffer = heap_xalloc((size_bytes * 2 + 1) * sizeof(WCHAR)); + buffer = malloc((size_bytes * 2 + 1) * sizeof(WCHAR)); ptr = buffer; for (i = 0; i < size_bytes; i++) ptr += swprintf(ptr, 3, fmt, src[i]); @@ -63,7 +63,7 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) const int zero_x_dword = 10; static const WCHAR fmt[] = {'0','x','%','x',0}; - buffer = heap_xalloc((zero_x_dword + 1) * sizeof(WCHAR)); + buffer = malloc((zero_x_dword + 1) * sizeof(WCHAR)); swprintf(buffer, zero_x_dword + 1, fmt, *(DWORD *)src); break; } @@ -76,13 +76,13 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) if (size_bytes <= two_wchars) { - buffer = heap_xalloc(sizeof(WCHAR)); + buffer = malloc(sizeof(WCHAR)); *buffer = 0; return buffer; } tmp_size = size_bytes - two_wchars; /* exclude both null terminators */ - buffer = heap_xalloc(tmp_size * 2 + sizeof(WCHAR)); + buffer = malloc(tmp_size * 2 + sizeof(WCHAR)); len = tmp_size / sizeof(WCHAR); for (i = 0, destindex = 0; i < len; i++, destindex++) @@ -146,7 +146,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) WCHAR *subkey_name, *subkey_path; HKEY subkey; - data = heap_xalloc(max_data_bytes); + data = malloc(max_data_bytes); for (;;) { @@ -185,7 +185,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) return 0; } - subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); + subkey_name = malloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = lstrlenW(path); @@ -227,8 +227,8 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) output_string(fmt, path); - value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); - data = heap_xalloc(max_data_bytes); + value_name = malloc(max_value_len * sizeof(WCHAR)); + data = malloc(max_data_bytes); i = 0; for (;;) @@ -263,7 +263,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) if (i || recurse) output_string(newlineW); - subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); + subkey_name = malloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = lstrlenW(path); diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 309d855e996..1ea0d9a3eb6 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdlib.h> #include "reg.h" #include <wine/debug.h> @@ -69,17 +68,6 @@ const struct reg_type_rels type_rels[] = {REG_MULTI_SZ, type_multi_sz}, }; -void *heap_xalloc(size_t size) -{ - void *buf = heap_alloc(size); - if (!buf) - { - ERR("Out of memory!\n"); - exit(1); - } - return buf; -} - void *heap_xrealloc(void *buf, size_t size) { void *new_buf = heap_realloc(buf, size); @@ -108,7 +96,7 @@ void output_writeconsole(const WCHAR *str, DWORD wlen) * one in that case. */ len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); - msgA = heap_xalloc(len); + msgA = malloc(len); WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); @@ -233,7 +221,7 @@ WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD WCHAR *subkey_path; static const WCHAR fmt[] = {'%','s','\\','%','s',0}; - subkey_path = heap_xalloc((path_len + subkey_len + 2) * sizeof(WCHAR)); + subkey_path = malloc((path_len + subkey_len + 2) * sizeof(WCHAR)); swprintf(subkey_path, path_len + subkey_len + 2, fmt, path, subkey_name); return subkey_path; @@ -255,13 +243,13 @@ static WCHAR *get_long_key(HKEY root, WCHAR *path) if (!path) { - long_key = heap_xalloc((len + 1) * sizeof(WCHAR)); + long_key = malloc((len + 1) * sizeof(WCHAR)); lstrcpyW(long_key, root_rels[i].long_name); return long_key; } len += lstrlenW(path) + 1; /* add one for the backslash */ - long_key = heap_xalloc((len + 1) * sizeof(WCHAR)); + long_key = malloc((len + 1) * sizeof(WCHAR)); swprintf(long_key, len + 1, fmt, root_rels[i].long_name, path); return long_key; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 83bcf516297..e6f9606c370 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -19,6 +19,7 @@ #ifndef __REG_H__ #define __REG_H__ +#include <stdlib.h> #include <windows.h> #include <wine/heap.h> #include "resource.h" @@ -33,7 +34,6 @@ struct reg_type_rels { extern const struct reg_type_rels type_rels[8]; -void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); void output_writeconsole(const WCHAR *str, DWORD wlen); void WINAPIV output_message(unsigned int id, ...); -- 2.31.0

2 7

[PATCH] sapi/tests: Update SpResourceManager test expectations for newer Windows.
by Gijs Vermeulen 23 Mar '21

23 Mar '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50841 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/sapi/tests/resource.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/sapi/tests/resource.c b/dlls/sapi/tests/resource.c index cbddaf6323a..e7776c9124a 100644 --- a/dlls/sapi/tests/resource.c +++ b/dlls/sapi/tests/resource.c @@ -25,13 +25,14 @@ #include "wine/test.h" -#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) -static void _expect_ref(IUnknown *obj, ULONG ref, int line) +#define EXPECT_REF_BROKEN(obj,ref,brokenref) _expect_ref_broken((IUnknown*)obj, ref, brokenref, __LINE__) +static void _expect_ref_broken(IUnknown *obj, ULONG ref, ULONG brokenref, int line) { ULONG rc; IUnknown_AddRef(obj); rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); + ok_(__FILE__,line)(rc == ref || broken(rc == brokenref) /* <Win7 */, + "Unexpected refcount %d, expected %d.\n", rc, ref); } static void test_interfaces(void) @@ -44,25 +45,25 @@ static void test_interfaces(void) hr = CoCreateInstance(&CLSID_SpResourceManager, NULL, CLSCTX_INPROC_SERVER, &IID_ISpResourceManager, (void **)&resource_manager); ok(hr == S_OK, "Failed to create ISpeechVoice interface: %#x.\n", hr); - EXPECT_REF(resource_manager, 1); + todo_wine EXPECT_REF_BROKEN(resource_manager, 2, 1); hr = CoCreateInstance(&CLSID_SpResourceManager, NULL, CLSCTX_INPROC_SERVER, &IID_ISpResourceManager, (void **)&resource_manager2); ok(hr == S_OK, "Failed to create ISpeechVoice interface: %#x.\n", hr); todo_wine ok(resource_manager2 == resource_manager, "Expected managers to match.\n"); - todo_wine EXPECT_REF(resource_manager2, 2); - todo_wine EXPECT_REF(resource_manager, 2); + todo_wine EXPECT_REF_BROKEN(resource_manager2, 3, 2); + todo_wine EXPECT_REF_BROKEN(resource_manager, 3, 2); if (resource_manager2 == resource_manager) ISpResourceManager_Release(resource_manager2); - EXPECT_REF(resource_manager, 1); + todo_wine EXPECT_REF_BROKEN(resource_manager, 2, 1); hr = CoCreateInstance(&CLSID_SpResourceManager, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Failed to create IUnknown interface: %#x.\n", hr); todo_wine ok(unk == (IUnknown *)resource_manager, "Expected unk to match existing manager.\n"); - todo_wine EXPECT_REF(unk, 2); - todo_wine EXPECT_REF(resource_manager, 2); + todo_wine EXPECT_REF_BROKEN(unk, 3, 2); + todo_wine EXPECT_REF_BROKEN(resource_manager, 3, 2); if (unk == (IUnknown *)resource_manager) IUnknown_Release(unk); - EXPECT_REF(resource_manager, 1); + todo_wine EXPECT_REF_BROKEN(resource_manager, 2, 1); hr = CoCreateInstance(&CLSID_SpResourceManager, NULL, CLSCTX_INPROC_SERVER, &IID_IDispatch, (void **)&dispatch); -- 2.31.0

2 1

[PATCH 1/4] gdiplus/metafile: Implement FillPie() recording.
by Nikolay Sivov 23 Mar '21

23 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 10 +++++++ dlls/gdiplus/metafile.c | 53 ++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index a617ca4803e..b0e4d967894 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -113,6 +113,8 @@ extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawEllipse(GpMetafile *metafile, GpPen *pen, GpRectF *rect) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRectF *rect) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF *rects, INT count) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_FillPie(GpMetafile *metafile, GpBrush *brush, const GpRectF *rect, + REAL startAngle, REAL sweepAngle) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2c18ced3e92..922c6591c87 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4402,6 +4402,7 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, { GpStatus stat; GpPath *path; + GpRectF rect; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, brush, x, y, width, height, startAngle, sweepAngle); @@ -4412,6 +4413,15 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, if(graphics->busy) return ObjectBusy; + if (is_metafile_graphics(graphics)) + { + rect.X = x; + rect.Y = y; + rect.Width = width; + rect.Height = height; + return METAFILE_FillPie((GpMetafile *)graphics->image, brush, &rect, startAngle, sweepAngle); + } + stat = GdipCreatePath(FillModeAlternate, &path); if (stat == Ok) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index eafcdaee963..a483b3a5e6d 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -4896,6 +4896,59 @@ GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRectF *rec return Ok; } +GpStatus METAFILE_FillPie(GpMetafile *metafile, GpBrush *brush, const GpRectF *rect, + REAL startAngle, REAL sweepAngle) +{ + BOOL is_int_rect, inline_color; + EmfPlusFillPie *record; + DWORD brush_id = -1; + GpStatus stat; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + inline_color = brush->bt == BrushTypeSolidColor; + if (!inline_color) + { + stat = METAFILE_AddBrushObject(metafile, brush, &brush_id); + if (stat != Ok) return stat; + } + + is_int_rect = is_integer_rect(rect); + + stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusFillPie, RectData) + + is_int_rect ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF), (void **)&record); + if (stat != Ok) return stat; + record->Header.Type = EmfPlusRecordTypeFillPie; + if (inline_color) + { + record->Header.Flags = 0x8000; + record->BrushId = ((GpSolidFill *)brush)->color; + } + else + record->BrushId = brush_id; + + record->StartAngle = startAngle; + record->SweepAngle = sweepAngle; + + if (is_int_rect) + { + record->Header.Flags |= 0x4000; + record->RectData.rect.X = (SHORT)rect->X; + record->RectData.rect.Y = (SHORT)rect->Y; + record->RectData.rect.Width = (SHORT)rect->Width; + record->RectData.rect.Height = (SHORT)rect->Height; + } + else + memcpy(&record->RectData.rectF, rect, sizeof(*rect)); + + METAFILE_WriteRecords(metafile); + return Ok; +} + static GpStatus METAFILE_AddFontObject(GpMetafile *metafile, GDIPCONST GpFont *font, DWORD *id) { EmfPlusObject *object_record; -- 2.30.2

2 7

[PATCH] ntoskrnl.exe: Use correct name format when sending WM_DEVICECHANGE.
by Arkadiusz Hiler 23 Mar '21

23 Mar '21

This fixes controller hotplug with FarCry Primal. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/ntoskrnl.exe/pnp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 4a1fbf001a4..6652be73c47 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -776,6 +776,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable broadcast->dbcc_reserved = 0; broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); + if (namelen > 1) broadcast->dbcc_name[1] = '\\'; send_devicechange( enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, broadcast, len ); heap_free( broadcast ); } -- 2.31.0

1 0

[PATCH v2 1/5] include: Add DayOfWeek enum in windows.globalization.idl.
by Rémi Bernon 23 Mar '21

23 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/Makefile.in | 1 + include/windows.globalization.idl | 49 +++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 include/windows.globalization.idl diff --git a/include/Makefile.in b/include/Makefile.in index b71de990aa2..46164b8268f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -753,6 +753,7 @@ SOURCES = \ windows.foundation.idl \ windows.gaming.input.forcefeedback.idl \ windows.gaming.input.idl \ + windows.globalization.idl \ windows.h \ windows.media.speechsynthesis.idl \ windows.system.idl \ diff --git a/include/windows.globalization.idl b/include/windows.globalization.idl new file mode 100644 index 00000000000..c08f7bd27d9 --- /dev/null +++ b/include/windows.globalization.idl @@ -0,0 +1,49 @@ +/* + * Copyright 2021 Rémi Bernon 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Globalization { + typedef enum DayOfWeek DayOfWeek; + } +} + +namespace Windows { + namespace Globalization { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum DayOfWeek + { + Sunday = 0, + Monday = 1, + Tuesday = 2, + Wednesday = 3, + Thursday = 4, + Friday = 5, + Saturday = 6 + }; + } +} -- 2.30.2

2 13

[PATCH] dinput: Implement device creation using product GUID.
by Arkadiusz Hiler 23 Mar '21

23 Mar '21

This fixes Far Cry Primal controller discovery. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/dinput/joystick.c | 4 ++-- dlls/dinput/joystick_linux.c | 10 ++++++++++ dlls/dinput/joystick_linuxinput.c | 10 ++++++++++ dlls/dinput/joystick_osx.c | 16 ++++++++++++++++ dlls/dinput/tests/device.c | 22 ++++++++++++++++++++++ 5 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 2eab4d3a33d..f9b89d2d70c 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -717,7 +717,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( index = pd.dwData; /* Return joystick */ - pdidi->guidInstance = This->guidInstance; + pdidi->guidInstance = This->base.guid; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; @@ -761,7 +761,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( index = pd.dwData; /* Return joystick */ - pdidi->guidInstance = This->guidInstance; + pdidi->guidInstance = This->base.guid; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 2b26eb806d3..79a077a027c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -598,6 +598,7 @@ static unsigned short get_joystick_index(REFGUID guid) { GUID wine_joystick = DInput_Wine_Joystick_GUID; GUID dev_guid = *guid; + INT i; wine_joystick.Data3 = 0; dev_guid.Data3 = 0; @@ -608,6 +609,9 @@ static unsigned short get_joystick_index(REFGUID guid) /* for the wine joystick GUIDs use the index stored in Data3 */ if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3; + for(i = 0; i < joystick_devices_count; i++) + if(IsEqualGUID(&joystick_devices[i].guid_product, guid)) return i; + return MAX_JOYSTICKS; } @@ -790,6 +794,9 @@ static HRESULT WINAPI JoystickLinuxAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A ifa fill_joystick_dideviceinstanceA( ddi, This->generic.base.dinput->dwVersion, get_joystick_index(&This->generic.base.guid) ); + + ddi->guidInstance = This->generic.base.guid; + return DI_OK; } @@ -806,6 +813,9 @@ static HRESULT WINAPI JoystickLinuxWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W ifa fill_joystick_dideviceinstanceW( ddi, This->generic.base.dinput->dwVersion, get_joystick_index(&This->generic.base.guid) ); + + ddi->guidInstance = This->generic.base.guid; + return DI_OK; } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 102de8269b9..f0d2e0dc32b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -612,6 +612,7 @@ static unsigned short get_joystick_index(REFGUID guid) { GUID wine_joystick = DInput_Wine_Joystick_Base_GUID; GUID dev_guid = *guid; + INT i; wine_joystick.Data3 = 0; dev_guid.Data3 = 0; @@ -622,6 +623,9 @@ static unsigned short get_joystick_index(REFGUID guid) /* for the wine joystick GUIDs use the index stored in Data3 */ if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3 - DInput_Wine_Joystick_Base_GUID.Data3; + for(i = 0; i < have_joydevs; i++) + if(IsEqualGUID(&joydevs[i].guid_product, guid)) return i; + return MAX_JOYDEV; } @@ -1450,6 +1454,9 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A iface, fill_joystick_dideviceinstanceA(pdidi, This->generic.base.dinput->dwVersion, get_joystick_index(&This->generic.base.guid)); + + pdidi->guidInstance = This->generic.base.guid; + return DI_OK; } @@ -1467,6 +1474,9 @@ static HRESULT WINAPI JoystickWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, fill_joystick_dideviceinstanceW(pdidi, This->generic.base.dinput->dwVersion, get_joystick_index(&This->generic.base.guid)); + + pdidi->guidInstance = This->generic.base.guid; + return DI_OK; } diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 805b75639fe..e27357efb32 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1322,6 +1322,10 @@ static unsigned short get_joystick_index(REFGUID guid) { GUID wine_joystick = DInput_Wine_OsX_Joystick_GUID; GUID dev_guid = *guid; + GUID prod_guid = *guid; + IOHIDDeviceRef device; + int joystick_devices_count; + INT i; wine_joystick.Data3 = 0; dev_guid.Data3 = 0; @@ -1332,6 +1336,18 @@ static unsigned short get_joystick_index(REFGUID guid) /* for the wine joystick GUIDs use the index stored in Data3 */ if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3; + prod_guid.Data1 = 0; + if(IsEqualGUID(&DInput_PIDVID_Product_GUID, &prod_guid)) + { + joystick_devices_count = find_joystick_devices(); + for(i = 0; i < joystick_devices_count; i++) + { + device = get_device_ref(i); + if(guid->Data1 == make_vid_pid(device)) + return i; + } + } + return 0xffff; } diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index dcf8a373348..fd212bf2514 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -197,12 +197,14 @@ struct enum_data { IDirectInputA *pDI; HWND hwnd; + BOOL tested_product_creation; }; static BOOL CALLBACK enum_devices(const DIDEVICEINSTANCEA *lpddi, void *pvRef) { struct enum_data *data = pvRef; IDirectInputDeviceA *device, *obj = NULL; + DIDEVICEINSTANCEA ddi2; HRESULT hr; hr = IDirectInput_GetDeviceStatus(data->pDI, &lpddi->guidInstance); @@ -226,6 +228,24 @@ static BOOL CALLBACK enum_devices(const DIDEVICEINSTANCEA *lpddi, void *pvRef) IUnknown_Release(obj); IUnknown_Release(device); + + if (!IsEqualGUID(&lpddi->guidInstance, &lpddi->guidProduct)) + { + data->tested_product_creation = TRUE; + hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidProduct, &device, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + + ddi2.dwSize = sizeof(ddi2); + hr = IDirectInputDevice_GetDeviceInfo(device, &ddi2); + ok(SUCCEEDED(hr), "IDirectInput_GetDeviceInfo failed: %08x\n", hr); + + ok(IsEqualGUID(&lpddi->guidProduct, &ddi2.guidProduct), "Product GUIDs do not match. Expected %s, got %s\n", debugstr_guid(&lpddi->guidProduct), debugstr_guid(&ddi2.guidProduct)); + ok(IsEqualGUID(&ddi2.guidProduct, &ddi2.guidInstance), "Instance GUID should equal product GUID. Expected %s, got %s\n", debugstr_guid(&ddi2.guidProduct), debugstr_guid(&ddi2.guidInstance)); + /* we cannot compare guidInstances as we may get a different device */ + + IUnknown_Release(device); + } + } return DIENUM_CONTINUE; } @@ -263,9 +283,11 @@ static void device_tests(void) data.pDI = pDI; data.hwnd = hwnd; + data.tested_product_creation = FALSE; hr = IDirectInput_EnumDevices(pDI, 0, enum_devices, &data, DIEDFL_ALLDEVICES); ok(SUCCEEDED(hr), "IDirectInput_EnumDevices() failed: %08x\n", hr); + if (!data.tested_product_creation) winetest_skip("Device creation using product GUID not tested\n"); /* If GetDeviceStatus returns DI_OK the device must exist */ hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Joystick); -- 2.31.0

1 0

[PATCH v2 1/2] winevulkan: Generate a separate physical device dispatch table.
by Georg Lehmann 23 Mar '21

23 Mar '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 47 +++++++++++++++++++++++++++----- dlls/winevulkan/vulkan.c | 6 +++- dlls/winevulkan/vulkan_private.h | 1 + 3 files changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3ad210e4701..a4c4d16eaaa 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -584,7 +584,7 @@ class VkFunction(object): def is_device_func(self): # If none of the other, it must be a device function - return not self.is_global_func() and not self.is_instance_func() + return not self.is_global_func() and not self.is_instance_func() and not self.is_phys_dev_func() def is_driver_func(self): """ Returns if function is part of Wine driver interface. """ @@ -601,8 +601,14 @@ class VkFunction(object): return True def is_instance_func(self): - # Instance functions are passed VkInstance or VkPhysicalDevice. - if self.params[0].type in ["VkInstance", "VkPhysicalDevice"]: + # Instance functions are passed VkInstance. + if self.params[0].type == "VkInstance": + return True + return False + + def is_phys_dev_func(self): + # Physical device functions are passed VkPhysicalDevice. + if self.params[0].type == "VkPhysicalDevice": return True return False @@ -2270,6 +2276,14 @@ class VkGenerator(object): f.write(" {{\"{0}\", &{1}{0}}},\n".format(vk_func.name, prefix)) f.write("};\n\n") + f.write("static const struct vulkan_func vk_phys_dev_dispatch_table[] =\n{\n") + for vk_func in self.registry.phys_dev_funcs: + if not vk_func.is_required(): + continue + + f.write(" {{\"{0}\", &{1}{0}}},\n".format(vk_func.name, prefix)) + f.write("};\n\n") + f.write("static const struct vulkan_func vk_instance_dispatch_table[] =\n{\n") for vk_func in self.registry.instance_funcs: if not vk_func.is_required(): @@ -2292,6 +2306,20 @@ class VkGenerator(object): f.write(" return NULL;\n") f.write("}\n\n") + f.write("void *wine_vk_get_phys_dev_proc_addr(const char *name)\n") + f.write("{\n") + f.write(" unsigned int i;\n") + f.write(" for (i = 0; i < ARRAY_SIZE(vk_phys_dev_dispatch_table); i++)\n") + f.write(" {\n") + f.write(" if (strcmp(vk_phys_dev_dispatch_table[i].name, name) == 0)\n") + f.write(" {\n") + f.write(" TRACE(\"Found name=%s in physical device table\\n\", debugstr_a(name));\n") + f.write(" return vk_phys_dev_dispatch_table[i].func;\n") + f.write(" }\n") + f.write(" }\n") + f.write(" return NULL;\n") + f.write("}\n\n") + f.write("void *wine_vk_get_instance_proc_addr(const char *name)\n") f.write("{\n") f.write(" unsigned int i;\n") @@ -2434,7 +2462,7 @@ class VkGenerator(object): f.write("/* For use by vkInstance and children */\n") f.write("struct vulkan_instance_funcs\n{\n") - for vk_func in self.registry.instance_funcs: + for vk_func in self.registry.instance_funcs + self.registry.phys_dev_funcs: if not vk_func.is_required(): continue @@ -2471,7 +2499,7 @@ class VkGenerator(object): f.write("#define ALL_VK_INSTANCE_FUNCS() \\\n") first = True - for vk_func in self.registry.instance_funcs: + for vk_func in self.registry.instance_funcs + self.registry.phys_dev_funcs: if not vk_func.is_required(): continue @@ -2635,7 +2663,7 @@ class VkGenerator(object): f.write("\n") f.write(" if (!instance) return NULL;\n\n") for vk_func in self.registry.funcs.values(): - if vk_func.is_driver_func() and vk_func.is_instance_func(): + if vk_func.is_driver_func() and (vk_func.is_instance_func() or vk_func.is_phys_dev_func()): f.write(' if (!strcmp(name, "{0}"))\n'.format(vk_func.name[2:])) f.write(' return vulkan_funcs->p_{0};\n'.format(vk_func.name)) f.write("\n") @@ -2836,21 +2864,26 @@ class VkRegistry(object): funcs[func.name] = func # To make life easy for the code generation, separate all function - # calls out in the 3 types of Vulkan functions: device, global and instance. + # calls out in the 4 types of Vulkan functions: + # device, global, physical device and instance. device_funcs = [] global_funcs = [] + phys_dev_funcs = [] instance_funcs = [] for func in funcs.values(): if func.is_device_func(): device_funcs.append(func) elif func.is_global_func(): global_funcs.append(func) + elif func.is_phys_dev_func(): + phys_dev_funcs.append(func) else: instance_funcs.append(func) # Sort function lists by name and store them. self.device_funcs = sorted(device_funcs, key=lambda func: func.name) self.global_funcs = sorted(global_funcs, key=lambda func: func.name) + self.phys_dev_funcs = sorted(phys_dev_funcs, key=lambda func: func.name) self.instance_funcs = sorted(instance_funcs, key=lambda func: func.name) # The funcs dictionary is used as a convenient way to lookup function diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 971394eb9dd..87cbc3b0e4c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1156,7 +1156,8 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * * https://github.com/KhronosGroup/Vulkan-Docs/issues/655 */ if (device->quirks & WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR - && (func = wine_vk_get_instance_proc_addr(name))) + && ((func = wine_vk_get_instance_proc_addr(name)) + || (func = wine_vk_get_phys_dev_proc_addr(name)))) { WARN("Returning instance function %s.\n", debugstr_a(name)); return func; @@ -1219,6 +1220,9 @@ PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const func = wine_vk_get_instance_proc_addr(name); if (func) return func; + func = wine_vk_get_phys_dev_proc_addr(name); + if (func) return func; + /* vkGetInstanceProcAddr also loads any children of instance, so device functions as well. */ func = wine_vk_get_device_proc_addr(name); if (func) return func; diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 4a41a15461e..322d27079ea 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -232,6 +232,7 @@ static inline VkSurfaceKHR wine_surface_to_handle(struct wine_surface *surface) } void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; +void *wine_vk_get_phys_dev_proc_addr(const char *name) DECLSPEC_HIDDEN; void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; -- 2.31.0

2 3

[PATCH] widl: Generate typedefs for namespaced struct / enum types.
by Rémi Bernon 23 Mar '21

23 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/header.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index a5e5d6c6fb3..1a69b298e7d 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -872,11 +872,25 @@ static void write_generic_handle_routines(FILE *header) static void write_typedef(FILE *header, type_t *type, int declonly) { - type_t *t = type_alias_get_aliasee_type(type); - if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) return; - fprintf(header, "typedef "); - write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT); - fprintf(header, ";\n"); + type_t *t = type_alias_get_aliasee_type(type); + if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) + { + fprintf(header, "#ifdef __cplusplus\n"); + write_namespace_start(header, t->namespace); + indent(header, 0); + } + fprintf(header, "typedef "); + write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT); + fprintf(header, ";\n"); + if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) + { + write_namespace_end(header, t->namespace); + fprintf(header, "#else /* __cplusplus */\n"); + fprintf(header, "typedef "); + write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->c_name, NAME_C); + fprintf(header, ";\n"); + fprintf(header, "#endif /* __cplusplus */\n\n"); + } } int is_const_decl(const var_t *var) -- 2.30.2

2 3