wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Vincent Povirk : windowscodecs: Make component enumerators thread-safe.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: d719120fc8486803f71e0070e6c5750b47bd7181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d719120fc8486803f71e0070e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 13 12:29:09 2010 -0600 windowscodecs: Make component enumerators thread-safe. This is needed so that ImagingFactory can have a threading model of Both. --- dlls/windowscodecs/info.c | 37 ++++++++++++++++++++++++++++++------- 1 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index f909d3a..2e558a8 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -726,6 +726,7 @@ typedef struct { LONG ref; struct list objects; struct list *cursor; + CRITICAL_SECTION lock; /* Must be held when reading or writing cursor */ } ComponentEnum; typedef struct { @@ -783,6 +784,8 @@ static ULONG WINAPI ComponentEnum_Release(IEnumUnknown *iface) list_remove(&cursor->entry); HeapFree(GetProcessHeap(), 0, cursor); } + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This); } @@ -795,15 +798,17 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, ComponentEnum *This = (ComponentEnum*)iface; int num_fetched=0; ComponentEnumItem *item; + HRESULT hr=S_OK; TRACE("(%p,%u,%p,%p)\n", iface, celt, rgelt, pceltFetched); + EnterCriticalSection(&This->lock); while (num_fetched<celt) { if (!This->cursor) { - *pceltFetched = num_fetched; - return S_FALSE; + hr = S_FALSE; + break; } item = LIST_ENTRY(This->cursor, ComponentEnumItem, entry); IUnknown_AddRef(item->unk); @@ -811,24 +816,31 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, num_fetched++; This->cursor = list_next(&This->objects, This->cursor); } + LeaveCriticalSection(&This->lock); *pceltFetched = num_fetched; - return S_OK; + return hr; } static HRESULT WINAPI ComponentEnum_Skip(IEnumUnknown *iface, ULONG celt) { ComponentEnum *This = (ComponentEnum*)iface; int i; + HRESULT hr=S_OK; TRACE("(%p,%u)\n", iface, celt); + EnterCriticalSection(&This->lock); for (i=0; i<celt; i++) { if (!This->cursor) - return S_FALSE; + { + hr = S_FALSE; + break; + } This->cursor = list_next(&This->objects, This->cursor); } - return S_OK; + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI ComponentEnum_Reset(IEnumUnknown *iface) @@ -837,7 +849,9 @@ static HRESULT WINAPI ComponentEnum_Reset(IEnumUnknown *iface) TRACE("(%p)\n", iface); + EnterCriticalSection(&This->lock); This->cursor = list_head(&This->objects); + LeaveCriticalSection(&This->lock); return S_OK; } @@ -847,6 +861,7 @@ static HRESULT WINAPI ComponentEnum_Clone(IEnumUnknown *iface, IEnumUnknown **pp ComponentEnum *new_enum; ComponentEnumItem *old_item, *new_item; HRESULT ret=S_OK; + struct list *old_cursor; new_enum = HeapAlloc(GetProcessHeap(), 0, sizeof(ComponentEnum)); if (!new_enum) @@ -858,8 +873,14 @@ static HRESULT WINAPI ComponentEnum_Clone(IEnumUnknown *iface, IEnumUnknown **pp new_enum->IEnumUnknown_Vtbl = &ComponentEnumVtbl; new_enum->ref = 1; new_enum->cursor = NULL; - list_init(&new_enum->objects); + InitializeCriticalSection(&new_enum->lock); + new_enum->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ComponentEnum.lock"); + + EnterCriticalSection(&This->lock); + old_cursor = This->cursor; + LeaveCriticalSection(&This->lock); + LIST_FOR_EACH_ENTRY(old_item, &This->objects, ComponentEnumItem, entry) { new_item = HeapAlloc(GetProcessHeap(), 0, sizeof(ComponentEnumItem)); @@ -871,7 +892,7 @@ static HRESULT WINAPI ComponentEnum_Clone(IEnumUnknown *iface, IEnumUnknown **pp new_item->unk = old_item->unk; list_add_tail(&new_enum->objects, &new_item->entry); IUnknown_AddRef(new_item->unk); - if (&old_item->entry == This->cursor) new_enum->cursor = &new_item->entry; + if (&old_item->entry == old_cursor) new_enum->cursor = &new_item->entry; } if (FAILED(ret)) @@ -923,6 +944,8 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn This->IEnumUnknown_Vtbl = &ComponentEnumVtbl; This->ref = 1; list_init(&This->objects); + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ComponentEnum.lock"); for (category=categories; category->type && hr == S_OK; category++) {

1 0

Vincent Povirk : include: Add definitions for IWICBitmapScaler.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 33ab02d38a474b22dce070d45c7dc1289d366c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ab02d38a474b22dce070d45… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 17 13:18:43 2010 -0500 include: Add definitions for IWICBitmapScaler. --- include/wincodec.idl | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index bf0fdee..1bcb2cd 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -72,6 +72,14 @@ typedef enum WICBitmapEncoderCacheOption { WICBITMAPENCODERCACHEOPTION_FORCE_DWORD = CODEC_FORCE_DWORD } WICBitmapEncoderCacheOption; +typedef enum WICBitmapInterpolationMode { + WICBitmapInterpolationModeNearestNeighbor = 0x00000000, + WICBitmapInterpolationModeLinear = 0x00000001, + WICBitmapInterpolationModeCubic = 0x00000002, + WICBitmapInterpolationModeFaint = 0x00000003, + WICBITMAPINTERPOLATIONMODE_FORCE_DWORD = CODEC_FORCE_DWORD +} WICBitmapInterpolationMode; + typedef enum WICBitmapPaletteType { WICBitmapPaletteTypeCustom = 0x00000000, WICBitmapPaletteTypeMedianCut = 0x00000001, @@ -170,7 +178,6 @@ cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") interface IWICPalette; -interface IWICBitmapScaler; interface IWICBitmapClipper; interface IWICBitmapFlipRotator; interface IWICColorContext; @@ -625,6 +632,19 @@ interface IWICStream : IStream [in] ULARGE_INTEGER ulMaxSize); } +[ + object, + uuid(00000302-a8f2-4877-ba0a-fd2b6645fb94) +] +interface IWICBitmapScaler : IWICBitmapSource +{ + HRESULT Initialize( + [in] IWICBitmapSource *pISource, + [in] UINT uiWidth, + [in] UINT uiHeight, + [in] WICBitmapInterpolationMode mode); +} + cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") [

1 0

Vincent Povirk : winex11.drv: Use CurrentTime to focus windows if we have no timestamp.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: e4a50e1615ad7cb8635fcfacae8fcc4b8f52da76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a50e1615ad7cb8635fcfaca… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 17 12:29:23 2010 -0500 winex11.drv: Use CurrentTime to focus windows if we have no timestamp. --- dlls/winex11.drv/window.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 47f7245..46f677b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2089,20 +2089,24 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) Display *display = thread_display(); struct x11drv_win_data *data; XWindowChanges changes; + DWORD timestamp; if (!(hwnd = GetAncestor( hwnd, GA_ROOT ))) return; if (!(data = X11DRV_get_win_data( hwnd ))) return; if (data->managed || !data->whole_window) return; + if (EVENT_x11_time_to_win32_time(0)) + /* ICCCM says don't use CurrentTime, so try to use last message time if possible */ + /* FIXME: this is not entirely correct */ + timestamp = GetMessageTime() - EVENT_x11_time_to_win32_time(0); + else + timestamp = CurrentTime; + /* Set X focus and install colormap */ wine_tsx11_lock(); changes.stack_mode = Above; XConfigureWindow( display, data->whole_window, CWStackMode, &changes ); - /* we must not use CurrentTime (ICCCM), so try to use last message time instead */ - /* FIXME: this is not entirely correct */ - XSetInputFocus( display, data->whole_window, RevertToParent, - /* CurrentTime */ - GetMessageTime() - EVENT_x11_time_to_win32_time(0)); + XSetInputFocus( display, data->whole_window, RevertToParent, timestamp ); wine_tsx11_unlock(); }

1 0

Vincent Povirk : winex11.drv: ReadSelectionData should fail if the import function fails.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 1eff311e8da7d2ca202427933b1e31302dddaef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eff311e8da7d2ca202427933… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 17 11:39:35 2010 -0500 winex11.drv: ReadSelectionData should fail if the import function fails. --- dlls/winex11.drv/clipboard.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f4e49e2..4d4306e 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2199,7 +2199,10 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA HANDLE hData = lpData->lpFormat->lpDrvImportFunc(display, xe.xselection.requestor, xe.xselection.property); - bRet = X11DRV_CLIPBOARD_InsertClipboardData(lpData->wFormatID, hData, 0, lpData->lpFormat, TRUE); + if (hData) + bRet = X11DRV_CLIPBOARD_InsertClipboardData(lpData->wFormatID, hData, 0, lpData->lpFormat, TRUE); + else + TRACE("Import function failed\n"); } else {

1 0

Nikolay Sivov : ole32: Remove useless parameter check.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: 0498534b6b1193f60ba63af00a14e665e3b37178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0498534b6b1193f60ba63af00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 17 18:21:52 2010 +0300 ole32: Remove useless parameter check. --- dlls/ole32/stg_prop.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 52153a2..b3362bc 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -181,7 +181,9 @@ static HRESULT WINAPI IPropertyStorage_fnQueryInterface( { PropertyStorage_impl *This = (PropertyStorage_impl *)iface; - if ( (This==0) || (ppvObject==0) ) + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); + + if (!ppvObject) return E_INVALIDARG; *ppvObject = 0;

1 0

Christian Costa : d3dx9_36: Add stub for D3DXCreateTextureFromFileInMemoryEx.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: c090624fbc86009c13860603947306406a8ce789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c090624fbc86009c138606039… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Mar 17 12:21:22 2010 +0100 d3dx9_36: Add stub for D3DXCreateTextureFromFileInMemoryEx. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 7924081..2034a04 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -97,7 +97,7 @@ @ stub D3DXCreateTextureFromFileExA @ stub D3DXCreateTextureFromFileExW @ stub D3DXCreateTextureFromFileInMemory -@ stub D3DXCreateTextureFromFileInMemoryEx +@ stdcall D3DXCreateTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateTextureFromFileW @ stub D3DXCreateTextureFromResourceA @ stub D3DXCreateTextureFromResourceExA diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f47853a..f0773b9 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -35,3 +35,25 @@ HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice, return IDirect3DDevice9_CreateTexture(pDevice, width, height, miplevels, usage, format, pool, ppTexture, NULL); } + +HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, + LPCVOID srcdata, + UINT srcdatasize, + UINT width, + UINT height, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mipfilter, + D3DCOLOR colorkey, + D3DXIMAGE_INFO* srcinfo, + PALETTEENTRY* palette, + LPDIRECT3DTEXTURE9* texture) +{ + FIXME("(%p, %p, %d, %d, %d, %d, %x, %x, %x, %d, %d, %x, %p, %p, %p): stub\n", device, srcdata, srcdatasize, width, + height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); + + return E_NOTIMPL; +}

