wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

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

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

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

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

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 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: Fail if duplicate command-line switches are passed to 'reg add'.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 08976b3ee0db827bc5add829de1f148da89a6362 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08976b3ee0db827bc5add829… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 30 23:00:14 2021 +1100 reg: Fail if duplicate command-line switches are passed to 'reg add'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 4 +++- programs/reg/tests/add.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 672ec19ef98..29ac0e88af5 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -227,6 +227,7 @@ int reg_add(int argc, WCHAR *argvW[]) if (!lstrcmpiW(str, L"ve")) { + if (value_empty) goto invalid; value_empty = TRUE; continue; } @@ -249,11 +250,12 @@ int reg_add(int argc, WCHAR *argvW[]) break; case 's': str = argvW[++i]; - if (!str || lstrlenW(str) != 1) + if (separator || !str || lstrlenW(str) != 1) goto invalid; separator = str[0]; break; case 'f': + if (force) goto invalid; force = TRUE; break; default: diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index f5d473e8887..e1e7a478502 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -234,7 +234,7 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /f /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -295,7 +295,7 @@ static void test_add(void) verify_reg(hkey, NULL, REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /f /ve", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg: Parse 'reg add' command-line arguments in add.c.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 9138f5893c2eb7cafabdd8ed49b99a633eeda462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9138f5893c2eb7cafabdd8ed… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 30 23:00:13 2021 +1100 reg: Parse 'reg add' command-line arguments in add.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 67 ++++++++++++++++++++++++++++++++++++++++++-- programs/reg/reg.c | 82 ++++-------------------------------------------------- programs/reg/reg.h | 3 +- 3 files changed, 71 insertions(+), 81 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 3d0a509b4f0..672ec19ef98 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -149,8 +149,8 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW return out_data; } -int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, - WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) +static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, + WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { HKEY key; @@ -208,3 +208,66 @@ int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, return 0; } + +int reg_add(int argc, WCHAR *argvW[]) +{ + HKEY root; + WCHAR *path, *key_name, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; + BOOL value_empty = FALSE, force = FALSE; + int i; + + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + return 1; + + for (i = 3; i < argc; i++) + { + if (argvW[i][0] == '/' || argvW[i][0] == '-') + { + WCHAR *str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"ve")) + { + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) + goto invalid; + break; + case 't': + if (type || !(type = argvW[++i])) + goto invalid; + break; + case 'd': + if (data || !(data = argvW[++i])) + goto invalid; + break; + case 's': + str = argvW[++i]; + if (!str || lstrlenW(str) != 1) + goto invalid; + separator = str[0]; + break; + case 'f': + force = TRUE; + break; + default: + goto invalid; + } + } + } + + if (value_name && value_empty) + goto invalid; + + return run_add(root, path, value_name, value_empty, type, separator, data, force); + +invalid: + output_message(STRING_INVALID_CMDLINE); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 9f2b4b53a04..e419799676f 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -333,11 +333,7 @@ static enum operations get_operation(const WCHAR *str, int *op_help) int __cdecl wmain(int argc, WCHAR *argvW[]) { - int i, op, op_help; - static const WCHAR switchVEW[] = {'v','e',0}; - WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; - BOOL value_empty = FALSE, force = FALSE; - HKEY root; + int op, op_help; if (argc == 1) { @@ -373,6 +369,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return 0; } + if (op == REG_ADD) + return reg_add(argc, argvW); + if (op == REG_DELETE) return reg_delete(argc, argvW); @@ -382,76 +381,5 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_IMPORT) return reg_import(argc, argvW); - if (op == REG_QUERY) - return reg_query(argc, argvW); - - if (!parse_registry_key(argvW[2], &root, &path, &key_name)) - return 1; - - for (i = 3; i < argc; i++) - { - if (argvW[i][0] == '/' || argvW[i][0] == '-') - { - WCHAR *ptr = &argvW[i][1]; - - if (!lstrcmpiW(ptr, switchVEW)) - { - value_empty = TRUE; - continue; - } - else if (!ptr[0] || ptr[1]) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - - switch(towlower(argvW[i][1])) - { - case 'v': - if (value_name || !(value_name = argvW[++i])) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - break; - case 't': - if (type || !(type = argvW[++i])) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - break; - case 'd': - if (data || !(data = argvW[++i])) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - break; - case 's': - ptr = argvW[++i]; - if (!ptr || lstrlenW(ptr) != 1) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - separator = ptr[0]; - break; - case 'f': - force = TRUE; - break; - default: - output_message(STRING_INVALID_CMDLINE); - return 1; - } - } - } - - if (value_name && value_empty) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - - return reg_add(root, path, value_name, value_empty, type, separator, data, force); + return reg_query(argc, argvW); } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index e4ee13eca6e..3525bed75b8 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -43,8 +43,7 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long BOOL is_switch(const WCHAR *s, const WCHAR c); /* add.c */ -int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, - WCHAR *type, WCHAR separator, WCHAR *data, BOOL force); +int reg_add(int arc, WCHAR *argvW[]); /* delete.c */ int reg_delete(int argc, WCHAR *argvW[]);

1 0

Hugh McMaster : reg: Parse 'reg delete' command-line arguments in delete.c.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 434c345e41222ae6eebe734e655a32bfd51871ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=434c345e41222ae6eebe734e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 30 23:00:12 2021 +1100 reg: Parse 'reg delete' command-line arguments in delete.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++-- programs/reg/reg.c | 22 ++++++------------- programs/reg/reg.h | 3 +-- 3 files changed, 67 insertions(+), 19 deletions(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index c102fb4ad53..1f3755b3365 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -18,8 +18,8 @@ #include "reg.h" -int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL value_all, BOOL force) +static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, + BOOL value_empty, BOOL value_all, BOOL force) { HKEY key; @@ -105,3 +105,60 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, output_message(STRING_SUCCESS); return 0; } + +int reg_delete(int argc, WCHAR *argvW[]) +{ + HKEY root; + WCHAR *path, *key_name, *value_name = NULL; + BOOL value_all = FALSE, value_empty = FALSE, force = FALSE; + int i; + + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + return 1; + + for (i = 3; i < argc; i++) + { + if (argvW[i][0] == '/' || argvW[i][0] == '-') + { + WCHAR *str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"va")) + { + if (value_all) goto invalid; + value_all = TRUE; + continue; + } + else if (!lstrcmpiW(str, L"ve")) + { + if (value_empty) goto invalid; + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) + goto invalid; + break; + case 'f': + if (force) goto invalid; + force = TRUE; + break; + default: + goto invalid; + } + } + } + + if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) + goto invalid; + + return run_delete(root, path, key_name, value_name, value_empty, value_all, force); + +invalid: + output_message(STRING_INVALID_CMDLINE); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 88889205ca7..9f2b4b53a04 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -333,11 +333,10 @@ static enum operations get_operation(const WCHAR *str, int *op_help) int __cdecl wmain(int argc, WCHAR *argvW[]) { - int i, op, op_help, ret; - static const WCHAR switchVAW[] = {'v','a',0}; + int i, op, op_help; static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; - BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; + BOOL value_empty = FALSE, force = FALSE; HKEY root; if (argc == 1) @@ -374,6 +373,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return 0; } + if (op == REG_DELETE) + return reg_delete(argc, argvW); + if (op == REG_EXPORT) return reg_export(argc, argvW); @@ -397,11 +399,6 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) value_empty = TRUE; continue; } - else if (!lstrcmpiW(ptr, switchVAW)) - { - value_all = TRUE; - continue; - } else if (!ptr[0] || ptr[1]) { output_message(STRING_INVALID_CMDLINE); @@ -450,16 +447,11 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) } } - if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) + if (value_name && value_empty) { output_message(STRING_INVALID_CMDLINE); return 1; } - if (op == REG_ADD) - ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); - else - ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); - - return ret; + return reg_add(root, path, value_name, value_empty, type, separator, data, force); } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index e1e4804d19d..e4ee13eca6e 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -47,8 +47,7 @@ int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force); /* delete.c */ -int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL value_all, BOOL force); +int reg_delete(int argc, WCHAR *argvW[]); /* export.c */ int reg_export(int argc, WCHAR *argvW[]);

1 0

Huw Davies : riched20: Send EN_UPDATE from TxDraw().
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 62f96b039794685a97fcf8055312e0afdb0b2add URL: https://source.winehq.org/git/wine.git/?a=commit;h=62f96b039794685a97fcf805… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 30 12:36:50 2021 +0100 riched20: Send EN_UPDATE from TxDraw(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 3 --- dlls/riched20/tests/txtsrv.c | 12 ++++++++++++ dlls/riched20/txtsrv.c | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index f991b2bebcf..6ab7e4de76b 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -140,9 +140,6 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) update_caret( editor ); - if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) - ITextHost_TxNotify( editor->texthost, EN_UPDATE, NULL ); - ITextHost_TxViewChange(editor->texthost, update_now); ME_SendSelChange(editor); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 45e48a734fa..6834e38b7f5 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -399,6 +399,7 @@ static HRESULT __thiscall ITextHostImpl_TxGetPropertyBits(ITextHost *iface, DWOR } static int en_vscroll_sent; +static int en_update_sent; static HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost *iface, DWORD code, void *data ) { ITextHostTestImpl *This = impl_from_ITextHost(iface); @@ -409,6 +410,10 @@ static HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost *iface, DWORD code, en_vscroll_sent++; ok( !data, "got %p\n", data ); break; + case EN_UPDATE: + en_update_sent++; + ok( !data, "got %p\n", data ); + break; } return S_OK; } @@ -1152,6 +1157,13 @@ static void test_notifications( void ) ok( hr == S_OK, "got %08x\n", hr ); ok( en_vscroll_sent == 2, "got %d\n", en_vscroll_sent ); + /* EN_UPDATE is sent by TxDraw() */ + en_update_sent = 0; + hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, 0, TXTVIEW_ACTIVE ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( en_update_sent == 1, "got %d\n", en_update_sent ); + DestroyWindow( host_impl->window ); ITextServices_Release( txtserv ); ITextHost_Release( host ); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 7a979971a0a..80e4682880f 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -193,6 +193,10 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD editor_mark_rewrap_all( services->editor ); wrap_marked_paras_dc( services->editor, dc, FALSE ); } + + if (!services->editor->bEmulateVersion10 || services->editor->nEventMask & ENM_UPDATE) + ITextHost_TxNotify( services->editor->texthost, EN_UPDATE, NULL ); + editor_draw( services->editor, dc, update ); if (!draw) ITextHost_TxReleaseDC( services->editor->texthost, dc );

1 0

← Newer
1
2
3
4
5
6
7
8
...
117
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021