December 2010 - Wine-commits

Jacek Caban : mshtml: Added more plugin in place activation support.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 41ca6568be0666dbd9063a2c298fd1d7dcf19ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ca6568be0666dbd9063a2c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 13 16:00:58 2010 +0100 mshtml: Added more plugin in place activation support. --- dlls/mshtml/pluginhost.c | 38 +++++++++++++++++++++++++++++++++----- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index cc90dc7..8f280c5 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -208,21 +208,39 @@ static void activate_plugin(PluginHost *host) IOleObject_Release(ole_obj); if(FAILED(hres)) WARN("DoVerb failed: %08x\n", hres); + + if(host->ip_object) { + HWND hwnd; + + hres = IOleInPlaceObject_GetWindow(host->ip_object, &hwnd); + if(SUCCEEDED(hres)) + TRACE("hwnd %p\n", hwnd); + } } void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) { + BOOL rect_changed = FALSE; + if(!hwnd || (host->hwnd && host->hwnd != hwnd)) { FIXME("unhandled hwnd\n"); return; } - host->rect = *rect; + TRACE("%p %s\n", hwnd, wine_dbgstr_rect(rect)); + + if(memcmp(rect, &host->rect, sizeof(RECT))) { + host->rect = *rect; + rect_changed = TRUE; + } if(!host->hwnd) { host->hwnd = hwnd; activate_plugin(host); } + + if(rect_changed && host->ip_object) + IOleInPlaceObject_SetObjectRects(host->ip_object, &host->rect, &host->rect); } static inline PluginHost *impl_from_IOleClientSite(IOleClientSite *iface) @@ -602,8 +620,11 @@ static ULONG WINAPI PHInPlaceSite_Release(IOleInPlaceSiteEx *iface) static HRESULT WINAPI PHInPlaceSite_GetWindow(IOleInPlaceSiteEx *iface, HWND *phwnd) { PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, phwnd); + + *phwnd = This->hwnd; + return S_OK; } static HRESULT WINAPI PHInPlaceSite_ContextSensitiveHelp(IOleInPlaceSiteEx *iface, BOOL fEnterMode) @@ -693,8 +714,15 @@ static HRESULT WINAPI PHInPlaceSite_OnUIDeactivate(IOleInPlaceSiteEx *iface, BOO static HRESULT WINAPI PHInPlaceSite_OnInPlaceDeactivate(IOleInPlaceSiteEx *iface) { PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if(This->ip_object) { + IOleInPlaceObject_Release(This->ip_object); + This->ip_object = NULL; + } + + return S_OK; } static HRESULT WINAPI PHInPlaceSite_DiscardUndoState(IOleInPlaceSiteEx *iface)

1 0

Jacek Caban : mshtml: Added more ActiveX tests.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 4fd57881374ba9cb04c7dec90e0727895980a8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd57881374ba9cb04c7dec90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 13 16:01:08 2010 +0100 mshtml: Added more ActiveX tests. --- dlls/mshtml/tests/activex.c | 443 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 438 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4fd57881374ba9cb04c7d…

1 0

Piotr Caban : sane.ds: Convert Polish translation to UTF-8.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: c0c781b14d4ad95de48095eb9f1bf9bdddd0dc18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c781b14d4ad95de48095eb9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 13 16:20:14 2010 +0100 sane.ds: Convert Polish translation to UTF-8. --- dlls/sane.ds/sane_Pl.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/sane_Pl.rc b/dlls/sane.ds/sane_Pl.rc index 935c65c..11ffe0f 100644 --- a/dlls/sane.ds/sane_Pl.rc +++ b/dlls/sane.ds/sane_Pl.rc @@ -21,6 +21,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG 0, 0, 186, 46 @@ -28,7 +30,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTE CAPTION "Skanowanie" FONT 8, "MS Sans Serif" BEGIN - LTEXT "TRWA SKANOWANIE... Prosz� czeka�",IDC_STATIC,5,19,181,8, SS_CENTER + LTEXT "TRWA SKANOWANIE... Proszę czekać",IDC_STATIC,5,19,181,8, SS_CENTER END STRINGTABLE

1 0

André Hentschel : advapi32: Fix test failure on some NT4 machines.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: f36b59349832450b6456d58a6b580abc06901e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36b59349832450b6456d58a6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 12 22:28:18 2010 +0100 advapi32: Fix test failure on some NT4 machines. --- dlls/advapi32/tests/crypt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 6cfbbbf..99f113d 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -945,7 +945,8 @@ static void test_machine_guid(void) r); /* Create and release a provider */ ret = pCryptAcquireContextA(&hCryptProv, szKeySet, NULL, PROV_RSA_FULL, 0); - ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); + ok(ret || broken(!ret && GetLastError() == NTE_KEYSET_ENTRY_BAD /* NT4 */), + "CryptAcquireContextA failed: %08x\n", GetLastError()); pCryptReleaseContext(hCryptProv, 0); if (restoreGuid)

