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

Francois Gouget : wininet/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: 4abe4cf1b1c6c619804ea6f7e3c78715820efe32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4abe4cf1b1c6c619804ea6f7e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 17 18:06:03 2011 +0100 wininet/tests: Fix compilation on systems that don't support nameless unions. --- dlls/wininet/tests/urlcache.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index e003293..5c12a81 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -235,11 +235,11 @@ static void test_IsUrlCacheEntryExpiredA(void) info = HeapAlloc(GetProcessHeap(), 0, size); ret = GetUrlCacheEntryInfo(TEST_URL, info, &size); GetSystemTimeAsFileTime(&info->ExpireTime); - exp_time.LowPart = info->ExpireTime.dwLowDateTime; - exp_time.HighPart = info->ExpireTime.dwHighDateTime; + exp_time.u.LowPart = info->ExpireTime.dwLowDateTime; + exp_time.u.HighPart = info->ExpireTime.dwHighDateTime; exp_time.QuadPart -= 10 * 60 * (ULONGLONG)10000000; - info->ExpireTime.dwLowDateTime = exp_time.LowPart; - info->ExpireTime.dwHighDateTime = exp_time.HighPart; + info->ExpireTime.dwLowDateTime = exp_time.u.LowPart; + info->ExpireTime.dwHighDateTime = exp_time.u.HighPart; ret = SetUrlCacheEntryInfo(TEST_URL, info, CACHE_ENTRY_EXPTIME_FC); ok(ret, "SetUrlCacheEntryInfo failed: %d\n", GetLastError()); ft.dwLowDateTime = 0xdeadbeef; @@ -253,8 +253,8 @@ static void test_IsUrlCacheEntryExpiredA(void) ft.dwLowDateTime, ft.dwHighDateTime); /* Set the expire time to a point in the future.. */ exp_time.QuadPart += 20 * 60 * (ULONGLONG)10000000; - info->ExpireTime.dwLowDateTime = exp_time.LowPart; - info->ExpireTime.dwHighDateTime = exp_time.HighPart; + info->ExpireTime.dwLowDateTime = exp_time.u.LowPart; + info->ExpireTime.dwHighDateTime = exp_time.u.HighPart; ret = SetUrlCacheEntryInfo(TEST_URL, info, CACHE_ENTRY_EXPTIME_FC); ok(ret, "SetUrlCacheEntryInfo failed: %d\n", GetLastError()); ft.dwLowDateTime = 0xdeadbeef; @@ -376,8 +376,8 @@ static void test_urlcacheA(void) broken(lpCacheEntryInfo->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", lpCacheEntryInfo->CacheEntryType); - ok(!lpCacheEntryInfo->dwExemptDelta, "expected dwExemptDelta 0, got %d\n", - lpCacheEntryInfo->dwExemptDelta); + ok(!U(*lpCacheEntryInfo).dwExemptDelta, "expected dwExemptDelta 0, got %d\n", + U(*lpCacheEntryInfo).dwExemptDelta); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); /* A subsequent commit with a different time/type doesn't change the type */ @@ -653,9 +653,9 @@ static void test_urlcacheA(void) ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); - ok(lpCacheEntryInfo->dwExemptDelta == 86400, + ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, "expected dwExemptDelta 864000, got %d\n", - lpCacheEntryInfo->dwExemptDelta); + U(*lpCacheEntryInfo).dwExemptDelta); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); if (pDeleteUrlCacheEntryA) { @@ -685,17 +685,17 @@ static void test_urlcacheA(void) ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); - ok(lpCacheEntryInfo->dwExemptDelta == 86400, + ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, "expected dwExemptDelta 864000, got %d\n", - lpCacheEntryInfo->dwExemptDelta); - lpCacheEntryInfo->dwExemptDelta = 0; + U(*lpCacheEntryInfo).dwExemptDelta); + U(*lpCacheEntryInfo).dwExemptDelta = 0; ret = SetUrlCacheEntryInfoA(TEST_URL, lpCacheEntryInfo, CACHE_ENTRY_EXEMPT_DELTA_FC); ok(ret, "SetUrlCacheEntryInfo failed: %d\n", GetLastError()); ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); - ok(!lpCacheEntryInfo->dwExemptDelta, "expected dwExemptDelta 0, got %d\n", - lpCacheEntryInfo->dwExemptDelta); + ok(!U(*lpCacheEntryInfo).dwExemptDelta, "expected dwExemptDelta 0, got %d\n", + U(*lpCacheEntryInfo).dwExemptDelta); /* See whether a sticky cache entry has the flag cleared once the exempt * delta is meaningless. */

