wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Michael Stefaniuc : urlmon: Use an iface instead of a vtbl pointer in MkProtocol.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 0abef309264806945518e39c0f14e9a301fd5ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0abef309264806945518e39c0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 9 20:45:20 2011 +0100 urlmon: Use an iface instead of a vtbl pointer in MkProtocol. --- dlls/urlmon/mk.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index 0befe5c..d10b567 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -22,29 +22,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { - const IInternetProtocolVtbl *lpIInternetProtocolVtbl; + IInternetProtocol IInternetProtocol_iface; LONG ref; IStream *stream; } MkProtocol; -#define PROTOCOL_THIS(iface) DEFINE_THIS(MkProtocol, IInternetProtocol, iface) +static inline MkProtocol *impl_from_IInternetProtocol(IInternetProtocol *iface) +{ + return CONTAINING_RECORD(iface, MkProtocol, IInternetProtocol_iface); +} static HRESULT WINAPI MkProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = PROTOCOL(This); + *ppv = &This->IInternetProtocol_iface; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); - *ppv = PROTOCOL(This); + *ppv = &This->IInternetProtocol_iface; }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); - *ppv = PROTOCOL(This); + *ppv = &This->IInternetProtocol_iface; } if(*ppv) { @@ -58,7 +61,7 @@ static HRESULT WINAPI MkProtocol_QueryInterface(IInternetProtocol *iface, REFIID static ULONG WINAPI MkProtocol_AddRef(IInternetProtocol *iface) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; @@ -66,7 +69,7 @@ static ULONG WINAPI MkProtocol_AddRef(IInternetProtocol *iface) static ULONG WINAPI MkProtocol_Release(IInternetProtocol *iface) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -93,7 +96,7 @@ static HRESULT WINAPI MkProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); IParseDisplayName *pdn; IMoniker *mon; LPWSTR mime, progid, display_name; @@ -188,7 +191,7 @@ static HRESULT WINAPI MkProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, static HRESULT WINAPI MkProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); FIXME("(%p)->(%p)\n", This, pProtocolData); return E_NOTIMPL; } @@ -196,14 +199,14 @@ static HRESULT WINAPI MkProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA static HRESULT WINAPI MkProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, DWORD dwOptions) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); return E_NOTIMPL; } static HRESULT WINAPI MkProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)->(%08x)\n", This, dwOptions); @@ -212,14 +215,14 @@ static HRESULT WINAPI MkProtocol_Terminate(IInternetProtocol *iface, DWORD dwOpt static HRESULT WINAPI MkProtocol_Suspend(IInternetProtocol *iface) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } static HRESULT WINAPI MkProtocol_Resume(IInternetProtocol *iface) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } @@ -227,7 +230,7 @@ static HRESULT WINAPI MkProtocol_Resume(IInternetProtocol *iface) static HRESULT WINAPI MkProtocol_Read(IInternetProtocol *iface, void *pv, ULONG cb, ULONG *pcbRead) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); @@ -240,14 +243,14 @@ static HRESULT WINAPI MkProtocol_Read(IInternetProtocol *iface, void *pv, static HRESULT WINAPI MkProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } static HRESULT WINAPI MkProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)->(%08x)\n", This, dwOptions); @@ -256,15 +259,13 @@ static HRESULT WINAPI MkProtocol_LockRequest(IInternetProtocol *iface, DWORD dwO static HRESULT WINAPI MkProtocol_UnlockRequest(IInternetProtocol *iface) { - MkProtocol *This = PROTOCOL_THIS(iface); + MkProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)\n", This); return S_OK; } -#undef PROTOCOL_THIS - static const IInternetProtocolVtbl MkProtocolVtbl = { MkProtocol_QueryInterface, MkProtocol_AddRef, @@ -291,14 +292,14 @@ HRESULT MkProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ret = heap_alloc(sizeof(MkProtocol)); - ret->lpIInternetProtocolVtbl = &MkProtocolVtbl; + ret->IInternetProtocol_iface.lpVtbl = &MkProtocolVtbl; ret->ref = 1; ret->stream = NULL; /* NOTE: * Native returns NULL ppobj and S_OK in CreateInstance if called with IID_IUnknown riid. */ - *ppobj = PROTOCOL(ret); + *ppobj = &ret->IInternetProtocol_iface; return S_OK; }

1 0

Michael Stefaniuc : urlmon: Use ifaces instead of vtbl pointers in MimeFilter.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: d4f8ce0a54d46f5f8866574e29ff4c2e81e50cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4f8ce0a54d46f5f8866574e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 9 20:39:15 2011 +0100 urlmon: Use ifaces instead of vtbl pointers in MimeFilter. --- dlls/urlmon/mimefilter.c | 81 ++++++++++++++++++++++----------------------- 1 files changed, 40 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4f8ce0a54d46f5f88665…

1 0

