wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Tag wine-1.1.42 : Alexandre Julliard : Release 1.1.42
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: refs/tags/wine-1.1.42 Tag: 3d830f6f8f4b984fb23a4dccaac4953e44b53186 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3d830f6f8f4b984fb23a4dccaac4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 19:43:46 2010 +0200 Release 1.1.42

1 0

Alexandre Julliard : Release 1.1.42.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: bb5f5c26adf1e9ce744d20a6c04a568f31da855d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb5f5c26adf1e9ce744d20a6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 19:43:45 2010 +0200 Release 1.1.42. --- ANNOUNCE | 1072 +++++++++++++++++++++++++++++++++++-------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 625 insertions(+), 467 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb5f5c26adf1e9ce744d2…

1 0

Vincent Povirk : gdiplus: Implement GdipFlush.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: ade25060296a1498c50f48a230a3b0e79a136121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade25060296a1498c50f48a23… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 2 09:19:13 2010 -0500 gdiplus: Implement GdipFlush. --- dlls/gdiplus/graphics.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3d5a961..18dae2d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2957,8 +2957,6 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) { - static int calls; - TRACE("(%p,%u)\n", graphics, intention); if(!graphics) @@ -2967,10 +2965,12 @@ GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) if(graphics->busy) return ObjectBusy; - if(!(calls++)) - FIXME("not implemented\n"); + /* We have no internal operation queue, so there's no need to clear it. */ - return NotImplemented; + if (graphics->hdc) + GdiFlush(); + + return Ok; } /*****************************************************************************

1 0

Alexandre Julliard : mshtml/tests: Don't crash when Gecko is missing.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: bc12cad5704c33f27785e8fd8bb761a039888a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc12cad5704c33f27785e8fd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 16:30:06 2010 +0200 mshtml/tests: Don't crash when Gecko is missing. --- dlls/mshtml/tests/script.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 4ac7ba6..56d83ef 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1056,6 +1056,7 @@ static IHTMLDocument2 *create_document(void) hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + if (hres != S_OK) return NULL; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); if(FAILED(hres)) {

1 0

Alexandre Julliard : user32/tests: Use the correct type for the bits pointer in CreateDIBSection calls.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 1f1d9e7b02617e40e2014ac76edd7e4f0d9aed0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1d9e7b02617e40e2014ac76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 15:40:55 2010 +0200 user32/tests: Use the correct type for the bits pointer in CreateDIBSection calls. --- dlls/user32/tests/cursoricon.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 11d11cf..8534875 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -963,7 +963,7 @@ static HICON create_test_icon(HDC hdc, int width, int height, int bpp, { ICONINFO iconInfo; BITMAPINFO bitmapInfo; - UINT32 *buffer = NULL; + void *buffer = NULL; UINT32 mask = maskvalue ? 0xFFFFFFFF : 0x00000000; memset(&bitmapInfo, 0, sizeof(bitmapInfo)); @@ -982,7 +982,7 @@ static HICON create_test_icon(HDC hdc, int width, int height, int bpp, iconInfo.hbmMask = CreateBitmap( width, height, 1, 1, &mask ); if(!iconInfo.hbmMask) return NULL; - iconInfo.hbmColor = CreateDIBSection(hdc, &bitmapInfo, DIB_RGB_COLORS, (void**)&buffer, NULL, 0); + iconInfo.hbmColor = CreateDIBSection(hdc, &bitmapInfo, DIB_RGB_COLORS, &buffer, NULL, 0); if(!iconInfo.hbmColor || !buffer) { DeleteObject(iconInfo.hbmMask); @@ -1074,7 +1074,7 @@ static void test_DrawIcon(void) HDC hdcDst = NULL; HBITMAP bmpDst = NULL; HBITMAP bmpOld = NULL; - UINT32 *bits = 0; + void *bits = 0; hdcDst = CreateCompatibleDC(0); ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); @@ -1096,7 +1096,7 @@ static void test_DrawIcon(void) bitmapInfo.bmiHeader.biCompression = BI_RGB; bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); - bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, &bits, NULL, 0); ok (bmpDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); if (!bmpDst || !bits) goto cleanup; @@ -1158,7 +1158,7 @@ static void test_DrawIconEx(void) HDC hdcDst = NULL; HBITMAP bmpDst = NULL; HBITMAP bmpOld = NULL; - UINT32 bits = 0; + void *bits = 0; hdcDst = CreateCompatibleDC(0); ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); @@ -1179,7 +1179,7 @@ static void test_DrawIconEx(void) bitmapInfo.bmiHeader.biPlanes = 1; bitmapInfo.bmiHeader.biCompression = BI_RGB; bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); - bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, &bits, NULL, 0); ok (bmpDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); if (!bmpDst || !bits) goto cleanup; @@ -1310,7 +1310,7 @@ static void test_DrawState(void) HDC hdcDst = NULL; HBITMAP bmpDst = NULL; HBITMAP bmpOld = NULL; - UINT32 bits = 0; + void *bits = 0; hdcDst = CreateCompatibleDC(0); ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); @@ -1331,7 +1331,7 @@ static void test_DrawState(void) bitmapInfo.bmiHeader.biPlanes = 1; bitmapInfo.bmiHeader.biCompression = BI_RGB; bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); - bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, &bits, NULL, 0); ok (bmpDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); if (!bmpDst || !bits) goto cleanup;

1 0

Alexandre Julliard : shlwapi: Fix SHCreateWorkerWindowA for 64-bit.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 86860cc976558d8318b90f0918dbd18e7318f21b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86860cc976558d8318b90f091… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 15:05:58 2010 +0200 shlwapi: Fix SHCreateWorkerWindowA for 64-bit. --- dlls/shlwapi/ordinal.c | 12 ++++++------ dlls/shlwapi/tests/ordinal.c | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index a72dba3..332bdb6 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2595,27 +2595,27 @@ HRESULT WINAPI IUnknown_GetSite(LPUNKNOWN lpUnknown, REFIID iid, PVOID *lppSite) * dwExStyle [I] Extra style flags * dwStyle [I] Style flags * hMenu [I] Window menu - * msg_result [I] New DWLP_MSGRESULT value + * wnd_extra [I] Window extra bytes value * * RETURNS * Success: The window handle of the newly created window. * Failure: 0. */ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG msg_result) + DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) { static const char szClass[] = "WorkerA"; WNDCLASSA wc; HWND hWnd; - TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x)\n", - wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); + TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", + wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); /* Create Window class */ wc.style = 0; wc.lpfnWndProc = DefWindowProcA; wc.cbClsExtra = 0; - wc.cbWndExtra = 4; + wc.cbWndExtra = sizeof(LONG_PTR); wc.hInstance = shlwapi_hInstance; wc.hIcon = NULL; wc.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); @@ -2629,7 +2629,7 @@ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { - SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, msg_result); + SetWindowLongPtrW(hWnd, 0, wnd_extra); if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); } diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 1c25f12..0d6e165 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -55,7 +55,7 @@ static DWORD (WINAPI *pSHGetObjectCompatFlags)(IUnknown*, const CLSID*); static BOOL (WINAPI *pGUIDFromStringA)(LPSTR, CLSID *); static HRESULT (WINAPI *pIUnknown_QueryServiceExec)(IUnknown*, REFIID, const GUID*, DWORD, DWORD, VARIANT*, VARIANT*); static HRESULT (WINAPI *pIUnknown_ProfferService)(IUnknown*, REFGUID, IServiceProvider*, DWORD*); -static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, LONG); +static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, LONG_PTR); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -2318,7 +2318,7 @@ static void test_SHCreateWorkerWindowA(void) WNDCLASSA cliA; char classA[20]; HWND hwnd; - LONG ret; + LONG_PTR ret; BOOL res; if (is_win2k_and_lower) @@ -2333,8 +2333,8 @@ static void test_SHCreateWorkerWindowA(void) GetClassName(hwnd, classA, 20); ok(lstrcmpA(classA, "WorkerA") == 0, "expected WorkerA class, got %s\n", classA); - ret = GetWindowLongA(hwnd, DWLP_MSGRESULT); - ok(ret == 0, "got %d\n", ret); + ret = GetWindowLongPtrA(hwnd, 0); + ok(ret == 0, "got %ld\n", ret); /* class info */ memset(&cliA, 0, sizeof(cliA)); @@ -2342,30 +2342,30 @@ static void test_SHCreateWorkerWindowA(void) ok(res, "failed to get class info\n"); ok(cliA.style == 0, "got 0x%08x\n", cliA.style); ok(cliA.cbClsExtra == 0, "got %d\n", cliA.cbClsExtra); - ok(cliA.cbWndExtra == 4, "got %d\n", cliA.cbWndExtra); + ok(cliA.cbWndExtra == sizeof(LONG_PTR), "got %d\n", cliA.cbWndExtra); ok(cliA.lpszMenuName == 0, "got %s\n", cliA.lpszMenuName); DestroyWindow(hwnd); - /* set DWLP_MSGRESULT */ + /* set extra bytes */ hwnd = pSHCreateWorkerWindowA(0, NULL, 0, 0, 0, 0xdeadbeef); ok(hwnd != 0, "expected window\n"); GetClassName(hwnd, classA, 20); ok(lstrcmpA(classA, "WorkerA") == 0, "expected WorkerA class, got %s\n", classA); - ret = GetWindowLongA(hwnd, DWLP_MSGRESULT); - ok(ret == 0xdeadbeef, "got %d\n", ret); + ret = GetWindowLongPtrA(hwnd, 0); + ok(ret == 0xdeadbeef, "got %ld\n", ret); /* test exstyle */ ret = GetWindowLongA(hwnd, GWL_EXSTYLE); - ok(ret == WS_EX_WINDOWEDGE, "0x%08x\n", ret); + ok(ret == WS_EX_WINDOWEDGE, "0x%08lx\n", ret); DestroyWindow(hwnd); hwnd = pSHCreateWorkerWindowA(0, NULL, WS_EX_TOOLWINDOW, 0, 0, 0); ret = GetWindowLongA(hwnd, GWL_EXSTYLE); - ok(ret == (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW), "0x%08x\n", ret); + ok(ret == (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW), "0x%08lx\n", ret); DestroyWindow(hwnd); }

