March 2011 - wine-commits

Henri Verbeet : wined3d: Get rid of struct wined3d_geometryshader.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 4674b94d237c99e51a4c701ef71812e76d83d8ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4674b94d237c99e51a4c701ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:51 2011 +0200 wined3d: Get rid of struct wined3d_geometryshader. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/shader.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 14 ++++---------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6d40041..6fe66ae 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1549,7 +1549,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateGeometryShader(IWineD3DDevice *if IWineD3DBaseShader **shader) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct wined3d_geometryshader *object; + IWineD3DBaseShaderImpl *object; HRESULT hr; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e7e5a18..0eaf728 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1913,8 +1913,8 @@ static HRESULT STDMETHODCALLTYPE geometryshader_QueryInterface(IWineD3DBaseShade static ULONG STDMETHODCALLTYPE geometryshader_AddRef(IWineD3DBaseShader *iface) { - struct wined3d_geometryshader *shader = (struct wined3d_geometryshader *)iface; - ULONG refcount = InterlockedIncrement(&shader->base_shader.ref); + IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; + ULONG refcount = InterlockedIncrement(&shader->baseShader.ref); TRACE("%p increasing refcount to %u.\n", shader, refcount); @@ -1924,15 +1924,15 @@ static ULONG STDMETHODCALLTYPE geometryshader_AddRef(IWineD3DBaseShader *iface) /* Do not call while under the GL lock. */ static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DBaseShader *iface) { - struct wined3d_geometryshader *shader = (struct wined3d_geometryshader *)iface; - ULONG refcount = InterlockedDecrement(&shader->base_shader.ref); + IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; + ULONG refcount = InterlockedDecrement(&shader->baseShader.ref); TRACE("%p decreasing refcount to %u.\n", shader, refcount); if (!refcount) { - shader_cleanup((IWineD3DBaseShaderImpl *)shader); - shader->base_shader.parent_ops->wined3d_object_destroyed(shader->base_shader.parent); + shader_cleanup(shader); + shader->baseShader.parent_ops->wined3d_object_destroyed(shader->baseShader.parent); HeapFree(GetProcessHeap(), 0, shader); } @@ -1975,24 +1975,24 @@ static const IWineD3DBaseShaderVtbl wined3d_geometryshader_vtbl = geometryshader_SetLocalConstantsF, }; -HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDeviceImpl *device, +HRESULT geometryshader_init(IWineD3DBaseShaderImpl *shader, IWineD3DDeviceImpl *device, const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, void *parent, const struct wined3d_parent_ops *parent_ops) { HRESULT hr; - shader->vtbl = &wined3d_geometryshader_vtbl; - shader_init(&shader->base_shader, device, parent, parent_ops); + shader->lpVtbl = &wined3d_geometryshader_vtbl; + shader_init(&shader->baseShader, device, parent, parent_ops); - hr = shader_set_function((IWineD3DBaseShaderImpl *)shader, byte_code, output_signature, 0); + hr = shader_set_function(shader, byte_code, output_signature, 0); if (FAILED(hr)) { WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup((IWineD3DBaseShaderImpl *)shader); + shader_cleanup(shader); return hr; } - shader->base_shader.load_local_constsF = FALSE; + shader->baseShader.load_local_constsF = FALSE; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b61c86f..3c3a325 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2738,6 +2738,10 @@ typedef struct IWineD3DBaseShaderImpl { } u; } IWineD3DBaseShaderImpl; +HRESULT geometryshader_init(IWineD3DBaseShaderImpl *shader, IWineD3DDeviceImpl *device, + const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + void find_vs_compile_args(const struct wined3d_state *state, IWineD3DBaseShaderImpl *shader, struct vs_compile_args *args) DECLSPEC_HIDDEN; HRESULT vertexshader_init(IWineD3DBaseShaderImpl *shader, IWineD3DDeviceImpl *device, @@ -2828,16 +2832,6 @@ static inline BOOL shader_constant_is_local(IWineD3DBaseShaderImpl* This, DWORD } -struct wined3d_geometryshader -{ - const struct IWineD3DBaseShaderVtbl *vtbl; - IWineD3DBaseShaderClass base_shader; -}; - -HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDeviceImpl *device, - const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; - /***************************************************************************** * IDirect3DPixelShader implementation structure */

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DVertexShaderImpl.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: dab01d435ea006c0a40dac093b7b25e312f4aae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab01d435ea006c0a40dac093… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:50 2011 +0200 wined3d: Get rid of IWineD3DVertexShaderImpl. --- dlls/wined3d/arb_program_shader.c | 39 +++++++++++++++++++----------------- dlls/wined3d/device.c | 4 +- dlls/wined3d/glsl_shader.c | 22 ++++++++++---------- dlls/wined3d/shader.c | 27 ++++++++++++------------- dlls/wined3d/wined3d_private.h | 38 +++++++++++++++++------------------- 5 files changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dab01d435ea006c0a40da…

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DGeometryShader.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 9ea2ee5f4e85afb98154661b06aeaf1b28720f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea2ee5f4e85afb98154661b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:48 2011 +0200 wined3d: Get rid of IWineD3DGeometryShader. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/shader.c | 4 +--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/shader.c | 17 ++++++++--------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 11 +---------- 6 files changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 131790f..bdfbc34 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -182,7 +182,7 @@ struct d3d10_geometry_shader const struct ID3D10GeometryShaderVtbl *vtbl; LONG refcount; - IWineD3DGeometryShader *wined3d_shader; + IWineD3DBaseShader *wined3d_shader; struct wined3d_shader_signature output_signature; }; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 5f41927..a1140fe 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -307,9 +307,7 @@ static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_Release(ID3D10GeometryShade TRACE("%p decreasing refcount to %u\n", This, refcount); if (!refcount) - { - IWineD3DGeometryShader_Release(This->wined3d_shader); - } + IWineD3DBaseShader_Release(This->wined3d_shader); return refcount; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3ab4a4c..6aebf7e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1546,7 +1546,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac static HRESULT WINAPI IWineD3DDeviceImpl_CreateGeometryShader(IWineD3DDevice *iface, const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, void *parent, const struct wined3d_parent_ops *parent_ops, - IWineD3DGeometryShader **shader) + IWineD3DBaseShader **shader) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_geometryshader *object; @@ -1568,7 +1568,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateGeometryShader(IWineD3DDevice *if } TRACE("Created geometry shader %p.\n", object); - *shader = (IWineD3DGeometryShader *)object; + *shader = (IWineD3DBaseShader *)object; return WINED3D_OK; } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 413de0a..3343363 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1892,13 +1892,12 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * return WINED3D_OK; } -static HRESULT STDMETHODCALLTYPE geometryshader_QueryInterface(IWineD3DGeometryShader *iface, +static HRESULT STDMETHODCALLTYPE geometryshader_QueryInterface(IWineD3DBaseShader *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_IWineD3DGeometryShader) - || IsEqualGUID(riid, &IID_IWineD3DBaseShader) + if (IsEqualGUID(riid, &IID_IWineD3DBaseShader) || IsEqualGUID(riid, &IID_IWineD3DBase) || IsEqualGUID(riid, &IID_IUnknown)) { @@ -1913,7 +1912,7 @@ static HRESULT STDMETHODCALLTYPE geometryshader_QueryInterface(IWineD3DGeometryS return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE geometryshader_AddRef(IWineD3DGeometryShader *iface) +static ULONG STDMETHODCALLTYPE geometryshader_AddRef(IWineD3DBaseShader *iface) { struct wined3d_geometryshader *shader = (struct wined3d_geometryshader *)iface; ULONG refcount = InterlockedIncrement(&shader->base_shader.ref); @@ -1924,7 +1923,7 @@ static ULONG STDMETHODCALLTYPE geometryshader_AddRef(IWineD3DGeometryShader *ifa } /* Do not call while under the GL lock. */ -static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DGeometryShader *iface) +static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DBaseShader *iface) { struct wined3d_geometryshader *shader = (struct wined3d_geometryshader *)iface; ULONG refcount = InterlockedDecrement(&shader->base_shader.ref); @@ -1941,21 +1940,21 @@ static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DGeometryShader *if return refcount; } -static void * STDMETHODCALLTYPE geometryshader_GetParent(IWineD3DGeometryShader *iface) +static void * STDMETHODCALLTYPE geometryshader_GetParent(IWineD3DBaseShader *iface) { TRACE("iface %p.\n", iface); return ((IWineD3DBaseShaderImpl *)iface)->baseShader.parent; } -static HRESULT STDMETHODCALLTYPE geometryshader_GetFunction(IWineD3DGeometryShader *iface, void *data, UINT *data_size) +static HRESULT STDMETHODCALLTYPE geometryshader_GetFunction(IWineD3DBaseShader *iface, void *data, UINT *data_size) { TRACE("iface %p, data %p, data_size %p.\n", iface, data, data_size); return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } -static HRESULT STDMETHODCALLTYPE geometryshader_SetLocalConstantsF(IWineD3DGeometryShader *iface, +static HRESULT STDMETHODCALLTYPE geometryshader_SetLocalConstantsF(IWineD3DBaseShader *iface, UINT start_idx, const float *src_data, UINT count) { TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); @@ -1964,7 +1963,7 @@ static HRESULT STDMETHODCALLTYPE geometryshader_SetLocalConstantsF(IWineD3DGeome start_idx, src_data, count); } -static const IWineD3DGeometryShaderVtbl wined3d_geometryshader_vtbl = +static const IWineD3DBaseShaderVtbl wined3d_geometryshader_vtbl = { /* IUnknown methods */ geometryshader_QueryInterface, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ac14d7..4fecd9a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2832,7 +2832,7 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * struct wined3d_geometryshader { - const struct IWineD3DGeometryShaderVtbl *vtbl; + const struct IWineD3DBaseShaderVtbl *vtbl; IWineD3DBaseShaderClass base_shader; }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 0055659..934f23f 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2405,15 +2405,6 @@ interface IWineD3DBaseShader : IWineD3DBase [ object, local, - uuid(8276c113-388b-49d1-ad8b-c9dd8bcbabcd) -] -interface IWineD3DGeometryShader : IWineD3DBaseShader -{ -} - -[ - object, - local, uuid(818503da-6f30-11d9-c687-00046142c14f) ] interface IWineD3DPixelShader : IWineD3DBaseShader @@ -2554,7 +2545,7 @@ interface IWineD3DDevice : IUnknown [in] const struct wined3d_shader_signature *output_signature, [in] void *parent, [in] const struct wined3d_parent_ops *parent_ops, - [out] IWineD3DGeometryShader **shader + [out] IWineD3DBaseShader **shader ); HRESULT CreatePixelShader( [in] const DWORD *function,

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DPixelShader.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 3d4fe0b7505b5d261db375c817bcd0b18a95a9ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d4fe0b7505b5d261db375c81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:49 2011 +0200 wined3d: Get rid of IWineD3DPixelShader. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/shader.c | 8 +---- dlls/d3d8/d3d8_private.h | 5 +-- dlls/d3d8/device.c | 17 ++++++----- dlls/d3d8/shader.c | 6 ++-- dlls/d3d9/d3d9_private.h | 8 +---- dlls/d3d9/device.c | 8 +++--- dlls/d3d9/shader.c | 8 +++--- dlls/wined3d/device.c | 53 ++++++++++++++++++++--------------- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/shader.c | 17 +++++------ dlls/wined3d/stateblock.c | 8 +++--- dlls/wined3d/wined3d_private.h | 8 ++--- include/wine/wined3d.idl | 15 ++-------- 14 files changed, 77 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d4fe0b7505b5d261db37…

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DVertexShader.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 49725ba58319f0d9ed5dee6301a64271758c2dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49725ba58319f0d9ed5dee630… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:47 2011 +0200 wined3d: Get rid of IWineD3DVertexShader. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/shader.c | 8 +---- dlls/d3d8/d3d8_private.h | 7 ++--- dlls/d3d8/device.c | 14 ++++++---- dlls/d3d8/shader.c | 12 ++++---- dlls/d3d8/vertexdeclaration.c | 5 ++- dlls/d3d9/d3d9_private.h | 10 ++----- dlls/d3d9/device.c | 8 +++--- dlls/d3d9/shader.c | 8 +++--- dlls/wined3d/device.c | 50 +++++++++++++++++++++--------------- dlls/wined3d/shader.c | 17 ++++++------ dlls/wined3d/stateblock.c | 8 +++--- dlls/wined3d/wined3d_private.h | 8 ++--- include/wine/wined3d.idl | 15 ++-------- 14 files changed, 81 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49725ba58319f0d9ed5de…

1 0

Henri Verbeet : Revert "wined3d: Prevent crash when blit_priv is NULL.".
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: c9ba0949c2ee0224696bc00575a7d42d33fc355f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ba0949c2ee0224696bc0057… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:46 2011 +0200 Revert "wined3d: Prevent crash when blit_priv is NULL.". This reverts commit 37aadc9e377d7840a607dbabff10de375f9fdde8. This patch was superseded by b2132202c77b0d56b68d2a0f4c0c1f6d637ab577. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0f20c1f..f76cdde 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3924,8 +3924,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT } /* Special cases for RenderTargets */ - if (This->resource.device->blit_priv && ((This->resource.usage & WINED3DUSAGE_RENDERTARGET) - || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET)))) + if ((This->resource.usage & WINED3DUSAGE_RENDERTARGET) + || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET))) { if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(This, DestRect, src, SrcRect, flags, DDBltFx, Filter))) return WINED3D_OK;

1 0

Vincent Povirk : winejack.drv: Fix build.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 0adc1b60d872b5f06cf4a33bb9bfe1a783518a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adc1b60d872b5f06cf4a33bb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 29 12:43:06 2011 -0500 winejack.drv: Fix build. --- dlls/winejack.drv/audio.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index ac8a0c0..5d339ee 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -34,6 +34,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdlib.h> #include <stdarg.h> @@ -47,6 +48,7 @@ #include "winbase.h" #include "winnls.h" #include "wingdi.h" +#include "winuser.h" #include "winerror.h" #include "mmddk.h" #include "dsound.h"

1 0

