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

[PATCH] include: Add missing typedefs to windows.foundation.idl.
by Jacek Caban 19 Mar '21

19 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/windows.foundation.idl | 7 +++++++ 1 file changed, 7 insertions(+)

1 0

[PATCH] dinput: Stop hook thread when DLL is unloaded.
by Rémi Bernon 19 Mar '21

19 Mar '21

Otherwise we may still have an alive window with a window procedure that isn't loaded anymore. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50673 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 41 +++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 45023fc104a..389d8da96e8 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1848,6 +1848,7 @@ static DWORD WINAPI hook_thread_proc(void *param) static DWORD hook_thread_id; static HANDLE hook_thread_event; +static HANDLE hook_thread; static CRITICAL_SECTION_DEBUG dinput_critsect_debug = { @@ -1857,24 +1858,11 @@ static CRITICAL_SECTION_DEBUG dinput_critsect_debug = }; static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0, 0 }; -static BOOL check_hook_thread(void) +static void stop_hook_thread(void) { - static HANDLE hook_thread; - HMODULE module; - EnterCriticalSection(&dinput_hook_crit); - - TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); - if (!list_empty(&direct_input_list) && !hook_thread) + if (hook_thread) { - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)DINPUT_instance, &module); - hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); - hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); - } - else if (list_empty(&direct_input_list) && hook_thread) - { - DWORD tid = hook_thread_id; - if (hook_thread_event) /* if thread is not started yet */ { WaitForSingleObject(hook_thread_event, INFINITE); @@ -1882,11 +1870,29 @@ static BOOL check_hook_thread(void) hook_thread_event = NULL; } - hook_thread_id = 0; - PostThreadMessageW(tid, WM_USER+0x10, 0, 0); + PostThreadMessageW(hook_thread_id, WM_USER+0x10, 0, 0); + WaitForSingleObject(hook_thread, INFINITE); CloseHandle(hook_thread); + hook_thread_id = 0; hook_thread = NULL; } + LeaveCriticalSection(&dinput_hook_crit); +} + +static BOOL check_hook_thread(void) +{ + HMODULE module; + + EnterCriticalSection(&dinput_hook_crit); + + TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); + if (!list_empty(&direct_input_list) && !hook_thread) + { + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)DINPUT_instance, &module); + hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); + hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); + } + else if (list_empty(&direct_input_list)) stop_hook_thread(); LeaveCriticalSection(&dinput_hook_crit); return hook_thread_id != 0; @@ -1988,6 +1994,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: if (reserved) break; + stop_hook_thread(); unregister_di_em_win_class(); DeleteCriticalSection(&dinput_hook_crit); break; -- 2.30.2

2 2

[PATCH 2/3] msxml3: Don't unlink the XML declaration when saving document.
by Dmitry Timoshkov 19 Mar '21

19 Mar '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/domdoc.c | 3 --- dlls/msxml3/tests/domdoc.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 80c32e9ba99..a81ef5f16cb 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2534,7 +2534,6 @@ static HRESULT WINAPI domdoc_save( { domdoc *This = impl_from_IXMLDOMDocument3( iface ); xmlSaveCtxtPtr ctx = NULL; - xmlNodePtr xmldecl; HRESULT ret = S_OK; TRACE("(%p)->(%s)\n", This, debugstr_variant(&destination)); @@ -2610,9 +2609,7 @@ static HRESULT WINAPI domdoc_save( return S_FALSE; } - xmldecl = xmldoc_unlink_xmldecl(get_doc(This)); if (xmlSaveDoc(ctx, get_doc(This)) == -1) ret = S_FALSE; - xmldoc_link_xmldecl(get_doc(This), xmldecl); /* will release resources through close callback */ xmlSaveClose(ctx); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6ba88cf0bf7..570f2d1aba2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8525,6 +8525,7 @@ static void test_createProcessingInstruction(void) static const WCHAR xml1[] = L"<?xml version=\"1.0\"?>\r\n<test/>\r\n"; static const char xml2[] = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\r\n<test/>\r\n"; static const char xml2_vista[] = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\r\n"; + static const char xml2_wine[] = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n<test/>\n"; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; IXMLDOMNode *node; @@ -8583,8 +8584,7 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); p[GlobalSize(global)] = 0; -todo_wine - ok(!strcmp(p, xml2) || broken(!strcmp(p, xml2_vista)), "got %s\n", wine_dbgstr_a(p)); + ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine) || broken(!strcmp(p, xml2_vista)), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); IStream_Release(stream); -- 2.30.2