Michael Stefaniuc : urlmon: Use ifaces instead of vtbl pointers in GopherProtocol.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 3d05c172f0b7bb8aa9973d499ca73a4677bef928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d05c172f0b7bb8aa9973d499… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 9 20:32:59 2011 +0100 urlmon: Use ifaces instead of vtbl pointers in GopherProtocol. --- dlls/urlmon/gopher.c | 79 +++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 39 deletions(-) diff --git a/dlls/urlmon/gopher.c b/dlls/urlmon/gopher.c index 0058836..4087ed5 100644 --- a/dlls/urlmon/gopher.c +++ b/dlls/urlmon/gopher.c @@ -24,14 +24,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { Protocol base; - const IInternetProtocolVtbl *lpIInternetProtocolVtbl; - const IInternetPriorityVtbl *lpInternetPriorityVtbl; + IInternetProtocol IInternetProtocol_iface; + IInternetPriority IInternetPriority_iface; LONG ref; } GopherProtocol; -#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) - static inline GopherProtocol *impl_from_Protocol(Protocol *prot) { return CONTAINING_RECORD(prot, GopherProtocol, base); @@ -86,25 +84,28 @@ static const ProtocolVtbl AsyncProtocolVtbl = { GopherProtocol_on_error }; -#define PROTOCOL_THIS(iface) DEFINE_THIS(GopherProtocol, IInternetProtocol, iface) +static inline GopherProtocol *impl_from_IInternetProtocol(IInternetProtocol *iface) +{ + return CONTAINING_RECORD(iface, GopherProtocol, IInternetProtocol_iface); +} static HRESULT WINAPI GopherProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = PROTOCOL(This); + *ppv = &This->IInternetProtocol_iface; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); - *ppv = PROTOCOL(This); + *ppv = &This->IInternetProtocol_iface; }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); - *ppv = PROTOCOL(This); + *ppv = &This->IInternetProtocol_iface; }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); - *ppv = PRIORITY(This); + *ppv = &This->IInternetPriority_iface; } if(*ppv) { @@ -118,7 +119,7 @@ static HRESULT WINAPI GopherProtocol_QueryInterface(IInternetProtocol *iface, RE static ULONG WINAPI GopherProtocol_AddRef(IInternetProtocol *iface) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; @@ -126,7 +127,7 @@ static ULONG WINAPI GopherProtocol_AddRef(IInternetProtocol *iface) static ULONG WINAPI GopherProtocol_Release(IInternetProtocol *iface) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -144,7 +145,7 @@ static HRESULT WINAPI GopherProtocol_Start(IInternetProtocol *iface, LPCWSTR szU IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); IUri *uri; HRESULT hres; @@ -155,7 +156,8 @@ static HRESULT WINAPI GopherProtocol_Start(IInternetProtocol *iface, LPCWSTR szU if(FAILED(hres)) return hres; - hres = protocol_start(&This->base, PROTOCOL(This), uri, pOIProtSink, pOIBindInfo); + hres = protocol_start(&This->base, &This->IInternetProtocol_iface, uri, pOIProtSink, + pOIBindInfo); IUri_Release(uri); return hres; @@ -163,7 +165,7 @@ static HRESULT WINAPI GopherProtocol_Start(IInternetProtocol *iface, LPCWSTR szU static HRESULT WINAPI GopherProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)->(%p)\n", This, pProtocolData); @@ -173,7 +175,7 @@ static HRESULT WINAPI GopherProtocol_Continue(IInternetProtocol *iface, PROTOCOL static HRESULT WINAPI GopherProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, DWORD dwOptions) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); @@ -182,7 +184,7 @@ static HRESULT WINAPI GopherProtocol_Abort(IInternetProtocol *iface, HRESULT hrR static HRESULT WINAPI GopherProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)->(%08x)\n", This, dwOptions); @@ -192,14 +194,14 @@ static HRESULT WINAPI GopherProtocol_Terminate(IInternetProtocol *iface, DWORD d static HRESULT WINAPI GopherProtocol_Suspend(IInternetProtocol *iface) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } static HRESULT WINAPI GopherProtocol_Resume(IInternetProtocol *iface) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } @@ -207,7 +209,7 @@ static HRESULT WINAPI GopherProtocol_Resume(IInternetProtocol *iface) static HRESULT WINAPI GopherProtocol_Read(IInternetProtocol *iface, void *pv, ULONG cb, ULONG *pcbRead) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); @@ -217,14 +219,14 @@ static HRESULT WINAPI GopherProtocol_Read(IInternetProtocol *iface, void *pv, static HRESULT WINAPI GopherProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } static HRESULT WINAPI GopherProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)->(%08x)\n", This, dwOptions); @@ -233,15 +235,13 @@ static HRESULT WINAPI GopherProtocol_LockRequest(IInternetProtocol *iface, DWORD static HRESULT WINAPI GopherProtocol_UnlockRequest(IInternetProtocol *iface) { - GopherProtocol *This = PROTOCOL_THIS(iface); + GopherProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)\n", This); return protocol_unlock_request(&This->base); } -#undef PROTOCOL_THIS - static const IInternetProtocolVtbl GopherProtocolVtbl = { GopherProtocol_QueryInterface, GopherProtocol_AddRef, @@ -258,29 +258,32 @@ static const IInternetProtocolVtbl GopherProtocolVtbl = { GopherProtocol_UnlockRequest }; -#define PRIORITY_THIS(iface) DEFINE_THIS(GopherProtocol, InternetPriority, iface) +static inline GopherProtocol *impl_from_IInternetPriority(IInternetPriority *iface) +{ + return CONTAINING_RECORD(iface, GopherProtocol, IInternetPriority_iface); +} static HRESULT WINAPI GopherPriority_QueryInterface(IInternetPriority *iface, REFIID riid, void **ppv) { - GopherProtocol *This = PRIORITY_THIS(iface); - return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); + GopherProtocol *This = impl_from_IInternetPriority(iface); + return IInternetProtocol_QueryInterface(&This->IInternetProtocol_iface, riid, ppv); } static ULONG WINAPI GopherPriority_AddRef(IInternetPriority *iface) { - GopherProtocol *This = PRIORITY_THIS(iface); - return IInternetProtocol_AddRef(PROTOCOL(This)); + GopherProtocol *This = impl_from_IInternetPriority(iface); + return IInternetProtocol_AddRef(&This->IInternetProtocol_iface); } static ULONG WINAPI GopherPriority_Release(IInternetPriority *iface) { - GopherProtocol *This = PRIORITY_THIS(iface); - return IInternetProtocol_Release(PROTOCOL(This)); + GopherProtocol *This = impl_from_IInternetPriority(iface); + return IInternetProtocol_Release(&This->IInternetProtocol_iface); } static HRESULT WINAPI GopherPriority_SetPriority(IInternetPriority *iface, LONG nPriority) { - GopherProtocol *This = PRIORITY_THIS(iface); + GopherProtocol *This = impl_from_IInternetPriority(iface); TRACE("(%p)->(%d)\n", This, nPriority); @@ -290,7 +293,7 @@ static HRESULT WINAPI GopherPriority_SetPriority(IInternetPriority *iface, LONG static HRESULT WINAPI GopherPriority_GetPriority(IInternetPriority *iface, LONG *pnPriority) { - GopherProtocol *This = PRIORITY_THIS(iface); + GopherProtocol *This = impl_from_IInternetPriority(iface); TRACE("(%p)->(%p)\n", This, pnPriority); @@ -298,8 +301,6 @@ static HRESULT WINAPI GopherPriority_GetPriority(IInternetPriority *iface, LONG return S_OK; } -#undef PRIORITY_THIS - static const IInternetPriorityVtbl GopherPriorityVtbl = { GopherPriority_QueryInterface, GopherPriority_AddRef, @@ -319,11 +320,11 @@ HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ret = heap_alloc_zero(sizeof(GopherProtocol)); ret->base.vtbl = &AsyncProtocolVtbl; - ret->lpIInternetProtocolVtbl = &GopherProtocolVtbl; - ret->lpInternetPriorityVtbl = &GopherPriorityVtbl; + ret->IInternetProtocol_iface.lpVtbl = &GopherProtocolVtbl; + ret->IInternetPriority_iface.lpVtbl = &GopherPriorityVtbl; ret->ref = 1; - *ppobj = PROTOCOL(ret); + *ppobj = &ret->IInternetProtocol_iface; return S_OK; }

