March 2008 - Wine-commits - list.winehq.org

Roderick Colenbrander : wined3d: Always report D16 as Windows drivers report it on all cards ( likely using emulation).
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: eaa1ff0d2c08a8112939dc6c32914a2e3c910fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa1ff0d2c08a8112939dc6c3… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Mar 25 11:02:20 2008 +0100 wined3d: Always report D16 as Windows drivers report it on all cards (likely using emulation). --- dlls/wined3d/directx.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0719ea1..ef6b6df 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1656,6 +1656,7 @@ static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(const WineD3D_Pixe static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(const WineD3D_PixelFormat *cfg, WINED3DFORMAT Format) { short depthSize, stencilSize; + BOOL lockable = FALSE; if(!cfg) return FALSE; @@ -1665,7 +1666,13 @@ static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(const WineD3D_Pixel return FALSE; } - if(cfg->depthSize != depthSize) + if((Format == WINED3DFMT_D16_LOCKABLE) || (Format == WINED3DFMT_D32F_LOCKABLE)) + lockable = TRUE; + + /* On some modern cards like the Geforce8/9 GLX doesn't offer some dephthstencil formats which D3D9 reports. + * We can safely report 'compatible' formats (e.g. D24 can be used for D16) as long as we aren't dealing with + * a lockable format. This also helps D3D <= 7 as they expect D16 which isn't offered without this on Geforce8 cards. */ + if(!(cfg->depthSize == depthSize || (!lockable && cfg->depthSize > depthSize))) return FALSE; if(cfg->stencilSize != stencilSize)

1 0

Alexandre Julliard : mscoree: Implement a number of interop helpers.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 6e5bc73b8d58c79a39595c20b280d94ec70f0e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5bc73b8d58c79a39595c20b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 25 15:21:18 2008 +0100 mscoree: Implement a number of interop helpers. --- dlls/mscoree/mscoree.spec | 10 ++++++++ dlls/mscoree/mscoree_main.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 8a1e1f8..34defdc 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -72,6 +72,16 @@ @ stdcall LoadStringRCEx(long long ptr long long ptr) @ stub LockClrVersion @ stub MetaDataGetDispenser +@ stdcall ND_CopyObjDst(ptr ptr long long) +@ stdcall ND_CopyObjSrc(ptr long ptr long) +@ stdcall ND_RI2(ptr long) +@ stdcall ND_RI4(ptr long) +@ stdcall -ret64 ND_RI8(ptr long) +@ stdcall ND_RU1(ptr long) +@ stdcall ND_WI2(ptr long long) +@ stdcall ND_WI4(ptr long long) +@ stdcall ND_WI8(ptr long long long) +@ stdcall ND_WU1(ptr long long) @ stub OpenCtrs @ stub ReOpenMetaDataWithMemoryEx @ stub RunDll(a)ShimW diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7093590..6f850f2 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -320,3 +320,53 @@ HRESULT WINAPI DllCanUnloadNow(VOID) FIXME("stub\n"); return S_OK; } + +INT WINAPI ND_RU1( const void *ptr, INT offset ) +{ + return *((const BYTE *)ptr + offset); +} + +INT WINAPI ND_RI2( const void *ptr, INT offset ) +{ + return *(const SHORT *)((const BYTE *)ptr + offset); +} + +INT WINAPI ND_RI4( const void *ptr, INT offset ) +{ + return *(const INT *)((const BYTE *)ptr + offset); +} + +INT64 WINAPI ND_RI8( const void *ptr, INT offset ) +{ + return *(const INT64 *)((const BYTE *)ptr + offset); +} + +void WINAPI ND_WU1( void *ptr, INT offset, BYTE val ) +{ + *((BYTE *)ptr + offset) = val; +} + +void WINAPI ND_WI2( void *ptr, INT offset, SHORT val ) +{ + *(SHORT *)((BYTE *)ptr + offset) = val; +} + +void WINAPI ND_WI4( void *ptr, INT offset, INT val ) +{ + *(INT *)((BYTE *)ptr + offset) = val; +} + +void WINAPI ND_WI8( void *ptr, INT offset, INT64 val ) +{ + *(INT64 *)((BYTE *)ptr + offset) = val; +} + +void WINAPI ND_CopyObjDst( const void *src, void *dst, INT offset, INT size ) +{ + memcpy( (BYTE *)dst + offset, src, size ); +} + +void WINAPI ND_CopyObjSrc( const void *src, INT offset, void *dst, INT size ) +{ + memcpy( dst, (const BYTE *)src + offset, size ); +}

1 0

Justin Chevrier : wine.inf: Create fake dll entry for dosx.exe.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 3d707dc8ec46e717c37aa34640dd24ba2d266c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d707dc8ec46e717c37aa3464… Author: Justin Chevrier <jchevrier(a)nexicom.net> Date: Tue Mar 25 00:14:47 2008 -0400 wine.inf: Create fake dll entry for dosx.exe. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 625c8ba..f3a45e6 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2229,6 +2229,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dbghelp.dll 11,,ddhelp.exe 11,,ddraw.dll +11,,dosx.exe 11,,dsound.dll 11,,dsound.vxd 11,,gdi32.dll

1 0

Kolbjørn Fredheim : ddraw: Don' t clear the return value anymore, we fill the fields anyway, also a test for the behaviour.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: a40185f12f83af2716306dc3cfe243bef1261bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a40185f12f83af2716306dc3c… Author: Kolbjørn Fredheim <coolbeer1980(a)yahoo.com> Date: Sun Mar 23 17:17:21 2008 +0100 ddraw: Don't clear the return value anymore, we fill the fields anyway, also a test for the behaviour. --- dlls/ddraw/tests/d3d.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/vertexbuffer.c | 6 ---- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 4e827a5..9281b37 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1530,6 +1530,67 @@ static void TextureLoadTest(void) if (Texture2) IDirect3DTexture_Release(Texture2); } +static void VertexBufferDescTest(void) +{ + HRESULT rc; + D3DVERTEXBUFFERDESC desc; + union mem_t + { + D3DVERTEXBUFFERDESC desc2; + unsigned char buffer[512]; + } mem; + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwCaps = 0; + desc.dwFVF = D3DFVF_XYZ; + desc.dwNumVertices = 1; + rc = IDirect3D7_CreateVertexBuffer(lpD3D, &desc, &lpVBufSrc, 0); + ok(rc==D3D_OK || rc==E_OUTOFMEMORY, "CreateVertexBuffer returned: %x\n", rc); + if (!lpVBufSrc) + { + trace("IDirect3D7::CreateVertexBuffer() failed with an error %x\n", rc); + goto out; + } + + memset(mem.buffer, 0x12, sizeof(mem.buffer)); + mem.desc2.dwSize = sizeof(D3DVERTEXBUFFERDESC)*2; + rc = IDirect3DVertexBuffer7_GetVertexBufferDesc(lpVBufSrc, &mem.desc2); + if(rc != D3D_OK) + skip("GetVertexBuffer Failed!\n"); + ok( mem.desc2.dwSize == sizeof(D3DVERTEXBUFFERDESC)*2, "Size returned from GetVertexBufferDesc does not match the value put in\n" ); + ok( mem.buffer[sizeof(D3DVERTEXBUFFERDESC)] == 0x12, "GetVertexBufferDesc cleared outside of the struct! (dwSize was double the size of the struct)\n"); + ok( mem.desc2.dwCaps == desc.dwCaps, "dwCaps returned differs. Got %x, expected %x \n", mem.desc2.dwCaps, desc.dwCaps); + ok( mem.desc2.dwFVF == desc.dwFVF, "dwFVF returned differs. Got %x, expected %x \n", mem.desc2.dwFVF, desc.dwFVF); + ok (mem.desc2.dwNumVertices == desc.dwNumVertices, "dwNumVertices returned differs. Got %x, expected %x\n", mem.desc2.dwNumVertices, desc.dwNumVertices); + + memset(mem.buffer, 0x12, sizeof(mem.buffer)); + mem.desc2.dwSize = 0; + rc = IDirect3DVertexBuffer7_GetVertexBufferDesc(lpVBufSrc, &mem.desc2); + if(rc != D3D_OK) + skip("GetVertexBuffer Failed!\n"); + ok( mem.desc2.dwSize == 0, "Size returned from GetVertexBufferDesc does not match the value put in\n" ); + ok( mem.buffer[sizeof(D3DVERTEXBUFFERDESC)] == 0x12, "GetVertexBufferDesc cleared outside of the struct! (dwSize was 0)\n"); + ok( mem.desc2.dwCaps == desc.dwCaps, "dwCaps returned differs. Got %x, expected %x \n", mem.desc2.dwCaps, desc.dwCaps); + ok( mem.desc2.dwFVF == desc.dwFVF, "dwFVF returned differs. Got %x, expected %x \n", mem.desc2.dwFVF, desc.dwFVF); + ok (mem.desc2.dwNumVertices == desc.dwNumVertices, "dwNumVertices returned differs. Got %x, expected %x\n", mem.desc2.dwNumVertices, desc.dwNumVertices); + + memset(mem.buffer, 0x12, sizeof(mem.buffer)); + mem.desc2.dwSize = sizeof(D3DVERTEXBUFFERDESC); + rc = IDirect3DVertexBuffer7_GetVertexBufferDesc(lpVBufSrc, &mem.desc2); + if(rc != D3D_OK) + skip("GetVertexBuffer Failed!\n"); + ok( mem.desc2.dwSize == sizeof(D3DVERTEXBUFFERDESC), "Size returned from GetVertexBufferDesc does not match the value put in\n" ); + ok( mem.buffer[sizeof(D3DVERTEXBUFFERDESC)] == 0x12, "GetVertexBufferDesc cleared outside of the struct! (dwSize was the size of the struct)\n"); + ok( mem.desc2.dwCaps == desc.dwCaps, "dwCaps returned differs. Got %x, expected %x \n", mem.desc2.dwCaps, desc.dwCaps); + ok( mem.desc2.dwFVF == desc.dwFVF, "dwFVF returned differs. Got %x, expected %x \n", mem.desc2.dwFVF, desc.dwFVF); + ok (mem.desc2.dwNumVertices == desc.dwNumVertices, "dwNumVertices returned differs. Got %x, expected %x\n", mem.desc2.dwNumVertices, desc.dwNumVertices); + +out: + IDirect3DVertexBuffer7_Release(lpVBufSrc); +} + + START_TEST(d3d) { init_function_pointers(); @@ -1548,6 +1609,7 @@ START_TEST(d3d) LimitTest(); D3D7EnumTest(); CapsTest(); + VertexBufferDescTest(); ReleaseDirect3D(); } diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 209411b..2469644 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -454,7 +454,6 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface); WINED3DVERTEXBUFFER_DESC WDesc; HRESULT hr; - DWORD size; TRACE("(%p)->(%p)\n", This, Desc); if(!Desc) return DDERR_INVALIDPARAMS; @@ -469,12 +468,7 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, return hr; } - /* Clear the return value of garbage */ - size = Desc->dwSize; - memset(Desc, 0, size); - /* Now fill the Desc structure */ - Desc->dwSize = size; Desc->dwCaps = This->Caps; Desc->dwFVF = WDesc.FVF; Desc->dwNumVertices = WDesc.Size / get_flexible_vertex_size(WDesc.FVF);