1 0

André Hentschel : ntdll: Fix test failure on some NT4 machines.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 74fecb35138b2162c20d1c717267b28c57cfece3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74fecb35138b2162c20d1c717… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 12 22:28:36 2010 +0100 ntdll: Fix test failure on some NT4 machines. --- dlls/ntdll/tests/error.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 1e44da0..d9c83b3 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -224,7 +224,7 @@ static void run_error_tests(void) cmp(STATUS_WRONG_VOLUME, ERROR_WRONG_DISK); cmp(STATUS_NO_MEDIA, ERROR_NO_MEDIA_IN_DRIVE); cmp(STATUS_NO_MEDIA_IN_DEVICE, ERROR_NOT_READY); - cmp(STATUS_VOLUME_DISMOUNTED, ERROR_NOT_READY); + cmp2(STATUS_VOLUME_DISMOUNTED, ERROR_NOT_READY); cmp(STATUS_NONEXISTENT_SECTOR, ERROR_SECTOR_NOT_FOUND); cmp(STATUS_WORKING_SET_QUOTA, ERROR_WORKING_SET_QUOTA); cmp(STATUS_NO_MEMORY, ERROR_NOT_ENOUGH_MEMORY);

1 0

André Hentschel : rsaenh: Fix test failure on some NT4 machines.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 59852bc3a06c352947c7b475133371f4d9206da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59852bc3a06c352947c7b4751… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 12 22:28:44 2010 +0100 rsaenh: Fix test failure on some NT4 machines. --- dlls/rsaenh/tests/rsaenh.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 5ee85f4..8f46a09 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2362,7 +2362,8 @@ static void test_rsa_round_trip(void) dataLen = strlen(test_string) + 1; result = CryptEncrypt(keyExchangeKey, 0, TRUE, 0, data, &dataLen, sizeof(data)); - ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */), + ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */) || + broken(GetLastError() == NTE_PERM /* NT4 */), "CryptEncrypt failed: %08x\n", GetLastError()); /* export the key... */ result = CryptExportKey(keyExchangeKey, 0, PRIVATEKEYBLOB, 0, NULL, @@ -2382,7 +2383,8 @@ static void test_rsa_round_trip(void) * key. */ result = CryptDecrypt(keyExchangeKey, 0, TRUE, 0, data, &dataLen); - ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */), + ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */) || + broken(GetLastError() == NTE_PERM /* NT4 */), "CryptDecrypt failed: %08x\n", GetLastError()); if (result) {

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_destroy().
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: fe2ffe1e6a47f190c3e3b508267bf1bbd96da4fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2ffe1e6a47f190c3e3b5082… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 13 13:40:32 2010 +0100 wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_destroy(). --- dlls/wined3d/arb_program_shader.c | 16 ++++++------ dlls/wined3d/device.c | 5 ++- dlls/wined3d/glsl_shader.c | 44 ++++++++++++++++++++---------------- dlls/wined3d/shader.c | 4 +- dlls/wined3d/wined3d_private.h | 3 +- 5 files changed, 39 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bd5b197..1526e70 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4702,14 +4702,14 @@ static void shader_arb_deselect_depth_blt(void *shader_priv, const struct wined3 } } -static void shader_arb_destroy(IWineD3DBaseShader *iface) { - IWineD3DBaseShaderImpl *baseShader = (IWineD3DBaseShaderImpl *) iface; - IWineD3DDeviceImpl *device = baseShader->baseShader.device; +static void shader_arb_destroy(IWineD3DBaseShaderImpl *shader) +{ + IWineD3DDeviceImpl *device = shader->baseShader.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - if (shader_is_pshader_version(baseShader->baseShader.reg_maps.shader_version.type)) + if (shader_is_pshader_version(shader->baseShader.reg_maps.shader_version.type)) { - struct arb_pshader_private *shader_data = baseShader->baseShader.backend_data; + struct arb_pshader_private *shader_data = shader->baseShader.backend_data; UINT i; if(!shader_data) return; /* This can happen if a shader was never compiled */ @@ -4731,11 +4731,11 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { HeapFree(GetProcessHeap(), 0, shader_data->gl_shaders); HeapFree(GetProcessHeap(), 0, shader_data); - baseShader->baseShader.backend_data = NULL; + shader->baseShader.backend_data = NULL; } else { - struct arb_vshader_private *shader_data = baseShader->baseShader.backend_data; + struct arb_vshader_private *shader_data = shader->baseShader.backend_data; UINT i; if(!shader_data) return; /* This can happen if a shader was never compiled */ @@ -4757,7 +4757,7 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { HeapFree(GetProcessHeap(), 0, shader_data->gl_shaders); HeapFree(GetProcessHeap(), 0, shader_data); - baseShader->baseShader.backend_data = NULL; + shader->baseShader.backend_data = NULL; } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 15b9020..0789ed9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6182,8 +6182,9 @@ static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl gl_info = context->gl_info; IWineD3DDevice_EnumResources(iface, reset_unload_resources, NULL); - LIST_FOR_EACH_ENTRY(shader, &This->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) { - This->shader_backend->shader_destroy((IWineD3DBaseShader *) shader); + LIST_FOR_EACH_ENTRY(shader, &This->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) + { + This->shader_backend->shader_destroy(shader); } ENTER_GL(); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a28e9ce..a2fb79a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4672,10 +4672,10 @@ static void shader_glsl_deselect_depth_blt(void *shader_priv, const struct wined checkGLcall("glUseProgramObjectARB"); } -static void shader_glsl_destroy(IWineD3DBaseShader *iface) { +static void shader_glsl_destroy(IWineD3DBaseShaderImpl *shader) +{ const struct list *linked_programs; - IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) iface; - IWineD3DDeviceImpl *device = This->baseShader.device; + IWineD3DDeviceImpl *device = shader->baseShader.device; struct shader_glsl_priv *priv = device->shader_priv; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -4683,41 +4683,44 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { /* Note: Do not use QueryInterface here to find out which shader type this is because this code * can be called from IWineD3DBaseShader::Release */ - char pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); + char pshader = shader_is_pshader_version(shader->baseShader.reg_maps.shader_version.type); + + if (pshader) + { + struct glsl_pshader_private *shader_data = shader->baseShader.backend_data; - if(pshader) { - struct glsl_pshader_private *shader_data; - shader_data = This->baseShader.backend_data; if (!shader_data || !shader_data->num_gl_shaders) { HeapFree(GetProcessHeap(), 0, shader_data); - This->baseShader.backend_data = NULL; + shader->baseShader.backend_data = NULL; return; } context = context_acquire(device, NULL); gl_info = context->gl_info; - if (priv->glsl_program && (IWineD3DBaseShader *)priv->glsl_program->pshader == iface) + if (priv->glsl_program && (IWineD3DBaseShaderImpl *)priv->glsl_program->pshader == shader) { ENTER_GL(); shader_glsl_select(context, FALSE, FALSE); LEAVE_GL(); } - } else { - struct glsl_vshader_private *shader_data; - shader_data = This->baseShader.backend_data; + } + else + { + struct glsl_vshader_private *shader_data = shader->baseShader.backend_data; + if (!shader_data || !shader_data->num_gl_shaders) { HeapFree(GetProcessHeap(), 0, shader_data); - This->baseShader.backend_data = NULL; + shader->baseShader.backend_data = NULL; return; } context = context_acquire(device, NULL); gl_info = context->gl_info; - if (priv->glsl_program && (IWineD3DBaseShader *)priv->glsl_program->vshader == iface) + if (priv->glsl_program && (IWineD3DBaseShaderImpl *)priv->glsl_program->vshader == shader) { ENTER_GL(); shader_glsl_select(context, FALSE, FALSE); @@ -4725,7 +4728,7 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { } } - linked_programs = &This->baseShader.linked_programs; + linked_programs = &shader->baseShader.linked_programs; TRACE("Deleting linked programs\n"); if (linked_programs->next) { @@ -4744,9 +4747,10 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { LEAVE_GL(); } - if(pshader) { + if (pshader) + { + struct glsl_pshader_private *shader_data = shader->baseShader.backend_data; UINT i; - struct glsl_pshader_private *shader_data = This->baseShader.backend_data; ENTER_GL(); for(i = 0; i < shader_data->num_gl_shaders; i++) { @@ -4759,8 +4763,8 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { } else { + struct glsl_vshader_private *shader_data = shader->baseShader.backend_data; UINT i; - struct glsl_vshader_private *shader_data = This->baseShader.backend_data; ENTER_GL(); for(i = 0; i < shader_data->num_gl_shaders; i++) { @@ -4772,8 +4776,8 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { HeapFree(GetProcessHeap(), 0, shader_data->gl_shaders); } - HeapFree(GetProcessHeap(), 0, This->baseShader.backend_data); - This->baseShader.backend_data = NULL; + HeapFree(GetProcessHeap(), 0, shader->baseShader.backend_data); + shader->baseShader.backend_data = NULL; context_release(context); } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4a72e88..1220e21 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1479,7 +1479,7 @@ static void shader_cleanup(IWineD3DBaseShader *iface) { IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; - shader->baseShader.device->shader_backend->shader_destroy(iface); + shader->baseShader.device->shader_backend->shader_destroy(shader); HeapFree(GetProcessHeap(), 0, shader->baseShader.reg_maps.constf); HeapFree(GetProcessHeap(), 0, shader->baseShader.function); shader_delete_constant_list(&shader->baseShader.constantsF); @@ -1503,7 +1503,7 @@ static void shader_none_update_float_pixel_constants(IWineD3DDeviceImpl *device, static void shader_none_load_constants(const struct wined3d_context *context, char usePS, char useVS) {} static void shader_none_load_np2fixup_constants(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) {} -static void shader_none_destroy(IWineD3DBaseShader *iface) {} +static void shader_none_destroy(IWineD3DBaseShaderImpl *shader) {} static HRESULT shader_none_alloc(IWineD3DDeviceImpl *device) {return WINED3D_OK;} static void shader_none_free(IWineD3DDeviceImpl *device) {} static BOOL shader_none_dirty_const(void) {return FALSE;} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7612eb..6769956 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -57,6 +57,7 @@ typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; typedef struct IWineD3DPaletteImpl IWineD3DPaletteImpl; typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl; typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl; +struct IWineD3DBaseShaderImpl; /* Texture format fixups */ @@ -758,7 +759,7 @@ typedef struct { void (*shader_load_constants)(const struct wined3d_context *context, char usePS, char useVS); void (*shader_load_np2fixup_constants)(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state); - void (*shader_destroy)(IWineD3DBaseShader *iface); + void (*shader_destroy)(struct IWineD3DBaseShaderImpl *shader); HRESULT (*shader_alloc_private)(IWineD3DDeviceImpl *device); void (*shader_free_private)(IWineD3DDeviceImpl *device); BOOL (*shader_dirtifyable_constants)(void);

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_cleanup().
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: bbbab10c8e647bba23929ca7db3a4803adf3fe29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbab10c8e647bba23929ca7d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 13 13:40:33 2010 +0100 wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_cleanup(). --- dlls/wined3d/shader.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1220e21..31ece02 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1475,10 +1475,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe } } -static void shader_cleanup(IWineD3DBaseShader *iface) +static void shader_cleanup(IWineD3DBaseShaderImpl *shader) { - IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; - shader->baseShader.device->shader_backend->shader_destroy(shader); HeapFree(GetProcessHeap(), 0, shader->baseShader.reg_maps.constf); HeapFree(GetProcessHeap(), 0, shader->baseShader.function); @@ -1661,7 +1659,7 @@ static ULONG STDMETHODCALLTYPE vertexshader_Release(IWineD3DVertexShader *iface) if (!refcount) { - shader_cleanup((IWineD3DBaseShader *)iface); + shader_cleanup((IWineD3DBaseShaderImpl *)shader); shader->baseShader.parent_ops->wined3d_object_destroyed(shader->baseShader.parent); HeapFree(GetProcessHeap(), 0, shader); } @@ -1860,7 +1858,7 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * if (FAILED(hr)) { WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup((IWineD3DBaseShader *)shader); + shader_cleanup((IWineD3DBaseShaderImpl *)shader); return hr; } @@ -1933,7 +1931,7 @@ static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DGeometryShader *if if (!refcount) { - shader_cleanup((IWineD3DBaseShader *)iface); + shader_cleanup((IWineD3DBaseShaderImpl *)shader); shader->base_shader.parent_ops->wined3d_object_destroyed(shader->base_shader.parent); HeapFree(GetProcessHeap(), 0, shader); } @@ -1980,7 +1978,7 @@ HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDevic if (FAILED(hr)) { WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup((IWineD3DBaseShader *)shader); + shader_cleanup((IWineD3DBaseShaderImpl *)shader); return hr; } @@ -2029,7 +2027,7 @@ static ULONG STDMETHODCALLTYPE pixelshader_Release(IWineD3DPixelShader *iface) if (!refcount) { - shader_cleanup((IWineD3DBaseShader *)iface); + shader_cleanup((IWineD3DBaseShaderImpl *)shader); shader->baseShader.parent_ops->wined3d_object_destroyed(shader->baseShader.parent); HeapFree(GetProcessHeap(), 0, shader); } @@ -2267,7 +2265,7 @@ HRESULT pixelshader_init(IWineD3DPixelShaderImpl *shader, IWineD3DDeviceImpl *de if (FAILED(hr)) { WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup((IWineD3DBaseShader *)shader); + shader_cleanup((IWineD3DBaseShaderImpl *)shader); return hr; }

1 0

Alexandre Julliard : comctl32: Fix positioning of tracking tooltips at the bottom of the screen.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 84a86d4897991360c6dc17f2ad9765282c32e06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a86d4897991360c6dc17f2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 16:24:49 2010 +0100 comctl32: Fix positioning of tracking tooltips at the bottom of the screen. --- dlls/comctl32/tooltips.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 5951796..774387a 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -636,7 +636,8 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) if (!(style & TTS_BALLOON)) rect.top -= (size.cy / 2); } - infoPtr->bToolBelow = TRUE; + if (!(infoPtr->bToolBelow = (infoPtr->yTrackPos + size.cy <= GetSystemMetrics(SM_CYSCREEN)))) + rect.top -= size.cy; if (!(toolPtr->uFlags & TTF_ABSOLUTE)) {

1 0

Jacek Caban : mshtml: Call DoVerb on embedded plugin.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 146b720f41f357f707f6af067f4fa5b5d153d439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=146b720f41f357f707f6af067… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 13 16:00:15 2010 +0100 mshtml: Call DoVerb on embedded plugin. --- dlls/mshtml/pluginhost.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index fc50be8..5b8ab71 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -88,6 +88,15 @@ static void update_readystate(PluginHost *host) } } +/* FIXME: We shouldn't need this function and we should embed plugin directly in the main document */ +void get_pos_rect(PluginHost *host, RECT *ret) +{ + ret->top = 0; + ret->left = 0; + ret->bottom = host->rect.bottom - host->rect.top; + ret->right = host->rect.right - host->rect.left; +} + static void load_prop_bag(PluginHost *host, IPersistPropertyBag *persist_prop_bag) { IPropertyBag *prop_bag; @@ -141,6 +150,9 @@ static void activate_plugin(PluginHost *host) { IClientSecurity *client_security; IQuickActivate *quick_activate; + IOleCommandTarget *cmdtrg; + IOleObject *ole_obj; + RECT rect; HRESULT hres; if(!host->plugin_unk) @@ -176,6 +188,26 @@ static void activate_plugin(PluginHost *host) } load_plugin(host); + + /* NOTE: Native QIs for IViewObjectEx, IActiveScript, an undocumented IID, IOleControl and IRunnableObject */ + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + FIXME("Use IOleCommandTarget\n"); + IOleCommandTarget_Release(cmdtrg); + } + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleObject, (void**)&ole_obj); + if(FAILED(hres)) { + FIXME("Plugin does not support IOleObject\n"); + return; + } + + get_pos_rect(host, &rect); + hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect); + IOleObject_Release(ole_obj); + if(FAILED(hres)) + WARN("DoVerb failed: %08x\n", hres); } void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) @@ -185,6 +217,8 @@ void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) return; } + host->rect = *rect; + if(!host->hwnd) { host->hwnd = hwnd; activate_plugin(host);

1 0