wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

Huw Davies : gdi32/tests: Output the required font height if the test fails .
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: ee339afa3fac61e8f802e901e41078aca7315c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee339afa3fac61e8f802e901e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 18 22:44:44 2009 +0000 gdi32/tests: Output the required font height if the test fails. --- dlls/gdi32/tests/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b10aebe..2a10f80 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -270,8 +270,8 @@ if (0) /* these metrics are scaled too, but with rounding errors */ cx = tm.tmAveCharWidth / tm_orig->tmAveCharWidth; cy = tm.tmHeight / tm_orig->tmHeight; - ok(cx == scale_x && cy == scale_y, "expected scale_x %d, scale_y %d, got cx %d, cy %d\n", - scale_x, scale_y, cx, cy); + ok(cx == scale_x && cy == scale_y, "height %d: expected scale_x %d, scale_y %d, got cx %d, cy %d\n", + lfHeight, scale_x, scale_y, cx, cy); ok(tm.tmHeight == tm_orig->tmHeight * scale_y, "height %d != %d\n", tm.tmHeight, tm_orig->tmHeight * scale_y); ok(tm.tmAscent == tm_orig->tmAscent * scale_y, "ascent %d != %d\n", tm.tmAscent, tm_orig->tmAscent * scale_y); ok(tm.tmDescent == tm_orig->tmDescent * scale_y, "descent %d != %d\n", tm.tmDescent, tm_orig->tmDescent * scale_y);

1 0

