May 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : winecrt0: Initialize the Unix call dispatcher on first use.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 455a3c1796d9a1bc9c049637c37b50fabc48488f URL: https://gitlab.winehq.org/wine/wine/-/commit/455a3c1796d9a1bc9c049637c37b50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 11:46:59 2024 +0200 winecrt0: Initialize the Unix call dispatcher on first use. --- dlls/winecrt0/unix_lib.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index 5b809b6949d..fd5087cbe48 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -43,18 +43,29 @@ static NTSTATUS WINAPI unix_call_fallback( unixlib_handle_t handle, unsigned int return STATUS_DLL_NOT_FOUND; } +static inline void *get_dispatcher( const char *name ) +{ + UNICODE_STRING ntdll_name = RTL_CONSTANT_STRING( L"ntdll.dll" ); + HMODULE module; + void **dispatcher; + + LdrGetDllHandle( NULL, 0, &ntdll_name, &module ); + dispatcher = RtlFindExportedRoutineByName( module, "__wine_unix_call_dispatcher" ); + return dispatcher ? *dispatcher : (void *)unix_call_fallback; +} + +static NTSTATUS WINAPI unix_call_init( unixlib_handle_t handle, unsigned int code, void *args ) +{ + InterlockedExchangePointer( (void **)&__wine_unix_call_dispatcher, + get_dispatcher( "__wine_unix_call_dispatcher" )); + return __wine_unix_call_dispatcher( handle, code, args ); +} + unixlib_handle_t __wine_unixlib_handle = 0; -NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = unix_call_fallback; +NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = unix_call_init; NTSTATUS WINAPI __wine_init_unix_call(void) { - NTSTATUS status; - HMODULE module = GetModuleHandleW( L"ntdll.dll" ); - void **p__wine_unix_call_dispatcher = (void **)GetProcAddress( module, "__wine_unix_call_dispatcher" ); - - if (!p__wine_unix_call_dispatcher) return STATUS_DLL_NOT_FOUND; - status = NtQueryVirtualMemory( GetCurrentProcess(), image_base(), MemoryWineUnixFuncs, - &__wine_unixlib_handle, sizeof(__wine_unixlib_handle), NULL ); - if (!status) __wine_unix_call_dispatcher = *p__wine_unix_call_dispatcher; - return status; + return NtQueryVirtualMemory( GetCurrentProcess(), image_base(), MemoryWineUnixFuncs, + &__wine_unixlib_handle, sizeof(__wine_unixlib_handle), NULL ); }

1 0

Alexandre Julliard : ntdll: Make __wine_unix_call() an inline function.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 127650c293b5716c6a1f2028185c3f3fe8c6598c URL: https://gitlab.winehq.org/wine/wine/-/commit/127650c293b5716c6a1f2028185c3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 11:54:55 2024 +0200 ntdll: Make __wine_unix_call() an inline function. --- dlls/ntdll/loader.c | 11 +---------- dlls/ntdll/ntdll.spec | 1 - dlls/win32u/main.c | 8 +++----- include/wine/unixlib.h | 8 ++++++-- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6e3f67ef593..31bfe60d121 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -70,7 +70,7 @@ typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); typedef void (CALLBACK *LDRENUMPROC)(LDR_DATA_TABLE_ENTRY *, void *, BOOLEAN *); void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *) = NULL; -NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = __wine_unix_call; +NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = NULL; static DWORD (WINAPI *pCtrlRoutine)(void *); @@ -3314,15 +3314,6 @@ NTSTATUS WINAPI __wine_ctrl_routine( void *arg ) } -/*********************************************************************** - * __wine_unix_call - */ -NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) -{ - return __wine_unix_call_dispatcher( handle, code, args ); -} - - /*********************************************************************** * __wine_unix_spawnvp */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 13043130cf6..d32c95c49ad 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1719,7 +1719,6 @@ @ cdecl wine_server_handle_to_fd(long long ptr ptr) # Unix interface -@ stdcall __wine_unix_call(int64 long ptr) @ stdcall __wine_unix_spawnvp(long ptr) @ stdcall __wine_ctrl_routine(ptr) @ extern -private __wine_syscall_dispatcher diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index 28383161b6f..8e32fc63556 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -33,8 +33,6 @@ void *__wine_syscall_dispatcher = NULL; -static unixlib_handle_t win32u_handle; - /******************************************************************* * syscalls */ @@ -2192,6 +2190,8 @@ void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *fun for (;;) RtlRaiseException( &record ); } +void *dummy = NtQueryVirtualMemory; /* forced import to avoid link error with winecrt0 */ + BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) { HMODULE ntdll; @@ -2206,9 +2206,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) LdrGetDllHandle( NULL, 0, &ntdll_name, &ntdll ); dispatcher_ptr = RtlFindExportedRoutineByName( ntdll, "__wine_syscall_dispatcher" ); __wine_syscall_dispatcher = *dispatcher_ptr; - if (!NtQueryVirtualMemory( GetCurrentProcess(), inst, MemoryWineUnixFuncs, - &win32u_handle, sizeof(win32u_handle), NULL )) - __wine_unix_call( win32u_handle, 0, NULL ); + if (!__wine_init_unix_call()) WINE_UNIX_CALL( 0, NULL ); break; } return TRUE; diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 95ff406d968..17ec93110f2 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -258,12 +258,16 @@ static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base ) #else /* WINE_UNIX_LIB */ -NTSYSAPI NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); extern unixlib_handle_t __wine_unixlib_handle; extern NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ); extern NTSTATUS WINAPI __wine_init_unix_call(void); -#define WINE_UNIX_CALL(code,args) __wine_unix_call_dispatcher( __wine_unixlib_handle, (code), (args) ) +static inline NTSTATUS __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) +{ + return __wine_unix_call_dispatcher( handle, code, args ); +} + +#define WINE_UNIX_CALL(code,args) __wine_unix_call( __wine_unixlib_handle, (code), (args) ) #endif /* WINE_UNIX_LIB */

