wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Matteo Bruni : d3dx9/tests: Fix a couple of ok() messages.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 5a5beba6c4e3bc53790e3a31916d0aaf57dc19b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a5beba6c4e3bc53790e3a31… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 24 01:10:57 2019 +0100 d3dx9/tests: Fix a couple of ok() messages. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 5fd9227..8f2f06b 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -343,7 +343,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3DXEffectPool, (void **)&pool2); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - ok(pool == pool2, "Release failed, got %p, expected %p\n", pool2, pool); + ok(pool == pool2, "Got effect pool %p, expected %p.\n", pool2, pool); count = pool2->lpVtbl->Release(pool2); ok(count == 1, "Release failed, got %u, expected 1\n", count); @@ -359,7 +359,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) hr = effect->lpVtbl->GetPool(effect, &pool); ok(hr == D3D_OK, "GetPool failed, got %x, expected 0 (D3D_OK)\n", hr); - ok(pool == pool2, "GetPool failed, got %p, expected %p\n", pool2, pool); + ok(pool == pool2, "Got effect pool %p, expected %p.\n", pool2, pool); count = pool2->lpVtbl->Release(pool2); ok(count == 2, "Release failed, got %u, expected 2\n", count);

1 0

Matteo Bruni : d3dx9/tests: Expect plain render target creation to work.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 64b6bb4d4a54642434594f0df2afcd2e90b2a0a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64b6bb4d4a54642434594f0d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 24 01:10:56 2019 +0100 d3dx9/tests: Expect plain render target creation to work. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 6cb1ddb..b7c52a2 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -847,21 +847,24 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* non-lockable render target */ hr = IDirect3DDevice9_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &newsurf, NULL); - if (SUCCEEDED(hr)) { - hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); - - IDirect3DSurface9_Release(newsurf); - } else skip("Failed to create render target surface\n"); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + IDirect3DSurface9_Release(newsurf); /* non-lockable multisampled render target */ hr = IDirect3DDevice9_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, 0, FALSE, &newsurf, NULL); - if (SUCCEEDED(hr)) { + if (SUCCEEDED(hr)) + { hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); IDirect3DSurface9_Release(newsurf); - } else skip("Failed to create multisampled render target.\n"); + } + else + { + skip("Failed to create multisampled render target.\n"); + } hr = IDirect3DDevice9_GetRenderTarget(device, 0, &newsurf); ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderTarget returned %#x, expected %#x.\n", hr, D3D_OK);

1 0

Alexandre Julliard : ntdll: Implement RtlIsProcessorFeaturePresent().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: b61d425502ce7e651a753c072e2840cb6274b3c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b61d425502ce7e651a753c07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 17:33:16 2019 +0100 ntdll: Implement RtlIsProcessorFeaturePresent(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 14 ++------------ dlls/ntdll/nt.c | 8 ++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 84385c7..9445d0b 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -46,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); -#define SHARED_DATA ((KSHARED_USER_DATA*)0x7ffe0000) - /**************************************************************************** * QueryPerformanceCounter (KERNEL32.@) * @@ -200,18 +198,10 @@ VOID WINAPI GetNativeSystemInfo( * IsProcessorFeaturePresent [KERNEL32.@] * * Determine if the cpu supports a given feature. - * - * RETURNS - * TRUE, If the processor supports feature, - * FALSE otherwise. */ -BOOL WINAPI IsProcessorFeaturePresent ( - DWORD feature /* [in] Feature number, (PF_ constants from "winnt.h") */) +BOOL WINAPI IsProcessorFeaturePresent ( DWORD feature ) { - if (feature < PROCESSOR_FEATURE_MAX) - return SHARED_DATA->ProcessorFeatures[feature]; - else - return FALSE; + return RtlIsProcessorFeaturePresent( feature ); } /*********************************************************************** diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index dcf9123..5138da4 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2230,6 +2230,14 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG #endif +/*********************************************************************** + * RtlIsProcessorFeaturePresent [NTDLL.@] + */ +BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) +{ + return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; +} + /****************************************************************************** * NtQuerySystemInformation [NTDLL.@] * ZwQuerySystemInformation [NTDLL.@] diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 09f9098..649774f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -756,6 +756,7 @@ @ stub RtlIsGenericTableEmpty # @ stub RtlIsGenericTableEmptyAvl @ stdcall RtlIsNameLegalDOS8Dot3(ptr ptr ptr) +@ stdcall RtlIsProcessorFeaturePresent(long) # @ stub RtlIsRangeAvailable @ stdcall RtlIsTextUnicode(ptr long ptr) # @ stub RtlIsThreadWithinLoaderCallout diff --git a/include/winternl.h b/include/winternl.h index 9c88613..a3adba3 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2741,6 +2741,7 @@ NTSYSAPI BOOL WINAPI RtlIsCriticalSectionLocked(RTL_CRITICAL_SECTION *); NTSYSAPI BOOL WINAPI RtlIsCriticalSectionLockedByThread(RTL_CRITICAL_SECTION *); NTSYSAPI ULONG WINAPI RtlIsDosDeviceName_U(PCWSTR); NTSYSAPI BOOLEAN WINAPI RtlIsNameLegalDOS8Dot3(const UNICODE_STRING*,POEM_STRING,PBOOLEAN); +NTSYSAPI BOOLEAN WINAPI RtlIsProcessorFeaturePresent(UINT); NTSYSAPI BOOLEAN WINAPI RtlIsTextUnicode(LPCVOID,INT,INT *); NTSYSAPI BOOLEAN WINAPI RtlIsValidHandle(const RTL_HANDLE_TABLE *, const RTL_HANDLE *); NTSYSAPI BOOLEAN WINAPI RtlIsValidIndexHandle(const RTL_HANDLE_TABLE *, ULONG Index, RTL_HANDLE **);