1 0

[PATCH 1/3] reg: Replace heap_xalloc() with heap_alloc()
by Hugh McMaster 19 Mar '21

19 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/add.c | 8 ++++---- programs/reg/delete.c | 2 +- programs/reg/export.c | 20 ++++++++++---------- programs/reg/import.c | 16 ++++++++-------- programs/reg/query.c | 20 ++++++++++---------- programs/reg/reg.c | 19 ++++--------------- programs/reg/reg.h | 1 - 7 files changed, 37 insertions(+), 49 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 054023df7ab..6d32e86c09a 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -64,7 +64,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 = heap_alloc(*reg_count); lstrcpyW((LPWSTR)out_data,data); break; } @@ -80,7 +80,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 = heap_alloc(*reg_count); ((LPDWORD)out_data)[0] = val; break; } @@ -89,7 +89,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 = heap_alloc(*reg_count); if(datalen % 2) { hex1 = hexchar_to_byte(data[i++]); @@ -116,7 +116,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 = heap_alloc((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..5aa84eed5b1 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 = heap_alloc(max_value_len * sizeof(WCHAR)); while (1) { diff --git a/programs/reg/export.c b/programs/reg/export.c index 8ce1945a693..10d3ca75eb4 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -42,7 +42,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 = heap_alloc((str_len + escape_count + 1) * sizeof(WCHAR)); for (i = 0, pos = 0; i < str_len; i++, pos++) { @@ -87,7 +87,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 = heap_alloc((line_len + 4) * sizeof(WCHAR)); line_len = swprintf(buf, line_len + 4, quoted_fmt, str); write_file(hFile, buf); heap_free(buf); @@ -111,7 +111,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 = heap_alloc((line_len + 3) * sizeof(WCHAR)); swprintf(*buf, line_len + 3, fmt, str); heap_free(str); } @@ -120,7 +120,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 = heap_alloc(15 * sizeof(WCHAR)); swprintf(*buf, 15, fmt, *data); } @@ -137,7 +137,7 @@ static size_t export_hex_data_type(HANDLE hFile, DWORD type) } else { - WCHAR *buf = heap_xalloc(15 * sizeof(WCHAR)); + WCHAR *buf = heap_alloc(15 * sizeof(WCHAR)); line_len = swprintf(buf, 15, hexp_fmt, type); write_file(hFile, buf); heap_free(buf); @@ -160,7 +160,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 = heap_alloc(size * 3 * sizeof(WCHAR)); for (i = 0, pos = 0; i < size; i++) { @@ -228,7 +228,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 = heap_alloc((lstrlenW(name) + 7) * sizeof(WCHAR)); swprintf(buf, lstrlenW(name) + 7, fmt, name); write_file(hFile, buf); heap_free(buf); @@ -247,8 +247,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 = heap_alloc(max_value_len * sizeof(WCHAR)); + data = heap_alloc(max_data_bytes); i = 0; for (;;) @@ -281,7 +281,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 = heap_alloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = lstrlenW(path); diff --git a/programs/reg/import.c b/programs/reg/import.c index 13e54e6a69a..9bcc8b63421 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -31,7 +31,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 = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, strA, -1, strW, len); return strW; } @@ -45,7 +45,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 = heap_alloc(*len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, strA, size, strW, *len); return strW; } @@ -383,7 +383,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 = heap_alloc((lstrlenW(path) + 1) * sizeof(WCHAR)); lstrcpyW(parser->key_name, path); } else @@ -482,7 +482,7 @@ static WCHAR *header_state(struct parser *parser, WCHAR *pos) if (!parser->is_unicode) { - header = heap_xalloc((lstrlenW(line) + 3) * sizeof(WCHAR)); + header = heap_alloc((lstrlenW(line) + 3) * sizeof(WCHAR)); header[0] = parser->two_wchars[0]; header[1] = parser->two_wchars[1]; lstrcpyW(header + 2, line); @@ -646,7 +646,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 = heap_alloc((lstrlenW(val_name) + 1) * sizeof(WCHAR)); lstrcpyW(parser->value_name, val_name); set_state(parser, DATA_START); @@ -757,7 +757,7 @@ static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos) { WCHAR *line = pos; - parser->data = heap_xalloc(sizeof(DWORD)); + parser->data = heap_alloc(sizeof(DWORD)); if (!convert_hex_to_dword(line, parser->data)) goto invalid; @@ -886,7 +886,7 @@ static WCHAR *get_lineA(FILE *fp) if (!size) { size = REG_VAL_BUF_SIZE; - buf = heap_xalloc(size); + buf = heap_alloc(size); *buf = 0; next = buf; } @@ -941,7 +941,7 @@ static WCHAR *get_lineW(FILE *fp) if (!size) { size = REG_VAL_BUF_SIZE; - buf = heap_xalloc(size * sizeof(WCHAR)); + buf = heap_alloc(size * sizeof(WCHAR)); *buf = 0; next = buf; } diff --git a/programs/reg/query.c b/programs/reg/query.c index b24edb2f0b2..0c1432d4e2d 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 = heap_alloc(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 = heap_alloc((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 = heap_alloc((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 = heap_alloc(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 = heap_alloc(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 = heap_alloc(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 = heap_alloc(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 = heap_alloc(max_value_len * sizeof(WCHAR)); + data = heap_alloc(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 = heap_alloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = lstrlenW(path); diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 309d855e996..3c8971d4e2a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -69,17 +69,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 +97,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 = heap_alloc(len); WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); @@ -233,7 +222,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 = heap_alloc((path_len + subkey_len + 2) * sizeof(WCHAR)); swprintf(subkey_path, path_len + subkey_len + 2, fmt, path, subkey_name); return subkey_path; @@ -255,13 +244,13 @@ static WCHAR *get_long_key(HKEY root, WCHAR *path) if (!path) { - long_key = heap_xalloc((len + 1) * sizeof(WCHAR)); + long_key = heap_alloc((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 = heap_alloc((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..280c0654109 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -33,7 +33,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 3

[PATCH] widl: Always check the runtimeclass interfaces presence.
by Rémi Bernon 19 Mar '21

19 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This fixes some crashes when runtimeclass are declared but not defined. tools/widl/typetree.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index b43b6bfbf79..db723817266 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -387,8 +387,7 @@ static inline type_t *type_runtimeclass_get_default_iface(const type_t *type, in typeref_list_t *ifaces = type_runtimeclass_get_ifaces(type); typeref_t *ref; - if (!ifaces) return NULL; - LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) + if (ifaces) LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) if (is_attr(ref->attrs, ATTR_DEFAULT)) return ref->type; -- 2.30.2

2 1

[PATCH 1/5] include: Add IAsyncInfo interface in asyncinfo.idl.
by Rémi Bernon 19 Mar '21

19 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- These are the interfaces and runtimeclasses required to implement RawGameControllerStatics runtimeclass stubs, which is also now used by some applications to enumerate gamepads on startup. include/Makefile.in | 1 + include/asyncinfo.idl | 45 ++++++++++++++++++++++ include/windows.foundation.collections.idl | 2 +- include/windows.foundation.idl | 2 +- 4 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 include/asyncinfo.idl diff --git a/include/Makefile.in b/include/Makefile.in index 1c80421ef6f..115da5bd080 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -20,6 +20,7 @@ SOURCES = \ appmodel.h \ asferr.h \ asptlb.idl \ + asyncinfo.idl \ asynot.idl \ asysta.idl \ atlbase.h \ diff --git a/include/asyncinfo.idl b/include/asyncinfo.idl new file mode 100644 index 00000000000..4662b462f5f --- /dev/null +++ b/include/asyncinfo.idl @@ -0,0 +1,45 @@ +/* + * 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"; + +typedef [v1_enum] enum AsyncStatus +{ + Started = 0, + Completed, + Canceled, + Error, +} AsyncStatus; + +[ + object, + uuid(00000036-0000-0000-c000-000000000046), + pointer_default(unique) +] +interface IAsyncInfo : IInspectable +{ + [propget] HRESULT Id([out, retval] unsigned __int32 *id); + [propget] HRESULT Status([out, retval] AsyncStatus *status); + [propget] HRESULT ErrorCode([out, retval] HRESULT *error_code); + HRESULT Cancel(); + HRESULT Close(); +} diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index ed05016b96d..53513b4c1ab 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -21,7 +21,7 @@ #endif import "inspectable.idl"; -/* import "asyncinfo.idl"; */ +import "asyncinfo.idl"; import "windowscontracts.idl"; /* import "eventtoken.idl"; */ diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 3c60278cf05..595f8af69e7 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -21,7 +21,7 @@ #endif import "inspectable.idl"; -/* import "asyncinfo.idl"; */ +import "asyncinfo.idl"; import "windowscontracts.idl"; /* import "eventtoken.idl"; */ /* import "ivectorchangedeventargs.idl"; */ -- 2.30.2

2 9

[PATCH] mmdevapi: Make spatial audio objects buffer update size constant.
by Paul Gofman 19 Mar '21

19 Mar '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mmdevapi/spatialaudio.c | 22 ++------- dlls/mmdevapi/tests/Makefile.in | 2 +- dlls/mmdevapi/tests/spatialaudio.c | 73 +++++++++++++++++++++++++++--- 3 files changed, 72 insertions(+), 25 deletions(-) diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index cbca57b4890..7ec09b663aa 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -41,8 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); -#define MAX_PERIODS 3 - static UINT32 AudioObjectType_to_index(AudioObjectType type) { UINT32 o = 0; @@ -361,7 +359,6 @@ static HRESULT WINAPI SAORS_BeginUpdatingAudioObjects(ISpatialAudioObjectRenderS static BOOL fixme_once = FALSE; SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); SpatialAudioObjectImpl *object; - UINT32 pad; HRESULT hr; TRACE("(%p)->(%p, %p)\n", This, dyn_count, frames); @@ -373,18 +370,7 @@ static HRESULT WINAPI SAORS_BeginUpdatingAudioObjects(ISpatialAudioObjectRenderS return SPTLAUDCLNT_E_OUT_OF_ORDER; } - hr = IAudioClient_GetCurrentPadding(This->client, &pad); - if(FAILED(hr)){ - WARN("GetCurrentPadding failed: %08x\n", hr); - LeaveCriticalSection(&This->lock); - return hr; - } - - if(pad < This->period_frames * MAX_PERIODS){ - This->update_frames = This->period_frames * MAX_PERIODS - pad; - }else{ - This->update_frames = 0; - } + This->update_frames = This->period_frames; if(This->update_frames > 0){ hr = IAudioRenderClient_GetBuffer(This->render, This->update_frames, (BYTE **)&This->buf); @@ -496,7 +482,7 @@ static HRESULT WINAPI SAORS_ActivateSpatialAudioObject(ISpatialAudioObjectRender obj->sa_stream = This; SAORS_AddRef(&This->ISpatialAudioObjectRenderStream_iface); - obj->buf = heap_alloc_zero(This->period_frames * MAX_PERIODS * This->sa_client->object_fmtex.Format.nBlockAlign); + obj->buf = heap_alloc_zero(This->period_frames * This->sa_client->object_fmtex.Format.nBlockAlign); EnterCriticalSection(&This->lock); @@ -616,7 +602,7 @@ static HRESULT WINAPI SAC_GetMaxFrameCount(ISpatialAudioClient *iface, TRACE("(%p)->(%p, %p)\n", This, format, count); - *count = MulDiv(period, format->nSamplesPerSec, 10000000) * MAX_PERIODS; + *count = MulDiv(period, format->nSamplesPerSec, 10000000); return S_OK; } @@ -731,7 +717,7 @@ static HRESULT activate_stream(SpatialAudioStreamImpl *stream) hr = IAudioClient_Initialize(stream->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, - period * MAX_PERIODS, 0, &stream->stream_fmtex.Format, NULL); + period, 0, &stream->stream_fmtex.Format, NULL); if(FAILED(hr)){ WARN("Initialize failed: %08x\n", hr); IAudioClient_Release(stream->client); diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index 062ad413922..dd180a253b9 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mmdevapi.dll -IMPORTS = ole32 version user32 advapi32 +IMPORTS = ole32 version user32 advapi32 winmm C_SRCS = \ capture.c \ diff --git a/dlls/mmdevapi/tests/spatialaudio.c b/dlls/mmdevapi/tests/spatialaudio.c index f2612499350..d9ccc429ce8 100644 --- a/dlls/mmdevapi/tests/spatialaudio.c +++ b/dlls/mmdevapi/tests/spatialaudio.c @@ -29,6 +29,7 @@ #include "mmdeviceapi.h" #include "spatialaudioclient.h" +#include "mmsystem.h" static IMMDeviceEnumerator *mme = NULL; static IMMDevice *dev = NULL; @@ -269,15 +270,14 @@ static BOOL is_buffer_zeroed(const BYTE *buffer, UINT32 buffer_length) static void test_audio_object_buffers(void) { - HRESULT hr; + UINT32 dyn_object_count, frame_count, max_frame_count, buffer_length; + SpatialAudioObjectRenderStreamActivationParams activation_params; ISpatialAudioObjectRenderStream *sas = NULL; + PROPVARIANT activation_params_prop; ISpatialAudioObject *sao[4]; - UINT32 dyn_object_count, frame_count, buffer_length; BYTE *buffer; - INT i; - - SpatialAudioObjectRenderStreamActivationParams activation_params; - PROPVARIANT activation_params_prop; + INT i, j, k; + HRESULT hr; PropVariantInit(&activation_params_prop); activation_params_prop.vt = VT_BLOB; @@ -288,6 +288,17 @@ static void test_audio_object_buffers(void) hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + hr = ISpatialAudioClient_GetMaxFrameCount(sac, &format, &max_frame_count); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + frame_count = format.nSamplesPerSec / 100; /* 10ms */ + /* Most of the time the frame count matches the 10ms interval exactly. + * However (seen on some Testbot machines) it might be a bit higher for some reason. */ + ok(max_frame_count <= frame_count + frame_count / 4, "Got unexpected frame count %u.\n", frame_count); + + /* The tests below which check frame count from _BeginUpdatingAudioObjects fail on some Testbot machines + * with max_frame_count from _GetMaxFrameCount(). */ + max_frame_count = frame_count + frame_count / 4; + hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao[0]); ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); @@ -306,6 +317,7 @@ static void test_audio_object_buffers(void) hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); + ok(frame_count <= max_frame_count, "Got unexpected frame count %u.\n", frame_count); hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_SideRight, &sao[3]); ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); @@ -323,6 +335,55 @@ static void test_audio_object_buffers(void) hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + /* Emulate underrun and test frame count approximate limit. */ + + /* Force 1ms Sleep() timer resolution. */ + timeBeginPeriod(1); + for (j = 0; j < 20; ++j) + { + hr = WaitForSingleObject(event, 200); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x, j %u.\n", hr, j); + + hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); + ok(frame_count <= max_frame_count, "Got unexpected frame_count %u.\n", frame_count); + + /* Audio starts crackling with delays 10ms and above. However, setting such delay (that is, the delay + * which skips the whole quantum) breaks SA on some Testbot machines: _BeginUpdatingAudioObjects fails + * with SPTLAUDCLNT_E_INTERNAL starting from some iteration or WaitForSingleObject timeouts. That seems + * to work on the real hardware though. */ + Sleep(5); + + for (i = 0; i < ARRAYSIZE(sao); i++) + { + hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x, i %d\n", hr, i); + ok(buffer != NULL, "Expected to get a non-NULL buffer\n"); + ok(buffer_length == frame_count * format.wBitsPerSample / 8, + "Expected buffer length to be sample_size * frame_count = %hu but got %u\n", + frame_count * format.wBitsPerSample / 8, buffer_length); + + /* Enable to hear the test sound. */ + if (0) + { + if (format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT) + { + for (k = 0; k < frame_count; ++k) + { + float time_sec = 10.0f / 1000.0f * (j + (float)k / frame_count); + + /* 440Hz tone. */ + ((float *)buffer)[k] = sinf(2.0f * M_PI * time_sec * 440.0f); + } + } + } + } + hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + } + timeEndPeriod(1); + hr = WaitForSingleObject(event, 200); ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x\n", hr); -- 2.30.2

2 1

[PATCH v3 1/2] windows.gaming.input: Fake empty IGamepadStatics::Gamepads vector.
by Rémi Bernon 19 Mar '21

19 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Remove the IGamepadStatics_add_GamepadAdded test with NULL token, that crashes on some Windows versions. dlls/windows.gaming.input/main.c | 14 +++++++++----- dlls/windows.gaming.input/tests/input.c | 20 ++++++++++++++++++-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index 5e349d98fab..d7a2f138a14 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -120,21 +120,25 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetAt( IVectorView_Gamepad *iface, ULONG index, IGamepad **value) { FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value); - return E_NOTIMPL; + *value = NULL; + return E_BOUNDS; } static HRESULT STDMETHODCALLTYPE vector_view_gamepad_get_Size( IVectorView_Gamepad *iface, ULONG *value) { FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + *value = 0; + return S_OK; } static HRESULT STDMETHODCALLTYPE vector_view_gamepad_IndexOf( - IVectorView_Gamepad *iface, IGamepad *element, ULONG *index, BOOLEAN *value) + IVectorView_Gamepad *iface, IGamepad *element, ULONG *index, BOOLEAN *found) { - FIXME("iface %p, element %p, index %p, value %p stub!\n", iface, element, index, value); - return E_NOTIMPL; + FIXME("iface %p, element %p, index %p, found %p stub!\n", iface, element, index, found); + *index = 0; + *found = FALSE; + return S_OK; } static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetMany( diff --git a/dlls/windows.gaming.input/tests/input.c b/dlls/windows.gaming.input/tests/input.c index cfd814d5631..622da229e70 100644 --- a/dlls/windows.gaming.input/tests/input.c +++ b/dlls/windows.gaming.input/tests/input.c @@ -111,6 +111,8 @@ static void test_Gamepad(void) IGamepadStatics *gamepad_statics = NULL; IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; + IGamepad *gamepad; + BOOLEAN found; HSTRING str; HRESULT hr; ULONG size; @@ -165,8 +167,22 @@ static void test_Gamepad(void) size = 0xdeadbeef; hr = IVectorView_Gamepad_get_Size(gamepads, &size); - todo_wine ok(hr == S_OK, "IVectorView_Gamepad_get_Size failed, hr %#x\n", hr); - todo_wine ok(size != 0xdeadbeef, "IVectorView_Gamepad_get_Size returned %u\n", size); + ok(hr == S_OK, "IVectorView_Gamepad_get_Size failed, hr %#x\n", hr); + ok(size != 0xdeadbeef, "IVectorView_Gamepad_get_Size returned %u\n", size); + + if (size == 0) + { + gamepad = (IGamepad *)0xdeadbeef; + hr = IVectorView_Gamepad_GetAt(gamepads, 0, &gamepad); + ok(hr == E_BOUNDS, "IVectorView_Gamepad_GetAt failed, hr %#x\n", hr); + ok(gamepad == NULL, "IVectorView_Gamepad_GetAt returned %p\n", gamepad); + + size = 0xdeadbeef; + found = TRUE; + hr = IVectorView_Gamepad_IndexOf(gamepads, gamepad, &size, &found); + ok(hr == S_OK, "IVectorView_Gamepad_IndexOf failed, hr %#x\n", hr); + ok(size == 0 && found == FALSE, "IVectorView_Gamepad_IndexOf returned size %d, found %d\n", size, found); + } IVectorView_Gamepad_Release(gamepads); -- 2.30.2

2 2

[PATCH] shell32: Resize from the first available icon to fill missing icon sizes.
by Gabriel Ivăncescu 19 Mar '21

19 Mar '21

The issue is not in PrivateExtractIconsW: it fails on Windows on such malformed executables as well (see bug report). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45696 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/iconcache.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index d1be540..265cb87 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -362,6 +362,7 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) { HICON hicons[ARRAY_SIZE(shell_imagelists)] = { 0 }; HICON hshortcuts[ARRAY_SIZE(hicons)] = { 0 }; + HICON first_icon = NULL; unsigned int i; SIZE size; INT ret = -1; @@ -369,8 +370,30 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) for (i = 0; i < ARRAY_SIZE(hicons); i++) { get_imagelist_icon_size( i, &size ); - if (!PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 )) - WARN("Failed to load icon %d from %s.\n", index, debugstr_w(sourcefile)); + PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 ); + if (!hicons[i]) + WARN("Failed to load icon %d (%dx%d) from %s.\n", index, size.cx, size.cy, debugstr_w(sourcefile)); + else if (!first_icon) + first_icon = hicons[i]; + } + + if (!first_icon) + { + WARN("No valid icon of any size was able to be loaded.\n"); + return ret; + } + + /* It is possible that PrivateExtractIconsW fails for some sizes, if the executable + is malformed (packed, obfuscated, etc), and does fail only on certain sizes even + on Windows. Create the missing sizes by resizing from the first available icon. */ + for (i = 0; i < ARRAY_SIZE(hicons); i++) + { + if (hicons[i]) continue; + + /* If this fails, we have to abort to prevent the image lists from + becoming out of sync and completely screwing the icons up */ + get_imagelist_icon_size(i, &size); + hicons[i] = CopyImage(first_icon, IMAGE_ICON, size.cx, size.cy, 0); if (!hicons[i]) goto fail; } -- 2.30.0

1 0

[PATCH v2 1/3] user32: Implement SendInput size parameter check.
by Rémi Bernon 19 Mar '21

19 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix WoW64 and 32bit test results, a bit or rewrite of PATCH 3 to use of the INPUT_WINE flag as implicit way to inform of injected messages. Supersedes: 201308-201310 dlls/user32/input.c | 18 +++++++++++ dlls/user32/tests/input.c | 63 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index e06f8b4413e..e9a74f177b9 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -182,6 +182,24 @@ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) UINT i; NTSTATUS status; + if (size != sizeof(INPUT)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + if (!count) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + if (!inputs) + { + SetLastError( ERROR_NOACCESS ); + return 0; + } + for (i = 0; i < count; i++) { if (inputs[i].type == INPUT_MOUSE) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9d75daa0bd5..7e8829ce375 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -4118,6 +4118,68 @@ static void test_UnregisterDeviceNotification(void) ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret); } +static void test_SendInput(void) +{ + INPUT input[16]; + UINT res, i; + HWND hwnd; + + hwnd = CreateWindowW( L"static", L"test", WS_OVERLAPPED, 0, 0, 100, 100, 0, 0, 0, 0 ); + ok(hwnd != 0, "CreateWindowW failed\n"); + + ShowWindow( hwnd, SW_SHOWNORMAL ); + UpdateWindow( hwnd ); + SetForegroundWindow( hwnd ); + SetFocus( hwnd ); + empty_message_queue(); + + SetLastError(0xdeadbeef); + res = SendInput(0, NULL, 0); + ok(res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError()); + SetLastError(0xdeadbeef); + res = SendInput(1, NULL, 0); + ok(res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError()); + SetLastError(0xdeadbeef); + res = SendInput(1, NULL, sizeof(*input)); + ok(res == 0 && (GetLastError() == ERROR_NOACCESS || GetLastError() == ERROR_INVALID_PARAMETER), "SendInput returned %u, error %#x\n", res, GetLastError()); + SetLastError(0xdeadbeef); + res = SendInput(0, input, sizeof(*input)); + ok(res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError()); + SetLastError(0xdeadbeef); + res = SendInput(0, NULL, sizeof(*input)); + ok(res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError()); + + memset(input, 0, sizeof(input)); + SetLastError(0xdeadbeef); + res = SendInput(1, input, sizeof(*input)); + ok(res == 1 && GetLastError() == 0xdeadbeef, "SendInput returned %u, error %#x\n", res, GetLastError()); + SetLastError(0xdeadbeef); + res = SendInput(16, input, sizeof(*input)); + ok(res == 16 && GetLastError() == 0xdeadbeef, "SendInput returned %u, error %#x\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = SendInput(1, input, 0); + ok(res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError()); + SetLastError(0xdeadbeef); + res = SendInput(1, input, sizeof(*input) + 1); + ok(res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError()); + SetLastError(0xdeadbeef); + res = SendInput(1, input, sizeof(*input) - 1); + ok(res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError()); + + for (i = 0; i < ARRAY_SIZE(input); ++i) input[i].type = INPUT_KEYBOARD; + SetLastError(0xdeadbeef); + res = SendInput(16, input, offsetof(INPUT, ki) + sizeof(KEYBDINPUT)); + ok(res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError()); + SetLastError(0xdeadbeef); + res = SendInput(16, input, sizeof(*input)); + ok(res == 16 && GetLastError() == 0xdeadbeef, "SendInput returned %u, error %#x\n", res, GetLastError()); + empty_message_queue(); + + trace("done\n"); + DestroyWindow(hwnd); +} + START_TEST(input) { char **argv; @@ -4140,6 +4202,7 @@ START_TEST(input) return; } + test_SendInput(); test_Input_blackbox(); test_Input_whitebox(); test_Input_unicode(); -- 2.30.0

2 7