- Wine-Devel - list.winehq.org

[PATCH 2/2] uninstaller: Use wide-char string literals.
by Michael Stefaniuc March 17, 2021

March 17, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/uninstaller/main.c | 44 +++++++++++++------------------------ 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 7686c803b36..7236f1689e5 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -46,17 +46,7 @@ static WCHAR *sFilter; static int FetchUninstallInformation(void); static void UninstallProgram(void); - -static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; -static const WCHAR PathUninstallW[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'U','n','i','n','s','t','a','l','l',0 }; -static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l','S','t','r','i','n','g',0}; -static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; -static const WCHAR SystemComponentW[] = {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0}; +static const WCHAR PathUninstallW[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"; static void output_writeconsole(const WCHAR *str, DWORD len) { @@ -125,12 +115,11 @@ static void WINAPIV output_array(const WCHAR *fmt, ...) static void ListUninstallPrograms(void) { unsigned int i; - static WCHAR fmtW[] = {'%','1','|','|','|','%','2','\n',0}; FetchUninstallInformation(); for (i=0; i < numentries; i++) - output_array(fmtW, entries[i].key, entries[i].descr); + output_array(L"%1|||%2\n", entries[i].key, entries[i].descr); } @@ -159,9 +148,6 @@ static void RemoveSpecificProgram(WCHAR *nameW) int __cdecl wmain(int argc, WCHAR *argv[]) { LPCWSTR token = NULL; - static const WCHAR helpW[] = { '-','-','h','e','l','p',0 }; - static const WCHAR listW[] = { '-','-','l','i','s','t',0 }; - static const WCHAR removeW[] = { '-','-','r','e','m','o','v','e',0 }; int i = 1; BOOL is_wow64; @@ -192,19 +178,19 @@ int __cdecl wmain(int argc, WCHAR *argv[]) while( i<argc ) { token = argv[i++]; - - if( !lstrcmpW( token, helpW ) ) + + if( !lstrcmpW( token, L"--help" ) ) { output_message(STRING_HEADER); output_message(STRING_USAGE); return 0; } - else if( !lstrcmpW( token, listW ) ) + else if( !lstrcmpW( token, L"--list" ) ) { ListUninstallPrograms(); return 0; } - else if( !lstrcmpW( token, removeW ) ) + else if( !lstrcmpW( token, L"--remove" ) ) { if( i >= argc ) { @@ -252,29 +238,29 @@ static int FetchFromRootKey(HKEY root) { RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); size = sizeof(value); - if (!RegQueryValueExW(hkeyApp, SystemComponentW, NULL, &type, (LPBYTE)&value, &size) && + if (!RegQueryValueExW(hkeyApp, L"SystemComponent", NULL, &type, (BYTE *)&value, &size) && type == REG_DWORD && value == 1) { RegCloseKey(hkeyApp); sizeOfSubKeyName = 255; continue; } - if (!RegQueryValueExW(hkeyApp, DisplayNameW, NULL, NULL, NULL, &displen)) + if (!RegQueryValueExW(hkeyApp, L"DisplayName", NULL, NULL, NULL, &displen)) { WCHAR *command; size = sizeof(value); - if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &type, (LPBYTE)&value, &size) && + if (!RegQueryValueExW(hkeyApp, L"WindowsInstaller", NULL, &type, (BYTE *)&value, &size) && type == REG_DWORD && value == 1) { - static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','x','%','s',0}; - command = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fmtW) + lstrlenW(subKeyName)) * sizeof(WCHAR)); - wsprintfW(command, fmtW, subKeyName); + command = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(L"msiexec /x%s") + lstrlenW(subKeyName)) * sizeof(WCHAR)); + wsprintfW(command, L"msiexec /x%s", subKeyName); } - else if (!RegQueryValueExW(hkeyApp, UninstallCommandlineW, NULL, NULL, NULL, &uninstlen)) + else if (!RegQueryValueExW(hkeyApp, L"UninstallString", NULL, NULL, NULL, &uninstlen)) { command = HeapAlloc(GetProcessHeap(), 0, uninstlen); - RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, (LPBYTE)command, &uninstlen); + RegQueryValueExW(hkeyApp, L"UninstallString", 0, 0, (BYTE *)command, &uninstlen); } else { @@ -288,7 +274,7 @@ static int FetchFromRootKey(HKEY root) entries[numentries-1].key = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(subKeyName)+1)*sizeof(WCHAR)); lstrcpyW(entries[numentries-1].key, subKeyName); entries[numentries-1].descr = HeapAlloc(GetProcessHeap(), 0, displen); - RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, (LPBYTE)entries[numentries-1].descr, &displen); + RegQueryValueExW(hkeyApp, L"DisplayName", 0, 0, (BYTE *)entries[numentries-1].descr, &displen); entries[numentries-1].command = command; entries[numentries-1].active = 0; WINE_TRACE("allocated entry #%d: %s (%s), %s\n", -- 2.26.3

1 0

[PATCH 1/2] uninstaller: Constify the string paramenter of output_array()
by Michael Stefaniuc March 17, 2021

March 17, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/uninstaller/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index d7f308c798d..7686c803b36 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -110,7 +110,7 @@ static void WINAPIV output_message(unsigned int id, ...) __ms_va_end(va_args); } -static void WINAPIV output_array(WCHAR *fmt, ...) +static void WINAPIV output_array(const WCHAR *fmt, ...) { __ms_va_list va_args; -- 2.26.3

1 0

[PATCH] urlmon: Remove unnecessary local variable.
by Nikolay Sivov March 17, 2021

March 17, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/urlmon/binding.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index d35052dfdf6..a74970033b3 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1126,8 +1126,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres HRESULT hres; if(!(This->state & BINDING_LOCKED)) { - HRESULT hres = IInternetProtocolEx_LockRequest( - &This->protocol->IInternetProtocolEx_iface, 0); + hres = IInternetProtocolEx_LockRequest(&This->protocol->IInternetProtocolEx_iface, 0); if(SUCCEEDED(hres)) This->state |= BINDING_LOCKED; } -- 2.30.2

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Factor out hlsl_new_copy().
by Zebediah Figura March 17, 2021

March 17, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 6 ++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 8 +++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 19c0e2e4..988f64dc 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -382,6 +382,12 @@ struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type * return hlsl_ir_expr(cast); } +struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ir_node *node) +{ + /* Use a cast to the same type as a makeshift identity expression. */ + return hlsl_new_cast(node, node->data_type, &node->loc); +} + struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc, const char *semantic, unsigned int modifiers, const struct hlsl_reg_reservation *reg_reservation) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 5a2f6af1..92ac5270 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -525,6 +525,7 @@ struct hlsl_ir_node *hlsl_new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_i struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, struct vkd3d_shader_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ir_node *node) DECLSPEC_HIDDEN; struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6fceafb6..afac0ab3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1336,9 +1336,8 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in /* Don't use the instruction itself as a source, as this makes structure * splitting easier. Instead copy it here. Since we retrieve sources from - * the last instruction in the list, we do need to copy. Use a cast - * instruction to the same type as a makeshift identity expression. */ - if (!(copy = hlsl_new_cast(rhs, rhs->data_type, &lhs->loc))) + * the last instruction in the list, we do need to copy. */ + if (!(copy = hlsl_new_copy(rhs))) return NULL; list_add_tail(instrs, &copy->node.entry); return &copy->node; @@ -1365,8 +1364,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem { struct hlsl_ir_expr *copy; - /* Use a cast to the same type as a makeshift identity expression. */ - if (!(copy = hlsl_new_cast(lhs, lhs->data_type, &lhs->loc))) + if (!(copy = hlsl_new_copy(lhs))) return false; list_add_tail(instrs, &copy->node.entry); -- 2.30.1

4 15

[PATCH] winegstreamer: Set specific large buffer sizes for decodebin
by Andrew Eikum March 17, 2021

March 17, 2021

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- Setting them to 0 just means use the default: https://gstreamer.freedesktop.org/documentation/playback/decodebin.html?gi-… dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/media_source.c | 2 +- dlls/winegstreamer/wg_parser.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 55a62361966..69833a40b62 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -173,7 +173,7 @@ struct unix_funcs void **data, uint64_t *offset, uint32_t *size); void (CDECL *wg_parser_complete_read_request)(struct wg_parser *parser, bool ret); - void (CDECL *wg_parser_set_unlimited_buffering)(struct wg_parser *parser); + void (CDECL *wg_parser_set_large_buffering)(struct wg_parser *parser); uint32_t (CDECL *wg_parser_get_stream_count)(struct wg_parser *parser); struct wg_parser_stream *(CDECL *wg_parser_get_stream)(struct wg_parser *parser, uint32_t index); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 3260175f45a..828d15f906e 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1125,7 +1125,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ * never deselects it). Remove buffering limits from decodebin in order to * account for this. Note that this does leak memory, but the same memory * leak occurs with native. */ - unix_funcs->wg_parser_set_unlimited_buffering(parser); + unix_funcs->wg_parser_set_large_buffering(parser); object->stream_count = unix_funcs->wg_parser_get_stream_count(parser); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f76ca903b80..de6396a5603 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -543,11 +543,11 @@ static void CDECL wg_parser_complete_read_request(struct wg_parser *parser, bool pthread_cond_signal(&parser->read_done_cond); } -static void CDECL wg_parser_set_unlimited_buffering(struct wg_parser *parser) +static void CDECL wg_parser_set_large_buffering(struct wg_parser *parser) { - g_object_set(parser->decodebin, "max-size-buffers", 0, NULL); - g_object_set(parser->decodebin, "max-size-time", G_GUINT64_CONSTANT(0), NULL); - g_object_set(parser->decodebin, "max-size-bytes", 0, NULL); + g_object_set(parser->decodebin, "max-size-buffers", UINT_MAX, NULL); + g_object_set(parser->decodebin, "max-size-time", G_GUINT64_CONSTANT(1000000000), NULL); + g_object_set(parser->decodebin, "max-size-bytes", 8 * 1024 * 1024, NULL); } static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) @@ -1883,7 +1883,7 @@ static const struct unix_funcs funcs = wg_parser_get_read_request, wg_parser_complete_read_request, - wg_parser_set_unlimited_buffering, + wg_parser_set_large_buffering, wg_parser_get_stream_count, wg_parser_get_stream, -- 2.31.0

2 1

[PATCH] urlmon: Fix function name in the warning message.
by Nikolay Sivov March 17, 2021

March 17, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/urlmon/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index e6ffd366693..2acffdc1ffe 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -498,7 +498,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret HRESULT protocol_lock_request(Protocol *protocol) { if (!InternetLockRequestFile(protocol->request, &protocol->lock)) - WARN("InternetLockRequest failed: %d\n", GetLastError()); + WARN("InternetLockRequestFile failed: %d\n", GetLastError()); return S_OK; } @@ -509,7 +509,7 @@ HRESULT protocol_unlock_request(Protocol *protocol) return S_OK; if(!InternetUnlockRequestFile(protocol->lock)) - WARN("InternetUnlockRequest failed: %d\n", GetLastError()); + WARN("InternetUnlockRequestFile failed: %d\n", GetLastError()); protocol->lock = 0; return S_OK; -- 2.30.2

1 0

[PATCH] mscoree/tests: Increase timeout in expected failure case.
by Esme Povirk March 17, 2021

March 17, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- Github's macOS CI is too slow for the 0.5 second timeout. dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 4be3da8c731..9974eff6335 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -646,7 +646,7 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, ret = CreateProcessW(tmpexe, tmpexe, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcessW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); - if (expect_failure) ret = WaitForSingleObject(pi.hProcess, 500); + if (expect_failure) ret = WaitForSingleObject(pi.hProcess, 2000); else { ret = WaitForSingleObject(pi.hProcess, 5000); -- 2.25.1

1 0

[PATCH 1/7] widl: Only register activatable WinRT runtimeclass.
by Rémi Bernon March 17, 2021

March 17, 2021

Or with a static factory, as Windows.Input.Gamepad for instance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.media.speech/tests/statics.c | 3 +-- tools/widl/register.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.media.speech/tests/statics.c b/dlls/windows.media.speech/tests/statics.c index 8454729f9c3..9faa49dfc5d 100644 --- a/dlls/windows.media.speech/tests/statics.c +++ b/dlls/windows.media.speech/tests/statics.c @@ -136,8 +136,7 @@ static void test_VoiceInformation(void) ok(SUCCEEDED(hr), "WindowsCreateString failed, hr %#x\n", hr); hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - todo_wine ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#x\n", hr); - if (SUCCEEDED(hr)) IActivationFactory_Release(factory); + ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#x\n", hr); pWindowsDeleteString(str); diff --git a/tools/widl/register.c b/tools/widl/register.c index 76bfc3c715c..e13d8451f9e 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -194,6 +194,7 @@ static void write_runtimeclasses_registry( const statement_list_t *stmts ) { if (stmt->type != STMT_TYPE) continue; if (type_get_type((type = stmt->u.type)) != TYPE_RUNTIMECLASS) continue; + if (!get_attrp(type->attrs, ATTR_ACTIVATABLE) && !get_attrp(type->attrs, ATTR_STATIC)) continue; put_str( indent, "ForceRemove %s\n", format_namespace( type->namespace, "", ".", type->name, NULL ) ); put_str( indent++, "{\n" ); put_str( indent, "val 'DllPath' = s '%%MODULE%%'\n" ); -- 2.30.2

2 15

[PATCH 1/4] iphlpapi: Implement asynchronous events for IcmpSendEcho2(Ex).
by Gabriel Ivăncescu March 17, 2021

March 17, 2021

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/iphlpapi/icmp.c | 117 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 109 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 8ef0321..697452e 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -106,9 +106,51 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); typedef struct { int sid; + LONG lock_count; + HANDLE lock_thread; IP_OPTION_INFORMATION default_opts; } icmp_t; +static void icmp_lock(icmp_t *icp) +{ + InterlockedIncrement(&icp->lock_count); +} + +static void icmp_unlock(icmp_t *icp) +{ + if (InterlockedDecrement(&icp->lock_count) == 0x80000000) + { + HANDLE thread = InterlockedExchangePointer(&icp->lock_thread, NULL); + + if (thread) + { + NtAlertThread(thread); + CloseHandle(thread); + } + } +} + +static void icmp_wait_for_released_locks(icmp_t *icp) +{ + DWORD wait = INFINITE; + + if (!DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), + &icp->lock_thread, 0, FALSE, DUPLICATE_SAME_ACCESS)) + { + icp->lock_thread = NULL; + wait = 1; + } + + if (InterlockedOr(&icp->lock_count, 0x80000000) != 0) + { + do + SleepEx(wait, TRUE); + while (icp->lock_count != 0x80000000 || icp->lock_thread); + } + else + if (icp->lock_thread) CloseHandle(icp->lock_thread); +} + #define IP_OPTS_UNKNOWN 0 #define IP_OPTS_DEFAULT 1 #define IP_OPTS_CUSTOM 2 @@ -347,6 +389,30 @@ done: return res; } +struct icmp_get_reply_async_ctx +{ + icmp_t *icp; + HANDLE event; + unsigned char *buffer; + void *reply_buf; + DWORD reply_size; + DWORD send_time; + DWORD timeout; +}; + +static DWORD WINAPI icmp_get_reply_async_func(VOID *parameter) +{ + struct icmp_get_reply_async_ctx *ctx = parameter; + + icmp_get_reply(ctx->icp->sid, ctx->buffer, ctx->send_time, ctx->reply_buf, ctx->reply_size, ctx->timeout); + + SetEvent(ctx->event); + + icmp_unlock(ctx->icp); + HeapFree(GetProcessHeap(), 0, ctx); + return 0; +} + /* @@ -381,6 +447,7 @@ HANDLE WINAPI Icmp6CreateFile(VOID) } icp->sid=sid; icp->default_opts.OptionsSize=IP_OPTS_UNKNOWN; + icp->lock_count=0; return (HANDLE)icp; } @@ -439,6 +506,7 @@ HANDLE WINAPI IcmpCreateFile(VOID) } icp->sid=sid; icp->default_opts.OptionsSize=IP_OPTS_UNKNOWN; + icp->lock_count=0; return (HANDLE)icp; } @@ -455,6 +523,9 @@ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle) return FALSE; } + /* Windows waits until all outstanding async requests are complete or timed out */ + icmp_wait_for_released_locks(icp); + close( icp->sid ); HeapFree(GetProcessHeap (), 0, icp); return TRUE; @@ -526,6 +597,7 @@ DWORD WINAPI IcmpSendEcho2Ex( unsigned char *buffer; int reqsize, repsize; DWORD send_time; + DWORD res = 0; TRACE("(%p, %p, %p, %p, %08x, %08x, %p, %d, %p, %p, %d, %d)\n", IcmpHandle, Event, ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, @@ -553,11 +625,6 @@ DWORD WINAPI IcmpSendEcho2Ex( return 0; } - if (Event) - { - FIXME("unsupported for events\n"); - return 0; - } if (ApcRoutine) { FIXME("unsupported for APCs\n"); @@ -569,6 +636,8 @@ DWORD WINAPI IcmpSendEcho2Ex( return 0; } + icmp_lock(icp); + /* Prepare the request */ id=getpid() & 0xFFFF; seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; @@ -580,7 +649,7 @@ DWORD WINAPI IcmpSendEcho2Ex( buffer = HeapAlloc(GetProcessHeap(), 0, max( repsize, reqsize )); if (buffer == NULL) { SetLastError(ERROR_OUTOFMEMORY); - return 0; + goto done; } icmp_header=(struct icmp*)buffer; @@ -661,10 +730,42 @@ DWORD WINAPI IcmpSendEcho2Ex( } } HeapFree(GetProcessHeap(), 0, buffer); - return 0; + goto done; } - return icmp_get_reply(icp->sid, buffer, send_time, ReplyBuffer, ReplySize, Timeout); + if (Event) + { + struct icmp_get_reply_async_ctx *ctx = HeapAlloc(GetProcessHeap(), 0, sizeof(*ctx)); + + if (ctx) + { + ctx->icp = icp; + ctx->event = Event; + ctx->buffer = buffer; + ctx->reply_buf = ReplyBuffer; + ctx->reply_size = ReplySize; + ctx->send_time = send_time; + ctx->timeout = Timeout; + if (QueueUserWorkItem(icmp_get_reply_async_func, ctx, WT_EXECUTEDEFAULT | WT_EXECUTELONGFUNCTION)) + { + SetLastError(ERROR_IO_PENDING); + return 0; + } + + HeapFree(GetProcessHeap(), 0, ctx); + } + else + SetLastError(ERROR_OUTOFMEMORY); + + HeapFree(GetProcessHeap(), 0, buffer); + goto done; + } + + res = icmp_get_reply(icp->sid, buffer, send_time, ReplyBuffer, ReplySize, Timeout); + +done: + icmp_unlock(icp); + return res; } /* -- 2.30.0

