April 2010 - Wine-Commits - list.winehq.org

Detlef Riekenberg : urlmon/tests: CoInternetGetSecurityUrl is not present on W95B.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 40cfa7a6f2c0ff9311257e087d3744bcc5a5843f URL: http://source.winehq.org/git/wine.git/?a=commit;h=40cfa7a6f2c0ff9311257e087… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 14 05:41:50 2010 +0200 urlmon/tests: CoInternetGetSecurityUrl is not present on W95B. --- dlls/urlmon/tests/sec_mgr.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index e758115..239da6c 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -35,6 +35,8 @@ #include "initguid.h" +static HRESULT (WINAPI *pCoInternetGetSecurityUrl)(LPCWSTR, LPWSTR*, PSUACTION, DWORD); + static const WCHAR url1[] = {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l', '/','b','l','a','n','k','.','h','t','m',0}; static const WCHAR url2[] = {'i','n','d','e','x','.','h','t','m',0}; @@ -654,8 +656,13 @@ static void test_InternetGetSecurityUrl(void) DWORD i; HRESULT hres; + if (!pCoInternetGetSecurityUrl) { + win_skip("CoInternetGetSecurityUrl not found\n"); + return; + } + for(i=0; i<sizeof(in)/sizeof(WCHAR*); i++) { - hres = CoInternetGetSecurityUrl(in[i], &sec, PSU_DEFAULT, 0); + hres = pCoInternetGetSecurityUrl(in[i], &sec, PSU_DEFAULT, 0); ok(hres == S_OK, "(%d) CoInternetGetSecurityUrl returned: %08x\n", i, hres); if(hres == S_OK) { ok(!strcmp_w(sec, out_default[i]), "(%d) Got %s, expected %s\n", @@ -663,7 +670,7 @@ static void test_InternetGetSecurityUrl(void) CoTaskMemFree(sec); } - hres = CoInternetGetSecurityUrl(in[i], &sec, PSU_SECURITY_URL_ONLY, 0); + hres = pCoInternetGetSecurityUrl(in[i], &sec, PSU_SECURITY_URL_ONLY, 0); ok(hres == S_OK, "(%d) CoInternetGetSecurityUrl returned: %08x\n", i, hres); if(hres == S_OK) { ok(!strcmp_w(sec, out_securl[i]), "(%d) Got %s, expected %s\n", @@ -676,8 +683,13 @@ static void test_InternetGetSecurityUrl(void) START_TEST(sec_mgr) { + HMODULE hurlmon; + OleInitialize(NULL); + hurlmon = GetModuleHandle("urlmon.dll"); + pCoInternetGetSecurityUrl = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrl"); + test_InternetGetSecurityUrl(); test_SecurityManager(); test_polices();

1 0

