February 2019 - Wine-Devel - list.winehq.org

Re: [PATCH] d3dx9: Get rid of the ID3DXEffectImpl #define.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=48442 Your paranoid android. === debian9 (build log) === error: patch failed: dlls/d3dx9_36/effect.c:148 Task: Patch failed to apply === debian9 (build log) === error: patch failed: dlls/d3dx9_36/effect.c:148 Task: Patch failed to apply

Feb. 28, 2019

Re: [PATCH] d3d8: Improve ValidatePixelShader().

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=48441 Your paranoid android. === debian9 (build log) === X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) === debian9 (build log) === X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig)

Feb. 28, 2019

[PATCH] d3dx9: Get rid of the ID3DXEffectImpl #define.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 45d9ff58838..396bd091f78 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -148,11 +148,9 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; -#define ID3DXEffectImpl d3dx_effect - struct d3dx9_base_effect { - struct ID3DXEffectImpl *effect; + struct d3dx_effect *effect; UINT parameter_count; UINT technique_count; @@ -718,7 +716,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) } } -static void free_effect(struct ID3DXEffectImpl *effect) +static void free_effect(struct d3dx_effect *effect) { TRACE("Free effect %p\n", effect); @@ -2841,7 +2839,7 @@ static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *ma } } -static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum SHADER_CONSTANT_TYPE op, UINT index, +static HRESULT d3dx_set_shader_const_state(struct d3dx_effect *effect, enum SHADER_CONSTANT_TYPE op, UINT index, struct d3dx_parameter *param, void *value_ptr) { static const struct @@ -2940,10 +2938,10 @@ static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum return ret; } -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, +static HRESULT d3dx9_apply_state(struct d3dx_effect *effect, struct d3dx_pass *pass, struct d3dx_state *state, unsigned int parent_index, BOOL update_all); -static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, +static HRESULT d3dx_set_shader_constants(struct d3dx_effect *effect, struct d3dx_pass *pass, struct d3dx_parameter *param, BOOL vs, BOOL update_all) { HRESULT hr, ret; @@ -2989,7 +2987,7 @@ static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct return ret; } -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, +static HRESULT d3dx9_apply_state(struct d3dx_effect *effect, struct d3dx_pass *pass, struct d3dx_state *state, unsigned int parent_index, BOOL update_all) { struct d3dx_parameter *param; @@ -3125,7 +3123,7 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas return D3D_OK; } -static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, BOOL update_all) +static HRESULT d3dx9_apply_pass_states(struct d3dx_effect *effect, struct d3dx_pass *pass, BOOL update_all) { unsigned int i; HRESULT ret; @@ -6540,7 +6538,7 @@ static const char **parse_skip_constants_string(char *skip_constants_string, uns static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect, struct d3dx_effect_pool *pool, + UINT eflags, ID3DBlob **errors, struct d3dx_effect *effect, struct d3dx_effect_pool *pool, const char *skip_constants_string) { DWORD tag, offset; @@ -6683,7 +6681,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, return D3D_OK; } -static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3DDevice9 *device, +static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDevice9 *device, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, UINT eflags, ID3DBlob **error_messages, struct ID3DXEffectPool *pool, const char *skip_constants) { @@ -6727,7 +6725,7 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors) { - struct ID3DXEffectImpl *object; + struct d3dx_effect *object; HRESULT hr; TRACE("device %p, srcdata %p, srcdatalen %u, defines %p, include %p," -- 2.19.2

Feb. 28, 2019

Re: [PATCH v2 3/3] d3dx9: Merge the d3dx9_effect_GetDesc() helper

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Feb. 28, 2019

Re: [PATCH v2 2/3] d3dx9: Merge the stub ID3DXBaseEffect methods

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Feb. 28, 2019

Re: [PATCH v2 1/3] d3dx9: Rename the ID3DXEffect object and methods

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Feb. 28, 2019

[PATCH] d3d8: Improve ValidatePixelShader().

by Gijs Vermeulen

