December 2021 - Wine-Commits

Zebediah Figura : ntdll: Factor out in_wow64_call().
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 7bea24f6e12be7cbb53ef75245468331ede31152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bea24f6e12be7cbb53ef752… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:31 2021 -0600 ntdll: Factor out in_wow64_call(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/unix_private.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 9b79b712b1e..d9ce8300fa9 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -342,11 +342,19 @@ static inline NTSTATUS wait_async( HANDLE handle, BOOL alertable ) return NtWaitForSingleObject( handle, alertable, NULL ); } +static inline BOOL in_wow64_call(void) +{ +#ifdef _WIN64 + return !!NtCurrentTeb()->WowTebOffset; +#endif + return FALSE; +} + static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR info ) { if (!iosb) return; -#ifdef _WIN64 - if (NtCurrentTeb()->WowTebOffset) + + if (in_wow64_call()) { struct iosb32 { @@ -357,7 +365,6 @@ static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR io->Information = info; } else -#endif { IO_STATUS_BLOCK *io = wine_server_get_ptr( iosb ); #ifdef NONAMELESSUNION @@ -371,12 +378,10 @@ static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR static inline client_ptr_t iosb_client_ptr( IO_STATUS_BLOCK *io ) { -#ifdef _WIN64 #ifdef NONAMELESSUNION - if (io && NtCurrentTeb()->WowTebOffset) return wine_server_client_ptr( io->u.Pointer ); + if (io && in_wow64_call()) return wine_server_client_ptr( io->u.Pointer ); #else - if (io && NtCurrentTeb()->WowTebOffset) return wine_server_client_ptr( io->Pointer ); -#endif + if (io && in_wow64_call()) return wine_server_client_ptr( io->Pointer ); #endif return wine_server_client_ptr( io ); }

1 0

Eric Pouech : dbghelp: Implement SymEnumTypesByName(W).
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: a6bf722bffb6cd731667151eab61f36b60caec9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6bf722bffb6cd731667151e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:45:02 2021 +0100 dbghelp: Implement SymEnumTypesByName(W). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 4 +- dlls/dbghelp/type.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ include/dbghelp.h | 2 + 3 files changed, 120 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 471d9b6141c..87861cd87ce 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -57,8 +57,8 @@ @ stub SymEnumSymbolsForAddrW @ stdcall SymEnumSymbolsW(ptr int64 wstr ptr ptr) @ stdcall SymEnumTypes(ptr int64 ptr ptr) -@ stub SymEnumTypesByName -@ stub SymEnumTypesByNameW +@ stdcall SymEnumTypesByName(ptr int64 str ptr ptr) +@ stdcall SymEnumTypesByNameW(ptr int64 wstr ptr ptr) @ stdcall SymEnumTypesW(ptr int64 ptr ptr) @ stdcall SymEnumerateModules(long ptr ptr) @ stdcall SymEnumerateModules64(long ptr ptr) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 3140d30e0bc..67f4265ddc9 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -544,6 +544,122 @@ BOOL WINAPI SymEnumTypesW(HANDLE hProcess, ULONG64 BaseOfDll, return SymEnumTypes(hProcess, BaseOfDll, enum_types_AtoW, &et); } +static void enum_types_of_module(struct module_pair* pair, const char* name, PSYM_ENUMERATESYMBOLS_CALLBACK cb, PVOID user) +{ + char buffer[sizeof(SYMBOL_INFO) + 256]; + SYMBOL_INFO* sym_info = (SYMBOL_INFO*)buffer; + struct symt* type; + DWORD64 size; + unsigned i; + const char* tname; + + sym_info->SizeOfStruct = sizeof(SYMBOL_INFO); + sym_info->MaxNameLen = sizeof(buffer) - sizeof(SYMBOL_INFO); + + for (i = 0; i < vector_length(&pair->effective->vtypes); i++) + { + type = *(struct symt**)vector_at(&pair->effective->vtypes, i); + tname = symt_get_name(type); + if (tname && SymMatchStringA(tname, name, TRUE)) + { + sym_info->TypeIndex = symt_ptr2index(pair->effective, type); + sym_info->Index = 0; /* FIXME */ + symt_get_info(pair->effective, type, TI_GET_LENGTH, &size); + sym_info->Size = size; + sym_info->ModBase = pair->requested->module.BaseOfImage; + sym_info->Flags = 0; /* FIXME */ + sym_info->Value = 0; /* FIXME */ + sym_info->Address = 0; /* FIXME */ + sym_info->Register = 0; /* FIXME */ + sym_info->Scope = 0; /* FIXME */ + sym_info->Tag = type->tag; + symbol_setname(sym_info, tname); + if (!cb(sym_info, sym_info->Size, user)) break; + } + } +} + +static BOOL walk_modules(struct module_pair* pair) +{ + /* first walk PE only modules */ + if (!pair->requested || pair->requested->type == DMT_PE) + { + while ((pair->requested = pair->requested ? pair->requested->next : pair->pcs->lmodules) != NULL) + { + if (pair->requested->type == DMT_PE && module_get_debug(pair)) return TRUE; + } + } + /* then walk ELF or Mach-O modules, not containing PE modules */ + while ((pair->requested = pair->requested ? pair->requested->next : pair->pcs->lmodules) != NULL) + { + if ((pair->requested->type == DMT_ELF || pair->requested->type == DMT_MACHO) && + !module_get_containee(pair->pcs, pair->requested) && + module_get_debug(pair)) + return TRUE; + } + return FALSE; +} + +BOOL WINAPI SymEnumTypesByName(HANDLE proc, ULONG64 base, PCSTR name, PSYM_ENUMERATESYMBOLS_CALLBACK cb, PVOID user) +{ + struct module_pair pair; + const char* bang; + + TRACE("(%p %I64x %s %p %p)\n", proc, base, wine_dbgstr_a(name), cb, user); + + if (!name) return SymEnumTypes(proc, base, cb, user); + bang = strchr(name, '!'); + if (bang) + { + DWORD sz; + WCHAR* modW; + pair.pcs = process_find_by_handle(proc); + if (bang == name) return FALSE; + if (!pair.pcs) return FALSE; + sz = MultiByteToWideChar(CP_ACP, 0, name, bang - name, NULL, 0) + 1; + if ((modW = malloc(sz * sizeof(WCHAR))) == NULL) return FALSE; + MultiByteToWideChar(CP_ACP, 0, name, bang - name, modW, sz); + modW[sz - 1] = L'\0'; + pair.requested = NULL; + while (walk_modules(&pair)) + { + if (SymMatchStringW(pair.requested->modulename, modW, FALSE)) + enum_types_of_module(&pair, bang + 1, cb, user); + } + free(modW); + } + else + { + if (!module_init_pair(&pair, proc, base) || !module_get_debug(&pair)) return FALSE; + enum_types_of_module(&pair, name, cb, user); + } + return TRUE; +} + +BOOL WINAPI SymEnumTypesByNameW(HANDLE proc, ULONG64 base, PCWSTR nameW, PSYM_ENUMERATESYMBOLS_CALLBACKW cb, PVOID user) +{ + struct enum_types_AtoW et; + DWORD len = nameW ? WideCharToMultiByte(CP_ACP, 0, nameW, -1, NULL, 0, NULL, NULL) : 0; + char* name; + BOOL ret; + + TRACE("(%p %I64x %s %p %p)\n", proc, base, wine_dbgstr_w(nameW), cb, user); + + if (len) + { + if (!(name = malloc(len))) return FALSE; + WideCharToMultiByte(CP_ACP, 0, nameW, -1, name, len, NULL, NULL); + } + else name = NULL; + + et.callback = cb; + et.user = user; + + ret = SymEnumTypesByName(proc, base, name, enum_types_AtoW, &et); + free(name); + return ret; +} + /****************************************************************** * symt_get_info * diff --git a/include/dbghelp.h b/include/dbghelp.h index 248b3ab418d..07fa429809a 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1081,6 +1081,8 @@ typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)(PSYMBOL_INFO, ULONG, PVO typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACKW)(PSYMBOL_INFOW, ULONG, PVOID); BOOL WINAPI SymEnumTypes(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); BOOL WINAPI SymEnumTypesW(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACKW, PVOID); +BOOL WINAPI SymEnumTypesByName(HANDLE, ULONG64, PCSTR, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); +BOOL WINAPI SymEnumTypesByNameW(HANDLE, ULONG64, PCWSTR, PSYM_ENUMERATESYMBOLS_CALLBACKW, PVOID); BOOL WINAPI SymFromAddr(HANDLE, DWORD64, DWORD64*, SYMBOL_INFO*); BOOL WINAPI SymFromAddrW(HANDLE, DWORD64, DWORD64*, SYMBOL_INFOW*); BOOL WINAPI SymFromInlineContext(HANDLE, DWORD64, ULONG, PDWORD64, PSYMBOL_INFO);

1 0

Jacek Caban : winevulkan: Pass Unix call arguments as a struct.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 3661194f8e8146a594673ad3682290f10fa2c096 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3661194f8e8146a594673ad3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 18:40:42 2021 +0100 winevulkan: Pass Unix call arguments as a struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 31 +- dlls/winevulkan/loader_thunks.c | 2683 ++++++++++++++++++++++---- dlls/winevulkan/loader_thunks.h | 3946 +++++++++++++++++++++++++++++++++++---- dlls/winevulkan/make_vulkan | 100 +- dlls/winevulkan/vulkan.c | 285 ++- dlls/winevulkan/vulkan_thunks.c | 3749 ++++++++++++++++++++++--------------- dlls/winevulkan/vulkan_thunks.h | 76 +- 7 files changed, 8364 insertions(+), 2506 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3661194f8e8146a59467…

1 0

Alexandre Julliard : winevulkan: Remove unnecessary '&' on function pointers.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: c2384cf23378953b6960e7044a0e467944e8814a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2384cf23378953b6960e704… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 20:07:37 2021 +0100 winevulkan: Remove unnecessary '&' on function pointers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 818 +++++++++++++++++++-------------------- dlls/winevulkan/make_vulkan | 14 +- dlls/winevulkan/vulkan_thunks.c | 828 ++++++++++++++++++++-------------------- 3 files changed, 830 insertions(+), 830 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2384cf23378953b6960…

1 0

Jacek Caban : winevulkan: Use __wine_unix_call interface for some Vulkan functions.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: c3862f2a6121796814ae31913bfb0efeba565087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3862f2a6121796814ae3191… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 18:41:16 2021 +0100 winevulkan: Use __wine_unix_call interface for some Vulkan functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 4 +- dlls/winevulkan/loader_thunks.c | 478 ++++++++++++++++++++-------------------- dlls/winevulkan/make_vulkan | 21 +- 3 files changed, 261 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3862f2a6121796814ae…

1 0

Jacek Caban : winevulkan: Support prefixing function parameters.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 9aef654392756aacdce6109ccbe21ba446ee4387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aef654392756aacdce6109c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 18:40:33 2021 +0100 winevulkan: Support prefixing function parameters. To allow them being accessed from a struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 59 ++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 53d69964aaa..adc8b4b76e3 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -721,19 +721,21 @@ class VkFunction(object): return proto - def body(self): + def body(self, params_prefix=""): body = "" if not self.needs_private_thunk(): - body += " {0}".format(self.trace()) + body += " {0}".format(self.trace(params_prefix=params_prefix)) - params = ", ".join([p.variable(conv=False) for p in self.params]) + params = ", ".join([p.variable(conv=False, params_prefix=params_prefix) for p in self.params]) # Call the native Vulkan function. if self.type == "void": - body += " {0}.p_{1}({2});\n".format(self.params[0].dispatch_table(), self.name, params) + body += " {0}{1}.p_{2}({3});\n".format(params_prefix, self.params[0].dispatch_table(), + self.name, params) else: - body += " return {0}.p_{1}({2});\n".format(self.params[0].dispatch_table(), self.name, params) + body += " return {0}{1}.p_{2}({3});\n".format(params_prefix, self.params[0].dispatch_table(), + self.name, params) return body @@ -750,7 +752,7 @@ class VkFunction(object): return body - def body_conversion(self, conv): + def body_conversion(self, conv, params_prefix=""): body = "" # Declare a variable to hold the result for non-void functions. @@ -771,22 +773,24 @@ class VkFunction(object): body += " {0} {1}_host;\n".format(p.type, p.name) if not self.needs_private_thunk(): - body += " {0}\n".format(self.trace()) + body += " {0}\n".format(self.trace(params_prefix=params_prefix)) # Call any win_to_host conversion calls. for p in self.params: if p.needs_input_conversion() and (p.needs_unwrapping() or conv): - body += p.copy(Direction.INPUT) + body += p.copy(Direction.INPUT, prefix=params_prefix) # Build list of parameters containing converted and non-converted parameters. # The param itself knows if conversion is needed and applies it when we set conv=True. - params = ", ".join([p.variable(conv=conv) for p in self.params]) + params = ", ".join([p.variable(conv=conv, params_prefix=params_prefix) for p in self.params]) # Call the native Vulkan function. if self.type == "void": - body += " {0}.p_{1}({2});\n".format(self.params[0].dispatch_table(), self.name, params) + body += " {0}{1}.p_{2}({3});\n".format(params_prefix, self.params[0].dispatch_table(), + self.name, params) else: - body += " result = {0}.p_{1}({2});\n".format(self.params[0].dispatch_table(), self.name, params) + body += " result = {0}{1}.p_{2}({3});\n".format(params_prefix, self.params[0].dispatch_table(), + self.name, params) body += "\n" @@ -795,12 +799,12 @@ class VkFunction(object): if not p.needs_output_conversion(): continue - body += p.copy(Direction.OUTPUT) + body += p.copy(Direction.OUTPUT, prefix=params_prefix) # Perform any required cleanups. Most of these are for array functions. for p in self.params: if p.needs_free() and (p.needs_unwrapping() or conv): - body += p.free() + body += p.free(prefix=params_prefix) # Finally return the result. if self.type != "void": @@ -872,7 +876,7 @@ class VkFunction(object): thunk += "}\n\n" return thunk - def trace(self, message=None, trace_func=None): + def trace(self, message=None, trace_func=None, params_prefix=""): """ Create a trace string including all parameters. Args: @@ -894,9 +898,9 @@ class VkFunction(object): # Second loop for parameter names and optional conversions. for param in self.params: if param.format_conv is not None: - trace += ", " + param.format_conv.format(param.name) + trace += ", " + param.format_conv.format("{0}{1}".format(params_prefix, param.name)) else: - trace += ", {0}".format(param.name) + trace += ", {0}{1}".format(params_prefix, param.name) trace += ");\n" return trace @@ -1599,17 +1603,17 @@ class VkParam(object): else: LOGGER.warn("Unhandled type: {0}".format(self.type_info)) - def copy(self, direction): + def copy(self, direction, prefix=""): if direction == Direction.INPUT: if self.is_dynamic_array(): - return " {0}_host = convert_{1}_array_win_to_host({0}, {2});\n".format(self.name, self.type, self.dyn_array_len) + return " {1}_host = convert_{2}_array_win_to_host({0}{1}, {0}{3});\n".format(prefix, self.name, self.type, self.dyn_array_len) else: - return " convert_{0}_win_to_host({1}, &{1}_host);\n".format(self.type, self.name) + return " convert_{0}_win_to_host({1}{2}, &{2}_host);\n".format(self.type, prefix, self.name) else: if self.is_dynamic_array(): LOGGER.error("Unimplemented output conversion for: {0}".format(self.name)) else: - return " convert_{0}_host_to_win(&{1}_host, {1});\n".format(self.type, self.name) + return " convert_{0}_host_to_win(&{2}_host, {1}{2});\n".format(self.type, prefix, self.name) def definition(self, postfix=None): """ Return prototype for the parameter. E.g. 'const char *foo' """ @@ -1654,13 +1658,13 @@ class VkParam(object): def format_string(self): return self.format_str - def free(self): + def free(self, prefix=""): if self.is_dynamic_array(): if self.is_struct() and self.struct.returnedonly: # For returnedonly, counts is stored in a pointer. - return " free_{0}_array({1}_host, *{2});\n".format(self.type, self.name, self.dyn_array_len) + return " free_{0}_array({1}_host, *{2}{3});\n".format(self.type, self.name, prefix, self.dyn_array_len) else: - return " free_{0}_array({1}_host, {2});\n".format(self.type, self.name, self.dyn_array_len) + return " free_{0}_array({1}_host, {2}{3});\n".format(self.type, self.name, prefix, self.dyn_array_len) else: # We are operating on a single structure. Some structs (very rare) contain dynamic members, # which would need freeing. @@ -1801,7 +1805,7 @@ class VkParam(object): LOGGER.error("Unhandled spec conversion for type: {0}".format(self.type)) - def variable(self, conv=False): + def variable(self, conv=False, params_prefix=""): """ Returns 'glue' code during generation of a function call on how to access the variable. This function handles various scenarios such as 'unwrapping' if dispatchable objects and renaming of parameters in case of win32 -> host conversion. @@ -1823,12 +1827,13 @@ class VkParam(object): return "&{0}_host".format(self.name) else: if self.object_type != None and self.type == "uint64_t": - return "wine_vk_unwrap_handle({0}, {1})".format(self.object_type, self.name) + return "wine_vk_unwrap_handle({0}{1}, {0}{2})".format(params_prefix, self.object_type, self.name) # We need to pass the native handle to the native Vulkan calls and # the wine driver's handle to calls which are wrapped by the driver. - driver_handle = self.handle.driver_handle(self.name) if self.is_handle() else None - return driver_handle if driver_handle else self.name + p = "{0}{1}".format(params_prefix, self.name) + driver_handle = self.handle.driver_handle(p) if self.is_handle() else None + return driver_handle if driver_handle else p class VkStruct(Sequence):

1 0

Alex Henrie : advapi32/tests: Accept more broken values in the RegEnumValue name overflow tests.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 9614a633a65eecc024552f0e9b47fc4e2ecbb691 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9614a633a65eecc024552f0e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 9 22:32:58 2021 -0700 advapi32/tests: Accept more broken values in the RegEnumValue name overflow tests. Fixes several intermittent testbot failures. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d09fe9a4add..c4f63c6cd27 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -548,12 +548,13 @@ static void test_enum_value(void) res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 3, "val_count set to %d\n", val_count ); - ok( data_count == 7 || broken( data_count == 8 ), "data_count set to %d instead of 7\n", data_count ); + /* Chinese, Japanese, and Korean editions of Windows 10 sometimes set data_count to a higher value */ + ok( data_count == 7 || broken( data_count > 7 ), "data_count set to %d instead of 7\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in this case */ ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ), "value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value ); - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count == 8 ), + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count > 7 ), "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); /* overflow empty name */ @@ -565,11 +566,12 @@ static void test_enum_value(void) res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 0, "val_count set to %d\n", val_count ); - ok( data_count == 7 || broken( data_count == 8 ), "data_count set to %d instead of 7\n", data_count ); + /* Chinese, Japanese, and Korean editions of Windows 10 sometimes set data_count to a higher value */ + ok( data_count == 7 || broken( data_count > 7 ), "data_count set to %d instead of 7\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); /* v5.1.2600.0 (XP Home and Professional) does not touch data in this case */ - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count == 8 ), + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count > 7 ), "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); /* overflow data */

