June 2007 - Wine-Commits - list.winehq.org

Misha Koshelev : gdi32/tests: Fix test_widenpath to succeed on Win98.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: 102a0a3b796ebffecd8c6e3622f23585c10bdf1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=102a0a3b796ebffecd8c6e362… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 21 23:39:20 2007 -0500 gdi32/tests: Fix test_widenpath to succeed on Win98. --- dlls/gdi32/tests/path.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 492673a..e9b8e2f 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -38,7 +38,6 @@ static void test_widenpath(void) HPEN oldPen; POINT pnt[6]; INT nSize, ret; - DWORD error; /* Create a pen to be used in WidenPath */ greenPen = CreatePen(PS_SOLID, 10, RGB(0,0,0)); @@ -73,12 +72,12 @@ static void test_widenpath(void) AbortPath(hdc); - /* Test WidenPath with an open path */ + /* Test WidenPath with an open path (last error only set on Win2k and later) */ SetLastError(0xdeadbeef); BeginPath(hdc); ret = WidenPath(hdc); - error = GetLastError(); - ok(ret == FALSE && GetLastError() == ERROR_CAN_NOT_COMPLETE, "WidenPath fails while widening an open path. Return value is %d, should be %d. Error is %08x, should be %08x\n", ret, FALSE, GetLastError(), ERROR_CAN_NOT_COMPLETE); + ok(ret == FALSE && (GetLastError() == ERROR_CAN_NOT_COMPLETE || GetLastError() == 0xdeadbeef), + "WidenPath fails while widening an open path. Return value is %d, should be %d. Error is %u\n", ret, FALSE, GetLastError()); AbortPath(hdc);

1 0

Misha Koshelev : gdi32: Emulate AngleArc using ArcTo.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: 920b050a8b583534bd33336a81814450cf05afd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=920b050a8b583534bd33336a8… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 21 23:39:18 2007 -0500 gdi32: Emulate AngleArc using ArcTo. --- dlls/gdi32/painting.c | 41 ++++++++++++++++------------------------- dlls/gdi32/tests/path.c | 24 ++++++++++++------------ 2 files changed, 28 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index ea36421..98bae33 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -793,34 +793,25 @@ BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, F dc = DC_GetDCUpdate( hdc ); if(!dc) return FALSE; - if(dc->funcs->pAngleArc) - { - result = dc->funcs->pAngleArc( dc->physDev, x, y, dwRadius, eStartAngle, eSweepAngle ); - - GDI_ReleaseObj( hdc ); - return result; - } - GDI_ReleaseObj( hdc ); - - /* AngleArc always works counterclockwise */ - arcdir = GetArcDirection( hdc ); - SetArcDirection( hdc, AD_COUNTERCLOCKWISE ); - - x1 = x + cos(eStartAngle*M_PI/180) * dwRadius; - y1 = y - sin(eStartAngle*M_PI/180) * dwRadius; + /* Calculate the end point */ x2 = x + cos((eStartAngle+eSweepAngle)*M_PI/180) * dwRadius; y2 = y - sin((eStartAngle+eSweepAngle)*M_PI/180) * dwRadius; - LineTo( hdc, x1, y1 ); - if( eSweepAngle >= 0 ) - result = Arc( hdc, x-dwRadius, y-dwRadius, x+dwRadius, y+dwRadius, - x1, y1, x2, y2 ); - else - result = Arc( hdc, x-dwRadius, y-dwRadius, x+dwRadius, y+dwRadius, - x2, y2, x1, y1 ); - - if( result ) MoveToEx( hdc, x2, y2, NULL ); - SetArcDirection( hdc, arcdir ); + if(!PATH_IsPathOpen(dc->path) && dc->funcs->pAngleArc) + result = dc->funcs->pAngleArc( dc->physDev, x, y, dwRadius, eStartAngle, eSweepAngle ); + else { /* do it using ArcTo */ + x1 = x + cos(eStartAngle*M_PI/180) * dwRadius; + y1 = y - sin(eStartAngle*M_PI/180) * dwRadius; + + arcdir = SetArcDirection( hdc, eSweepAngle >= 0 ? AD_COUNTERCLOCKWISE : AD_CLOCKWISE); + result = ArcTo( hdc, x-dwRadius, y-dwRadius, x+dwRadius, y+dwRadius, + x1, y1, x2, y2 ); + SetArcDirection( hdc, arcdir ); + } + if (result) { + dc->CursPosX = x2; + dc->CursPosY = y2; + } return result; } diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 385a524..492673a 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -252,7 +252,7 @@ done: static const path_test_t anglearc_path[] = { {0, 0, PT_MOVETO, 0, 0}, /* 0 */ {371, 229, PT_LINETO, 0, 0}, /* 1 */ - {352, 211, PT_BEZIERTO, 1, 0}, /* 2 */ + {352, 211, PT_BEZIERTO, 0, 0}, /* 2 */ {327, 200, PT_BEZIERTO, 0, 0}, /* 3 */ {300, 200, PT_BEZIERTO, 0, 0}, /* 4 */ {245, 200, PT_BEZIERTO, 0, 0}, /* 5 */ @@ -261,16 +261,16 @@ static const path_test_t anglearc_path[] = { {200, 300, PT_BEZIERTO, 0, 2}, /* 8 */ {200, 300, PT_BEZIERTO, 0, 2}, /* 9 */ {200, 300, PT_BEZIERTO, 0, 2}, /* 10 */ - {231, 260, PT_LINETO, 1, 0}, /* 11 */ - {245, 235, PT_BEZIERTO, 1, 1}, /* 12 */ - {271, 220, PT_BEZIERTO, 0, 1}, /* 13 */ - {300, 220, PT_BEZIERTO, 0, 1}, /* 14 */ - {344, 220, PT_BEZIERTO, 0, 1}, /* 15 */ - {380, 256, PT_BEZIERTO, 0, 1}, /* 16 */ - {380, 300, PT_BEZIERTO, 0, 1}, /* 17 */ - {380, 314, PT_BEZIERTO, 0, 1}, /* 18 */ - {376, 328, PT_BEZIERTO, 0, 1}, /* 19 */ - {369, 340, PT_BEZIERTO | PT_CLOSEFIGURE, 0, 1}}; /* 20 */ + {231, 260, PT_LINETO, 0, 0}, /* 11 */ + {245, 235, PT_BEZIERTO, 0, 0}, /* 12 */ + {271, 220, PT_BEZIERTO, 0, 0}, /* 13 */ + {300, 220, PT_BEZIERTO, 0, 0}, /* 14 */ + {344, 220, PT_BEZIERTO, 0, 0}, /* 15 */ + {380, 256, PT_BEZIERTO, 0, 0}, /* 16 */ + {380, 300, PT_BEZIERTO, 0, 0}, /* 17 */ + {380, 314, PT_BEZIERTO, 0, 0}, /* 18 */ + {376, 328, PT_BEZIERTO, 0, 0}, /* 19 */ + {369, 340, PT_BEZIERTO | PT_CLOSEFIGURE, 0, 0}}; /* 20 */ static void test_anglearc(void) { @@ -287,7 +287,7 @@ static void test_anglearc(void) CloseFigure(hdc); EndPath(hdc); - ok_path(hdc, "anglearc_path", anglearc_path, sizeof(anglearc_path)/sizeof(path_test_t), 0); + ok_path(hdc, "anglearc_path", anglearc_path, sizeof(anglearc_path)/sizeof(path_test_t), 1); done: ReleaseDC(0, hdc); }

