- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : ieframe: Implement IEHTMLWindow2_get_document.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 125c390f61e09bcc2e988ecf39aed92b8b54951b URL: https://gitlab.winehq.org/wine/wine/-/commit/125c390f61e09bcc2e988ecf39aed9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 ieframe: Implement IEHTMLWindow2_get_document. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ieframe/iehtmlwnd.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/iehtmlwnd.c b/dlls/ieframe/iehtmlwnd.c index 44e58a2cdff..de211fc784f 100644 --- a/dlls/ieframe/iehtmlwnd.c +++ b/dlls/ieframe/iehtmlwnd.c @@ -22,6 +22,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(ieframe); +HRESULT get_window(DocHost *doc_host, IHTMLWindow2 **ret) +{ + IHTMLDocument2 *doc_obj; + HRESULT hres; + + if(!doc_host->document) { + *ret = NULL; + return S_OK; + } + + hres = IUnknown_QueryInterface(doc_host->document, &IID_IHTMLDocument2, (void**)&doc_obj); + if(FAILED(hres)) + return hres; + + hres = IHTMLDocument2_get_parentWindow(doc_obj, ret); + IHTMLDocument2_Release(doc_obj); + return hres; +} + static inline IEHTMLWindow *impl_from_IHTMLWindow2(IHTMLWindow2 *iface) { return CONTAINING_RECORD(iface, IEHTMLWindow, IHTMLWindow2_iface); @@ -432,8 +451,22 @@ static HRESULT WINAPI IEHTMLWindow2_get_onscroll(IHTMLWindow2 *iface, VARIANT *p static HRESULT WINAPI IEHTMLWindow2_get_document(IHTMLWindow2 *iface, IHTMLDocument2 **p) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IHTMLWindow2 *window; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + hres = get_window(This->doc_host, &window); + if(FAILED(hres)) + return hres; + + if(!window) + *p = NULL; + else { + hres = IHTMLWindow2_get_document(window, p); + IHTMLWindow2_Release(window); + } + return hres; } static HRESULT WINAPI IEHTMLWindow2_get_event(IHTMLWindow2 *iface, IHTMLEventObj **p)

1 0

Gabriel Ivăncescu : shdoclc: Add a basic generic html page for navigation errors.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: e3c768ab551b4751937a14d55ae470e5618ff272 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3c768ab551b4751937a14d55ae470… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 shdoclc: Add a basic generic html page for navigation errors. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shdoclc/ERROR.HTM | 13 +++++++++++++ dlls/shdoclc/shdoclc.rc | 3 +++ 2 files changed, 16 insertions(+) diff --git a/dlls/shdoclc/ERROR.HTM b/dlls/shdoclc/ERROR.HTM new file mode 100644 index 00000000000..e74efa15608 --- /dev/null +++ b/dlls/shdoclc/ERROR.HTM @@ -0,0 +1,13 @@ +<!DOCTYPE HTML> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Page Load Error</title> +</head> +<body onload="javascript: if(window.location.search) document.getElementById('err').innerHTML = unescape(window.location.search.substr(1))"> +<div style="margin-left:45px; width:720px;"> + <h2>The page cannot be loaded because of an error</h2> + <p>Error code: <b id="err">Unknown</b></p> +</div> +</body> +</html> diff --git a/dlls/shdoclc/shdoclc.rc b/dlls/shdoclc/shdoclc.rc index 57b03e152d4..a350438e0fb 100644 --- a/dlls/shdoclc/shdoclc.rc +++ b/dlls/shdoclc/shdoclc.rc @@ -241,3 +241,6 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Scroll Right", IDM_SCROLL_RIGHT } } + +/* @makedep: ERROR.HTM */ +ERROR.HTM HTML "ERROR.HTM"

1 0

Gabriel Ivăncescu : ieframe: Navigate to a basic error page on failed navigation.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 8a67308f7466fed8f8f3b4968b7022ec8bc12459 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a67308f7466fed8f8f3b4968b7022… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 ieframe: Navigate to a basic error page on failed navigation. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 49 +++++++++++++-- dlls/ieframe/tests/ie.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 198 insertions(+), 8 deletions(-)

1 0