1 0

Eric Pouech : winedbg: Move module scoping to the lexer.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: c03d651b486c1562c208d549299445e8e576d3d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c03d651b486c1562c208d549… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:44:56 2021 +0100 winedbg: Move module scoping to the lexer. This allows expressing module scoping with wildcard characters (eg kernel*!CreateFileA). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 2 -- programs/winedbg/debug.l | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 79877b2c644..3e6ef34b836 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -164,8 +164,6 @@ pathname: identifier: tIDENTIFIER { $$ = $1; } - | tIDENTIFIER '!' tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 1 + strlen($3) + 1); - sprintf($$, "%s!%s", $1, $3); } ; list_arg: diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index a587a13fb70..280013799c9 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -100,6 +100,7 @@ HEXDIGIT [0-9a-fA-F] FORMAT [ubcdgiswxa] IDENTIFIER [_a-zA-Z~?][_a-zA-Z0-9~?@]* SCOPED_IDENTIFIER [_a-zA-Z~?][_a-zA-Z0-9~?@]*"::" +MODULE_IDENTIFIER [_a-zA-Z~?\*][_a-zA-Z0-9~?\*@]*"!" PATHNAME [\\/_a-zA-Z0-9\.~@][\\/\-_a-zA-Z0-9\.~@]* STRING \"(\\[^\n]|[^\\"\n])*\" @@ -243,7 +244,7 @@ union { return tUNION; } enum { return tENUM; } all { return tALL; } -{SCOPED_IDENTIFIER}*{IDENTIFIER} { dbg_lval.string = lexeme_alloc(yytext); return tIDENTIFIER; } +{MODULE_IDENTIFIER}?{SCOPED_IDENTIFIER}*{IDENTIFIER} { dbg_lval.string = lexeme_alloc(yytext); return tIDENTIFIER; } "$"{IDENTIFIER} { dbg_lval.string = lexeme_alloc(yytext+1); return tINTVAR; } <PATH_EXPECTED,PATH_ACCEPTED>{PATHNAME} { dbg_lval.string = lexeme_alloc(yytext); return tPATH; }