1 0

Alexandre Julliard : ntdll: Don' t crash on empty table in RtlAddFunctionTable().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 7f4e5b1ed8c6f53e1f936eff745d2071e4aa6f9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f4e5b1ed8c6f53e1f936eff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 16:45:54 2019 +0100 ntdll: Don't crash on empty table in RtlAddFunctionTable(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/tests/exception.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index cbb3dd7..c3cc3d8 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3458,7 +3458,7 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD64 return FALSE; entry->base = addr; - entry->end = addr + table[count - 1].EndAddress; + entry->end = addr + (count ? table[count - 1].EndAddress : 0); entry->table = table; entry->count = count; entry->max_count = 0; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index dee8a9f..f7b8f21 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2103,6 +2103,14 @@ static void test_dynamic_unwind(void) ok( !pRtlDeleteFunctionTable( runtime_func ), "RtlDeleteFunctionTable returned success for nonexistent table runtime_func = %p\n", runtime_func ); + /* Empty table */ + ok( pRtlAddFunctionTable( runtime_func, 0, (ULONG_PTR)code_mem ), + "RtlAddFunctionTable failed for empty table\n" ); + ok( pRtlDeleteFunctionTable( runtime_func ), + "RtlDeleteFunctionTable failed for empty table\n" ); + ok( !pRtlDeleteFunctionTable( runtime_func ), + "RtlDeleteFunctionTable succeeded twice for empty table\n" ); + /* Test RtlInstallFunctionTableCallback with both low bits unset */ table = (ULONG_PTR)code_mem; ok( !pRtlInstallFunctionTableCallback( table, (ULONG_PTR)code_mem, code_offset + 32, &dynamic_unwind_callback, (PVOID*)&count, NULL ),

1 0

Piotr Caban : wbemprox: Add Win32_NetworkAdapter Description property.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 9b0e1f0bb8ec0b521bffc3807f38b7c7ccf7acc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b0e1f0bb8ec0b521bffc380… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 14:49:54 2019 +0100 wbemprox: Add Win32_NetworkAdapter Description property. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 39be6c8..d3efd99 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -546,6 +546,7 @@ static const struct column col_networkadapter[] = { { prop_adaptertypeW, CIM_STRING }, { prop_adaptertypeidW, CIM_UINT16, VT_I4 }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_indexW, CIM_UINT32, VT_I4 }, { prop_interfaceindexW, CIM_UINT32, VT_I4 }, @@ -971,6 +972,7 @@ struct record_networkadapter { const WCHAR *adaptertype; UINT16 adaptertypeid; + const WCHAR *description; const WCHAR *device_id; UINT32 index; UINT32 interface_index; @@ -2372,6 +2374,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e sprintfW( device_id, fmtW, aa->u.s.IfIndex ); rec->adaptertype = get_adaptertype( aa->IfType, &adaptertypeid, &physical ); rec->adaptertypeid = adaptertypeid; + rec->description = heap_strdupW( aa->Description ); rec->device_id = heap_strdupW( device_id ); rec->index = aa->u.s.IfIndex; rec->interface_index = aa->u.s.IfIndex;

1 0

Piotr Caban : wbemprox: Add Win32_NetworkAdapter DeviceAdapterID property.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 0185fcc94fdab63c9e74afdd9adf33749ae96af9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0185fcc94fdab63c9e74afdd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 14:49:46 2019 +0100 wbemprox: Add Win32_NetworkAdapter DeviceAdapterID property. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index c658cc32..39be6c8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -142,6 +142,8 @@ static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_adaptertypeW[] = {'A','d','a','p','t','e','r','T','y','p','e',0}; +static const WCHAR prop_adaptertypeidW[] = + {'A','d','a','p','t','e','r','T','y','p','e','I','D',0}; static const WCHAR prop_addresswidthW[] = {'A','d','d','r','e','s','s','W','i','d','t','h',0}; static const WCHAR prop_architectureW[] = @@ -543,6 +545,7 @@ static const struct column col_logicaldisk[] = static const struct column col_networkadapter[] = { { prop_adaptertypeW, CIM_STRING }, + { prop_adaptertypeidW, CIM_UINT16, VT_I4 }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_indexW, CIM_UINT32, VT_I4 }, { prop_interfaceindexW, CIM_UINT32, VT_I4 }, @@ -967,6 +970,7 @@ struct record_logicaldisk struct record_networkadapter { const WCHAR *adaptertype; + UINT16 adaptertypeid; const WCHAR *device_id; UINT32 index; UINT32 interface_index; @@ -2299,7 +2303,7 @@ static WCHAR *get_mac_address( const BYTE *addr, DWORD len ) sprintfW( ret, fmtW, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); return ret; } -static const WCHAR *get_adaptertype( DWORD type, int *physical ) +static const WCHAR *get_adaptertype( DWORD type, int *id, int *physical ) { static const WCHAR ethernetW[] = {'E','t','h','e','r','n','e','t',' ','8','0','2','.','3',0}; static const WCHAR wirelessW[] = {'W','i','r','e','l','e','s','s',0}; @@ -2308,11 +2312,26 @@ static const WCHAR *get_adaptertype( DWORD type, int *physical ) switch (type) { - case IF_TYPE_ETHERNET_CSMACD: *physical = -1; return ethernetW; - case IF_TYPE_IEEE80211: *physical = -1; return wirelessW; - case IF_TYPE_IEEE1394: *physical = -1; return firewireW; - case IF_TYPE_TUNNEL: *physical = 0; return tunnelW; - default: *physical = 0; return NULL; + case IF_TYPE_ETHERNET_CSMACD: + *id = 0; + *physical = -1; + return ethernetW; + case IF_TYPE_IEEE80211: + *id = 9; + *physical = -1; + return wirelessW; + case IF_TYPE_IEEE1394: + *id = 13; + *physical = -1; + return firewireW; + case IF_TYPE_TUNNEL: + *id = 15; + *physical = 0; + return tunnelW; + default: + *id = -1; + *physical = 0; + return NULL; } } @@ -2324,7 +2343,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e IP_ADAPTER_ADDRESSES *aa, *buffer; UINT row = 0, offset = 0, count = 0; DWORD size = 0, ret; - int physical; + int adaptertypeid, physical; enum fill_status status = FILL_STATUS_UNFILTERED; ret = GetAdaptersAddresses( WS_AF_UNSPEC, 0, NULL, NULL, &size ); @@ -2351,7 +2370,8 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e rec = (struct record_networkadapter *)(table->data + offset); sprintfW( device_id, fmtW, aa->u.s.IfIndex ); - rec->adaptertype = get_adaptertype( aa->IfType, &physical ); + rec->adaptertype = get_adaptertype( aa->IfType, &adaptertypeid, &physical ); + rec->adaptertypeid = adaptertypeid; rec->device_id = heap_strdupW( device_id ); rec->index = aa->u.s.IfIndex; rec->interface_index = aa->u.s.IfIndex;

1 0

Jacek Caban : mshtml: Add IDOMCustomEvent interface stub implementation.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 57cf4a38acf09613465d4ed3568fd95483da4d89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57cf4a38acf09613465d4ed3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 24 13:49:51 2019 +0100 mshtml: Add IDOMCustomEvent interface stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 144 +++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/htmlevent.h | 4 +- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/nsiface.idl | 12 ++++ dlls/mshtml/tests/events.c | 12 ++++ 5 files changed, 168 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f2c24a4..62ae8d3 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -851,7 +851,7 @@ static HRESULT WINAPI DOMEvent_QueryInterface(IDOMEvent *iface, REFIID riid, voi *ppv = &This->IDOMKeyboardEvent_iface; else if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - else { + else if(!This->query_interface || !(*ppv = This->query_interface(This, riid))) { *ppv = NULL; WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); return E_NOINTERFACE; @@ -879,10 +879,14 @@ static ULONG WINAPI DOMEvent_Release(IDOMEvent *iface) TRACE("(%p) ref=%u\n", This, ref); if(!ref) { + if(This->destroy) + This->destroy(This); if(This->ui_event) nsIDOMUIEvent_Release(This->ui_event); if(This->mouse_event) nsIDOMMouseEvent_Release(This->mouse_event); + if(This->keyboard_event) + nsIDOMKeyEvent_Release(This->keyboard_event); if(This->target) IEventTarget_Release(&This->target->IEventTarget_iface); nsIDOMEvent_Release(This->nsevent); @@ -2042,6 +2046,112 @@ static const IDOMKeyboardEventVtbl DOMKeyboardEventVtbl = { DOMKeyboardEvent_get_locale }; +typedef struct { + DOMEvent event; + IDOMCustomEvent IDOMCustomEvent_iface; + VARIANT detail; +} DOMCustomEvent; + +static inline DOMCustomEvent *impl_from_IDOMCustomEvent(IDOMCustomEvent *iface) +{ + return CONTAINING_RECORD(iface, DOMCustomEvent, IDOMCustomEvent_iface); +} + +static HRESULT WINAPI DOMCustomEvent_QueryInterface(IDOMCustomEvent *iface, REFIID riid, void **ppv) +{ + DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); + return IDOMEvent_QueryInterface(&This->event.IDOMEvent_iface, riid, ppv); +} + +static ULONG WINAPI DOMCustomEvent_AddRef(IDOMCustomEvent *iface) +{ + DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); + return IDOMEvent_AddRef(&This->event.IDOMEvent_iface); +} + +static ULONG WINAPI DOMCustomEvent_Release(IDOMCustomEvent *iface) +{ + DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); + return IDOMEvent_Release(&This->event.IDOMEvent_iface); +} + +static HRESULT WINAPI DOMCustomEvent_GetTypeInfoCount(IDOMCustomEvent *iface, UINT *pctinfo) +{ + DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); + return IDispatchEx_GetTypeInfoCount(&This->event.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DOMCustomEvent_GetTypeInfo(IDOMCustomEvent *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); + return IDispatchEx_GetTypeInfo(&This->event.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DOMCustomEvent_GetIDsOfNames(IDOMCustomEvent *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); + return IDispatchEx_GetIDsOfNames(&This->event.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI DOMCustomEvent_Invoke(IDOMCustomEvent *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); + return IDispatchEx_Invoke(&This->event.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DOMCustomEvent_get_detail(IDOMCustomEvent *iface, VARIANT *p) +{ + DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMCustomEvent_initCustomEvent(IDOMCustomEvent *iface, BSTR type, VARIANT_BOOL can_bubble, + VARIANT_BOOL cancelable, VARIANT *detail) +{ + DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); + FIXME("(%p)->(%s %x %x %p)\n", This, debugstr_w(type), can_bubble, cancelable, debugstr_variant(detail)); + return E_NOTIMPL; +} + +static const IDOMCustomEventVtbl DOMCustomEventVtbl = { + DOMCustomEvent_QueryInterface, + DOMCustomEvent_AddRef, + DOMCustomEvent_Release, + DOMCustomEvent_GetTypeInfoCount, + DOMCustomEvent_GetTypeInfo, + DOMCustomEvent_GetIDsOfNames, + DOMCustomEvent_Invoke, + DOMCustomEvent_get_detail, + DOMCustomEvent_initCustomEvent +}; + +static DOMCustomEvent *DOMCustomEvent_from_DOMEvent(DOMEvent *event) +{ + return CONTAINING_RECORD(event, DOMCustomEvent, event); +} + +static void *DOMCustomEvent_query_interface(DOMEvent *event, REFIID riid) +{ + DOMCustomEvent *custom_event = DOMCustomEvent_from_DOMEvent(event); + if(IsEqualGUID(&IID_IDOMCustomEvent, riid)) + return &custom_event->IDOMCustomEvent_iface; + return NULL; +} + +static void DOMCustomEvent_destroy(DOMEvent *event) +{ + DOMCustomEvent *custom_event = DOMCustomEvent_from_DOMEvent(event); + VariantClear(&custom_event->detail); +} + + static const tid_t DOMEvent_iface_tids[] = { IDOMEvent_tid, 0 @@ -2091,19 +2201,43 @@ static dispex_static_data_t DOMKeyboardEvent_dispex = { DOMKeyboardEvent_iface_tids }; +static BOOL check_event_iface(nsIDOMEvent *event, REFIID riid) +{ + nsISupports *iface; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(event, riid, (void**)&iface); + if(NS_FAILED(nsres)) + return FALSE; + + nsISupports_Release(iface); + return TRUE; +} + static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) { dispex_static_data_t *dispex_data = &DOMEvent_dispex; - DOMEvent *event; + DOMEvent *event = NULL; FILETIME time; nsresult nsres; /* 1601 to 1970 is 369 years plus 89 leap days */ const ULONGLONG time_epoch = (ULONGLONG)(369 * 365 + 89) * 86400 * 1000; - event = heap_alloc_zero(sizeof(*event)); - if(!event) - return NULL; + if(check_event_iface(nsevent, &IID_nsIDOMCustomEvent)) { + DOMCustomEvent *custom_event = heap_alloc_zero(sizeof(*custom_event)); + if(!custom_event) + return NULL; + + custom_event->IDOMCustomEvent_iface.lpVtbl = &DOMCustomEventVtbl; + custom_event->event.query_interface = DOMCustomEvent_query_interface; + custom_event->event.destroy = DOMCustomEvent_destroy; + event = &custom_event->event; + }else if(!event) { + event = heap_alloc_zero(sizeof(*event)); + if(!event) + return NULL; + } event->IDOMEvent_iface.lpVtbl = &DOMEventVtbl; event->IDOMUIEvent_iface.lpVtbl = &DOMUIEventVtbl; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 1a7afb5..e2f45dc 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -57,7 +57,7 @@ typedef enum { EVENTID_LAST } eventid_t; -typedef struct { +typedef struct DOMEvent { DispatchEx dispex; IDOMEvent IDOMEvent_iface; IDOMUIEvent IDOMUIEvent_iface; @@ -65,6 +65,8 @@ typedef struct { IDOMKeyboardEvent IDOMKeyboardEvent_iface; LONG ref; + void *(*query_interface)(struct DOMEvent*,REFIID); + void (*destroy)(struct DOMEvent*); nsIDOMEvent *nsevent; nsIDOMUIEvent *ui_event; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 89a56bd..bc3c5a6e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -80,6 +80,7 @@ typedef struct EventTarget EventTarget; XDIID(DispCEventObj) \ XDIID(DispCPlugins) \ XDIID(DispDOMChildrenCollection) \ + XDIID(DispDOMCustomEvent) \ XDIID(DispDOMEvent) \ XDIID(DispDOMKeyboardEvent) \ XDIID(DispDOMMouseEvent) \ @@ -130,6 +131,7 @@ typedef struct EventTarget EventTarget; XDIID(DispHTMLXMLHttpRequest) \ XDIID(HTMLDocumentEvents) \ XDIID(HTMLElementEvents2) \ + XIID(IDOMCustomEvent) \ XIID(IDOMEvent) \ XIID(IDOMKeyboardEvent) \ XIID(IDOMMouseEvent) \ diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 34f83ab..b3335ba 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3243,6 +3243,18 @@ interface nsIDOMKeyEvent : nsIDOMUIEvent [ object, + uuid(5be16b03-36f9-4ca8-b2c5-0daadf3cd1b3), + local +] +interface nsIDOMCustomEvent : nsISupports +{ + nsresult GetDetail(nsIVariant **aDetail); + nsresult InitCustomEvent(const nsAString *typeArg, bool canBubbleArg, bool cancelableArg, + nsIVariant *detailArg); +} + +[ + object, uuid(0b976267-4aaa-4f36-a2d4-27b5ca8d73bb), local ] diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index a219987..f9bf88e 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2667,6 +2667,7 @@ static void test_iframe_connections(IHTMLDocument2 *doc) static void test_create_event(IHTMLDocument2 *doc) { IDOMKeyboardEvent *keyboard_event; + IDOMCustomEvent *custom_event; IDOMMouseEvent *mouse_event; IDocumentEvent *doc_event; IEventTarget *event_target; @@ -2771,6 +2772,17 @@ static void test_create_event(IHTMLDocument2 *doc) IDOMEvent_Release(event); + str = a2bstr("CustomEvent"); + hres = IDocumentEvent_createEvent(doc_event, str, &event); + SysFreeString(str); + ok(hres == S_OK, "createEvent failed: %08x\n", hres); + + hres = IDOMEvent_QueryInterface(event, &IID_IDOMCustomEvent, (void**)&custom_event); + ok(hres == S_OK, "QueryInterface(IID_IDOMCustomEvent returned %08x\n", hres); + IDOMCustomEvent_Release(custom_event); + + IDOMEvent_Release(event); + IDocumentEvent_Release(doc_event); }

1 0

Jacek Caban : widl: Default to input param if [out] nor [in] attribut is specified in get_contexthandle_flags.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: d2a8994d99708f8ee3f32a4d067c0ce1f828a921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2a8994d99708f8ee3f32a4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 24 13:38:51 2019 +0100 widl: Default to input param if [out] nor [in] attribut is specified in get_contexthandle_flags. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0fe3a22..7a81277 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -446,6 +446,7 @@ static unsigned char get_contexthandle_flags( const type_t *iface, const attr_li const type_t *type, int is_return ) { unsigned char flags = 0; + int is_out; if (is_attr(iface->attrs, ATTR_STRICTCONTEXTHANDLE)) flags |= NDR_STRICT_CONTEXT_HANDLE; @@ -456,12 +457,13 @@ static unsigned char get_contexthandle_flags( const type_t *iface, const attr_li if (is_return) return flags | HANDLE_PARAM_IS_OUT | HANDLE_PARAM_IS_RETURN; - if (is_attr(attrs, ATTR_IN)) + is_out = is_attr(attrs, ATTR_OUT); + if (is_attr(attrs, ATTR_IN) || !is_out) { flags |= HANDLE_PARAM_IS_IN; - if (!is_attr(attrs, ATTR_OUT)) flags |= NDR_CONTEXT_HANDLE_CANNOT_BE_NULL; + if (!is_out) flags |= NDR_CONTEXT_HANDLE_CANNOT_BE_NULL; } - if (is_attr(attrs, ATTR_OUT)) flags |= HANDLE_PARAM_IS_OUT; + if (is_out) flags |= HANDLE_PARAM_IS_OUT; return flags; }

1 0

Jacek Caban : widl: Fix context handle as return value handling.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 895d04623ca01330feb39ffeba7ff68d5dc3533e URL: https://source.winehq.org/git/wine.git/?a=commit;h=895d04623ca01330feb39ffe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 24 13:38:40 2019 +0100 widl: Fix context handle as return value handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index da657d3..0fe3a22 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -67,6 +67,7 @@ enum type_context TYPE_CONTEXT_PARAM, TYPE_CONTEXT_CONTAINER, TYPE_CONTEXT_CONTAINER_NO_POINTERS, + TYPE_CONTEXT_RETVAL, }; /* parameter flags in Oif mode */ @@ -287,7 +288,7 @@ static unsigned char get_pointer_fc_context( const type_t *type, const attr_list int pointer_fc = get_pointer_fc(type, attrs, context == TYPE_CONTEXT_TOPLEVELPARAM); if (pointer_fc == FC_UP && is_attr( attrs, ATTR_OUT ) && - context == TYPE_CONTEXT_PARAM && is_object( current_iface )) + (context == TYPE_CONTEXT_PARAM || context == TYPE_CONTEXT_RETVAL) && is_object( current_iface )) pointer_fc = FC_OP; return pointer_fc; @@ -442,7 +443,7 @@ static unsigned int get_stack_size( const var_t *var, int *by_value ) } static unsigned char get_contexthandle_flags( const type_t *iface, const attr_list_t *attrs, - const type_t *type ) + const type_t *type, int is_return ) { unsigned char flags = 0; @@ -453,6 +454,8 @@ static unsigned char get_contexthandle_flags( const type_t *iface, const attr_li !is_attr( attrs, ATTR_CONTEXTHANDLE )) flags |= HANDLE_PARAM_IS_VIA_PTR; + if (is_return) return flags | HANDLE_PARAM_IS_OUT | HANDLE_PARAM_IS_RETURN; + if (is_attr(attrs, ATTR_IN)) { flags |= HANDLE_PARAM_IS_IN; @@ -1361,7 +1364,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, *offset += 6; break; case FC_BIND_CONTEXT: - handle_flags = get_contexthandle_flags( iface, handle_var->attrs, handle_var->type ); + handle_flags = get_contexthandle_flags( iface, handle_var->attrs, handle_var->type, 0 ); print_file( file, indent, "0x%02x,\t/* %s */\n", explicit_fc, string_of_type(explicit_fc) ); print_file( file, indent, "0x%02x,\n", handle_flags ); print_file( file, indent, "NdrFcShort(0x%hx),\t/* stack offset = %hu */\n", @@ -3494,17 +3497,17 @@ static unsigned int write_ip_tfs(FILE *file, const attr_list_t *attrs, type_t *t static unsigned int write_contexthandle_tfs(FILE *file, const attr_list_t *attrs, type_t *type, - int toplevel_param, + enum type_context context, unsigned int *typeformat_offset) { unsigned int start_offset = *typeformat_offset; - unsigned char flags = get_contexthandle_flags( current_iface, attrs, type ); + unsigned char flags = get_contexthandle_flags( current_iface, attrs, type, context == TYPE_CONTEXT_RETVAL ); print_start_tfs_comment(file, type, start_offset); if (flags & 0x80) /* via ptr */ { - int pointer_type = get_pointer_fc( type, attrs, toplevel_param ); + int pointer_type = get_pointer_fc( type, attrs, context == TYPE_CONTEXT_TOPLEVELPARAM ); if (!pointer_type) pointer_type = FC_RP; *typeformat_offset += 4; print_file(file, 2,"0x%x, 0x0,\t/* %s */\n", pointer_type, string_of_type(pointer_type) ); @@ -3579,8 +3582,7 @@ static unsigned int write_type_tfs(FILE *file, int indent, { case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER: - return write_contexthandle_tfs(file, attrs, type, - context == TYPE_CONTEXT_TOPLEVELPARAM, typeformat_offset); + return write_contexthandle_tfs(file, attrs, type, context, typeformat_offset); case TGT_USER_TYPE: return write_user_tfs(file, type, typeformat_offset); case TGT_STRING: @@ -3701,8 +3703,8 @@ static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned in var = type_function_get_retval(func->type); if (!is_void(var->type)) - var->typestring_offset = write_type_tfs( file, 2, func->attrs, var->type, func->name, - TYPE_CONTEXT_PARAM, offset); + var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, func->name, + TYPE_CONTEXT_RETVAL, offset); if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry )

1 0

Jacek Caban : rpcrt4/tests: Use --prefix-client to avoid duplicated function implementations.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: f634a84fda00d45df255404bde1c7af5cc185a22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f634a84fda00d45df255404b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 24 13:33:29 2019 +0100 rpcrt4/tests: Use --prefix-client to avoid duplicated function implementations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/Makefile.in | 4 +- dlls/rpcrt4/tests/server.c | 712 +++++++----------------------------- dlls/rpcrt4/tests/server.idl | 184 +++++----- dlls/rpcrt4/tests/server_interp.idl | 3 +- 4 files changed, 239 insertions(+), 664 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f634a84fda00d45df255…

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2019