August 2023 - Wine-commits - list.winehq.org

Ilia Docin : sane.ds: Set monochrome DIB color table.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: b830a46dfbf86fe6dcd23d3dcfd7ed709f50ffc6 URL: https://gitlab.winehq.org/wine/wine/-/commit/b830a46dfbf86fe6dcd23d3dcfd7ed… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Sun Aug 6 14:04:46 2023 +0300 sane.ds: Set monochrome DIB color table. --- dlls/sane.ds/ds_image.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index 2c52184a056..250b4aba6f9 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -335,10 +335,8 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, switch (activeDS.frame_params.format) { case FMT_GRAY: - if (activeDS.frame_params.depth == 8) - color_size = (1 << 8) * sizeof(*colors); - else if (activeDS.frame_params.depth == 1) - ; + if (activeDS.frame_params.depth == 8 || activeDS.frame_params.depth == 1) + color_size = (1 << activeDS.frame_params.depth) * sizeof(*colors); else { FIXME("For NATIVE, we support only 1 bit monochrome and 8 bit Grayscale, not %d\n", activeDS.frame_params.depth); @@ -405,8 +403,15 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, { colors = (RGBQUAD *) p; p += color_size; - for (i = 0; i < (color_size / sizeof(*colors)); i++) - colors[i].rgbBlue = colors[i].rgbRed = colors[i].rgbGreen = i; + if (activeDS.frame_params.depth == 1) + { + /* Sane uses 1 to represent minimum intensity (black) and 0 for maximum (white) */ + colors[0].rgbBlue = colors[0].rgbRed = colors[0].rgbGreen = 255; + colors[1].rgbBlue = colors[1].rgbRed = colors[1].rgbGreen = 0; + } + else + for (i = 0; i < (color_size / sizeof(*colors)); i++) + colors[i].rgbBlue = colors[i].rgbRed = colors[i].rgbGreen = i; }

1 0

Alex Henrie : include: Add __WINE_ALLOC_SIZE to the definition of FNALLOC.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 9d509c0383b62b7779556028935ad73b783bb3be URL: https://gitlab.winehq.org/wine/wine/-/commit/9d509c0383b62b7779556028935ad7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 15 19:52:47 2023 -0600 include: Add __WINE_ALLOC_SIZE to the definition of FNALLOC. --- include/fdi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/fdi.h b/include/fdi.h index a4928b06f95..6659ce462ef 100644 --- a/include/fdi.h +++ b/include/fdi.h @@ -204,7 +204,7 @@ typedef struct { /**********************************************************************/ typedef void * (__WINE_ALLOC_SIZE(1) __cdecl *PFNALLOC)(ULONG cb); -#define FNALLOC(fn) void * __cdecl fn(ULONG cb) +#define FNALLOC(fn) void * __WINE_ALLOC_SIZE(1) __cdecl fn(ULONG cb) typedef void (__cdecl *PFNFREE)(void *pv); #define FNFREE(fn) void __cdecl fn(void *pv)

1 0