1 0

Alexandre Julliard : winex11: Don' t attempt to dock into the system tray in desktop mode.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 46489aeda2f0a710a76ff1142e95043546812aa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46489aeda2f0a710a76ff1142… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 25 12:13:28 2008 +0100 winex11: Don't attempt to dock into the system tray in desktop mode. --- dlls/winex11.drv/window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ca76230..ffeed8e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -690,6 +690,8 @@ void X11DRV_make_systray_window( HWND hwnd ) struct x11drv_win_data *data; Window systray_window; + if (root_window != DefaultRootWindow(display)) return; + if (!(data = X11DRV_get_win_data( hwnd )) && !(data = X11DRV_create_win_data( hwnd ))) return;

1 0

Hans Leidekker : mscms: Rewrite handle management to be thread-safe. Allocate handles dynamically.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 3e30e298479a1edb35b341963c4e291bd221dd8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e30e298479a1edb35b341963… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 24 21:33:06 2008 +0100 mscms: Rewrite handle management to be thread-safe. Allocate handles dynamically. --- dlls/mscms/handle.c | 293 +++++++++++++++++++++-------------------------- dlls/mscms/mscms_main.c | 3 + dlls/mscms/mscms_priv.h | 48 ++++++--- dlls/mscms/profile.c | 224 ++++++++++++++++++++++-------------- dlls/mscms/transform.c | 82 +++++++++----- 5 files changed, 356 insertions(+), 294 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e30e298479a1edb35b34…