Zebediah Figura : objsel: Do not check for a NULL interface in COM methods.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 2ac66e33fd89bbae31367ebda94415424d812a56 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ac66e33fd89bbae31367ebda94415… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 17:45:49 2023 -0500 objsel: Do not check for a NULL interface in COM methods. --- dlls/objsel/objsel.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index 0c809673c44..41f548bbc75 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -59,8 +59,6 @@ static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface) TRACE("\n"); - if (This == NULL) return E_POINTER; - return InterlockedIncrement(&This->ref); } @@ -75,8 +73,6 @@ static ULONG WINAPI OBJSEL_IDsObjectPicker_Release(IDsObjectPicker * iface) TRACE("\n"); - if (This == NULL) return E_POINTER; - ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -209,9 +205,6 @@ static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) TRACE("\n"); - if (!factory) - return E_POINTER; - return InterlockedIncrement(&factory->ref); } @@ -222,9 +215,6 @@ static ULONG WINAPI class_factory_Release(IClassFactory *iface) TRACE("\n"); - if (!factory) - return E_POINTER; - return InterlockedDecrement(&factory->ref); }

1 0

Alexandre Julliard : ntdll: Only create the main module on the 32-bit side for wow64.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: de81e2ea41b27a14f88177639c5b5d35a210b5bd URL: https://gitlab.winehq.org/wine/wine/-/commit/de81e2ea41b27a14f88177639c5b5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 6 15:08:02 2023 +0200 ntdll: Only create the main module on the 32-bit side for wow64. --- dlls/ntdll/loader.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cfb1e833cc6..2bf1437623f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4219,16 +4219,13 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR init_user_process_params(); load_global_options(); version_init(); + build_ntdll_module( meminfo.AllocationBase ); - get_env_var( L"WINESYSTEMDLLPATH", 0, &system_dll_path ); + if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); wm = build_main_module(); wm->ldr.LoadCount = -1; - build_ntdll_module( meminfo.AllocationBase ); - - if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); - if ((status = load_dll( NULL, L"kernel32.dll", 0, &kernel32, FALSE )) != STATUS_SUCCESS) { MESSAGE( "wine: could not load kernel32.dll, status %lx\n", status ); @@ -4245,6 +4242,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR actctx_init(); locale_init(); + get_env_var( L"WINESYSTEMDLLPATH", 0, &system_dll_path ); if (wm->ldr.Flags & LDR_COR_ILONLY) status = fixup_imports_ilonly( wm, NULL, entry ); else

1 0

Alexandre Julliard : server: Remove some leftover code from a failed rebase.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 93a5dce013a0b992e18ff6b923dcbb6535577ab3 URL: https://gitlab.winehq.org/wine/wine/-/commit/93a5dce013a0b992e18ff6b923dcbb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 6 11:23:46 2023 +0200 server: Remove some leftover code from a failed rebase. --- server/mapping.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index c570bcf8f94..a795dc4b38b 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -833,11 +833,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s !(nt.FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)); if (nt.opt.hdr64.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; - else if (nt.opt.hdr64.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_BASERELOC && - nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress && - nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size && - !(nt.FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)) - mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated; else if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && (has_relocs || mapping->image.contains_code) && !(clr_va && clr_size)) mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated;

1 0

Zebediah Figura : objsel: Remove unnecessary includes.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 528fdc783bf8fe84cf232b90b5d19acc258c0a32 URL: https://gitlab.winehq.org/wine/wine/-/commit/528fdc783bf8fe84cf232b90b5d19a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 13:01:43 2023 -0500 objsel: Remove unnecessary includes. --- dlls/objsel/objsel.c | 1 - dlls/objsel/objsel_private.h | 16 +--------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index e42ac5ab898..90873191691 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -19,7 +19,6 @@ */ #include "objsel_private.h" -#include "rpcproxy.h" #include "wine/debug.h" diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h index 9289c00d8c9..b0a2e956733 100644 --- a/dlls/objsel/objsel_private.h +++ b/dlls/objsel/objsel_private.h @@ -18,24 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" - #define COBJMACROS -#include "ole2.h" -#include "strmif.h" -#include "olectl.h" -#include "unknwn.h" +#include "objidl.h" #include "objsel.h" -#include "uuids.h" /********************************************************************** * Dll lifetime tracking declaration for objsel.dll

1 0

Zebediah Figura : objsel: Merge factory.c into objsel.c.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 026c7fc6b52f26b75de920f57766c807a329610d URL: https://gitlab.winehq.org/wine/wine/-/commit/026c7fc6b52f26b75de920f57766c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 17:41:14 2023 -0500 objsel: Merge factory.c into objsel.c. A separate file for the class factory is not justified. --- dlls/objsel/Makefile.in | 1 - dlls/objsel/factory.c | 152 ------------------------------------------- dlls/objsel/objsel.c | 151 ++++++++++++++++++++++++++++++++++++------ dlls/objsel/objsel_private.h | 43 ------------ 4 files changed, 131 insertions(+), 216 deletions(-)

1 0