Vitaly Lipatov : include: Add some missing defines.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: de17a77b2f1923fd2a487de33e96ec4a9126742b URL: https://gitlab.winehq.org/wine/wine/-/commit/de17a77b2f1923fd2a487de33e96ec… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:13:46 2023 +0300 include: Add some missing defines. --- include/lmshare.h | 2 ++ include/msasn1.h | 4 ++++ include/ntstatus.h | 1 + 3 files changed, 7 insertions(+) diff --git a/include/lmshare.h b/include/lmshare.h index 442cf5ef306..2cb71df4756 100644 --- a/include/lmshare.h +++ b/include/lmshare.h @@ -74,6 +74,8 @@ NET_API_STATUS WINAPI NetShareSetInfo(LMSTR,LMSTR,DWORD,LPBYTE,LPDWORD); #define STYPE_IPC 3 #define STYPE_SPECIAL 0x80000000 +#define SHI_USES_UNLIMITED (DWORD)(-1) + NET_API_STATUS WINAPI NetSessionDel(LMSTR,LMSTR,LMSTR); NET_API_STATUS WINAPI NetSessionEnum(LMSTR,LMSTR,LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetSessionGetInfo(LMSTR,LMSTR,LMSTR,DWORD,LPBYTE*); diff --git a/include/msasn1.h b/include/msasn1.h index 244ed61487b..89539d48c0d 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -46,6 +46,10 @@ typedef ASN1uint16_t ASN1choice_t; typedef ASN1uint32_t ASN1magic_t; typedef ASN1ztcharstring_t ASN1objectdescriptor_t; +#define ASN1_PUBLIC DECLSPEC_IMPORT +#define ASN1API __stdcall +#define ASN1CALL __stdcall + #define ASN1_MAKE_VERSION(major,minor) (((major) << 16) | (minor)) #define ASN1_THIS_VERSION ASN1_MAKE_VERSION(1,0) diff --git a/include/ntstatus.h b/include/ntstatus.h index e049be0bdbd..15bc7d6668b 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1413,6 +1413,7 @@ #define STATUS_SMI_PRIMITIVE_INSTALLER_FAILED ((NTSTATUS) 0xC0150025) #define STATUS_GENERIC_COMMAND_FAILED ((NTSTATUS) 0xC0150026) #define STATUS_SXS_FILE_HASH_MISSING ((NTSTATUS) 0xC0150027) +#define STATUS_HANDLE_NO_LONGER_VALID ((NTSTATUS) 0xC0190028) #define STATUS_GRAPHICS_NOT_EXCLUSIVE_MODE_OWNER ((NTSTATUS) 0xC01E0000) #define STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER ((NTSTATUS) 0xC01E0001)

1 0

Vitaly Lipatov : include: Use compatible file guard name (_NTSECAPI_, _NTSECPKG_).
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: caae33a8534cfd4beced1be3ca7cf21edc28c4f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/caae33a8534cfd4beced1be3ca7cf2… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:16:29 2023 +0300 include: Use compatible file guard name (_NTSECAPI_, _NTSECPKG_). --- include/ntsecapi.h | 6 +++--- include/ntsecpkg.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index b06a9628e61..849e72ef33e 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_NTSECAPI_H -#define __WINE_NTSECAPI_H +#ifndef _NTSECAPI_ +#define _NTSECAPI_ #ifndef GUID_DEFINED # include <guiddef.h> @@ -712,4 +712,4 @@ NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING,PHANDLE,PLSA_OPERATIONAL_MOD } /* extern "C" */ #endif /* defined(__cplusplus) */ -#endif /* !defined(__WINE_NTSECAPI_H) */ +#endif /* !defined(_NTSECAPI_) */ diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 609be585d24..836c9c650ef 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _NTSECPKG_H -#define _NTSECPKG_H +#ifndef _NTSECPKG_ +#define _NTSECPKG_ #ifdef __cplusplus extern "C" { @@ -511,4 +511,4 @@ typedef NTSTATUS (WINAPI *SpUserModeInitializeFn)(ULONG, PULONG, #ifdef __cplusplus } #endif -#endif /* _NTSECPKG_H */ +#endif /* _NTSECPKG_ */

1 0

Vitaly Lipatov : include: Add specstrings_strict.h with some defines.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 6bcdbbe5736f8c5f9adb1c4c687a3f23a4e5c261 URL: https://gitlab.winehq.org/wine/wine/-/commit/6bcdbbe5736f8c5f9adb1c4c687a3f… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:17:04 2023 +0300 include: Add specstrings_strict.h with some defines. --- include/Makefile.in | 1 + include/specstrings.h | 4 ++++ include/specstrings_strict.h | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 54b4ab5925e..c5ba156f50e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -710,6 +710,7 @@ SOURCES = \ softpub.h \ spatialaudioclient.idl \ specstrings.h \ + specstrings_strict.h \ sperror.h \ sql.h \ sqlext.h \ diff --git a/include/specstrings.h b/include/specstrings.h index f2636a49779..4d404759c2e 100644 --- a/include/specstrings.h +++ b/include/specstrings.h @@ -323,6 +323,10 @@ extern "C" { #endif #endif +#ifndef RC_INVOKED +#include <specstrings_strict.h> +#endif /* RC_INVOKED */ + #ifndef DECLSPEC_ADDRSAFE #if (_MSC_VER >= 1200) && (defined(_M_ALPHA) || defined(_M_AXP64)) #define DECLSPEC_ADDRSAFE __declspec(address_safe) diff --git a/include/specstrings_strict.h b/include/specstrings_strict.h new file mode 100644 index 00000000000..07a30db765c --- /dev/null +++ b/include/specstrings_strict.h @@ -0,0 +1,37 @@ +/* + * Copyright 2023 Vitaly Lipatov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __SPECSTRINGS_STRICT_LEVEL +#define __SPECSTRINGS_STRICT_LEVEL 1 +#endif + +#if !defined(__midl) && !defined(__WIDL__) && (__SPECSTRINGS_STRICT_LEVEL > 0) + +#define __field_bcount(size) +#define __field_ecount(size) +#define __field_xcount(size) +#define __success(status) +#define __range(lb,ub) + +#ifdef _MSC_VER +#define __in +#define __out +#define __reserved +#endif + +#endif

