September 2021 - Wine-Commits

Zhiyi Zhang : msiexec: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: aa3f2ccd1dbf963cd1bed5e15458719a0488017d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa3f2ccd1dbf963cd1bed5e1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 7 11:10:48 2021 +0800 msiexec: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/msiexec.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/msiexec/msiexec.manifest b/programs/msiexec/msiexec.manifest index a4a17a5397d..0e3454555c2 100644 --- a/programs/msiexec/msiexec.manifest +++ b/programs/msiexec/msiexec.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : iexplore: Set process DPI settings to be system awareness.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: 8e11db9d557050ff309fe1348008d3717ee8b2ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e11db9d557050ff309fe134… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 7 11:10:14 2021 +0800 iexplore: Set process DPI settings to be system awareness. iexplore.exe doesn't have DPI awareness settings in its manifest. However, tests show that it has at least per-monitor DPI awareness on Win10. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index ade9f8c5226..adb6eff1101 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -68,6 +68,8 @@ static DWORD register_iexplore(BOOL doregister) int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE prev, WCHAR *cmdline, int show) { + SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_SYSTEM_AWARE); + if(*cmdline == '-' || *cmdline == '/') { if(!wcsicmp(cmdline+1, L"regserver")) return register_iexplore(TRUE);

1 0

Jan Sikorski : winemac.drv: Omit WM_ENTER/EXITSIZEMOVE on non-interactive window changes.
by Alexandre Julliard Sept. 6, 2021

Sept. 6, 2021