1 0

Travis Athougies : d3dcompiler_43/tests: Added error tests to HLSL test suite.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: ee8b276731b1953e551eb332374014ea60eb53c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee8b276731b1953e551eb3323… Author: Travis Athougies <iammisc(a)gmail.com> Date: Sat Jan 8 13:14:09 2011 -0800 d3dcompiler_43/tests: Added error tests to HLSL test suite. --- dlls/d3dcompiler_43/tests/hlsl.c | 93 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index cb53408..837a72e 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -556,6 +556,98 @@ static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo } } +static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_geometry, + IDirect3DVertexShader9 *vshader_passthru) +{ + static const char *undefined_variable_shader = + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " return y;\n" + "}"; + + static const char *invalid_swizzle_shader = + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " float4 x = float4(0, 0, 0, 0);\n" + " x.xzzx = float4(1, 2, 3, 4);\n" + " return x;\n" + "}"; + + static const char *invalid_conversion_shader = + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " float4 x = pos;\n" + " return x;\n" + "}"; + + static const char *invalid_syntax_shader = + "float4 test(float2 pos, TEXCOORD0) ; COLOR\n" + "{\n" + " pos = float4 x;\n" + " mul(float4(5, 4, 3, 2), mvp) = x;\n" + " return float4;\n" + "}"; + + static const char *invalid_identifiers_shader = + "float4 563r(float2 45s: TEXCOORD0) : COLOR\n" + "{\n" + " float2 x = 45s;\n" + " return float4(x.x, x.y, 0, 0);\n" + "}"; + + ID3D10Blob *compiled = NULL, *errors = NULL; + HRESULT hr; + + hr = D3DCompile(undefined_variable_shader, strlen(undefined_variable_shader), NULL, NULL, NULL, + "test", "ps_2_0", 0, 0, &compiled, &errors); + ok(hr != D3D_OK, "Pixel shader compilation succeeded on shader with undefined variable\n"); + ok(errors != NULL, "No errors returned for a shader with undefined variables\n"); + ok(compiled == NULL, "A shader blob was returned for a shader with undefined variables\n"); + + IUnknown_Release(errors); + errors = NULL; + + hr = D3DCompile(invalid_swizzle_shader, strlen(invalid_swizzle_shader), NULL, NULL, NULL, + "test","ps_2_0", 0, 0, &compiled, &errors); + ok(hr != D3D_OK, "Pixel shader compilation succeeded on shader with an invalid swizzle mask\n"); + ok(errors != NULL, "No errors returned for a shader with an invalid swizzle mask\n"); + ok(compiled == NULL, "A shader blob was returned for a shader with an invalid swizzle mask\n"); + + IUnknown_Release(errors); + errors = NULL; + + hr = D3DCompile(invalid_conversion_shader, strlen(invalid_conversion_shader), NULL, NULL, NULL, + "test", "ps_2_0", 0, 0, &compiled, &errors); + ok(hr != D3D_OK, "Pixel shader compilation succeeded on shader with an invalid type " + "conversion\n"); + ok(errors != NULL, "No errors returned for a shader with invalid type conversions\n"); + ok(compiled == NULL, "A shader blob was returned for a shader with invalid type conversions\n"); + + IUnknown_Release(errors); + errors = NULL; + + hr = D3DCompile(invalid_syntax_shader, strlen(invalid_syntax_shader), NULL, NULL, NULL, "test", + "ps_2_0", 0, 0, &compiled, &errors); + ok(hr != D3D_OK, "Pixel shader compilation succeeded on shader with blatantly invalid " + "syntax\n"); + ok(errors != NULL, "No errors returned for a shader with invalid syntax\n"); + ok(compiled == NULL, "A shader blob was returned for a shader with invalid syntax\n"); + + IUnknown_Release(errors); + errors = NULL; + + hr = D3DCompile(invalid_identifiers_shader, strlen(invalid_identifiers_shader), NULL, NULL, + NULL, "test", "ps_2_0", 0, 0, &compiled, &errors); + ok(hr != D3D_OK, "Pixel shader compilation successful on a shader with invalid variable and " + "function names\n"); + ok(errors != NULL, "No errors returned for a shader with invalid variable and function " + "names\n"); + ok(compiled == NULL, "A shader blob was returend for a shader with invalid variable and " + "function names\n"); + + IUnknown_Release(errors); +} + START_TEST(hlsl) { D3DCAPS9 caps; @@ -580,6 +672,7 @@ START_TEST(hlsl) test_conditionals(device, quad_geometry, vshader_passthru); test_float_vectors(device, quad_geometry, vshader_passthru); test_trig(device, quad_geometry, vshader_passthru); + test_fail(device, quad_geometry, vshader_passthru); } } else skip("no pixel shader support\n");