1 0

Stefan Dösinger : d3d9: Remove old debug messages from the tests.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: 48d6167c29b06edfe4be0c29430adb1fe82b285e URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d6167c29b06edfe4be0c294… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 14 07:54:58 2010 -0800 d3d9: Remove old debug messages from the tests. --- dlls/d3d9/tests/visual.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 875d2be..1fa7f47 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -495,9 +495,6 @@ static void clear_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetViewport(device, &old_vp); ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr); - trace("viewport: X %u, Y %u, W %u, H %u, MinZ %.8e, MaxZ %.8e.\n", - old_vp.X, old_vp.Y, old_vp.Width, old_vp.Height, old_vp.MinZ, old_vp.MaxZ); - vp.X = 160; vp.Y = 120; vp.Width = 160; @@ -10433,7 +10430,6 @@ static void loop_index_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); if(SUCCEEDED(hr)) { - trace("going to draw index\n"); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); hr = IDirect3DDevice9_EndScene(device);

1 0

Stefan Dösinger : d3d9: Windows 7 rejects invalid rectangles.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: f5b5f7176a656ba0a61a082d51419732362a1346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5b5f7176a656ba0a61a082d5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 15 14:08:23 2010 +0100 d3d9: Windows 7 rejects invalid rectangles. --- dlls/d3d9/tests/surface.c | 54 ++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 967c608..c1246fc 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -255,6 +255,12 @@ static void test_lockrect_offset(IDirect3DDevice9 *device) IDirect3D9_Release(d3d); } +struct rect_test +{ + RECT rect; + HRESULT win7_result; +}; + static void test_lockrect_invalid(IDirect3DDevice9 *device) { IDirect3DSurface9 *surface = 0; @@ -264,20 +270,20 @@ static void test_lockrect_invalid(IDirect3DDevice9 *device) HRESULT hr; const RECT test_rect_2 = { 0, 0, 8, 8 }; - const RECT test_data[] = { - {60, 60, 68, 68}, /* Valid */ - {60, 60, 60, 68}, /* 0 height */ - {60, 60, 68, 60}, /* 0 width */ - {68, 60, 60, 68}, /* left > right */ - {60, 68, 68, 60}, /* top > bottom */ - {-8, 60, 0, 68}, /* left < surface */ - {60, -8, 68, 0}, /* top < surface */ - {-16, 60, -8, 68}, /* right < surface */ - {60, -16, 68, -8}, /* bottom < surface */ - {60, 60, 136, 68}, /* right > surface */ - {60, 60, 68, 136}, /* bottom > surface */ - {136, 60, 144, 68}, /* left > surface */ - {60, 136, 68, 144}, /* top > surface */ + const struct rect_test test_data[] = { + {{60, 60, 68, 68}, D3D_OK}, /* Valid */ + {{60, 60, 60, 68}, D3DERR_INVALIDCALL}, /* 0 height */ + {{60, 60, 68, 60}, D3DERR_INVALIDCALL}, /* 0 width */ + {{68, 60, 60, 68}, D3DERR_INVALIDCALL}, /* left > right */ + {{60, 68, 68, 60}, D3DERR_INVALIDCALL}, /* top > bottom */ + {{-8, 60, 0, 68}, D3DERR_INVALIDCALL}, /* left < surface */ + {{60, -8, 68, 0}, D3DERR_INVALIDCALL}, /* top < surface */ + {{-16, 60, -8, 68}, D3DERR_INVALIDCALL}, /* right < surface */ + {{60, -16, 68, -8}, D3DERR_INVALIDCALL}, /* bottom < surface */ + {{60, 60, 136, 68}, D3DERR_INVALIDCALL}, /* right > surface */ + {{60, 60, 68, 136}, D3DERR_INVALIDCALL}, /* bottom > surface */ + {{136, 60, 144, 68}, D3DERR_INVALIDCALL}, /* left > surface */ + {{60, 136, 68, 144}, D3DERR_INVALIDCALL}, /* top > surface */ }; hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, 0); @@ -294,14 +300,18 @@ static void test_lockrect_invalid(IDirect3DDevice9 *device) for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i) { unsigned int offset, expected_offset; - const RECT *rect = &test_data[i]; + const RECT *rect = &test_data[i].rect; locked_rect.pBits = (BYTE *)0xdeadbeef; locked_rect.Pitch = 0xdeadbeef; hr = IDirect3DSurface9_LockRect(surface, &locked_rect, rect, 0); - ok(SUCCEEDED(hr), "LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]\n", + /* Windows XP accepts invalid locking rectangles, windows 7 rejects them. + * Some games(C&C3) depend on the XP behavior, mark the Win7 one broken */ + ok(SUCCEEDED(hr) || broken(hr == test_data[i].win7_result), + "LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]\n", hr, rect->left, rect->top, rect->right, rect->bottom); + if(FAILED(hr)) continue; offset = (BYTE *)locked_rect.pBits - base; expected_offset = rect->top * locked_rect.Pitch + rect->left * 4; @@ -319,14 +329,14 @@ static void test_lockrect_invalid(IDirect3DDevice9 *device) hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); - hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0], 0); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0].rect, 0); ok(hr == D3D_OK, "LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]" - ", expected D3D_OK (0x%08x)\n", hr, test_data[0].left, test_data[0].top, - test_data[0].right, test_data[0].bottom, D3D_OK); - hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0], 0); + ", expected D3D_OK (0x%08x)\n", hr, test_data[0].rect.left, test_data[0].rect.top, + test_data[0].rect.right, test_data[0].rect.bottom, D3D_OK); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0].rect, 0); ok(hr == D3DERR_INVALIDCALL, "Double LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]" - ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, test_data[0].left, test_data[0].top, - test_data[0].right, test_data[0].bottom, D3DERR_INVALIDCALL); + ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, test_data[0].rect.left, test_data[0].rect.top, + test_data[0].rect.right, test_data[0].rect.bottom, D3DERR_INVALIDCALL); hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_rect_2, 0); ok(hr == D3DERR_INVALIDCALL, "Double LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]" ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, test_rect_2.left, test_rect_2.top,

1 0

Stefan Dösinger : d3d9: Remove the double unlock test.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: 25c6dbfc2a62e43672d3fc7b75ea80c565d50ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c6dbfc2a62e43672d3fc7b7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 15 13:42:57 2010 +0100 d3d9: Remove the double unlock test. --- dlls/d3d9/tests/surface.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 4427cc0..967c608 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -169,8 +169,9 @@ static void test_surface_alignment(IDirect3DDevice9 *device_ptr) ok(SUCCEEDED(hr), "IDirect3DTexture9_LockRect: %08x\n", hr); hr = IDirect3DTexture9_UnlockRect(pTexture, j); ok(SUCCEEDED(hr), "IDirect3DTexture9_UnLockRect: %08x\n", hr); - hr = IDirect3DTexture9_UnlockRect(pTexture, j); -todo_wine ok(SUCCEEDED(hr), "Double IDirect3DTexture9_UnLockRect failed with %08x\n", hr); + /* Windows XP returns D3D_OK when calling UnlockRect on an unlocked surface, + * windows 7 returns an error. + */ pitch = ((descr.Width + 3) >> 2) << 3; if (i > 0) pitch <<= 1;

1 0

Stefan Dösinger : ddraw: Use a D24X8 depth buffer.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: b5ddd6f0fca86a09e2c69867ff894265b562b662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ddd6f0fca86a09e2c69867f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Feb 27 14:38:18 2010 +0100 ddraw: Use a D24X8 depth buffer. --- dlls/ddraw/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index e5b81a1..221e6d1 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -113,7 +113,7 @@ static BOOL createObjects(void) U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; U1(U4(ddsd).ddpfPixelFormat).dwZBufferBitDepth = 32; - U3(U4(ddsd).ddpfPixelFormat).dwZBitMask = 0xffffffff; + U3(U4(ddsd).ddpfPixelFormat).dwZBitMask = 0x00ffffff; ddsd.dwWidth = 640; ddsd.dwHeight = 480; hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &depth_buffer, NULL);

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
92
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 March 2010