October 2021 - Wine-commits

Jacek Caban : win32u: Move NtUserSetObjectInformation implementation from user32.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 9f041bb21e1140825a2cea72bf7c795800ee1609 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f041bb21e1140825a2cea72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 14:56:22 2021 +0200 win32u: Move NtUserSetObjectInformation implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/winstation.c | 28 +--------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 25 +++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 9 files changed, 42 insertions(+), 30 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 97ad596e518..306f955b2a2 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -713,7 +713,7 @@ @ stdcall SetThreadDpiAwarenessContext(ptr) @ stdcall SetTimer(long long long ptr) @ stdcall SetUserObjectInformationA(long long ptr long) -@ stdcall SetUserObjectInformationW(long long ptr long) +@ stdcall SetUserObjectInformationW(long long ptr long) NtUserSetObjectInformation @ stdcall SetUserObjectSecurity(long ptr ptr) @ stdcall SetWinEventHook(long long long ptr long long long) @ stdcall SetWindowCompositionAttribute(ptr ptr) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 5a786ad7f83..0046d475fbc 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -303,7 +303,7 @@ static void winstation_init(void) flags.fInherit = FALSE; flags.fReserved = FALSE; flags.dwFlags = WSF_VISIBLE; - SetUserObjectInformationW( handle, UOI_FLAGS, &flags, sizeof(flags) ); + NtUserSetObjectInformation( handle, UOI_FLAGS, &flags, sizeof(flags) ); } } } diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 1a955879f3d..e2c4f0f251f 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -461,33 +461,7 @@ BOOL WINAPI GetUserObjectInformationA( HANDLE handle, INT index, LPVOID info, DW */ BOOL WINAPI SetUserObjectInformationA( HANDLE handle, INT index, LPVOID info, DWORD len ) { - return SetUserObjectInformationW( handle, index, info, len ); -} - - -/****************************************************************************** - * SetUserObjectInformationW (USER32.@) - */ -BOOL WINAPI SetUserObjectInformationW( HANDLE handle, INT index, LPVOID info, DWORD len ) -{ - BOOL ret; - const USEROBJECTFLAGS *obj_flags = info; - - if (index != UOI_FLAGS || !info || len < sizeof(*obj_flags)) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - /* FIXME: inherit flag */ - SERVER_START_REQ( set_user_object_info ) - { - req->handle = wine_server_obj_handle( handle ); - req->flags = SET_USER_OBJECT_SET_FLAGS; - req->obj_flags = obj_flags->dwFlags; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + return NtUserSetObjectInformation( handle, index, info, len ); } diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 06fc68f00cf..f54098c5d4f 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -100,6 +100,7 @@ static void * const syscalls[] = NtUserGetProcessWindowStation, NtUserGetThreadDesktop, NtUserOpenInputDesktop, + NtUserSetObjectInformation, NtUserSetProcessWindowStation, NtUserSetThreadDesktop, }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 5c477f75bfd..c82e974be04 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1213,7 +1213,7 @@ @ stub NtUserSetMirrorRendering @ stub NtUserSetMonitorWorkArea @ stub NtUserSetMouseInputRateLimitingTimer -@ stub NtUserSetObjectInformation +@ stdcall -syscall NtUserSetObjectInformation(long long ptr long) @ stub NtUserSetParent @ stub NtUserSetPrecisionTouchPadConfiguration @ stub NtUserSetProcessDpiAwarenessContext diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 6bf2cd5e2c1..e787cc3884c 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -246,3 +246,28 @@ BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info, return FALSE; } } + +/*********************************************************************** + * NtUserSetObjectInformation (win32u.@) + */ +BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DWORD len ) +{ + BOOL ret; + const USEROBJECTFLAGS *obj_flags = info; + + if (index != UOI_FLAGS || !info || len < sizeof(*obj_flags)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + /* FIXME: inherit flag */ + SERVER_START_REQ( set_user_object_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->flags = SET_USER_OBJECT_SET_FLAGS; + req->obj_flags = obj_flags->dwFlags; + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 154c21e5cc6..303bdf08c57 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -86,6 +86,7 @@ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ + SYSCALL_ENTRY( NtUserSetObjectInformation ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserSetThreadDesktop ) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 47a7263ab46..59286969283 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -86,3 +86,13 @@ NTSTATUS WINAPI wow64_NtUserGetObjectInformation( UINT *args ) return NtUserGetObjectInformation( handle, index, info, len, needed ); } + +NTSTATUS WINAPI wow64_NtUserSetObjectInformation( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + INT index = get_ulong( &args ); + void *info = get_ptr( &args ); + DWORD len = get_ulong( &args ); + + return NtUserSetObjectInformation( handle, index, info, len ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 0478ab69967..e5d16afdd53 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -28,6 +28,7 @@ BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info, DWORD len, DWORD *needed ); HWINSTA WINAPI NtUserGetProcessWindowStation(void); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ); +BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DWORD len ); HDESK WINAPI NtUserOpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetThreadDesktop( HDESK handle );

1 0

Jacek Caban : make_unicode: Update vertical.c path.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 5740b091b941bc156acf61fe2e8e9505c708da36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5740b091b941bc156acf61fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 17:08:37 2021 +0200 make_unicode: Update vertical.c path. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_unicode b/tools/make_unicode index c5c804b678b..4c9d3d6d988 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2828,7 +2828,7 @@ dump_linebreak( "dlls/gdi32/uniscribe/linebreak.c" ); dump_linebreak( "dlls/dwrite/linebreak.c" ); dump_scripts( "dlls/dwrite/scripts" ); dump_indic( "dlls/gdi32/uniscribe/indicsyllable.c" ); -dump_vertical( "dlls/gdi32/vertical.c", 1 ); +dump_vertical( "dlls/win32u/vertical.c", 1 ); dump_vertical( "dlls/wineps.drv/vertical.c", 0 ); dump_intl_nls("nls/l_intl.nls"); dump_norm_table( "nls/normnfc.nls" );

1 0

Eric Pouech : mscoree/tests: Remove unused parameter in sprintf.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 7b5e8ef1d84a3f1c78a1dc467a671d5b8785116f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b5e8ef1d84a3f1c78a1dc46… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:15:24 2021 +0200 mscoree/tests: Remove unused parameter in sprintf. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/comtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 6c0d081cbd3..f6dc93c1070 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -166,7 +166,7 @@ static void run_registry_test(run_type run) if (run == run_type_exe_directory) result_expected = S_OK; else result_expected = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test), ""); + sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test)); ret = RegCreateKeyA( HKEY_CLASSES_ROOT, buffer, &hkey ); if (ret == ERROR_ACCESS_DENIED && !IsUserAnAdmin()) {

1 0

Eric Pouech : winedump: Fix incorrect alignment.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: bad368750e5881683574250df3ad7db75b0607ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=bad368750e5881683574250d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:08 2021 +0200 winedump: Fix incorrect alignment. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 2c3d406347e..b7b7eb435ff 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1161,7 +1161,7 @@ BOOL codeview_dump_types_from_block(const void* table, unsigned long len) codeview_dump_one_type(curr_type, type); curr_type++; - ptr += (type->generic.len + 2 + 3) & ~3; + ptr += type->generic.len + 2; } return TRUE;