1 0

André Hentschel : kernel32/tests: Also test for ntdll. dll in toolhelp tests.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: 6ff842fddba0a4cd2e6935aa3953be86015a2cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff842fddba0a4cd2e6935aa3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 17 18:33:19 2011 +0100 kernel32/tests: Also test for ntdll.dll in toolhelp tests. --- dlls/kernel32/tests/toolhelp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index dfe4ad8..bfa3127 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -206,14 +206,14 @@ static const char* curr_expected_modules[] = { "kernel32_test.exe" "kernel32.dll", - /* FIXME: could test for ntdll on NT and Wine */ + "ntdll.dll", }; static const char* sub_expected_modules[] = { "kernel32_test.exe", "kernel32.dll", - "shell32.dll" - /* FIXME: could test for ntdll on NT and Wine */ + "shell32.dll", + "ntdll.dll", }; #define NUM_OF(x) (sizeof(x) / sizeof(x[0]))

1 0

Aric Stewart : usp10: Correct fTrailing handling for RTL runs in ScriptCPtoX.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: 7acd2ba264484637d08611e37bf4ebcb591ed958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7acd2ba264484637d08611e37… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 17 14:46:03 2011 -0500 usp10: Correct fTrailing handling for RTL runs in ScriptCPtoX. --- dlls/usp10/usp10.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index d575425..10ffed0 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1117,12 +1117,7 @@ HRESULT WINAPI ScriptCPtoX(int iCP, rtl = TRUE; if (fTrailing) - { - if (rtl) - iCP--; - else - iCP++; - } + iCP++; if (rtl) {

1 0

Aric Stewart : usp10: Rewrite of ScriptXtoCP to handle pwLogClust for LTR and RTL runs.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: c7b4964b7e306cc6f5d27b68c769142a9b0f63fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b4964b7e306cc6f5d27b68c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 17 14:46:15 2011 -0500 usp10: Rewrite of ScriptXtoCP to handle pwLogClust for LTR and RTL runs. --- dlls/usp10/tests/usp10.c | 391 ++++++++++++++-------------------------------- dlls/usp10/usp10.c | 128 +++++++++++++--- 2 files changed, 225 insertions(+), 294 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7b4964b7e306cc6f5d27…

1 0

Michael Stefaniuc : oleaut32/tests: COM cleanup in vartype.c.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: 6fade2400ad566f7569fc139491bf4b43dad229e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fade2400ad566f7569fc1394… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 17 22:15:31 2011 +0100 oleaut32/tests: COM cleanup in vartype.c. --- dlls/oleaut32/tests/vartype.c | 51 +++++++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 484a17f..2026cce 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define CONST_VTABLE + #include "wine/test.h" #include "oleauto.h" #include <math.h> @@ -514,7 +516,7 @@ typedef struct tagINTERNAL_BSTR typedef struct { - const IDispatchVtbl *lpVtbl; + IDispatch IDispatch_iface; LONG ref; VARTYPE vt; BOOL bFailInvoke; @@ -522,16 +524,25 @@ typedef struct static DummyDispatch dispatch; +static inline DummyDispatch *impl_from_IDispatch(IDispatch *iface) +{ + return CONTAINING_RECORD(iface, DummyDispatch, IDispatch_iface); +} + static ULONG WINAPI DummyDispatch_AddRef(LPDISPATCH iface) { + DummyDispatch *This = impl_from_IDispatch(iface); + trace("AddRef(%p)\n", iface); - return InterlockedIncrement(&((DummyDispatch*)iface)->ref); + return InterlockedIncrement(&This->ref); } static ULONG WINAPI DummyDispatch_Release(LPDISPATCH iface) { + DummyDispatch *This = impl_from_IDispatch(iface); + trace("Release(%p)\n", iface); - return InterlockedDecrement(&((DummyDispatch*)iface)->ref); + return InterlockedDecrement(&This->ref); } static HRESULT WINAPI DummyDispatch_QueryInterface(LPDISPATCH iface, @@ -592,7 +603,7 @@ static const IDispatchVtbl DummyDispatch_VTable = DummyDispatch_Invoke }; -static DummyDispatch dispatch = { &DummyDispatch_VTable, 1, 0, 0 }; +static DummyDispatch dispatch = { { &DummyDispatch_VTable }, 1, 0, 0 }; /* * VT_I1/VT_UI1 @@ -1094,11 +1105,11 @@ static void test_VarUI1FromDisp(void) VariantInit(&vDst); V_VT(&vSrc) = VT_DISPATCH; - V_DISPATCH(&vSrc) = (IDispatch*)&dispatch; + V_DISPATCH(&vSrc) = &dispatch.IDispatch_iface; dispatch.vt = VT_UI1; dispatch.bFailInvoke = FALSE; - hres = pVarUI1FromDisp((IDispatch*)&dispatch, in, &out); + hres = pVarUI1FromDisp(&dispatch.IDispatch_iface, in, &out); trace("0x%08x\n", hres); hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1); @@ -1106,7 +1117,7 @@ static void test_VarUI1FromDisp(void) dispatch.bFailInvoke = TRUE; - hres = pVarUI1FromDisp((IDispatch*)&dispatch, in, &out); + hres = pVarUI1FromDisp(&dispatch.IDispatch_iface, in, &out); trace("0x%08x\n", hres); hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1); @@ -5579,12 +5590,12 @@ static void test_IUnknownClear(void) { HRESULT hres; VARIANTARG v; - DummyDispatch u = { &DummyDispatch_VTable, 1, VT_UI1, FALSE }; - IUnknown* pu = (IUnknown*)&u; + DummyDispatch u = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; + IUnknown* pu = (IUnknown*)&u.IDispatch_iface; /* Test that IUnknown_Release is called on by-value */ V_VT(&v) = VT_UNKNOWN; - V_UNKNOWN(&v) = (IUnknown*)&u; + V_UNKNOWN(&v) = (IUnknown*)&u.IDispatch_iface; hres = VariantClear(&v); ok(hres == S_OK && u.ref == 0 && V_VT(&v) == VT_EMPTY, "clear unknown: expected 0x%08x, %d, %d, got 0x%08x, %d, %d\n", @@ -5604,8 +5615,8 @@ static void test_IUnknownCopy(void) { HRESULT hres; VARIANTARG vSrc, vDst; - DummyDispatch u = { &DummyDispatch_VTable, 1, VT_UI1, FALSE }; - IUnknown* pu = (IUnknown*)&u; + DummyDispatch u = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; + IUnknown* pu = (IUnknown*)&u.IDispatch_iface; /* AddRef is called on by-value copy */ VariantInit(&vDst); @@ -5652,8 +5663,8 @@ static void test_IUnknownChangeTypeEx(void) VARIANTARG vSrc, vDst; LCID lcid; VARTYPE vt; - DummyDispatch u = { &DummyDispatch_VTable, 1, VT_UI1, FALSE }; - IUnknown* pu = (IUnknown*)&u; + DummyDispatch u = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; + IUnknown* pu = (IUnknown*)&u.IDispatch_iface; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); @@ -5720,8 +5731,8 @@ static void test_IDispatchClear(void) { HRESULT hres; VARIANTARG v; - DummyDispatch d = { &DummyDispatch_VTable, 1, VT_UI1, FALSE }; - IDispatch* pd = (IDispatch*)&d; + DummyDispatch d = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; + IDispatch* pd = &d.IDispatch_iface; /* As per IUnknown */ @@ -5745,8 +5756,8 @@ static void test_IDispatchCopy(void) { HRESULT hres; VARIANTARG vSrc, vDst; - DummyDispatch d = { &DummyDispatch_VTable, 1, VT_UI1, FALSE }; - IDispatch* pd = (IDispatch*)&d; + DummyDispatch d = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; + IDispatch* pd = &d.IDispatch_iface; /* As per IUnknown */ @@ -5790,8 +5801,8 @@ static void test_IDispatchChangeTypeEx(void) HRESULT hres; VARIANTARG vSrc, vDst; LCID lcid; - DummyDispatch d = { &DummyDispatch_VTable, 1, VT_UI1, FALSE }; - IDispatch* pd = (IDispatch*)&d; + DummyDispatch d = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; + IDispatch* pd = &d.IDispatch_iface; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: 18c11b9b2da4fd0c424ea4e8b69f069d48eab7f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c11b9b2da4fd0c424ea4e8b… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Mar 17 18:53:13 2011 +0100 po: Update Polish translation. --- po/pl.po | 468 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 237 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18c11b9b2da4fd0c424ea…

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DCubeTexture.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: b8c40f3a7e07560203035f1f1442b2332b240dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8c40f3a7e07560203035f1f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 17 23:15:09 2011 +0100 wined3d: Get rid of IWineD3DCubeTexture. --- dlls/d3d8/cubetexture.c | 46 +++++++++++++++--------------- dlls/d3d8/d3d8_private.h | 8 +---- dlls/d3d9/cubetexture.c | 52 +++++++++++++++++----------------- dlls/d3d9/d3d9_private.h | 9 +---- dlls/ddraw/ddraw.c | 3 +- dlls/wined3d/cubetexture.c | 60 +++++++++++++++++---------------------- dlls/wined3d/device.c | 8 ++-- dlls/wined3d/wined3d_private.h | 6 +--- include/wine/wined3d.idl | 11 +------ 9 files changed, 86 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8c40f3a7e07560203035…

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DCubeTextureImpl.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: afa93a5b58021cff05b95eb0b24e32b6a2ea9c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa93a5b58021cff05b95eb0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 17 23:15:10 2011 +0100 wined3d: Get rid of IWineD3DCubeTextureImpl. --- dlls/wined3d/cubetexture.c | 24 ++++++++++++------------ dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_private.h | 15 ++++----------- 3 files changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 4be1fee..06bd55d 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -168,7 +168,7 @@ static const struct wined3d_resource_ops cubetexture_resource_ops = cubetexture_unload, }; -static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) +static void cubetexture_cleanup(IWineD3DBaseTextureImpl *This) { UINT sub_count = This->baseTexture.level_count * This->baseTexture.layer_count; UINT i; @@ -197,7 +197,7 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) static HRESULT WINAPI IWineD3DCubeTextureImpl_QueryInterface(IWineD3DBaseTexture *iface, REFIID riid, LPVOID *ppobj) { - IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IWineD3DBase) @@ -214,7 +214,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_QueryInterface(IWineD3DBaseTexture static ULONG WINAPI IWineD3DCubeTextureImpl_AddRef(IWineD3DBaseTexture *iface) { - IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; TRACE("(%p) : AddRef increasing from %d\n", This, This->resource.ref); return InterlockedIncrement(&This->resource.ref); } @@ -222,7 +222,7 @@ static ULONG WINAPI IWineD3DCubeTextureImpl_AddRef(IWineD3DBaseTexture *iface) /* Do not call while under the GL lock. */ static ULONG WINAPI IWineD3DCubeTextureImpl_Release(IWineD3DBaseTexture *iface) { - IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; ULONG ref; TRACE("(%p) : Releasing from %d\n", This, This->resource.ref); ref = InterlockedDecrement(&This->resource.ref); @@ -238,28 +238,28 @@ static ULONG WINAPI IWineD3DCubeTextureImpl_Release(IWineD3DBaseTexture *iface) static HRESULT WINAPI IWineD3DCubeTextureImpl_SetPrivateData(IWineD3DBaseTexture *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data(&((IWineD3DCubeTextureImpl *)iface)->resource, riid, data, data_size, flags); + return resource_set_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DCubeTextureImpl_GetPrivateData(IWineD3DBaseTexture *iface, REFGUID guid, void *data, DWORD *data_size) { - return resource_get_private_data(&((IWineD3DCubeTextureImpl *)iface)->resource, guid, data, data_size); + return resource_get_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, guid, data, data_size); } static HRESULT WINAPI IWineD3DCubeTextureImpl_FreePrivateData(IWineD3DBaseTexture *iface, REFGUID refguid) { - return resource_free_private_data(&((IWineD3DCubeTextureImpl *)iface)->resource, refguid); + return resource_free_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, refguid); } static DWORD WINAPI IWineD3DCubeTextureImpl_SetPriority(IWineD3DBaseTexture *iface, DWORD priority) { - return resource_set_priority(&((IWineD3DCubeTextureImpl *)iface)->resource, priority); + return resource_set_priority(&((IWineD3DBaseTextureImpl *)iface)->resource, priority); } static DWORD WINAPI IWineD3DCubeTextureImpl_GetPriority(IWineD3DBaseTexture *iface) { - return resource_get_priority(&((IWineD3DCubeTextureImpl *)iface)->resource); + return resource_get_priority(&((IWineD3DBaseTextureImpl *)iface)->resource); } /* Do not call while under the GL lock. */ @@ -270,14 +270,14 @@ static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DBaseTexture *iface) static WINED3DRESOURCETYPE WINAPI IWineD3DCubeTextureImpl_GetType(IWineD3DBaseTexture *iface) { - return resource_get_type(&((IWineD3DCubeTextureImpl *)iface)->resource); + return resource_get_type(&((IWineD3DBaseTextureImpl *)iface)->resource); } static void * WINAPI IWineD3DCubeTextureImpl_GetParent(IWineD3DBaseTexture *iface) { TRACE("iface %p.\n", iface); - return ((IWineD3DCubeTextureImpl *)iface)->resource.parent; + return ((IWineD3DBaseTextureImpl *)iface)->resource.parent; } static DWORD WINAPI IWineD3DCubeTextureImpl_SetLOD(IWineD3DBaseTexture *iface, DWORD LODNew) @@ -367,7 +367,7 @@ static const IWineD3DBaseTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_AddDirtyRegion, }; -HRESULT cubetexture_init(IWineD3DCubeTextureImpl *texture, UINT edge_length, UINT levels, +HRESULT cubetexture_init(IWineD3DBaseTextureImpl *texture, UINT edge_length, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fa3cf2f..c8d05de 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1206,9 +1206,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface DWORD Usage, enum wined3d_format_id Format, WINED3DPOOL Pool, void *parent, const struct wined3d_parent_ops *parent_ops, IWineD3DBaseTexture **texture) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DCubeTextureImpl *object; /** NOTE: impl ref allowed since this is a create function **/ - HRESULT hr; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DBaseTextureImpl *object; + HRESULT hr; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 71897ce..a8d3b94 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1954,6 +1954,10 @@ void basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPE DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) DECLSPEC_HIDDEN; void basetexture_unload(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; +HRESULT cubetexture_init(IWineD3DBaseTextureImpl *texture, UINT edge_length, UINT levels, + IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + HRESULT texture_init(IWineD3DBaseTextureImpl *texture, UINT width, UINT height, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; @@ -1962,17 +1966,6 @@ HRESULT volumetexture_init(IWineD3DBaseTextureImpl *texture, UINT width, UINT he UINT depth, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -typedef struct IWineD3DCubeTextureImpl -{ - const IWineD3DBaseTextureVtbl *lpVtbl; - struct wined3d_resource resource; - IWineD3DBaseTextureClass baseTexture; -} IWineD3DCubeTextureImpl; - -HRESULT cubetexture_init(IWineD3DCubeTextureImpl *texture, UINT edge_length, UINT levels, - IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; - typedef struct IWineD3DVolumeImpl { /* IUnknown & WineD3DResource fields */

1 0

Henri Verbeet : wined3d: Merge the IWineD3DBaseTexture::AddDirtyRegion() implementations.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: d30d9d5e49260b0c5ce3bc030055bb541885fcd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30d9d5e49260b0c5ce3bc030… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 17 23:15:11 2011 +0100 wined3d: Merge the IWineD3DBaseTexture::AddDirtyRegion() implementations. --- dlls/wined3d/basetexture.c | 19 +++++++++++++++++++ dlls/wined3d/cubetexture.c | 23 ++++++++--------------- dlls/wined3d/texture.c | 23 ++++++++--------------- dlls/wined3d/volumetexture.c | 23 ++++++++--------------- dlls/wined3d/wined3d_private.h | 4 ++++ 5 files changed, 47 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 01652ab..28aceec 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -338,6 +338,25 @@ HRESULT basetexture_bind(IWineD3DBaseTextureImpl *texture, return hr; } +HRESULT basetexture_add_dirty_region(IWineD3DBaseTextureImpl *texture, + UINT layer, const WINED3DBOX *dirty_region) +{ + struct wined3d_resource *sub_resource; + + TRACE("texture %p, layer %u, dirty_region %p.\n", texture, layer, dirty_region); + + if (!(sub_resource = basetexture_get_sub_resource(texture, layer * texture->baseTexture.level_count))) + { + WARN("Failed to get sub-resource.\n"); + return WINED3DERR_INVALIDCALL; + } + + basetexture_set_dirty(texture, TRUE); + texture->baseTexture.texture_ops->texture_sub_resource_add_dirty_region(sub_resource, dirty_region); + + return WINED3D_OK; +} + /* GL locking is done by the caller */ static void apply_wrap(const struct wined3d_gl_info *gl_info, GLenum target, WINED3DTEXTUREADDRESS d3d_wrap, GLenum param, BOOL cond_np2) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 06bd55d..ca0c234 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -135,6 +135,12 @@ static void cubetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSR if (context) context_release(context); } +static void cubetexture_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, + const WINED3DBOX *dirty_region) +{ + surface_add_dirty_rect(surface_from_resource(sub_resource), dirty_region); +} + /* Do not call while under the GL lock. */ static void cubetexture_unload(struct wined3d_resource *resource) { @@ -161,6 +167,7 @@ static const struct wined3d_texture_ops cubetexture_ops = { cubetexture_bind, cubetexture_preload, + cubetexture_sub_resource_add_dirty_region, }; static const struct wined3d_resource_ops cubetexture_resource_ops = @@ -324,21 +331,7 @@ static struct wined3d_resource * WINAPI IWineD3DCubeTextureImpl_GetSubResource(I static HRESULT WINAPI IWineD3DCubeTextureImpl_AddDirtyRegion(IWineD3DBaseTexture *iface, UINT layer, const WINED3DBOX *dirty_region) { - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, layer %u, dirty_region %p.\n", iface, layer, dirty_region); - - if (!(sub_resource = basetexture_get_sub_resource(texture, layer * texture->baseTexture.level_count))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - basetexture_set_dirty(texture, TRUE); - surface_add_dirty_rect(surface_from_resource(sub_resource), dirty_region); - - return WINED3D_OK; + return basetexture_add_dirty_region((IWineD3DBaseTextureImpl *)iface, layer, dirty_region); } static const IWineD3DBaseTextureVtbl IWineD3DCubeTexture_Vtbl = diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3eb3c71..27ac291 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -159,6 +159,12 @@ static void texture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSRGB s gl_tex->dirty = FALSE; } +static void texture_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, + const WINED3DBOX *dirty_region) +{ + surface_add_dirty_rect(surface_from_resource(sub_resource), dirty_region); +} + /* Do not call while under the GL lock. */ static void texture_unload(struct wined3d_resource *resource) { @@ -184,6 +190,7 @@ static const struct wined3d_texture_ops texture_ops = { texture_bind, texture_preload, + texture_sub_resource_add_dirty_region, }; static const struct wined3d_resource_ops texture_resource_ops = @@ -348,21 +355,7 @@ static struct wined3d_resource * WINAPI IWineD3DTextureImpl_GetSubResource(IWine static HRESULT WINAPI IWineD3DTextureImpl_AddDirtyRegion(IWineD3DBaseTexture *iface, UINT layer, const WINED3DBOX *dirty_region) { - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, layer %u, dirty_region %p.\n", iface, layer, dirty_region); - - if (!(sub_resource = basetexture_get_sub_resource(texture, layer * texture->baseTexture.level_count))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - basetexture_set_dirty(texture, TRUE); - surface_add_dirty_rect(surface_from_resource(sub_resource), dirty_region); - - return WINED3D_OK; + return basetexture_add_dirty_region((IWineD3DBaseTextureImpl *)iface, layer, dirty_region); } static const IWineD3DBaseTextureVtbl IWineD3DTexture_Vtbl = diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 3831ef1..50ee060 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -83,6 +83,12 @@ static void volumetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3D texture->baseTexture.texture_rgb.dirty = FALSE; } +static void volumetexture_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, + const WINED3DBOX *dirty_region) +{ + volume_add_dirty_box(volume_from_resource(sub_resource), dirty_region); +} + /* Do not call while under the GL lock. */ static void volumetexture_unload(struct wined3d_resource *resource) { @@ -104,6 +110,7 @@ static const struct wined3d_texture_ops volumetexture_ops = { volumetexture_bind, volumetexture_preload, + volumetexture_sub_resource_add_dirty_region, }; static const struct wined3d_resource_ops volumetexture_resource_ops = @@ -265,21 +272,7 @@ static struct wined3d_resource * WINAPI IWineD3DVolumeTextureImpl_GetSubResource static HRESULT WINAPI IWineD3DVolumeTextureImpl_AddDirtyRegion(IWineD3DBaseTexture *iface, UINT layer, const WINED3DBOX *dirty_region) { - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, layer %u, dirty_region %p.\n", iface, layer, dirty_region); - - if (!(sub_resource = basetexture_get_sub_resource(texture, layer * texture->baseTexture.level_count))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - basetexture_set_dirty(texture, TRUE); - volume_add_dirty_box(volume_from_resource(sub_resource), dirty_region); - - return WINED3D_OK; + return basetexture_add_dirty_region((IWineD3DBaseTextureImpl *)iface, layer, dirty_region); } static const IWineD3DBaseTextureVtbl IWineD3DVolumeTexture_Vtbl = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a8d3b94..74c23a7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1888,6 +1888,8 @@ struct wined3d_texture_ops HRESULT (*texture_bind)(struct IWineD3DBaseTextureImpl *texture, const struct wined3d_gl_info *gl_info, BOOL srgb); void (*texture_preload)(struct IWineD3DBaseTextureImpl *texture, enum WINED3DSRGB srgb); + void (*texture_sub_resource_add_dirty_region)(struct wined3d_resource *sub_resource, + const WINED3DBOX *dirty_region); }; typedef struct IWineD3DBaseTextureClass @@ -1932,6 +1934,8 @@ static inline struct gl_texture *basetexture_get_gl_texture(IWineD3DBaseTextureI : &texture->baseTexture.texture_rgb; } +HRESULT basetexture_add_dirty_region(IWineD3DBaseTextureImpl *texture, + UINT layer, const WINED3DBOX *dirty_region) DECLSPEC_HIDDEN; void basetexture_apply_state_changes(IWineD3DBaseTextureImpl *texture, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add a null driver entry point for PatBlt.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: ef676d6d7d19354e12bda0fa58de92922fd63e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef676d6d7d19354e12bda0fa5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 14:54:56 2011 +0100 gdi32: Add a null driver entry point for PatBlt. --- dlls/gdi32/bitblt.c | 44 ++++++++++++++------------------------------ dlls/gdi32/driver.c | 7 ++++++- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index f32ae98..6586f41 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -43,28 +43,21 @@ static inline BOOL rop_uses_src( DWORD rop ) /*********************************************************************** * PatBlt (GDI32.@) */ -BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, - INT width, INT height, DWORD rop) +BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop) { DC * dc; BOOL bRet = FALSE; - if (rop_uses_src( rop )) return FALSE; - if (!(dc = get_dc_ptr( hdc ))) return FALSE; - TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop ); - if (dc->funcs->pPatBlt) - { - update_dc( dc ); - bRet = dc->funcs->pPatBlt( dc->physDev, left, top, width, height, rop ); - } - else if (dc->funcs->pStretchBlt) + if (rop_uses_src( rop )) return FALSE; + if ((dc = get_dc_ptr( hdc ))) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPatBlt ); update_dc( dc ); - bRet = dc->funcs->pStretchBlt( dc->physDev, left, top, width, height, NULL, 0, 0, 0, 0, rop ); + bRet = physdev->funcs->pPatBlt( physdev, left, top, width, height, rop ); + release_dc_ptr( dc ); } - release_dc_ptr( dc ); return bRet; } @@ -78,18 +71,15 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, BOOL ret = FALSE; DC *dcDst, *dcSrc; + if (!rop_uses_src( rop )) return PatBlt( hdcDst, xDst, yDst, width, height, rop ); + TRACE("hdcSrc=%p %d,%d -> hdcDest=%p %d,%d %dx%d rop=%06x\n", hdcSrc, xSrc, ySrc, hdcDst, xDst, yDst, width, height, rop); if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; update_dc( dcDst ); - if (!rop_uses_src( rop ) && dcDst->funcs->pPatBlt) - { - ret = dcDst->funcs->pPatBlt( dcDst->physDev, xDst, yDst, width, height, rop ); - release_dc_ptr( dcDst ); - } - else if (dcDst->funcs->pBitBlt || dcDst->funcs->pStretchBlt) + if (dcDst->funcs->pBitBlt || dcDst->funcs->pStretchBlt) { dcSrc = get_dc_ptr( hdcSrc ); if (dcSrc) update_dc( dcSrc ); @@ -158,15 +148,14 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, /*********************************************************************** * StretchBlt (GDI32.@) */ -BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, - INT widthDst, INT heightDst, - HDC hdcSrc, INT xSrc, INT ySrc, - INT widthSrc, INT heightSrc, - DWORD rop ) +BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, INT widthDst, INT heightDst, + HDC hdcSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, DWORD rop ) { BOOL ret = FALSE; DC *dcDst, *dcSrc; + if (!rop_uses_src( rop )) return PatBlt( hdcDst, xDst, yDst, widthDst, heightDst, rop ); + TRACE("%p %d,%d %dx%d -> %p %d,%d %dx%d rop=%06x\n", hdcSrc, xSrc, ySrc, widthSrc, heightSrc, hdcDst, xDst, yDst, widthDst, heightDst, rop ); @@ -175,12 +164,7 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; update_dc( dcDst ); - if (!rop_uses_src( rop ) && dcDst->funcs->pPatBlt) - { - ret = dcDst->funcs->pPatBlt( dcDst->physDev, xDst, yDst, widthDst, heightDst, rop ); - release_dc_ptr( dcDst ); - } - else if (dcDst->funcs->pStretchBlt) + if (dcDst->funcs->pStretchBlt) { if ((dcSrc = get_dc_ptr( hdcSrc ))) { diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f040bde..57f3117 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -514,6 +514,11 @@ static BOOL CDECL nulldrv_PaintRgn( PHYSDEV dev, HRGN rgn ) return TRUE; } +static BOOL CDECL nulldrv_PatBlt( PHYSDEV dev, INT x, INT y, INT width, INT height, DWORD rop ) +{ + return TRUE; +} + static BOOL CDECL nulldrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { @@ -839,7 +844,7 @@ const DC_FUNCTIONS null_driver = nulldrv_OffsetViewportOrgEx, /* pOffsetViewportOrg */ nulldrv_OffsetWindowOrgEx, /* pOffsetWindowOrg */ nulldrv_PaintRgn, /* pPaintRgn */ - NULL, /* pPatBlt */ + nulldrv_PatBlt, /* pPatBlt */ nulldrv_Pie, /* pPie */ nulldrv_PolyBezier, /* pPolyBezier */ nulldrv_PolyBezierTo, /* pPolyBezierTo */

1 0