April 2021 - Wine-Commits - list.winehq.org

Hugh McMaster : reg: Improve initial syntax checks during the 'export' operation.
by Alexandre Julliard April 1, 2021

April 1, 2021

Module: wine Branch: master Commit: 4df5c1641e7091f42c2313b275d999f2b9d25eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df5c1641e7091f42c2313b2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 1 23:20:48 2021 +1100 reg: Improve initial syntax checks during the 'export' operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 28 +++++++++++++++++----------- programs/reg/reg.c | 10 ++++++---- programs/reg/reg.h | 1 + 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 3150c075f26..79f055c691f 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -344,27 +344,33 @@ static HANDLE get_file_handle(WCHAR *filename, BOOL overwrite_file) return hFile; } -static BOOL is_overwrite_switch(const WCHAR *s) -{ - return is_switch(s, 'y'); -} - int reg_export(int argc, WCHAR *argvW[]) { HKEY root, hkey; WCHAR *path, *long_key; BOOL overwrite_file = FALSE; HANDLE hFile; - int ret; + int i, ret; - if (argc == 3 || argc > 5) - goto error; + if (argc < 4) goto invalid; if (!parse_registry_key(argvW[2], &root, &path, &long_key)) return 1; - if (argc == 5 && !(overwrite_file = is_overwrite_switch(argvW[4]))) - goto error; + for (i = 4; i < argc; i++) + { + WCHAR *str; + + if (argvW[i][0] != '/' && argvW[i][0] != '-') + goto invalid; + + str = &argvW[i][1]; + + if (is_char(*str, 'y') && !str[1]) + overwrite_file = TRUE; + else + goto invalid; + } if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) { @@ -382,7 +388,7 @@ int reg_export(int argc, WCHAR *argvW[]) return ret; -error: +invalid: output_message(STRING_INVALID_SYNTAX); output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); return 1; diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 10aaabf92da..6b337f5d415 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -250,15 +250,17 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long return TRUE; } +BOOL is_char(const WCHAR s, const WCHAR c) +{ + return (s == c || s == towupper(c)); +} + BOOL is_switch(const WCHAR *s, const WCHAR c) { if (lstrlenW(s) > 2) return FALSE; - if ((s[0] == '/' || s[0] == '-') && (s[1] == c || s[1] == towupper(c))) - return TRUE; - - return FALSE; + return ((s[0] == '/' || s[0] == '-') && is_char(s[1], c)); } static BOOL is_help_switch(const WCHAR *s) diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 3525bed75b8..c7719a6e4f0 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -40,6 +40,7 @@ BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info); HKEY path_get_rootkey(const WCHAR *path); WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len); BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key); +BOOL is_char(const WCHAR s, const WCHAR c); BOOL is_switch(const WCHAR *s, const WCHAR c); /* add.c */

1 0

Zebediah Figura : wined3d: Check for a valid index buffer in d3d[89]_device_DrawIndexedPrimitive().
by Alexandre Julliard April 1, 2021

April 1, 2021

Module: wine Branch: master Commit: 1c810a64b74816116ddc387cc0c52aaf0a16036e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c810a64b74816116ddc387c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 31 11:38:00 2021 -0500 wined3d: Check for a valid index buffer in d3d[89]_device_DrawIndexedPrimitive(). 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/d3d8/device.c | 13 +++++++++---- dlls/d3d8/tests/device.c | 2 +- dlls/d3d9/device.c | 19 +++++++++++-------- dlls/ddraw/device.c | 6 +++--- dlls/wined3d/device.c | 14 +------------- include/wine/wined3d.h | 2 +- 6 files changed, 26 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c810a64b74816116ddc…

1 0

Hugh McMaster : reg: Use wide-char string literals in export.c.
by Alexandre Julliard April 1, 2021

April 1, 2021