1 0

Eric Pouech : winedump: Dump MSC's S_UNAMESPACE entries.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 768bb93fd78fc4cafd01443989e5cec75a9adaaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=768bb93fd78fc4cafd014439… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:14 2021 +0200 winedump: Dump MSC's S_UNAMESPACE entries. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 15 +++++++++++++++ tools/winedump/msc.c | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index c9ab4abb166..1ede937abc4 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1958,6 +1958,20 @@ union codeview_symbol unsigned short varflags; char name[1]; } file_static_v3; + + struct + { + unsigned short int len; + unsigned short int id; + struct p_string pname; + } unamespace_v2; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned char name[1]; + } unamespace_v3; }; enum BinaryAnnotationOpcode @@ -2031,6 +2045,7 @@ enum BinaryAnnotationOpcode #define S_GTHREAD32_ST 0x100f #define S_FRAMEPROC 0x1012 #define S_COMPILE2_ST 0x1013 +#define S_UNAMESPACE_ST 0x1029 #define S_OBJNAME 0x1101 #define S_THUNK32 0x1102 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index b7b7eb435ff..12d1a9e62ab 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1839,6 +1839,14 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) get_varflags(sym->file_static_v3.varflags)); break; + case S_UNAMESPACE_ST: + printf("UNameSpace V2 '%s'\n", p_string(&sym->unamespace_v2.pname)); + break; + + case S_UNAMESPACE: + printf("UNameSpace V3 '%s'\n", sym->unamespace_v3.name); + break; + default: printf("\n\t\t>>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Eric Pouech : dbghelp: Use proper macros for VARIANT.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 58d5b3c880ce9d3f0d5f9d193dba250014676144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58d5b3c880ce9d3f0d5f9d19… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:20 2021 +0200 dbghelp: Use proper macros for VARIANT. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 32 ++++++++++++++--------------- dlls/dbghelp/msc.c | 57 +++++++++++++++++++++++++-------------------------- dlls/dbghelp/symbol.c | 18 ++++++++-------- dlls/dbghelp/type.c | 8 ++++---- 4 files changed, 57 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58d5b3c880ce9d3f0d5f…