1 0

James Hawkins : fusion: Implement CreateAssemblyCache.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 823640fc2faf80ef478989032ce631638ee30f15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=823640fc2faf80ef478989032… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Mar 25 00:04:57 2008 -0500 fusion: Implement CreateAssemblyCache. --- dlls/fusion/asmcache.c | 26 ++++++++++++++++++++++++++ dlls/fusion/fusion.c | 9 --------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 3bee109..68a8240 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -147,6 +147,32 @@ static const IAssemblyCacheVtbl AssemblyCacheVtbl = { IAssemblyCacheImpl_InstallAssembly }; +/****************************************************************** + * CreateAssemblyCache (FUSION.@) + */ +HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved) +{ + IAssemblyCacheImpl *cache; + + TRACE("(%p, %d)\n", ppAsmCache, dwReserved); + + if (!ppAsmCache) + return E_INVALIDARG; + + *ppAsmCache = NULL; + + cache = HeapAlloc(GetProcessHeap(), 0, sizeof(IAssemblyCacheImpl)); + if (!cache) + return E_OUTOFMEMORY; + + cache->lpIAssemblyCacheVtbl = &AssemblyCacheVtbl; + cache->ref = 1; + + *ppAsmCache = (IAssemblyCache *)cache; + + return S_OK; +} + /* IAssemblyCacheItem */ typedef struct { diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index 43f0d15..999cb92 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -54,15 +54,6 @@ HRESULT WINAPI CompareAssemblyIdentity(LPCWSTR pwzAssemblyIdentity1, BOOL fUnifi } /****************************************************************** - * CreateAssemblyCache (FUSION.@) - */ -HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved) -{ - FIXME("(%p, %d) stub!\n", ppAsmCache, dwReserved); - return E_NOTIMPL; -} - -/****************************************************************** * CreateAssemblyEnum (FUSION.@) */ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved,

