January 2011 - Wine-commits

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLStyle3 iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 0ed9078234285085ef9b956ddbb94d8e54c2c277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed9078234285085ef9b956dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 02:03:57 2011 +0100 mshtml: COM cleanup for the IHTMLStyle3 iface. --- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/htmlstyle.h | 3 +- dlls/mshtml/htmlstyle3.c | 81 ++++++++++++++++++++++++---------------------- 3 files changed, 44 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ed9078234285085ef9b9…

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_bind().
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 32779a22324868042e6e7f0b52630c8213dd01d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32779a22324868042e6e7f0b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 3 18:51:39 2011 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_bind(). --- dlls/wined3d/basetexture.c | 34 ++++++++++++++++++---------------- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 608efc9..241d434 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -243,23 +243,23 @@ BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) } /* Context activation is done by the caller. */ -HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) +HRESULT basetexture_bind(IWineD3DBaseTextureImpl *texture, BOOL srgb, BOOL *set_surface_desc) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; HRESULT hr = WINED3D_OK; GLenum textureDimensions; BOOL isNewTexture = FALSE; struct gl_texture *gl_tex; - TRACE("(%p) : About to bind texture\n", This); - This->baseTexture.is_srgb = srgb; /* SRGB mode cache for PreLoad calls outside drawprim */ - if(srgb) { - gl_tex = &This->baseTexture.texture_srgb; - } else { - gl_tex = &This->baseTexture.texture_rgb; - } + TRACE("texture %p, srgb %#x, set_surface_desc %p.\n", texture, srgb, set_surface_desc); + + texture->baseTexture.is_srgb = srgb; /* SRGB mode cache for PreLoad calls outside drawprim */ + if (srgb) + gl_tex = &texture->baseTexture.texture_srgb; + else + gl_tex = &texture->baseTexture.texture_rgb; + + textureDimensions = texture->baseTexture.target; - textureDimensions = This->baseTexture.target; ENTER_GL(); /* Generate a texture name if we don't already have one */ if (!gl_tex->name) @@ -268,7 +268,8 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac glGenTextures(1, &gl_tex->name); checkGLcall("glGenTextures"); TRACE("Generated texture %d\n", gl_tex->name); - if (This->resource.pool == WINED3DPOOL_DEFAULT) { + if (texture->resource.pool == WINED3DPOOL_DEFAULT) + { /* Tell opengl to try and keep this texture in video ram (well mostly) */ GLclampf tmp; tmp = 0.9f; @@ -288,10 +289,11 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac gl_tex->states[WINED3DTEXSTA_MAXANISOTROPY] = 1; gl_tex->states[WINED3DTEXSTA_SRGBTEXTURE] = 0; gl_tex->states[WINED3DTEXSTA_SHADOW] = FALSE; - basetexture_set_dirty(This, TRUE); + basetexture_set_dirty(texture, TRUE); isNewTexture = TRUE; - if(This->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP) { + if (texture->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP) + { /* This means double binding the texture at creation, but keeps the code simpler all * in all, and the run-time path free from additional checks */ @@ -319,9 +321,9 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac */ if (textureDimensions != GL_TEXTURE_RECTANGLE_ARB) { - TRACE("Setting GL_TEXTURE_MAX_LEVEL to %u.\n", This->baseTexture.level_count - 1); - glTexParameteri(textureDimensions, GL_TEXTURE_MAX_LEVEL, This->baseTexture.level_count - 1); - checkGLcall("glTexParameteri(textureDimensions, GL_TEXTURE_MAX_LEVEL, This->baseTexture.level_count)"); + TRACE("Setting GL_TEXTURE_MAX_LEVEL to %u.\n", texture->baseTexture.level_count - 1); + glTexParameteri(textureDimensions, GL_TEXTURE_MAX_LEVEL, texture->baseTexture.level_count - 1); + checkGLcall("glTexParameteri(textureDimensions, GL_TEXTURE_MAX_LEVEL, texture->baseTexture.level_count)"); } if(textureDimensions==GL_TEXTURE_CUBE_MAP_ARB) { /* Cubemaps are always set to clamp, regardless of the sampler state. */ diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index e3a0583..70fca05 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -283,7 +283,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *i TRACE("(%p) : relay to BaseTexture\n", This); - hr = basetexture_bind((IWineD3DBaseTexture *)iface, srgb, &set_gl_texture_desc); + hr = basetexture_bind((IWineD3DBaseTextureImpl *)iface, srgb, &set_gl_texture_desc); if (set_gl_texture_desc && SUCCEEDED(hr)) { UINT sub_count = This->baseTexture.level_count * This->baseTexture.layer_count; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 232f105..da0e175 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -274,7 +274,7 @@ static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface, BO TRACE("(%p) : relay to BaseTexture\n", This); - hr = basetexture_bind((IWineD3DBaseTexture *)iface, srgb, &set_gl_texture_desc); + hr = basetexture_bind((IWineD3DBaseTextureImpl *)iface, srgb, &set_gl_texture_desc); if (set_gl_texture_desc && SUCCEEDED(hr)) { UINT i; struct gl_texture *gl_tex; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index b2ddce1..23694df 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -237,7 +237,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTextur TRACE("iface %p, srgb %#x.\n", iface, srgb); - return basetexture_bind((IWineD3DBaseTexture *)iface, srgb, &dummy); + return basetexture_bind((IWineD3DBaseTextureImpl *)iface, srgb, &dummy); } static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DVolumeTexture *iface) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e22cc9f..9eb550e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1912,7 +1912,7 @@ typedef struct IWineD3DBaseTextureImpl void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; +HRESULT basetexture_bind(IWineD3DBaseTextureImpl *texture, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_apply_state_changes ().
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: a2c81adae12b2e9c1d0984e5fb5a449146a2f13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c81adae12b2e9c1d0984e5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 3 18:51:40 2011 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_apply_state_changes(). --- dlls/wined3d/basetexture.c | 36 +++++++++++++++++------------------- dlls/wined3d/state.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 241d434..1005e87 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -370,24 +370,22 @@ static void apply_wrap(const struct wined3d_gl_info *gl_info, GLenum target, } /* GL locking is done by the caller (state handler) */ -void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, +void basetexture_apply_state_changes(IWineD3DBaseTextureImpl *texture, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - GLenum textureDimensions = This->baseTexture.target; + BOOL cond_np2 = IWineD3DBaseTexture_IsCondNP2((IWineD3DBaseTexture *)texture); + GLenum textureDimensions = texture->baseTexture.target; DWORD state; - BOOL cond_np2 = IWineD3DBaseTexture_IsCondNP2(iface); DWORD aniso; struct gl_texture *gl_tex; - TRACE("iface %p, samplerStates %p\n", iface, samplerStates); + TRACE("texture %p, samplerStates %p\n", texture, samplerStates); - if(This->baseTexture.is_srgb) { - gl_tex = &This->baseTexture.texture_srgb; - } else { - gl_tex = &This->baseTexture.texture_rgb; - } + if (texture->baseTexture.is_srgb) + gl_tex = &texture->baseTexture.texture_srgb; + else + gl_tex = &texture->baseTexture.texture_rgb; /* This function relies on the correct texture being bound and loaded. */ @@ -427,7 +425,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, FIXME("Unrecognized or unsupported MAGFILTER* value %d\n", state); } - glValue = wined3d_gl_mag_filter(This->baseTexture.magLookup, + glValue = wined3d_gl_mag_filter(texture->baseTexture.magLookup, min(max(state, WINED3DTEXF_POINT), WINED3DTEXF_LINEAR)); TRACE("ValueMAG=%d setting MAGFILTER to %x\n", state, glValue); glTexParameteri(textureDimensions, GL_TEXTURE_MAG_FILTER, glValue); @@ -452,7 +450,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, gl_tex->states[WINED3DTEXSTA_MINFILTER], gl_tex->states[WINED3DTEXSTA_MIPFILTER]); } - glValue = wined3d_gl_min_mip_filter(This->baseTexture.minMipLookup, + glValue = wined3d_gl_min_mip_filter(texture->baseTexture.minMipLookup, min(max(samplerStates[WINED3DSAMP_MINFILTER], WINED3DTEXF_POINT), WINED3DTEXF_LINEAR), min(max(samplerStates[WINED3DSAMP_MIPFILTER], WINED3DTEXF_NONE), WINED3DTEXF_LINEAR)); @@ -465,12 +463,12 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, if (!cond_np2) { if (gl_tex->states[WINED3DTEXSTA_MIPFILTER] == WINED3DTEXF_NONE) - glValue = This->baseTexture.LOD; - else if (gl_tex->states[WINED3DTEXSTA_MAXMIPLEVEL] >= This->baseTexture.level_count) - glValue = This->baseTexture.level_count - 1; - else if (gl_tex->states[WINED3DTEXSTA_MAXMIPLEVEL] < This->baseTexture.LOD) + glValue = texture->baseTexture.LOD; + else if (gl_tex->states[WINED3DTEXSTA_MAXMIPLEVEL] >= texture->baseTexture.level_count) + glValue = texture->baseTexture.level_count - 1; + else if (gl_tex->states[WINED3DTEXSTA_MAXMIPLEVEL] < texture->baseTexture.LOD) /* baseTexture.LOD is already clamped in the setter */ - glValue = This->baseTexture.LOD; + glValue = texture->baseTexture.LOD; else glValue = gl_tex->states[WINED3DTEXSTA_MAXMIPLEVEL]; @@ -508,10 +506,10 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, gl_tex->states[WINED3DTEXSTA_MAXANISOTROPY] = aniso; } - if (!(This->resource.format->flags & WINED3DFMT_FLAG_SHADOW) + if (!(texture->resource.format->flags & WINED3DFMT_FLAG_SHADOW) != !gl_tex->states[WINED3DTEXSTA_SHADOW]) { - if (This->resource.format->flags & WINED3DFMT_FLAG_SHADOW) + if (texture->resource.format->flags & WINED3DFMT_FLAG_SHADOW) { glTexParameteri(textureDimensions, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); glTexParameteri(textureDimensions, GL_TEXTURE_COMPARE_MODE_ARB, GL_COMPARE_R_TO_TEXTURE_ARB); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 77f3b98..0df1597 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3643,10 +3643,10 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w if (state->textures[sampler]) { - IWineD3DBaseTexture *texture = (IWineD3DBaseTexture *)state->textures[sampler]; + IWineD3DBaseTextureImpl *texture = state->textures[sampler]; BOOL srgb = state->sampler_states[sampler][WINED3DSAMP_SRGBTEXTURE]; - IWineD3DBaseTexture_BindTexture(texture, srgb); + IWineD3DBaseTexture_BindTexture((IWineD3DBaseTexture *)texture, srgb); basetexture_apply_state_changes(texture, state->sampler_states[sampler], gl_info); @@ -3671,7 +3671,7 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w } /* Trigger shader constant reloading (for NP2 texcoord fixup) */ - if (!state->textures[sampler]->baseTexture.pow2Matrix_identity) + if (!texture->baseTexture.pow2Matrix_identity) { device->shader_backend->shader_load_np2fixup_constants(device->shader_priv, gl_info, state); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9eb550e..98823db 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1909,7 +1909,7 @@ typedef struct IWineD3DBaseTextureImpl } IWineD3DBaseTextureImpl; -void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, +void basetexture_apply_state_changes(IWineD3DBaseTextureImpl *texture, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT basetexture_bind(IWineD3DBaseTextureImpl *texture, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to internal_preload().
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 3a59137b0921e4cc4db0c7fac5112697471cda3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a59137b0921e4cc4db0c7fac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 3 18:51:41 2011 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to internal_preload(). --- dlls/wined3d/cubetexture.c | 33 ++++++++++++++++----------------- dlls/wined3d/device.c | 5 +++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/texture.c | 33 ++++++++++++++++----------------- dlls/wined3d/volumetexture.c | 37 ++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 3 ++- 6 files changed, 57 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a59137b0921e4cc4db0c…

1 0

Jacek Caban : urlmon: Fixed IUriBuilderFactory declaration.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: d34bbb2b52615a88cac8f2f0dca0a48b6e46bb25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d34bbb2b52615a88cac8f2f0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 3 23:48:18 2011 +0100 urlmon: Fixed IUriBuilderFactory declaration. --- dlls/urlmon/tests/uri.c | 19 ++++++++----------- dlls/urlmon/uri.c | 20 ++++++++++---------- include/urlmon.idl | 6 +++--- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index fd9099c..44f438f 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -9090,23 +9090,23 @@ static void test_IUriBuilderFactory(void) { if(SUCCEEDED(hr)) { builder = (void*) 0xdeadbeef; - hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 10, 0, &builder); + hr = IUriBuilderFactory_CreateIUriBuilder(factory, 10, 0, &builder); ok(hr == E_INVALIDARG, "Error: CreateInitializedIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder); builder = (void*) 0xdeadbeef; - hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 0, 10, &builder); + hr = IUriBuilderFactory_CreateIUriBuilder(factory, 0, 10, &builder); ok(hr == E_INVALIDARG, "Error: CreateInitializedIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder); - hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 0, 0, NULL); + hr = IUriBuilderFactory_CreateIUriBuilder(factory, 0, 0, NULL); ok(hr == E_POINTER, "Error: CreateInitializedIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); builder = NULL; - hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 0, 0, &builder); + hr = IUriBuilderFactory_CreateIUriBuilder(factory, 0, 0, &builder); ok(hr == S_OK, "Error: CreateInitializedIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, S_OK); if(SUCCEEDED(hr)) { @@ -9114,9 +9114,6 @@ static void test_IUriBuilderFactory(void) { LPCWSTR result; DWORD result_len; - /* Seems microsoft had a bit of mixup naming this function. It - * returns an uninitialized IUriBuilder. - */ hr = IUriBuilder_GetIUri(builder, &tmp); ok(hr == S_OK, "Error: GetIUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); @@ -9129,23 +9126,23 @@ static void test_IUriBuilderFactory(void) { if(builder) IUriBuilder_Release(builder); builder = (void*) 0xdeadbeef; - hr = IUriBuilderFactory_CreateIUriBuilder(factory, 10, 0, &builder); + hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 10, 0, &builder); ok(hr == E_INVALIDARG, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder); builder = (void*) 0xdeadbeef; - hr = IUriBuilderFactory_CreateIUriBuilder(factory, 0, 10, &builder); + hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 0, 10, &builder); ok(hr == E_INVALIDARG, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder); - hr = IUriBuilderFactory_CreateIUriBuilder(factory, 0, 0, NULL); + hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 0, 0, NULL); ok(hr == E_POINTER, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); builder = NULL; - hr = IUriBuilderFactory_CreateIUriBuilder(factory, 0, 0, &builder); + hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 0, 0, &builder); ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, S_OK); if(SUCCEEDED(hr)) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 825c6c5..7f8a441 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5007,10 +5007,10 @@ static ULONG WINAPI UriBuilderFactory_Release(IUriBuilderFactory *iface) return ref; } -static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilderFactory *iface, - DWORD dwFlags, - DWORD_PTR dwReserved, - IUriBuilder **ppIUriBuilder) +static HRESULT WINAPI UriBuilderFactory_CreateIUriBuilder(IUriBuilderFactory *iface, + DWORD dwFlags, + DWORD_PTR dwReserved, + IUriBuilder **ppIUriBuilder) { Uri *This = impl_from_IUriBuilderFactory(iface); TRACE("(%p)->(%08x %08x %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); @@ -5026,10 +5026,10 @@ static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilder return CreateIUriBuilder(NULL, 0, 0, ppIUriBuilder); } -static HRESULT WINAPI UriBuilderFactory_CreateIUriBuilder(IUriBuilderFactory *iface, - DWORD dwFlags, - DWORD_PTR dwReserved, - IUriBuilder **ppIUriBuilder) +static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilderFactory *iface, + DWORD dwFlags, + DWORD_PTR dwReserved, + IUriBuilder **ppIUriBuilder) { Uri *This = impl_from_IUriBuilderFactory(iface); TRACE("(%p)->(%08x %08x %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); @@ -5049,8 +5049,8 @@ static const IUriBuilderFactoryVtbl UriBuilderFactoryVtbl = { UriBuilderFactory_QueryInterface, UriBuilderFactory_AddRef, UriBuilderFactory_Release, - UriBuilderFactory_CreateInitializedIUriBuilder, - UriBuilderFactory_CreateIUriBuilder + UriBuilderFactory_CreateIUriBuilder, + UriBuilderFactory_CreateInitializedIUriBuilder }; static Uri* create_uri_obj(void) { diff --git a/include/urlmon.idl b/include/urlmon.idl index d2a46a0..240b6a7 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1839,16 +1839,16 @@ cpp_quote("HRESULT WINAPI CreateIUriBuilder(IUri*,DWORD,DWORD_PTR,IUriBuilder**) ] interface IUriBuilderFactory : IUnknown { - HRESULT CreateInitializedIUriBuilder( + HRESULT CreateIUriBuilder( [in] DWORD dwFlags, [in] DWORD_PTR dwReserved, [out] IUriBuilder **ppIUriBuilder); - HRESULT CreateIUriBuilder( + HRESULT CreateInitializedIUriBuilder( [in] DWORD dwFlags, [in] DWORD_PTR dwReserved, [out] IUriBuilder **ppIUriBuilder); -}; +} /***************************************************************************** * IInternetProtocolEx interface

1 0

Jacek Caban : mshtml: Make nsIURI::Resolve implementation IUri-based.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 2d0ec719622780269575a21e45d7ce89514f4d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d0ec719622780269575a21e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 3 23:48:29 2011 +0100 mshtml: Make nsIURI::Resolve implementation IUri-based. --- dlls/mshtml/nsio.c | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e5cfa78..1a8c4fd 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2048,36 +2048,43 @@ static nsresult NSAPI nsURI_Resolve(nsIURL *iface, const nsACString *aRelativePa nsACString *_retval) { nsWineURI *This = NSURI_THIS(iface); - WCHAR url[INTERNET_MAX_URL_LENGTH]; const char *patha; + IUri *new_uri; WCHAR *path; - char *urla; - DWORD len; + char *reta; + BSTR ret; HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_nsacstr(aRelativePath), _retval); + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + nsACString_GetData(aRelativePath, &patha); path = heap_strdupAtoW(patha); if(!path) return NS_ERROR_OUT_OF_MEMORY; - hres = CoInternetCombineUrl(This->wine_url, path, - URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, - url, sizeof(url)/sizeof(WCHAR), &len, 0); + hres = CoInternetCombineUrlEx(This->uri, path, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, &new_uri, 0); heap_free(path); if(FAILED(hres)) { - ERR("CoIntenetCombineUrl failed: %08x\n", hres); + ERR("CoIntenetCombineUrlEx failed: %08x\n", hres); return NS_ERROR_FAILURE; } - urla = heap_strdupWtoA(url); - if(!urla) + hres = IUri_GetDisplayUri(new_uri, &ret); + IUri_Release(new_uri); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + reta = heap_strdupWtoA(ret); + SysFreeString(ret); + if(!reta) return NS_ERROR_OUT_OF_MEMORY; - TRACE("returning %s\n", debugstr_a(urla)); - nsACString_SetData(_retval, urla); - heap_free(urla); + TRACE("returning %s\n", debugstr_a(reta)); + nsACString_SetData(_retval, reta); + heap_free(reta); return NS_OK; }

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLFormElement iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 95d8566a83f701171bd072b85b13847c4f0a5920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d8566a83f701171bd072b85… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:44:12 2011 +0100 mshtml: COM cleanup for the IHTMLFormElement iface. --- dlls/mshtml/htmlform.c | 81 +++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95d8566a83f701171bd07…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the nsIFactory iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: a59cc1a630049ce996ae70cda5ffd599ed79705b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59cc1a630049ce996ae70cda… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:46:39 2011 +0100 mshtml: COM cleanup for the nsIFactory iface. --- dlls/mshtml/nsservice.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c index b280020..a2b6cab 100644 --- a/dlls/mshtml/nsservice.c +++ b/dlls/mshtml/nsservice.c @@ -377,27 +377,28 @@ static const nsITooltipTextProviderVtbl nsTooltipTextProviderVtbl = { static nsITooltipTextProvider nsTooltipTextProvider = { &nsTooltipTextProviderVtbl }; typedef struct { - const nsIFactoryVtbl *lpFactoryVtbl; + nsIFactory nsIFactory_iface; nsISupports *service; } nsServiceFactory; -#define NSFACTORY(x) ((nsIFactory*) &(x)->lpFactoryVtbl) - -#define NSFACTORY_THIS(iface) DEFINE_THIS(nsServiceFactory, Factory, iface) +static inline nsServiceFactory *impl_from_nsIFactory(nsIFactory *iface) +{ + return CONTAINING_RECORD(iface, nsServiceFactory, nsIFactory_iface); +} static nsresult NSAPI nsServiceFactory_QueryInterface(nsIFactory *iface, nsIIDRef riid, void **result) { - nsServiceFactory *This = NSFACTORY_THIS(iface); + nsServiceFactory *This = impl_from_nsIFactory(iface); *result = NULL; if(IsEqualGUID(&IID_nsISupports, riid)) { TRACE("(%p)->(IID_nsISupports %p)\n", This, result); - *result = NSFACTORY(This); + *result = &This->nsIFactory_iface; }else if(IsEqualGUID(&IID_nsIFactory, riid)) { TRACE("(%p)->(IID_nsIFactory %p)\n", This, result); - *result = NSFACTORY(This); + *result = &This->nsIFactory_iface; } if(*result) @@ -420,7 +421,7 @@ static nsrefcnt NSAPI nsServiceFactory_Release(nsIFactory *iface) static nsresult NSAPI nsServiceFactory_CreateInstance(nsIFactory *iface, nsISupports *aOuter, const nsIID *iid, void **result) { - nsServiceFactory *This = NSFACTORY_THIS(iface); + nsServiceFactory *This = impl_from_nsIFactory(iface); TRACE("(%p)->(%p %s %p)\n", This, aOuter, debugstr_guid(iid), result); @@ -429,13 +430,11 @@ static nsresult NSAPI nsServiceFactory_CreateInstance(nsIFactory *iface, static nsresult NSAPI nsServiceFactory_LockFactory(nsIFactory *iface, PRBool lock) { - nsServiceFactory *This = NSFACTORY_THIS(iface); + nsServiceFactory *This = impl_from_nsIFactory(iface); WARN("(%p)->(%x)\n", This, lock); return NS_OK; } -#undef NSFACTORY_THIS - static const nsIFactoryVtbl nsServiceFactoryVtbl = { nsServiceFactory_QueryInterface, nsServiceFactory_AddRef, @@ -445,12 +444,12 @@ static const nsIFactoryVtbl nsServiceFactoryVtbl = { }; static nsServiceFactory nsPromptServiceFactory = { - &nsServiceFactoryVtbl, + { &nsServiceFactoryVtbl }, (nsISupports*)&nsPromptService }; static nsServiceFactory nsTooltipTextFactory = { - &nsServiceFactoryVtbl, + { &nsServiceFactoryVtbl }, (nsISupports*)&nsTooltipTextProvider }; @@ -460,7 +459,7 @@ void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *ser nsresult nsres; nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_PROMPTSERVICE_CID, - "Prompt Service", NS_PROMPTSERVICE_CONTRACTID, NSFACTORY(&nsPromptServiceFactory)); + "Prompt Service", NS_PROMPTSERVICE_CONTRACTID, &nsPromptServiceFactory.nsIFactory_iface); if(NS_FAILED(nsres)) ERR("RegisterFactory failed: %08x\n", nsres); @@ -478,7 +477,7 @@ void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *ser nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_TOOLTIPTEXTPROVIDER_CID, NS_TOOLTIPTEXTPROVIDER_CLASSNAME, NS_TOOLTIPTEXTPROVIDER_CONTRACTID, - NSFACTORY(&nsTooltipTextFactory)); + &nsTooltipTextFactory.nsIFactory_iface); if(NS_FAILED(nsres)) ERR("RegisterFactory failed: %08x\n", nsres); }

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLCommentElement iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 78a10a627f89469147563d56fd96a93a1039ef9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a10a627f89469147563d56f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:48:22 2011 +0100 mshtml: COM cleanup for the IHTMLCommentElement iface. --- dlls/mshtml/htmlcomment.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 84d1347..e97127e 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -34,45 +34,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLCommentElement { HTMLElement element; - const IHTMLCommentElementVtbl *lpIHTMLCommentElementVtbl; + IHTMLCommentElement IHTMLCommentElement_iface; }; -#define HTMLCOMMENT(x) (&(x)->lpIHTMLCommentElementVtbl) - -#define HTMLCOMMENT_THIS(iface) DEFINE_THIS(HTMLCommentElement, IHTMLCommentElement, iface) +static inline HTMLCommentElement *impl_from_IHTMLCommentElement(IHTMLCommentElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLCommentElement, IHTMLCommentElement_iface); +} static HRESULT WINAPI HTMLCommentElement_QueryInterface(IHTMLCommentElement *iface, REFIID riid, void **ppv) { - HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); } static ULONG WINAPI HTMLCommentElement_AddRef(IHTMLCommentElement *iface) { - HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); } static ULONG WINAPI HTMLCommentElement_Release(IHTMLCommentElement *iface) { - HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); } static HRESULT WINAPI HTMLCommentElement_GetTypeInfoCount(IHTMLCommentElement *iface, UINT *pctinfo) { - HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); return IDispatchEx_GetTypeInfoCount(&This->element.node.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLCommentElement_GetTypeInfo(IHTMLCommentElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); return IDispatchEx_GetTypeInfo(&This->element.node.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -81,7 +82,7 @@ static HRESULT WINAPI HTMLCommentElement_GetIDsOfNames(IHTMLCommentElement *ifac LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); return IDispatchEx_GetIDsOfNames(&This->element.node.dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -90,21 +91,21 @@ static HRESULT WINAPI HTMLCommentElement_Invoke(IHTMLCommentElement *iface, DISP REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); return IDispatchEx_Invoke(&This->element.node.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLCommentElement_put_text(IHTMLCommentElement *iface, BSTR v) { - HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLCommentElement_get_text(IHTMLCommentElement *iface, BSTR *p) { - HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); TRACE("(%p)->(%p)\n", This, p); @@ -113,20 +114,18 @@ static HRESULT WINAPI HTMLCommentElement_get_text(IHTMLCommentElement *iface, BS static HRESULT WINAPI HTMLCommentElement_put_atomic(IHTMLCommentElement *iface, LONG v) { - HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLCommentElement_get_atomic(IHTMLCommentElement *iface, LONG *p) { - HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + HTMLCommentElement *This = impl_from_IHTMLCommentElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } -#undef HTMLCOMMENT_THIS - static const IHTMLCommentElementVtbl HTMLCommentElementVtbl = { HTMLCommentElement_QueryInterface, HTMLCommentElement_AddRef, @@ -154,7 +153,7 @@ static HRESULT HTMLCommentElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv if(IsEqualGUID(&IID_IHTMLCommentElement, riid)) { TRACE("(%p)->(IID_IHTMLCommentElement %p)\n", This, ppv); - *ppv = HTMLCOMMENT(This); + *ppv = &This->IHTMLCommentElement_iface; }else { return HTMLElement_QI(&This->element.node, riid, ppv); } @@ -197,7 +196,7 @@ HRESULT HTMLCommentElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTM return E_OUTOFMEMORY; ret->element.node.vtbl = &HTMLCommentElementImplVtbl; - ret->lpIHTMLCommentElementVtbl = &HTMLCommentElementVtbl; + ret->IHTMLCommentElement_iface.lpVtbl = &HTMLCommentElementVtbl; HTMLElement_Init(&ret->element, doc, NULL, &HTMLCommentElement_dispex);

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLStyleSheet* ifaces.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 51b047825446baee7a4b02a87d913266a6bf2f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b047825446baee7a4b02a87… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:50:04 2011 +0100 mshtml: COM cleanup for the IHTMLStyleSheet* ifaces. --- dlls/mshtml/htmlstylesheet.c | 156 +++++++++++++++++++++--------------------- 1 files changed, 78 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51b047825446baee7a4b0…

1 0