1 0

Gabriel Ivăncescu : mshtml: Use ASCII strings for dispex object names.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: c81c0aa7a35d4fbd770b845207240d6055b77f24 URL: https://gitlab.winehq.org/wine/wine/-/commit/c81c0aa7a35d4fbd770b845207240d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:26 2023 +0300 mshtml: Use ASCII strings for dispex object names. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 12 +++++------- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlarea.c | 2 +- dlls/mshtml/htmlattr.c | 2 +- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmlcurstyle.c | 2 +- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/htmlelem.c | 14 +++++++------- dlls/mshtml/htmlelemcol.c | 2 +- dlls/mshtml/htmlevent.c | 20 ++++++++++---------- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlframe.c | 4 ++-- dlls/mshtml/htmlgeneric.c | 2 +- dlls/mshtml/htmlhead.c | 8 ++++---- dlls/mshtml/htmlimg.c | 4 ++-- dlls/mshtml/htmlinput.c | 6 +++--- dlls/mshtml/htmllink.c | 2 +- dlls/mshtml/htmllocation.c | 2 +- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmlobject.c | 4 ++-- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 6 +++--- dlls/mshtml/htmlstorage.c | 2 +- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmlstyleelem.c | 2 +- dlls/mshtml/htmlstylesheet.c | 8 ++++---- dlls/mshtml/htmltable.c | 6 +++--- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/htmltextnode.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 4 ++-- dlls/mshtml/omnavigator.c | 24 ++++++++++++------------ dlls/mshtml/range.c | 4 ++-- dlls/mshtml/selection.c | 2 +- dlls/mshtml/xmlhttprequest.c | 4 ++-- 37 files changed, 88 insertions(+), 90 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Move console to the inner window.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 5e8210bb94f31bab5b329dd9133561d2c04f65aa URL: https://gitlab.winehq.org/wine/wine/-/commit/5e8210bb94f31bab5b329dd9133561… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:26 2023 +0300 mshtml: Move console to the inner window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 16 +++++++--------- dlls/mshtml/mshtml_private.h | 3 +-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e668f8a5d2b..26964b3216f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -257,9 +257,6 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - if (This->console) - IWineMSHTMLConsole_Release(This->console); - if(is_outer_window(This)) release_outer_window(This->outer_window); else @@ -3255,15 +3252,16 @@ static HRESULT WINAPI window_private_postMessage(IWineHTMLWindowPrivate *iface, static HRESULT WINAPI window_private_get_console(IWineHTMLWindowPrivate *iface, IDispatch **console) { HTMLWindow *This = impl_from_IWineHTMLWindowPrivateVtbl(iface); + HTMLInnerWindow *window = This->inner_window; TRACE("iface %p, console %p.\n", iface, console); - if (!This->console) - create_console(dispex_compat_mode(&This->inner_window->event_target.dispex), &This->console); + if (!window->console) + create_console(dispex_compat_mode(&window->event_target.dispex), &window->console); - *console = (IDispatch *)This->console; - if (This->console) - IWineMSHTMLConsole_AddRef(This->console); + *console = (IDispatch *)window->console; + if (window->console) + IWineMSHTMLConsole_AddRef(window->console); return S_OK; } @@ -3725,7 +3723,7 @@ static void HTMLWindow_unlink(DispatchEx *dispex) TRACE("%p\n", This); - unlink_ref(&This->base.console); + unlink_ref(&This->console); detach_inner_window(This); if(This->doc) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 32ea4c9c9ea..2a608efcfc6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -569,8 +569,6 @@ struct HTMLWindow { IWineHTMLWindowPrivate IWineHTMLWindowPrivate_iface; IWineHTMLWindowCompatPrivate IWineHTMLWindowCompatPrivate_iface; - IWineMSHTMLConsole *console; - LONG ref; HTMLInnerWindow *inner_window; @@ -625,6 +623,7 @@ struct HTMLInnerWindow { IOmNavigator *navigator; IHTMLStorage *session_storage; IHTMLStorage *local_storage; + IWineMSHTMLConsole *console; BOOL performance_initialized; VARIANT performance;