1 0

Misha Koshelev : gdi32/tests: Expand framework for tests of drawing functions in paths, add test for AngleArc in paths.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: ce8e6d16cd3ae1904086cd608a6e976aef4a952b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8e6d16cd3ae1904086cd608… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 21 23:39:16 2007 -0500 gdi32/tests: Expand framework for tests of drawing functions in paths, add test for AngleArc in paths. --- dlls/gdi32/tests/path.c | 90 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 73 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index e567106..385a524 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -2,6 +2,7 @@ * Unit test suite for paths * * Copyright 2007 Laurent Vromman + * Copyright 2007 Misha Koshelev * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -107,7 +108,9 @@ typedef struct * but not on native? */ int wine_only_entries_preceding; - /* Does this entry itself not match on wine? */ + /* 0 - This entry matches on wine. + * 1 - This entry corresponds to a single entry on wine that does not match the native entry. + * 2 - This entry is currently skipped on wine but present on native. */ int todo; } path_test_t; @@ -115,17 +118,18 @@ typedef struct * * We use a "smart" matching algorithm that allows us to detect partial improvements * in conformance. Specifically, two running indices are kept, one through the actual - * path and one through the expected path. The actual path index always increases, - * whereas, if the wine_entries_preceding field of the appropriate path_test_t element is - * non-zero, the expected path index does not increase for that many elements as long as - * there is no match. This allows us to todo_wine extra path elements that are present only - * in wine but not on native. + * path and one through the expected path. The actual path index increases unless there is + * no match and the todo field of the appropriate path_test_t element is 2. Similarly, + * if the wine_entries_preceding field of the appropriate path_test_t element is non-zero, + * the expected path index does not increase for that many elements as long as there + * is no match. This allows us to todo_wine extra path elements that are present only + * on wine but not on native and vice versa. * * Note that if expected_size is zero and the WINETEST_DEBUG environment variable is * greater than 2, the trace() output is a C path_test_t array structure, useful for making * new tests that use this function. */ -static void ok_path(HDC hdc, const path_test_t *expected, int expected_size, BOOL todo_size) +static void ok_path(HDC hdc, const char *path_name, const path_test_t *expected, int expected_size, BOOL todo_size) { static const char *type_string[8] = { "Unknown (0)", "PT_CLOSEFIGURE", "PT_LINETO", "PT_LINETO | PT_CLOSEFIGURE", "PT_BEZIERTO", @@ -133,7 +137,7 @@ static void ok_path(HDC hdc, const path_test_t *expected, int expected_size, BOO POINT *pnt = NULL; BYTE *types = NULL; int size, numskip, - idx, eidx = 0; + idx = 0, eidx = 0; /* Get the path */ assert(hdc != 0); @@ -156,17 +160,17 @@ static void ok_path(HDC hdc, const path_test_t *expected, int expected_size, BOO else ok(size == expected_size, "Path size %d does not match expected size %d\n", size, expected_size); - if (expected_size) numskip = expected[eidx].wine_only_entries_preceding; - for (idx = 0; idx < size && eidx < expected_size; idx++) + if (winetest_debug > 2) + trace("static const path_test_t %s[] = {\n", path_name); + + numskip = expected_size ? expected[eidx].wine_only_entries_preceding : 0; + while (idx < size && eidx < expected_size) { /* We allow a few pixels fudge in matching X and Y coordinates to account for imprecision in * floating point to integer conversion */ BOOL match = (types[idx] == expected[eidx].type) && - (pnt[idx].x >= expected[eidx].x-1 && pnt[idx].x <= expected[eidx].x+1) && - (pnt[idx].y >= expected[eidx].y-1 && pnt[idx].y <= expected[eidx].y+1); - - if (winetest_debug > 2) - trace("{%d, %d, %s, 0, 0}, /* %d */\n", pnt[idx].x, pnt[idx].y, type_string[types[idx]], idx); + (pnt[idx].x >= expected[eidx].x-2 && pnt[idx].x <= expected[eidx].x+2) && + (pnt[idx].y >= expected[eidx].y-2 && pnt[idx].y <= expected[eidx].y+2); if (expected[eidx].todo || numskip) todo_wine ok(match, "Expected #%d: %s (%d,%d) but got %s (%d,%d)\n", eidx, @@ -177,6 +181,13 @@ static void ok_path(HDC hdc, const path_test_t *expected, int expected_size, BOO type_string[expected[eidx].type], expected[eidx].x, expected[eidx].y, type_string[types[idx]], pnt[idx].x, pnt[idx].y); + if (match || expected[eidx].todo != 2) + { + if (winetest_debug > 2) + trace(" {%d, %d, %s, 0, 0}%s /* %d */\n", pnt[idx].x, pnt[idx].y, + type_string[types[idx]], idx < size-1 ? "," : "};", idx); + idx++; + } if (match || !numskip--) numskip = expected[++eidx].wine_only_entries_preceding; } @@ -185,7 +196,8 @@ static void ok_path(HDC hdc, const path_test_t *expected, int expected_size, BOO * sure to display the entire path */ if (winetest_debug > 2 && idx < size) for (; idx < size; idx++) - trace("{%d, %d, %s, 0, 0}, /* %d */\n", pnt[idx].x, pnt[idx].y, type_string[types[idx]], idx); + trace(" {%d, %d, %s, 0, 0}%s /* %d */\n", pnt[idx].x, pnt[idx].y, + type_string[types[idx]], idx < size-1 ? "," : "};", idx); HeapFree(GetProcessHeap(), 0, types); HeapFree(GetProcessHeap(), 0, pnt); @@ -232,7 +244,50 @@ static void test_arcto(void) CloseFigure(hdc); EndPath(hdc); - ok_path(hdc, arcto_path, sizeof(arcto_path)/sizeof(path_test_t), 0); + ok_path(hdc, "arcto_path", arcto_path, sizeof(arcto_path)/sizeof(path_test_t), 0); +done: + ReleaseDC(0, hdc); +} + +static const path_test_t anglearc_path[] = { + {0, 0, PT_MOVETO, 0, 0}, /* 0 */ + {371, 229, PT_LINETO, 0, 0}, /* 1 */ + {352, 211, PT_BEZIERTO, 1, 0}, /* 2 */ + {327, 200, PT_BEZIERTO, 0, 0}, /* 3 */ + {300, 200, PT_BEZIERTO, 0, 0}, /* 4 */ + {245, 200, PT_BEZIERTO, 0, 0}, /* 5 */ + {200, 245, PT_BEZIERTO, 0, 0}, /* 6 */ + {200, 300, PT_BEZIERTO, 0, 0}, /* 7 */ + {200, 300, PT_BEZIERTO, 0, 2}, /* 8 */ + {200, 300, PT_BEZIERTO, 0, 2}, /* 9 */ + {200, 300, PT_BEZIERTO, 0, 2}, /* 10 */ + {231, 260, PT_LINETO, 1, 0}, /* 11 */ + {245, 235, PT_BEZIERTO, 1, 1}, /* 12 */ + {271, 220, PT_BEZIERTO, 0, 1}, /* 13 */ + {300, 220, PT_BEZIERTO, 0, 1}, /* 14 */ + {344, 220, PT_BEZIERTO, 0, 1}, /* 15 */ + {380, 256, PT_BEZIERTO, 0, 1}, /* 16 */ + {380, 300, PT_BEZIERTO, 0, 1}, /* 17 */ + {380, 314, PT_BEZIERTO, 0, 1}, /* 18 */ + {376, 328, PT_BEZIERTO, 0, 1}, /* 19 */ + {369, 340, PT_BEZIERTO | PT_CLOSEFIGURE, 0, 1}}; /* 20 */ + +static void test_anglearc(void) +{ + HDC hdc = GetDC(0); + BeginPath(hdc); + if (!AngleArc(hdc, 300, 300, 100, 45.0, 135.0) && + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + /* AngleArc is only available on Win2k and later */ + skip("AngleArc is not available\n"); + goto done; + } + AngleArc(hdc, 300, 300, 80, 150.0, -180.0); + CloseFigure(hdc); + EndPath(hdc); + + ok_path(hdc, "anglearc_path", anglearc_path, sizeof(anglearc_path)/sizeof(path_test_t), 0); done: ReleaseDC(0, hdc); } @@ -241,4 +296,5 @@ START_TEST(path) { test_widenpath(); test_arcto(); + test_anglearc(); }

1 0

Stefan Dösinger : d3d9: Hold the lock in swapchain methods.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: ef5e5300e30cc4fdeb061d021ea8a136e5177940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5e5300e30cc4fdeb061d021… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jun 14 11:48:59 2007 +0200 d3d9: Hold the lock in swapchain methods. --- dlls/d3d9/swapchain.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index c02a7f1..79bea2d 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -62,7 +62,9 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) if (ref == 0) { if (This->parentDevice) IUnknown_Release(This->parentDevice); if (!This->isImplicit) { + EnterCriticalSection(&d3d9_cs); IWineD3DSwapChain_Destroy(This->wineD3DSwapChain, D3D9CB_DestroyRenderTarget); + LeaveCriticalSection(&d3d9_cs); HeapFree(GetProcessHeap(), 0, This); } } @@ -78,8 +80,13 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_Present(LPDIRECT3DSWAPCHAIN9 iface static HRESULT WINAPI IDirect3DSwapChain9Impl_GetFrontBufferData(LPDIRECT3DSWAPCHAIN9 iface, IDirect3DSurface9* pDestSurface) { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSwapChain_GetFrontBufferData(This->wineD3DSwapChain, ((IDirect3DSurface9Impl *)pDestSurface)->wineD3DSurface); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DSwapChain_GetFrontBufferData(This->wineD3DSwapChain, ((IDirect3DSurface9Impl *)pDestSurface)->wineD3DSurface); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DSwapChain9Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN9 iface, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9** ppBackBuffer) { @@ -89,25 +96,37 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN9 TRACE("(%p) Relay\n", This); + EnterCriticalSection(&d3d9_cs); hrc = IWineD3DSwapChain_GetBackBuffer(This->wineD3DSwapChain, iBackBuffer, (WINED3DBACKBUFFER_TYPE) Type, &mySurface); if (hrc == D3D_OK && NULL != mySurface) { IWineD3DSurface_GetParent(mySurface, (IUnknown **)ppBackBuffer); IWineD3DSurface_Release(mySurface); } + LeaveCriticalSection(&d3d9_cs); /* Do not touch the **ppBackBuffer pointer otherwise! (see device test) */ return hrc; } static HRESULT WINAPI IDirect3DSwapChain9Impl_GetRasterStatus(LPDIRECT3DSWAPCHAIN9 iface, D3DRASTER_STATUS* pRasterStatus) { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSwapChain_GetRasterStatus(This->wineD3DSwapChain, (WINED3DRASTER_STATUS *) pRasterStatus); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DSwapChain_GetRasterStatus(This->wineD3DSwapChain, (WINED3DRASTER_STATUS *) pRasterStatus); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DSwapChain9Impl_GetDisplayMode(LPDIRECT3DSWAPCHAIN9 iface, D3DDISPLAYMODE* pMode) { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSwapChain_GetDisplayMode(This->wineD3DSwapChain, (WINED3DDISPLAYMODE *) pMode); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DSwapChain_GetDisplayMode(This->wineD3DSwapChain, (WINED3DDISPLAYMODE *) pMode); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DSwapChain9Impl_GetDevice(LPDIRECT3DSWAPCHAIN9 iface, IDirect3DDevice9** ppDevice) { @@ -117,11 +136,13 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetDevice(LPDIRECT3DSWAPCHAIN9 ifa TRACE("(%p) Relay\n", This); + EnterCriticalSection(&d3d9_cs); hrc = IWineD3DSwapChain_GetDevice(This->wineD3DSwapChain, &device); if (hrc == D3D_OK && NULL != device) { IWineD3DDevice_GetParent(device, (IUnknown **)ppDevice); IWineD3DDevice_Release(device); } + LeaveCriticalSection(&d3d9_cs); return hrc; } @@ -132,7 +153,9 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetPresentParameters(LPDIRECT3DSWA TRACE("(%p)->(%p): Relay\n", This, pPresentationParameters); + EnterCriticalSection(&d3d9_cs); hr = IWineD3DSwapChain_GetPresentParameters(This->wineD3DSwapChain, &winePresentParameters); + LeaveCriticalSection(&d3d9_cs); pPresentationParameters->BackBufferWidth = winePresentParameters.BackBufferWidth; pPresentationParameters->BackBufferHeight = winePresentParameters.BackBufferHeight; @@ -205,7 +228,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->PresentationInterval; + EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_CreateAdditionalSwapChain(This->WineD3DDevice, &localParameters, &object->wineD3DSwapChain, (IUnknown*)object, D3D9CB_CreateRenderTarget, D3D9CB_CreateDepthStencilSurface); + LeaveCriticalSection(&d3d9_cs); pPresentationParameters->BackBufferWidth = localParameters.BackBufferWidth; pPresentationParameters->BackBufferHeight = localParameters.BackBufferHeight; @@ -242,6 +267,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9 iface, UINT TRACE("(%p) Relay\n", This); + EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_GetSwapChain(This->WineD3DDevice, iSwapChain, &swapchain); if (hrc == D3D_OK && NULL != swapchain) { IWineD3DSwapChain_GetParent(swapchain, (IUnknown **)pSwapChain); @@ -249,11 +275,17 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9 iface, UINT } else { *pSwapChain = NULL; } + LeaveCriticalSection(&d3d9_cs); return hrc; } UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(LPDIRECT3DDEVICE9 iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + UINT ret; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetNumberOfSwapChains(This->WineD3DDevice); + + EnterCriticalSection(&d3d9_cs); + ret = IWineD3DDevice_GetNumberOfSwapChains(This->WineD3DDevice); + LeaveCriticalSection(&d3d9_cs); + return ret; }

1 0

Stefan Dösinger : d3d9: Hold the lock in suface methods.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: 35c5c4528fbedf640edb6b41034fd97b0645c5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c5c4528fbedf640edb6b410… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jun 14 11:42:26 2007 +0200 d3d9: Hold the lock in suface methods. --- dlls/d3d9/surface.c | 89 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 77 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index a9a93b4..54558b4 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -78,7 +78,9 @@ static ULONG WINAPI IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) { if (ref == 0) { if (This->parentDevice) IUnknown_Release(This->parentDevice); if (!This->isImplicit) { + EnterCriticalSection(&d3d9_cs); IWineD3DSurface_Release(This->wineD3DSurface); + LeaveCriticalSection(&d3d9_cs); HeapFree(GetProcessHeap(), 0, This); } } @@ -90,50 +92,89 @@ static ULONG WINAPI IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) { /* IDirect3DSurface9 IDirect3DResource9 Interface follow: */ static HRESULT WINAPI IDirect3DSurface9Impl_GetDevice(LPDIRECT3DSURFACE9 iface, IDirect3DDevice9** ppDevice) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; - return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); + HRESULT hr; + TRACE("(%p)->(%p)\n", This, ppDevice); + + EnterCriticalSection(&d3d9_cs); + hr = IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DSurface9Impl_SetPrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_SetPrivateData(This->wineD3DSurface, refguid, pData, SizeOfData, Flags); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DSurface_SetPrivateData(This->wineD3DSurface, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DSurface9Impl_GetPrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_GetPrivateData(This->wineD3DSurface, refguid, pData, pSizeOfData); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DSurface_GetPrivateData(This->wineD3DSurface, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DSurface9Impl_FreePrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_FreePrivateData(This->wineD3DSurface, refguid); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DSurface_FreePrivateData(This->wineD3DSurface, refguid); + LeaveCriticalSection(&d3d9_cs); + return hr; } static DWORD WINAPI IDirect3DSurface9Impl_SetPriority(LPDIRECT3DSURFACE9 iface, DWORD PriorityNew) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_SetPriority(This->wineD3DSurface, PriorityNew); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DSurface_SetPriority(This->wineD3DSurface, PriorityNew); + LeaveCriticalSection(&d3d9_cs); + return hr; } static DWORD WINAPI IDirect3DSurface9Impl_GetPriority(LPDIRECT3DSURFACE9 iface) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_GetPriority(This->wineD3DSurface); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DSurface_GetPriority(This->wineD3DSurface); + LeaveCriticalSection(&d3d9_cs); + return hr; } static void WINAPI IDirect3DSurface9Impl_PreLoad(LPDIRECT3DSURFACE9 iface) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d9_cs); IWineD3DSurface_PreLoad(This->wineD3DSurface); + LeaveCriticalSection(&d3d9_cs); return ; } static D3DRESOURCETYPE WINAPI IDirect3DSurface9Impl_GetType(LPDIRECT3DSURFACE9 iface) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + D3DRESOURCETYPE ret; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_GetType(This->wineD3DSurface); + + EnterCriticalSection(&d3d9_cs); + ret = IWineD3DSurface_GetType(This->wineD3DSurface); + LeaveCriticalSection(&d3d9_cs); + return ret; } /* IDirect3DSurface9 Interface follow: */ @@ -160,6 +201,7 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(LPDIRECT3DSURFACE9 iface, D3 IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; WINED3DSURFACE_DESC wined3ddesc; UINT tmpInt = -1; + HRESULT hr; TRACE("(%p) Relay\n", This); /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */ @@ -173,32 +215,55 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(LPDIRECT3DSURFACE9 iface, D3 wined3ddesc.Width = &pDesc->Width; wined3ddesc.Height = &pDesc->Height; - return IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DSurface9Impl_LockRect(LPDIRECT3DSURFACE9 iface, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d9_cs); TRACE("(%p) calling IWineD3DSurface_LockRect %p %p %p %d\n", This, This->wineD3DSurface, pLockedRect, pRect, Flags); - return IWineD3DSurface_LockRect(This->wineD3DSurface, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); + hr = IWineD3DSurface_LockRect(This->wineD3DSurface, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DSurface9Impl_UnlockRect(LPDIRECT3DSURFACE9 iface) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_UnlockRect(This->wineD3DSurface); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DSurface_UnlockRect(This->wineD3DSurface); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DSurface9Impl_GetDC(LPDIRECT3DSURFACE9 iface, HDC* phdc) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_GetDC(This->wineD3DSurface, phdc); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DSurface_GetDC(This->wineD3DSurface, phdc); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, HDC hdc) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_ReleaseDC(This->wineD3DSurface, hdc); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DSurface_ReleaseDC(This->wineD3DSurface, hdc); + LeaveCriticalSection(&d3d9_cs); + return hr; }

1 0

Stefan Dösinger : wined3d: Depthfill blits are allowed between BeginScene and Endscene.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: fb269f92104db36b0fdf081ed69fc78481aabb3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb269f92104db36b0fdf081ed… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Jun 8 20:59:57 2007 +0200 wined3d: Depthfill blits are allowed between BeginScene and Endscene. --- dlls/ddraw/tests/d3d.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 6 ++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 5de0e2f..35d6192 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -27,6 +27,7 @@ static LPDIRECTDRAW7 lpDD = NULL; static LPDIRECT3D7 lpD3D = NULL; static LPDIRECTDRAWSURFACE7 lpDDS = NULL; +static LPDIRECTDRAWSURFACE7 lpDDSdepth = NULL; static LPDIRECT3DDEVICE7 lpD3DDevice = NULL; static LPDIRECT3DVERTEXBUFFER7 lpVBufSrc = NULL; static LPDIRECT3DVERTEXBUFFER7 lpVBufDest1 = NULL; @@ -88,6 +89,27 @@ static BOOL CreateDirect3D(void) if (!SUCCEEDED(rc)) return FALSE; + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + ddsd.ddpfPixelFormat.dwZBufferBitDepth = 16; + ddsd.ddpfPixelFormat.dwZBitMask = 0x0000FFFF; + ddsd.dwWidth = 256; + ddsd.dwHeight = 256; + rc = IDirectDraw7_CreateSurface(lpDD, &ddsd, &lpDDSdepth, NULL); + ok(rc==DD_OK, "CreateSurface returned: %x\n", rc); + if (!SUCCEEDED(rc)) { + lpDDSdepth = NULL; + } else { + rc = IDirectDrawSurface_AddAttachedSurface(lpDDS, lpDDSdepth); + ok(rc == DD_OK, "IDirectDrawSurface_AddAttachedSurface returned %x\n", rc); + if (!SUCCEEDED(rc)) + return FALSE; + } + rc = IDirect3D7_CreateDevice(lpD3D, &IID_IDirect3DTnLHalDevice, lpDDS, &lpD3DDevice); ok(rc==D3D_OK || rc==DDERR_NOPALETTEATTACHED || rc==E_OUTOFMEMORY, "CreateDevice returned: %x\n", rc); @@ -117,6 +139,12 @@ static void ReleaseDirect3D(void) lpD3DDevice = NULL; } + if (lpDDSdepth != NULL) + { + IDirectDrawSurface_Release(lpDDSdepth); + lpDDSdepth = NULL; + } + if (lpDDS != NULL) { IDirectDrawSurface_Release(lpDDS); @@ -569,6 +597,16 @@ static void SceneTest(void) ok(hr == D3D_OK, "IDirect3DDevice7_BeginScene failed with %08x\n", hr); if(SUCCEEDED(hr)) { + DDBLTFX fx; + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + + if(lpDDSdepth) { + hr = IDirectDrawSurface7_Blt(lpDDSdepth, NULL, NULL, NULL, DDBLT_DEPTHFILL, &fx); + ok(hr == D3D_OK, "Depthfill failed in a BeginScene / EndScene pair\n"); + } else { + skip("Depth stencil creation failed at startup, skipping\n"); + } hr = IDirect3DDevice7_EndScene(lpD3DDevice); ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed with %08x\n", hr); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4640bef..c8e961a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3175,9 +3175,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, RECT *Dest TRACE("(%p)->(%p,%p,%p,%x,%p)\n", This, DestRect, SrcSurface, SrcRect, Flags, DDBltFx); TRACE("(%p): Usage is %s\n", This, debug_d3dusage(This->resource.usage)); - /* Accessing the depth stencil is supposed to fail between a BeginScene and EndScene pair */ + /* Accessing the depth stencil is supposed to fail between a BeginScene and EndScene pair, + * except depth blits, which seem to work + */ if(iface == myDevice->stencilBufferTarget || (SrcSurface && SrcSurface == myDevice->stencilBufferTarget)) { - if(myDevice->inScene) { + if(myDevice->inScene && !(Flags & WINEDDBLT_DEPTHFILL)) { TRACE("Attempt to access the depth stencil surface in a BeginScene / EndScene pair, returning WINED3DERR_INVALIDCALL\n"); return WINED3DERR_INVALIDCALL; } else if(IWineD3DSurfaceImpl_BltZ(This, DestRect, SrcSurface, SrcRect, Flags, DDBltFx) == WINED3D_OK) {

1 0

Stefan Dösinger : ddraw: Add a test for incorrect surface desc sizes for Lock().
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: e019cebd1653fd7e18ec8c3645feefafb15f44e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e019cebd1653fd7e18ec8c364… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Jun 8 17:35:44 2007 +0200 ddraw: Add a test for incorrect surface desc sizes for Lock(). --- dlls/ddraw/surface.c | 15 ++++--------- dlls/ddraw/tests/dsurface.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 934999c..9608aef 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -582,17 +582,12 @@ IDirectDrawSurfaceImpl_Lock(IDirectDrawSurface7 *iface, * for the supported values. The others are ignored by WineD3D */ - /* Hmm. Anarchy online passes an uninitialized surface descriptor, - * that means it doesn't have dwSize set. Init it to some sane - * value - */ - if(DDSD->dwSize <= sizeof(DDSURFACEDESC)) - { - DDSD->dwSize = sizeof(DDSURFACEDESC); - } - else + if(DDSD->dwSize != sizeof(DDSURFACEDESC) && + DDSD->dwSize != sizeof(DDSURFACEDESC2)) { - DDSD->dwSize = sizeof(DDSURFACEDESC2); + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", DDERR_INVALIDPARAMS); + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; } hr = IWineD3DSurface_LockRect(This->WineD3DSurface, diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 55d7cbd..a02c1d3 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2315,6 +2315,52 @@ static void StructSizeTest(void) hr = IDirectDrawSurface7_GetSurfaceDesc(surface7, &desc.desc2); ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_GetSurfaceDesc with desc size sizeof(DDSURFACEDESC2) + 1returned %08x\n", hr); + /* Tests for Lock() */ + + desc.desc1.dwSize = sizeof(DDSURFACEDESC); + hr = IDirectDrawSurface_Lock(surface1, NULL, &desc.desc1, 0, 0); + ok(hr == DD_OK, "IDirectDrawSurface_Lock with desc size sizeof(DDSURFACEDESC) returned %08x\n", hr); + if(SUCCEEDED(hr)) IDirectDrawSurface_Unlock(surface1, NULL); + ok(desc.desc1.dwSize == sizeof(DDSURFACEDESC), "Destination size was changed to %d\n", desc.desc1.dwSize); + hr = IDirectDrawSurface7_Lock(surface7, NULL, &desc.desc2, 0, 0); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock with desc size sizeof(DDSURFACEDESC) returned %08x\n", hr); + if(SUCCEEDED(hr)) IDirectDrawSurface7_Unlock(surface7, NULL); + ok(desc.desc2.dwSize == sizeof(DDSURFACEDESC), "Destination size was changed to %d\n", desc.desc1.dwSize); + + desc.desc2.dwSize = sizeof(DDSURFACEDESC2); + hr = IDirectDrawSurface_Lock(surface1, NULL, &desc.desc1, 0, 0); + ok(hr == DD_OK, "IDirectDrawSurface_Lock with desc size sizeof(DDSURFACEDESC2) returned %08x\n", hr); + ok(desc.desc1.dwSize == sizeof(DDSURFACEDESC2), "Destination size was changed to %d\n", desc.desc1.dwSize); + if(SUCCEEDED(hr)) IDirectDrawSurface_Unlock(surface1, NULL); + hr = IDirectDrawSurface7_Lock(surface7, NULL, &desc.desc2, 0, 0); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock with desc size sizeof(DDSURFACEDESC2) returned %08x\n", hr); + if(SUCCEEDED(hr)) IDirectDrawSurface7_Unlock(surface7, NULL); + ok(desc.desc2.dwSize == sizeof(DDSURFACEDESC2), "Destination size was changed to %d\n", desc.desc1.dwSize); + + desc.desc2.dwSize = 0; + hr = IDirectDrawSurface_Lock(surface1, NULL, &desc.desc1, 0, 0); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface_Lock with desc size 0 returned %08x\n", hr); + if(SUCCEEDED(hr)) IDirectDrawSurface_Unlock(surface1, NULL); + hr = IDirectDrawSurface7_Lock(surface7, NULL, &desc.desc2, 0, 0); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_Lock with desc size 0 returned %08x\n", hr); + if(SUCCEEDED(hr)) IDirectDrawSurface7_Unlock(surface7, NULL); + + desc.desc1.dwSize = sizeof(DDSURFACEDESC) + 1; + hr = IDirectDrawSurface_Lock(surface1, NULL, &desc.desc1, 0, 0); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface_Lock with desc size sizeof(DDSURFACEDESC) + 1 returned %08x\n", hr); + if(SUCCEEDED(hr)) IDirectDrawSurface_Unlock(surface1, NULL); + hr = IDirectDrawSurface7_Lock(surface7, NULL, &desc.desc2, 0, 0); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_Lock with desc size sizeof(DDSURFACEDESC) + 1 returned %08x\n", hr); + if(SUCCEEDED(hr)) IDirectDrawSurface7_Unlock(surface7, NULL); + + desc.desc2.dwSize = sizeof(DDSURFACEDESC2) + 1; + hr = IDirectDrawSurface_Lock(surface1, NULL, &desc.desc1, 0, 0); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface_Lock with desc size sizeof(DDSURFACEDESC2) + 1returned %08x\n", hr); + if(SUCCEEDED(hr)) IDirectDrawSurface_Unlock(surface1, NULL); + hr = IDirectDrawSurface7_Lock(surface7, NULL, &desc.desc2, 0, 0); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_Lock with desc size sizeof(DDSURFACEDESC2) + 1returned %08x\n", hr); + if(SUCCEEDED(hr)) IDirectDrawSurface7_Unlock(surface7, NULL); + IDirectDrawSurface7_Release(surface7); IDirectDrawSurface_Release(surface1); }

1 0

Emmanuel Maillard : configure: Fix libxml2 detection on Mac OS X.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: 2a98b40a9fbd11c5b0ad3b0b194c903058711ac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a98b40a9fbd11c5b0ad3b0b1… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Fri Jun 22 02:58:39 2007 +0200 configure: Fix libxml2 detection on Mac OS X. --- configure | 21 +++++++++++++++------ configure.ac | 27 ++++++++++++++++++--------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/configure b/configure index a86bd86..b8eea0b 100755 --- a/configure +++ b/configure @@ -8836,12 +8836,16 @@ XSLTLIBS="" XSLTINCL="" +ac_save_CPPFLAGS="$CPPFLAGS" if test "$PKG_CONFIG" != "false" then - ac_save_CPPFLAGS="$CPPFLAGS" ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`" ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_xml_cflags" +else + ac_xml_libs="`xml2-config --libs 2>/dev/null`" + ac_xml_cflags="`xml2-config --cflags 2>/dev/null`" +fi +CPPFLAGS="$CPPFLAGS $ac_xml_cflags" for ac_header in libxml/parser.h do @@ -9196,10 +9200,16 @@ fi done - CPPFLAGS="$ac_save_CPPFLAGS" +CPPFLAGS="$ac_save_CPPFLAGS" +if test "$PKG_CONFIG" != "false" +then ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`" ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_xslt_cflags" +else + ac_xslt_libs="`xslt-config --libs 2>/dev/null`" + ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`" +fi +CPPFLAGS="$CPPFLAGS $ac_xslt_cflags" for ac_header in libxslt/pattern.h libxslt/transform.h @@ -9332,8 +9342,7 @@ fi done - CPPFLAGS="$ac_save_CPPFLAGS" -fi +CPPFLAGS="$ac_save_CPPFLAGS" HALINCL="" diff --git a/configure.ac b/configure.ac index 59f5e50..f499a70 100644 --- a/configure.ac +++ b/configure.ac @@ -475,13 +475,17 @@ AC_SUBST(XML2LIBS,"") AC_SUBST(XML2INCL,"") AC_SUBST(XSLTLIBS,"") AC_SUBST(XSLTINCL,"") +ac_save_CPPFLAGS="$CPPFLAGS" if test "$PKG_CONFIG" != "false" then - ac_save_CPPFLAGS="$CPPFLAGS" ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`" ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_xml_cflags" - AC_CHECK_HEADERS(libxml/parser.h, +else + ac_xml_libs="`xml2-config --libs 2>/dev/null`" + ac_xml_cflags="`xml2-config --cflags 2>/dev/null`" +fi +CPPFLAGS="$CPPFLAGS $ac_xml_cflags" +AC_CHECK_HEADERS(libxml/parser.h, [AC_CHECK_LIB(xml2, xmlParseMemory, [AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the libxml2 library]) XML2LIBS="$ac_xml_libs" @@ -490,12 +494,18 @@ then [AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs) AC_CHECK_LIB(xml2, xmlNewDocPI, [AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs) - ]) - CPPFLAGS="$ac_save_CPPFLAGS" + ]) +CPPFLAGS="$ac_save_CPPFLAGS" +if test "$PKG_CONFIG" != "false" +then ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`" ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_xslt_cflags" - AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h], +else + ac_xslt_libs="`xslt-config --libs 2>/dev/null`" + ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`" +fi +CPPFLAGS="$CPPFLAGS $ac_xslt_cflags" +AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h], [AC_CHECK_LIB(xslt, xsltCompilePattern, [AC_DEFINE(HAVE_LIBXSLT, 1, [Define if you have the libxslt library]) XSLTLIBS="$ac_xslt_libs" @@ -504,8 +514,7 @@ then [#ifdef HAVE_LIBXSLT_PATTERN_H # include <libxslt/pattern.h> #endif]) - CPPFLAGS="$ac_save_CPPFLAGS" -fi +CPPFLAGS="$ac_save_CPPFLAGS" dnl **** Check for libhal **** AC_SUBST(HALINCL,"")

1 0

Stefan Dösinger : ddraw: Check for incorrect rectangles to DDrawSurface::Blt.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: 208d38688ae0b101ff5398d660ca408bd77bc985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=208d38688ae0b101ff5398d66… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Jun 8 19:04:13 2007 +0200 ddraw: Check for incorrect rectangles to DDrawSurface::Blt. --- dlls/ddraw/surface.c | 24 +++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9608aef..39ed549 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -753,7 +753,31 @@ IDirectDrawSurfaceImpl_Blt(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } + /* Sizes can change, therefore hold the lock when testing the rectangles */ EnterCriticalSection(&ddraw_cs); + if(DestRect) + { + if(DestRect->top >= DestRect->bottom || DestRect->left >= DestRect->right || + DestRect->right > This->surface_desc.dwWidth || + DestRect->bottom > This->surface_desc.dwHeight) + { + WARN("Source rectangle is invalid, returning DDERR_INVALIDRECT\n"); + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDRECT; + } + } + if(Src && SrcRect) + { + if(SrcRect->top >= SrcRect->bottom || SrcRect->left >=SrcRect->right || + SrcRect->right > Src->surface_desc.dwWidth || + SrcRect->bottom > Src->surface_desc.dwHeight) + { + WARN("Source rectangle is invalid, returning DDERR_INVALIDRECT\n"); + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDRECT; + } + } + if(Flags & DDBLT_KEYSRC && (!Src || !(Src->surface_desc.dwFlags & DDSD_CKSRCBLT))) { WARN("DDBLT_KEYDEST blit without color key in surface, returning DDERR_INVALIDPARAMS\n"); LeaveCriticalSection(&ddraw_cs); diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index a02c1d3..a21a76d 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2208,6 +2208,7 @@ static void BltParamTest(void) IDirectDrawSurface *surface1 = NULL, *surface2 = NULL; DDSURFACEDESC desc; HRESULT hr; + DDBLTFX BltFx; RECT valid = {10, 10, 20, 20}; RECT invalid1 = {20, 10, 10, 20}; RECT invalid2 = {20, 20, 20, 20}; @@ -2255,6 +2256,54 @@ static void BltParamTest(void) hr = IDirectDrawSurface_BltFast(surface1, 0, 0, surface1, NULL, 0); ok(hr == DD_OK, "BltFast blitting a surface onto itself returned %08x\n", hr); + /* Blt(non-fast) tests */ + memset(&BltFx, 0, sizeof(BltFx)); + BltFx.dwSize = sizeof(BltFx); + BltFx.dwFillColor = 0xaabbccdd; + + hr = IDirectDrawSurface_Blt(surface1, &valid, NULL, NULL, DDBLT_COLORFILL, &BltFx); + ok(hr == DD_OK, "IDirectDrawSurface_Blt with a valid rectangle for color fill returned %08x\n", hr); + hr = IDirectDrawSurface_Blt(surface1, &valid, NULL, &invalid3, DDBLT_COLORFILL, &BltFx); + ok(hr == DD_OK, "IDirectDrawSurface_Blt with a invalid, unused rectangle returned %08x\n", hr); + hr = IDirectDrawSurface_Blt(surface2, &invalid1, NULL, NULL, DDBLT_COLORFILL, &BltFx); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface_Blt with a with invalid rectangle 1 returned %08x\n", hr); + hr = IDirectDrawSurface_Blt(surface2, &invalid2, NULL, NULL, DDBLT_COLORFILL, &BltFx); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface_Blt with a with invalid rectangle 2 returned %08x\n", hr); + hr = IDirectDrawSurface_Blt(surface2, &invalid3, NULL, NULL, DDBLT_COLORFILL, &BltFx); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface_Blt with a with invalid rectangle 3 returned %08x\n", hr); + hr = IDirectDrawSurface_Blt(surface2, &invalid4, NULL, NULL, DDBLT_COLORFILL, &BltFx); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface_Blt with a with invalid rectangle 4 returned %08x\n", hr); + + /* Valid on surface 1 */ + hr = IDirectDrawSurface_Blt(surface1, &invalid4, NULL, NULL, DDBLT_COLORFILL, &BltFx); + ok(hr == DD_OK, "IDirectDrawSurface_Blt with a subrectangle fill returned %08x\n", hr); + + /* Works - stretched blit */ + hr = IDirectDrawSurface_Blt(surface1, NULL, surface2, NULL, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface_Blt from a smaller to a bigger surface returned %08x\n", hr); + hr = IDirectDrawSurface_Blt(surface2, NULL, surface1, NULL, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface_Blt from a bigger to a smaller surface %08x\n", hr); + + /* Invalid dest rects in sourced blits */ + hr = IDirectDrawSurface_Blt(surface2, &invalid1, surface1, NULL, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface_Blt with a with invalid rectangle 1 returned %08x\n", hr); + hr = IDirectDrawSurface_Blt(surface2, &invalid2, surface1, NULL, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface_Blt with a with invalid rectangle 2 returned %08x\n", hr); + hr = IDirectDrawSurface_Blt(surface2, &invalid3, surface1, NULL, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface_Blt with a with invalid rectangle 3 returned %08x\n", hr); + hr = IDirectDrawSurface_Blt(surface2, &invalid4, surface1, NULL, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface_Blt with a with invalid rectangle 4 returned %08x\n", hr); + + /* Invalid src rects */ + hr = IDirectDrawSurface_Blt(surface2, NULL, surface1, &invalid1, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface_Blt with a with invalid rectangle 1 returned %08x\n", hr); + hr = IDirectDrawSurface_Blt(surface2, NULL, surface1, &invalid2, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface_Blt with a with invalid rectangle 2 returned %08x\n", hr); + hr = IDirectDrawSurface_Blt(surface2, NULL, surface1, &invalid3, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface_Blt with a with invalid rectangle 3 returned %08x\n", hr); + hr = IDirectDrawSurface_Blt(surface1, NULL, surface2, &invalid4, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface_Blt with a with invalid rectangle 4 returned %08x\n", hr); + IDirectDrawSurface_Release(surface1); IDirectDrawSurface_Release(surface2); }

1 0

Maarten Lankhorst : dsound: Simplify mixing by removing remixing support, and fix its waveout breakage.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: a7d6ed8ea65260f62f1762b05c496bee0944e6a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d6ed8ea65260f62f1762b05… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jun 13 17:05:49 2007 +0200 dsound: Simplify mixing by removing remixing support, and fix its waveout breakage. Based on a patch by Peter Dons Tychsen. --- dlls/dsound/buffer.c | 112 +++---- dlls/dsound/dsound_main.c | 9 +- dlls/dsound/dsound_private.h | 16 +- dlls/dsound/mixer.c | 809 +++++++++++++++--------------------------- dlls/dsound/primary.c | 71 +++- dlls/dsound/sound3d.c | 4 +- 6 files changed, 399 insertions(+), 622 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7d6ed8ea65260f62f176…

1 0