Zebediah Figura : objsel: Remove DLL refcount tracking.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 39ccd7199160bd0e9ed3ed4a040328f930369706 URL: https://gitlab.winehq.org/wine/wine/-/commit/39ccd7199160bd0e9ed3ed4a040328… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 13:05:14 2023 -0500 objsel: Remove DLL refcount tracking. Recent consensus seems to be that this isn't worth the effort. --- dlls/objsel/factory.c | 20 ++------------------ dlls/objsel/objsel.c | 24 +----------------------- dlls/objsel/objsel_private.h | 6 ------ 3 files changed, 3 insertions(+), 47 deletions(-) diff --git a/dlls/objsel/factory.c b/dlls/objsel/factory.c index cb0fb491cb4..c3e64f0568a 100644 --- a/dlls/objsel/factory.c +++ b/dlls/objsel/factory.c @@ -66,20 +66,12 @@ static HRESULT WINAPI OBJSEL_IClassFactory_QueryInterface( static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface) { ClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref; TRACE("\n"); if (This == NULL) return E_POINTER; - ref = InterlockedIncrement(&This->ref); - - if (ref == 1) - { - InterlockedIncrement(&dll_refs); - } - - return ref; + return InterlockedIncrement(&This->ref); } @@ -89,20 +81,12 @@ static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface) static ULONG WINAPI OBJSEL_IClassFactory_Release(LPCLASSFACTORY iface) { ClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref; TRACE("\n"); if (This == NULL) return E_POINTER; - ref = InterlockedDecrement(&This->ref); - - if (ref == 0) - { - InterlockedDecrement(&dll_refs); - } - - return ref; + return InterlockedDecrement(&This->ref); } diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index 90873191691..026a6d594af 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -24,8 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(objsel); -LONG dll_refs = 0; - /*********************************************************************** * DllGetClassObject (OBJSEL.@) */ @@ -43,15 +41,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) } -/*********************************************************************** - * DllCanUnloadNow (OBJSEL.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return dll_refs != 0 ? S_FALSE : S_OK; -} - - /********************************************************************** * OBJSEL_IDsObjectPicker_Destroy (also IUnknown) */ @@ -74,20 +63,12 @@ static inline IDsObjectPickerImpl *impl_from_IDsObjectPicker(IDsObjectPicker *if static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface) { IDsObjectPickerImpl *This = impl_from_IDsObjectPicker(iface); - ULONG ref; TRACE("\n"); if (This == NULL) return E_POINTER; - ref = InterlockedIncrement(&This->ref); - - if (ref == 1) - { - InterlockedIncrement(&dll_refs); - } - - return ref; + return InterlockedIncrement(&This->ref); } @@ -106,10 +87,7 @@ static ULONG WINAPI OBJSEL_IDsObjectPicker_Release(IDsObjectPicker * iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) - { - InterlockedDecrement(&dll_refs); OBJSEL_IDsObjectPicker_Destroy(This); - } return ref; } diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h index b0a2e956733..86ea129089b 100644 --- a/dlls/objsel/objsel_private.h +++ b/dlls/objsel/objsel_private.h @@ -23,12 +23,6 @@ #include "objidl.h" #include "objsel.h" -/********************************************************************** - * Dll lifetime tracking declaration for objsel.dll - */ - -extern LONG dll_refs DECLSPEC_HIDDEN; - /********************************************************************** * ClassFactory declaration for objsel.dll */

1 0

Alex Henrie : riched20: Use CRT allocation functions.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 42579f1dcd2f14e765e2f53ceb5b46fff5623f10 URL: https://gitlab.winehq.org/wine/wine/-/commit/42579f1dcd2f14e765e2f53ceb5b46… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 24 11:36:20 2023 -0600 riched20: Use CRT allocation functions. --- dlls/riched20/caret.c | 2 +- dlls/riched20/clipboard.c | 8 +++--- dlls/riched20/editor.c | 36 ++++++++++++------------ dlls/riched20/editstr.h | 1 - dlls/riched20/list.c | 8 +++--- dlls/riched20/reader.c | 72 +++++++++++++++++------------------------------ dlls/riched20/richole.c | 22 +++++++-------- dlls/riched20/string.c | 24 ++++++++-------- dlls/riched20/style.c | 4 +-- dlls/riched20/table.c | 2 +- dlls/riched20/txthost.c | 12 ++++---- dlls/riched20/txtsrv.c | 4 +-- dlls/riched20/undo.c | 8 +++--- dlls/riched20/wrap.c | 18 ++++++------ dlls/riched20/writer.c | 12 ++++---- 15 files changed, 106 insertions(+), 127 deletions(-)

1 0