Module: wine Branch: master Commit: 0d22e8455a2e809a891df289df42113276c0a276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d22e8455a2e809a891df289… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Sep 6 12:50:54 2021 +0200 winemac.drv: Omit WM_ENTER/EXITSIZEMOVE on non-interactive window changes. The motivating example is when a newly created window gets moved off the system menu bar. A program might not be prepared to handle these messages yet. Fixes a crash in Lord of the Rings online. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 19 +++++++++++++------ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 5 +++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index eec750706a8..0926756c875 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1785,7 +1785,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi /* Cocoa may adjust the frame when the window is ordered onto the screen. Generate a frame-changed event just in case. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; + [self windowDidResize:nil skipSizeMove:TRUE]; if (![self isExcludedFromWindowsMenu]) [NSApp addWindowsItem:self title:[self title] filename:NO]; @@ -1964,7 +1964,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed event. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; + [self windowDidResize:nil skipSizeMove:TRUE]; } } } @@ -2129,7 +2129,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_release_event(event); } - - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing + - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing skipSizeMove:(BOOL)skipSizeMove { macdrv_event* event; NSUInteger style = self.styleMask; @@ -2149,6 +2149,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi event->window_frame_changed.frame = cgrect_win_from_mac(NSRectToCGRect(frame)); event->window_frame_changed.fullscreen = isFullscreen; event->window_frame_changed.in_resize = resizing; + event->window_frame_changed.skip_size_move_loop = skipSizeMove; [queue postEvent:event]; macdrv_release_event(event); } @@ -2912,7 +2913,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_release_event(event); } - - (void)windowDidResize:(NSNotification *)notification + - (void)windowDidResize:(NSNotification *)notification skipSizeMove:(BOOL)skipSizeMove { NSRect frame = self.wine_fractionalFrame; @@ -2935,12 +2936,18 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self postWindowFrameChanged:frame fullscreen:([self styleMask] & NSWindowStyleMaskFullScreen) != 0 - resizing:[self inLiveResize]]; + resizing:[self inLiveResize] + skipSizeMove:skipSizeMove]; [[[self contentView] inputContext] invalidateCharacterCoordinates]; [self updateFullscreen]; } + - (void)windowDidResize:(NSNotification *)notification + { + [self windowDidResize:notification skipSizeMove:FALSE]; + } + - (BOOL)windowShouldClose:(id)sender { macdrv_event* event = macdrv_create_event(WINDOW_CLOSE_REQUESTED, self); @@ -2997,7 +3004,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) windowWillExitFullScreen:(NSNotification*)notification { exitingFullScreen = TRUE; - [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE]; + [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE skipSizeMove:FALSE]; } - (void)windowWillMiniaturize:(NSNotification *)notification diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 47ae6627b9f..81840e067a9 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -443,6 +443,7 @@ typedef struct macdrv_event { CGRect frame; int fullscreen; int in_resize; + int skip_size_move_loop; } window_frame_changed; struct { unsigned long serial; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 14d6a6fd1b2..622f136930c 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2322,10 +2322,11 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) flags |= SWP_NOSENDCHANGING; if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE)) { - if (!event->window_frame_changed.in_resize && !being_dragged) + int send_sizemove = !event->window_frame_changed.in_resize && !being_dragged && !event->window_frame_changed.skip_size_move_loop; + if (send_sizemove) SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); SetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags); - if (!event->window_frame_changed.in_resize && !being_dragged) + if (send_sizemove) SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); } }

1 0

Eric Pouech : dbghelp: Manage the new MachineType field in IMAGEHLP_MODULE(W)64.
by Alexandre Julliard Sept. 6, 2021

Sept. 6, 2021

Module: wine Branch: master Commit: ffc3efe775de733d47c783b276916b79a7dd2667 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffc3efe775de733d47c783b2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Sep 6 10:40:29 2021 +0200 dbghelp: Manage the new MachineType field in IMAGEHLP_MODULE(W)64. 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/elf_module.c | 18 +++++++++++++++++- dlls/dbghelp/macho_module.c | 3 ++- dlls/dbghelp/module.c | 6 +++--- dlls/dbghelp/pe_module.c | 6 ++++-- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index d6280a5189b..0c324a827e9 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -636,7 +636,7 @@ extern struct module* module_new(struct process* pcs, const WCHAR* name, enum module_type type, BOOL virtual, DWORD64 addr, DWORD64 size, - ULONG_PTR stamp, ULONG_PTR checksum) DECLSPEC_HIDDEN; + ULONG_PTR stamp, ULONG_PTR checksum, WORD machine) DECLSPEC_HIDDEN; extern struct module* module_get_containee(const struct process* pcs, const struct module* inner) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e23de1a8c63..553b212c526 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -121,6 +121,21 @@ struct elf_module_info #define ELF_AT_SYSINFO_EHDR 33 +static DWORD elf_get_machine(unsigned mach) +{ + switch (mach) + { + default: + FIXME("No mapping yet for ELF e_machine %u\n", mach); + /* fall through */ + case /*EM_NONE*/ 0: return IMAGE_FILE_MACHINE_UNKNOWN; + case /*EM_386*/ 3: return IMAGE_FILE_MACHINE_I386; + case /*EM_ARM*/ 40: return IMAGE_FILE_MACHINE_ARMNT; + case /*EM_X86_64*/ 62: return IMAGE_FILE_MACHINE_AMD64; + case /*EM_AARCH64*/ 183: return IMAGE_FILE_MACHINE_ARM64; + } +} + /****************************************************************** * elf_map_section * @@ -1227,7 +1242,8 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, sizeof(struct module_format) + sizeof(struct elf_module_info)); if (!modfmt) return FALSE; elf_info->module = module_new(pcs, filename, DMT_ELF, FALSE, modbase, - fmap->u.elf.elf_size, 0, calc_crc32(fmap->u.elf.handle)); + fmap->u.elf.elf_size, 0, calc_crc32(fmap->u.elf.handle), + elf_get_machine(fmap->u.elf.elfhdr.e_machine)); if (!elf_info->module) { HeapFree(GetProcessHeap(), 0, modfmt); diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 7b17d1c30df..34bc4f2c4ea 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1479,7 +1479,8 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, if (!load_addr) load_addr = fmap.u.macho.segs_start; macho_info->module = module_new(pcs, filename, DMT_MACHO, FALSE, load_addr, - fmap.u.macho.segs_size, 0, calc_crc32(fmap.u.macho.handle)); + fmap.u.macho.segs_size, 0, calc_crc32(fmap.u.macho.handle), + IMAGE_FILE_MACHINE_UNKNOWN); if (!macho_info->module) { HeapFree(GetProcessHeap(), 0, modfmt); diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 01803b027d8..cda12f4c350 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -185,7 +185,7 @@ static const char* get_module_type(enum module_type type, BOOL virtual) struct module* module_new(struct process* pcs, const WCHAR* name, enum module_type type, BOOL virtual, DWORD64 mod_addr, DWORD64 size, - ULONG_PTR stamp, ULONG_PTR checksum) + ULONG_PTR stamp, ULONG_PTR checksum, WORD machine) { struct module* module; unsigned i; @@ -229,7 +229,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->module.TypeInfo = FALSE; module->module.SourceIndexed = FALSE; module->module.Publics = FALSE; - module->module.MachineType = 0; + module->module.MachineType = machine; module->module.Reserved = 0; module->reloc_delta = 0; @@ -792,7 +792,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & SLMFLAG_VIRTUAL) { if (!wImageName) return 0; - module = module_new(pcs, wImageName, DMT_PE, TRUE, BaseOfDll, SizeOfDll, 0, 0); + module = module_new(pcs, wImageName, DMT_PE, TRUE, BaseOfDll, SizeOfDll, 0, 0, IMAGE_FILE_MACHINE_UNKNOWN); if (!module) return 0; if (wModuleName) module_set_module(module, wModuleName); module->module.SymType = SymVirtual; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 383d2b52429..38829d6e6de 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -815,7 +815,8 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size, modfmt->u.pe_info->fmap.u.pe.file_header.TimeDateStamp, - PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, CheckSum)); + PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, CheckSum), + modfmt->u.pe_info->fmap.u.pe.file_header.Machine); if (module) { module->real_path = builtin.path; @@ -877,7 +878,8 @@ struct module* pe_load_builtin_module(struct process* pcs, const WCHAR* name, if (!size) size = nth.OptionalHeader.SizeOfImage; module = module_new(pcs, name, DMT_PE, FALSE, base, size, nth.FileHeader.TimeDateStamp, - nth.OptionalHeader.CheckSum); + nth.OptionalHeader.CheckSum, + nth.FileHeader.Machine); } } return module;

1 0

Eric Pouech : dbghelp: Use module->modulename instead of module->module.ModuleName in traces.
by Alexandre Julliard Sept. 6, 2021

Sept. 6, 2021

Module: wine Branch: master Commit: b9ebb3fb6269846cb9b04e4887d0235f089a79bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9ebb3fb6269846cb9b04e48… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Sep 6 10:40:08 2021 +0200 dbghelp: Use module->modulename instead of module->module.ModuleName in traces. The former is truncated to 64 chars while the latter is truncated to 32 chars. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 6 +++--- dlls/dbghelp/elf_module.c | 12 ++++++------ dlls/dbghelp/macho_module.c | 8 ++++---- dlls/dbghelp/module.c | 4 ++-- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- dlls/dbghelp/symbol.c | 20 ++++++++++---------- dlls/dbghelp/type.c | 4 ++-- 8 files changed, 29 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9ebb3fb6269846cb9b0…

1 0

Zhiyi Zhang : explorer: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard Sept. 6, 2021

Sept. 6, 2021

Module: wine Branch: master Commit: f613323d93ba43053d81a123244895e87d6d7c79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f613323d93ba43053d81a123… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 6 16:54:52 2021 +0800 explorer: Add system DPI awareness settings to the application manifest. This is also required for get_monitor_dpi() in wineserver to function properly for DPI unaware applications because it uses desktop window DPI as monitor DPI. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/explorer/explorer.manifest b/programs/explorer/explorer.manifest index 15e5428a1b7..a4b573f0b41 100644 --- a/programs/explorer/explorer.manifest +++ b/programs/explorer/explorer.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : dxdiag: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard Sept. 6, 2021

Sept. 6, 2021

Module: wine Branch: master Commit: 3331d92a3cc3a0e5ee23ad8d7ca023f9377a62bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3331d92a3cc3a0e5ee23ad8d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 6 16:54:45 2021 +0800 dxdiag: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dxdiag/dxdiag.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/dxdiag/dxdiag.manifest b/programs/dxdiag/dxdiag.manifest index 57ba80c05db..6b17f6cd09f 100644 --- a/programs/dxdiag/dxdiag.manifest +++ b/programs/dxdiag/dxdiag.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : clock: Add DPI system awareness settings to the application manifest.
by Alexandre Julliard Sept. 6, 2021

Sept. 6, 2021

Module: wine Branch: master Commit: a30d2c5821cec6301b6736e22d4a00dd8f2f31b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a30d2c5821cec6301b6736e2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 6 16:54:37 2021 +0800 clock: Add DPI system awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/clock/clock.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/clock/clock.manifest b/programs/clock/clock.manifest index 4a9f38c4ff8..393459c383c 100644 --- a/programs/clock/clock.manifest +++ b/programs/clock/clock.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Eric Pouech : dbghelp: Allow loading virtual module at any address.
by Alexandre Julliard Sept. 6, 2021

Sept. 6, 2021

Module: wine Branch: master Commit: aed40b934c6ab307afc156b943c8087b57934ae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aed40b934c6ab307afc156b9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Sep 6 10:39:55 2021 +0200 dbghelp: Allow loading virtual module at any address. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index f2c0eca5df6..916aaf5ce53 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -786,7 +786,6 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Data) FIXME("Unsupported load data parameter %p for %s\n", Data, debugstr_w(wImageName)); - if (!validate_addr64(BaseOfDll)) return 0; if (!(pcs = process_find_by_handle(hProcess))) return 0; @@ -803,6 +802,8 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & ~(SLMFLAG_VIRTUAL)) FIXME("Unsupported Flags %08x for %s\n", Flags, debugstr_w(wImageName)); + if (!validate_addr64(BaseOfDll)) return 0; + pcs->loader->synchronize_module_list(pcs); /* this is a Wine extension to the API just to redo the synchronisation */ @@ -923,7 +924,6 @@ BOOL WINAPI SymUnloadModule64(HANDLE hProcess, DWORD64 BaseOfDll) pcs = process_find_by_handle(hProcess); if (!pcs) return FALSE; - if (!validate_addr64(BaseOfDll)) return FALSE; module = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); if (!module) return FALSE; return module_remove(pcs, module);

1 0

Eric Pouech : dbghelp: Return correct error code when reloading a module in SymLoadModule*.
by Alexandre Julliard Sept. 6, 2021

Sept. 6, 2021

Module: wine Branch: master Commit: 2296b4952a3f665e12a189f64457ac2d3074590c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2296b4952a3f665e12a189f6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Sep 6 10:40:02 2021 +0200 dbghelp: Return correct error code when reloading a module in SymLoadModule*. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 916aaf5ce53..e0d1dce0c86 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -815,6 +815,20 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (wImageName) { module = module_is_already_loaded(pcs, wImageName); + if (module) + { + if (module->module.BaseOfImage == BaseOfDll) + SetLastError(ERROR_SUCCESS); + else + { + /* native allows to load the same module at different addresses + * we don't support this for now + */ + SetLastError(ERROR_INVALID_PARAMETER); + FIXME("Reloading %s at different base address isn't supported\n", debugstr_w(module->modulename)); + } + return 0; + } if (!module && module_is_container_loaded(pcs, wImageName, BaseOfDll)) { /* force the loading of DLL as builtin */

1 0