1 0

Travis Athougies : d3dcompiler_43/tests: Fixed nonconformant C string literals in HLSL test suite.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 3add55840da4bc8bba538055bfd46987ce1f1c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3add55840da4bc8bba538055b… Author: Travis Athougies <iammisc(a)gmail.com> Date: Sat Jan 8 13:13:52 2011 -0800 d3dcompiler_43/tests: Fixed nonconformant C string literals in HLSL test suite. --- dlls/d3dcompiler_43/tests/hlsl.c | 110 +++++++++++++++++++------------------- 1 files changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 1f8e31c..cb53408 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -70,10 +70,10 @@ static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration, }; static const char *vshader_passthru_hlsl = - "float4 vshader(float4 pos: POSITION, inout float2 texcoord: TEXCOORD0): POSITION \ - { \ - return pos; \ - }"; + "float4 vshader(float4 pos: POSITION, inout float2 texcoord: TEXCOORD0): POSITION\n" + "{\n" + " return pos;\n" + "}"; IDirect3D9 *d3d9_ptr; IDirect3DDevice9 *device_ptr = NULL; @@ -301,14 +301,14 @@ static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_ }; static const char *swizzle_test_shader = - "uniform float4 color; \ - float4 test(): COLOR \ - { \ - float4 ret = color; \ - ret.gb = ret.ra; \ - ret.ra = float2(0.0101, 0.0404); \ - return ret; \ - }"; + "uniform float4 color;\n" + "float4 test(): COLOR\n" + "{\n" + " float4 ret = color;\n" + " ret.gb = ret.ra;\n" + " ret.ra = float2(0.0101, 0.0404);\n" + " return ret;\n" + "}"; ID3DXConstantTable *constants; IDirect3DPixelShader9 *pshader; @@ -339,14 +339,14 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo }; static const char *order_of_operations_shader = - "float4 test(uniform float u, uniform float v, uniform float w, uniform float x, \ - uniform float y, uniform float z): COLOR \ - { \ - return float4(x * y - z / w + --u / -v, \ - z * x / y + w / -v, \ - u + v - w, \ - x / y / w); \ - }"; + "float4 test(uniform float u, uniform float v, uniform float w, uniform float x,\n" + " uniform float y, uniform float z): COLOR\n" + "{\n" + " return float4(x * y - z / w + --u / -v,\n" + " z * x / y + w / -v,\n" + " u + v - w,\n" + " x / y / w);\n" + "}"; ID3DXConstantTable *constants; IDirect3DPixelShader9 *pshader; @@ -383,13 +383,13 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * }; static const char *if_greater_shader = - "float4 test(float2 pos: TEXCOORD0): COLOR \ - { \ - if((pos.x * 32.0) > 20.0) \ - return float4(0.1, 0.2, 0.3, 0.4); \ - else \ - return float4(0.9, 0.8, 0.7, 0.6); \ - }"; + "float4 test(float2 pos: TEXCOORD0): COLOR\n" + "{\n" + " if((pos.x * 32.0) > 20.0)\n" + " return float4(0.1, 0.2, 0.3, 0.4);\n" + " else\n" + " return float4(0.9, 0.8, 0.7, 0.6);\n" + "}"; static const struct hlsl_probe_info ternary_operator_probes[] = { @@ -404,10 +404,10 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * }; static const char *ternary_operator_shader = - "float4 test(float2 pos: TEXCOORD0): COLOR \ - { \ - return (pos.x < 0.5?float4(0.5, 0.25, 0.5, 0.75):float4(0.6, 0.8, 0.1, 0.2)); \ - }"; + "float4 test(float2 pos: TEXCOORD0): COLOR\n" + "{\n" + " return (pos.x < 0.5?float4(0.5, 0.25, 0.5, 0.75):float4(0.6, 0.8, 0.1, 0.2));\n" + "}"; ID3DXConstantTable *constants; IDirect3DPixelShader9 *pshader; @@ -442,15 +442,15 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 }; static const char *vec4_indexing_test1_shader = - "float4 test(): COLOR \ - { \ - float4 color; \ - color[0] = 0.020; \ - color[1] = 0.245; \ - color[2] = 0.351; \ - color[3] = 1.0; \ - return color; \ - }"; + "float4 test(): COLOR\n" + "{\n" + " float4 color;\n" + " color[0] = 0.020;\n" + " color[1] = 0.245;\n" + " color[2] = 0.351;\n" + " color[3] = 1.0;\n" + " return color;\n" + "}"; static const struct hlsl_probe_info vec4_indexing_test2_probes[] = { @@ -459,14 +459,14 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 /* We have this uniform i here so the compiler can't optimize */ static const char *vec4_indexing_test2_shader = - "uniform int i; \ - float4 test(): COLOR \ - { \ - float4 color = float4(0.5, 0.4, 0.3, 0.2); \ - color.g = color[i]; \ - color.b = 0.8; \ - return color; \ - }"; + "uniform int i;\n" + "float4 test(): COLOR\n" + "{\n" + " float4 color = float4(0.5, 0.4, 0.3, 0.2);\n" + " color.g = color[i];\n" + " color.b = 0.8;\n" + " return color;\n" + "}"; ID3DXConstantTable *constants; IDirect3DPixelShader9 *pshader; @@ -534,13 +534,13 @@ static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo }; static const char *sincos_shader = - "float4 test(float x: TEXCOORD0): COLOR \ - { \ - const float pi2 = 6.2831853; \ - float calcd_sin = (sin(x * pi2) + 1)/2; \ - float calcd_cos = (cos(x * pi2) + 1)/2; \ - return float4(calcd_sin, calcd_cos, 0, 0); \ - }"; + "float4 test(float x: TEXCOORD0): COLOR\n" + "{\n" + " const float pi2 = 6.2831853;\n" + " float calcd_sin = (sin(x * pi2) + 1)/2;\n" + " float calcd_cos = (cos(x * pi2) + 1)/2;\n" + " return float4(calcd_sin, calcd_cos, 0, 0);\n" + "}"; ID3DXConstantTable *constants; IDirect3DPixelShader9 *pshader;