1 0

Eric Pouech : dbghelp: Report a couple more VARIANT types in symbol info for constants.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: eded75f8d25dbf011ecbf5bcbae0352e2ca654b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eded75f8d25dbf011ecbf5bc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:26 2021 +0200 dbghelp: Report a couple more VARIANT types in symbol info for constants. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 0b71584e6e0..3fb6ba360fd 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -750,13 +750,16 @@ static void symt_fill_sym_info(struct module_pair* pair, sym_info->Flags |= SYMFLAG_LOCAL; switch (V_VT(&data->u.value)) { - case VT_I4: sym_info->Value = (ULONG)V_I4(&data->u.value); break; - case VT_I2: sym_info->Value = (ULONG)(LONG_PTR)V_I2(&data->u.value); break; - case VT_I1: sym_info->Value = (ULONG)(LONG_PTR)V_I1(&data->u.value); break; - case VT_UI4: sym_info->Value = (ULONG)V_UI4(&data->u.value); break; - case VT_UI2: sym_info->Value = (ULONG)V_UI2(&data->u.value); break; - case VT_UI1: sym_info->Value = (ULONG)V_UI1(&data->u.value); break; - case VT_BYREF: sym_info->Value = (ULONG64)(DWORD_PTR)V_BYREF(&data->u.value); break; + case VT_I8: sym_info->Value = (LONG64)V_I8(&data->u.value); break; + case VT_I4: sym_info->Value = (LONG64)V_I4(&data->u.value); break; + case VT_I2: sym_info->Value = (LONG64)V_I2(&data->u.value); break; + case VT_I1: sym_info->Value = (LONG64)V_I1(&data->u.value); break; + case VT_UINT:sym_info->Value = V_UINT(&data->u.value); break; + case VT_UI8: sym_info->Value = V_UI8(&data->u.value); break; + case VT_UI4: sym_info->Value = V_UI4(&data->u.value); break; + case VT_UI2: sym_info->Value = V_UI2(&data->u.value); break; + case VT_UI1: sym_info->Value = V_UI1(&data->u.value); break; + case VT_BYREF: sym_info->Value = (DWORD_PTR)V_BYREF(&data->u.value); break; case VT_EMPTY: sym_info->Value = 0; break; default: FIXME("Unsupported variant type (%u)\n", V_VT(&data->u.value));

1 0

Eric Pouech : dbghelp: Add helper to initialize a module_pair.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 099a8bbfd3b6cc0cb4508f999b11069beae43e38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=099a8bbfd3b6cc0cb4508f99… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:33 2021 +0200 dbghelp: Add helper to initialize a module_pair. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 2 ++ dlls/dbghelp/dwarf.c | 5 +---- dlls/dbghelp/module.c | 7 +++++++ dlls/dbghelp/msc.c | 5 +---- dlls/dbghelp/symbol.c | 30 ++++++------------------------ dlls/dbghelp/type.c | 20 +++----------------- 6 files changed, 20 insertions(+), 49 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 14c4336e205..fda6714c332 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -629,6 +629,8 @@ extern const WCHAR S_WineLoaderW[] DECLSPEC_HIDDEN; extern const WCHAR S_SlashW[] DECLSPEC_HIDDEN; extern const struct loader_ops no_loader_ops DECLSPEC_HIDDEN; +extern BOOL module_init_pair(struct module_pair* pair, HANDLE hProcess, + DWORD64 addr) DECLSPEC_HIDDEN; extern struct module* module_find_by_addr(const struct process* pcs, DWORD64 addr, enum module_type type) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index c20c3db5ca9..f371f7a6822 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3652,10 +3652,7 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, struct module_pair pair; struct frame_info info; - if (!(pair.pcs = process_find_by_handle(csw->hProcess)) || - !(pair.requested = module_find_by_addr(pair.pcs, ip, DMT_UNKNOWN)) || - !module_get_debug(&pair)) - return FALSE; + if (!module_init_pair(&pair, csw->hProcess, ip)) return FALSE; if (!dwarf2_fetch_frame_info(pair.effective, csw->cpu, ip, &info)) return FALSE; /* if at very beginning of function, return and use default unwinder */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 254bbb297d7..488ed1a3bd6 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -262,6 +262,13 @@ struct module* module_new(struct process* pcs, const WCHAR* name, return module; } +BOOL module_init_pair(struct module_pair* pair, HANDLE hProcess, DWORD64 addr) +{ + if (!(pair->pcs = process_find_by_handle(hProcess))) return FALSE; + pair->requested = module_find_by_addr(pair->pcs, addr, DMT_UNKNOWN); + return module_get_debug(pair); +} + /*********************************************************************** * module_find_by_nameW * diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 353915cc7db..2468051acc7 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3199,10 +3199,7 @@ BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip, char* strbase; BOOL ret = TRUE; - if (!(pair.pcs = process_find_by_handle(csw->hProcess)) || - !(pair.requested = module_find_by_addr(pair.pcs, ip, DMT_UNKNOWN)) || - !module_get_debug(&pair)) - return FALSE; + if (!module_init_pair(&pair, csw->hProcess, ip)) return FALSE; if (!pair.effective->format_info[DFI_PDB]) return FALSE; pdb_info = pair.effective->format_info[DFI_PDB]->u.pdb_info; TRACE("searching %lx => %lx\n", ip, ip - (DWORD_PTR)pair.effective->module.BaseOfImage); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 3fb6ba360fd..1113bbc39cf 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1363,10 +1363,7 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, struct module_pair pair; struct symt_ht* sym; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, Address, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, Address)) return FALSE; if ((sym = symt_find_nearest(pair.effective, Address)) == NULL) return FALSE; symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); @@ -1717,10 +1714,7 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr, struct symt_ht* symt; struct symt_function* func; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, addr, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, addr)) return FALSE; if ((symt = symt_find_nearest(pair.effective, addr)) == NULL) return FALSE; if (symt->symt.tag != SymTagFunction) return FALSE; @@ -1862,10 +1856,7 @@ static BOOL symt_get_func_line_prev(HANDLE hProcess, struct internal_line_t* int struct line_info* li; struct line_info* srcli; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, addr, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, addr)) return FALSE; if (key == NULL) return FALSE; @@ -1944,10 +1935,7 @@ static BOOL symt_get_func_line_next(HANDLE hProcess, struct internal_line_t* int struct line_info* srcli; if (key == NULL) return FALSE; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, addr, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, addr)) return FALSE; /* search current source file */ for (srcli = key; !srcli->is_source_file; srcli--); @@ -2344,10 +2332,7 @@ BOOL WINAPI SymAddSymbol(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR name, TRACE("(%p %s %s %u)\n", hProcess, wine_dbgstr_a(name), wine_dbgstr_longlong(addr), size); - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, BaseOfDll, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, BaseOfDll)) return FALSE; return symt_new_custom(pair.effective, name, addr, size) != NULL; } @@ -2400,11 +2385,8 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, if (!cb) return FALSE; if (!(dbghelp_options & SYMOPT_LOAD_LINES)) return TRUE; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; + if (!module_init_pair(&pair, hProcess, base)) return FALSE; if (compiland) FIXME("Unsupported yet (filtering on compiland %s)\n", compiland); - pair.requested = module_find_by_addr(pair.pcs, base, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; if (!(srcmask = file_regex(srcfile))) return FALSE; sci.SizeOfStruct = sizeof(sci); diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index e50c5cac1fd..eecb83f325f 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -483,9 +483,7 @@ BOOL WINAPI SymEnumTypes(HANDLE hProcess, ULONG64 BaseOfDll, hProcess, wine_dbgstr_longlong(BaseOfDll), EnumSymbolsCallback, UserContext); - if (!(pair.pcs = process_find_by_handle(hProcess))) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, BaseOfDll, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, BaseOfDll)) return FALSE; sym_info->SizeOfStruct = sizeof(SYMBOL_INFO); sym_info->MaxNameLen = sizeof(buffer) - sizeof(SYMBOL_INFO); @@ -1007,16 +1005,7 @@ BOOL WINAPI SymGetTypeInfo(HANDLE hProcess, DWORD64 ModBase, { struct module_pair pair; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - - pair.requested = module_find_by_addr(pair.pcs, ModBase, DMT_UNKNOWN); - if (!module_get_debug(&pair)) - { - FIXME("Someone didn't properly set ModBase (%s)\n", wine_dbgstr_longlong(ModBase)); - return FALSE; - } - + if (!module_init_pair(&pair, hProcess, ModBase)) return FALSE; return symt_get_info(pair.effective, symt_index2ptr(pair.effective, TypeId), GetType, pInfo); } @@ -1031,10 +1020,7 @@ BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll, struct symt* type; DWORD64 size; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, BaseOfDll, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, BaseOfDll)) return FALSE; type = symt_find_type_by_name(pair.effective, SymTagNull, Name); if (!type) return FALSE; Symbol->Index = Symbol->TypeIndex = symt_ptr2index(pair.effective, type);