Rico Schüller : d3dx9/tests: Add ID3DXEffectCompiler test.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 9ea9a053b9d28cff9ae3aa1d2c684192d1df2e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea9a053b9d28cff9ae3aa1d2… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:13:02 2011 +0200 d3dx9/tests: Add ID3DXEffectCompiler test. --- dlls/d3dx9_36/tests/effect.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 6f4b674..483efd4 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -117,6 +117,60 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ok(count == 0, "Release failed %u\n", count); } +static void test_create_effect_compiler(void) +{ + HRESULT hr; + ID3DXEffectCompiler *compiler, *compiler2; + ID3DXBaseEffect *base; + IUnknown *unknown; + ULONG count; + + hr = D3DXCreateEffectCompiler(NULL, 0, NULL, NULL, 0, &compiler, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectCompiler(NULL, 0, NULL, NULL, 0, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectCompiler(effect_desc, 0, NULL, NULL, 0, &compiler, NULL); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + count = compiler->lpVtbl->Release(compiler); + ok(count == 0, "Release failed %u\n", count); + + hr = D3DXCreateEffectCompiler(effect_desc, 0, NULL, NULL, 0, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectCompiler(NULL, sizeof(effect_desc), NULL, NULL, 0, &compiler, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectCompiler(NULL, sizeof(effect_desc), NULL, NULL, 0, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectCompiler(effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectCompiler(effect_desc, sizeof(effect_desc), NULL, NULL, 0, &compiler, NULL); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + hr = compiler->lpVtbl->QueryInterface(compiler, &IID_ID3DXBaseEffect, (void **)&base); + ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x (E_NOINTERFACE)\n", hr, E_NOINTERFACE); + + hr = compiler->lpVtbl->QueryInterface(compiler, &IID_ID3DXEffectCompiler, (void **)&compiler2); + ok(hr == D3D_OK, "QueryInterface failed, got %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + hr = compiler->lpVtbl->QueryInterface(compiler, &IID_IUnknown, (void **)&unknown); + ok(hr == D3D_OK, "QueryInterface failed, got %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + count = unknown->lpVtbl->Release(unknown); + ok(count == 2, "Release failed, got %u, expected %u\n", count, 2); + + count = compiler2->lpVtbl->Release(compiler2); + ok(count == 1, "Release failed, got %u, expected %u\n", count, 1); + + count = compiler->lpVtbl->Release(compiler); + ok(count == 0, "Release failed %u\n", count); +} + START_TEST(effect) { HWND wnd; @@ -150,6 +204,7 @@ START_TEST(effect) } test_create_effect_and_pool(device); + test_create_effect_compiler(); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Rico Schüller : d3dx9/tests: Add ID3DXEffect::GetPool( ) and ID3DXEffect::GetDevice() tests.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: f1bfecd616522757bce575bbbfe2b22f61bbc05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1bfecd616522757bce575bbb… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:13:00 2011 +0200 d3dx9/tests: Add ID3DXEffect::GetPool() and ID3DXEffect::GetDevice() tests. --- dlls/d3dx9_36/tests/effect.c | 53 +++++++++++++++++++++++++++++++---------- 1 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 2c9034f..6f4b674 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -26,11 +26,14 @@ static const char effect_desc[] = "{\n" "}\n"; -static void test_create_effect(IDirect3DDevice9 *device) +static void test_create_effect_and_pool(IDirect3DDevice9 *device) { HRESULT hr; ID3DXEffect *effect; + ID3DXBaseEffect *base; ULONG count; + IDirect3DDevice9 *device2; + ID3DXEffectPool *pool = (ID3DXEffectPool *)0xdeadbeef, *pool2; hr = D3DXCreateEffect(NULL, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -47,16 +50,27 @@ static void test_create_effect(IDirect3DDevice9 *device) hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, &effect, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3DXBaseEffect, (void **)&base); + ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x (E_NOINTERFACE)\n", hr, E_NOINTERFACE); + + hr = effect->lpVtbl->GetPool(effect, &pool); + ok(hr == D3D_OK, "GetPool failed, got %x, expected 0 (D3D_OK)\n", hr); + ok(!pool, "GetPool failed, got %p\n", pool); + + hr = effect->lpVtbl->GetPool(effect, NULL); + ok(hr == D3DERR_INVALIDCALL, "GetPool failed, got %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->GetDevice(effect, &device2); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + hr = effect->lpVtbl->GetDevice(effect, NULL); + ok(hr == D3DERR_INVALIDCALL, "GetDevice failed, got %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + count = IDirect3DDevice9_Release(device2); + ok(count == 2, "Release failed, got %u, expected 2\n", count); + count = effect->lpVtbl->Release(effect); ok(count == 0, "Release failed %u\n", count); -} - -static void test_create_effect_pool(IDirect3DDevice9 *device) -{ - HRESULT hr; - ID3DXEffectPool *pool, *pool2; - ULONG count; - IDirect3DDevice9 *device2; hr = D3DXCreateEffectPool(NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -75,16 +89,30 @@ static void test_create_effect_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); count = pool2->lpVtbl->Release(pool2); ok(count == 1, "Release failed, got %u, expected 1\n", count); - hr = device->lpVtbl->QueryInterface(device, &IID_IDirect3DDevice9, (void **)&device2); + hr = IDirect3DDevice9_QueryInterface(device, &IID_IDirect3DDevice9, (void **)&device2); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - count = device2->lpVtbl->Release(device2); + count = IDirect3DDevice9_Release(device2); ok(count == 1, "Release failed, got %u, expected 1\n", count); + hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, pool, &effect, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + 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); + + count = pool2->lpVtbl->Release(pool2); + ok(count == 2, "Release failed, got %u, expected 2\n", count); + + count = effect->lpVtbl->Release(effect); + ok(count == 0, "Release failed %u\n", count); + count = pool->lpVtbl->Release(pool); ok(count == 0, "Release failed %u\n", count); } @@ -121,8 +149,7 @@ START_TEST(effect) return; } - test_create_effect(device); - test_create_effect_pool(device); + test_create_effect_and_pool(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Rico Schüller : d3dx9: ID3DXEffect::QueryInterface() does not support IID_ID3DXBaseEffect.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: dccbfe32ad289f38d53afea0ad5857a6895d0199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dccbfe32ad289f38d53afea0a… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:57 2011 +0200 d3dx9: ID3DXEffect::QueryInterface() does not support IID_ID3DXBaseEffect. --- dlls/d3dx9_36/effect.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c90e492..d06c9ac 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -723,7 +723,6 @@ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_ID3DXBaseEffect) || IsEqualGUID(riid, &IID_ID3DXEffect)) { This->ID3DXEffect_iface.lpVtbl->AddRef(iface);

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect:: GetDevice().
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: adbfae9b2abb3e5840179ac633b2904f429615e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adbfae9b2abb3e5840179ac63… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:54 2011 +0200 d3dx9: Implement ID3DXEffect::GetDevice(). --- dlls/d3dx9_36/effect.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 795b426..c90e492 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1417,13 +1417,25 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect* iface) return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect* iface, LPDIRECT3DDEVICE9* device) +static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect *iface, LPDIRECT3DDEVICE9 *device) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(%p): stub\n", This, device); + TRACE("iface %p, device %p\n", This, device); - return E_NOTIMPL; + if (!device) + { + WARN("Invalid argument supplied.\n"); + return D3DERR_INVALIDCALL; + } + + IDirect3DDevice9_AddRef(This->device); + + *device = This->device; + + TRACE("Returning device %p\n", *device); + + return S_OK; } static HRESULT WINAPI ID3DXEffectImpl_OnLostDevice(ID3DXEffect* iface)

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect::GetPool( ).
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 96192306a09feed279b6741ab6c490ee33844290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96192306a09feed279b6741ab… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:52 2011 +0200 d3dx9: Implement ID3DXEffect::GetPool(). --- dlls/d3dx9_36/effect.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 00a35cd..795b426 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1303,13 +1303,28 @@ static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHAND } /*** ID3DXEffect methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect* iface, LPD3DXEFFECTPOOL* pool) +static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, LPD3DXEFFECTPOOL *pool) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(%p): stub\n", This, pool); + TRACE("iface %p, pool %p\n", This, pool); - return E_NOTIMPL; + if (!pool) + { + WARN("Invalid argument supplied.\n"); + return D3DERR_INVALIDCALL; + } + + if (This->pool) + { + This->pool->lpVtbl->AddRef(This->pool); + } + + *pool = This->pool; + + TRACE("Returning pool %p\n", *pool); + + return S_OK; } static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect* iface, D3DXHANDLE technique)

1 0

Rico Schüller : d3dx9: Fix some style issues.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 27209e60973586635c46f9dac2b95f5db0dc3d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27209e60973586635c46f9dac… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:49 2011 +0200 d3dx9: Fix some style issues. --- dlls/d3dx9_36/effect.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3c3a082..00a35cd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2535,20 +2535,21 @@ HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl; -typedef struct ID3DXEffectPoolImpl { +struct ID3DXEffectPoolImpl +{ ID3DXEffectPool ID3DXEffectPool_iface; LONG ref; -} ID3DXEffectPoolImpl; +}; -static inline ID3DXEffectPoolImpl *impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) +static inline struct ID3DXEffectPoolImpl *impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) { - return CONTAINING_RECORD(iface, ID3DXEffectPoolImpl, ID3DXEffectPool_iface); + return CONTAINING_RECORD(iface, struct ID3DXEffectPoolImpl, ID3DXEffectPool_iface); } /*** IUnknown methods ***/ -static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool* iface, REFIID riid, void** object) +static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool *iface, REFIID riid, void **object) { - ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); + struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); @@ -2565,18 +2566,18 @@ static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool* iface, return E_NOINTERFACE; } -static ULONG WINAPI ID3DXEffectPoolImpl_AddRef(ID3DXEffectPool* iface) +static ULONG WINAPI ID3DXEffectPoolImpl_AddRef(ID3DXEffectPool *iface) { - ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); + struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); TRACE("(%p)->(): AddRef from %u\n", This, This->ref); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI ID3DXEffectPoolImpl_Release(ID3DXEffectPool* iface) +static ULONG WINAPI ID3DXEffectPoolImpl_Release(ID3DXEffectPool *iface) { - ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); + struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(): Release from %u\n", This, ref + 1); @@ -2595,9 +2596,9 @@ static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl = ID3DXEffectPoolImpl_Release }; -HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool) +HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL *pool) { - ID3DXEffectPoolImpl* object; + struct ID3DXEffectPoolImpl *object; TRACE("(%p)\n", pool);

1 0

Rico Schüller : d3dx9: Add ID3DXEffectCompiler interface.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 2f3e9673a19cd01a0a5893e48f3ef8cff06d86e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3e9673a19cd01a0a5893e48… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:45 2011 +0200 d3dx9: Add ID3DXEffectCompiler interface. --- dlls/d3dx9_36/effect.c | 1040 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 912 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f3e9673a19cd01a0a589…

1 0

Rico Schüller : d3dx9: Forward ID3DXEffect to ID3DXBaseEffect.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 0dff8dd3ce3fd96554d6c527f79ce7c1b3adfc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dff8dd3ce3fd96554d6c527f… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:41 2011 +0200 d3dx9: Forward ID3DXEffect to ID3DXBaseEffect. --- dlls/d3dx9_36/effect.c | 554 ++++++++++++++++++++++++++---------------------- 1 files changed, 304 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dff8dd3ce3fd96554d6c…

1 0

Rico Schüller : d3dx9: Add ID3DXBaseEffect interface.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: aaa06cfba4e357343508d2776416275e60f77acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa06cfba4e357343508d2776… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:38 2011 +0200 d3dx9: Add ID3DXBaseEffect interface. --- dlls/d3dx9_36/effect.c | 689 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 669 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaa06cfba4e357343508d…

1 0

Rico Schüller : include: Fix ID3DXEffectCompiler interface.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 2b877d758686f6e172c54e2535ecefd6c5b86e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b877d758686f6e172c54e253… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:35 2011 +0200 include: Fix ID3DXEffectCompiler interface. --- include/d3dx9effect.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 235b8e7..d014559 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -337,9 +337,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) STDMETHOD(GetString)(THIS_ D3DXHANDLE parameter, LPCSTR* string) PURE; STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; - STDMETHOD(SetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9 pshader) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9* pshader) PURE; - STDMETHOD(SetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 vshader) PURE; STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; /*** ID3DXEffectCompiler methods ***/

1 0

Rico Schüller : d3dx9/tests: Add refcount test for the device.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 68f11dabd7740624d666bbcf4bfd4c47993c85a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f11dabd7740624d666bbcf4… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:31 2011 +0200 d3dx9/tests: Add refcount test for the device. --- dlls/d3dx9_36/tests/effect.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index f4e0f9a..2c9034f 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -92,10 +92,11 @@ static void test_create_effect_pool(IDirect3DDevice9 *device) START_TEST(effect) { HWND wnd; - IDirect3D9* d3d; - IDirect3DDevice9* device; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; + ULONG count; wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -123,7 +124,11 @@ START_TEST(effect) test_create_effect(device); test_create_effect_pool(device); - IDirect3DDevice9_Release(device); - IDirect3D9_Release(d3d); + count = IDirect3DDevice9_Release(device); + ok(count == 0, "The device was not properly freed: refcount %u\n", count); + + count = IDirect3D9_Release(d3d); + ok(count == 0, "Release failed %u\n", count); + DestroyWindow(wnd); }

1 0