Huw Davies : comdlg32/tests: Vista can return a failure from StartDoc when using the XPS driver - don' t fail the test in this case.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 466b50cf7d242c68f9d5d86c5de063485c04923e URL: http://source.winehq.org/git/wine.git/?a=commit;h=466b50cf7d242c68f9d5d86c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 19 12:50:45 2009 +0000 comdlg32/tests: Vista can return a failure from StartDoc when using the XPS driver - don't fail the test in this case. --- dlls/comdlg32/tests/printdlg.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 6f70621..c305016 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -335,7 +335,11 @@ static void test_abort_proc(void) doc_info.lpszOutput = filename; job_id = StartDocA(print_dc, &doc_info); - ok(job_id > 0, "StartDocA failed ret %d gle %d\n", job_id, GetLastError()); + + ok(job_id > 0 || + GetLastError() == ERROR_SPL_NO_STARTDOC, /* Vista can fail with this error when using the XPS driver */ + "StartDocA failed ret %d gle %d\n", job_id, GetLastError()); + if(job_id <= 0) { skip("StartDoc failed\n");

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_fontFamily .
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 169f440cb7ea3e27cd1165299e4fef2369d2bfd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=169f440cb7ea3e27cd1165299… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 17 20:44:41 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_fontFamily. --- dlls/mshtml/htmlcurstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index bcff943..422c5b1 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -158,8 +158,10 @@ static HRESULT WINAPI HTMLCurrentStyle_get_backgroundColor(IHTMLCurrentStyle *if static HRESULT WINAPI HTMLCurrentStyle_get_fontFamily(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_FONT_FAMILY, p); } static HRESULT WINAPI HTMLCurrentStyle_get_fontStyle(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b2b776e..1face6f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2384,6 +2384,10 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_position failed: %08x\n", hres); ok(!strcmp_wa(str, "absolute"), "get_position returned %s\n", dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_fontFamily(current_style, &str); + ok(hres == S_OK, "get_fontFamily failed: %08x\n", hres); + SysFreeString(str); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_position.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: e6a18895eea1eed1a682efd4983bed1be1f41cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a18895eea1eed1a682efd49… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 17 20:41:45 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_position. --- dlls/mshtml/htmlcurstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 0a93570..bcff943 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -128,8 +128,10 @@ static HRESULT WINAPI HTMLCurrentStyle_Invoke(IHTMLCurrentStyle *iface, DISPID d static HRESULT WINAPI HTMLCurrentStyle_get_position(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_POSITION, p); } static HRESULT WINAPI HTMLCurrentStyle_get_styleFloat(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b6f6eaa..b2b776e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2379,6 +2379,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_display failed: %08x\n", hres); ok(!strcmp_wa(str, "block"), "get_display returned %s\n", dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_position(current_style, &str); + ok(hres == S_OK, "get_position failed: %08x\n", hres); + ok(!strcmp_wa(str, "absolute"), "get_position returned %s\n", dbgstr_w(str)); + SysFreeString(str); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alexandre Julliard : user32/tests: Try harder to make the window receive keystrokes.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: cd77c7561931550a28c46e1d2c6468d1a2eb6b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd77c7561931550a28c46e1d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 19 14:23:49 2009 +0100 user32/tests: Try harder to make the window receive keystrokes. --- dlls/user32/tests/input.c | 35 ++++++++++++----------------------- 1 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index cb03e6e..584c23a 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -310,23 +310,7 @@ static void TestSysKeys( HWND hWnd) static LRESULT CALLBACK WndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) { - switch (msg) { - case WM_USER: - SetFocus(hWnd); - /* window has focus, now do the test */ - if( hWnd == hWndTest) TestSysKeys( hWnd); - /* finished :-) */ - break; - - case WM_DESTROY: - PostQuitMessage( 0 ); - break; - - default: - return( DefWindowProcA( hWnd, msg, wParam, lParam ) ); - } - - return 0; + return DefWindowProcA( hWnd, msg, wParam, lParam ); } static void test_Input_whitebox(void) @@ -345,18 +329,22 @@ static void test_Input_whitebox(void) wclass.lpszMenuName = 0; wclass.cbClsExtra = 0; wclass.cbWndExtra = 0; - assert (RegisterClassA( &wclass )); + RegisterClassA( &wclass ); /* create the test window that will receive the keystrokes */ - assert ( hWndTest = CreateWindowA( wclass.lpszClassName, "InputSysKeyTest", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, - NULL, NULL, hInstance, NULL) ); + hWndTest = CreateWindowA( wclass.lpszClassName, "InputSysKeyTest", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, + NULL, NULL, hInstance, NULL); + assert( hWndTest ); ShowWindow( hWndTest, SW_SHOW); + SetWindowPos( hWndTest, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); + SetForegroundWindow( hWndTest ); UpdateWindow( hWndTest); /* flush pending messages */ while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); - SendMessageA(hWndTest, WM_USER, 0, 0); + SetFocus( hWndTest ); + TestSysKeys( hWndTest ); DestroyWindow(hWndTest); } @@ -377,7 +365,6 @@ static void empty_message_queue(void) DispatchMessage(&msg); } diff = time - GetTickCount(); - min_timeout = 20; } } @@ -859,6 +846,8 @@ static void test_Input_blackbox(void) |WS_VISIBLE, 0, 0, 200, 60, NULL, NULL, NULL, NULL); ok(window != NULL, "error: %d\n", (int) GetLastError()); + SetWindowPos( window, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); + SetForegroundWindow( window ); hook = SetWindowsHookExA(WH_KEYBOARD_LL, hook_proc, GetModuleHandleA( NULL ), 0);

1 0