1 0

Jacek Caban : shdocvw: Improved 'iexplore -nohome' handling.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 89991e1f4c7d2bd011c161d9276d63ee41f5073a URL: http://source.winehq.org/git/wine.git/?a=commit;h=89991e1f4c7d2bd011c161d92… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 7 19:07:05 2011 +0100 shdocvw: Improved 'iexplore -nohome' handling. --- dlls/shdocvw/ie.c | 1 + dlls/shdocvw/iexplore.c | 52 +++++++++++++++++++++++++++++++++------------- dlls/shdocvw/shdocvw.h | 3 ++ 3 files changed, 41 insertions(+), 15 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 7b59839..491f025 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -87,6 +87,7 @@ static ULONG WINAPI InternetExplorer_Release(IWebBrowser2 *iface) if(This->frame_hwnd) DestroyWindow(This->frame_hwnd); + list_remove(&This->entry); heap_free(This); released_obj(); diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index f0107d6..3b652cb 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -54,6 +54,7 @@ static const WCHAR wszWineInternetExplorer[] = static LONG obj_cnt; static DWORD dde_inst; static HSZ ddestr_iexplore, ddestr_openurl; +static struct list ie_list; HRESULT update_ie_statustext(InternetExplorer* This, LPCWSTR text) { @@ -736,9 +737,15 @@ static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost *iface, LPCWSTR tex return update_ie_statustext(This->ie, text); } -static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) +static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url) { - SendMessageW(This->frame_hwnd, WM_UPDATEADDRBAR, 0, (LPARAM)url); + IEDocHost *This = impl_from_DocHost(iface); + + if(!This->ie) + return; + + This->ie->nohome = FALSE; + SendMessageW(This->ie->frame_hwnd, WM_UPDATEADDRBAR, 0, (LPARAM)url); } static HRESULT DocHostContainer_exec(DocHost* This, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in, @@ -782,6 +789,7 @@ static HRESULT create_ie(InternetExplorer **ret_obj) ret->doc_host->doc_host.frame_hwnd = ret->frame_hwnd; InterlockedIncrement(&obj_cnt); + list_add_tail(&ie_list, &ret->entry); *ret_obj = ret; return S_OK; } @@ -830,8 +838,6 @@ static BOOL create_ie_window(LPCSTR cmdline) DWORD len; int cmdlen; - if(!strncasecmp(cmdline, "-nohome", 7)) - cmdline += 7; while(*cmdline == ' ' || *cmdline == '\t') cmdline++; cmdlen = lstrlenA(cmdline); @@ -840,16 +846,20 @@ static BOOL create_ie_window(LPCSTR cmdline) cmdlen -= 2; } - V_VT(&var_url) = VT_BSTR; + if(cmdlen == 7 && !memcmp(cmdline, "-nohome", 7)) { + ie->nohome = TRUE; + }else { + V_VT(&var_url) = VT_BSTR; - len = MultiByteToWideChar(CP_ACP, 0, cmdline, cmdlen, NULL, 0); - V_BSTR(&var_url) = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, cmdline, cmdlen, V_BSTR(&var_url), len); + len = MultiByteToWideChar(CP_ACP, 0, cmdline, cmdlen, NULL, 0); + V_BSTR(&var_url) = SysAllocStringLen(NULL, len); + MultiByteToWideChar(CP_ACP, 0, cmdline, cmdlen, V_BSTR(&var_url), len); - /* navigate to the first page */ - IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &var_url, NULL, NULL, NULL, NULL); + /* navigate to the first page */ + IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &var_url, NULL, NULL, NULL, NULL); - SysFreeString(V_BSTR(&var_url)); + SysFreeString(V_BSTR(&var_url)); + } } IWebBrowser2_Release(&ie->IWebBrowser2_iface); @@ -858,7 +868,7 @@ static BOOL create_ie_window(LPCSTR cmdline) static ULONG open_dde_url(WCHAR *dde_url) { - InternetExplorer *ie; + InternetExplorer *ie, *iter; WCHAR *url, *url_end; VARIANT urlv; HRESULT hres; @@ -882,9 +892,19 @@ static ULONG open_dde_url(WCHAR *dde_url) url_end = url + strlenW(url); } - hres = create_ie(&ie); - if(FAILED(hres)) - return 0; + LIST_FOR_EACH_ENTRY(iter, &ie_list, InternetExplorer, entry) { + if(iter->nohome) { + IWebBrowser2_AddRef(&iter->IWebBrowser2_iface); + ie = iter; + break; + } + } + + if(!ie) { + hres = create_ie(&ie); + if(FAILED(hres)) + return 0; + } IWebBrowser2_put_Visible(&ie->IWebBrowser2_iface, VARIANT_TRUE); IWebBrowser2_put_MenuBar(&ie->IWebBrowser2_iface, VARIANT_TRUE); @@ -1000,6 +1020,8 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) TRACE("%s %d\n", debugstr_a(szCommandLine), nShowWindow); + list_init(&ie_list); + if(*szCommandLine == '-' || *szCommandLine == '/') { if(!strcasecmp(szCommandLine+1, "regserver")) return register_iexplore(TRUE); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 86c9b42..3692e15 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -40,6 +40,7 @@ #include "htiframe.h" #include "wine/unicode.h" +#include "wine/list.h" #include "resource.h" @@ -201,7 +202,9 @@ struct InternetExplorer { HWND frame_hwnd; HWND status_hwnd; HMENU menu; + BOOL nohome; + struct list entry; IEDocHost *doc_host; };

