wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Detlef Riekenberg : urlmon/tests: Fix a failure on Win98.
by Alexandre Julliard 14 Apr '10

14 Apr '10

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: Do not depend on user security settings in sec_mgr tests.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: d5e4666e6ab993fc3da8b1214384835d8ad70721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e4666e6ab993fc3da8b1214… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 13 21:30:34 2010 +0200 urlmon/tests: Do not depend on user security settings in sec_mgr tests. --- dlls/urlmon/tests/sec_mgr.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index e441698..a83f7ec 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1,6 +1,6 @@ /* * Copyright 2005-2006 Jacek Caban for CodeWeavers - * Copyright 2009 Detlef Riekenberg + * Copyright 2009-2010 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -41,15 +41,14 @@ static const WCHAR url2[] = {'i','n','d','e','x','.','h','t','m',0}; static const WCHAR url3[] = {'f','i','l','e',':','/','/','c',':','\\','I','n','d','e','x','.','h','t','m',0}; static const WCHAR url4[] = {'f','i','l','e',':','s','o','m','e','%','2','0','f','i','l','e', '%','2','e','j','p','g',0}; -static const WCHAR url5[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', - '.','o','r','g',0}; +static const WCHAR url5[] = {'h','t','t','p',':','/','/','w','w','w','.','z','o','n','e','3', + '.','w','i','n','e','t','e','s','t',0}; static const WCHAR url6[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; -static const WCHAR url7[] = {'f','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g','/', - 'f','i','l','e','.','t','e','s','t',0}; +static const WCHAR url7[] = {'f','t','p',':','/','/','z','o','n','e','3', + '.','w','i','n','e','t','e','s','t','/','f','i','l','e','.','t','e','s','t',0}; static const WCHAR url8[] = {'t','e','s','t',':','1','2','3','a','b','c',0}; -static const WCHAR url9[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', - '/','s','i','t','e','/','a','b','o','u','t',0}; +static const WCHAR url9[] = {'h','t','t','p',':','/','/','w','w','w','.','z','o','n','e','3', + '.','w','i','n','e','t','e','s','t', '/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR url10[] = {'f','i','l','e',':','/','/','s','o','m','e','%','2','0','f','i','l','e', '.','j','p','g',0}; @@ -58,11 +57,11 @@ static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l static const BYTE secid1[] = {'f','i','l','e',':',0,0,0,0}; -static const BYTE secid5[] = {'h','t','t','p',':','w','w','w','.','w','i','n','e','h','q', - '.','o','r','g',3,0,0,0}; +static const BYTE secid5[] = {'h','t','t','p',':','w','w','w','.','z','o','n','e','3', + '.','w','i','n','e','t','e','s','t',3,0,0,0}; static const BYTE secid6[] = {'a','b','o','u','t',':','b','l','a','n','k',3,0,0,0}; -static const BYTE secid7[] = {'f','t','p',':','w','i','n','e','h','q','.','o','r','g', - 3,0,0,0}; +static const BYTE secid7[] = {'f','t','p',':','z','o','n','e','3', + '.','w','i','n','e','t','e','s','t',3,0,0,0}; static const BYTE secid10[] = {'f','i','l','e',':','s','o','m','e','%','2','0','f','i','l','e','.','j','p','g',3,0,0,0}; static const BYTE secid10_2[] = @@ -641,8 +640,9 @@ static void test_InternetSecurityMarshalling(void) static void test_InternetGetSecurityUrl(void) { - const WCHAR url5_out[] = {'h','t','t','p',':','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; - const WCHAR url7_out[] = {'f','t','p',':','w','i','n','e','h','q','.','o','r','g',0}; + const WCHAR url5_out[] = {'h','t','t','p',':','w','w','w','.','z','o','n','e','3', + '.','w','i','n','e','t','e','s','t',0}; + const WCHAR url7_out[] = {'f','t','p',':','z','o','n','e','3','.','w','i','n','e','t','e','s','t',0}; const WCHAR *in[] = {url2, url3, url4, url5, url7, url8, url9, url10}; const WCHAR *out_default[] = {url2, url3, url4, url5_out, url7_out, url8, url5_out, url10};

1 0

Henri Verbeet : wined3d: Prune unsupported world matrix transform states.
by Alexandre Julliard 14 Apr '10

14 Apr '10

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

Henri Verbeet : wined3d: We always support at least a single modelview matrix.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 71d484303adcd34d7e73bde02a12dd2eb7dc60f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d484303adcd34d7e73bde02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 13 20:46:27 2010 +0200 wined3d: We always support at least a single modelview matrix. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 939354f..67b2bd2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2101,6 +2101,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) * with Default values */ memset(gl_info->supported, 0, sizeof(gl_info->supported)); + gl_info->limits.blends = 1; gl_info->limits.buffers = 1; gl_info->limits.textures = 1; gl_info->limits.fragment_samplers = 1;