Rico Schüller : d3dx9: Handle pool and device in ID3DXEffect.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: eb1faf6155eda67028637ed6b252c46d38d803fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb1faf6155eda67028637ed6b… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:28 2011 +0200 d3dx9: Handle pool and device in ID3DXEffect. --- dlls/d3dx9_36/effect.c | 39 ++++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/effect.c | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 71 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 15683df..fec95be 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -32,6 +32,9 @@ typedef struct ID3DXEffectImpl { ID3DXEffect ID3DXEffect_iface; LONG ref; + LPDIRECT3DDEVICE9 device; + LPD3DXEFFECTPOOL pool; + UINT parameter_count; UINT technique_count; } ID3DXEffectImpl; @@ -55,6 +58,18 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) } } +static void free_effect(struct ID3DXEffectImpl *effect) +{ + TRACE("Free effect %p\n", effect); + + if (effect->pool) + { + effect->pool->lpVtbl->Release(effect->pool); + } + + IDirect3DDevice9_Release(effect->device); +} + static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) { return (0xfeff0000 | ((major) << 8) | (minor)); @@ -103,7 +118,10 @@ static ULONG WINAPI ID3DXEffectImpl_Release(ID3DXEffect* iface) TRACE("(%p)->(): Release from %u\n", This, ref + 1); if (!ref) + { + free_effect(This); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -899,15 +917,24 @@ static HRESULT d3dx9_parse_effect(ID3DXEffectImpl *effect, const char *data, UIN return S_OK; } -static HRESULT d3dx9_effect_init(ID3DXEffectImpl *effect, const char *data, SIZE_T data_size) +static HRESULT d3dx9_effect_init(ID3DXEffectImpl *effect, LPDIRECT3DDEVICE9 device, + const char *data, SIZE_T data_size, LPD3DXEFFECTPOOL pool) { DWORD tag, offset; const char *ptr = data; HRESULT hr; + TRACE("effect %p, device %p, data %p, data_size %lu, pool %p\n", effect, device, data, data_size, pool); + effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; + if (pool) pool->lpVtbl->AddRef(pool); + effect->pool = pool; + + IDirect3DDevice9_AddRef(device); + effect->device = device; + read_dword(&ptr, &tag); TRACE("Tag: %x\n", tag); @@ -928,11 +955,17 @@ static HRESULT d3dx9_effect_init(ID3DXEffectImpl *effect, const char *data, SIZE if (hr != S_OK) { FIXME("Failed to parse effect.\n"); - return hr; + goto err_out; } } return S_OK; + +err_out: + + free_effect(effect); + + return hr; } HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, @@ -969,7 +1002,7 @@ HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, return E_OUTOFMEMORY; } - hr = d3dx9_effect_init(object, srcdata, srcdatalen); + hr = d3dx9_effect_init(object, device, srcdata, srcdatalen, pool); if (FAILED(hr)) { WARN("Failed to initialize shader reflection\n"); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8b23536..f4e0f9a 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS +#include "initguid.h" #include "wine/test.h" #include "d3dx9.h" @@ -24,10 +26,11 @@ static const char effect_desc[] = "{\n" "}\n"; -static void test_create_effect(IDirect3DDevice9* device) +static void test_create_effect(IDirect3DDevice9 *device) { HRESULT hr; - ID3DXEffect* effect; + ID3DXEffect *effect; + ULONG count; hr = D3DXCreateEffect(NULL, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -44,13 +47,16 @@ static void test_create_effect(IDirect3DDevice9* device) hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, &effect, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - effect->lpVtbl->Release(effect); + count = effect->lpVtbl->Release(effect); + ok(count == 0, "Release failed %u\n", count); } -static void test_create_effect_pool(void) +static void test_create_effect_pool(IDirect3DDevice9 *device) { HRESULT hr; - ID3DXEffectPool* pool; + ID3DXEffectPool *pool, *pool2; + ULONG count; + IDirect3DDevice9 *device2; hr = D3DXCreateEffectPool(NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -58,7 +64,29 @@ static void test_create_effect_pool(void) hr = D3DXCreateEffectPool(&pool); ok(hr == S_OK, "Got result %x, expected 0 (S_OK)\n", hr); - pool->lpVtbl->Release(pool); + count = pool->lpVtbl->Release(pool); + ok(count == 0, "Release failed %u\n", count); + + hr = D3DXCreateEffectPool(&pool); + ok(hr == S_OK, "Got result %x, expected 0 (S_OK)\n", hr); + + hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, pool, NULL, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3DXEffectPool, (void **)&pool2); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + count = pool2->lpVtbl->Release(pool2); + ok(count == 1, "Release failed, got %u, expected 1\n", count); + + hr = device->lpVtbl->QueryInterface(device, &IID_IDirect3DDevice9, (void **)&device2); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + count = device2->lpVtbl->Release(device2); + ok(count == 1, "Release failed, got %u, expected 1\n", count); + + count = pool->lpVtbl->Release(pool); + ok(count == 0, "Release failed %u\n", count); } START_TEST(effect) @@ -93,7 +121,7 @@ START_TEST(effect) } test_create_effect(device); - test_create_effect_pool(); + test_create_effect_pool(device); IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d);

1 0

Rico Schüller : d3dx9: Use size of variable instead of type.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: bb88fada4bd859eb5dbe67dbbc0659b50a95be05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb88fada4bd859eb5dbe67dbb… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:25 2011 +0200 d3dx9: Use size of variable instead of type. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index efb5da3..15683df 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1137,7 +1137,7 @@ HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, LPCSTR srcf return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); - srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(*srcfileW)); MultiByteToWideChar(CP_ACP, 0, srcfile, -1, srcfileW, len); ret = D3DXCreateEffectFromFileExW(device, srcfileW, defines, include, skipconstants, flags, pool, effect, compilationerrors); @@ -1274,7 +1274,7 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, const D3DXMACRO return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); - srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(*srcfileW)); MultiByteToWideChar(CP_ACP, 0, srcfile, -1, srcfileW, len); ret = D3DXCreateEffectCompilerFromFileW(srcfileW, defines, include, flags, effectcompiler, parseerrors);

1 0

Rico Schüller : d3dx9: Fix HeapAlloc size in D3DXCreateEffectPool.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: be43a5c41470880cb2d44a2e9c7e5b958608fc78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be43a5c41470880cb2d44a2e9… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:22 2011 +0200 d3dx9: Fix HeapAlloc size in D3DXCreateEffectPool. --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2697782..efb5da3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1084,7 +1084,7 @@ HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool) if (!pool) return D3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXEffectImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { ERR("Out of memory\n");

1 0

Rico Schüller : include: Add missing D3DXCreateEffect* declarations in d3dx9effect.h.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 1c30783c927ee9cb9a3b9e53df5a001c1b86ebd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c30783c927ee9cb9a3b9e53d… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:13 2011 +0200 include: Add missing D3DXCreateEffect* declarations in d3dx9effect.h. --- include/d3dx9effect.h | 112 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 1 deletions(-) diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 67d28b2..235b8e7 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -347,7 +347,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) STDMETHOD(GetLiteral)(THIS_ D3DXHANDLE parameter, BOOL* literal) PURE; STDMETHOD(CompileEffect)(THIS_ DWORD flags, LPD3DXBUFFER* effect, LPD3DXBUFFER* error_msgs) PURE; STDMETHOD(CompileShader)(THIS_ D3DXHANDLE function, LPCSTR target, DWORD flags, LPD3DXBUFFER* shader, - LPD3DXBUFFER* error_msgs, LPD3DXCONSTANTTABLE* constant_table) PURE; + LPD3DXBUFFER* error_msgs, LPD3DXCONSTANTTABLE* constant_table) PURE; }; #undef INTERFACE @@ -386,6 +386,116 @@ HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, LPD3DXEFFECTCOMPILER* compiler, LPD3DXBUFFER* parse_errors); +HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, + LPCSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + LPCSTR skipconstants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +HRESULT WINAPI D3DXCreateEffectFromFileExW(LPDIRECT3DDEVICE9 device, + LPCWSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + LPCSTR skipconstants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +#define D3DXCreateEffectFromFileEx WINELIB_NAME_AW(D3DXCreateEffectFromFileEx) + +HRESULT WINAPI D3DXCreateEffectFromFileA(LPDIRECT3DDEVICE9 device, + LPCSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +HRESULT WINAPI D3DXCreateEffectFromFileW(LPDIRECT3DDEVICE9 device, + LPCWSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +#define D3DXCreateEffectFromFile WINELIB_NAME_AW(D3DXCreateEffectFromFile) + +HRESULT WINAPI D3DXCreateEffectFromResourceExA(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + LPCSTR skipconstants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +HRESULT WINAPI D3DXCreateEffectFromResourceExW(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCWSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + LPCSTR skipconstants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +#define D3DXCreateEffectFromResourceEx WINELIB_NAME_AW(D3DXCreateEffectFromResourceEx) + +HRESULT WINAPI D3DXCreateEffectFromResourceA(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +HRESULT WINAPI D3DXCreateEffectFromResourceW(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCWSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +#define D3DXCreateEffectFromResource WINELIB_NAME_AW(D3DXCreateEffectFromResource) + +HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER *effectcompiler, + LPD3DXBUFFER *parseerrors); +HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER *effectcompiler, + LPD3DXBUFFER *parseerrors); +#define D3DXCreateEffectCompilerFromFile WINELIB_NAME_AW(D3DXCreateEffectCompilerFromFile) + +HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, + LPCSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER *effectcompiler, + LPD3DXBUFFER *parseerrors); +HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, + LPCWSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER *effectcompiler, + LPD3DXBUFFER *parseerrors); +#define D3DXCreateEffectCompilerFromResource WINELIB_NAME_AW(D3DXCreateEffectCompilerFromResource) + #ifdef __cplusplus } #endif

1 0

Hans Leidekker : wldap32: Accept a NULL value in ldap_set_option.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 95a5e9eba1771d231142990352b60b438b5ac664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a5e9eba1771d23114299035… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 29 13:59:22 2011 +0200 wldap32: Accept a NULL value in ldap_set_option. --- dlls/wldap32/option.c | 4 ++-- dlls/wldap32/tests/parse.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 801d77d..95290ce 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -319,7 +319,7 @@ ULONG CDECL ldap_set_optionA( WLDAP32_LDAP *ld, int option, void *value ) TRACE( "(%p, 0x%08x, %p)\n", ld, option, value ); - if (!ld || !value) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld) return WLDAP32_LDAP_PARAM_ERROR; switch (option) { @@ -422,7 +422,7 @@ ULONG CDECL ldap_set_optionW( WLDAP32_LDAP *ld, int option, void *value ) TRACE( "(%p, 0x%08x, %p)\n", ld, option, value ); - if (!ld || !value) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld) return WLDAP32_LDAP_PARAM_ERROR; switch (option) { diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 98e6b80..4cf8564 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -105,6 +105,24 @@ static void test_ldap_search_extW( LDAP *ld ) ok( !ret, "ldap_search_extW failed 0x%08x\n", ret ); } +static void test_ldap_set_optionW( LDAP *ld ) +{ + ULONG ret, oldvalue; + + ret = ldap_get_optionW( ld, LDAP_OPT_REFERRALS, &oldvalue ); + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) + { + skip("test server can't be reached\n"); + return; + } + + ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF ); + ok( !ret || broken(ret == LDAP_PARAM_ERROR) /* nt4, win2k */, "ldap_set_optionW failed 0x%08x\n", ret ); + + ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, (void *)&oldvalue ); + ok( !ret, "ldap_set_optionW failed 0x%08x\n", ret ); +} + START_TEST (parse) { LDAP *ld; @@ -114,5 +132,6 @@ START_TEST (parse) test_ldap_parse_sort_control( ld ); test_ldap_search_extW( ld ); + test_ldap_set_optionW( ld ); ldap_unbind( ld ); }

1 0

Hans Leidekker : kernel32: Implement and test GetVolumePathNamesForVolumeName.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 552715f0c15d9a75ca13baf0ca84ebc939a3c745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=552715f0c15d9a75ca13baf0c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 29 13:03:42 2011 +0200 kernel32: Implement and test GetVolumePathNamesForVolumeName. --- dlls/kernel32/tests/volume.c | 169 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/volume.c | 159 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 322 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=552715f0c15d9a75ca13b…

1 0

Hans Leidekker : ws2_32: Implement GetNameInfoW.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 8f07cdf975914fb7ddf7ec15e23f1f842db441f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f07cdf975914fb7ddf7ec15e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 29 13:03:24 2011 +0200 ws2_32: Implement GetNameInfoW. --- dlls/ws2_32/socket.c | 25 +++++++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9469d30..d72ed80 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5104,6 +5104,31 @@ int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, #endif } +int WINAPI GetNameInfoW(const SOCKADDR *sa, WS_socklen_t salen, PWCHAR host, + DWORD hostlen, PWCHAR serv, DWORD servlen, INT flags) +{ + int ret; + char *hostA = NULL, *servA = NULL; + + if (host && (!(hostA = HeapAlloc(GetProcessHeap(), 0, hostlen)))) return EAI_MEMORY; + if (serv && (!(servA = HeapAlloc(GetProcessHeap(), 0, servlen)))) + { + HeapFree(GetProcessHeap(), 0, hostA); + return EAI_MEMORY; + } + + ret = WS_getnameinfo(sa, salen, hostA, hostlen, servA, servlen, flags); + if (!ret) + { + if (host) MultiByteToWideChar(CP_ACP, 0, hostA, -1, host, hostlen); + if (serv) MultiByteToWideChar(CP_ACP, 0, servA, -1, serv, servlen); + } + + HeapFree(GetProcessHeap(), 0, hostA); + HeapFree(GetProcessHeap(), 0, servA); + return ret; +} + /*********************************************************************** * getservbyport (WS2_32.56) */ diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 537e7f3..ccec106 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -52,6 +52,7 @@ @ stdcall FreeAddrInfoW(ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) +@ stdcall GetNameInfoW(ptr long ptr long ptr long long) @ stdcall WSApSetPostRoutine(ptr) @ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr) @ stdcall WSAAccept(long ptr ptr ptr long)

1 0

Jacek Caban : mshtml: Fixed node leak in HTMLEventObj.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 86aecc8488e818cb09c0817cbfa9c40845938fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86aecc8488e818cb09c0817cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 13:37:42 2011 +0200 mshtml: Fixed node leak in HTMLEventObj. --- dlls/mshtml/htmlevent.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 8dbf554..d0e8814 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -289,6 +289,8 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->target) + IHTMLDOMNode_Release(&This->target->IHTMLDOMNode_iface); if(This->nsevent) nsIDOMEvent_Release(This->nsevent); release_dispex(&This->dispex);

1 0