1 0

Jacek Caban : shdocvw: Moved allocating InternetExplorer object to separated function.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: c56614e114c1c73f34c099ce23df7c552152cda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56614e114c1c73f34c099ce2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 7 19:06:39 2011 +0100 shdocvw: Moved allocating InternetExplorer object to separated function. --- dlls/shdocvw/iexplore.c | 125 ++++++++++++++++++++++++++--------------------- 1 files changed, 69 insertions(+), 56 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 48fcf97..f0107d6 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -693,50 +693,6 @@ static void create_frame_hwnd(InternetExplorer *This) NULL, NULL /* FIXME */, shdocvw_hinstance, This); } -static BOOL create_ie_window(LPCSTR cmdline) -{ - IWebBrowser2 *wb = NULL; - - InternetExplorer_Create(NULL, &IID_IWebBrowser2, (void**)&wb); - if(!wb) - return FALSE; - - IWebBrowser2_put_Visible(wb, VARIANT_TRUE); - IWebBrowser2_put_MenuBar(wb, VARIANT_TRUE); - - if(!*cmdline) { - IWebBrowser2_GoHome(wb); - }else { - VARIANT var_url; - DWORD len; - int cmdlen; - - if(!strncasecmp(cmdline, "-nohome", 7)) - cmdline += 7; - while(*cmdline == ' ' || *cmdline == '\t') - cmdline++; - cmdlen = lstrlenA(cmdline); - if(cmdlen > 2 && cmdline[0] == '"' && cmdline[cmdlen-1] == '"') { - cmdline++; - cmdlen -= 2; - } - - V_VT(&var_url) = VT_BSTR; - - len = MultiByteToWideChar(CP_ACP, 0, cmdline, cmdlen, NULL, 0); - V_BSTR(&var_url) = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, cmdline, cmdlen, V_BSTR(&var_url), len); - - /* navigate to the first page */ - IWebBrowser2_Navigate2(wb, &var_url, NULL, NULL, NULL, NULL); - - SysFreeString(V_BSTR(&var_url)); - } - - IWebBrowser2_Release(wb); - return TRUE; -} - static inline IEDocHost *impl_from_DocHost(DocHost *iface) { return CONTAINING_RECORD(iface, IEDocHost, doc_host); @@ -799,12 +755,9 @@ static const IDocHostContainerVtbl DocHostContainerVtbl = { DocHostContainer_exec }; -HRESULT InternetExplorer_Create(IUnknown *pOuter, REFIID riid, void **ppv) +static HRESULT create_ie(InternetExplorer **ret_obj) { InternetExplorer *ret; - HRESULT hres; - - TRACE("(%p %s %p)\n", pOuter, debugstr_guid(riid), ppv); ret = heap_alloc_zero(sizeof(InternetExplorer)); if(!ret) @@ -828,12 +781,27 @@ HRESULT InternetExplorer_Create(IUnknown *pOuter, REFIID riid, void **ppv) create_frame_hwnd(ret); ret->doc_host->doc_host.frame_hwnd = ret->frame_hwnd; + InterlockedIncrement(&obj_cnt); + *ret_obj = ret; + return S_OK; +} + +HRESULT InternetExplorer_Create(IUnknown *pOuter, REFIID riid, void **ppv) +{ + InternetExplorer *ret; + HRESULT hres; + + TRACE("(%p %s %p)\n", pOuter, debugstr_guid(riid), ppv); + + hres = create_ie(&ret); + if(FAILED(hres)) + return hres; + hres = IWebBrowser2_QueryInterface(&ret->IWebBrowser2_iface, riid, ppv); IWebBrowser2_Release(&ret->IWebBrowser2_iface); if(FAILED(hres)) return hres; - InterlockedIncrement(&obj_cnt); return S_OK; } @@ -843,9 +811,54 @@ void released_obj(void) PostQuitMessage(0); } +static BOOL create_ie_window(LPCSTR cmdline) +{ + InternetExplorer *ie; + HRESULT hres; + + hres = create_ie(&ie); + if(FAILED(hres)) + return FALSE; + + IWebBrowser2_put_Visible(&ie->IWebBrowser2_iface, VARIANT_TRUE); + IWebBrowser2_put_MenuBar(&ie->IWebBrowser2_iface, VARIANT_TRUE); + + if(!*cmdline) { + IWebBrowser2_GoHome(&ie->IWebBrowser2_iface); + }else { + VARIANT var_url; + DWORD len; + int cmdlen; + + if(!strncasecmp(cmdline, "-nohome", 7)) + cmdline += 7; + while(*cmdline == ' ' || *cmdline == '\t') + cmdline++; + cmdlen = lstrlenA(cmdline); + if(cmdlen > 2 && cmdline[0] == '"' && cmdline[cmdlen-1] == '"') { + cmdline++; + cmdlen -= 2; + } + + V_VT(&var_url) = VT_BSTR; + + len = MultiByteToWideChar(CP_ACP, 0, cmdline, cmdlen, NULL, 0); + V_BSTR(&var_url) = SysAllocStringLen(NULL, len); + MultiByteToWideChar(CP_ACP, 0, cmdline, cmdlen, V_BSTR(&var_url), len); + + /* navigate to the first page */ + IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &var_url, NULL, NULL, NULL, NULL); + + SysFreeString(V_BSTR(&var_url)); + } + + IWebBrowser2_Release(&ie->IWebBrowser2_iface); + return TRUE; +} + static ULONG open_dde_url(WCHAR *dde_url) { - IWebBrowser2 *wb; + InternetExplorer *ie; WCHAR *url, *url_end; VARIANT urlv; HRESULT hres; @@ -869,25 +882,25 @@ static ULONG open_dde_url(WCHAR *dde_url) url_end = url + strlenW(url); } - hres = InternetExplorer_Create(NULL, &IID_IWebBrowser2, (void**)&wb); + hres = create_ie(&ie); if(FAILED(hres)) return 0; - IWebBrowser2_put_Visible(wb, VARIANT_TRUE); - IWebBrowser2_put_MenuBar(wb, VARIANT_TRUE); + IWebBrowser2_put_Visible(&ie->IWebBrowser2_iface, VARIANT_TRUE); + IWebBrowser2_put_MenuBar(&ie->IWebBrowser2_iface, VARIANT_TRUE); V_VT(&urlv) = VT_BSTR; V_BSTR(&urlv) = SysAllocStringLen(url, url_end-url); if(!V_BSTR(&urlv)) { - IWebBrowser2_Release(wb); + IWebBrowser2_Release(&ie->IWebBrowser2_iface); return 0; } - hres = IWebBrowser2_Navigate2(wb, &urlv, NULL, NULL, NULL, NULL); + hres = IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &urlv, NULL, NULL, NULL, NULL); if(FAILED(hres)) return 0; - IWebBrowser2_Release(wb); + IWebBrowser2_Release(&ie->IWebBrowser2_iface); return DDE_FACK; }