1 3

[PATCH 1/3] reg: Split 'query' functions from reg.c
by Hugh McMaster March 17, 2021

March 17, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/Makefile.in | 1 + programs/reg/query.c | 329 +++++++++++++++++++++++++++++++++++++++ programs/reg/reg.c | 315 +------------------------------------ programs/reg/reg.h | 16 +- 4 files changed, 346 insertions(+), 315 deletions(-) create mode 100644 programs/reg/query.c diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 248b470eb31..3203126db66 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -7,6 +7,7 @@ EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ export.c \ import.c \ + query.c \ reg.c RC_SRCS = reg.rc diff --git a/programs/reg/query.c b/programs/reg/query.c new file mode 100644 index 00000000000..3d81d120bd2 --- /dev/null +++ b/programs/reg/query.c @@ -0,0 +1,329 @@ +/* + * Copyright 2016-2017, 2021 Hugh McMaster + * + * 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 + */ + +#include <stdio.h> +#include <windows.h> +#include <wine/heap.h> +#include "reg.h" + +static const WCHAR *reg_type_to_wchar(DWORD type) +{ + int i, array_size = ARRAY_SIZE(type_rels); + + for (i = 0; i < array_size; i++) + { + if (type == type_rels[i].type) + return type_rels[i].name; + } + + return NULL; +} + +static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) +{ + WCHAR *buffer = NULL; + int i; + + switch (type) + { + case REG_SZ: + case REG_EXPAND_SZ: + buffer = heap_xalloc(size_bytes); + lstrcpyW(buffer, (WCHAR *)src); + break; + case REG_NONE: + case REG_BINARY: + { + WCHAR *ptr; + static const WCHAR fmt[] = {'%','0','2','X',0}; + + buffer = heap_xalloc((size_bytes * 2 + 1) * sizeof(WCHAR)); + ptr = buffer; + for (i = 0; i < size_bytes; i++) + ptr += swprintf(ptr, 3, fmt, src[i]); + break; + } + case REG_DWORD: + /* case REG_DWORD_LITTLE_ENDIAN: */ + case REG_DWORD_BIG_ENDIAN: + { + const int zero_x_dword = 10; + static const WCHAR fmt[] = {'0','x','%','x',0}; + + buffer = heap_xalloc((zero_x_dword + 1) * sizeof(WCHAR)); + swprintf(buffer, zero_x_dword + 1, fmt, *(DWORD *)src); + break; + } + case REG_MULTI_SZ: + { + const int two_wchars = 2 * sizeof(WCHAR); + DWORD tmp_size; + const WCHAR *tmp = (const WCHAR *)src; + int len, destindex; + + if (size_bytes <= two_wchars) + { + buffer = heap_xalloc(sizeof(WCHAR)); + *buffer = 0; + return buffer; + } + + tmp_size = size_bytes - two_wchars; /* exclude both null terminators */ + buffer = heap_xalloc(tmp_size * 2 + sizeof(WCHAR)); + len = tmp_size / sizeof(WCHAR); + + for (i = 0, destindex = 0; i < len; i++, destindex++) + { + if (tmp[i]) + buffer[destindex] = tmp[i]; + else + { + buffer[destindex++] = '\\'; + buffer[destindex] = '0'; + } + } + buffer[destindex] = 0; + break; + } + } + return buffer; +} + +static const WCHAR newlineW[] = {'\n',0}; + +static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD data_size) +{ + static const WCHAR fmt[] = {' ',' ',' ',' ','%','1',0}; + WCHAR defval[32]; + WCHAR *reg_data; + + if (value_name && value_name[0]) + output_string(fmt, value_name); + else + { + LoadStringW(GetModuleHandleW(NULL), STRING_DEFAULT_VALUE, defval, ARRAY_SIZE(defval)); + output_string(fmt, defval); + } + output_string(fmt, reg_type_to_wchar(type)); + + if (data) + { + reg_data = reg_data_to_wchar(type, data, data_size); + output_string(fmt, reg_data); + heap_free(reg_data); + } + else + { + LoadStringW(GetModuleHandleW(NULL), STRING_VALUE_NOT_SET, defval, ARRAY_SIZE(defval)); + output_string(fmt, defval); + } + output_string(newlineW); +} + +static unsigned int num_values_found = 0; + +static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) +{ + LONG rc; + DWORD max_data_bytes = 2048, data_size; + DWORD subkey_len; + DWORD type, path_len, i; + BYTE *data; + WCHAR fmt[] = {'%','1','\n',0}; + WCHAR *subkey_name, *subkey_path; + HKEY subkey; + + data = heap_xalloc(max_data_bytes); + + for (;;) + { + data_size = max_data_bytes; + rc = RegQueryValueExW(key, value_name, NULL, &type, data, &data_size); + if (rc == ERROR_MORE_DATA) + { + max_data_bytes = data_size; + data = heap_xrealloc(data, max_data_bytes); + } + else break; + } + + if (rc == ERROR_SUCCESS) + { + output_string(fmt, path); + output_value(value_name, type, data, data_size); + output_string(newlineW); + num_values_found++; + } + + heap_free(data); + + if (!recurse) + { + if (rc == ERROR_FILE_NOT_FOUND) + { + if (value_name && *value_name) + { + output_message(STRING_CANNOT_FIND); + return 1; + } + output_string(fmt, path); + output_value(NULL, REG_SZ, NULL, 0); + } + return 0; + } + + subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); + + path_len = lstrlenW(path); + + i = 0; + for (;;) + { + subkey_len = MAX_SUBKEY_LEN; + rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); + if (!RegOpenKeyExW(key, subkey_name, 0, KEY_READ, &subkey)) + { + query_value(subkey, value_name, subkey_path, recurse); + RegCloseKey(subkey); + } + heap_free(subkey_path); + i++; + } + else break; + } + + heap_free(subkey_name); + return 0; +} + +static int query_all(HKEY key, WCHAR *path, BOOL recurse) +{ + LONG rc; + DWORD max_value_len = 256, value_len; + 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); + + value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); + data = heap_xalloc(max_data_bytes); + + i = 0; + for (;;) + { + value_len = max_value_len; + data_size = max_data_bytes; + rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); + if (rc == ERROR_SUCCESS) + { + output_value(value_name, type, data, data_size); + i++; + } + else if (rc == ERROR_MORE_DATA) + { + if (data_size > max_data_bytes) + { + max_data_bytes = data_size; + data = heap_xrealloc(data, max_data_bytes); + } + else + { + max_value_len *= 2; + value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + } + } + else break; + } + + heap_free(data); + heap_free(value_name); + + if (i || recurse) + output_string(newlineW); + + subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); + + path_len = lstrlenW(path); + + i = 0; + for (;;) + { + subkey_len = MAX_SUBKEY_LEN; + rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + if (recurse) + { + subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); + if (!RegOpenKeyExW(key, subkey_name, 0, KEY_READ, &subkey)) + { + query_all(subkey, subkey_path, recurse); + RegCloseKey(subkey); + } + heap_free(subkey_path); + } + else output_string(fmt_path, path, subkey_name); + i++; + } + else break; + } + + heap_free(subkey_name); + + if (i && !recurse) + output_string(newlineW); + + return 0; +} + +int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, + BOOL value_empty, BOOL recurse) +{ + HKEY key; + int ret; + + if (RegOpenKeyExW(root, path, 0, KEY_READ, &key) != ERROR_SUCCESS) + { + output_message(STRING_CANNOT_FIND); + return 1; + } + + output_string(newlineW); + + if (value_name || value_empty) + { + ret = query_value(key, value_name, key_name, recurse); + if (recurse) + output_message(STRING_MATCHES_FOUND, num_values_found); + } + else + ret = query_all(key, key_name, recurse); + + RegCloseKey(key); + + return ret; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 997a6703831..8b97c560118 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -61,12 +61,7 @@ static const WCHAR type_dword_le[] = {'R','E','G','_','D','W','O','R','D','_','L 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}; -static const struct -{ - DWORD type; - const WCHAR *name; -} -type_rels[] = +const struct reg_type_rels type_rels[] = { {REG_NONE, type_none}, {REG_SZ, type_sz}, @@ -78,8 +73,6 @@ type_rels[] = {REG_MULTI_SZ, type_multi_sz}, }; -static const WCHAR newlineW[] = {'\n',0}; - void *heap_xalloc(size_t size) { void *buf = heap_alloc(size); @@ -158,7 +151,7 @@ void WINAPIV output_message(unsigned int id, ...) __ms_va_end(va_args); } -static void WINAPIV output_string(const WCHAR *fmt, ...) +void WINAPIV output_string(const WCHAR *fmt, ...) { __ms_va_list va_args; @@ -517,117 +510,6 @@ static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name return 0; } -static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) -{ - WCHAR *buffer = NULL; - int i; - - switch (type) - { - case REG_SZ: - case REG_EXPAND_SZ: - buffer = heap_xalloc(size_bytes); - lstrcpyW(buffer, (WCHAR *)src); - break; - case REG_NONE: - case REG_BINARY: - { - WCHAR *ptr; - static const WCHAR fmt[] = {'%','0','2','X',0}; - - buffer = heap_xalloc((size_bytes * 2 + 1) * sizeof(WCHAR)); - ptr = buffer; - for (i = 0; i < size_bytes; i++) - ptr += swprintf(ptr, 3, fmt, src[i]); - break; - } - case REG_DWORD: - /* case REG_DWORD_LITTLE_ENDIAN: */ - case REG_DWORD_BIG_ENDIAN: - { - const int zero_x_dword = 10; - static const WCHAR fmt[] = {'0','x','%','x',0}; - - buffer = heap_xalloc((zero_x_dword + 1) * sizeof(WCHAR)); - swprintf(buffer, zero_x_dword + 1, fmt, *(DWORD *)src); - break; - } - case REG_MULTI_SZ: - { - const int two_wchars = 2 * sizeof(WCHAR); - DWORD tmp_size; - const WCHAR *tmp = (const WCHAR *)src; - int len, destindex; - - if (size_bytes <= two_wchars) - { - buffer = heap_xalloc(sizeof(WCHAR)); - *buffer = 0; - return buffer; - } - - tmp_size = size_bytes - two_wchars; /* exclude both null terminators */ - buffer = heap_xalloc(tmp_size * 2 + sizeof(WCHAR)); - len = tmp_size / sizeof(WCHAR); - - for (i = 0, destindex = 0; i < len; i++, destindex++) - { - if (tmp[i]) - buffer[destindex] = tmp[i]; - else - { - buffer[destindex++] = '\\'; - buffer[destindex] = '0'; - } - } - buffer[destindex] = 0; - break; - } - } - return buffer; -} - -static const WCHAR *reg_type_to_wchar(DWORD type) -{ - int i, array_size = ARRAY_SIZE(type_rels); - - for (i = 0; i < array_size; i++) - { - if (type == type_rels[i].type) - return type_rels[i].name; - } - return NULL; -} - -static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD data_size) -{ - static const WCHAR fmt[] = {' ',' ',' ',' ','%','1',0}; - WCHAR defval[32]; - WCHAR *reg_data; - - if (value_name && value_name[0]) - output_string(fmt, value_name); - else - { - LoadStringW(GetModuleHandleW(NULL), STRING_DEFAULT_VALUE, defval, ARRAY_SIZE(defval)); - output_string(fmt, defval); - } - output_string(fmt, reg_type_to_wchar(type)); - - if (data) - { - reg_data = reg_data_to_wchar(type, data, data_size); - output_string(fmt, reg_data); - heap_free(reg_data); - } - else - { - LoadStringW(GetModuleHandleW(NULL), STRING_VALUE_NOT_SET, defval, ARRAY_SIZE(defval)); - output_string(fmt, defval); - } - output_string(newlineW); -} - WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) { WCHAR *subkey_path; @@ -639,199 +521,6 @@ WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD return subkey_path; } -static unsigned int num_values_found = 0; - -static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) -{ - LONG rc; - DWORD max_data_bytes = 2048, data_size; - DWORD subkey_len; - DWORD type, path_len, i; - BYTE *data; - WCHAR fmt[] = {'%','1','\n',0}; - WCHAR *subkey_name, *subkey_path; - HKEY subkey; - - data = heap_xalloc(max_data_bytes); - - for (;;) - { - data_size = max_data_bytes; - rc = RegQueryValueExW(key, value_name, NULL, &type, data, &data_size); - if (rc == ERROR_MORE_DATA) - { - max_data_bytes = data_size; - data = heap_xrealloc(data, max_data_bytes); - } - else break; - } - - if (rc == ERROR_SUCCESS) - { - output_string(fmt, path); - output_value(value_name, type, data, data_size); - output_string(newlineW); - num_values_found++; - } - - heap_free(data); - - if (!recurse) - { - if (rc == ERROR_FILE_NOT_FOUND) - { - if (value_name && *value_name) - { - output_message(STRING_CANNOT_FIND); - return 1; - } - output_string(fmt, path); - output_value(NULL, REG_SZ, NULL, 0); - } - return 0; - } - - subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); - - path_len = lstrlenW(path); - - i = 0; - for (;;) - { - subkey_len = MAX_SUBKEY_LEN; - rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); - if (rc == ERROR_SUCCESS) - { - subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); - if (!RegOpenKeyExW(key, subkey_name, 0, KEY_READ, &subkey)) - { - query_value(subkey, value_name, subkey_path, recurse); - RegCloseKey(subkey); - } - heap_free(subkey_path); - i++; - } - else break; - } - - heap_free(subkey_name); - return 0; -} - -static int query_all(HKEY key, WCHAR *path, BOOL recurse) -{ - LONG rc; - DWORD max_value_len = 256, value_len; - 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); - - value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); - data = heap_xalloc(max_data_bytes); - - i = 0; - for (;;) - { - value_len = max_value_len; - data_size = max_data_bytes; - rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); - if (rc == ERROR_SUCCESS) - { - output_value(value_name, type, data, data_size); - i++; - } - else if (rc == ERROR_MORE_DATA) - { - if (data_size > max_data_bytes) - { - max_data_bytes = data_size; - data = heap_xrealloc(data, max_data_bytes); - } - else - { - max_value_len *= 2; - value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); - } - } - else break; - } - - heap_free(data); - heap_free(value_name); - - if (i || recurse) - output_string(newlineW); - - subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); - - path_len = lstrlenW(path); - - i = 0; - for (;;) - { - subkey_len = MAX_SUBKEY_LEN; - rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); - if (rc == ERROR_SUCCESS) - { - if (recurse) - { - subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); - if (!RegOpenKeyExW(key, subkey_name, 0, KEY_READ, &subkey)) - { - query_all(subkey, subkey_path, recurse); - RegCloseKey(subkey); - } - heap_free(subkey_path); - } - else output_string(fmt_path, path, subkey_name); - i++; - } - else break; - } - - heap_free(subkey_name); - - if (i && !recurse) - output_string(newlineW); - - return 0; -} - -static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL recurse) -{ - HKEY key; - int ret; - - if (RegOpenKeyExW(root, path, 0, KEY_READ, &key) != ERROR_SUCCESS) - { - output_message(STRING_CANNOT_FIND); - return 1; - } - - output_string(newlineW); - - if (value_name || value_empty) - { - ret = query_value(key, value_name, key_name, recurse); - if (recurse) - output_message(STRING_MATCHES_FOUND, num_values_found); - } - else - ret = query_all(key, key_name, recurse); - - RegCloseKey(key); - - return ret; -} - static WCHAR *get_long_key(HKEY root, WCHAR *path) { DWORD i, array_size = ARRAY_SIZE(root_rels), len; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index a27399d06a4..471ed9c4d55 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -24,19 +24,31 @@ #define MAX_SUBKEY_LEN 257 /* reg.c */ +struct reg_type_rels { + DWORD type; + const WCHAR *name; +}; + +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, ...); +void WINAPIV output_string(const WCHAR *fmt, ...); 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); +/* export.c */ +int reg_export(int argc, WCHAR *argv[]); + /* import.c */ int reg_import(const WCHAR *filename); -/* export.c */ -int reg_export(int argc, WCHAR *argv[]); +/* query.c */ +int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, + BOOL value_empty, BOOL recurse); #endif /* __REG_H__ */ -- 2.31.0

1 2