Jacek Caban : mshtml: Fixed ref count handling in events.c.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 1d61146cb6fc722157b9d3a20c2923fd7a04609b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d61146cb6fc722157b9d3a20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 13:37:01 2011 +0200 mshtml: Fixed ref count handling in events.c. --- dlls/mshtml/tests/events.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 6ed9f97..32f943f 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1037,7 +1037,6 @@ static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, L str = NULL; hres = IHTMLFrameBase2_get_readyState(iframe, &str); - IHTMLFrameBase2_Release(iframe); ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(str != NULL, "readyState == NULL\n"); ok(!lstrcmpW(str, V_BSTR(&v)), "ready states differ\n");

1 0

Jacek Caban : mshtml: Event handler may be already free in release_event_target.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: a96606e6adcb43ce6953b7161419013f3783168a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96606e6adcb43ce6953b7161… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 13:36:46 2011 +0200 mshtml: Event handler may be already free in release_event_target. --- dlls/mshtml/htmlevent.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d1430cd..8dbf554 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1343,7 +1343,8 @@ void release_event_target(event_target_t *event_target) if(event_target->event_table[i]->handler_prop) IDispatch_Release(event_target->event_table[i]->handler_prop); for(j=0; j < event_target->event_table[i]->handler_cnt; j++) - IDispatch_Release(event_target->event_table[i]->handlers[j]); + if(event_target->event_table[i]->handlers[j]) + IDispatch_Release(event_target->event_table[i]->handlers[j]); } }

1 0

Jacek Caban : mshtml: Use zone mapping instead of hardcoded protocols in use_gecko_script.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 3e422b9ed828122524214b9f3ce20f35431242dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e422b9ed828122524214b9f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 12:51:21 2011 +0200 mshtml: Use zone mapping instead of hardcoded protocols in use_gecko_script. --- dlls/mshtml/persist.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 43d7e3c..6915e3d 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -48,15 +48,22 @@ typedef struct { LPOLESTR url; } download_proc_task_t; -static BOOL use_gecko_script(LPCWSTR url) +static BOOL use_gecko_script(HTMLWindow *window) { - static const WCHAR fileW[] = {'f','i','l','e',':'}; + DWORD zone; + HRESULT hres; + static const WCHAR aboutW[] = {'a','b','o','u','t',':'}; - static const WCHAR resW[] = {'r','e','s',':'}; - return strncmpiW(fileW, url, sizeof(fileW)/sizeof(WCHAR)) - && strncmpiW(aboutW, url, sizeof(aboutW)/sizeof(WCHAR)) - && strncmpiW(resW, url, sizeof(resW)/sizeof(WCHAR)); + hres = IInternetSecurityManager_MapUrlToZone(window->secmgr, window->url, &zone, 0); + if(FAILED(hres)) { + WARN("Could not map %s to zone: %08x\n", debugstr_w(window->url), hres); + return TRUE; + } + + TRACE("zone %d\n", zone); + return zone != URLZONE_LOCAL_MACHINE && zone != URLZONE_TRUSTED + && strncmpiW(aboutW, window->url, sizeof(aboutW)/sizeof(WCHAR)); } void set_current_mon(HTMLWindow *This, IMoniker *mon) @@ -83,7 +90,7 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) if(FAILED(hres)) WARN("GetDisplayName failed: %08x\n", hres); - set_script_mode(This, use_gecko_script(This->url) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); + set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); } static void set_progress_proc(task_t *_task)

1 0