1 0

Jacek Caban : shdocvw: Added beginning iexplore DDE suport.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: e2fa7a4019b8c004dda2439aa98c57eaff6ea4ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2fa7a4019b8c004dda2439aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 7 19:06:17 2011 +0100 shdocvw: Added beginning iexplore DDE suport. --- dlls/shdocvw/iexplore.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 5c03b9c..48fcf97 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -37,6 +37,7 @@ #include "winreg.h" #include "shlwapi.h" #include "intshcut.h" +#include "ddeml.h" #include "wine/debug.h" @@ -51,6 +52,8 @@ static const WCHAR wszWineInternetExplorer[] = {'W','i','n','e',' ','I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r',0}; static LONG obj_cnt; +static DWORD dde_inst; +static HSZ ddestr_iexplore, ddestr_openurl; HRESULT update_ie_statustext(InternetExplorer* This, LPCWSTR text) { @@ -840,6 +843,138 @@ void released_obj(void) PostQuitMessage(0); } +static ULONG open_dde_url(WCHAR *dde_url) +{ + IWebBrowser2 *wb; + WCHAR *url, *url_end; + VARIANT urlv; + HRESULT hres; + + TRACE("%s\n", debugstr_w(dde_url)); + + url = dde_url; + if(*url == '"') { + url++; + url_end = strchrW(url, '"'); + if(!url_end) { + FIXME("missing string terminator\n"); + return 0; + } + *url_end = 0; + }else { + url_end = strchrW(url, ','); + if(url_end) + *url_end = 0; + else + url_end = url + strlenW(url); + } + + hres = InternetExplorer_Create(NULL, &IID_IWebBrowser2, (void**)&wb); + if(FAILED(hres)) + return 0; + + IWebBrowser2_put_Visible(wb, VARIANT_TRUE); + IWebBrowser2_put_MenuBar(wb, VARIANT_TRUE); + + V_VT(&urlv) = VT_BSTR; + V_BSTR(&urlv) = SysAllocStringLen(url, url_end-url); + if(!V_BSTR(&urlv)) { + IWebBrowser2_Release(wb); + return 0; + } + + hres = IWebBrowser2_Navigate2(wb, &urlv, NULL, NULL, NULL, NULL); + if(FAILED(hres)) + return 0; + + IWebBrowser2_Release(wb); + return DDE_FACK; +} + +static HDDEDATA WINAPI dde_proc(UINT type, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA data, + ULONG_PTR dwData1, ULONG_PTR dwData2) +{ + switch(type) { + case XTYP_CONNECT: + TRACE("XTYP_CONNECT %p\n", hsz1); + return (HDDEDATA)!DdeCmpStringHandles(hsz1, ddestr_openurl); + + case XTYP_EXECUTE: { + WCHAR *url; + DWORD size; + HDDEDATA ret; + + TRACE("XTYP_EXECUTE %p\n", data); + + size = DdeGetData(data, NULL, 0, 0); + if(!size) { + WARN("size = 0\n"); + break; + } + + url = heap_alloc(size); + if(!url) + break; + + if(DdeGetData(data, (BYTE*)url, size, 0) != size) { + ERR("error during read\n"); + break; + } + + ret = (HDDEDATA)open_dde_url(url); + + heap_free(url); + return ret; + } + + case XTYP_REQUEST: + FIXME("XTYP_REQUEST\n"); + break; + + default: + TRACE("type %d\n", type); + } + + return NULL; +} + +static void init_dde(void) +{ + UINT res; + + static const WCHAR iexploreW[] = {'I','E','x','p','l','o','r','e',0}; + static const WCHAR openurlW[] = {'W','W','W','_','O','p','e','n','U','R','L',0}; + + res = DdeInitializeW(&dde_inst, dde_proc, CBF_SKIP_ALLNOTIFICATIONS | CBF_FAIL_ADVISES | CBF_FAIL_POKES, 0); + if(res != DMLERR_NO_ERROR) { + WARN("DdeInitialize failed: %u\n", res); + return; + } + + ddestr_iexplore = DdeCreateStringHandleW(dde_inst, iexploreW, CP_WINUNICODE); + if(!ddestr_iexplore) + WARN("Failed to create string handle: %u\n", DdeGetLastError(dde_inst)); + + ddestr_openurl = DdeCreateStringHandleW(dde_inst, openurlW, CP_WINUNICODE); + if(!ddestr_openurl) + WARN("Failed to create string handle: %u\n", DdeGetLastError(dde_inst)); + + res = (ULONG)DdeNameService(dde_inst, ddestr_iexplore, 0, DNS_REGISTER); + if(res != DMLERR_NO_ERROR) + WARN("DdeNameService failed: %u\n", res); +} + +static void release_dde(void) +{ + if(ddestr_iexplore) + DdeNameService(dde_inst, ddestr_iexplore, 0, DNS_UNREGISTER); + if(ddestr_openurl) + DdeFreeStringHandle(dde_inst, ddestr_openurl); + if(ddestr_iexplore) + DdeFreeStringHandle(dde_inst, ddestr_iexplore); + DdeUninitialize(dde_inst); +} + /****************************************************************** * IEWinMain (SHDOCVW.101) * @@ -867,6 +1002,8 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) ExitProcess(1); } + init_dde(); + if(strcasecmp(szCommandLine, "-embedding")) { if(!create_ie_window(szCommandLine)) { CoUninitialize(); @@ -882,6 +1019,7 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) } register_class_object(FALSE); + release_dde(); CoUninitialize();

