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

Hugh McMaster : reg: Use RegCreateKeyExW() instead of RegCreateKeyW().
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: aaf503e1de3f476639113b7ab7988c8628529e03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf503e1de3f476639113b7a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 30 23:00:15 2021 +1100 reg: Use RegCreateKeyExW() instead of RegCreateKeyW(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 29ac0e88af5..e1fd2223716 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -154,7 +154,8 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, { HKEY key; - if (RegCreateKeyW(root, path, &key) != ERROR_SUCCESS) + if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_WRITE, NULL, &key, NULL)) { output_message(STRING_INVALID_KEY); return 1;

1 0

Hugh McMaster : reg: Use wide-char string literals.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 0c73f95b336ba2ae4b49fa7f652c622ce47038c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c73f95b336ba2ae4b49fa7f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 30 23:00:16 2021 +1100 reg: Use wide-char string literals. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 18 ++++++-------- programs/reg/reg.c | 68 ++++++++++++++++------------------------------------ 2 files changed, 27 insertions(+), 59 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index c8277cd7114..961d926a10b 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -48,12 +48,11 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) case REG_BINARY: { WCHAR *ptr; - static const WCHAR fmt[] = {'%','0','2','X',0}; buffer = malloc((size_bytes * 2 + 1) * sizeof(WCHAR)); ptr = buffer; for (i = 0; i < size_bytes; i++) - ptr += swprintf(ptr, 3, fmt, src[i]); + ptr += swprintf(ptr, 3, L"%02X", src[i]); break; } case REG_DWORD: @@ -61,10 +60,9 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) case REG_DWORD_BIG_ENDIAN: { const int zero_x_dword = 10; - static const WCHAR fmt[] = {'0','x','%','x',0}; buffer = malloc((zero_x_dword + 1) * sizeof(WCHAR)); - swprintf(buffer, zero_x_dword + 1, fmt, *(DWORD *)src); + swprintf(buffer, zero_x_dword + 1, L"0x%x", *(DWORD *)src); break; } case REG_MULTI_SZ: @@ -102,11 +100,11 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) return buffer; } -static const WCHAR newlineW[] = {'\n',0}; +static const WCHAR *newlineW = L"\n"; static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD data_size) { - static const WCHAR fmt[] = {' ',' ',' ',' ','%','1',0}; + static const WCHAR *fmt = L" %1"; WCHAR defval[32]; WCHAR *reg_data; @@ -142,7 +140,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) DWORD subkey_len; DWORD type, path_len, i; BYTE *data; - WCHAR fmt[] = {'%','1','\n',0}; + static const WCHAR *fmt = L"%1\n"; WCHAR *subkey_name, *subkey_path; HKEY subkey; @@ -219,13 +217,11 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) DWORD max_data_bytes = 2048, data_size; DWORD subkey_len; DWORD i, type, path_len; - WCHAR fmt[] = {'%','1','\n',0}; - WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; WCHAR *value_name, *subkey_name, *subkey_path; BYTE *data; HKEY subkey; - output_string(fmt, path); + output_string(L"%1\n", path); value_name = malloc(max_value_len * sizeof(WCHAR)); data = malloc(max_data_bytes); @@ -284,7 +280,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) } free(subkey_path); } - else output_string(fmt_path, path, subkey_name); + else output_string(L"%1\\%2\n", path, subkey_name); i++; } else break; diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e419799676f..10aaabf92da 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -21,17 +21,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); -static const WCHAR short_hklm[] = {'H','K','L','M',0}; -static const WCHAR short_hkcu[] = {'H','K','C','U',0}; -static const WCHAR short_hkcr[] = {'H','K','C','R',0}; -static const WCHAR short_hku[] = {'H','K','U',0}; -static const WCHAR short_hkcc[] = {'H','K','C','C',0}; -static const WCHAR long_hklm[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}; -static const WCHAR long_hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; -static const WCHAR long_hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}; -static const WCHAR long_hku[] = {'H','K','E','Y','_','U','S','E','R','S',0}; -static const WCHAR long_hkcc[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; - static const struct { HKEY key; @@ -40,32 +29,23 @@ static const struct } root_rels[] = { - {HKEY_LOCAL_MACHINE, short_hklm, long_hklm}, - {HKEY_CURRENT_USER, short_hkcu, long_hkcu}, - {HKEY_CLASSES_ROOT, short_hkcr, long_hkcr}, - {HKEY_USERS, short_hku, long_hku}, - {HKEY_CURRENT_CONFIG, short_hkcc, long_hkcc}, + {HKEY_LOCAL_MACHINE, L"HKLM", L"HKEY_LOCAL_MACHINE"}, + {HKEY_CURRENT_USER, L"HKCU", L"HKEY_CURRENT_USER"}, + {HKEY_CLASSES_ROOT, L"HKCR", L"HKEY_CLASSES_ROOT"}, + {HKEY_USERS, L"HKU", L"HKEY_USERS"}, + {HKEY_CURRENT_CONFIG, L"HKCC", L"HKEY_CURRENT_CONFIG"}, }; -static const WCHAR type_none[] = {'R','E','G','_','N','O','N','E',0}; -static const WCHAR type_sz[] = {'R','E','G','_','S','Z',0}; -static const WCHAR type_expand_sz[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; -static const WCHAR type_binary[] = {'R','E','G','_','B','I','N','A','R','Y',0}; -static const WCHAR type_dword[] = {'R','E','G','_','D','W','O','R','D',0}; -static const WCHAR type_dword_le[] = {'R','E','G','_','D','W','O','R','D','_','L','I','T','T','L','E','_','E','N','D','I','A','N',0}; -static const WCHAR type_dword_be[] = {'R','E','G','_','D','W','O','R','D','_','B','I','G','_','E','N','D','I','A','N',0}; -static const WCHAR type_multi_sz[] = {'R','E','G','_','M','U','L','T','I','_','S','Z',0}; - const struct reg_type_rels type_rels[] = { - {REG_NONE, type_none}, - {REG_SZ, type_sz}, - {REG_EXPAND_SZ, type_expand_sz}, - {REG_BINARY, type_binary}, - {REG_DWORD, type_dword}, - {REG_DWORD_LITTLE_ENDIAN, type_dword_le}, - {REG_DWORD_BIG_ENDIAN, type_dword_be}, - {REG_MULTI_SZ, type_multi_sz}, + {REG_NONE, L"REG_NONE"}, + {REG_SZ, L"REG_SZ"}, + {REG_EXPAND_SZ, L"REG_EXPAND_SZ"}, + {REG_BINARY, L"REG_BINARY"}, + {REG_DWORD, L"REG_DWORD"}, + {REG_DWORD_LITTLE_ENDIAN, L"REG_DWORD_LITTLE_ENDIAN"}, + {REG_DWORD_BIG_ENDIAN, L"REG_DWORD_BIG_ENDIAN"}, + {REG_MULTI_SZ, L"REG_MULTI_SZ"}, }; void output_writeconsole(const WCHAR *str, DWORD wlen) @@ -216,10 +196,9 @@ static BOOL sane_path(const WCHAR *key) WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) { WCHAR *subkey_path; - static const WCHAR fmt[] = {'%','s','\\','%','s',0}; subkey_path = malloc((path_len + subkey_len + 2) * sizeof(WCHAR)); - swprintf(subkey_path, path_len + subkey_len + 2, fmt, path, subkey_name); + swprintf(subkey_path, path_len + subkey_len + 2, L"%s\\%s", path, subkey_name); return subkey_path; } @@ -228,7 +207,6 @@ static WCHAR *get_long_key(HKEY root, WCHAR *path) { DWORD i, array_size = ARRAY_SIZE(root_rels), len; WCHAR *long_key; - WCHAR fmt[] = {'%','s','\\','%','s',0}; for (i = 0; i < array_size; i++) { @@ -247,7 +225,7 @@ static WCHAR *get_long_key(HKEY root, WCHAR *path) len += lstrlenW(path) + 1; /* add one for the backslash */ long_key = malloc((len + 1) * sizeof(WCHAR)); - swprintf(long_key, len + 1, fmt, root_rels[i].long_name, path); + swprintf(long_key, len + 1, L"%s\\%s", root_rels[i].long_name, path); return long_key; } @@ -301,19 +279,13 @@ static enum operations get_operation(const WCHAR *str, int *op_help) { struct op_info { const WCHAR *op; int id; int help_id; }; - static const WCHAR add[] = {'a','d','d',0}; - static const WCHAR delete[] = {'d','e','l','e','t','e',0}; - static const WCHAR export[] = {'e','x','p','o','r','t',0}; - static const WCHAR import[] = {'i','m','p','o','r','t',0}; - static const WCHAR query[] = {'q','u','e','r','y',0}; - static const struct op_info op_array[] = { - { add, REG_ADD, STRING_ADD_USAGE }, - { delete, REG_DELETE, STRING_DELETE_USAGE }, - { export, REG_EXPORT, STRING_EXPORT_USAGE }, - { import, REG_IMPORT, STRING_IMPORT_USAGE }, - { query, REG_QUERY, STRING_QUERY_USAGE }, + { L"add", REG_ADD, STRING_ADD_USAGE }, + { L"delete", REG_DELETE, STRING_DELETE_USAGE }, + { L"export", REG_EXPORT, STRING_EXPORT_USAGE }, + { L"import", REG_IMPORT, STRING_IMPORT_USAGE }, + { L"query", REG_QUERY, STRING_QUERY_USAGE }, { NULL, -1, 0 } };

1 0

Hugh McMaster : reg: Use wide-char string literals in import.c.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 1fadcf240997f77b4bf31f708893051c94e299b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fadcf240997f77b4bf31f70… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 30 23:00:17 2021 +1100 reg: Use wide-char string literals in import.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index 93d6d46aef9..3ce8fce7394 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -245,18 +245,13 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) { struct data_type { const WCHAR *tag; int len; int type; int parse_type; }; - static const WCHAR quote[] = {'"'}; - static const WCHAR hex[] = {'h','e','x',':'}; - static const WCHAR dword[] = {'d','w','o','r','d',':'}; - static const WCHAR hexp[] = {'h','e','x','('}; - static const struct data_type data_types[] = { - /* tag len type parse type */ - { quote, 1, REG_SZ, REG_SZ }, - { hex, 4, REG_BINARY, REG_BINARY }, - { dword, 6, REG_DWORD, REG_DWORD }, - { hexp, 4, -1, REG_BINARY }, /* REG_NONE, REG_EXPAND_SZ, REG_MULTI_SZ */ - { NULL, 0, 0, 0 } + /* tag len type parse type */ + { L"\"", 1, REG_SZ, REG_SZ }, + { L"hex:", 4, REG_BINARY, REG_BINARY }, + { L"dword:", 6, REG_DWORD, REG_DWORD }, + { L"hex(", 4, -1, REG_BINARY }, /* REG_NONE, REG_EXPAND_SZ, REG_MULTI_SZ */ + { NULL, 0, 0, 0 } }; const struct data_type *ptr; @@ -443,21 +438,17 @@ enum reg_versions { static enum reg_versions parse_file_header(const WCHAR *s) { - static const WCHAR header_31[] = {'R','E','G','E','D','I','T',0}; - static const WCHAR header_40[] = {'R','E','G','E','D','I','T','4',0}; - static const WCHAR header_50[] = {'W','i','n','d','o','w','s',' ', - 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', - 'V','e','r','s','i','o','n',' ','5','.','0','0',0}; + static const WCHAR *header_31 = L"REGEDIT"; while (*s == ' ' || *s == '\t') s++; if (!lstrcmpW(s, header_31)) return REG_VERSION_31; - if (!lstrcmpW(s, header_40)) + if (!lstrcmpW(s, L"REGEDIT4")) return REG_VERSION_40; - if (!lstrcmpW(s, header_50)) + if (!lstrcmpW(s, L"Windows Registry Editor Version 5.00")) return REG_VERSION_50; /* The Windows version accepts registry file headers beginning with "REGEDIT" and ending @@ -511,13 +502,12 @@ static WCHAR *header_state(struct parser *parser, WCHAR *pos) static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos) { WCHAR *line, *value; - static WCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T'}; unsigned int key_end = 0; if (!(line = get_line(parser->file))) return NULL; - if (wcsncmp(line, hkcr, ARRAY_SIZE(hkcr))) + if (wcsncmp(line, L"HKEY_CLASSES_ROOT", 17)) /* "HKEY_CLASSES_ROOT" without NUL */ return line; /* get key name */ @@ -948,8 +938,7 @@ static WCHAR *get_lineW(FILE *fp) while (next) { - static const WCHAR line_endings[] = {'\r','\n',0}; - WCHAR *p = wcspbrk(line, line_endings); + WCHAR *p = wcspbrk(line, L"\r\n"); if (!p) { size_t len, count; @@ -986,7 +975,6 @@ int reg_import(int argc, WCHAR *argvW[]) { WCHAR *filename, *pos; FILE *fp; - static const WCHAR rb_mode[] = {'r','b',0}; BYTE s[2]; struct parser parser; @@ -999,7 +987,7 @@ int reg_import(int argc, WCHAR *argvW[]) filename = argvW[2]; - fp = _wfopen(filename, rb_mode); + fp = _wfopen(filename, L"rb"); if (!fp) { output_message(STRING_FILE_NOT_FOUND, filename);

1 0

Nikolay Sivov : msvcrt/tests: Add a test for wcsncpy().
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: a1e47a31280fd5b65bddfa9349465d6a8c423893 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1e47a31280fd5b65bddfa93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 30 17:41:45 2021 +0200 msvcrt/tests: Add a test for wcsncpy(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index dbc93dc93f5..b236301218f 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4457,6 +4457,17 @@ static void test__mbbtype(void) } } +static void test_wcsncpy(void) +{ + wchar_t dst[6], *p; + + memset(dst, 0xff, sizeof(dst)); + p = wcsncpy(dst, L"1234567", 6); + ok(p == dst, "Unexpected return value.\n"); + ok(!memcmp(dst, L"123456", sizeof(dst)), "unexpected buffer %s\n", + wine_dbgstr_wn(dst, ARRAY_SIZE(dst))); +} + START_TEST(string) { char mem[100]; @@ -4612,4 +4623,5 @@ START_TEST(string) test___STRINGTOLD(); test_SpecialCasing(); test__mbbtype(); + test_wcsncpy(); }

1 0

Jacek Caban : dxdiagn: Use nameless unions.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 52183f916c01e029d48f95d47b16062af227d8a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52183f916c01e029d48f95d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 30 20:09:34 2021 +0200 dxdiagn: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/Makefile.in | 1 - dlls/dxdiagn/provider.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index db44ea3a40e..5099f01461a 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -1,6 +1,5 @@ MODULE = dxdiagn.dll IMPORTS = strmiids dxguid uuid d3d9 ddraw dsound version ole32 oleaut32 user32 advapi32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index f68fa7f243c..aaffb5c213d 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1548,16 +1548,16 @@ static HRESULT fill_filter_data_information(IDxDiagContainerImpl_Container *subc if (pRF->dwVersion == 1) { - for (j = 0; j < pRF->u.s1.cPins; j++) - if (pRF->u.s1.rgPins[j].bOutput) + for (j = 0; j < pRF->cPins; j++) + if (pRF->rgPins[j].bOutput) dwNOutputs++; else dwNInputs++; } else if (pRF->dwVersion == 2) { - for (j = 0; j < pRF->u.s2.cPins2; j++) - if (pRF->u.s2.rgPins2[j].dwFlags & REG_PINFLAG_B_OUTPUT) + for (j = 0; j < pRF->cPins2; j++) + if (pRF->rgPins2[j].dwFlags & REG_PINFLAG_B_OUTPUT) dwNOutputs++; else dwNInputs++;

1 0

Austin English : tdh: Add TdhLoadManifestFromBinary stub.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: a9bab3601ed741982e661a04951241478442bebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9bab3601ed741982e661a04… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 4 01:07:38 2021 -0600 tdh: Add TdhLoadManifestFromBinary stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50725 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tdh/tdh.spec | 2 +- dlls/tdh/tdh_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/tdh/tdh.spec b/dlls/tdh/tdh.spec index 0e7c5a5995a..cde397c3899 100644 --- a/dlls/tdh/tdh.spec +++ b/dlls/tdh/tdh.spec @@ -22,7 +22,7 @@ @ stub TdhGetWppMessage @ stub TdhGetWppProperty @ stdcall TdhLoadManifest(wstr) -@ stub TdhLoadManifestFromBinary +@ stdcall TdhLoadManifestFromBinary(wstr) @ stub TdhOpenDecodingHandle @ stub TdhQueryProviderFieldInformation @ stub TdhQueryRemoteWBEMProviderFieldInformation diff --git a/dlls/tdh/tdh_main.c b/dlls/tdh/tdh_main.c index 2e6a9e69a38..60f32976b98 100644 --- a/dlls/tdh/tdh_main.c +++ b/dlls/tdh/tdh_main.c @@ -32,3 +32,9 @@ ULONG WINAPI TdhLoadManifest(LPWSTR manifest) FIXME("(%s): stub\n", debugstr_w(manifest)); return STATUS_SUCCESS; } + +ULONG WINAPI TdhLoadManifestFromBinary(LPWSTR binary) +{ + FIXME("(%s): stub\n", debugstr_w(binary)); + return STATUS_SUCCESS; +}

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_draw().
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: ebf9ca12c1e916774d0d4fafae66b8eb2d02f0e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf9ca12c1e916774d0d4faf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 27 14:34:22 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_draw(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 15 ++++++++------- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 7 ++++--- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 390a97a64d3..cbc97d3614a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1046,15 +1046,16 @@ static void acquire_graphics_pipeline_resources(const struct wined3d_state *stat state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); } -void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, - unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, - unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) +void wined3d_device_context_emit_draw(struct wined3d_device_context *context, + enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, + unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, + bool indexed) { - const struct wined3d_d3d_info *d3d_info = &cs->c.device->adapter->d3d_info; - const struct wined3d_state *state = cs->c.state; + const struct wined3d_d3d_info *d3d_info = &context->device->adapter->d3d_info; + const struct wined3d_state *state = context->state; struct wined3d_cs_draw *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DRAW; op->primitive_type = primitive_type; op->patch_vertex_count = patch_vertex_count; @@ -1068,7 +1069,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type pri acquire_graphics_pipeline_resources(state, indexed, d3d_info); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7e123661cdb..a683f4096f6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4445,7 +4445,7 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT TRACE("device %p, start_vertex %u, vertex_count %u.\n", device, start_vertex, vertex_count); - wined3d_cs_emit_draw(device->cs, state->primitive_type, + wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, 0, start_vertex, vertex_count, 0, 0, false); return WINED3D_OK; @@ -4459,7 +4459,7 @@ void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device TRACE("device %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", device, start_vertex, vertex_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, state->primitive_type, state->patch_vertex_count, + wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, 0, start_vertex, vertex_count, start_instance, instance_count, false); } @@ -4490,7 +4490,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - wined3d_cs_emit_draw(device->cs, state->primitive_type, state->patch_vertex_count, + wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, state->base_vertex_index, start_idx, index_count, 0, 0, true); return WINED3D_OK; @@ -4504,7 +4504,7 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", device, start_idx, index_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, state->primitive_type, state->patch_vertex_count, + wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, state->base_vertex_index, start_idx, index_count, start_instance, instance_count, true); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f0205a41c7e..a60c3691c82 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4735,9 +4735,6 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; -void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, - unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, - unsigned int start_instance, unsigned int instance_count, bool indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, struct wined3d_buffer *buffer, unsigned int offset, bool indexed) DECLSPEC_HIDDEN; @@ -4789,6 +4786,10 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_draw(struct wined3d_device_context *context, + enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, + unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, + bool indexed) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_draw().
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 08e8cd1b016ec4c04225688133850a21430392d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08e8cd1b016ec4c042256881… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 27 14:34:23 2021 -0500 wined3d: Introduce wined3d_device_context_draw(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 22 ++++++++++++++-------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a683f4096f6..71ca6740c37 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2397,6 +2397,18 @@ void CDECL wined3d_device_context_set_stream_output(struct wined3d_device_contex wined3d_buffer_decref(prev_buffer); } +void CDECL wined3d_device_context_draw(struct wined3d_device_context *context, unsigned int start_vertex, + unsigned int vertex_count, unsigned int start_instance, unsigned int instance_count) +{ + struct wined3d_state *state = context->state; + + TRACE("context %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", + context, start_vertex, vertex_count, start_instance, instance_count); + + wined3d_device_context_emit_draw(context, state->primitive_type, state->patch_vertex_count, + 0, start_vertex, vertex_count, start_instance, instance_count, false); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); @@ -4441,12 +4453,9 @@ void CDECL wined3d_device_get_primitive_type(const struct wined3d_device *device HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT start_vertex, UINT vertex_count) { - struct wined3d_state *state = device->cs->c.state; - TRACE("device %p, start_vertex %u, vertex_count %u.\n", device, start_vertex, vertex_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, - state->patch_vertex_count, 0, start_vertex, vertex_count, 0, 0, false); + wined3d_device_context_draw(&device->cs->c, start_vertex, vertex_count, 0, 0); return WINED3D_OK; } @@ -4454,13 +4463,10 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device, UINT start_vertex, UINT vertex_count, UINT start_instance, UINT instance_count) { - struct wined3d_state *state = device->cs->c.state; - TRACE("device %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", device, start_vertex, vertex_count, start_instance, instance_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, - 0, start_vertex, vertex_count, start_instance, instance_count, false); + wined3d_device_context_draw(&device->cs->c, start_vertex, vertex_count, start_instance, instance_count); } void CDECL wined3d_device_draw_primitive_instanced_indirect(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3b5945076d6..087a6bead13 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -166,6 +166,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_device_context_draw(ptr long long long long) @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a78590413ac..197a56d1952 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2559,6 +2559,8 @@ void __cdecl wined3d_device_context_dispatch(struct wined3d_device_context *cont unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); void __cdecl wined3d_device_context_dispatch_indirect(struct wined3d_device_context *context, struct wined3d_buffer *buffer, unsigned int offset); +void __cdecl wined3d_device_context_draw(struct wined3d_device_context *context, unsigned int start_vertex, + unsigned int vertex_count, unsigned int start_instance, unsigned int instance_count); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_draw().
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 21c77190554390e2a0e8a618d0e1ef1c9651a2f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c77190554390e2a0e8a618… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 27 14:34:24 2021 -0500 d3d11: Use wined3d_device_context_draw(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5f1e52644a2..4c8aa8c854c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -589,13 +589,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexed(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_Draw(ID3D11DeviceContext1 *iface, UINT vertex_count, UINT start_vertex_location) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, vertex_count %u, start_vertex_location %u.\n", iface, vertex_count, start_vertex_location); wined3d_mutex_lock(); - wined3d_device_draw_primitive(device->wined3d_device, start_vertex_location, vertex_count); + wined3d_device_context_draw(context->wined3d_context, start_vertex_location, vertex_count, 0, 0); wined3d_mutex_unlock(); } @@ -720,7 +720,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11DeviceContext1 *iface, UINT instance_vertex_count, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u, " "start_instance_location %u.\n", @@ -728,7 +728,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11Device start_instance_location); wined3d_mutex_lock(); - wined3d_device_draw_primitive_instanced(device->wined3d_device, start_vertex_location, + wined3d_device_context_draw(context->wined3d_context, start_vertex_location, instance_vertex_count, start_instance_location, instance_count); wined3d_mutex_unlock(); }

1 0

Zebediah Figura : d3d9: Use device->stateblock_state to check for a valid vertex declaration.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 7c62e6b169f18f4a5d5809490f8aebdb5a9375eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c62e6b169f18f4a5d580949… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 27 14:34:25 2021 -0500 d3d9: Use device->stateblock_state to check for a valid vertex declaration. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 3 +-- dlls/d3d9/device.c | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 03ab10ad01b..dc7c4ca3b1c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -113,8 +113,7 @@ struct d3d9_device DWORD sysmem_ib : 1; DWORD in_destruction : 1; DWORD in_scene : 1; - DWORD has_vertex_declaration : 1; - DWORD padding : 12; + DWORD padding : 13; DWORD auto_mipmaps; /* D3D9_MAX_TEXTURE_UNITS */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index fec631e0e67..229fc59521c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3024,7 +3024,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, iface, primitive_type, start_vertex, primitive_count); wined3d_mutex_lock(); - if (!device->has_vertex_declaration) + if (!device->stateblock_state->vertex_declaration) { wined3d_mutex_unlock(); WARN("Called without a valid vertex declaration set.\n"); @@ -3057,7 +3057,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface vertex_count, start_idx, primitive_count); wined3d_mutex_lock(); - if (!device->has_vertex_declaration) + if (!device->stateblock_state->vertex_declaration) { wined3d_mutex_unlock(); WARN("Called without a valid vertex declaration set.\n"); @@ -3143,7 +3143,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); - if (!device->has_vertex_declaration) + if (!device->stateblock_state->vertex_declaration) { wined3d_mutex_unlock(); WARN("Called without a valid vertex declaration set.\n"); @@ -3260,7 +3260,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_mutex_lock(); - if (!device->has_vertex_declaration) + if (!device->stateblock_state->vertex_declaration) { wined3d_mutex_unlock(); WARN("Called without a valid vertex declaration set.\n"); @@ -3425,7 +3425,6 @@ static HRESULT WINAPI d3d9_device_SetVertexDeclaration(IDirect3DDevice9Ex *iface wined3d_mutex_lock(); wined3d_stateblock_set_vertex_declaration(device->update_state, decl_impl ? decl_impl->wined3d_declaration : NULL); - device->has_vertex_declaration = !!decl_impl; wined3d_mutex_unlock(); return D3D_OK; @@ -3548,7 +3547,6 @@ static HRESULT WINAPI d3d9_device_SetFVF(IDirect3DDevice9Ex *iface, DWORD fvf) } wined3d_stateblock_set_vertex_declaration(device->update_state, decl); - device->has_vertex_declaration = TRUE; wined3d_mutex_unlock(); return D3D_OK;

1 0