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

Joel Holdsworth : shell32: Replaced drive.ico with a Tango compliant icon.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: be4af0b66fefa565c14d91a8d2d4c3f98a29ac74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4af0b66fefa565c14d91a8d… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:59:22 2010 +0100 shell32: Replaced drive.ico with a Tango compliant icon. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/drive.ico | Bin 23558 -> 25214 bytes dlls/shell32/drive.svg | 150 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be4af0b66fefa565c14d9…

1 0

Joel Holdsworth : shell32: Replaced floppy.ico with a Tango compliant icon.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 5b3d1b6971fee9e61e7b536caa9f23d86ea23137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3d1b6971fee9e61e7b536ca… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:59:26 2010 +0100 shell32: Replaced floppy.ico with a Tango compliant icon. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/floppy.ico | Bin 25214 -> 25214 bytes dlls/shell32/floppy.svg | 115 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b3d1b6971fee9e61e7b5…

1 0

Joel Holdsworth : shell32: Replaced folder_open. ico with a Tango compliant icon.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 6e600d1edb1e0e7d1784240b7b253ca0f062b694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e600d1edb1e0e7d1784240b7… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:59:30 2010 +0100 shell32: Replaced folder_open.ico with a Tango compliant icon. --- dlls/shell32/folder_open.ico | Bin 15086 -> 25214 bytes dlls/shell32/folder_open.svg | 1097 +++++------------------------------------- 2 files changed, 130 insertions(+), 967 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e600d1edb1e0e7d17842…

1 0

Joel Holdsworth : shell32: Replaced mycomputer. ico with a Tango compliant icon.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 39d08372017766f1f4529ad7c77b046169a26d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d08372017766f1f4529ad7c… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:59:36 2010 +0100 shell32: Replaced mycomputer.ico with a Tango compliant icon. --- dlls/shell32/mycomputer.ico | Bin 15086 -> 25214 bytes dlls/shell32/mycomputer.svg | 2400 ++++++++++++++++++++++++++----------------- 2 files changed, 1477 insertions(+), 923 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39d08372017766f1f4529…

1 0

Joel Holdsworth : shell32: Replaced mydocs.ico with a Tango compliant icon.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 6f6ca9b1a81181254590065e556753db6f1e78bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6ca9b1a81181254590065e5… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:59:42 2010 +0100 shell32: Replaced mydocs.ico with a Tango compliant icon. --- dlls/shell32/mydocs.ico | Bin 15086 -> 25214 bytes dlls/shell32/mydocs.svg | 1150 +++++++++-------------------------------------- 2 files changed, 207 insertions(+), 943 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f6ca9b1a811812545900…

1 0

Joel Holdsworth : shell32: Replaced netdrive. ico with a Tango compliant icon.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 8865907352195ae80ac5e1ddef6d3b5301c34428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8865907352195ae80ac5e1dde… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:59:48 2010 +0100 shell32: Replaced netdrive.ico with a Tango compliant icon. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/netdrive.ico | Bin 25214 -> 25214 bytes dlls/shell32/netdrive.svg | 231 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 232 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8865907352195ae80ac5e…

1 0

Joel Holdsworth : shell32: Replaced netdrive2. ico with a Tango compliant icon.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: c86698d199562268099310cb9d70ed5da9a0080a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c86698d199562268099310cb9… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:59:53 2010 +0100 shell32: Replaced netdrive2.ico with a Tango compliant icon. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/netdrive2.ico | Bin 25214 -> 25214 bytes dlls/shell32/netdrive2.svg | 239 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 240 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c86698d19956226809931…

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: 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: 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