1 0

Jacek Caban : shdocvw: Added InternetExplorer::get_Visible implementation.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: f48fa4b945bebfbab5f4980c175e9a5915625c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48fa4b945bebfbab5f4980c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 7 19:05:16 2011 +0100 shdocvw: Added InternetExplorer::get_Visible implementation. --- dlls/shdocvw/ie.c | 7 +++++-- dlls/shdocvw/tests/ie.c | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index f968302..7b59839 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -372,8 +372,11 @@ static HRESULT WINAPI InternetExplorer_get_Path(IWebBrowser2 *iface, BSTR *Path) static HRESULT WINAPI InternetExplorer_get_Visible(IWebBrowser2 *iface, VARIANT_BOOL *pBool) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, pBool); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pBool); + + *pBool = IsWindowVisible(This->frame_hwnd) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI InternetExplorer_put_Visible(IWebBrowser2 *iface, VARIANT_BOOL Value) diff --git a/dlls/shdocvw/tests/ie.c b/dlls/shdocvw/tests/ie.c index e7b5ead..336a62e 100644 --- a/dlls/shdocvw/tests/ie.c +++ b/dlls/shdocvw/tests/ie.c @@ -27,6 +27,28 @@ #include "ole2.h" #include "exdisp.h" +static void test_visible(IWebBrowser2 *wb) +{ + VARIANT_BOOL b; + HRESULT hres; + + b = 0x100; + hres = IWebBrowser2_get_Visible(wb, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "Visible = %x\n", hres); + + hres = IWebBrowser2_put_Visible(wb, VARIANT_TRUE); + ok(hres == S_OK, "put_Visible failed: %08x\n", hres); + + b = 0x100; + hres = IWebBrowser2_get_Visible(wb, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", hres); + + hres = IWebBrowser2_put_Visible(wb, VARIANT_FALSE); + ok(hres == S_OK, "put_Visible failed: %08x\n", hres); +} + static void test_InternetExplorer(void) { IWebBrowser2 *wb; @@ -44,6 +66,8 @@ static void test_InternetExplorer(void) hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); + test_visible(wb); + IWebBrowser2_Release(wb); ref = IUnknown_Release(unk); ok(!ref, "object not destroyed, ref=%u\n", ref);

1 0

Jacek Caban : shdocvw: Added InternetExplorer object tests.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 74ccbf0083db5aef3821a51c823cbf7e9f6d1221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ccbf0083db5aef3821a51c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 7 19:04:07 2011 +0100 shdocvw: Added InternetExplorer object tests. --- dlls/shdocvw/tests/Makefile.in | 1 + dlls/shdocvw/tests/ie.c | 59 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in index 10474a1..53f2130 100644 --- a/dlls/shdocvw/tests/Makefile.in +++ b/dlls/shdocvw/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = shdocvw.dll IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 C_SRCS = \ + ie.c \ intshcut.c \ shdocvw.c \ shortcut.c \ diff --git a/dlls/shdocvw/tests/ie.c b/dlls/shdocvw/tests/ie.c new file mode 100644 index 0000000..e7b5ead --- /dev/null +++ b/dlls/shdocvw/tests/ie.c @@ -0,0 +1,59 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 + */ + +#define COBJMACROS + +#include <wine/test.h> +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "exdisp.h" + +static void test_InternetExplorer(void) +{ + IWebBrowser2 *wb; + IUnknown *unk; + ULONG ref; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_InternetExplorer, NULL, CLSCTX_SERVER, + &IID_IUnknown, (void**)&unk); + if(FAILED(hres)) { + win_skip("Could not create InternetExplorer object\n"); + return; + } + + hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); + ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); + + IWebBrowser2_Release(wb); + ref = IUnknown_Release(unk); + ok(!ref, "object not destroyed, ref=%u\n", ref); +} + +START_TEST(ie) +{ + CoInitialize(NULL); + + test_InternetExplorer(); + + CoUninitialize(); +}

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
88
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 2011