Module: wine Branch: master Commit: 1b746c1e1c4da4a07a1293fe9e60429867c86697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b746c1e1c4da4a07a1293fe… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 1 23:20:47 2021 +1100 reg: Use wide-char string literals in export.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 30f01c8b94f..3150c075f26 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -79,15 +79,14 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) static size_t export_value_name(HANDLE hFile, WCHAR *name, size_t len) { - static const WCHAR quoted_fmt[] = {'"','%','s','"','=',0}; - static const WCHAR default_name[] = {'@','=',0}; + static const WCHAR *default_name = L"@="; size_t line_len; if (name && *name) { WCHAR *str = escape_string(name, len, &line_len); WCHAR *buf = malloc((line_len + 4) * sizeof(WCHAR)); - line_len = swprintf(buf, line_len + 4, quoted_fmt, str); + line_len = swprintf(buf, line_len + 4, L"\"%s\"=", str); write_file(hFile, buf); free(buf); free(str); @@ -105,28 +104,24 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) { size_t len = 0, line_len; WCHAR *str; - static const WCHAR fmt[] = {'"','%','s','"',0}; if (size) len = size / sizeof(WCHAR) - 1; str = escape_string(data, len, &line_len); *buf = malloc((line_len + 3) * sizeof(WCHAR)); - swprintf(*buf, line_len + 3, fmt, str); + swprintf(*buf, line_len + 3, L"\"%s\"", str); free(str); } static void export_dword_data(WCHAR **buf, DWORD *data) { - static const WCHAR fmt[] = {'d','w','o','r','d',':','%','0','8','x',0}; - *buf = malloc(15 * sizeof(WCHAR)); - swprintf(*buf, 15, fmt, *data); + swprintf(*buf, 15, L"dword:%08x", *data); } static size_t export_hex_data_type(HANDLE hFile, DWORD type) { - static const WCHAR hex[] = {'h','e','x',':',0}; - static const WCHAR hexp_fmt[] = {'h','e','x','(','%','x',')',':',0}; + static const WCHAR *hex = L"hex:"; size_t line_len; if (type == REG_BINARY) @@ -137,7 +132,7 @@ static size_t export_hex_data_type(HANDLE hFile, DWORD type) else { WCHAR *buf = malloc(15 * sizeof(WCHAR)); - line_len = swprintf(buf, 15, hexp_fmt, type); + line_len = swprintf(buf, 15, L"hex(%x):", type); write_file(hFile, buf); free(buf); } @@ -150,8 +145,6 @@ static size_t export_hex_data_type(HANDLE hFile, DWORD type) static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, DWORD line_len, void *data, DWORD size) { - static const WCHAR fmt[] = {'%','0','2','x',0}; - static const WCHAR hex_concat[] = {'\\','\r','\n',' ',' ',0}; size_t num_commas, i, pos; line_len += export_hex_data_type(hFile, type); @@ -163,7 +156,7 @@ static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, for (i = 0, pos = 0; i < size; i++) { - pos += swprintf(*buf + pos, 3, fmt, ((BYTE *)data)[i]); + pos += swprintf(*buf + pos, 3, L"%02x", ((BYTE *)data)[i]); if (i == num_commas) break; (*buf)[pos++] = ','; (*buf)[pos] = 0; @@ -172,7 +165,7 @@ static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, if (line_len >= MAX_HEX_CHARS) { write_file(hFile, *buf); - write_file(hFile, hex_concat); + write_file(hFile, L"\\\r\n "); line_len = 2; pos = 0; } @@ -181,7 +174,7 @@ static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, static void export_newline(HANDLE hFile) { - static const WCHAR newline[] = {'\r','\n',0}; + static const WCHAR *newline = L"\r\n"; write_file(hFile, newline); } @@ -224,11 +217,10 @@ static void export_data(HANDLE hFile, WCHAR *value_name, DWORD value_len, static void export_key_name(HANDLE hFile, WCHAR *name) { - static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; WCHAR *buf; buf = malloc((lstrlenW(name) + 7) * sizeof(WCHAR)); - swprintf(buf, lstrlenW(name) + 7, fmt, name); + swprintf(buf, lstrlenW(name) + 7, L"\r\n[%s]\r\n", name); write_file(hFile, buf); free(buf); } @@ -309,9 +301,7 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) static void export_file_header(HANDLE hFile) { - static const WCHAR header[] = { 0xfeff,'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','\r','\n',0}; + static const WCHAR *header = L"\uFEFFWindows Registry Editor Version 5.00\r\n"; write_file(hFile, header); }

1 0

Nikolay Sivov : combase: Return initial values for global options.
by Alexandre Julliard April 1, 2021

April 1, 2021

Module: wine Branch: master Commit: d63ed91c280b7af30b498735a2d8924e58fdcfe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63ed91c280b7af30b498735… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 1 13:24:53 2021 +0300 combase: Return initial values for global options. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 11 +++++++++-- dlls/ole32/tests/compobj.c | 13 +++++++++++++ include/objidlbase.idl | 28 +++++++++++++++++++++++++++- 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index cda0d52f579..4677972656f 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); HINSTANCE hProxyDll; +static ULONG_PTR global_options[COMGLB_PROPERTIES_RESERVED3 + 1]; + /* Ole32 exports */ extern void WINAPI DestroyRunningObjectTable(void); extern HRESULT WINAPI Ole32DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj); @@ -490,9 +492,14 @@ static HRESULT WINAPI global_options_Set(IGlobalOptions *iface, GLOBALOPT_PROPER static HRESULT WINAPI global_options_Query(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR *value) { - FIXME("%p, %u, %p.\n", iface, property, value); + TRACE("%p, %u, %p.\n", iface, property, value); - return E_NOTIMPL; + if (property < COMGLB_EXCEPTION_HANDLING || property > COMGLB_PROPERTIES_RESERVED3) + return E_INVALIDARG; + + *value = global_options[property]; + + return S_OK; } static const IGlobalOptionsVtbl global_options_vtbl = diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 2e5006463da..d1e947e393f 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3919,6 +3919,7 @@ todo_wine { static void test_GlobalOptions(void) { IGlobalOptions *global_options; + ULONG_PTR value; HRESULT hres; CoInitialize(NULL); @@ -3933,6 +3934,18 @@ static void test_GlobalOptions(void) return; } + hres = IGlobalOptions_Query(global_options, 0, &value); + ok(FAILED(hres), "Unexpected hr %#x.\n", hres); + + hres = IGlobalOptions_Query(global_options, COMGLB_PROPERTIES_RESERVED3 + 1, &value); + ok(FAILED(hres), "Unexpected hr %#x.\n", hres); + + value = ~0u; + hres = IGlobalOptions_Query(global_options, COMGLB_EXCEPTION_HANDLING, &value); + ok(hres == S_OK || broken(hres == E_FAIL) /* Vista */, "Unexpected hr %#x.\n", hres); + if (SUCCEEDED(hres)) + ok(value == COMGLB_EXCEPTION_HANDLE, "Unexpected value %ld.\n", value); + IGlobalOptions_Release(global_options); hres = CoCreateInstance(&CLSID_GlobalOptions, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, diff --git a/include/objidlbase.idl b/include/objidlbase.idl index 6449be8417b..bd5a9b12409 100644 --- a/include/objidlbase.idl +++ b/include/objidlbase.idl @@ -1095,7 +1095,12 @@ typedef enum tagGLOBALOPT_PROPERTIES { COMGLB_EXCEPTION_HANDLING = 1, COMGLB_APPID = 2, - COMGLB_RPC_THREADPOOL_SETTING = 3 + COMGLB_RPC_THREADPOOL_SETTING = 3, + COMGLB_RO_SETTINGS = 4, + COMGLB_UNMARSHALING_POLICY = 5, + COMGLB_PROPERTIES_RESERVED1 = 6, + COMGLB_PROPERTIES_RESERVED2 = 7, + COMGLB_PROPERTIES_RESERVED3 = 8, } GLOBALOPT_PROPERTIES; typedef enum tagGLOBALOPT_EH_VALUES @@ -1112,6 +1117,27 @@ typedef enum tagGLOBALOPT_RPCTP_VALUES COMGLB_RPC_THREADPOOL_SETTING_PRIVATE_POOL = 1 } GLOBALOPT_RPCTP_VALUES; +typedef enum tagGLOBALOPT_RO_FLAGS +{ + COMGLB_STA_MODALLOOP_REMOVE_TOUCH_MESSAGES = 0x1, + COMGLB_STA_MODALLOOP_SHARED_QUEUE_REMOVE_INPUT_MESSAGES = 0x2, + COMGLB_STA_MODALLOOP_SHARED_QUEUE_DONOT_REMOVE_INPUT_MESSAGES = 0x4, + COMGLB_FAST_RUNDOWN = 0x8, + COMGLB_RESERVED1 = 0x10, + COMGLB_RESERVED2 = 0x20, + COMGLB_RESERVED3 = 0x40, + COMGLB_STA_MODALLOOP_SHARED_QUEUE_REORDER_POINTER_MESSAGES = 0x80, + COMGLB_RESERVED4 = 0x100, + COMGLB_RESERVED5 = 0x200, + COMGLB_RESERVED6 = 0x400, +} GLOBALOPT_RO_FLAGS; + +typedef enum tagGLOBALOPT_UNMARSHALING_POLICY_VALUES +{ + COMGLB_UNMARSHALING_POLICY_NORMAL = 0, + COMGLB_UNMARSHALING_POLICY_STRONG = 1, + COMGLB_UNMARSHALING_POLICY_HYBRID = 2, +} GLOBALOPT_UNMARSHALING_POLICY_VALUES; [ object,

1 0

Alexandre Julliard : ntdll: Create the initial stack on the Unix side.
by Alexandre Julliard April 1, 2021

April 1, 2021

Module: wine Branch: master Commit: c00c62bbfdb85eb2e2ecc545b6eee838e5a481f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c00c62bbfdb85eb2e2ecc545… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 1 11:25:48 2021 +0200 ntdll: Create the initial stack on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ------ dlls/ntdll/unix/loader.c | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 336b11c6344..e418eef6acb 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4020,7 +4020,6 @@ static void map_wow64cpu(void) */ static NTSTATUS process_init(void) { - INITIAL_TEB stack; TEB *teb = NtCurrentTeb(); PEB *peb = teb->Peb; @@ -4069,11 +4068,6 @@ static NTSTATUS process_init(void) map_wow64cpu(); } #endif - - RtlCreateUserStack( 0, 0, 0, 0x10000, 0x10000, &stack ); - teb->Tib.StackBase = stack.StackBase; - teb->Tib.StackLimit = stack.StackLimit; - teb->DeallocationStack = stack.DeallocationStack; return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5b0004b6d01..1d3a940aab8 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1797,6 +1797,7 @@ static struct unix_funcs unix_funcs = static void start_main_thread(void) { NTSTATUS status; + INITIAL_TEB stack; TEB *teb = virtual_alloc_first_teb(); signal_init_threading(); @@ -1809,6 +1810,10 @@ static void start_main_thread(void) syscall_dispatcher = signal_init_syscalls(); init_files(); init_startup_info(); + virtual_alloc_thread_stack( &stack, 0, 0, NULL ); + teb->Tib.StackBase = stack.StackBase; + teb->Tib.StackLimit = stack.StackLimit; + teb->DeallocationStack = stack.DeallocationStack; NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); load_libwine();

1 0