1 0

Victor Chiletto : vkd3d-shader/hlsl: Fix XOR assign operator lexing.
by Alexandre Julliard 22 May '24

22 May '24

Module: vkd3d Branch: master Commit: fa5708d3b554d9534c1fcad0d7d1eae3a535cec1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fa5708d3b554d9534c1fcad0d7d1e… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Mon May 20 14:18:04 2024 -0300 vkd3d-shader/hlsl: Fix XOR assign operator lexing. --- libs/vkd3d-shader/hlsl.l | 2 +- tests/hlsl/bitwise.shader_test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 88b917ef..a5923d8b 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -191,7 +191,7 @@ while {return KW_WHILE; } %= {return OP_MODASSIGN; } &= {return OP_ANDASSIGN; } \|= {return OP_ORASSIGN; } -^= {return OP_XORASSIGN; } +\^= {return OP_XORASSIGN; } {IDENTIFIER} { struct hlsl_ctx *ctx = yyget_extra(yyscanner); diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test index 008ddce3..63971f52 100644 --- a/tests/hlsl/bitwise.shader_test +++ b/tests/hlsl/bitwise.shader_test @@ -96,7 +96,7 @@ float4 main() : SV_TARGET todo(glsl) draw quad probe all rgba (0.0, 1.0, 1.0, 0.0) -[pixel shader todo(sm<6)] +[pixel shader] float4 main() : SV_TARGET { int a = 0; @@ -113,7 +113,7 @@ float4 main() : SV_TARGET } [test] -todo(glsl|sm<6) draw quad +todo(glsl) draw quad probe all rgba (0.0, 1.0, 1.0, 0.0) [pixel shader]

1 0

Giovanni Mascellani : vkd3d: Move the full stops before the newline.
by Alexandre Julliard 22 May '24

22 May '24

Module: vkd3d Branch: master Commit: dfa3ee25e039d1ac1a046406c74a2e589d6f28c9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dfa3ee25e039d1ac1a046406c74a2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 21 13:35:18 2024 +0200 vkd3d: Move the full stops before the newline. --- libs/vkd3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8b817264..cfc9c5f5 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1334,11 +1334,11 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev fragment_shader_interlock_features = &info->fragment_shader_interlock_features; TRACE(" VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT:\n"); - TRACE(" fragmentShaderSampleInterlock: %#x.\n.", + TRACE(" fragmentShaderSampleInterlock: %#x.\n", fragment_shader_interlock_features->fragmentShaderSampleInterlock); - TRACE(" fragmentShaderPixelInterlock: %#x\n.", + TRACE(" fragmentShaderPixelInterlock: %#x.\n", fragment_shader_interlock_features->fragmentShaderPixelInterlock); - TRACE(" fragmentShaderShadingRateInterlock: %#x\n.", + TRACE(" fragmentShaderShadingRateInterlock: %#x.\n", fragment_shader_interlock_features->fragmentShaderShadingRateInterlock); demote_features = &info->demote_features;

1 0

Giovanni Mascellani : tests: Check device support for all the 16 bit image formats.
by Alexandre Julliard 22 May '24

22 May '24

Module: vkd3d Branch: master Commit: a64426edf9fa0e36cbe982656dc606bf1e02822f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a64426edf9fa0e36cbe982656dc60… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 21 13:40:48 2024 +0200 tests: Check device support for all the 16 bit image formats. Otherwise the test crash on llvmpipe. --- tests/d3d12.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index bbfa51e5..26b6e2b8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5791,10 +5791,10 @@ static void test_clear_unordered_access_view_image(void) 0x00000380, true}, {DXGI_FORMAT_B5G6R5_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* -1.0f */, 0}, - 0x87ff, true}, + 0x87ff, true, false, true}, {DXGI_FORMAT_B5G5R5A1_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3e800000 /* 0.25f */, 0x3e000000 /* 0.125f */, 0x3f800000 /* 1.0f */}, - 0xc104, true}, + 0xc104, true, false, true}, {DXGI_FORMAT_B4G4R4A4_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* 2.0f */, 0x40000000 /* -1.0f */}, 0xf8ff, true, false, true},