1 0

Gabriel Ivăncescu : mshtml: Split IUnknown methods for outer windows into separate vtable.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 4e08d7e200779f81666e5afe2066343106de0444 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e08d7e200779f81666e5afe206634… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:26 2023 +0300 mshtml: Split IUnknown methods for outer windows into separate vtable. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 174 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 150 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 26964b3216f..ef71246d723 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -62,11 +62,6 @@ HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy *mozwindow) return entry ? WINE_RB_ENTRY_VALUE(entry, HTMLOuterWindow, entry) : NULL; } -static inline BOOL is_outer_window(HTMLWindow *window) -{ - return &window->outer_window->base == window; -} - static void get_location(HTMLOuterWindow *This, HTMLLocation **ret) { if(!This->location.dispex.outer) @@ -146,12 +141,18 @@ static inline HTMLWindow *impl_from_IHTMLWindow2(IHTMLWindow2 *iface) return CONTAINING_RECORD(iface, HTMLWindow, IHTMLWindow2_iface); } -static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) +static inline HTMLInnerWindow *HTMLInnerWindow_from_IHTMLWindow2(IHTMLWindow2 *iface) { - HTMLWindow *This = impl_from_IHTMLWindow2(iface); + return CONTAINING_RECORD(iface, HTMLInnerWindow, base.IHTMLWindow2_iface); +} - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); +static inline HTMLOuterWindow *HTMLOuterWindow_from_IHTMLWindow2(IHTMLWindow2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLOuterWindow, base.IHTMLWindow2_iface); +} +static HRESULT base_query_interface(HTMLWindow *This, REFIID riid, void **ppv) +{ if(IsEqualGUID(&IID_IUnknown, riid)) { *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { @@ -194,21 +195,69 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii *ppv = NULL; FIXME("(%p)->(IID_IMarshal %p)\n", This, ppv); return E_NOINTERFACE; - }else if(dispex_query_interface(&This->inner_window->event_target.dispex, riid, ppv)) { - assert(!*ppv); - return E_NOINTERFACE; }else { - return EventTarget_QI(&This->inner_window->event_target, riid, ppv); + return S_FALSE; } IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } +static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) +{ + HTMLInnerWindow *This = HTMLInnerWindow_from_IHTMLWindow2(iface); + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + hres = base_query_interface(&This->base, riid, ppv); + if(hres != S_FALSE) + return hres; + + return EventTarget_QI(&This->event_target, riid, ppv); +} + static ULONG WINAPI HTMLWindow2_AddRef(IHTMLWindow2 *iface) { - HTMLWindow *This = impl_from_IHTMLWindow2(iface); - LONG ref = InterlockedIncrement(&This->ref); + HTMLInnerWindow *This = HTMLInnerWindow_from_IHTMLWindow2(iface); + LONG ref = InterlockedIncrement(&This->base.ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) +{ + HTMLInnerWindow *This = HTMLInnerWindow_from_IHTMLWindow2(iface); + LONG ref = InterlockedDecrement(&This->base.ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) + release_dispex(&This->event_target.dispex); + + return ref; +} + +static HRESULT WINAPI outer_window_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) +{ + HTMLOuterWindow *This = HTMLOuterWindow_from_IHTMLWindow2(iface); + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + hres = base_query_interface(&This->base, riid, ppv); + if(hres != S_FALSE) + return hres; + + return EventTarget_QI(&This->base.inner_window->event_target, riid, ppv); +} + +static ULONG WINAPI outer_window_AddRef(IHTMLWindow2 *iface) +{ + HTMLOuterWindow *This = HTMLOuterWindow_from_IHTMLWindow2(iface); + LONG ref = InterlockedIncrement(&This->base.ref); TRACE("(%p) ref=%ld\n", This, ref); @@ -249,19 +298,15 @@ static void release_outer_window(HTMLOuterWindow *This) free(This); } -static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) +static ULONG WINAPI outer_window_Release(IHTMLWindow2 *iface) { - HTMLWindow *This = impl_from_IHTMLWindow2(iface); - LONG ref = InterlockedDecrement(&This->ref); + HTMLOuterWindow *This = HTMLOuterWindow_from_IHTMLWindow2(iface); + LONG ref = InterlockedDecrement(&This->base.ref); TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - if(is_outer_window(This)) - release_outer_window(This->outer_window); - else - release_dispex(&This->inner_window->event_target.dispex); - } + if(!ref) + release_outer_window(This); return ref; } @@ -1548,6 +1593,86 @@ static const IHTMLWindow2Vtbl HTMLWindow2Vtbl = { HTMLWindow2_get_external }; +static const IHTMLWindow2Vtbl outer_window_HTMLWindow2Vtbl = { + outer_window_QueryInterface, + outer_window_AddRef, + outer_window_Release, + HTMLWindow2_GetTypeInfoCount, + HTMLWindow2_GetTypeInfo, + HTMLWindow2_GetIDsOfNames, + HTMLWindow2_Invoke, + HTMLWindow2_item, + HTMLWindow2_get_length, + HTMLWindow2_get_frames, + HTMLWindow2_put_defaultStatus, + HTMLWindow2_get_defaultStatus, + HTMLWindow2_put_status, + HTMLWindow2_get_status, + HTMLWindow2_setTimeout, + HTMLWindow2_clearTimeout, + HTMLWindow2_alert, + HTMLWindow2_confirm, + HTMLWindow2_prompt, + HTMLWindow2_get_Image, + HTMLWindow2_get_location, + HTMLWindow2_get_history, + HTMLWindow2_close, + HTMLWindow2_put_opener, + HTMLWindow2_get_opener, + HTMLWindow2_get_navigator, + HTMLWindow2_put_name, + HTMLWindow2_get_name, + HTMLWindow2_get_parent, + HTMLWindow2_open, + HTMLWindow2_get_self, + HTMLWindow2_get_top, + HTMLWindow2_get_window, + HTMLWindow2_navigate, + HTMLWindow2_put_onfocus, + HTMLWindow2_get_onfocus, + HTMLWindow2_put_onblur, + HTMLWindow2_get_onblur, + HTMLWindow2_put_onload, + HTMLWindow2_get_onload, + HTMLWindow2_put_onbeforeunload, + HTMLWindow2_get_onbeforeunload, + HTMLWindow2_put_onunload, + HTMLWindow2_get_onunload, + HTMLWindow2_put_onhelp, + HTMLWindow2_get_onhelp, + HTMLWindow2_put_onerror, + HTMLWindow2_get_onerror, + HTMLWindow2_put_onresize, + HTMLWindow2_get_onresize, + HTMLWindow2_put_onscroll, + HTMLWindow2_get_onscroll, + HTMLWindow2_get_document, + HTMLWindow2_get_event, + HTMLWindow2_get__newEnum, + HTMLWindow2_showModalDialog, + HTMLWindow2_showHelp, + HTMLWindow2_get_screen, + HTMLWindow2_get_Option, + HTMLWindow2_focus, + HTMLWindow2_get_closed, + HTMLWindow2_blur, + HTMLWindow2_scroll, + HTMLWindow2_get_clientInformation, + HTMLWindow2_setInterval, + HTMLWindow2_clearInterval, + HTMLWindow2_put_offscreenBuffering, + HTMLWindow2_get_offscreenBuffering, + HTMLWindow2_execScript, + HTMLWindow2_toString, + HTMLWindow2_scrollBy, + HTMLWindow2_scrollTo, + HTMLWindow2_moveTo, + HTMLWindow2_moveBy, + HTMLWindow2_resizeTo, + HTMLWindow2_resizeBy, + HTMLWindow2_get_external +}; + static inline HTMLWindow *impl_from_IHTMLWindow3(IHTMLWindow3 *iface) { return CONTAINING_RECORD(iface, HTMLWindow, IHTMLWindow3_iface); @@ -4078,7 +4203,6 @@ static void *alloc_window(size_t size) if(!window) return NULL; - window->IHTMLWindow2_iface.lpVtbl = &HTMLWindow2Vtbl; window->IHTMLWindow3_iface.lpVtbl = &HTMLWindow3Vtbl; window->IHTMLWindow4_iface.lpVtbl = &HTMLWindow4Vtbl; window->IHTMLWindow5_iface.lpVtbl = &HTMLWindow5Vtbl; @@ -4105,6 +4229,7 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, window = alloc_window(sizeof(HTMLInnerWindow)); if(!window) return E_OUTOFMEMORY; + window->base.IHTMLWindow2_iface.lpVtbl = &HTMLWindow2Vtbl; hres = create_performance_timing(&window->performance_timing); if(FAILED(hres)) { @@ -4144,6 +4269,7 @@ HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow window = alloc_window(sizeof(HTMLOuterWindow)); if(!window) return E_OUTOFMEMORY; + window->base.IHTMLWindow2_iface.lpVtbl = &outer_window_HTMLWindow2Vtbl; window->base.outer_window = window; window->base.inner_window = NULL;

1 0

Gabriel Ivăncescu : mshtml: Make all event target vtbls const.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: dfd32a332a2689664fc37c482127ff8b3c2035db URL: https://gitlab.winehq.org/wine/wine/-/commit/dfd32a332a2689664fc37c482127ff… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:26 2023 +0300 mshtml: Make all event target vtbls const. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/xmlhttprequest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d4761db77aa..77916ca1a0f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -365,7 +365,7 @@ static IHTMLEventObj *DocumentType_set_current_event(DispatchEx *dispex, IHTMLEv return default_set_current_event(This->node.doc->window, event); } -static event_target_vtbl_t DocumentType_event_target_vtbl = { +static const event_target_vtbl_t DocumentType_event_target_vtbl = { { NULL, }, diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 417923cf444..9bfaefcd892 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -1592,7 +1592,7 @@ static void HTMLXMLHttpRequest_init_dispex_info(dispex_data_t *info, compat_mode compat_mode < COMPAT_MODE_IE11 ? private_ie10_hooks : NULL); } -static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { +static const event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { { HTMLXMLHttpRequest_destructor, HTMLXMLHttpRequest_unlink

1 0

Gabriel Ivăncescu : mshtml: Use designated initializers in dispex and event target vtables.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: b4f9aee68c1c51cec7eba5094297f225e0ee77b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4f9aee68c1c51cec7eba5094297f2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:26 2023 +0300 mshtml: Use designated initializers in dispex and event target vtables. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 8 ++--- dlls/mshtml/htmlattr.c | 4 +-- dlls/mshtml/htmldoc.c | 34 +++++++------------ dlls/mshtml/htmlelem.c | 77 ++++++++++++++++++-------------------------- dlls/mshtml/htmlelemcol.c | 12 +++---- dlls/mshtml/htmlevent.c | 36 ++++++++++----------- dlls/mshtml/htmlimg.c | 8 ++--- dlls/mshtml/htmlnode.c | 12 +++---- dlls/mshtml/htmlselect.c | 8 ++--- dlls/mshtml/htmlstorage.c | 15 ++++----- dlls/mshtml/htmlstyle.c | 9 ++---- dlls/mshtml/htmlstylesheet.c | 30 ++++++++--------- dlls/mshtml/htmlwindow.c | 25 ++++++-------- dlls/mshtml/mutation.c | 9 +++--- dlls/mshtml/omnavigator.c | 36 ++++++++++----------- dlls/mshtml/range.c | 8 ++--- dlls/mshtml/selection.c | 4 +-- dlls/mshtml/xmlhttprequest.c | 13 ++++---- 18 files changed, 146 insertions(+), 202 deletions(-)

1 0