1 0

James Hawkins : fusion: Add a stub implementation of IAssemblyEnum.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 082b46887a548599f980c08a58f07d1789e76d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082b46887a548599f980c08a5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Mar 25 00:03:15 2008 -0500 fusion: Add a stub implementation of IAssemblyEnum. --- dlls/fusion/asmcache.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ include/fusion.idl | 7 ++++ 2 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 36c29f2..3bee109 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -235,3 +235,86 @@ static const IAssemblyCacheItemVtbl AssemblyCacheItemVtbl = { IAssemblyCacheItemImpl_Commit, IAssemblyCacheItemImpl_AbortItem }; + +/* IAssemblyEnum */ + +typedef struct { + const IAssemblyEnumVtbl *lpIAssemblyEnumVtbl; + + LONG ref; +} IAssemblyEnumImpl; + +static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface, + REFIID riid, LPVOID *ppobj) +{ + IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IAssemblyEnum)) + { + IUnknown_AddRef(iface); + *ppobj = This; + return S_OK; + } + + WARN("(%p, %s, %p): not found\n", This, debugstr_guid(riid), ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI IAssemblyEnumImpl_AddRef(IAssemblyEnum *iface) +{ + IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) +{ + IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); + + if (!refCount) + HeapFree(GetProcessHeap(), 0, This); + + return refCount; +} + +static HRESULT WINAPI IAssemblyEnumImpl_GetNextAssembly(IAssemblyEnum *iface, + LPVOID pvReserved, + IAssemblyName **ppName, + DWORD dwFlags) +{ + FIXME("(%p, %p, %p, %d) stub!\n", iface, pvReserved, ppName, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI IAssemblyEnumImpl_Reset(IAssemblyEnum *iface) +{ + FIXME("(%p) stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI IAssemblyEnumImpl_Clone(IAssemblyEnum *iface, + IAssemblyEnum **ppEnum) +{ + FIXME("(%p, %p) stub!\n", iface, ppEnum); + return E_NOTIMPL; +} + +static const IAssemblyEnumVtbl AssemblyEnumVtbl = { + IAssemblyEnumImpl_QueryInterface, + IAssemblyEnumImpl_AddRef, + IAssemblyEnumImpl_Release, + IAssemblyEnumImpl_GetNextAssembly, + IAssemblyEnumImpl_Reset, + IAssemblyEnumImpl_Clone +}; diff --git a/include/fusion.idl b/include/fusion.idl index 6f14082..9963838 100644 --- a/include/fusion.idl +++ b/include/fusion.idl @@ -312,7 +312,14 @@ interface IAssemblyName: IUnknown ] interface IAssemblyEnum : IUnknown { + HRESULT GetNextAssembly( + [in] LPVOID pvReserved, + [out] IAssemblyName **ppName, + [in] DWORD dwFlags); + + HRESULT Reset(void); + HRESULT Clone([out] IAssemblyEnum **ppEnum); } [

1 0

James Hawkins : fusion: Add a stub implementation of IAssemblyCache.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 8a19faf261a23a54f6777b2acc94fce76f152e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a19faf261a23a54f6777b2ac… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Mar 25 00:01:53 2008 -0500 fusion: Add a stub implementation of IAssemblyCache. --- dlls/fusion/Makefile.in | 1 + dlls/fusion/asmcache.c | 237 +++++++++++++++++++++++++++++++++++++++++++++++ include/fusion.idl | 82 ++++++++++++++++ 3 files changed, 320 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a19faf261a23a54f6777…

1 0

Alexander Dorofeyev : wined3d: Don't use device palettes in RealizePalette.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 9b913b3b79ae59a842b91a859fdea0e6b467b905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b913b3b79ae59a842b91a859… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Mar 25 02:03:59 2008 +0200 wined3d: Don't use device palettes in RealizePalette. --- dlls/wined3d/surface.c | 21 +++++++-------------- dlls/wined3d/surface_gdi.c | 24 ++++++++---------------- 2 files changed, 15 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2f9dc66..8ed1513 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3574,6 +3574,8 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { unsigned int n; TRACE("(%p)\n", This); + if (!pal) return WINED3D_OK; + if(This->resource.format == WINED3DFMT_P8 || This->resource.format == WINED3DFMT_A8P8) { @@ -3588,26 +3590,17 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { if(This->Flags & SFLAG_DIBSECTION) { TRACE("(%p): Updating the hdc's palette\n", This); for (n=0; n<256; n++) { - if(pal) { - col[n].rgbRed = pal->palents[n].peRed; - col[n].rgbGreen = pal->palents[n].peGreen; - col[n].rgbBlue = pal->palents[n].peBlue; - } else { - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - /* Use the default device palette */ - col[n].rgbRed = device->palettes[device->currentPalette][n].peRed; - col[n].rgbGreen = device->palettes[device->currentPalette][n].peGreen; - col[n].rgbBlue = device->palettes[device->currentPalette][n].peBlue; - } + col[n].rgbRed = pal->palents[n].peRed; + col[n].rgbGreen = pal->palents[n].peGreen; + col[n].rgbBlue = pal->palents[n].peBlue; col[n].rgbReserved = 0; } SetDIBColorTable(This->hDC, 0, 256, col); } - /* Propagate the changes to the drawable when we have a palette. This function is also called - * when the palette is removed. + /* Propagate the changes to the drawable when we have a palette. * TODO: in case of hardware p8 palettes we should only upload the palette. */ - if(pal && (This->resource.usage & WINED3DUSAGE_RENDERTARGET)) + if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, NULL); return WINED3D_OK; diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index fcbecd3..1da1a6a 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -635,30 +635,22 @@ HRESULT WINAPI IWineGDISurfaceImpl_RealizePalette(IWineD3DSurface *iface) { unsigned int n; TRACE("(%p)\n", This); + if (!pal) return WINED3D_OK; + if(This->Flags & SFLAG_DIBSECTION) { TRACE("(%p): Updating the hdc's palette\n", This); for (n=0; n<256; n++) { - if(pal) { - col[n].rgbRed = pal->palents[n].peRed; - col[n].rgbGreen = pal->palents[n].peGreen; - col[n].rgbBlue = pal->palents[n].peBlue; - } else { - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - /* Use the default device palette */ - col[n].rgbRed = device->palettes[device->currentPalette][n].peRed; - col[n].rgbGreen = device->palettes[device->currentPalette][n].peGreen; - col[n].rgbBlue = device->palettes[device->currentPalette][n].peBlue; - } + col[n].rgbRed = pal->palents[n].peRed; + col[n].rgbGreen = pal->palents[n].peGreen; + col[n].rgbBlue = pal->palents[n].peBlue; col[n].rgbReserved = 0; } SetDIBColorTable(This->hDC, 0, 256, col); } - /* Update the image because of the palette change. Note that this function is also - * called on a palette removal. In such a case we don't have to update the screen. - * Some games like e.g Red Alert call SetEntries a lot to implement fading. - */ - if(pal && This->resource.usage & WINED3DUSAGE_RENDERTARGET) + /* Update the image because of the palette change. Some games like e.g Red Alert + call SetEntries a lot to implement fading. */ + if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) x11_copy_to_screen(This, NULL); return WINED3D_OK;

1 0