Alexandre Julliard : include: Avoid redefinition of WIN32 in twain.h.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 5d513c1b0422f87e69f6db4dabf1ef4f20608059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d513c1b0422f87e69f6db4da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 19 13:06:35 2009 +0100 include: Avoid redefinition of WIN32 in twain.h. --- include/twain.h | 35 +++++++---------------------------- 1 files changed, 7 insertions(+), 28 deletions(-) diff --git a/include/twain.h b/include/twain.h index a7ff0f0..bdbda47 100644 --- a/include/twain.h +++ b/include/twain.h @@ -62,11 +62,6 @@ #undef FAR #define FAR -#define huge -#define WIN32 -#define _WIN32 -#undef __declspec -#define __declspec(spec) /**************************************************************************** * TWAIN Version * @@ -86,16 +81,8 @@ #ifdef _MSWIN_ typedef HANDLE TW_HANDLE; typedef LPVOID TW_MEMREF; - - /* SDH - 05/05/95 - TWUNK */ - /* For common code between 16 and 32 bits. */ -# ifdef WIN32 -# define TW_HUGE -# else /* WIN32 */ -# define TW_HUGE huge -# endif /* WIN32 */ - typedef BYTE TW_HUGE * HPBYTE; - typedef void TW_HUGE * HPVOID; + typedef BYTE * HPBYTE; + typedef void * HPVOID; #endif /* _MSWIN_ */ #ifdef _MAC_ @@ -1830,19 +1817,11 @@ typedef TW_UINT16 (*DSMENTRYPROC)(pTW_IDENTITY, pTW_IDENTITY, extern "C" { #endif /* __cplusplus */ #ifdef _MSWIN_ -# ifdef _WIN32 - __declspec(dllexport) TW_UINT16 FAR PASCAL DS_Entry (pTW_IDENTITY pOrigin, - TW_UINT32 DG, - TW_UINT16 DAT, - TW_UINT16 MSG, - TW_MEMREF pData); -# else /* _WIN32 */ - TW_UINT16 FAR PASCAL DS_Entry (pTW_IDENTITY pOrigin, - TW_UINT32 DG, - TW_UINT16 DAT, - TW_UINT16 MSG, - TW_MEMREF pData); -# endif /* _WIN32 */ + TW_UINT16 DECLSPEC_EXPORT PASCAL DS_Entry (pTW_IDENTITY pOrigin, + TW_UINT32 DG, + TW_UINT16 DAT, + TW_UINT16 MSG, + TW_MEMREF pData); typedef TW_UINT16 (FAR PASCAL *DSENTRYPROC) (pTW_IDENTITY pOrigin, TW_UINT32 DG,

1 0

Alexandre Julliard : winetest: Try to trigger the Gecko install for mshtml tests, and skip them otherwise .
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: de02d20ec733d5d0255c5a0e0782528ec247dbdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=de02d20ec733d5d0255c5a0e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 19 12:55:23 2009 +0100 winetest: Try to trigger the Gecko install for mshtml tests, and skip them otherwise. --- programs/winetest/Makefile.in | 2 +- programs/winetest/main.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index d50284a..05427e7 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winetest.exe APPMODE = -mconsole -IMPORTS = comctl32 version user32 gdi32 advapi32 wsock32 kernel32 +IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 kernel32 EXTRARCFLAGS = -DBUILD_SHA1=\"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 211ec2e..ab9c79e 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -28,9 +28,11 @@ #include "config.h" #include "wine/port.h" +#define COBJMACROS #include <stdio.h> #include <assert.h> #include <windows.h> +#include <mshtml.h> #include "winetest.h" #include "resource.h" @@ -149,6 +151,34 @@ static int running_on_visible_desktop (void) return IsWindowVisible(desktop); } +/* check if Gecko is present, trying to trigger the install if not */ +static BOOL gecko_check(void) +{ + HMODULE mshtml; + HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); + IClassFactory *factory = NULL; + IHTMLDocument2 *doc = NULL; + IHTMLElement *body; + BOOL ret = FALSE; + + if (!(mshtml = LoadLibraryA( "mshtml.dll" ))) return FALSE; + if (!(pDllGetClassObject = (void *)GetProcAddress( mshtml, "DllGetClassObject" ))) + goto done; + if (FAILED(pDllGetClassObject( &CLSID_HTMLDocument, &IID_IClassFactory, (void **)&factory ))) + goto done; + if (FAILED(IClassFactory_CreateInstance( factory, NULL, &IID_IHTMLDocument2, (void **)&doc ))) + goto done; + if (FAILED(IHTMLDocument2_get_body( doc, &body ))) + goto done; + IHTMLElement_Release( body ); + ret = TRUE; +done: + if (doc) IHTMLDocument_Release( doc ); + if (factory) IClassFactory_Release( factory ); + FreeLibrary( mshtml ); + return ret; +} + static void print_version (void) { #ifdef __i386__ @@ -520,6 +550,12 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, xprintf (" %s=dll is missing\n", dllname); return TRUE; } + if (!strcmp( dllname, "mshtml" ) && running_under_wine() && !gecko_check()) + { + FreeLibrary(dll); + xprintf (" %s=load error Gecko is not installed\n", dllname); + return TRUE; + } GetModuleFileNameA(dll, filename, MAX_PATH); FreeLibrary(dll);

1 0