1 0

Victor Chiletto : tests/hlsl: Add a test for the XOR assign operator.
by Alexandre Julliard 22 May '24

22 May '24

Module: vkd3d Branch: master Commit: d8d2414132f5a84c44ee3492dd59fa5f00c6c8a5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d8d2414132f5a84c44ee3492dd59f… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Mon May 20 13:45:41 2024 -0300 tests/hlsl: Add a test for the XOR assign operator. --- tests/hlsl/bitwise.shader_test | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test index 03b4282c..008ddce3 100644 --- a/tests/hlsl/bitwise.shader_test +++ b/tests/hlsl/bitwise.shader_test @@ -96,6 +96,26 @@ float4 main() : SV_TARGET todo(glsl) draw quad probe all rgba (0.0, 1.0, 1.0, 0.0) +[pixel shader todo(sm<6)] +float4 main() : SV_TARGET +{ + int a = 0; + int b = 0; + int c = 1; + int d = 1; + + a ^= 0; + b ^= 1; + c ^= 0; + d ^= 1; + + return float4(a, b, c, d); +} + +[test] +todo(glsl|sm<6) draw quad +probe all rgba (0.0, 1.0, 1.0, 0.0) + [pixel shader] float4 main() : SV_TARGET {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlstylesheet.c.
by Alexandre Julliard 22 May '24

22 May '24

Module: wine Branch: master Commit: 95c37b8208a67a4f2b79d1947f5e16fc671d2f66 URL: https://gitlab.winehq.org/wine/wine/-/commit/95c37b8208a67a4f2b79d1947f5e16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 11:53:06 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlstylesheet.c. --- dlls/mshtml/htmlstylesheet.c | 251 ++----------------------------------------- 1 file changed, 8 insertions(+), 243 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltable.c.
by Alexandre Julliard 22 May '24

22 May '24

Module: wine Branch: master Commit: 49f8b384500537c4d61c9dd04e0c5d7bacdf574b URL: https://gitlab.winehq.org/wine/wine/-/commit/49f8b384500537c4d61c9dd04e0c5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 11:55:42 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltable.c. --- dlls/mshtml/htmltable.c | 272 ++---------------------------------------------- 1 file changed, 7 insertions(+), 265 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltextarea.c.
by Alexandre Julliard 22 May '24

22 May '24

Module: wine Branch: master Commit: 9f6d1da89d451d0cbddb3459f5c17ca15cf95063 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f6d1da89d451d0cbddb3459f5c17c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 11:57:23 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltextarea.c. --- dlls/mshtml/htmltextarea.c | 55 ++-------------------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 6964c1c06a0..de0cd735e9e 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -45,59 +45,8 @@ static inline HTMLTextAreaElement *impl_from_IHTMLTextAreaElement(IHTMLTextAreaE return CONTAINING_RECORD(iface, HTMLTextAreaElement, IHTMLTextAreaElement_iface); } -static HRESULT WINAPI HTMLTextAreaElement_QueryInterface(IHTMLTextAreaElement *iface, - REFIID riid, void **ppv) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLTextAreaElement_AddRef(IHTMLTextAreaElement *iface) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLTextAreaElement_Release(IHTMLTextAreaElement *iface) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLTextAreaElement_GetTypeInfoCount(IHTMLTextAreaElement *iface, UINT *pctinfo) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLTextAreaElement_GetTypeInfo(IHTMLTextAreaElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLTextAreaElement_GetIDsOfNames(IHTMLTextAreaElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLTextAreaElement_Invoke(IHTMLTextAreaElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLTextAreaElement, IHTMLTextAreaElement, + impl_from_IHTMLTextAreaElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLTextAreaElement_get_type(IHTMLTextAreaElement *iface, BSTR *p) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltextnode.c.
by Alexandre Julliard 22 May '24

22 May '24

Module: wine Branch: master Commit: ff32b269b90af2a153b3ed62b7977c019750763d URL: https://gitlab.winehq.org/wine/wine/-/commit/ff32b269b90af2a153b3ed62b7977c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 11:59:52 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltextnode.c. --- dlls/mshtml/htmltextnode.c | 106 ++------------------------------------------- 1 file changed, 4 insertions(+), 102 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 0d59204ad00..06dac8fff24 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -45,58 +45,8 @@ static inline HTMLDOMTextNode *impl_from_IHTMLDOMTextNode(IHTMLDOMTextNode *ifac return CONTAINING_RECORD(iface, HTMLDOMTextNode, IHTMLDOMTextNode_iface); } -static HRESULT WINAPI HTMLDOMTextNode_QueryInterface(IHTMLDOMTextNode *iface, - REFIID riid, void **ppv) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - - return IHTMLDOMNode_QueryInterface(&This->node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLDOMTextNode_AddRef(IHTMLDOMTextNode *iface) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - - return IHTMLDOMNode_AddRef(&This->node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLDOMTextNode_Release(IHTMLDOMTextNode *iface) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - - return IHTMLDOMNode_Release(&This->node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLDOMTextNode_GetTypeInfoCount(IHTMLDOMTextNode *iface, UINT *pctinfo) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLDOMTextNode_GetTypeInfo(IHTMLDOMTextNode *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLDOMTextNode_GetIDsOfNames(IHTMLDOMTextNode *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLDOMTextNode_Invoke(IHTMLDOMTextNode *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLDOMTextNode, IHTMLDOMTextNode, + impl_from_IHTMLDOMTextNode(iface)->node.event_target.dispex) static HRESULT WINAPI HTMLDOMTextNode_put_data(IHTMLDOMTextNode *iface, BSTR v) { @@ -206,56 +156,8 @@ static inline HTMLDOMTextNode *impl_from_IHTMLDOMTextNode2(IHTMLDOMTextNode2 *if return CONTAINING_RECORD(iface, HTMLDOMTextNode, IHTMLDOMTextNode2_iface); } -static HRESULT WINAPI HTMLDOMTextNode2_QueryInterface(IHTMLDOMTextNode2 *iface, REFIID riid, void **ppv) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - - return IHTMLDOMNode_QueryInterface(&This->node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLDOMTextNode2_AddRef(IHTMLDOMTextNode2 *iface) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - - return IHTMLDOMNode_AddRef(&This->node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLDOMTextNode2_Release(IHTMLDOMTextNode2 *iface) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - - return IHTMLDOMNode_Release(&This->node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLDOMTextNode2_GetTypeInfoCount(IHTMLDOMTextNode2 *iface, UINT *pctinfo) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLDOMTextNode2_GetTypeInfo(IHTMLDOMTextNode2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLDOMTextNode2_GetIDsOfNames(IHTMLDOMTextNode2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLDOMTextNode2_Invoke(IHTMLDOMTextNode2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLDOMTextNode2, IHTMLDOMTextNode2, + impl_from_IHTMLDOMTextNode2(iface)->node.event_target.dispex) static HRESULT WINAPI HTMLDOMTextNode2_substringData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR *string) {

1 0