1 0

Louis Lenders : wine.inf: Add another .Net Framework key.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 3ded06b2281d9dcf98203bd41ec9b59f62f27491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ded06b2281d9dcf98203bd41… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Apr 2 14:05:19 2010 +0200 wine.inf: Add another .Net Framework key. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 8f53088..a0c5b35 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -480,6 +480,7 @@ HKCU,%Desktop%,"MenuShowDelay",2,"400" [DotNet] HKLM,Software\Microsoft\.NETFramework\policy\v1.0 +HKLM,Software\Microsoft\.NETFramework\policy\v1.1 HKLM,Software\Microsoft\.NETFramework\policy\v2.0 HKLM,Software\Microsoft\.NETFramework\policy\v3.0 HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1

1 0

Vincent Povirk : winex11.drv: Clip rectangle values to 16-bit limits.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 986a534ebed82a8b99a182ecfb2790bf00eee6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=986a534ebed82a8b99a182ecf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 1 16:57:14 2010 -0500 winex11.drv: Clip rectangle values to 16-bit limits. --- dlls/winex11.drv/graphics.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index bc00e85..53cbab4 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -36,6 +36,7 @@ #define PI M_PI #endif #include <string.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -131,10 +132,10 @@ RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) for (j = data->rdh.nCount-1; j >= 0; j--) { tmp = rect[j]; - xrect[j].x = tmp.left; - xrect[j].y = tmp.top; - xrect[j].width = tmp.right - tmp.left; - xrect[j].height = tmp.bottom - tmp.top; + xrect[j].x = max( min( tmp.left, SHRT_MAX), SHRT_MIN); + xrect[j].y = max( min( tmp.top, SHRT_MAX), SHRT_MIN); + xrect[j].width = max( min( tmp.right - xrect[j].x, USHRT_MAX), 0); + xrect[j].height = max( min( tmp.bottom - xrect[j].y, USHRT_MAX), 0); } } else @@ -142,10 +143,10 @@ RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) for (i = 0; i < data->rdh.nCount; i++) { tmp = rect[i]; - xrect[i].x = tmp.left; - xrect[i].y = tmp.top; - xrect[i].width = tmp.right - tmp.left; - xrect[i].height = tmp.bottom - tmp.top; + xrect[i].x = max( min( tmp.left, SHRT_MAX), SHRT_MIN); + xrect[i].y = max( min( tmp.top, SHRT_MAX), SHRT_MIN); + xrect[i].width = max( min( tmp.right - xrect[i].x, USHRT_MAX), 0); + xrect[i].height = max( min( tmp.bottom - xrect[i].y, USHRT_MAX), 0); } } return data;