Alexandre Julliard : msctf/tests: Don't import uuid.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: cd656fa7f68bc86f78be21c67f876935d924d7f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd656fa7f68bc86f78be21c67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 19 12:54:44 2009 +0100 msctf/tests: Don't import uuid. --- dlls/msctf/tests/Makefile.in | 2 +- dlls/msctf/tests/inputprocessor.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/Makefile.in b/dlls/msctf/tests/Makefile.in index 669f5a1..0d7aba8 100644 --- a/dlls/msctf/tests/Makefile.in +++ b/dlls/msctf/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = msctf.dll -IMPORTS = uuid ole32 user32 kernel32 +IMPORTS = ole32 user32 kernel32 CTESTS = \ inputprocessor.c diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 200a0d4..2e71eec 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -33,6 +33,7 @@ static ITfInputProcessorProfiles* g_ipp; static LANGID gLangid; DEFINE_GUID(CLSID_FakeService, 0xEDE1A7AD,0x66DE,0x47E0,0xB6,0x20,0x3E,0x92,0xF8,0x24,0x6B,0xF3); +DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); static HRESULT initialize(void) {

1 0

Paul Vriens : ddraw/tests: Use skip() instead of trace().
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 4542ab35b432552a84bf45908b3299bef7e146be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4542ab35b432552a84bf45908… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Feb 19 11:53:54 2009 +0100 ddraw/tests: Use skip() instead of trace(). --- dlls/ddraw/tests/visual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 87193ea..7c5e651 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -2638,28 +2638,28 @@ START_TEST(visual) hr = IDirect3DDevice7_Clear(Direct3DDevice, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); if(FAILED(hr)) { - trace("Clear failed, can't assure correctness of the test results, skipping\n"); + skip("Clear failed, can't assure correctness of the test results, skipping\n"); goto cleanup; } color = getPixelColor(Direct3DDevice, 1, 1); if(color !=0x00ff0000) { - trace("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests, skipping\n", color); + skip("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests, skipping\n", color); goto cleanup; } hr = IDirect3DDevice7_Clear(Direct3DDevice, 0, NULL, D3DCLEAR_TARGET, 0xff00ddee, 0.0, 0); if(FAILED(hr)) { - trace("Clear failed, can't assure correctness of the test results, skipping\n"); + skip("Clear failed, can't assure correctness of the test results, skipping\n"); goto cleanup; } color = getPixelColor(Direct3DDevice, 639, 479); if(color != 0x0000ddee) { - trace("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests, skipping\n", color); + skip("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests, skipping\n", color); goto cleanup; }

1 0

Paul Vriens : ddraw/tests: Don't crash on W2K.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: b63728a850b333761bd3fb7ff8e9e3032981ac5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b63728a850b333761bd3fb7ff… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Feb 19 11:20:29 2009 +0100 ddraw/tests: Don't crash on W2K. --- dlls/ddraw/tests/visual.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 1bac1b7..87193ea 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -37,6 +37,8 @@ IDirect3DDevice *Direct3DDevice1 = NULL; IDirect3DExecuteBuffer *ExecuteBuffer = NULL; IDirect3DViewport *Viewport = NULL; +static BOOL refdevice = FALSE; + static HRESULT (WINAPI *pDirectDrawCreateEx)(LPGUID,LPVOID*,REFIID,LPUNKNOWN); static BOOL createObjects(void) @@ -100,6 +102,8 @@ static BOOL createObjects(void) { trace("Creating a HAL device failed, trying Ref\n"); hr = IDirect3D7_CreateDevice(Direct3D, &IID_IDirect3DRefDevice, Surface, &Direct3DDevice); + if (SUCCEEDED(hr)) + refdevice = TRUE; } } if(!Direct3DDevice) goto err; @@ -562,7 +566,7 @@ static void offscreen_test(IDirect3DDevice7 *device) hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState returned hr = %08x\n", hr); - if(IDirect3DDevice7_BeginScene(device) == D3D_OK) { + if(IDirect3DDevice7_BeginScene(device) == D3D_OK && !refdevice) { hr = IDirect3DDevice7_SetRenderTarget(device, offscreen, 0); ok(hr == D3D_OK, "SetRenderTarget failed, hr = %08x\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0);

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
97
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 February 2009