Jacek Caban : mshtml: Store security manager in HTMLWindow instead of HTMLDocumentNode.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 739ff1208e63ef46dcb11ec0205fc76fc80f5eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739ff1208e63ef46dcb11ec02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 12:51:04 2011 +0200 mshtml: Store security manager in HTMLWindow instead of HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 9 --------- dlls/mshtml/htmlwindow.c | 10 ++++++++++ dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/secmgr.c | 6 +++--- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f9bc469..f7a70ca 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1912,8 +1912,6 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) release_nsevents(This); if(This->catmgr) ICatInformation_Release(This->catmgr); - if(This->secmgr) - IInternetSecurityManager_Release(This->secmgr); detach_selection(This); detach_ranges(This); @@ -2013,7 +2011,6 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLWindow *wi HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLWindow *window, HTMLDocumentNode **ret) { HTMLDocumentNode *doc; - HRESULT hres; doc = alloc_doc_node(doc_obj, window); if(!doc) @@ -2030,12 +2027,6 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob doc->node.vtbl = &HTMLDocumentNodeImplVtbl; doc->node.cp_container = &doc->basedoc.cp_container; - hres = CoInternetCreateSecurityManager(NULL, &doc->secmgr, 0); - if(FAILED(hres)) { - htmldoc_release(&doc->basedoc); - return hres; - } - *ret = doc; return S_OK; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 695b829..e0d542b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -236,6 +236,9 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) window_set_docnode(This, NULL); release_children(This); + if(This->secmgr) + IInternetSecurityManager_Release(This->secmgr); + if(This->frame_element) This->frame_element->content_window = NULL; @@ -2217,6 +2220,7 @@ static dispex_static_data_t HTMLWindow_dispex = { HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTMLWindow *parent, HTMLWindow **ret) { HTMLWindow *window; + HRESULT hres; window = heap_alloc_zero(sizeof(HTMLWindow)); if(!window) @@ -2251,6 +2255,12 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->readystate = READYSTATE_UNINITIALIZED; list_init(&window->script_hosts); + hres = CoInternetCreateSecurityManager(NULL, &window->secmgr, 0); + if(FAILED(hres)) { + IHTMLWindow2_Release(&window->IHTMLWindow2_iface); + return hres; + } + window->task_magic = get_task_target_magic(); update_window_doc(window); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 83a76b9..a449b18 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -295,6 +295,8 @@ struct HTMLWindow { SCRIPTMODE scriptmode; struct list script_hosts; + IInternetSecurityManager *secmgr; + HTMLOptionElementFactory *option_factory; HTMLImageElementFactory *image_factory; HTMLLocation *location; @@ -611,7 +613,6 @@ struct HTMLDocumentNode { BOOL content_ready; event_target_t *body_event_target; - IInternetSecurityManager *secmgr; ICatInformation *catmgr; nsDocumentEventListener *nsevent_listener; BOOL *event_vector; diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index 8225d59..3d21475 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -83,7 +83,7 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; - return IInternetSecurityManager_ProcessUrlAction(This->secmgr, url, dwAction, pPolicy, cbPolicy, + return IInternetSecurityManager_ProcessUrlAction(This->basedoc.window->secmgr, url, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); } @@ -121,7 +121,7 @@ static HRESULT confirm_safety(HTMLDocumentNode *This, const WCHAR *url, struct C /* FIXME: Check URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY */ - hres = IInternetSecurityManager_ProcessUrlAction(This->secmgr, url, URLACTION_SCRIPT_SAFE_ACTIVEX, + hres = IInternetSecurityManager_ProcessUrlAction(This->basedoc.window->secmgr, url, URLACTION_SCRIPT_SAFE_ACTIVEX, (BYTE*)&policy, sizeof(policy), NULL, 0, 0, 0); if(FAILED(hres) || policy != URLPOLICY_ALLOW) { *ret = URLPOLICY_DISALLOW; @@ -187,7 +187,7 @@ static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHos url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; - hres = IInternetSecurityManager_QueryCustomPolicy(This->secmgr, url, guidKey, ppPolicy, pcbPolicy, + hres = IInternetSecurityManager_QueryCustomPolicy(This->basedoc.window->secmgr, url, guidKey, ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); if(hres != HRESULT_FROM_WIN32(ERROR_NOT_FOUND)) return hres;

1 0

Jacek Caban : mshtml: Try loading library in IInternetProtocolInfo:: ParseUrl(PARSE_INTERNET_URL) for res protocol to work around library name difference for winelib libraries .
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 643c66ba752a6274178cd9c574896395cf063f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=643c66ba752a6274178cd9c57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 12:50:52 2011 +0200 mshtml: Try loading library in IInternetProtocolInfo::ParseUrl(PARSE_INTERNET_URL) for res protocol to work around library name difference for winelib libraries. --- dlls/mshtml/protocol.c | 16 ++++++++++++++-- dlls/mshtml/tests/protocol.c | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index dad93ba..456c3fd 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -865,8 +865,20 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC len = SearchPathW(NULL, file_part, NULL, sizeof(full_path)/sizeof(WCHAR), full_path, NULL); if(!len) { - WARN("Could not find file %s\n", debugstr_w(file_part)); - return MK_E_SYNTAX; + HMODULE module; + + /* SearchPath does not work well with winelib files (like our test executable), + * so we also try to load the library here */ + module = LoadLibraryExW(file_part, NULL, LOAD_LIBRARY_AS_DATAFILE); + if(!module) { + WARN("Could not find file %s\n", debugstr_w(file_part)); + return MK_E_SYNTAX; + } + + len = GetModuleFileNameW(module, full_path, sizeof(full_path)/sizeof(WCHAR)); + FreeLibrary(module); + if(!len) + return E_FAIL; } size = sizeof(wszFile)/sizeof(WCHAR) + len + 1; diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 7504927..07f424f 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -315,6 +315,8 @@ static void test_res_protocol(void) {'r','e','s',':','/','/','x','x','.','d','l','l','/','b','l','a','n','k','.','h','t','m',0}; static const WCHAR wrong_url5[] = {'r','e','s',':','/','/','s','h','t','m','l','.','d','l','l','/','b','l','a','n','k','.','h','t','m',0}; + static const WCHAR wrong_url6[] = + {'r','e','s',':','/','/','c',':','\\','d','i','r','\\','f','i','l','e','.','d','l','l','/','b','l','a','n','k','.','h','t','m',0}; static const WCHAR mshtml_dllW[] = {'m','s','h','t','m','l','.','d','l','l',0}; hres = CoGetClassObject(&CLSID_ResProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); @@ -366,6 +368,10 @@ static void test_res_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); + hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url6, PARSE_SECURITY_URL, 0, buf, + sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); + size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf,

1 0

Dmitry Timoshkov : user32: Add the SW_SHOWDEFAULT case to WINPOS_MinMaximize().
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 5fea02e8c2c83003f9b5278b8ba0dd48c9530449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fea02e8c2c83003f9b5278b8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 29 15:00:39 2011 +0900 user32: Add the SW_SHOWDEFAULT case to WINPOS_MinMaximize(). --- dlls/user32/winpos.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 03c16c9..a8324e8 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -955,6 +955,7 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) /* fall through */ case SW_SHOWNORMAL: case SW_RESTORE: + case SW_SHOWDEFAULT: /* FIXME: should have its own handler */ old_style = WIN_SetStyle( hwnd, 0, WS_MINIMIZE | WS_MAXIMIZE ); if (old_style & WS_MINIMIZE) {

1 0

Bart Van Assche : ntdll: Fix race condition in RtlCreateHeap().
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: c0913ed064f86d9cc2ddf6efc7f6f6a9db446934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0913ed064f86d9cc2ddf6efc… Author: Bart Van Assche <bvanassche(a)acm.org> Date: Mon Feb 28 11:39:57 2011 +0100 ntdll: Fix race condition in RtlCreateHeap(). --- dlls/ntdll/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index df94410..2e945e9 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1538,6 +1538,8 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c if (!(subheap = HEAP_CreateSubHeap( NULL, addr, flags, commitSize, totalSize ))) return 0; + heap_set_debug_flags( subheap->heap ); + /* link it into the per-process heap list */ if (processHeap) { @@ -1552,7 +1554,6 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c list_init( &processHeap->entry ); } - heap_set_debug_flags( subheap->heap ); return subheap->heap; }

1 0

Vincent Povirk : gdiplus: Add test for GdipSetTextRenderingHint and make it pass.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: b3dfe973adaf1a9cbe92f53838fa468c45d6d0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3dfe973adaf1a9cbe92f5383… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 28 17:38:38 2011 -0500 gdiplus: Add test for GdipSetTextRenderingHint and make it pass. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 49 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index eb74021..163aaac 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5023,7 +5023,7 @@ GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics *graphics, { TRACE("(%p, %d)\n", graphics, hint); - if(!graphics) + if(!graphics || hint > TextRenderingHintClearTypeGridFit) return InvalidParameter; if(graphics->busy) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index d42b37a..3adf6c6 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3113,6 +3113,54 @@ static void test_get_set_interpolation(void) ReleaseDC(hwnd, hdc); } +static void test_get_set_textrenderinghint(void) +{ + GpGraphics *graphics; + HDC hdc = GetDC( hwnd ); + GpStatus status; + TextRenderingHint hint; + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipGetTextRenderingHint(NULL, &hint); + expect(InvalidParameter, status); + + status = GdipGetTextRenderingHint(graphics, NULL); + expect(InvalidParameter, status); + + status = GdipSetTextRenderingHint(NULL, TextRenderingHintAntiAlias); + expect(InvalidParameter, status); + + /* out of range */ + status = GdipSetTextRenderingHint(graphics, TextRenderingHintClearTypeGridFit+1); + expect(InvalidParameter, status); + + status = GdipGetTextRenderingHint(graphics, &hint); + expect(Ok, status); + expect(TextRenderingHintSystemDefault, hint); + + status = GdipSetTextRenderingHint(graphics, TextRenderingHintSystemDefault); + expect(Ok, status); + + status = GdipGetTextRenderingHint(graphics, &hint); + expect(Ok, status); + expect(TextRenderingHintSystemDefault, hint); + + status = GdipSetTextRenderingHint(graphics, TextRenderingHintAntiAliasGridFit); + expect(Ok, status); + + status = GdipGetTextRenderingHint(graphics, &hint); + expect(Ok, status); + expect(TextRenderingHintAntiAliasGridFit, hint); + + GdipDeleteGraphics(graphics); + + ReleaseDC(hwnd, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3172,6 +3220,7 @@ START_TEST(graphics) test_fromMemoryBitmap(); test_string_functions(); test_get_set_interpolation(); + test_get_set_textrenderinghint(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Vincent Povirk : gdiplus: Add test for GdipDrawDriverString.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 204253b6babd179759a494d17fcb8af857ee5f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=204253b6babd179759a494d17… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 28 16:40:19 2011 -0500 gdiplus: Add test for GdipDrawDriverString. --- dlls/gdiplus/tests/graphics.c | 32 ++++++++++++++++++++++++++++++++ include/gdiplusenums.h | 9 +++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index bd14ab6..d42b37a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1954,6 +1954,8 @@ static void test_GdipDrawString(void) LOGFONTA logfont; HDC hdc = GetDC( hwnd ); static const WCHAR string[] = {'T','e','s','t',0}; + static const PointF positions[4] = {{0,0}, {1,1}, {2,2}, {3,3}}; + GpMatrix *matrix; memset(&logfont,0,sizeof(logfont)); strcpy(logfont.lfFaceName,"Arial"); @@ -1985,6 +1987,36 @@ static void test_GdipDrawString(void) status = GdipDrawString(graphics, string, 4, fnt, &rect, format, brush); expect(Ok, status); + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + +todo_wine { + status = GdipDrawDriverString(NULL, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, matrix); + expect(InvalidParameter, status); + + status = GdipDrawDriverString(graphics, NULL, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, matrix); + expect(InvalidParameter, status); + + status = GdipDrawDriverString(graphics, string, 4, NULL, brush, positions, DriverStringOptionsCmapLookup, matrix); + expect(InvalidParameter, status); + + status = GdipDrawDriverString(graphics, string, 4, fnt, NULL, positions, DriverStringOptionsCmapLookup, matrix); + expect(InvalidParameter, status); + + status = GdipDrawDriverString(graphics, string, 4, fnt, brush, NULL, DriverStringOptionsCmapLookup, matrix); + expect(InvalidParameter, status); + + status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup|0x10, matrix); + expect(Ok, status); + + status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, NULL); + expect(Ok, status); + + status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, matrix); + expect(Ok, status); +} + + GdipDeleteMatrix(matrix); GdipDeleteGraphics(graphics); GdipDeleteBrush(brush); GdipDeleteFont(fnt); diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index dc03b29..69c8154 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -42,6 +42,14 @@ enum BrushType BrushTypeLinearGradient = 4 }; +enum DriverStringOptions +{ + DriverStringOptionsCmapLookup = 1, + DriverStringOptionsVertical = 2, + DriverStringOptionsRealizedAdvance = 4, + DriverStringOptionsLimitSubpixel = 4 +}; + enum FillMode { FillModeAlternate = 0, @@ -707,6 +715,7 @@ enum EmfPlusRecordType { typedef enum Unit Unit; typedef enum BrushType BrushType; +typedef enum DriverStringOptions DriverStringOptions; typedef enum FillMode FillMode; typedef enum LineCap LineCap; typedef enum PathPointType PathPointType;

1 0

Piotr Caban : urlmon/tests: Added IWinInetHttpInfo tests.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 319a748f7b361dd98b9e1a83aab5409412c6ccaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=319a748f7b361dd98b9e1a83a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:38:27 2011 +0200 urlmon/tests: Added IWinInetHttpInfo tests. --- dlls/urlmon/tests/url.c | 50 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 17a797b..b606b90 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1352,6 +1352,51 @@ static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; static IBindStatusCallbackEx objbsc; +static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) +{ + DWORD status, size; + HRESULT hres, expect; + + /* QueryInfo changes it's behavior during this request */ + if(progress == BINDSTATUS_SENDINGREQUEST) + return; + + if(test_protocol==FTP_TEST && download_state==BEFORE_DOWNLOAD + && progress!=BINDSTATUS_MIMETYPEAVAILABLE) + expect = E_FAIL; + else if(test_protocol == FTP_TEST) + expect = S_FALSE; + else + expect = S_OK; + + size = sizeof(DWORD); + hres = IWinInetHttpInfo_QueryInfo(http_info, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, + &status, &size, NULL, NULL); + ok(hres == expect, "hres = %x, expected %x\n", hres, expect); + if(hres == S_OK) { + if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE) + ok(status == 0, "status = %d\n", status); + else + ok(status == HTTP_STATUS_OK, "status = %d\n", status); + ok(size == sizeof(DWORD), "size = %d\n", size); + } + + size = sizeof(DWORD); + hres = IWinInetHttpInfo_QueryOption(http_info, INTERNET_OPTION_HANDLE_TYPE, &status, &size); + if(test_protocol == FTP_TEST) { + if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE) + ok(hres == E_FAIL, "hres = %x\n", hres); + else + ok(hres == S_OK, "hres = %x\n", hres); + + if(hres == S_OK) + ok(status == INTERNET_HANDLE_TYPE_FTP_FILE, "status = %d\n", status); + } else { + ok(hres == S_OK, "hres = %x\n", hres); + ok(status == INTERNET_HANDLE_TYPE_HTTP_REQUEST, "status = %d\n", status); + } +} + static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REFIID riid, void **ppv) { ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); @@ -1658,9 +1703,10 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u HRESULT hres; hres = IBinding_QueryInterface(current_binding, &IID_IWinInetHttpInfo, (void**)&http_info); - if(!emulate_protocol && test_protocol != FILE_TEST && is_urlmon_protocol(test_protocol)) + if(!emulate_protocol && test_protocol != FILE_TEST && is_urlmon_protocol(test_protocol)) { ok(hres == S_OK, "Could not get IWinInetHttpInfo iface: %08x\n", hres); - else + test_WinInetHttpInfo(http_info, ulStatusCode); + } else ok(hres == E_NOINTERFACE, "QueryInterface(IID_IWinInetHttpInfo) returned: %08x, expected E_NOINTERFACE\n", hres); if(SUCCEEDED(hres))

1 0

Piotr Caban : urlmon: Added IWinInetHttpInfo_{QueryOption, QueryInfo} implementation.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 1041f61e68f34fc632ceeb2a2966b4e667a38db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1041f61e68f34fc632ceeb2a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:38:16 2011 +0200 urlmon: Added IWinInetHttpInfo_{QueryOption,QueryInfo} implementation. --- dlls/urlmon/ftp.c | 20 ++++++++++++++++---- dlls/urlmon/http.c | 23 +++++++++++++++++++---- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index c9d43b8..04cf49c 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -384,16 +384,28 @@ static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOpti void *pBuffer, DWORD *pcbBuffer) { FtpProtocol *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); - return E_NOTIMPL; + TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + + if(!This->base.request) + return E_FAIL; + + if(!InternetQueryOptionW(This->base.request, dwOption, pBuffer, pcbBuffer)) + return S_FALSE; + return S_OK; } static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) { FtpProtocol *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); - return E_NOTIMPL; + TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + + if(!This->base.request) + return E_FAIL; + + if(!HttpQueryInfoW(This->base.request, dwOption, pBuffer, pcbBuffer, pdwFlags)) + return S_FALSE; + return S_OK; } static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 23f6e69..846c790 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -836,16 +836,31 @@ static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOpti void *pBuffer, DWORD *pcbBuffer) { HttpProtocol *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); - return E_NOTIMPL; + TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + + if(!This->base.request) + return E_FAIL; + + if(!InternetQueryOptionW(This->base.request, dwOption, pBuffer, pcbBuffer)) + return S_FALSE; + return S_OK; } static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) { HttpProtocol *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); - return E_NOTIMPL; + TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + + if(!This->base.request) + return E_FAIL; + + if(!HttpQueryInfoW(This->base.request, dwOption, pBuffer, pcbBuffer, pdwFlags)) { + if(pBuffer) + memset(pBuffer, 0, *pcbBuffer); + return S_OK; + } + return S_OK; } static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = {

1 0

Piotr Caban : urlmon: Forward IWinInetHttpInfo calls to protocol implementations.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: e1c1b937ebbc4c91ea2415d60e985ea0cead0c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c1b937ebbc4c91ea2415d60… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:38:07 2011 +0200 urlmon: Forward IWinInetHttpInfo calls to protocol implementations. --- dlls/urlmon/binding.c | 28 +++++++++++++++------------- dlls/urlmon/bindprot.c | 6 +++++- dlls/urlmon/urlmon_main.h | 1 + 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 0d6043c..be72ee1 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -762,19 +762,11 @@ static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void *ppv = &This->IWinInetHttpInfo_iface; }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { - IWinInetHttpInfo *http_info; - HRESULT hres; - TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); - if(!This->protocol->wininet_info) + if(!This->protocol->wininet_http_info) return E_NOINTERFACE; - hres = IWinInetInfo_QueryInterface(This->protocol->wininet_info, &IID_IWinInetHttpInfo, (void**)&http_info); - if(FAILED(hres)) - return E_NOINTERFACE; - - IWinInetHttpInfo_Release(http_info); *ppv = &This->IWinInetHttpInfo_iface; } @@ -1259,16 +1251,26 @@ static HRESULT WINAPI WinInetHttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD void *pBuffer, DWORD *pcbBuffer) { Binding *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); - return E_NOTIMPL; + TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + + if(!This->protocol->wininet_info) + return E_FAIL; + + return IWinInetInfo_QueryOption(This->protocol->wininet_info, + dwOption, pBuffer, pcbBuffer); } static HRESULT WINAPI WinInetHttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) { Binding *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); - return E_NOTIMPL; + TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + + if(!This->protocol->wininet_http_info) + return E_FAIL; + + return IWinInetHttpInfo_QueryInfo(This->protocol->wininet_http_info, + dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); } static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 01a1b90..45cf14c 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -329,6 +329,8 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) if(!ref) { if(This->wininet_info) IWinInetInfo_Release(This->wininet_info); + if(This->wininet_http_info) + IWinInetHttpInfo_Release(This->wininet_http_info); if(This->protocol) IInternetProtocol_Release(This->protocol); if(This->bind_info) @@ -523,8 +525,10 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr This->protocol = protocol; - if(urlmon_protocol) + if(urlmon_protocol) { IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&This->wininet_info); + IInternetProtocol_QueryInterface(protocol, &IID_IWinInetHttpInfo, (void**)&This->wininet_http_info); + } set_binding_sink(This, pOIProtSink, pOIBindInfo); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 00247c8..2691622 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -180,6 +180,7 @@ typedef struct { IInternetProtocolSink *protocol_sink; IServiceProvider *service_provider; IWinInetInfo *wininet_info; + IWinInetHttpInfo *wininet_http_info; struct { IInternetProtocol IInternetProtocol_iface;

1 0

Piotr Caban : shdocvw: Report navigation error depending on HTTP status code.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: d55ebe0a4b6c421356aabfee88971473cb729cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55ebe0a4b6c421356aabfee8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:37:36 2011 +0200 shdocvw: Report navigation error depending on HTTP status code. --- dlls/shdocvw/navigate.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index a6899b0..09135a8 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -40,6 +40,7 @@ typedef struct { LONG ref; DocHost *doc_host; + IBinding *binding; LPWSTR url; HGLOBAL post_data; @@ -176,6 +177,8 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) if(!ref) { if(This->doc_host) IOleClientSite_Release(&This->doc_host->IOleClientSite_iface); + if(This->binding) + IBinding_Release(This->binding); if(This->post_data) GlobalFree(This->post_data); SysFreeString(This->headers); @@ -193,6 +196,9 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa TRACE("(%p)->(%d %p)\n", This, dwReserved, pbind); + This->binding = pbind; + IBinding_AddRef(This->binding); + return S_OK; } @@ -212,10 +218,30 @@ static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *ifac return E_NOTIMPL; } +static DWORD get_http_status_code(IBinding *binding) +{ + IWinInetHttpInfo *http_info; + DWORD status, size = sizeof(DWORD); + HRESULT hres; + + hres = IBinding_QueryInterface(binding, &IID_IWinInetHttpInfo, (void**)&http_info); + if(FAILED(hres)) + return HTTP_STATUS_OK; + + hres = IWinInetHttpInfo_QueryInfo(http_info, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, + &status, &size, NULL, NULL); + IWinInetHttpInfo_Release(http_info); + + if(FAILED(hres)) + return HTTP_STATUS_OK; + return status; +} + static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { BindStatusCallback *This = impl_from_IBindStatusCallback(iface); + DWORD status_code; TRACE("(%p)->(%d %d %d %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText)); @@ -225,6 +251,9 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, return set_dochost_url(This->doc_host, szStatusText); case BINDSTATUS_BEGINDOWNLOADDATA: set_status_text(This, szStatusText); /* FIXME: "Start downloading from site: %s" */ + status_code = get_http_status_code(This->binding); + if(status_code != HTTP_STATUS_OK) + handle_navigation_error(This->doc_host, status_code, This->url, NULL); return S_OK; case BINDSTATUS_ENDDOWNLOADDATA: set_status_text(This, szStatusText); /* FIXME: "Downloading from site: %s" */ @@ -298,13 +327,15 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac if(!This->doc_host) return S_OK; - /* FIXME: Check HTTP status code */ if(FAILED(hresult)) handle_navigation_error(This->doc_host, hresult, This->url, NULL); IOleClientSite_Release(&This->doc_host->IOleClientSite_iface); This->doc_host = NULL; + IBinding_Release(This->binding); + This->binding = NULL; + return S_OK; } @@ -438,6 +469,8 @@ static BindStatusCallback *create_callback(DocHost *doc_host, LPCWSTR url, PBYTE ret->doc_host = doc_host; IOleClientSite_AddRef(&doc_host->IOleClientSite_iface); + ret->binding = NULL; + if(post_data) { ret->post_data = GlobalAlloc(0, post_data_len); memcpy(ret->post_data, post_data, post_data_len);

1 0

Piotr Caban : mshtml/tests: Added connection error handling tests.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 2790f363c57e283ad7b4979f52f199bbd466b5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=2790f363c57e283ad7b4979f5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:36:45 2011 +0200 mshtml/tests: Added connection error handling tests. --- dlls/mshtml/tests/htmldoc.c | 68 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 843b9cc..2df4e74 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1212,6 +1212,10 @@ static void continue_binding(IBindStatusCallback *callback) hres = IBindStatusCallback_OnProgress(callback, sizeof(html_page)-1, sizeof(html_page)-1, BINDSTATUS_BEGINDOWNLOADDATA, doc_url); ok(hres == S_OK, "OnProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); + if(status_code != HTTP_STATUS_OK) { + CHECK_CALLED(IsErrorUrl); + SET_EXPECT(IsErrorUrl); + } SET_EXPECT(Read); stgmedium.tymed = TYMED_ISTREAM; @@ -2752,6 +2756,57 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(V_VT(pvaIn) == VT_UNKNOWN, "V_VT(pvaIn) != VT_UNKNOWN\n"); /* FIXME: test V_UNKNOWN(pvaIn) == window */ return S_OK; + case 1: { + SAFEARRAY *sa; + UINT dim; + LONG ind=0; + VARIANT var; + HRESULT hres; + + ok(pvaIn != NULL, "pvaIn == NULL\n"); + ok(pvaOut != NULL, "pvaOut != NULL\n"); + ok(V_VT(pvaIn) == VT_ARRAY, "V_VT(pvaIn) = %d\n", V_VT(pvaIn)); + ok(V_VT(pvaOut) == VT_BOOL, "V_VT(pvaOut) = %d\n", V_VT(pvaOut)); + sa = V_ARRAY(pvaIn); + + dim = SafeArrayGetDim(sa); + ok(dim == 1, "dim = %d\n", dim); + hres = SafeArrayGetLBound(sa, 1, &ind); + ok(hres == S_OK, "SafeArrayGetLBound failed: %x\n", hres); + ok(ind == 0, "Lower bound = %d\n", ind); + hres = SafeArrayGetUBound(sa, 1, &ind); + ok(hres == S_OK, "SafeArrayGetUBound failed: %x\n", hres); + ok(ind == 7 || broken(ind == 5), "Upper bound = %d\n", ind); + + ind = 0; + SafeArrayGetElement(sa, &ind, &var); + ok(V_VT(&var) == VT_I4, "Incorrect data type: %d\n", V_VT(&var)); + ok(V_I4(&var) == status_code, "Incorrect error code: %d\n", V_I4(&var)); + VariantClear(&var); + ind = 1; + SafeArrayGetElement(sa, &ind, &var); + ok(V_VT(&var) == VT_BSTR, "Incorrect data type: %d\n", V_VT(&var)); + ok(!strcmp_wa(V_BSTR(&var), "winetest:doc"), "Page address: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + ind = 2; + SafeArrayGetElement(sa, &ind, &var); + ok(V_VT(&var) == VT_UNKNOWN, "Incorrect data type: %d\n", V_VT(&var)); + VariantClear(&var); + ind = 3; + SafeArrayGetElement(sa, &ind, &var); + ok(V_VT(&var) == VT_UNKNOWN, "Incorrect data type: %d\n", V_VT(&var)); + VariantClear(&var); + ind = 4; + SafeArrayGetElement(sa, &ind, &var); + ok(V_VT(&var) == VT_BOOL, "Incorrect data type: %d\n", V_VT(&var)); + ok(!V_BOOL(&var), "Unknown value is incorrect\n"); + VariantClear(&var); + ind = 5; + SafeArrayGetElement(sa, &ind, &var); + ok(V_VT(&var) == VT_BOOL, "Incorrect data type: %d\n", V_VT(&var)); + ok(!V_BOOL(&var), "Unknown value is incorrect\n"); + VariantClear(&var); + } default: return E_FAIL; /* TODO */ } @@ -2967,7 +3022,8 @@ static HRESULT WINAPI DocObjectService_IsErrorUrl( BOOL *pfIsError) { CHECK_EXPECT(IsErrorUrl); - return E_NOTIMPL; + *pfIsError = FALSE; + return S_OK; } static IDocObjectServiceVtbl DocObjectServiceVtbl = { @@ -5353,7 +5409,7 @@ static void test_HTMLDocument(BOOL do_load) ok(!IsWindow(hwnd), "hwnd is not destroyed\n"); } -static void test_HTMLDocument_hlink(void) +static void test_HTMLDocument_hlink(DWORD status) { IHTMLDocument2 *doc; @@ -5372,7 +5428,9 @@ static void test_HTMLDocument_hlink(void) test_Persist(doc, &Moniker); test_Navigate(doc); + status_code = status; test_download(DWL_CSS|DWL_TRYCSS); + status_code = HTTP_STATUS_OK; test_IsDirty(doc, S_FALSE); test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); @@ -6000,7 +6058,11 @@ START_TEST(htmldoc) container_hwnd = create_container_window(); register_protocol(); - test_HTMLDocument_hlink(); + asynchronous_binding = TRUE; + test_HTMLDocument_hlink(HTTP_STATUS_NOT_FOUND); + + asynchronous_binding = FALSE; + test_HTMLDocument_hlink(HTTP_STATUS_OK); test_HTMLDocument(FALSE); test_HTMLDocument(TRUE); test_HTMLDocument_StreamLoad();

1 0

Piotr Caban : mshtml/tests: Added asynchronous moniker to htmldoc tests.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: f7afa250f80b0c3e78f9c0726d09b8e7c96616f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7afa250f80b0c3e78f9c0726… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:36:35 2011 +0200 mshtml/tests: Added asynchronous moniker to htmldoc tests. --- dlls/mshtml/tests/htmldoc.c | 88 ++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 3dac323..843b9cc 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -177,6 +177,7 @@ static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, static BOOL editmode = FALSE; static BOOL inplace_deactivated, open_call; static DWORD status_code = HTTP_STATUS_OK; +static BOOL asynchronous_binding = FALSE; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -204,6 +205,7 @@ static const WCHAR http_urlW[] = static const WCHAR doc_url[] = {'w','i','n','e','t','e','s','t',':','d','o','c',0}; #define DOCHOST_DOCCANNAVIGATE 0 +#define WM_CONTINUE_BINDING (WM_APP+1) static HRESULT QueryInterface(REFIID riid, void **ppv); static void test_MSHTML_QueryStatus(IHTMLDocument2*,DWORD); @@ -1054,6 +1056,11 @@ static IWinInetHttpInfo WinInetHttpInfo = { &WinInetHttpInfoVtbl }; static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) { + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = iface; + return S_OK; + } + if(IsEqualGUID(&IID_IWinInetInfo, riid) || IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { *ppv = &WinInetHttpInfo; return S_OK; @@ -1076,6 +1083,8 @@ static ULONG WINAPI Binding_Release(IBinding *iface) static HRESULT WINAPI Binding_Abort(IBinding *iface) { CHECK_EXPECT(Abort); + if(asynchronous_binding) + PeekMessage(NULL, container_hwnd, WM_CONTINUE_BINDING, WM_CONTINUE_BINDING, PM_REMOVE); return S_OK; } @@ -1188,18 +1197,53 @@ static HRESULT WINAPI Moniker_BindToObject(IMoniker *iface, IBindCtx *pcb, IMoni return E_NOTIMPL; } +static void continue_binding(IBindStatusCallback *callback) +{ + FORMATETC formatetc = {0xc02d, NULL, 1, -1, TYMED_ISTREAM}; + STGMEDIUM stgmedium; + HRESULT hres; + + static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; + + hres = IBindStatusCallback_OnProgress(callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, + wszTextHtml); + ok(hres == S_OK, "OnProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); + + hres = IBindStatusCallback_OnProgress(callback, sizeof(html_page)-1, sizeof(html_page)-1, + BINDSTATUS_BEGINDOWNLOADDATA, doc_url); + ok(hres == S_OK, "OnProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); + + SET_EXPECT(Read); + stgmedium.tymed = TYMED_ISTREAM; + U(stgmedium).pstm = &Stream; + stgmedium.pUnkForRelease = (IUnknown*)&Moniker; + hres = IBindStatusCallback_OnDataAvailable(callback, + BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION, + sizeof(html_page)-1, &formatetc, &stgmedium); + ok(hres == S_OK, "OnDataAvailable failed: %08x\n", hres); + CHECK_CALLED(Read); + + hres = IBindStatusCallback_OnProgress(callback, sizeof(html_page)-1, sizeof(html_page)-1, + BINDSTATUS_ENDDOWNLOADDATA, NULL); + ok(hres == S_OK, "OnProgress(BINDSTATUS_ENDDOWNLOADDATA) failed: %08x\n", hres); + + SET_EXPECT(GetBindResult); + hres = IBindStatusCallback_OnStopBinding(callback, S_OK, NULL); + ok(hres == S_OK, "OnStopBinding failed: %08x\n", hres); + SET_CALLED(GetBindResult); /* IE7 */ + + IBindStatusCallback_Release(callback); +} + static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, void **ppv) { IBindStatusCallback *callback = NULL; - FORMATETC formatetc = {0xc02d, NULL, 1, -1, TYMED_ISTREAM}; - STGMEDIUM stgmedium; BINDINFO bindinfo; DWORD bindf; HRESULT hres; static OLECHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; - static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; CHECK_EXPECT(BindToStorage); @@ -1240,35 +1284,12 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon hres = IBindStatusCallback_OnStartBinding(callback, 0, &Binding); ok(hres == S_OK, "OnStartBinding failed: %08x\n", hres); - hres = IBindStatusCallback_OnProgress(callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, - wszTextHtml); - ok(hres == S_OK, "OnProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); - - hres = IBindStatusCallback_OnProgress(callback, sizeof(html_page)-1, sizeof(html_page)-1, - BINDSTATUS_BEGINDOWNLOADDATA, doc_url); - ok(hres == S_OK, "OnProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); - - SET_EXPECT(Read); - stgmedium.tymed = TYMED_ISTREAM; - U(stgmedium).pstm = &Stream; - stgmedium.pUnkForRelease = (IUnknown*)iface; - hres = IBindStatusCallback_OnDataAvailable(callback, - BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION, - sizeof(html_page)-1, &formatetc, &stgmedium); - ok(hres == S_OK, "OnDataAvailable failed: %08x\n", hres); - CHECK_CALLED(Read); - - hres = IBindStatusCallback_OnProgress(callback, sizeof(html_page)-1, sizeof(html_page)-1, - BINDSTATUS_ENDDOWNLOADDATA, NULL); - ok(hres == S_OK, "OnProgress(BINDSTATUS_ENDDOWNLOADDATA) failed: %08x\n", hres); - - SET_EXPECT(GetBindResult); - hres = IBindStatusCallback_OnStopBinding(callback, S_OK, NULL); - ok(hres == S_OK, "OnStopBinding failed: %08x\n", hres); - SET_CALLED(GetBindResult); /* IE7 */ - - IBindStatusCallback_Release(callback); + if(asynchronous_binding) { + PostMessageW(container_hwnd, WM_CONTINUE_BINDING, (WPARAM)callback, 0); + return MK_S_ASYNCHRONOUS; + } + continue_binding(callback); return S_OK; } @@ -3533,6 +3554,11 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { + if(msg == WM_CONTINUE_BINDING) { + IBindStatusCallback *callback = (IBindStatusCallback*)wParam; + continue_binding(callback); + } + return DefWindowProc(hwnd, msg, wParam, lParam); }

1 0

Piotr Caban : mshtml/tests: Added IDocObjectService interface.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 21d500b37f19780742a7038acd52776e1b717530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d500b37f19780742a7038ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:36:23 2011 +0200 mshtml/tests: Added IDocObjectService interface. --- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/tests/htmldoc.c | 159 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 158 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 957b892..bd6faf6 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -254,7 +254,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event update_title(doc_obj); } - if(doc_obj && doc_obj->doc_object_service) + if(doc_obj && doc_obj->usermode!=EDITMODE && doc_obj->doc_object_service) IDocObjectService_FireDocumentComplete(doc_obj->doc_object_service, &doc->basedoc.window->IHTMLWindow2_iface, 0); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index bdabfd5..3dac323 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -161,6 +161,11 @@ DEFINE_EXPECT(OnViewChange); DEFINE_EXPECT(EvaluateNewWindow); DEFINE_EXPECT(GetTravelLog); DEFINE_EXPECT(UpdateBackForwardState); +DEFINE_EXPECT(FireNavigateComplete2); +DEFINE_EXPECT(FireDocumentComplete); +DEFINE_EXPECT(GetPendingUrl); +DEFINE_EXPECT(ActiveElementChanged); +DEFINE_EXPECT(IsErrorUrl); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -2834,6 +2839,134 @@ static const IDispatchVtbl DispatchVtbl = { static IDispatch Dispatch = { &DispatchVtbl }; +static HRESULT WINAPI DocObjectService_QueryInterface( + IDocObjectService* This, + REFIID riid, + void **ppvObject) +{ + /* F62D9369-75EF-4578-8856-232802C76468 (ITridentService2) */ + return E_NOTIMPL; +} + +static ULONG WINAPI DocObjectService_AddRef( + IDocObjectService* This) +{ + return 2; +} + +static ULONG WINAPI DocObjectService_Release( + IDocObjectService* This) +{ + return 1; +} + +static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( + IDocObjectService* This, + IDispatch *pDispatch, + LPCWSTR lpszUrl, + DWORD dwFlags, + LPCWSTR lpszFrameName, + BYTE *pPostData, + DWORD cbPostData, + LPCWSTR lpszHeaders, + BOOL fPlayNavSound, + BOOL *pfCancel) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireNavigateComplete2( + IDocObjectService* This, + IHTMLWindow2 *pHTMLWindow2, + DWORD dwFlags) +{ + CHECK_EXPECT(FireNavigateComplete2); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireDownloadBegin( + IDocObjectService* This) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireDownloadComplete( + IDocObjectService* This) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireDocumentComplete( + IDocObjectService* This, + IHTMLWindow2 *pHTMLWindow, + DWORD dwFlags) +{ + CHECK_EXPECT(FireDocumentComplete); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_UpdateDesktopComponent( + IDocObjectService* This, + IHTMLWindow2 *pHTMLWindow) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_GetPendingUrl( + IDocObjectService* This, + BSTR *pbstrPendingUrl) +{ + CHECK_EXPECT(GetPendingUrl); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_ActiveElementChanged( + IDocObjectService* This, + IHTMLElement *pHTMLElement) +{ + CHECK_EXPECT(ActiveElementChanged); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_GetUrlSearchComponent( + IDocObjectService* This, + BSTR *pbstrSearch) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_IsErrorUrl( + IDocObjectService* This, + LPCWSTR lpszUrl, + BOOL *pfIsError) +{ + CHECK_EXPECT(IsErrorUrl); + return E_NOTIMPL; +} + +static IDocObjectServiceVtbl DocObjectServiceVtbl = { + DocObjectService_QueryInterface, + DocObjectService_AddRef, + DocObjectService_Release, + DocObjectService_FireBeforeNavigate2, + DocObjectService_FireNavigateComplete2, + DocObjectService_FireDownloadBegin, + DocObjectService_FireDownloadComplete, + DocObjectService_FireDocumentComplete, + DocObjectService_UpdateDesktopComponent, + DocObjectService_GetPendingUrl, + DocObjectService_ActiveElementChanged, + DocObjectService_GetUrlSearchComponent, + DocObjectService_IsErrorUrl +}; + +static IDocObjectService DocObjectService = { &DocObjectServiceVtbl }; + DEFINE_GUID(IID_ITabBrowserService, 0x5E8FA523,0x83D4,0x4DBE,0x81,0x99,0x4C,0x18,0xE4,0x85,0x87,0x25); static HRESULT WINAPI BrowserService_QueryInterface( @@ -2846,8 +2979,10 @@ static HRESULT WINAPI BrowserService_QueryInterface( if(IsEqualGUID(&IID_IShellBrowser, riid)) return E_NOINTERFACE; /* TODO */ - if(IsEqualGUID(&IID_IDocObjectService, riid)) - return E_NOINTERFACE; /* TODO */ + if(IsEqualGUID(&IID_IDocObjectService, riid)) { + *ppvObject = &DocObjectService; + return S_OK; + } if(IsEqualGUID(&IID_ITabBrowserService, riid)) return E_NOINTERFACE; /* TODO */ @@ -3665,9 +3800,11 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) SET_EXPECT(Invoke_AMBIENT_SILENT); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); SET_EXPECT(Exec_ShellDocView_37); + SET_EXPECT(IsErrorUrl); } else SET_EXPECT(GetTravelLog); + SET_EXPECT(GetPendingUrl); load_state = LD_DOLOAD; expect_LockContainer_fLock = TRUE; readystate_set_loading = TRUE; @@ -3709,9 +3846,11 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_37); + todo_wine CHECK_CALLED(IsErrorUrl); } else todo_wine CHECK_CALLED(GetTravelLog); + todo_wine CHECK_CALLED(GetPendingUrl); set_clientsite = container_locked = TRUE; @@ -3786,6 +3925,12 @@ static void test_download(DWORD flags) SET_EXPECT(Exec_SETTITLE); SET_EXPECT(UpdateBackForwardState); } + if(!editmode && !(flags & DWL_EMPTY)) + SET_EXPECT(FireNavigateComplete2); + if(!editmode) + SET_EXPECT(FireDocumentComplete); + SET_EXPECT(ActiveElementChanged); + SET_EXPECT(IsErrorUrl); expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */ while(!called_Exec_HTTPEQUIV_DONE && GetMessage(&msg, NULL, 0, 0)) { @@ -3847,6 +3992,12 @@ static void test_download(DWORD flags) SET_CALLED(Exec_SETTITLE); todo_wine CHECK_CALLED(UpdateBackForwardState); } + if(!editmode && !(flags & DWL_EMPTY)) + todo_wine CHECK_CALLED(FireNavigateComplete2); + if(!editmode) + CHECK_CALLED(FireDocumentComplete); + todo_wine CHECK_CALLED(ActiveElementChanged); + todo_wine CHECK_CALLED(IsErrorUrl); load_state = LD_COMPLETE; @@ -4957,6 +5108,7 @@ static void test_StreamLoad(IHTMLDocument2 *doc) SET_EXPECT(Exec_ShellDocView_37); SET_EXPECT(OnChanged_READYSTATE); SET_EXPECT(Read); + SET_EXPECT(GetPendingUrl); readystate_set_loading = TRUE; hres = IPersistStreamInit_Load(init, &Stream); @@ -4967,6 +5119,7 @@ static void test_StreamLoad(IHTMLDocument2 *doc) CHECK_CALLED(Exec_ShellDocView_37); CHECK_CALLED(OnChanged_READYSTATE); CHECK_CALLED(Read); + todo_wine CHECK_CALLED(GetPendingUrl); test_timer(EXPECT_SETTITLE); test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank"); @@ -4988,6 +5141,7 @@ static void test_StreamInitNew(IHTMLDocument2 *doc) SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); SET_EXPECT(Exec_ShellDocView_37); SET_EXPECT(OnChanged_READYSTATE); + SET_EXPECT(GetPendingUrl); readystate_set_loading = TRUE; hres = IPersistStreamInit_InitNew(init); @@ -4997,6 +5151,7 @@ static void test_StreamInitNew(IHTMLDocument2 *doc) CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_37); CHECK_CALLED(OnChanged_READYSTATE); + todo_wine CHECK_CALLED(GetPendingUrl); test_timer(EXPECT_SETTITLE); test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank");

1 0

Piotr Caban : mshtml/tests: Added IBrowserService interface.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 9ebe31016cea69d30f26962ebc49782a08c37700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ebe31016cea69d30f26962eb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:36:14 2011 +0200 mshtml/tests: Added IBrowserService interface. --- dlls/mshtml/tests/htmldoc.c | 351 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 351 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ebe31016cea69d30f269…

1 0

Piotr Caban : mshtml/tests: Added IWinInetHttpInfo interface.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 9b4ee3176e0ece3527b8c3f6a8c6cf65cc1c97cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4ee3176e0ece3527b8c3f6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:36:03 2011 +0200 mshtml/tests: Added IWinInetHttpInfo interface. --- dlls/mshtml/tests/htmldoc.c | 71 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d45eefb..2da187f 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -167,6 +167,7 @@ static BOOL set_clientsite, container_locked; static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE; static BOOL inplace_deactivated, open_call; +static DWORD status_code = HTTP_STATUS_OK; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -981,13 +982,73 @@ static const IStreamVtbl StreamVtbl = { static IStream Stream = { &StreamVtbl }; -static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WinInetHttpInfo_QueryInterface( + IWinInetHttpInfo* This, + REFIID riid, + void **ppvObject) { - if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) - return E_NOINTERFACE; /* TODO */ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} - if(IsEqualGUID(&IID_IWinInetInfo, riid)) - return E_NOINTERFACE; /* TODO */ +static ULONG WINAPI WinInetHttpInfo_AddRef( + IWinInetHttpInfo* This) +{ + return 2; +} + +static ULONG WINAPI WinInetHttpInfo_Release( + IWinInetHttpInfo* This) +{ + return 1; +} + +static HRESULT WINAPI WinInetHttpInfo_QueryOption( + IWinInetHttpInfo* This, + DWORD dwOption, + LPVOID pBuffer, + DWORD *pcbBuf) +{ + return E_NOTIMPL; /* TODO */ +} + +static HRESULT WINAPI WinInetHttpInfo_QueryInfo( + IWinInetHttpInfo* This, + DWORD dwOption, + LPVOID pBuffer, + DWORD *pcbBuf, + DWORD *pdwFlags, + DWORD *pdwReserved) +{ + ok(pdwReserved == NULL, "pdwReserved != NULL\n"); + + if(dwOption == (HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER)) { + ok(pBuffer != NULL, "pBuffer == NULL\n"); + ok(*pcbBuf == sizeof(DWORD), "*pcbBuf = %d\n", *pcbBuf); + ok(pdwFlags == NULL, "*pdwFlags != NULL\n"); + *((DWORD*)pBuffer) = status_code; + return S_OK; + } + + return E_NOTIMPL; /* TODO */ +} + +static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { + WinInetHttpInfo_QueryInterface, + WinInetHttpInfo_AddRef, + WinInetHttpInfo_Release, + WinInetHttpInfo_QueryOption, + WinInetHttpInfo_QueryInfo +}; + +static IWinInetHttpInfo WinInetHttpInfo = { &WinInetHttpInfoVtbl }; + +static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IWinInetInfo, riid) || IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { + *ppv = &WinInetHttpInfo; + return S_OK; + } ok(0, "unexpected call\n"); return E_NOINTERFACE;