1 0

Eric Pouech : winedbg: Remove fetch_float() method from CPU backends.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 5f9d09f4bdd7303425d1100b67f6baeb228b3203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9d09f4bdd7303425d1100b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:44:38 2021 +0100 winedbg: Remove fetch_float() method from CPU backends. As they're all the same. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 18 ------------------ programs/winedbg/be_arm64.c | 18 ------------------ programs/winedbg/be_cpu.h | 3 --- programs/winedbg/be_i386.c | 18 ------------------ programs/winedbg/be_x86_64.c | 18 ------------------ programs/winedbg/debugger.h | 1 + programs/winedbg/memory.c | 17 ++++++++++++++++- 7 files changed, 17 insertions(+), 76 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 02f72e9c789..a9551a40337 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1831,23 +1831,6 @@ static int be_arm_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) return step; } -static BOOL be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, double *ret) -{ - char tmp[sizeof(double)]; - - /* FIXME: this assumes that debuggee and debugger use the same - * representation for reals - */ - if (size > sizeof(tmp)) return FALSE; - if (!memory_read_value(lvalue, size, tmp)) return FALSE; - - if (size == sizeof(float)) *ret = *(float*)tmp; - else if (size == sizeof(double)) *ret = *(double*)tmp; - else return FALSE; - - return TRUE; -} - static BOOL be_arm_get_context(HANDLE thread, dbg_ctx_t *ctx) { ctx->ctx.ContextFlags = CONTEXT_ALL; @@ -1904,7 +1887,6 @@ struct backend_cpu be_arm = be_arm_is_watchpoint_set, be_arm_clear_watchpoint, be_arm_adjust_pc_for_break, - be_arm_fetch_float, be_arm_get_context, be_arm_set_context, be_arm_gdb_register_map, diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index 8ca54e6c461..ab64801e6db 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -228,23 +228,6 @@ static int be_arm64_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) return 4; } -static BOOL be_arm64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, double *ret) -{ - char tmp[sizeof(double)]; - - /* FIXME: this assumes that debuggee and debugger use the same - * representation for reals - */ - if (size > sizeof(tmp)) return FALSE; - if (!memory_read_value(lvalue, size, tmp)) return FALSE; - - if (size == sizeof(float)) *ret = *(float*)tmp; - else if (size == sizeof(double)) *ret = *(double*)tmp; - else return FALSE; - - return TRUE; -} - void be_arm64_disasm_one_insn(ADDRESS64 *addr, int display) { dbg_printf("be_arm64_disasm_one_insn: not done\n"); @@ -323,7 +306,6 @@ struct backend_cpu be_arm64 = be_arm64_is_watchpoint_set, be_arm64_clear_watchpoint, be_arm64_adjust_pc_for_break, - be_arm64_fetch_float, be_arm64_get_context, be_arm64_set_context, be_arm64_gdb_register_map, diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index 69e3e148f75..0c4f9b8f056 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -118,9 +118,6 @@ struct backend_cpu /* ------------------------------------------------------------------------------- * basic type read/write * -------------------------------------------------------------------------------*/ - /* Reads a real from memory and stores it inside a long double */ - BOOL (*fetch_float)(const struct dbg_lvalue* lvalue, unsigned size, double*); - BOOL (*get_context)(HANDLE thread, dbg_ctx_t *ctx); BOOL (*set_context)(HANDLE thread, const dbg_ctx_t *ctx); diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 9b3c615092c..262e68894d5 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -777,23 +777,6 @@ static int be_i386_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) return 1; } -static BOOL be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, double *ret) -{ - char tmp[sizeof(double)]; - - /* FIXME: this assumes that debuggee and debugger use the same - * representation for reals - */ - if (size > sizeof(tmp)) return FALSE; - if (!memory_read_value(lvalue, size, tmp)) return FALSE; - - if (size == sizeof(float)) *ret = *(float*)tmp; - else if (size == sizeof(double)) *ret = *(double*)tmp; - else return FALSE; - - return TRUE; -} - static BOOL be_i386_get_context(HANDLE thread, dbg_ctx_t *ctx) { ctx->x86.ContextFlags = WOW64_CONTEXT_ALL; @@ -875,7 +858,6 @@ struct backend_cpu be_i386 = be_i386_is_watchpoint_set, be_i386_clear_watchpoint, be_i386_adjust_pc_for_break, - be_i386_fetch_float, be_i386_get_context, be_i386_set_context, be_i386_gdb_register_map, diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 169a31a584d..44079c2fe76 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -699,23 +699,6 @@ static int be_x86_64_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) return 1; } -static BOOL be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, double *ret) -{ - char tmp[sizeof(double)]; - - /* FIXME: this assumes that debuggee and debugger use the same - * representation for reals - */ - if (size > sizeof(tmp)) return FALSE; - if (!memory_read_value(lvalue, size, tmp)) return FALSE; - - if (size == sizeof(float)) *ret = *(float*)tmp; - else if (size == sizeof(double)) *ret = *(double*)tmp; - else return FALSE; - - return TRUE; -} - static BOOL be_x86_64_get_context(HANDLE thread, dbg_ctx_t *ctx) { ctx->ctx.ContextFlags = CONTEXT_ALL; @@ -813,7 +796,6 @@ struct backend_cpu be_x86_64 = be_x86_64_is_watchpoint_set, be_x86_64_clear_watchpoint, be_x86_64_adjust_pc_for_break, - be_x86_64_fetch_float, be_x86_64_get_context, be_x86_64_set_context, be_x86_64_gdb_register_map, diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 09bd98e70e6..578240c6453 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -396,6 +396,7 @@ extern BOOL memory_transfer_value(const struct dbg_lvalue* to, const extern BOOL memory_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, dbg_lgint_t* ret); extern BOOL memory_store_integer(const struct dbg_lvalue* lvalue, dbg_lgint_t val); +extern BOOL memory_fetch_float(const struct dbg_lvalue* lvalue, double *ret); extern void memory_examine(const struct dbg_lvalue *lvalue, int count, char format); extern void* memory_to_linear_addr(const ADDRESS64* address); extern BOOL memory_get_current_pc(ADDRESS64* address); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 6dffcc9db45..eed9bf6c049 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -338,6 +338,21 @@ BOOL memory_store_integer(const struct dbg_lvalue* lvalue, dbg_lgint_t val) return memory_write_value(lvalue, (unsigned)size, &val); } +BOOL memory_fetch_float(const struct dbg_lvalue* lvalue, double *ret) +{ + DWORD64 size; + if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &size)) return FALSE; + /* FIXME: this assumes that debuggee and debugger use the same + * representation for reals + */ + if (size > sizeof(*ret)) return FALSE; + if (!memory_read_value(lvalue, size, ret)) return FALSE; + + if (size == sizeof(float)) *ret = *(float*)ret; + else if (size != sizeof(double)) return FALSE; + + return TRUE; +} BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee, BOOL unicode, char* buffer, int size) @@ -478,7 +493,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) dbg_print_hex(size, val_int); break; case btFloat: - if (!dbg_curr_process->be_cpu->fetch_float(lvalue, size, &val_real)) return; + if (!memory_fetch_float(lvalue, &val_real)) return; dbg_printf("%f", val_real); break; case btChar:

1 0

Eric Pouech : winedbg: Implement proper assignements of floating point numbers.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 05c5a12f87eec74dc64e728d7e60861b5517c033 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05c5a12f87eec74dc64e728d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:44:44 2021 +0100 winedbg: Implement proper assignements of floating point numbers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 2 ++ programs/winedbg/memory.c | 17 +++++++++++++++++ programs/winedbg/types.c | 17 ++++++++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 578240c6453..b676bc8d955 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -397,6 +397,7 @@ extern BOOL memory_fetch_integer(const struct dbg_lvalue* lvalue, un BOOL is_signed, dbg_lgint_t* ret); extern BOOL memory_store_integer(const struct dbg_lvalue* lvalue, dbg_lgint_t val); extern BOOL memory_fetch_float(const struct dbg_lvalue* lvalue, double *ret); +extern BOOL memory_store_float(const struct dbg_lvalue* lvalue, double *ret); extern void memory_examine(const struct dbg_lvalue *lvalue, int count, char format); extern void* memory_to_linear_addr(const ADDRESS64* address); extern BOOL memory_get_current_pc(ADDRESS64* address); @@ -497,6 +498,7 @@ extern struct dbg_type types_find_pointer(const struct dbg_type* type); extern struct dbg_type types_find_type(DWORD64 linear, const char* name, enum SymTagEnum tag); extern BOOL types_compare(const struct dbg_type, const struct dbg_type, BOOL* equal); extern BOOL types_is_integral_type(const struct dbg_lvalue*); +extern BOOL types_is_float_type(const struct dbg_lvalue*); /* winedbg.c */ extern void dbg_outputW(const WCHAR* buffer, int len); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index eed9bf6c049..5e01bef5607 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -354,6 +354,23 @@ BOOL memory_fetch_float(const struct dbg_lvalue* lvalue, double *ret) return TRUE; } +BOOL memory_store_float(const struct dbg_lvalue* lvalue, double *ret) +{ + DWORD64 size; + if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &size)) return FALSE; + /* FIXME: this assumes that debuggee and debugger use the same + * representation for reals + */ + if (size > sizeof(*ret)) return FALSE; + if (size == sizeof(float)) + { + float f = *ret; + return memory_write_value(lvalue, size, &f); + } + if (size != sizeof(double)) return FALSE; + return memory_write_value(lvalue, size, ret); +} + BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee, BOOL unicode, char* buffer, int size) { diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 48f985f7e16..1383f025430 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -168,6 +168,12 @@ BOOL types_store_value(struct dbg_lvalue* lvalue_to, const struct dbg_lvalue* lv if (!types_compare(lvalue_to->type, lvalue_from->type, &equal)) return FALSE; if (equal) return memory_transfer_value(lvalue_to, lvalue_from); + if (types_is_float_type(lvalue_from) && types_is_float_type(lvalue_to)) + { + double d; + return memory_fetch_float(lvalue_from, &d) && + memory_store_float(lvalue_to, &d); + } } if (types_is_integral_type(lvalue_from) && types_is_integral_type(lvalue_to)) { @@ -175,7 +181,6 @@ BOOL types_store_value(struct dbg_lvalue* lvalue_to, const struct dbg_lvalue* lv dbg_lgint_t val = types_extract_as_integer(lvalue_from); return memory_store_integer(lvalue_to, val); } - /* FIXME: should support floats as well */ dbg_printf("Cannot assign (different types)\n"); return FALSE; return FALSE; } @@ -1075,3 +1080,13 @@ BOOL types_is_integral_type(const struct dbg_lvalue* lv) !types_get_info(&type, TI_GET_BASETYPE, &bt)) return FALSE; return is_basetype_integer(bt); } + +BOOL types_is_float_type(const struct dbg_lvalue* lv) +{ + struct dbg_type type = lv->type; + DWORD tag, bt; + if (lv->bitlen) return FALSE; + if (!types_get_real_type(&type, &tag) || + !types_get_info(&type, TI_GET_BASETYPE, &bt)) return FALSE; + return bt == btFloat; +}

1 0