1 0

Hans Leidekker : wbemprox: Return an empty array for __DERIVATION.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 2243229043b9af45376e27df55a3fa279590a9b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2243229043b9af45376e27df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 12:48:44 2021 +0200 wbemprox: Return an empty array for __DERIVATION. Based on a patch by Louis Lenders. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51871 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 13 +++++++++++++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 14 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 77ed27e105d..28028474d59 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1006,6 +1006,19 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_STRING; return S_OK; } + if (!wcsicmp( name, L"__DERIVATION" )) + { + if (ret) + { + SAFEARRAY *sa; + FIXME( "returning empty array for __DERIVATION\n" ); + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, 0 ))) return E_OUTOFMEMORY; + V_VT( ret ) = VT_BSTR | VT_ARRAY; + V_ARRAY( ret ) = sa; + } + if (type) *type = CIM_STRING | CIM_FLAG_ARRAY; + return S_OK; + } FIXME("system property %s not implemented\n", debugstr_w(name)); return WBEM_E_NOT_FOUND; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 69bb8e7977e..5ca61cff825 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1642,6 +1642,7 @@ static void test_Win32_VideoController( IWbemServices *services ) if (hr != S_OK) break; check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__DERIVATION", VT_BSTR | VT_ARRAY, CIM_STRING | CIM_FLAG_ARRAY ); check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); check_property( obj, L"__NAMESPACE", VT_BSTR, CIM_STRING ); check_property( obj, L"__PATH", VT_BSTR, CIM_STRING );

1 0

Hans Leidekker : wbemprox: Add __DERIVATION to the list of system properties.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 8b6565a61fe66ccd1472a4c78b3daf0e1897fba0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6565a61fe66ccd1472a4c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 12:48:45 2021 +0200 wbemprox: Add __DERIVATION to the list of system properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 28028474d59..63007565766 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1395,7 +1395,8 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR HRESULT get_properties( const struct view *view, UINT index, LONG flags, SAFEARRAY **props ) { static const WCHAR * const system_props[] = - { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__SERVER", L"__NAMESPACE", L"__PATH" }; + { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__DERIVATION", L"__SERVER", L"__NAMESPACE", + L"__PATH" }; SAFEARRAY *sa; BSTR str; UINT i, table_index, result_index, count = 0;

1 0