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

Hugh McMaster : conhost: Set keyboard focus to correct radio button in save dialog.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 0eab766bce01871d5c9055ab1bad7060d28bd805 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eab766bce01871d5c9055ab… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Aug 31 22:29:14 2021 +1000 conhost: Set keyboard focus to correct radio button in save dialog. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 48cd9ed6f6b..319463537d5 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1818,8 +1818,9 @@ static INT_PTR WINAPI save_dialog_proc( HWND dialog, UINT msg, WPARAM wparam, LP switch (msg) { case WM_INITDIALOG: + SendMessageW( dialog, WM_NEXTDLGCTL, (WPARAM)GetDlgItem( dialog, IDC_SAV_SESSION ), TRUE ); SendDlgItemMessageW( dialog, IDC_SAV_SESSION, BM_SETCHECK, BST_CHECKED, 0 ); - break; + return FALSE; case WM_COMMAND: switch (LOWORD(wparam))

1 0

Francois Gouget : dnsapi: Make the resolv_*() functions static.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 312dc76c759f144211802e984a19cf08c9f5b60b URL: https://source.winehq.org/git/wine.git/?a=commit;h=312dc76c759f144211802e98… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 15:06:57 2021 +0200 dnsapi: Make the resolv_*() functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 5 ----- dlls/dnsapi/libresolv.c | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index 5b4fc1019e2..c598ade756e 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -121,11 +121,6 @@ static inline char *strdup_ua( const char *src ) extern const char *type_to_str( unsigned short ) DECLSPEC_HIDDEN; -extern DNS_STATUS CDECL resolv_get_searchlist( DNS_TXT_DATAW *, DWORD * ) DECLSPEC_HIDDEN; -extern DNS_STATUS CDECL resolv_get_serverlist( USHORT, DNS_ADDR_ARRAY *, DWORD * ) DECLSPEC_HIDDEN; -extern DNS_STATUS CDECL resolv_query( const char *, WORD, DWORD, DNS_RECORDA ** ) DECLSPEC_HIDDEN; -extern DNS_STATUS CDECL resolv_set_serverlist( const IP4_ARRAY * ) DECLSPEC_HIDDEN; - struct resolv_funcs { DNS_STATUS (CDECL *get_searchlist)( DNS_TXT_DATAW *list, DWORD *len ); diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 864c517333d..197ca84aeae 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -277,7 +277,7 @@ static DNS_STATUS map_h_errno( int error ) } } -DNS_STATUS CDECL resolv_get_searchlist( DNS_TXT_DATAW *list, DWORD *len ) +static DNS_STATUS CDECL resolv_get_searchlist( DNS_TXT_DATAW *list, DWORD *len ) { DWORD i, needed, str_needed = 0; char *ptr, *end; @@ -320,7 +320,7 @@ static inline int filter( unsigned short sin_family, USHORT family ) #ifdef HAVE_RES_GETSERVERS -DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) +static DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) { struct __res_state *state = &_res; DWORD i, found, total, needed; @@ -386,7 +386,7 @@ DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DW #else -DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) +static DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) { DWORD needed, found, i; @@ -451,7 +451,7 @@ DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DW } #endif -DNS_STATUS CDECL resolv_set_serverlist( const IP4_ARRAY *addrs ) +static DNS_STATUS CDECL resolv_set_serverlist( const IP4_ARRAY *addrs ) { int i; @@ -872,7 +872,7 @@ static void free_record_list( DNS_RECORD *list ) } #define DNS_MAX_PACKET_SIZE 4096 -DNS_STATUS CDECL resolv_query( const char *name, WORD type, DWORD options, DNS_RECORDA **result ) +static DNS_STATUS CDECL resolv_query( const char *name, WORD type, DWORD options, DNS_RECORDA **result ) { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; unsigned int i, num;

1 0

Esme Povirk : mscoree: Don't trace arguments in CorExeMain.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 2586907566c6a4b57d9f13761b65e23dc7f3281f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2586907566c6a4b57d9f1376… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Aug 31 13:25:32 2021 -0500 mscoree: Don't trace arguments in CorExeMain. This can overflow the debug buffer. We could print each argument on an individual line, but command-line arguments can be obtained other ways and turned out to usually not be useful. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index d47492b7d4d..ec06717be85 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1441,10 +1441,7 @@ __int32 WINAPI _CorExeMain(void) GetModuleFileNameW(NULL, filename, MAX_PATH); - TRACE("%s", debugstr_w(filename)); - for (i=0; i<argc; i++) - TRACE(" %s", debugstr_a(argv[i])); - TRACE("\n"); + TRACE("%s argc=%i\n", debugstr_w(filename), argc); filenameA = WtoA(filename); if (!filenameA)

1 0

Eric Pouech : dbghelp: Fix SymInitialize for a live 32bit target from a 64bit caller in WOW64.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 1cddd8d5715dcbba618425c20bfabf19f9a20422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cddd8d5715dcbba618425c2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 31 13:20:39 2021 +0200 dbghelp: Fix SymInitialize for a live 32bit target from a 64bit caller in WOW64. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 00d7b61fbd8..9d99f0d646a 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -286,7 +286,7 @@ const WCHAR *process_getenv(const struct process *process, const WCHAR *name) * check_live_target * */ -static BOOL check_live_target(struct process* pcs) +static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64) { PROCESS_BASIC_INFORMATION pbi; ULONG_PTR base = 0, env = 0; @@ -300,11 +300,17 @@ static BOOL check_live_target(struct process* pcs) if (!pcs->is_64bit) { + const char* peb32_addr; DWORD env32; PEB32 peb32; + C_ASSERT(sizeof(void*) != 4 || FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, Environment) == 0x48); - if (!ReadProcessMemory(pcs->handle, pbi.PebBaseAddress, &peb32, sizeof(peb32), NULL)) return FALSE; - if (!ReadProcessMemory(pcs->handle, (char *)pbi.PebBaseAddress + 0x460 /* CloudFileFlags */, &base, sizeof(base), NULL)) return FALSE; + peb32_addr = (const char*)pbi.PebBaseAddress; + if (!wow64 && child_wow64) + /* current process is 64bit, while child process is 32 bit, need to read 32bit PEB */ + peb32_addr += 0x1000; + if (!ReadProcessMemory(pcs->handle, peb32_addr, &peb32, sizeof(peb32), NULL)) return FALSE; + if (!ReadProcessMemory(pcs->handle, peb32_addr + 0x460 /* CloudFileFlags */, &base, sizeof(base), NULL)) return FALSE; if (read_process_memory(pcs, peb32.ProcessParameters + 0x48, &env32, sizeof(env32))) env = env32; } else @@ -454,7 +460,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP pcs->next = process_first; process_first = pcs; - if (check_live_target(pcs)) + if (check_live_target(pcs, wow64, child_wow64)) { if (fInvadeProcess) EnumerateLoadedModulesW64(hProcess, process_invade_cb, hProcess);

1 0

Eric Pouech : dbghelp: Store the IMAGE_OPTIONAL_HEADER in either 32bit or 64bit form.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 4a03ffc1ef491acb88ff83efcf69996e3a264b0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a03ffc1ef491acb88ff83ef… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 31 13:20:33 2021 +0200 dbghelp: Store the IMAGE_OPTIONAL_HEADER in either 32bit or 64bit form. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 6 +++++- dlls/dbghelp/pe_module.c | 37 +++++++++++++++++++++++++++---------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 8d44458b7c9..83442ffb9e1 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -151,7 +151,11 @@ struct image_file_map { HANDLE hMap; IMAGE_FILE_HEADER file_header; - IMAGE_OPTIONAL_HEADER opt_header; + union + { + IMAGE_OPTIONAL_HEADER32 header32; + IMAGE_OPTIONAL_HEADER64 header64; + } opt; BOOL builtin; unsigned full_count; void* full_map; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index e796622ae87..7cfe5f4dc37 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -65,6 +65,11 @@ static void pe_unmap_full(struct image_file_map* fmap) } } +/* as we store either IMAGE_OPTIONAL_HEADER(32|64) inside pe_file_map, + * this helper will read to any field 'field' inside such an header + */ +#define PE_FROM_OPTHDR(fmap, field) (((fmap)->addr_size == 32) ? ((fmap)->u.pe.opt.header32. field) : ((fmap)->u.pe.opt.header64. field)) + /****************************************************************** * pe_map_section * @@ -259,12 +264,24 @@ BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt) if (!(nthdr = RtlImageNtHeader(mapping))) goto error; memcpy(&fmap->u.pe.file_header, &nthdr->FileHeader, sizeof(fmap->u.pe.file_header)); - memcpy(&fmap->u.pe.opt_header, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt_header)); switch (nthdr->OptionalHeader.Magic) { - case 0x10b: fmap->addr_size = 32; break; - case 0x20b: fmap->addr_size = 64; break; - default: return FALSE; + case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + if (sizeof(void*) == 8 && !(SymGetOptions() & SYMOPT_INCLUDE_32BIT_MODULES)) + { + TRACE("Won't load 32bit module in 64bit dbghelp when options don't ask for it\n"); + goto error; + } + fmap->addr_size = 32; + memcpy(&fmap->u.pe.opt.header32, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt.header32)); + break; + case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + if (sizeof(void*) == 4) return FALSE; + fmap->addr_size = 64; + memcpy(&fmap->u.pe.opt.header64, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt.header64)); + break; + default: + return FALSE; } fmap->u.pe.builtin = !memcmp((const IMAGE_DOS_HEADER*)mapping + 1, builtin_signature, sizeof(builtin_signature)); @@ -497,7 +514,7 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module) if (stab != IMAGE_NO_MAP && stabstr != IMAGE_NO_MAP) { ret = stabs_parse(module, - module->module.BaseOfImage - fmap->u.pe.opt_header.ImageBase, + module->module.BaseOfImage - PE_FROM_OPTHDR(fmap, ImageBase), stab, image_get_map_size(&sect_stabs) / sizeof(struct stab_nlist), sizeof(struct stab_nlist), stabstr, image_get_map_size(&sect_stabstr), NULL, NULL); @@ -523,7 +540,7 @@ static BOOL pe_load_dwarf(struct module* module) BOOL ret; ret = dwarf2_parse(module, - module->module.BaseOfImage - fmap->u.pe.opt_header.ImageBase, + module->module.BaseOfImage - PE_FROM_OPTHDR(fmap, ImageBase), NULL, /* FIXME: some thunks to deal with ? */ fmap); TRACE("%s the DWARF debug info\n", ret ? "successfully loaded" : "failed to load"); @@ -793,12 +810,12 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, image_unmap_file(&modfmt->u.pe_info->fmap); modfmt->u.pe_info->fmap = builtin.fmap; } - if (!base) base = modfmt->u.pe_info->fmap.u.pe.opt_header.ImageBase; - if (!size) size = modfmt->u.pe_info->fmap.u.pe.opt_header.SizeOfImage; + if (!base) base = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); + if (!size) size = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, SizeOfImage); module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size, modfmt->u.pe_info->fmap.u.pe.file_header.TimeDateStamp, - modfmt->u.pe_info->fmap.u.pe.opt_header.CheckSum); + PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, CheckSum)); if (module) { module->real_path = builtin.path; @@ -811,7 +828,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, module->module.SymType = SymDeferred; else pe_load_debug_info(pcs, module); - module->reloc_delta = base - modfmt->u.pe_info->fmap.u.pe.opt_header.ImageBase; + module->reloc_delta = base - PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); } else {

1 0

Francois Gouget : user32: Fix ASCII / ANSI mixups in comments.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: e2b0fb985727b4015395ecd11dc13290793a1d48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2b0fb985727b4015395ecd1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 15:04:56 2021 +0200 user32: Fix ASCII / ANSI mixups in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 4 ++-- dlls/user32/dde_server.c | 4 ++-- dlls/user32/menu.c | 2 +- dlls/user32/text.c | 2 +- dlls/user32/winproc.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index cef52883988..622226f9e15 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -235,7 +235,7 @@ static BOOL set_server_info( HWND hwnd, INT offset, LONG_PTR newval, UINT size ) /*********************************************************************** * CLASS_GetMenuNameA * - * Get the menu name as a ASCII string. + * Get the menu name as an ANSI string. */ static inline LPSTR CLASS_GetMenuNameA( CLASS *classPtr ) { @@ -524,7 +524,7 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE * register_builtin * * Register a builtin control class. - * This allows having both ASCII and Unicode winprocs for the same class. + * This allows having both ANSI and Unicode winprocs for the same class. */ static void register_builtin( const struct builtin_class_descr *descr ) { diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index e11c0c20d3b..3867e0f014b 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -782,7 +782,7 @@ static HDDEDATA map_A_to_W( DWORD instance, void *ptr, DWORD size ) return ret; } -/* convert data to ASCII, unless it looks like it's not in Unicode format */ +/* convert data to ANSI, unless it looks like it's not in Unicode format */ static HDDEDATA map_W_to_A( DWORD instance, void *ptr, DWORD size ) { HDDEDATA ret; @@ -821,7 +821,7 @@ static WDML_QUEUE_STATE WDML_ServerHandleExecute(WDML_CONV* pConv, WDML_XACT* pX { if (pConv->instance->unicode) /* Unicode server, try to map A->W */ hDdeData = map_A_to_W( pConv->instance->instanceID, ptr, size ); - else if (!IsWindowUnicode( pConv->hwndClient )) /* ASCII server and client, try to map W->A */ + else if (!IsWindowUnicode( pConv->hwndClient )) /* ANSI server and client, try to map W->A */ hDdeData = map_W_to_A( pConv->instance->instanceID, ptr, size ); else hDdeData = DdeCreateDataHandle(pConv->instance->instanceID, ptr, size, 0, 0, CF_TEXT, 0); diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ecefe9dd67c..ec6ff1d0dd0 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4879,7 +4879,7 @@ BOOL WINAPI GetMenuItemInfoW( HMENU hmenu, UINT item, BOOL bypos, } -/* set a menu item text from a ASCII or Unicode string */ +/* set a menu item text from an ANSI or Unicode string */ static inline void set_menu_item_text( MENUITEM *menu, LPCWSTR text, BOOL unicode ) { if (!text) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index dd9d711cd48..86946e6a53a 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1185,7 +1185,7 @@ INT WINAPI DrawTextA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags ) * GrayString functions */ -/* callback for ASCII gray string proc */ +/* callback for ANSI gray string proc */ static BOOL CALLBACK gray_string_callbackA( HDC hdc, LPARAM param, INT len ) { return TextOutA( hdc, 0, 0, (LPCSTR)param, len ); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index f83d8b61a63..81fbcab928d 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); typedef struct tagWINDOWPROC { - WNDPROC procA; /* ASCII window proc */ + WNDPROC procA; /* ANSI window proc */ WNDPROC procW; /* Unicode window proc */ } WINDOWPROC;

1 0

Francois Gouget : shlwapi: Fix the length returned by SHFormatDateTimeA().
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: c2391296b8e4ffca28364194198688063f714782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2391296b8e4ffca28364194… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 31 14:57:44 2021 +0200 shlwapi: Fix the length returned by SHFormatDateTimeA(). The ANSI string may be longer than the Unicode one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 52cc3b725fa..63945deaea3 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4360,7 +4360,7 @@ INT WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *fileTime, DWORD *flags, retval = SHFormatDateTimeW(fileTime, flags, bufW, size); if (retval != 0) - WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, size, NULL, NULL); + retval = WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, size, NULL, NULL); HeapFree(GetProcessHeap(), 0, bufW); return retval;

1 0

Eric Pouech : dbghelp: Split storage of PE header.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 339953cced3d6cd9ee25ee5a7b721d1ac7e81984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=339953cced3d6cd9ee25ee5a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 31 13:20:26 2021 +0200 dbghelp: Split storage of PE header. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 3 ++- dlls/dbghelp/pe_module.c | 49 ++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 870f5300575..8d44458b7c9 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -150,7 +150,8 @@ struct image_file_map struct pe_file_map { HANDLE hMap; - IMAGE_NT_HEADERS ntheader; + IMAGE_FILE_HEADER file_header; + IMAGE_OPTIONAL_HEADER opt_header; BOOL builtin; unsigned full_count; void* full_map; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index f0ca20e5e4f..e796622ae87 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -75,7 +75,7 @@ static const char* pe_map_section(struct image_section_map* ism) void* mapping; struct pe_file_map* fmap = &ism->fmap->u.pe; - if (ism->sidx >= 0 && ism->sidx < fmap->ntheader.FileHeader.NumberOfSections && + if (ism->sidx >= 0 && ism->sidx < fmap->file_header.NumberOfSections && fmap->sect[ism->sidx].mapped == IMAGE_NO_MAP) { IMAGE_NT_HEADERS* nth; @@ -115,7 +115,7 @@ static BOOL pe_find_section(struct image_file_map* fmap, const char* name, unsigned i; char tmp[IMAGE_SIZEOF_SHORT_NAME + 1]; - for (i = 0; i < fmap->u.pe.ntheader.FileHeader.NumberOfSections; i++) + for (i = 0; i < fmap->u.pe.file_header.NumberOfSections; i++) { sectname = (const char*)fmap->u.pe.sect[i].shdr.Name; /* long section names start with a '/' (at least on MinGW32) */ @@ -147,7 +147,7 @@ static BOOL pe_find_section(struct image_file_map* fmap, const char* name, */ static void pe_unmap_section(struct image_section_map* ism) { - if (ism->sidx >= 0 && ism->sidx < ism->fmap->u.pe.ntheader.FileHeader.NumberOfSections && + if (ism->sidx >= 0 && ism->sidx < ism->fmap->u.pe.file_header.NumberOfSections && ism->fmap->u.pe.sect[ism->sidx].mapped != IMAGE_NO_MAP) { pe_unmap_full(ism->fmap); @@ -162,7 +162,7 @@ static void pe_unmap_section(struct image_section_map* ism) */ static DWORD_PTR pe_get_map_rva(const struct image_section_map* ism) { - if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.pe.ntheader.FileHeader.NumberOfSections) + if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.pe.file_header.NumberOfSections) return 0; return ism->fmap->u.pe.sect[ism->sidx].shdr.VirtualAddress; } @@ -174,7 +174,7 @@ static DWORD_PTR pe_get_map_rva(const struct image_section_map* ism) */ static unsigned pe_get_map_size(const struct image_section_map* ism) { - if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.pe.ntheader.FileHeader.NumberOfSections) + if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.pe.file_header.NumberOfSections) return 0; return ism->fmap->u.pe.sect[ism->sidx].shdr.Misc.VirtualSize; } @@ -190,7 +190,7 @@ static void pe_unmap_file(struct image_file_map* fmap) { struct image_section_map ism; ism.fmap = fmap; - for (ism.sidx = 0; ism.sidx < fmap->u.pe.ntheader.FileHeader.NumberOfSections; ism.sidx++) + for (ism.sidx = 0; ism.sidx < fmap->u.pe.file_header.NumberOfSections; ism.sidx++) { pe_unmap_section(&ism); } @@ -258,7 +258,8 @@ BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt) unsigned i; if (!(nthdr = RtlImageNtHeader(mapping))) goto error; - memcpy(&fmap->u.pe.ntheader, nthdr, sizeof(fmap->u.pe.ntheader)); + memcpy(&fmap->u.pe.file_header, &nthdr->FileHeader, sizeof(fmap->u.pe.file_header)); + memcpy(&fmap->u.pe.opt_header, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt_header)); switch (nthdr->OptionalHeader.Magic) { case 0x10b: fmap->addr_size = 32; break; @@ -298,8 +299,8 @@ BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt) { WARN("Bad coff table... wipping out\n"); /* we have bad information here, wipe it out */ - fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable = 0; - fmap->u.pe.ntheader.FileHeader.NumberOfSymbols = 0; + fmap->u.pe.file_header.PointerToSymbolTable = 0; + fmap->u.pe.file_header.NumberOfSymbols = 0; fmap->u.pe.strtable = NULL; } } @@ -362,16 +363,16 @@ static BOOL pe_locate_with_coff_symbol_table(struct module* module) struct symt_data* sym; const char* mapping; - numsym = fmap->u.pe.ntheader.FileHeader.NumberOfSymbols; - if (!fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable || !numsym) + numsym = fmap->u.pe.file_header.NumberOfSymbols; + if (!fmap->u.pe.file_header.PointerToSymbolTable || !numsym) return TRUE; if (!(mapping = pe_map_full(fmap, NULL))) return FALSE; - isym = (const IMAGE_SYMBOL*)(mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable); + isym = (const IMAGE_SYMBOL*)(mapping + fmap->u.pe.file_header.PointerToSymbolTable); for (i = 0; i < numsym; i+= naux, isym += naux) { if (isym->StorageClass == IMAGE_SYM_CLASS_EXTERNAL && - isym->SectionNumber > 0 && isym->SectionNumber <= fmap->u.pe.ntheader.FileHeader.NumberOfSections) + isym->SectionNumber > 0 && isym->SectionNumber <= fmap->u.pe.file_header.NumberOfSections) { if (isym->N.Name.Short) { @@ -424,11 +425,11 @@ static BOOL pe_load_coff_symbol_table(struct module* module) const IMAGE_SECTION_HEADER* sect; const char* mapping; - numsym = fmap->u.pe.ntheader.FileHeader.NumberOfSymbols; - if (!fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable || !numsym) + numsym = fmap->u.pe.file_header.NumberOfSymbols; + if (!fmap->u.pe.file_header.PointerToSymbolTable || !numsym) return TRUE; if (!(mapping = pe_map_full(fmap, NULL))) return FALSE; - isym = (const IMAGE_SYMBOL*)(mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable); + isym = (const IMAGE_SYMBOL*)(mapping + fmap->u.pe.file_header.PointerToSymbolTable); /* FIXME: no way to get strtable size */ strtable = (const char*)&isym[numsym]; sect = IMAGE_FIRST_SECTION(RtlImageNtHeader((HMODULE)mapping)); @@ -441,7 +442,7 @@ static BOOL pe_load_coff_symbol_table(struct module* module) compiland = NULL; } if (isym->StorageClass == IMAGE_SYM_CLASS_EXTERNAL && - isym->SectionNumber > 0 && isym->SectionNumber <= fmap->u.pe.ntheader.FileHeader.NumberOfSections) + isym->SectionNumber > 0 && isym->SectionNumber <= fmap->u.pe.file_header.NumberOfSections) { if (isym->N.Name.Short) { @@ -496,7 +497,7 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module) if (stab != IMAGE_NO_MAP && stabstr != IMAGE_NO_MAP) { ret = stabs_parse(module, - module->module.BaseOfImage - fmap->u.pe.ntheader.OptionalHeader.ImageBase, + module->module.BaseOfImage - fmap->u.pe.opt_header.ImageBase, stab, image_get_map_size(&sect_stabs) / sizeof(struct stab_nlist), sizeof(struct stab_nlist), stabstr, image_get_map_size(&sect_stabstr), NULL, NULL); @@ -522,7 +523,7 @@ static BOOL pe_load_dwarf(struct module* module) BOOL ret; ret = dwarf2_parse(module, - module->module.BaseOfImage - fmap->u.pe.ntheader.OptionalHeader.ImageBase, + module->module.BaseOfImage - fmap->u.pe.opt_header.ImageBase, NULL, /* FIXME: some thunks to deal with ? */ fmap); TRACE("%s the DWARF debug info\n", ret ? "successfully loaded" : "failed to load"); @@ -792,12 +793,12 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, image_unmap_file(&modfmt->u.pe_info->fmap); modfmt->u.pe_info->fmap = builtin.fmap; } - if (!base) base = modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.ImageBase; - if (!size) size = modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.SizeOfImage; + if (!base) base = modfmt->u.pe_info->fmap.u.pe.opt_header.ImageBase; + if (!size) size = modfmt->u.pe_info->fmap.u.pe.opt_header.SizeOfImage; module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size, - modfmt->u.pe_info->fmap.u.pe.ntheader.FileHeader.TimeDateStamp, - modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.CheckSum); + modfmt->u.pe_info->fmap.u.pe.file_header.TimeDateStamp, + modfmt->u.pe_info->fmap.u.pe.opt_header.CheckSum); if (module) { module->real_path = builtin.path; @@ -810,7 +811,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, module->module.SymType = SymDeferred; else pe_load_debug_info(pcs, module); - module->reloc_delta = base - modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.ImageBase; + module->reloc_delta = base - modfmt->u.pe_info->fmap.u.pe.opt_header.ImageBase; } else {

1 0

Jacek Caban : wininet: Return ERROR_CANCELLED for unsupported errors in InternetErrorDlg.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 6cdccb2131c785665e7cb4fbee543da2bf49ce1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cdccb2131c785665e7cb4fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 20:10:29 2021 +0200 wininet: Return ERROR_CANCELLED for unsupported errors in InternetErrorDlg. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/dialogs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index a425534fa87..7af1bcd59f9 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -539,7 +539,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = ERROR_SUCCESS; break; default: - res = ERROR_NOT_SUPPORTED; + res = ERROR_CANCELLED; } if(req)

1 0

Jacek Caban : wininet: Prefer recent windows results in InternetErrorDlg tests.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: b340956e7268acfa3912e425bcb3ecd90db09f3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b340956e7268acfa3912e425… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 20:10:41 2021 +0200 wininet: Prefer recent windows results in InternetErrorDlg tests. Based on patch by Dmitry Timoshkov. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 66 +++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index ef1adefd1a3..9feafc4118e 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1463,9 +1463,8 @@ static void test_Option_PerConnectionOptionA(void) HeapFree(GetProcessHeap(), 0, list.pOptions); } -#define FLAG_TODO 0x1 -#define FLAG_NEEDREQ 0x2 -#define FLAG_UNIMPL 0x4 +#define FLAG_NEEDREQ 0x1 +#define FLAG_UNIMPL 0x2 static void test_InternetErrorDlg(void) { @@ -1482,21 +1481,22 @@ static void test_InternetErrorDlg(void) { ERROR_INTERNET_SEC_CERT_DATE_INVALID , ERROR_CANCELLED, 0 }, { ERROR_INTERNET_SEC_CERT_CN_INVALID , ERROR_CANCELLED, 0 }, { ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR , ERROR_SUCCESS, 0 }, - { ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR , ERROR_SUCCESS, FLAG_TODO }, - { ERROR_INTERNET_MIXED_SECURITY , ERROR_CANCELLED, FLAG_TODO }, - { ERROR_INTERNET_CHG_POST_IS_NON_SECURE , ERROR_CANCELLED, FLAG_TODO }, + { ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR , ERROR_SUCCESS }, + { ERROR_INTERNET_MIXED_SECURITY , ERROR_CANCELLED }, + { ERROR_INTERNET_CHG_POST_IS_NON_SECURE , ERROR_SUCCESS }, { ERROR_INTERNET_POST_IS_NON_SECURE , ERROR_SUCCESS, 0 }, - { ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED, ERROR_CANCELLED, FLAG_NEEDREQ|FLAG_TODO }, + { ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED, ERROR_CANCELLED, FLAG_NEEDREQ }, { ERROR_INTERNET_INVALID_CA , ERROR_CANCELLED, 0 }, - { ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR, ERROR_CANCELLED, FLAG_TODO }, - { ERROR_INTERNET_INSERT_CDROM , ERROR_CANCELLED, FLAG_TODO|FLAG_NEEDREQ|FLAG_UNIMPL }, + { ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR, ERROR_CANCELLED }, + { ERROR_INTERNET_INSERT_CDROM , ERROR_CANCELLED, FLAG_NEEDREQ|FLAG_UNIMPL }, { ERROR_INTERNET_SEC_CERT_ERRORS , ERROR_CANCELLED, 0 }, { ERROR_INTERNET_SEC_CERT_REV_FAILED , ERROR_CANCELLED, 0 }, - { ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION , ERROR_HTTP_COOKIE_DECLINED, FLAG_TODO }, - { ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT , ERROR_CANCELLED, FLAG_TODO }, - { ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT, ERROR_CANCELLED, FLAG_TODO }, - { ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION, ERROR_CANCELLED, FLAG_TODO }, - { ERROR_INTERNET_SEC_CERT_REVOKED , ERROR_CANCELLED, 0 }, + { ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION , ERROR_HTTP_COOKIE_DECLINED }, + { ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT , ERROR_CANCELLED }, + { ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT, ERROR_CANCELLED }, + { ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION, ERROR_CANCELLED }, + { ERROR_INTERNET_SEC_CERT_REVOKED , ERROR_CANCELLED }, + { ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE, ERROR_CANCELLED }, }; res = InternetErrorDlg(NULL, NULL, ERROR_INTERNET_SEC_CERT_ERRORS, 0, NULL); @@ -1514,7 +1514,7 @@ static void test_InternetErrorDlg(void) for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) { - DWORD expected = ERROR_NOT_SUPPORTED, test_flags = 0, j; + DWORD expected = ERROR_CANCELLED, test_flags = 0, j; for (j = 0; j < ARRAY_SIZE(no_ui_res); ++j) { @@ -1549,32 +1549,27 @@ static void test_InternetErrorDlg(void) /* Handle some special cases */ switch(i) { - case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: /* later 9.x versions */ - case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: /* later 9.x versions */ - case ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE: /* later 11.x versions */ - if(res == ERROR_CANCELLED) + case ERROR_INTERNET_CHG_POST_IS_NON_SECURE: + if (broken(res == ERROR_CANCELLED)) /* before win10 returns ERROR_CANCELLED */ expected = ERROR_CANCELLED; break; - case ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED: - if (res == NTE_PROV_TYPE_NOT_DEF) /* XP, 2003 */ - expected = NTE_PROV_TYPE_NOT_DEF; - break; - case ERROR_INTERNET_CHG_POST_IS_NON_SECURE: - if(res == ERROR_SUCCESS) /* win10 returns ERROR_SUCCESS */ - expected = ERROR_SUCCESS; + default: + if(broken((expected == ERROR_CANCELLED || i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) && + res == ERROR_NOT_SUPPORTED)) /* XP, Win7, Win8 */ + expected = ERROR_NOT_SUPPORTED; break; - default: break; } - if (expected == ERROR_NOT_SUPPORTED && res == ERROR_CANCELLED) /* Win10 1607+ */ - expected = ERROR_CANCELLED; - - todo_wine_if(test_flags & FLAG_TODO) + todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || + i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || + i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); /* Same thing with NULL hwnd */ res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(test_flags & FLAG_TODO) + todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || + i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || + i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); @@ -1583,7 +1578,12 @@ static void test_InternetErrorDlg(void) expected = ERROR_INVALID_PARAMETER; res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if( test_flags & FLAG_TODO || i == ERROR_INTERNET_INCORRECT_PASSWORD) + todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || + i == ERROR_INTERNET_INCORRECT_PASSWORD || + i == ERROR_INTERNET_INSERT_CDROM || + i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED || + i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || + i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); }

1 0