1 0

Henri Verbeet : wined3d: Disable strict draw ordering by default.
by Alexandre Julliard 14 Apr '10

14 Apr '10

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: Add a separate function for palette initialization .
by Alexandre Julliard 14 Apr '10

14 Apr '10

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 14 Apr '10

14 Apr '10

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

Damjan Jovanovic : ntoskrnl.exe: Implement IoCallDriver.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 242370b8364ec75651c807d4ed5577b77efc6635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=242370b8364ec75651c807d4e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Apr 13 20:42:13 2010 +0200 ntoskrnl.exe: Implement IoCallDriver. --- dlls/ntoskrnl.exe/ntoskrnl.c | 24 +++++++++++++++++------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e71f692..793a699 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -632,14 +632,9 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK acc /*********************************************************************** - * IofCallDriver (NTOSKRNL.EXE.@) + * IoCallDriver (NTOSKRNL.EXE.@) */ -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( IofCallDriver ) -NTSTATUS WINAPI __regs_IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) -#else -NTSTATUS WINAPI IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) -#endif +NTSTATUS WINAPI IoCallDriver( DEVICE_OBJECT *device, IRP *irp ) { PDRIVER_DISPATCH dispatch; IO_STACK_LOCATION *irpsp; @@ -657,6 +652,21 @@ NTSTATUS WINAPI IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) /*********************************************************************** + * IofCallDriver (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( IofCallDriver ) +NTSTATUS WINAPI __regs_IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) +#else +NTSTATUS WINAPI IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) +#endif +{ + TRACE( "%p %p\n", device, irp ); + return IoCallDriver( device, irp ); +} + + +/*********************************************************************** * IoGetRelatedDeviceObject (NTOSKRNL.EXE.@) */ PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject( PFILE_OBJECT obj ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 1722393..bb98dc2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -323,7 +323,7 @@ @ stdcall IoBuildDeviceIoControlRequest(long ptr ptr long ptr long long ptr ptr) @ stub IoBuildPartialMdl @ stub IoBuildSynchronousFsdRequest -@ stub IoCallDriver +@ stdcall IoCallDriver(ptr ptr) @ stub IoCancelFileOpen @ stub IoCancelIrp @ stub IoCheckDesiredAccess

1 0

Damjan Jovanovic : wdm.h: Declare IoCallDriver.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 189335441e41be7066805965927c38025d0ec7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189335441e41be70668059659… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Apr 13 20:41:31 2010 +0200 wdm.h: Declare IoCallDriver. --- include/ddk/wdm.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index e57be4b..da673a5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1063,6 +1063,7 @@ void WINAPI ExFreePoolWithTag(PVOID,ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); +NTSTATUS WINAPI IoCallDriver(DEVICE_OBJECT*,IRP*); VOID WINAPI IoCompleteRequest(IRP*,UCHAR); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE);

1 0

Jacek Caban : mshtml: Use NSContainer HWND in handle_blur.
by Alexandre Julliard 14 Apr '10

14 Apr '10

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

← Newer
1
...
52
53
54
55
56
57
58
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010