1 0

Mikhail Maroukhine : advapi32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 3d2fc2f315cecbf4442f38ff9b6bfda4106e2982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d2fc2f315cecbf4442f38ff9… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Thu Apr 1 23:24:15 2010 +0700 advapi32: Fix compiler warnings with flag -Wcast-qual. --- dlls/advapi32/cred.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index d978b43..7d5c286 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -474,10 +474,10 @@ static DWORD registry_write_credential(HKEY hkey, const CREDENTIALW *credential, GetSystemTimeAsFileTime(&LastWritten); - ret = RegSetValueExW(hkey, wszFlagsValue, 0, REG_DWORD, (LPVOID)&credential->Flags, + ret = RegSetValueExW(hkey, wszFlagsValue, 0, REG_DWORD, (const BYTE*)&credential->Flags, sizeof(credential->Flags)); if (ret != ERROR_SUCCESS) return ret; - ret = RegSetValueExW(hkey, wszTypeValue, 0, REG_DWORD, (LPVOID)&credential->Type, + ret = RegSetValueExW(hkey, wszTypeValue, 0, REG_DWORD, (const BYTE*)&credential->Type, sizeof(credential->Type)); if (ret != ERROR_SUCCESS) return ret; ret = RegSetValueExW(hkey, NULL, 0, REG_SZ, (LPVOID)credential->TargetName, @@ -492,7 +492,7 @@ static DWORD registry_write_credential(HKEY hkey, const CREDENTIALW *credential, ret = RegSetValueExW(hkey, wszLastWrittenValue, 0, REG_BINARY, (LPVOID)&LastWritten, sizeof(LastWritten)); if (ret != ERROR_SUCCESS) return ret; - ret = RegSetValueExW(hkey, wszPersistValue, 0, REG_DWORD, (LPVOID)&credential->Persist, + ret = RegSetValueExW(hkey, wszPersistValue, 0, REG_DWORD, (const BYTE*)&credential->Persist, sizeof(credential->Persist)); if (ret != ERROR_SUCCESS) return ret; /* FIXME: Attributes */

1 0

Roderick Colenbrander : wined3d: Remove the swapchain parameter from fb_copy_to_texture_hwstretch in order to unify all blit calls .
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: ae8d9e21e3abb93c2b2d5d668bf23cd179604ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8d9e21e3abb93c2b2d5d668… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 1 23:58:50 2010 +0200 wined3d: Remove the swapchain parameter from fb_copy_to_texture_hwstretch in order to unify all blit calls. --- dlls/wined3d/surface.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2dea6a0..3bde8fd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3515,12 +3515,12 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D /* Uses the hardware to stretch and flip the image */ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWineD3DSurface *SrcSurface, - IWineD3DSwapChainImpl *swapchain, const RECT *src_rect, const RECT *dst_rect_in, - WINED3DTEXTUREFILTERTYPE Filter) + const RECT *src_rect, const RECT *dst_rect_in, WINED3DTEXTUREFILTERTYPE Filter) { IWineD3DDeviceImpl *myDevice = This->resource.device; GLuint src, backup = 0; IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface; + IWineD3DSwapChainImpl *src_swapchain = NULL; float left, right, top, bottom; /* Texture coordinates */ UINT fbwidth = Src->currentDesc.Width; UINT fbheight = Src->currentDesc.Height; @@ -3618,7 +3618,9 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine wined3d_gl_min_mip_filter(minMipLookup, Filter, WINED3DTEXF_NONE)); checkGLcall("glTexParameteri"); - if(!swapchain || (IWineD3DSurface *) Src == swapchain->backBuffer[0]) { + IWineD3DSurface_GetContainer((IWineD3DSurface *)SrcSurface, &IID_IWineD3DSwapChain, (void **)&src_swapchain); + if (src_swapchain) IWineD3DSwapChain_Release((IWineD3DSwapChain *)src_swapchain); + if (!src_swapchain || (IWineD3DSurface *) Src == src_swapchain->backBuffer[0]) { src = backup ? backup : Src->texture_name; } else { glReadBuffer(GL_FRONT); @@ -3991,7 +3993,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const fb_copy_to_texture_direct(This, SrcSurface, &src_rect, &dst_rect, Filter); } else { TRACE("Using hardware stretching to flip / stretch the texture\n"); - fb_copy_to_texture_hwstretch(This, SrcSurface, srcSwapchain, &src_rect, &dst_rect, Filter); + fb_copy_to_texture_hwstretch(This, SrcSurface, &src_rect, &dst_rect, Filter); } /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
90
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 April 2010