Based largely on a patch by Sebastian Lackner. Adapted from "Improve ValidateVertexShader()" by Henri Verbeet. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Native crashes when ps_code is NULL, so those tests were omitted. dlls/d3d8/d3d8_main.c | 69 +++++++++++++++++++++------------------- dlls/d3d8/tests/device.c | 43 ++++++++++++------------- 2 files changed, 58 insertions(+), 54 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 17f35c9089..64f951e0bd 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -103,41 +103,46 @@ done: return hr; } -/*********************************************************************** - * ValidatePixelShader (D3D8.@) - * - * PARAMS - * toto result? - */ -HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL boolean, DWORD* toto) +/* FIXME: We should probably use libvkd3d-shader for validation. */ +HRESULT WINAPI ValidatePixelShader(const DWORD *ps_code, const DWORD *declaration, + BOOL return_error, char **errors) { - HRESULT ret; - static BOOL warned; - - if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, boolean, toto); - warned = TRUE; - } - - if (!pixelshader) - return E_FAIL; - - if (reserved1) - return E_FAIL; - - switch(*pixelshader) { - case 0xFFFF0100: - case 0xFFFF0101: - case 0xFFFF0102: - case 0xFFFF0103: - case 0xFFFF0104: - ret=S_OK; + const char *message = ""; + SIZE_T message_size; + HRESULT hr = E_FAIL; + + TRACE("ps_code %p, declaration %p, return_error %#x, errors %p.\n", + ps_code, declaration, return_error, errors); + + if (!ps_code) + { + message = "Invalid code pointer.\n"; + goto done; + } + + switch (*ps_code) + { + case D3DPS_VERSION(1, 3): + case D3DPS_VERSION(1, 2): + case D3DPS_VERSION(1, 1): + case D3DPS_VERSION(1, 0): break; + default: - WARN("Invalid shader version token %#x.\n", *pixelshader); - ret=E_FAIL; - } - return ret; + message = "Unsupported shader version.\n"; + goto done; + } + + hr = S_OK; + +done: + if (!return_error) + message = ""; + message_size = strlen(message) + 1; + if (errors && (*errors = heap_alloc(message_size))) + memcpy(*errors, message, message_size); + + return hr; } void d3d8_resource_cleanup(struct d3d8_resource *resource) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a64736913d..41401091ca 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -53,7 +53,7 @@ struct device_desc static DEVMODEW registry_mode; static HRESULT (WINAPI *ValidateVertexShader)(const DWORD *, const DWORD *, const D3DCAPS8 *, BOOL, char **); -static HRESULT (WINAPI *ValidatePixelShader)(DWORD *, DWORD *, int, DWORD *); +static HRESULT (WINAPI *ValidatePixelShader)(const DWORD *, const DWORD *, BOOL, char **); static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO); @@ -4506,7 +4506,7 @@ static void test_validate_vs(void) static void test_validate_ps(void) { - static DWORD ps[] = + static DWORD ps_code[] = { 0xffff0101, /* ps_1_1 */ 0x00000051, 0xa00f0001, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ @@ -4516,33 +4516,32 @@ static void test_validate_ps(void) 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ 0x0000ffff, /* end */ }; + char *errors; HRESULT hr; - hr = ValidatePixelShader(0, 0, 0, 0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidatePixelShader(0, 0, 1, 0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidatePixelShader(ps, 0, 0, 0); + hr = ValidatePixelShader(ps_code, NULL, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_code, NULL, TRUE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_code, NULL, TRUE, &errors); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); - hr = ValidatePixelShader(ps, 0, 1, 0); + *ps_code = D3DPS_VERSION(1, 0); + hr = ValidatePixelShader(ps_code, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* Seems to do some version checking. */ - *ps = 0xffff0105; /* bogus version */ - hr = ValidatePixelShader(ps, 0, 1, 0); + *ps_code = D3DPS_VERSION(1, 4); + hr = ValidatePixelShader(ps_code, NULL, TRUE, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen that applications always pass the 2nd parameter as 0. - * Simple test with a non-zero parameter. */ - *ps = 0xffff0101; /* ps_1_1 */ - hr = ValidatePixelShader(ps, ps, 1, 0); + hr = ValidatePixelShader(ps_code, NULL, FALSE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen the 3rd parameter always passed as either 0 or 1, but passing - * other values doesn't seem to hurt. */ - hr = ValidatePixelShader(ps, 0, 12345, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* What is the 4th parameter? The following seems to work ok. */ - hr = ValidatePixelShader(ps, 0, 1, ps); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); + hr = ValidatePixelShader(ps_code, NULL, TRUE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!!*errors, "Got unexpected empty string.\n"); + heap_free(errors); } static void test_volume_get_container(void) -- 2.21.0

Feb. 28, 2019

Re: [PATCH resend] ieframe: add implementation for WebBrowser_get_LocationName

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=48437 Your paranoid android. === debian9 (32 bit report) === ieframe: webbrowser.c:2763: Test failed: unexpected name: L"" webbrowser.c:2763: Test failed: unexpected name: L"" === debian9 (32 bit French report) === ieframe: webbrowser.c:2763: Test failed: unexpected name: L"" webbrowser.c:2763: Test failed: unexpected name: L"" === debian9 (32 bit Japanese:Japan report) === ieframe: webbrowser.c:2763: Test failed: unexpected name: L"" webbrowser.c:2763: Test failed: unexpected name: L"" === debian9 (32 bit Chinese:China report) === ieframe: webbrowser.c:2763: Test failed: unexpected name: L"" webbrowser.c:2763: Test failed: unexpected name: L"" === debian9 (32 bit WoW report) === ieframe: webbrowser.c:2763: Test failed: unexpected name: L"" webbrowser.c:2763: Test failed: unexpected name: L"" === debian9 (64 bit WoW report) === ieframe: webbrowser.c:2763: Test failed: unexpected name: L"" webbrowser.c:2763: Test failed: unexpected name: L""

Feb. 28, 2019

[PATCH] wpcap: Fix compilation with recent pcap/pcap.h versions.

by Dmitry Timoshkov

Recent libpcap versions have added inclusion of pcap/socket.h to pcap.h that includes sys/socket.h and other system .h files that lead to conflicts with winsock2.h. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wpcap/wpcap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index e7908cd038..f163235138 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -24,6 +24,7 @@ #undef SOCKET #undef INVALID_SOCKET +#define USE_WS_PREFIX #include "winsock2.h" #include "windef.h" #include "winbase.h" -- 2.20.1

Feb. 28, 2019

[PATCH] oleaut32: Unify the typelib and dispatch proxy/stub factories.

by Zebediah Figura

Both seem to be able to handle either kind of interface on Windows. f72f8e5c4 was not enough, since the IDispatch proxy/stub factory delegates to the typelib proxy/stub factory if the IID is not IDispatch. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/oleaut.c | 155 +++++++++++++++------------------ dlls/oleaut32/tests/tmarshal.c | 35 +++++++- 2 files changed, 102 insertions(+), 88 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 3161d5e1dd..16345f7d4b 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -923,7 +923,7 @@ static HRESULT get_typeinfo_for_iid(REFIID iid, ITypeInfo **typeinfo) return hr; } -static HRESULT WINAPI typelib_ps_QueryInterface(IPSFactoryBuffer *iface, REFIID iid, void **out) +static HRESULT WINAPI dispatch_typelib_ps_QueryInterface(IPSFactoryBuffer *iface, REFIID iid, void **out) { if (IsEqualIID(iid, &IID_IPSFactoryBuffer) || IsEqualIID(iid, &IID_IUnknown)) { @@ -936,135 +936,121 @@ static HRESULT WINAPI typelib_ps_QueryInterface(IPSFactoryBuffer *iface, REFIID return E_NOINTERFACE; } -static ULONG WINAPI typelib_ps_AddRef(IPSFactoryBuffer *iface) +static ULONG WINAPI dispatch_typelib_ps_AddRef(IPSFactoryBuffer *iface) { return 2; } -static ULONG WINAPI typelib_ps_Release(IPSFactoryBuffer *iface) +static ULONG WINAPI dispatch_typelib_ps_Release(IPSFactoryBuffer *iface) { return 1; } -static HRESULT WINAPI typelib_ps_CreateProxy(IPSFactoryBuffer *iface, - IUnknown *outer, REFIID iid, IRpcProxyBuffer **proxy, void **out) +static HRESULT dispatch_create_proxy(IUnknown *outer, IRpcProxyBuffer **proxy, void **out) { - ITypeInfo *typeinfo; + IPSFactoryBuffer *factory; HRESULT hr; - hr = get_typeinfo_for_iid(iid, &typeinfo); + hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&factory); if (FAILED(hr)) return hr; - hr = CreateProxyFromTypeInfo(typeinfo, outer, iid, proxy, out); - if (FAILED(hr)) - ERR("Failed to create proxy, hr %#x.\n", hr); - - ITypeInfo_Release(typeinfo); + hr = IPSFactoryBuffer_CreateProxy(factory, outer, &IID_IDispatch, proxy, out); + IPSFactoryBuffer_Release(factory); return hr; } -static HRESULT WINAPI typelib_ps_CreateStub(IPSFactoryBuffer *iface, REFIID iid, - IUnknown *server, IRpcStubBuffer **stub) +static HRESULT WINAPI dispatch_typelib_ps_CreateProxy(IPSFactoryBuffer *iface, + IUnknown *outer, REFIID iid, IRpcProxyBuffer **proxy, void **out) { ITypeInfo *typeinfo; + TYPEATTR *attr; HRESULT hr; + if (IsEqualGUID(iid, &IID_IDispatch)) + return dispatch_create_proxy(outer, proxy, out); + hr = get_typeinfo_for_iid(iid, &typeinfo); if (FAILED(hr)) return hr; - hr = CreateStubFromTypeInfo(typeinfo, iid, server, stub); + hr = ITypeInfo_GetTypeAttr(typeinfo, &attr); if (FAILED(hr)) - ERR("Failed to create stub, hr %#x.\n", hr); - - ITypeInfo_Release(typeinfo); - return hr; -} - -static const IPSFactoryBufferVtbl typelib_ps_vtbl = -{ - typelib_ps_QueryInterface, - typelib_ps_AddRef, - typelib_ps_Release, - typelib_ps_CreateProxy, - typelib_ps_CreateStub, -}; - -static IPSFactoryBuffer typelib_ps = { &typelib_ps_vtbl }; - -extern void _get_STDFONT_CF(LPVOID *); -extern void _get_STDPIC_CF(LPVOID *); - -static HRESULT WINAPI PSDispatchFacBuf_QueryInterface(IPSFactoryBuffer *iface, REFIID riid, void **ppv) -{ - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IPSFactoryBuffer)) { - IPSFactoryBuffer_AddRef(iface); - *ppv = iface; - return S_OK; + ITypeInfo_Release(typeinfo); + return hr; } - return E_NOINTERFACE; -} -static ULONG WINAPI PSDispatchFacBuf_AddRef(IPSFactoryBuffer *iface) -{ - return 2; -} + if (attr->typekind == TKIND_INTERFACE || (attr->wTypeFlags & TYPEFLAG_FDUAL)) + hr = CreateProxyFromTypeInfo(typeinfo, outer, iid, proxy, out); + else + hr = dispatch_create_proxy(outer, proxy, out); -static ULONG WINAPI PSDispatchFacBuf_Release(IPSFactoryBuffer *iface) -{ - return 1; + if (FAILED(hr)) + ERR("Failed to create proxy, hr %#x.\n", hr); + + ITypeInfo_ReleaseTypeAttr(typeinfo, attr); + ITypeInfo_Release(typeinfo); + return hr; } -static HRESULT WINAPI PSDispatchFacBuf_CreateProxy(IPSFactoryBuffer *iface, - IUnknown *outer, REFIID iid, IRpcProxyBuffer **proxy, void **obj) +static HRESULT dispatch_create_stub(IUnknown *server, IRpcStubBuffer **stub) { IPSFactoryBuffer *factory; HRESULT hr; - if (IsEqualIID(iid, &IID_IDispatch)) - { - hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&factory); - if (FAILED(hr)) return hr; + hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&factory); + if (FAILED(hr)) return hr; - hr = IPSFactoryBuffer_CreateProxy(factory, outer, iid, proxy, obj); - IPSFactoryBuffer_Release(factory); - return hr; - } - else - return IPSFactoryBuffer_CreateProxy(&typelib_ps, outer, iid, proxy, obj); + hr = IPSFactoryBuffer_CreateStub(factory, &IID_IDispatch, server, stub); + IPSFactoryBuffer_Release(factory); + return hr; } -static HRESULT WINAPI PSDispatchFacBuf_CreateStub(IPSFactoryBuffer *iface, +static HRESULT WINAPI dispatch_typelib_ps_CreateStub(IPSFactoryBuffer *iface, REFIID iid, IUnknown *server, IRpcStubBuffer **stub) { - IPSFactoryBuffer *factory; + ITypeInfo *typeinfo; + TYPEATTR *attr; HRESULT hr; - if (IsEqualIID(iid, &IID_IDispatch)) - { - hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&factory); - if (FAILED(hr)) return hr; + if (IsEqualGUID(iid, &IID_IDispatch)) + return dispatch_create_stub(server, stub); + + hr = get_typeinfo_for_iid(iid, &typeinfo); + if (FAILED(hr)) return hr; - hr = IPSFactoryBuffer_CreateStub(factory, iid, server, stub); - IPSFactoryBuffer_Release(factory); + hr = ITypeInfo_GetTypeAttr(typeinfo, &attr); + if (FAILED(hr)) + { + ITypeInfo_Release(typeinfo); return hr; } + + if (attr->typekind == TKIND_INTERFACE || (attr->wTypeFlags & TYPEFLAG_FDUAL)) + hr = CreateStubFromTypeInfo(typeinfo, iid, server, stub); else - return IPSFactoryBuffer_CreateStub(&typelib_ps, iid, server, stub); + hr = dispatch_create_stub(server, stub); + + if (FAILED(hr)) + ERR("Failed to create proxy, hr %#x.\n", hr); + + ITypeInfo_ReleaseTypeAttr(typeinfo, attr); + ITypeInfo_Release(typeinfo); + return hr; } -static const IPSFactoryBufferVtbl PSDispatchFacBuf_Vtbl = +static const IPSFactoryBufferVtbl dispatch_typelib_ps_vtbl = { - PSDispatchFacBuf_QueryInterface, - PSDispatchFacBuf_AddRef, - PSDispatchFacBuf_Release, - PSDispatchFacBuf_CreateProxy, - PSDispatchFacBuf_CreateStub + dispatch_typelib_ps_QueryInterface, + dispatch_typelib_ps_AddRef, + dispatch_typelib_ps_Release, + dispatch_typelib_ps_CreateProxy, + dispatch_typelib_ps_CreateStub, }; -/* This is the whole PSFactoryBuffer object, just the vtableptr */ -static const IPSFactoryBufferVtbl *pPSDispatchFacBuf = &PSDispatchFacBuf_Vtbl; +static IPSFactoryBuffer dispatch_typelib_ps = { &dispatch_typelib_ps_vtbl }; + +extern void _get_STDFONT_CF(LPVOID *); +extern void _get_STDPIC_CF(LPVOID *); /*********************************************************************** * DllGetClassObject (OLEAUT32.@) @@ -1086,14 +1072,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return S_OK; } } - if (IsEqualCLSID(rclsid, &CLSID_PSDispatch) && IsEqualIID(iid, &IID_IPSFactoryBuffer)) { - *ppv = &pPSDispatchFacBuf; - IPSFactoryBuffer_AddRef((IPSFactoryBuffer *)*ppv); - return S_OK; - } - if (IsEqualGUID(rclsid, &CLSID_PSOAInterface)) - return IPSFactoryBuffer_QueryInterface(&typelib_ps, iid, ppv); + if (IsEqualGUID(rclsid, &CLSID_PSDispatch) || IsEqualGUID(rclsid, &CLSID_PSOAInterface)) + return IPSFactoryBuffer_QueryInterface(&dispatch_typelib_ps, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_PSTypeComp) || IsEqualCLSID(rclsid, &CLSID_PSTypeInfo) || diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f3cc1f96f9..32cd5e9f39 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -410,7 +410,8 @@ static inline struct disp_obj *impl_from_ISomethingFromDispatch(ISomethingFromDi static HRESULT WINAPI disp_obj_QueryInterface(ISomethingFromDispatch *iface, REFIID iid, void **out) { if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IDispatch) - || IsEqualGUID(iid, &IID_ISomethingFromDispatch)) + || IsEqualGUID(iid, &IID_ISomethingFromDispatch) + || IsEqualGUID(iid, &DIID_ItestIF4)) { *out = iface; ISomethingFromDispatch_AddRef(iface); @@ -3637,6 +3638,37 @@ static void test_external_connection(void) IStream_Release(stream); } +static void test_marshal_dispinterface(void) +{ + static const LARGE_INTEGER zero = {0}; + + ISomethingFromDispatch *disp_obj = create_disp_obj(); + ITypeInfo *typeinfo = NULL; + IDispatch *proxy_disp; + IStream *stream; + HANDLE thread; + HRESULT hr; + ULONG ref; + DWORD tid; + + CreateStreamOnHGlobal(NULL, TRUE, &stream); + tid = start_host_object(stream, &DIID_ItestIF4, (IUnknown *)disp_obj, MSHLFLAGS_NORMAL, &thread); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(stream, &DIID_ItestIF4, (void **)&proxy_disp); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDispatch_GetTypeInfo(proxy_disp, 0xdeadbeef, 0, &typeinfo); + ok(hr == 0xbeefdead, "Got hr %#x.\n", hr); + + ref = IDispatch_Release(proxy_disp); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + end_host_object(tid, thread); + ref = ISomethingFromDispatch_Release(disp_obj); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(tmarshal) { HRESULT hr; @@ -3658,6 +3690,7 @@ START_TEST(tmarshal) test_StaticWidget(); test_libattr(); test_external_connection(); + test_marshal_dispinterface(); hr = UnRegisterTypeLib(&LIBID_TestTypelib, 2, 5, LOCALE_NEUTRAL, sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32); -- 2.20.1

Feb. 28, 2019