Henri Verbeet : wined3d: Disable strict draw ordering by default.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 8eb2a2cf0c50f986cd136af13814dae0991cb837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eb2a2cf0c50f986cd136af13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 13 20:46:26 2010 +0200 wined3d: Disable strict draw ordering by default. While some performance hit from the extra flushes was expected and would be acceptable, the performance hit can be over 50% on some configurations, which clearly isn't acceptable. This patch introduces a "StrictDrawOrdering" registry key for applications affected by this, until we have a more structural solution. --- dlls/wined3d/arb_program_shader.c | 13 +++++++------ dlls/wined3d/device.c | 8 +++++--- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 18 +++++++++++++----- dlls/wined3d/wined3d_main.c | 9 ++++++++- dlls/wined3d/wined3d_private.h | 1 + 6 files changed, 35 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 44c4ab0..b939213 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6899,8 +6899,8 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect_in, enum blit_operation blit_op, DWORD Filter) { + IWineD3DSwapChainImpl *dst_swapchain; struct wined3d_context *context; - IWineD3DSwapChainImpl *dst_swapchain = NULL; RECT dst_rect = *dst_rect_in; /* Now load the surface */ @@ -6913,10 +6913,8 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ * while OpenGL coordinates are window relative. * Also beware of the origin difference(top left vs bottom left). * Also beware that the front buffer's surface size is screen width x screen height, - * whereas the real gl drawable size is the size of the window. - */ - IWineD3DSurface_GetContainer((IWineD3DSurface *)dst_surface, &IID_IWineD3DSwapChain, (void **)&dst_swapchain); - if (dst_swapchain) IWineD3DSwapChain_Release((IWineD3DSwapChain *)dst_swapchain); + * whereas the real gl drawable size is the size of the window. */ + dst_swapchain = (dst_surface->Flags & SFLAG_SWAPCHAIN) ? (IWineD3DSwapChainImpl *)dst_surface->container : NULL; if (dst_swapchain && (IWineD3DSurface *)dst_surface == dst_swapchain->frontBuffer) { RECT windowsize; @@ -6942,7 +6940,10 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ /* Leave the opengl state valid for blitting */ arbfp_blit_unset((IWineD3DDevice *)device); - wglFlush(); /* Flush to ensure ordering across contexts. */ + if (wined3d_settings.strict_draw_ordering || (dst_swapchain + && ((IWineD3DSurface *)dst_surface == dst_swapchain->frontBuffer + || dst_swapchain->num_contexts > 1))) + wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f8f7df4..6cd2831 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4496,7 +4496,9 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac LEAVE_GL(); - wglFlush(); /* Flush to ensure ordering across contexts. */ + if (wined3d_settings.strict_draw_ordering || ((target->Flags & SFLAG_SWAPCHAIN) + && ((IWineD3DSwapChainImpl *)target->container)->frontBuffer == (IWineD3DSurface *)target)) + wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); @@ -5467,7 +5469,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, LEAVE_GL(); - wglFlush(); /* Flush to ensure ordering across contexts. */ + if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); } @@ -5811,7 +5813,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const LEAVE_GL(); - wglFlush(); /* Flush to ensure ordering across contexts. */ + if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 201aa54..dafdd93 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -694,7 +694,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT wined3d_event_query_issue(This->buffer_queries[i], This); } - wglFlush(); /* Flush to ensure ordering across contexts. */ + if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 25967b3..1dbbeeb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3406,7 +3406,7 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine LEAVE_GL(); - wglFlush(); /* Flush to ensure ordering across contexts. */ + if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); @@ -3793,7 +3793,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const /* Leave the opengl state valid for blitting */ myDevice->blitter->unset_shader((IWineD3DDevice *) myDevice); - wglFlush(); /* Flush to ensure ordering across contexts. */ + if (wined3d_settings.strict_draw_ordering || (dstSwapchain + && ((IWineD3DSurface *)This == dstSwapchain->frontBuffer + || dstSwapchain->num_contexts > 1))) + wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); @@ -4266,7 +4269,7 @@ void surface_load_ds_location(IWineD3DSurface *iface, struct wined3d_context *co LEAVE_GL(); - wglFlush(); /* Flush to ensure ordering across contexts. */ + if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ } else { @@ -4287,7 +4290,7 @@ void surface_load_ds_location(IWineD3DSurface *iface, struct wined3d_context *co LEAVE_GL(); - wglFlush(); /* Flush to ensure ordering across contexts. */ + if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ } else { @@ -4357,6 +4360,7 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT *rect_in) { IWineD3DDeviceImpl *device = This->resource.device; + IWineD3DSwapChainImpl *swapchain; struct wined3d_context *context; RECT src_rect, dst_rect; @@ -4383,7 +4387,11 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT device->blitter->set_shader((IWineD3DDevice *) device, This); - wglFlush(); /* Flush to ensure ordering across contexts. */ + swapchain = (This->Flags & SFLAG_SWAPCHAIN) ? (IWineD3DSwapChainImpl *)This->container : NULL; + if (wined3d_settings.strict_draw_ordering || (swapchain + && ((IWineD3DSurface *)This == swapchain->frontBuffer + || swapchain->num_contexts > 1))) + wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2a96698..6330eba 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -72,7 +72,8 @@ wined3d_settings_t wined3d_settings = PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in FillGLCaps */ NULL, /* No wine logo by default */ - FALSE /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */ + FALSE, /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */ + FALSE, /* No strict draw ordering. */ }; IWineD3D * WINAPI WineDirect3DCreate(UINT version, IUnknown *parent) @@ -319,6 +320,12 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.allow_multisampling = TRUE; } } + if (!get_config_key(hkey, appkey, "StrictDrawOrdering", buffer, size) + && !strcmp(buffer,"enabled")) + { + TRACE("Enforcing strict draw ordering.\n"); + wined3d_settings.strict_draw_ordering = TRUE; + } } if (wined3d_settings.vs_mode == VS_HW) TRACE("Allow HW vertex shaders\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 511a348..981f580 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -268,6 +268,7 @@ typedef struct wined3d_settings_s { unsigned int emulated_textureram; char *logo; int allow_multisampling; + BOOL strict_draw_ordering; } wined3d_settings_t; extern wined3d_settings_t wined3d_settings DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Prune unsupported world matrix transform states.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 43e89cb981644508538b44f37245153b5698456e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e89cb981644508538b44f37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 13 20:46:28 2010 +0200 wined3d: Prune unsupported world matrix transform states. --- dlls/wined3d/state.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f94aac5..bfde5e4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5647,6 +5647,14 @@ static void prune_invalid_states(struct StateEntry *state_table, const struct wi state_table[i].representative = 0; state_table[i].apply = state_undefined; } + + start = STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(gl_info->limits.blends)); + last = STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)); + for (i = start; i <= last; ++i) + { + state_table[i].representative = 0; + state_table[i].apply = state_undefined; + } } static void validate_state_table(struct StateEntry *state_table)

1 0

Detlef Riekenberg : urlmon/tests: Fix a failure on Win98.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 43e9bb5e92e7c64639142eb991450ecf61326d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e9bb5e92e7c64639142eb99… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 13 23:20:11 2010 +0200 urlmon/tests: Fix a failure on Win98. --- dlls/urlmon/tests/sec_mgr.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index a83f7ec..e758115 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -631,7 +631,9 @@ static void test_InternetSecurityMarshalling(void) ok(hres == S_OK, "CreateStreamOnHGlobal returned: %08x\n", hres); hres = CoMarshalInterface(stream, &IID_IInternetSecurityManager, unk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - ok(hres == S_OK, "CoMarshalInterface returned: %08x\n", hres); + /* Not supported in W98 */ + ok(hres == S_OK || broken(hres == REGDB_E_IIDNOTREG), + "CoMarshalInterface returned: %08x\n", hres); IStream_Release(stream); IUnknown_Release(unk);

1 0

Detlef Riekenberg : urlmon/tests: Run the tests again on W95B ( CoInternetParseUrl).
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 083849559679f1f4ab2661fe6ea5bbba6bda9e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=083849559679f1f4ab2661fe6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 13 21:30:54 2010 +0200 urlmon/tests: Run the tests again on W95B (CoInternetParseUrl). --- dlls/urlmon/tests/misc.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 2e77c1b..259c5a0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -63,6 +63,8 @@ DEFINE_EXPECT(QI_IInternetProtocolInfo); DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(unk_Release); +static HRESULT (WINAPI *pCoInternetCompareUrl)(LPCWSTR, LPCWSTR, DWORD); + static void test_CreateFormatEnum(void) { IEnumFORMATETC *fenum = NULL, *fenum2 = NULL; @@ -363,13 +365,18 @@ static void test_CoInternetCompareUrl(void) { HRESULT hres; - hres = CoInternetCompareUrl(url1, url1, 0); + if (!pCoInternetCompareUrl) { + win_skip("CoInternetCompareUrl not found\n"); + return; + } + + hres = pCoInternetCompareUrl(url1, url1, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); - hres = CoInternetCompareUrl(url1, url3, 0); + hres = pCoInternetCompareUrl(url1, url3, 0); ok(hres == S_FALSE, "CoInternetParseUrl failed: %08x\n", hres); - hres = CoInternetCompareUrl(url3, url1, 0); + hres = pCoInternetCompareUrl(url3, url1, 0); ok(hres == S_FALSE, "CoInternetParseUrl failed: %08x\n", hres); } @@ -1402,10 +1409,15 @@ static void test_IsValidURL(void) START_TEST(misc) { + HMODULE hurlmon; + OleInitialize(NULL); register_protocols(); + hurlmon = GetModuleHandle("urlmon.dll"); + pCoInternetCompareUrl = (void *) GetProcAddress(hurlmon, "CoInternetCompareUrl"); + test_CreateFormatEnum(); test_RegisterFormatEnumerator(); test_CoInternetParseUrl();

1 0

Henri Verbeet : wined3d: Add a separate function for palette initialization .
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: ab80e9739c5b377e3ab47abb6dccdb6f0466423c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab80e9739c5b377e3ab47abb6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 13 20:46:25 2010 +0200 wined3d: Add a separate function for palette initialization. --- dlls/wined3d/device.c | 34 +++++++++++++--------------------- dlls/wined3d/palette.c | 35 +++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 48 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ae777a7..f8f7df4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1360,35 +1360,27 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DW IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DPaletteImpl *object; HRESULT hr; - TRACE("(%p)->(%x, %p, %p, %p)\n", This, Flags, PalEnt, Palette, Parent); - /* Create the new object */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DPaletteImpl)); - if(!object) { - ERR("Out of memory when allocating memory for a IWineD3DPalette implementation\n"); - return E_OUTOFMEMORY; - } + TRACE("iface %p, flags %#x, entries %p, palette %p, parent %p.\n", + iface, Flags, PalEnt, Palette, Parent); - object->lpVtbl = &IWineD3DPalette_Vtbl; - object->ref = 1; - object->Flags = Flags; - object->parent = Parent; - object->device = This; - object->palNumEntries = IWineD3DPaletteImpl_Size(Flags); - object->hpal = CreatePalette((const LOGPALETTE*)&(object->palVersion)); - - if(!object->hpal) { - HeapFree( GetProcessHeap(), 0, object); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate palette memory.\n"); return E_OUTOFMEMORY; } - hr = IWineD3DPalette_SetEntries((IWineD3DPalette *) object, 0, 0, IWineD3DPaletteImpl_Size(Flags), PalEnt); - if(FAILED(hr)) { - IWineD3DPalette_Release((IWineD3DPalette *) object); + hr = wined3d_palette_init(object, This, Flags, PalEnt, Parent); + if (FAILED(hr)) + { + WARN("Failed to initialize palette, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); return hr; } - *Palette = (IWineD3DPalette *) object; + TRACE("Created palette %p.\n", object); + *Palette = (IWineD3DPalette *)object; return WINED3D_OK; } diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 553a08a..3fd8be9 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -74,7 +74,8 @@ static ULONG WINAPI IWineD3DPaletteImpl_Release(IWineD3DPalette *iface) { } /* Not called from the vtable */ -DWORD IWineD3DPaletteImpl_Size(DWORD dwFlags) { +static DWORD IWineD3DPaletteImpl_Size(DWORD dwFlags) +{ switch (dwFlags & SIZE_BITS) { case WINEDDPCAPS_1BIT: return 2; case WINEDDPCAPS_2BIT: return 4; @@ -183,7 +184,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetParent(IWineD3DPalette *iface, IUn return WINED3D_OK; } -const IWineD3DPaletteVtbl IWineD3DPalette_Vtbl = +static const IWineD3DPaletteVtbl IWineD3DPalette_Vtbl = { /*** IUnknown ***/ IWineD3DPaletteImpl_QueryInterface, @@ -195,3 +196,33 @@ const IWineD3DPaletteVtbl IWineD3DPalette_Vtbl = IWineD3DPaletteImpl_GetCaps, IWineD3DPaletteImpl_SetEntries }; + +HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *device, + DWORD flags, const PALETTEENTRY *entries, IUnknown *parent) +{ + HRESULT hr; + + palette->lpVtbl = &IWineD3DPalette_Vtbl; + palette->ref = 1; + palette->parent = parent; + palette->device = device; + palette->Flags = flags; + + palette->palNumEntries = IWineD3DPaletteImpl_Size(flags); + palette->hpal = CreatePalette((const LOGPALETTE *)&palette->palVersion); + if (!palette->hpal) + { + WARN("Failed to create palette.\n"); + return E_FAIL; + } + + hr = IWineD3DPalette_SetEntries((IWineD3DPalette *)palette, 0, 0, IWineD3DPaletteImpl_Size(flags), entries); + if (FAILED(hr)) + { + WARN("Failed to set palette entries, hr %#x.\n", hr); + DeleteObject(palette->hpal); + return hr; + } + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 699a49d..511a348 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2966,8 +2966,8 @@ struct IWineD3DPaletteImpl { DWORD Flags; }; -extern const IWineD3DPaletteVtbl IWineD3DPalette_Vtbl DECLSPEC_HIDDEN; -DWORD IWineD3DPaletteImpl_Size(DWORD dwFlags) DECLSPEC_HIDDEN; +HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *device, + DWORD flags, const PALETTEENTRY *entries, IUnknown *parent) DECLSPEC_HIDDEN; /* DirectDraw utility functions */ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Add a separate function for rendertarget view initialization.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: d1d8c81439dc118f551e4e2f45e63a14df60e2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d8c81439dc118f551e4e2f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 13 20:46:24 2010 +0200 wined3d: Add a separate function for rendertarget view initialization. --- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/view.c | 12 +++++++++++- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3b87878..ae777a7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -838,6 +838,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateRendertargetView(IWineD3DDevice * { struct wined3d_rendertarget_view *object; + TRACE("iface %p, resource %p, parent %p, rendertarget_view %p.\n", + iface, resource, parent, rendertarget_view); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -845,12 +848,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateRendertargetView(IWineD3DDevice * return E_OUTOFMEMORY; } - object->vtbl = &wined3d_rendertarget_view_vtbl; - object->refcount = 1; - IWineD3DResource_AddRef(resource); - object->resource = resource; - object->parent = parent; + wined3d_rendertarget_view_init(object, resource, parent); + TRACE("Created render target view %p.\n", object); *rendertarget_view = (IWineD3DRendertargetView *)object; return WINED3D_OK; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index bbf0f5f..0c9919d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -97,7 +97,7 @@ static HRESULT STDMETHODCALLTYPE rendertarget_view_GetResource(IWineD3DRendertar return WINED3D_OK; } -const struct IWineD3DRendertargetViewVtbl wined3d_rendertarget_view_vtbl = +static const struct IWineD3DRendertargetViewVtbl wined3d_rendertarget_view_vtbl = { /* IUnknown methods */ rendertarget_view_QueryInterface, @@ -108,3 +108,13 @@ const struct IWineD3DRendertargetViewVtbl wined3d_rendertarget_view_vtbl = /* IWineD3DRendertargetView methods */ rendertarget_view_GetResource, }; + +void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, + IWineD3DResource *resource, IUnknown *parent) +{ + view->vtbl = &wined3d_rendertarget_view_vtbl; + view->refcount = 1; + IWineD3DResource_AddRef(resource); + view->resource = resource; + view->parent = parent; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09e1b81..699a49d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2549,7 +2549,8 @@ struct wined3d_rendertarget_view IUnknown *parent; }; -extern const IWineD3DRendertargetViewVtbl wined3d_rendertarget_view_vtbl DECLSPEC_HIDDEN; +void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, + IWineD3DResource *resource, IUnknown *parent) DECLSPEC_HIDDEN; /***************************************************************************** * IWineD3DSwapChainImpl implementation structure (extends IUnknown)

1 0

Alexandre Julliard : user32: The Z-order of owned windows doesn' t depend on them having the WS_POPUP style.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: b6765134a3174d124d24f8ae3345755d21c70982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6765134a3174d124d24f8ae3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 20:54:15 2010 +0200 user32: The Z-order of owned windows doesn't depend on them having the WS_POPUP style. --- dlls/user32/tests/win.c | 13 +++++++------ dlls/user32/winpos.c | 7 +++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e3bebe7..a295850 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2181,7 +2181,7 @@ static void check_z_order_debug(HWND hwnd, HWND next, HWND prev, HWND owner, hwnd, topmost ? "" : "NOT "); } -static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E) +static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E, DWORD style) { HWND hwnd_A, hwnd_B, hwnd_C, hwnd_F; @@ -2205,7 +2205,7 @@ static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E) check_z_order(hwnd_D, hwnd_E, 0, 0, FALSE); hwnd_C = CreateWindowEx(0, "MainWindowClass", NULL, - WS_POPUP, + style, 100, 100, 100, 100, hwnd_F, 0, GetModuleHandle(0), NULL); trace("hwnd_C %p\n", hwnd_C); @@ -2215,7 +2215,7 @@ static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E) check_z_order(hwnd_C, hwnd_D, 0, hwnd_F, FALSE); hwnd_B = CreateWindowEx(WS_EX_TOPMOST, "MainWindowClass", NULL, - WS_POPUP, + style, 100, 100, 100, 100, hwnd_F, 0, GetModuleHandle(0), NULL); trace("hwnd_B %p\n", hwnd_B); @@ -2226,7 +2226,7 @@ static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E) check_z_order(hwnd_B, hwnd_C, 0, hwnd_F, TRUE); hwnd_A = CreateWindowEx(WS_EX_TOPMOST, "MainWindowClass", NULL, - WS_POPUP, + style, 100, 100, 100, 100, 0, 0, GetModuleHandle(0), NULL); trace("hwnd_A %p\n", hwnd_A); @@ -2262,7 +2262,7 @@ static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E) /* make hwnd_C owned by a topmost window */ DestroyWindow( hwnd_C ); hwnd_C = CreateWindowEx(0, "MainWindowClass", NULL, - WS_POPUP, + style, 100, 100, 100, 100, hwnd_A, 0, GetModuleHandle(0), NULL); trace("hwnd_C %p\n", hwnd_C); @@ -6073,7 +6073,8 @@ START_TEST(win) test_NCRedraw(); test_children_zorder(hwndMain); - test_popup_zorder(hwndMain2, hwndMain); + test_popup_zorder(hwndMain2, hwndMain, WS_POPUP); + test_popup_zorder(hwndMain2, hwndMain, 0); test_keyboard_input(hwndMain); test_mouse_input(hwndMain); test_validatergn(hwndMain); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index f8a3c41..dd529dc 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1617,13 +1617,14 @@ static inline void get_valid_rects( const RECT *old_client, const RECT *new_clie */ static HWND SWP_DoOwnedPopups(HWND hwnd, HWND hwndInsertAfter) { - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); HWND owner, *list = NULL; unsigned int i; TRACE("(%p) hInsertAfter = %p\n", hwnd, hwndInsertAfter ); - if ((style & WS_POPUP) && (owner = GetWindow( hwnd, GW_OWNER ))) + if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) return hwndInsertAfter; + + if ((owner = GetWindow( hwnd, GW_OWNER ))) { /* make sure this popup stays above the owner */ @@ -1650,7 +1651,6 @@ static HWND SWP_DoOwnedPopups(HWND hwnd, HWND hwndInsertAfter) } } } - else if (style & WS_CHILD) return hwndInsertAfter; if (hwndInsertAfter == HWND_BOTTOM) goto done; if (!list && !(list = WIN_ListChildren( GetDesktopWindow() ))) goto done; @@ -1677,7 +1677,6 @@ static HWND SWP_DoOwnedPopups(HWND hwnd, HWND hwndInsertAfter) for ( ; list[i]; i++) { if (list[i] == hwnd) break; - if (!(GetWindowLongW( list[i], GWL_STYLE ) & WS_POPUP)) continue; if (GetWindow( list[i], GW_OWNER ) != hwnd) continue; TRACE( "moving %p owned by %p after %p\n", list[i], hwnd, hwndInsertAfter ); SetWindowPos( list[i], hwndInsertAfter, 0, 0, 0, 0,

1 0

Jacek Caban : mshtml: Improved focus handling.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 7cdad62b973eb48c2e11aee0fb50c0de96277cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdad62b973eb48c2e11aee0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 13 20:01:21 2010 +0200 mshtml: Improved focus handling. --- dlls/mshtml/editor.c | 1 - dlls/mshtml/mshtml_private.h | 2 -- dlls/mshtml/nsembed.c | 24 ++++++------------------ dlls/mshtml/nsevents.c | 4 ++-- dlls/mshtml/view.c | 7 ++++++- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 961bb91..14e7ebb 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -508,7 +508,6 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) void handle_edit_load(HTMLDocument *This) { - This->doc_obj->nscontainer->reset_focus = GetFocus(); get_editor_controller(This->doc_obj->nscontainer); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e378f26..4431d9c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -437,8 +437,6 @@ struct NSContainer { nsIURIContentListener *content_listener; HWND hwnd; - - HWND reset_focus; /* hack */ }; typedef struct nsWineURI nsWineURI; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fa8aa41..f3e43c8 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -80,8 +80,6 @@ static const WCHAR wszNsContainer[] = {'N','s','C','o','n','t','a','i','n','e',' static ATOM nscontainer_class; -#define WM_RESETFOCUS_HACK WM_USER+600 - static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { NSContainer *This; @@ -106,20 +104,13 @@ static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP WARN("SetSize failed: %08x\n", nsres); break; - case WM_RESETFOCUS_HACK: - /* - * FIXME - * Gecko grabs focus in edit mode and some apps don't like it. - * We should somehow prevent grabbing focus. - */ - - TRACE("WM_RESETFOCUS_HACK\n"); + case WM_PARENTNOTIFY: + TRACE("WM_PARENTNOTIFY %x\n", (unsigned)wParam); - if(This->reset_focus) { - SetFocus(This->reset_focus); - This->reset_focus = NULL; - if(This->doc) - This->doc->focus = FALSE; + switch(wParam) { + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + nsIWebBrowserFocus_Activate(This->focus); } } @@ -1316,9 +1307,6 @@ static nsresult NSAPI nsEmbeddingSiteWindow_SetFocus(nsIEmbeddingSiteWindow *ifa TRACE("(%p)\n", This); - if(This->reset_focus) - PostMessageW(This->hwnd, WM_RESETFOCUS_HACK, 0, 0); - return nsIBaseWindow_SetFocus(This->window); } diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index c491424..fb2b055 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -129,7 +129,7 @@ static nsresult NSAPI handle_blur(nsIDOMEventListener *iface, nsIDOMEvent *event return NS_ERROR_FAILURE; doc_obj = doc->basedoc.doc_obj; - if(!doc_obj->nscontainer->reset_focus && doc_obj->focus && !is_doc_child_focus(doc_obj)) { + if(doc_obj->focus && !is_doc_child_focus(doc_obj)) { doc_obj->focus = FALSE; notif_focus(doc_obj); } @@ -148,7 +148,7 @@ static nsresult NSAPI handle_focus(nsIDOMEventListener *iface, nsIDOMEvent *even return NS_ERROR_FAILURE; doc_obj = doc->basedoc.doc_obj; - if(!doc_obj->nscontainer->reset_focus && !doc_obj->focus) { + if(!doc_obj->focus) { doc_obj->focus = TRUE; notif_focus(doc_obj); } diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 2561478..5c096ed 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -92,7 +92,6 @@ static void activate_gecko(NSContainer *This) nsIBaseWindow_SetVisibility(This->window, TRUE); nsIBaseWindow_SetEnabled(This->window, TRUE); - nsIWebBrowserFocus_Activate(This->focus); } void update_doc(HTMLDocument *This, DWORD flags) @@ -216,6 +215,10 @@ static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM break; case WM_TIMER: return on_timer(This); + case WM_SETFOCUS: + TRACE("(%p) WM_SETFOCUS\n", This); + nsIWebBrowserFocus_Activate(This->nscontainer->focus); + break; case WM_MOUSEACTIVATE: return MA_ACTIVATE; } @@ -664,6 +667,8 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f This->doc_obj->ui_active = TRUE; }else { + This->doc_obj->focus = FALSE; + nsIWebBrowserFocus_Deactivate(This->doc_obj->nscontainer->focus); if(This->doc_obj->ui_active) { This->doc_obj->ui_active = FALSE; if(This->doc_obj->ip_window)

1 0

Jacek Caban : mshtml: Use NSContainer HWND in handle_blur.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 9539cf7a4e83e0bdd5b24a7381f666a765cc8ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9539cf7a4e83e0bdd5b24a738… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 13 20:01:59 2010 +0200 mshtml: Use NSContainer HWND in handle_blur. --- dlls/mshtml/nsevents.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index fb2b055..3e03149 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -109,11 +109,11 @@ static nsrefcnt NSAPI nsDOMEventListener_Release(nsIDOMEventListener *iface) return release_listener(This); } -static BOOL is_doc_child_focus(HTMLDocumentObj *doc) +static BOOL is_doc_child_focus(NSContainer *nscontainer) { HWND hwnd; - for(hwnd = GetFocus(); hwnd && hwnd != doc->hwnd; hwnd = GetParent(hwnd)); + for(hwnd = GetFocus(); hwnd && hwnd != nscontainer->hwnd; hwnd = GetParent(hwnd)); return hwnd != NULL; } @@ -129,7 +129,7 @@ static nsresult NSAPI handle_blur(nsIDOMEventListener *iface, nsIDOMEvent *event return NS_ERROR_FAILURE; doc_obj = doc->basedoc.doc_obj; - if(doc_obj->focus && !is_doc_child_focus(doc_obj)) { + if(doc_obj->focus && !is_doc_child_focus(doc_obj->nscontainer)) { doc_obj->focus = FALSE; notif_focus(doc_obj); }

1 0