1 0

Piotr Caban : mshtml: Report an error when navigation fails.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: c3a677d007607aa96b3564230956fe737483d75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a677d007607aa96b3564230… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:35:34 2011 +0200 mshtml: Report an error when navigation fails. --- dlls/mshtml/navigate.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 116 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index bb71c79..db624d8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1110,11 +1110,105 @@ static HRESULT async_stop_request(nsChannelBSC *This) return S_OK; } +static void handle_navigation_error(nsChannelBSC *This, DWORD result) +{ + HTMLDocumentObj *doc; + IOleCommandTarget *olecmd; + BOOL is_error_url; + SAFEARRAY *sa; + SAFEARRAYBOUND bound; + VARIANT var, varOut; + LONG ind; + BSTR url, unk; + HRESULT hres; + + if(!This->window) + return; + + doc = This->window->doc_obj; + if(!doc || !doc->doc_object_service || !doc->client) + return; + + hres = IDocObjectService_IsErrorUrl(doc->doc_object_service, + This->window->url, &is_error_url); + if(FAILED(hres) || is_error_url) + return; + + hres = IOleClientSite_QueryInterface(doc->client, + &IID_IOleCommandTarget, (void**)&olecmd); + if(FAILED(hres)) + return; + + bound.lLbound = 0; + bound.cElements = 8; + sa = SafeArrayCreate(VT_VARIANT, 1, &bound); + if(!sa) { + IOleCommandTarget_Release(olecmd); + return; + } + + ind = 0; + V_VT(&var) = VT_I4; + V_I4(&var) = result; + SafeArrayPutElement(sa, &ind, &var); + + ind = 1; + V_VT(&var) = VT_BSTR; + url = SysAllocString(This->window->url); + V_BSTR(&var) = url; + SafeArrayPutElement(sa, &ind, &var); + + ind = 3; + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)&This->window->IHTMLWindow2_iface; + SafeArrayPutElement(sa, &ind, &var); + + /* FIXME: what are the following fields for? */ + ind = 2; + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = NULL; + SafeArrayPutElement(sa, &ind, &var); + + ind = 4; + V_VT(&var) = VT_BOOL; + V_BOOL(&var) = FALSE; + SafeArrayPutElement(sa, &ind, &var); + + ind = 5; + V_VT(&var) = VT_BOOL; + V_BOOL(&var) = FALSE; + SafeArrayPutElement(sa, &ind, &var); + + ind = 6; + V_VT(&var) = VT_BSTR; + unk = SysAllocString(NULL); + V_BSTR(&var) = unk; + SafeArrayPutElement(sa, &ind, &var); + + ind = 7; + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = NULL; + SafeArrayPutElement(sa, &ind, &var); + + V_VT(&var) = VT_ARRAY; + V_ARRAY(&var) = sa; + V_VT(&varOut) = VT_BOOL; + V_BOOL(&varOut) = VARIANT_TRUE; + IOleCommandTarget_Exec(olecmd, &CGID_DocHostCmdPriv, 1, 0, &var, FAILED(hres)?NULL:&varOut); + + SysFreeString(url); + SysFreeString(unk); + SafeArrayDestroy(sa); + IOleCommandTarget_Release(olecmd); +} + static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); - if(This->window && SUCCEEDED(result)) { + if(FAILED(result)) + handle_navigation_error(This, result); + else if(This->window) { result = async_stop_request(This); if(SUCCEEDED(result)) return S_OK; @@ -1148,6 +1242,27 @@ static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCW /* FIXME: We should find a better way to handle this */ set_wine_url(This->nschannel->uri, status_text); + break; + case BINDSTATUS_BEGINDOWNLOADDATA: { + IWinInetHttpInfo *http_info; + DWORD status, size = sizeof(DWORD); + HRESULT hres; + + if(!This->bsc.binding) + break; + + hres = IBinding_QueryInterface(This->bsc.binding, &IID_IWinInetHttpInfo, (void**)&http_info); + if(FAILED(hres)) + break; + + hres = IWinInetHttpInfo_QueryInfo(http_info, + HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL, NULL); + IWinInetHttpInfo_Release(http_info); + if(FAILED(hres) || status == HTTP_STATUS_OK) + break; + + handle_navigation_error(This, status); + } } return S_OK;

1 0

Thomas Mullaly : urlmon: Added basic domain zone support to MapUrlToZone.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: e06d49ff6252412cf0375997c0b74aaf61539cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06d49ff6252412cf0375997c… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sun Mar 13 19:26:45 2011 -0400 urlmon: Added basic domain zone support to MapUrlToZone. --- dlls/urlmon/sec_mgr.c | 357 ++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/tests/sec_mgr.c | 28 ++-- dlls/urlmon/uri.c | 2 +- dlls/urlmon/urlmon_main.h | 2 + 4 files changed, 372 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e06d49ff6252412cf0375…

1 0

Thomas Mullaly : urlmon: Removed str_last_of in favor of memrchrW.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 1b625bb1f817799928475d3e7407864dede5296b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b625bb1f817799928475d3e7… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sun Mar 20 16:28:59 2011 -0400 urlmon: Removed str_last_of in favor of memrchrW. --- dlls/urlmon/uri.c | 27 ++++++--------------------- 1 files changed, 6 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 0a92dad..fb51cc2 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -597,21 +597,6 @@ static inline void pct_encode_val(WCHAR val, WCHAR *dest) { dest[2] = hexDigits[val & 0xf]; } -/* Scans the range of characters [str, end] and returns the last occurrence - * of 'ch' or returns NULL. - */ -static const WCHAR *str_last_of(const WCHAR *str, const WCHAR *end, WCHAR ch) { - const WCHAR *ptr = end; - - while(ptr >= str) { - if(*ptr == ch) - return ptr; - --ptr; - } - - return NULL; -} - /* Attempts to parse the domain name from the host. * * This function also includes the Top-level Domain (TLD) name @@ -636,12 +621,12 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, if(host_len < 4) return; - last_tld = str_last_of(host, end, '.'); + last_tld = memrchrW(host, '.', host_len); if(!last_tld) /* http://hostname -> has no domain name. */ return; - sec_last_tld = str_last_of(host, last_tld-1, '.'); + sec_last_tld = memrchrW(host, '.', last_tld-host); if(!sec_last_tld) { /* If the '.' is at the beginning of the host there * has to be at least 3 characters in the TLD for it @@ -692,7 +677,7 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, if(last_tld - (sec_last_tld+1) == 3) { for(i = 0; i < sizeof(recognized_tlds)/sizeof(recognized_tlds[0]); ++i) { if(!StrCmpNIW(sec_last_tld+1, recognized_tlds[i].tld_name, 3)) { - const WCHAR *domain = str_last_of(host, sec_last_tld-1, '.'); + const WCHAR *domain = memrchrW(host, '.', sec_last_tld-host); if(!domain) *domain_start = 0; @@ -710,7 +695,7 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, * part of the TLD. * Ex: www.google.fo.uk -> google.fo.uk as the domain name. */ - const WCHAR *domain = str_last_of(host, sec_last_tld-1, '.'); + const WCHAR *domain = memrchrW(host, '.', sec_last_tld-host); if(!domain) *domain_start = 0; @@ -5801,10 +5786,10 @@ static HRESULT merge_paths(parse_data *data, const WCHAR *base, DWORD base_len, /* Find the characters the will be copied over from * the base path. */ - end = str_last_of(base, base+(base_len-1), '/'); + end = memrchrW(base, '/', base_len); if(!end && data->scheme_type == URL_SCHEME_FILE) /* Try looking for a '\\'. */ - end = str_last_of(base, base+(base_len-1), '\\'); + end = memrchrW(base, '\\', base_len); } if(end) {

1 0

Vincent Povirk : gdiplus: Use the given HPALETTE in GdipCreateBitmapFromHBITMAP.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: a7444e8e2c4dcccbfe621e8e6945cef989499d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7444e8e2c4dcccbfe621e8e6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 28 16:03:29 2011 -0500 gdiplus: Use the given HPALETTE in GdipCreateBitmapFromHBITMAP. --- dlls/gdiplus/image.c | 56 +++++++++++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/image.c | 6 +--- 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1916524..35ebd29 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3524,12 +3524,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi if(!hbm || !bitmap) return InvalidParameter; - /* TODO: Support for device-dependent bitmaps */ - if(hpal){ - FIXME("no support for device-dependent bitmaps\n"); - return NotImplemented; - } - if (GetObjectA(hbm, sizeof(bm), &bm) != sizeof(bm)) return InvalidParameter; @@ -3626,6 +3620,56 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi GdipBitmapUnlockBits(*bitmap, &lockeddata); } + + if (retval == Ok && hpal) + { + WORD num_palette_entries; + PALETTEENTRY *palette_entries=NULL; + ColorPalette *palette=NULL; + int i; + + if (!GetObjectW(hpal, sizeof(num_palette_entries), &num_palette_entries)) + retval = GenericError; + + if (retval == Ok) + { + palette_entries = GdipAlloc(sizeof(PALETTEENTRY) * num_palette_entries); + palette = GdipAlloc(sizeof(ColorPalette) + sizeof(ARGB) * (num_palette_entries-1)); + + if (!palette_entries || !palette) + retval = OutOfMemory; + } + + if (retval == Ok) + { + if (!GetPaletteEntries(hpal, 0, num_palette_entries, palette_entries)) + retval = GenericError; + } + + if (retval == Ok) + { + palette->Flags = 0; + palette->Count = num_palette_entries; + + for (i=0; i<num_palette_entries; i++) + { + PALETTEENTRY * entry = &palette_entries[i]; + palette->Entries[i] = 0xff000000 | entry->peRed << 16 | + entry->peGreen << 8 | entry->peBlue; + } + + retval = GdipSetImagePalette((GpImage*)*bitmap, palette); + } + + GdipFree(palette_entries); + GdipFree(palette); + } + + if (retval != Ok) + { + GdipDisposeImage((GpImage*)*bitmap); + *bitmap = NULL; + } } return retval; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 1e6a9e9..77aec93 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -917,10 +917,8 @@ static void test_GdipCreateBitmapFromHBITMAP(void) GdipFree(LogPal); stat = GdipCreateBitmapFromHBITMAP(hbm, hpal, &gpbm); - todo_wine - { - expect(Ok, stat); - } + expect(Ok, stat); + if (stat == Ok) GdipDisposeImage((GpImage*)gpbm);

1 0

Henri Verbeet : wined3d: Move IWineD3DVertexShader::SetLocalConstantsF() to IWineD3DBaseShader.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 57d70bfddae578398a74acec9cbe3ed4609d5fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d70bfddae578398a74acec9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:46 2011 +0200 wined3d: Move IWineD3DVertexShader::SetLocalConstantsF() to IWineD3DBaseShader. --- dlls/wined3d/shader.c | 75 ++++++++++++++++++++++++++++++--------------- include/wine/wined3d.idl | 10 +++--- 2 files changed, 55 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0641b27..80ea5ea 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1572,6 +1572,33 @@ static HRESULT shader_get_function(IWineD3DBaseShaderImpl *shader, void *data, U return WINED3D_OK; } +/* Set local constants for d3d8 shaders. */ +static HRESULT shader_set_local_constants_float(IWineD3DBaseShaderImpl *shader, + UINT start_idx, const float *src_data, UINT count) +{ + UINT end_idx = start_idx + count; + UINT i; + + if (end_idx > shader->baseShader.limits.constant_float) + { + WARN("end_idx %u > float constants limit %u.\n", + end_idx, shader->baseShader.limits.constant_float); + end_idx = shader->baseShader.limits.constant_float; + } + + for (i = start_idx; i < end_idx; ++i) + { + local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); + if (!lconst) return E_OUTOFMEMORY; + + lconst->idx = i; + memcpy(lconst->value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); + list_add_head(&shader->baseShader.constantsF, &lconst->entry); + } + + return WINED3D_OK; +} + static HRESULT shader_set_function(IWineD3DBaseShaderImpl *shader, const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, DWORD float_const_count) { @@ -1679,34 +1706,13 @@ static HRESULT STDMETHODCALLTYPE vertexshader_GetFunction(IWineD3DVertexShader * return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } -/* Set local constants for d3d8 shaders. */ static HRESULT STDMETHODCALLTYPE vertexshader_SetLocalConstantsF(IWineD3DVertexShader *iface, UINT start_idx, const float *src_data, UINT count) { - IWineD3DVertexShaderImpl *shader =(IWineD3DVertexShaderImpl *)iface; - IWineD3DDeviceImpl *device = shader->baseShader.device; - UINT i, end_idx; - TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); - end_idx = start_idx + count; - if (end_idx > device->d3d_vshader_constantF) - { - WARN("end_idx %u > float constants limit %u.\n", end_idx, device->d3d_vshader_constantF); - end_idx = device->d3d_vshader_constantF; - } - - for (i = start_idx; i < end_idx; ++i) - { - local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); - if (!lconst) return E_OUTOFMEMORY; - - lconst->idx = i; - memcpy(lconst->value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); - list_add_head(&shader->baseShader.constantsF, &lconst->entry); - } - - return WINED3D_OK; + return shader_set_local_constants_float((IWineD3DBaseShaderImpl *)iface, + start_idx, src_data, count); } static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = @@ -1719,7 +1725,6 @@ static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = vertexshader_GetParent, /* IWineD3DBaseShader methods */ vertexshader_GetFunction, - /* IWineD3DVertexShader methods */ vertexshader_SetLocalConstantsF, }; @@ -1951,6 +1956,15 @@ static HRESULT STDMETHODCALLTYPE geometryshader_GetFunction(IWineD3DGeometryShad return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } +static HRESULT STDMETHODCALLTYPE geometryshader_SetLocalConstantsF(IWineD3DGeometryShader *iface, + UINT start_idx, const float *src_data, UINT count) +{ + TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); + + return shader_set_local_constants_float((IWineD3DBaseShaderImpl *)iface, + start_idx, src_data, count); +} + static const IWineD3DGeometryShaderVtbl wined3d_geometryshader_vtbl = { /* IUnknown methods */ @@ -1961,6 +1975,7 @@ static const IWineD3DGeometryShaderVtbl wined3d_geometryshader_vtbl = geometryshader_GetParent, /* IWineD3DBaseShader methods */ geometryshader_GetFunction, + geometryshader_SetLocalConstantsF, }; HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDeviceImpl *device, @@ -2047,6 +2062,15 @@ static HRESULT STDMETHODCALLTYPE pixelshader_GetFunction(IWineD3DPixelShader *if return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } +static HRESULT STDMETHODCALLTYPE pixelshader_SetLocalConstantsF(IWineD3DPixelShader *iface, + UINT start_idx, const float *src_data, UINT count) +{ + TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); + + return shader_set_local_constants_float((IWineD3DBaseShaderImpl *)iface, + start_idx, src_data, count); +} + static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = { /* IUnknown methods */ @@ -2056,7 +2080,8 @@ static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = /* IWineD3DBase methods */ pixelshader_GetParent, /* IWineD3DBaseShader methods */ - pixelshader_GetFunction + pixelshader_GetFunction, + pixelshader_SetLocalConstantsF, }; void find_ps_compile_args(const struct wined3d_state *state, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index bc7d588..e56aea5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2395,6 +2395,11 @@ interface IWineD3DBaseShader : IWineD3DBase [out] void *data, [in, out] UINT *data_size ); + HRESULT SetLocalConstantsF( + [in] UINT start_idx, + [in] const float *src_data, + [in] UINT vector4f_count + ); } [ @@ -2404,11 +2409,6 @@ interface IWineD3DBaseShader : IWineD3DBase ] interface IWineD3DVertexShader : IWineD3DBaseShader { - HRESULT SetLocalConstantsF( - [in] UINT start_idx, - [in] const float *src_data, - [in] UINT vector4f_count - ); } [

1 0

Henri Verbeet : wined3d: Replace "is_srgb" in wined3d_texture with a flag.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 19e66a0dc964b839eaef4699e80208096de05c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e66a0dc964b839eaef4699e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:45 2011 +0200 wined3d: Replace "is_srgb" in wined3d_texture with a flag. --- dlls/wined3d/texture.c | 36 +++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 10edf4a..1d42c34 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -57,7 +57,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->lod = 0; texture->texture_rgb.dirty = TRUE; texture->texture_srgb.dirty = TRUE; - texture->is_srgb = FALSE; texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) @@ -143,7 +142,12 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, TRACE("texture %p, srgb %#x, set_surface_desc %p.\n", texture, srgb, set_surface_desc); - texture->is_srgb = srgb; /* sRGB mode cache for preload() calls outside drawprim. */ + /* sRGB mode cache for preload() calls outside drawprim. */ + if (srgb) + texture->flags |= WINED3D_TEXTURE_IS_SRGB; + else + texture->flags &= ~WINED3D_TEXTURE_IS_SRGB; + gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, srgb); target = texture->target; @@ -270,7 +274,8 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, TRACE("texture %p, sampler_states %p.\n", texture, sampler_states); - gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, texture->is_srgb); + gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, + texture->flags & WINED3D_TEXTURE_IS_SRGB); /* This function relies on the correct texture being bound and loaded. */ @@ -646,7 +651,8 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, if (set_gl_texture_desc && SUCCEEDED(hr)) { UINT sub_count = texture->level_count * texture->layer_count; - BOOL srgb_tex = !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] && texture->is_srgb; + BOOL srgb_tex = !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] + && (texture->flags & WINED3D_TEXTURE_IS_SRGB); struct gl_texture *gl_tex; UINT i; @@ -718,7 +724,7 @@ static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB break; default: - srgb_mode = texture->is_srgb; + srgb_mode = texture->flags & WINED3D_TEXTURE_IS_SRGB; break; } @@ -1115,7 +1121,6 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB { IWineD3DDeviceImpl *device = texture->resource.device; struct wined3d_context *context = NULL; - BOOL srgb_mode = texture->is_srgb; BOOL srgb_was_toggled = FALSE; unsigned int i; @@ -1125,9 +1130,17 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB context = context_acquire(device, NULL); else if (texture->bind_count > 0) { - srgb_mode = device->stateBlock->state.sampler_states[texture->sampler][WINED3DSAMP_SRGBTEXTURE]; - srgb_was_toggled = texture->is_srgb != srgb_mode; - texture->is_srgb = srgb_mode; + BOOL texture_srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB; + BOOL sampler_srgb = device->stateBlock->state.sampler_states[texture->sampler][WINED3DSAMP_SRGBTEXTURE]; + srgb_was_toggled = !texture_srgb != !sampler_srgb; + + if (srgb_was_toggled) + { + if (sampler_srgb) + texture->flags |= WINED3D_TEXTURE_IS_SRGB; + else + texture->flags &= ~WINED3D_TEXTURE_IS_SRGB; + } } /* If the texture is marked dirty or the sRGB sampler setting has changed @@ -1136,7 +1149,8 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB { for (i = 0; i < texture->level_count; ++i) { - volume_load(volume_from_resource(texture->sub_resources[i]), i, srgb_mode); + volume_load(volume_from_resource(texture->sub_resources[i]), i, + texture->flags & WINED3D_TEXTURE_IS_SRGB); } } else if (srgb_was_toggled) @@ -1145,7 +1159,7 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB { IWineD3DVolumeImpl *volume = volume_from_resource(texture->sub_resources[i]); volume_add_dirty_box(volume, NULL); - volume_load(volume, i, srgb_mode); + volume_load(volume, i, texture->flags & WINED3D_TEXTURE_IS_SRGB); } } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4ec25e6..1fe633f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1890,6 +1890,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_COND_NP2 0x1 #define WINED3D_TEXTURE_POW2_MAT_IDENT 0x2 +#define WINED3D_TEXTURE_IS_SRGB 0x4 struct wined3d_texture { @@ -1904,7 +1905,6 @@ struct wined3d_texture WINED3DTEXTUREFILTERTYPE filter_type; LONG bind_count; DWORD sampler; - BOOL is_srgb; DWORD flags; const struct min_lookup *min_mip_lookup; const GLenum *mag_lookup;

1 0

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 March 2011