[prev in list] [next in list] [prev in thread] [next in thread]
List: wine-patches
Subject: Resend: d3d9: fix failing tests on windows,
From: "Louis. Lenders" <xerox_xerox2000 () yahoo ! co ! uk>
Date: 2006-12-31 14:25:56
Message-ID: 20061231142557.43063.qmail () web23215 ! mail ! ird ! yahoo ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Hi, is there anything wrong with this patch? If so, could you please tell me what. \
Thx
"Louis. Lenders" <xerox_xerox2000@yahoo.co.uk> wrote: Hi, this patch should fix \
failing tests in d3d9, like you see for example here: \
http://test.winehq.org/data/200612231000/
Appearently the tests in stateblock.c didn't need to be modified, as they create the \
device with flag D3DDEVTYPE_NULLREF; these tests do not fail anywhere.
thanks for some advice from stringfellow
---------------------------------
Send instant messages to your online friends http://uk.messenger.yahoo.com
[Attachment #5 (text/html)]
Hi, is there anything wrong with this patch? If so, could you please tell me what. \
Thx<br><br><b><i>"Louis. Lenders" <xerox_xerox2000@yahoo.co.uk></i></b> \
wrote:<blockquote class="replbq" style="border-left: 2px solid rgb(16, 16, 255); \
margin-left: 5px; padding-left: 5px;"> Hi, this patch should fix failing tests in \
d3d9, like you see for example \
here:<br>http://test.winehq.org/data/200612231000/<br><br>Appearently the tests in \
stateblock.c didn't need to be modified, as they create the device with flag \
D3DDEVTYPE_NULLREF; these tests do not fail anywhere.<br><br>thanks for some advice \
from stringfellow<br><div> </div><hr size="1"><br></blockquote><br><p> Send \
instant messages to your online friends http://uk.messenger.yahoo.com \
--0-1687403619-1167575156=:41893--
["y.txt" (text/plain)]
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 7198155..1e1dde0 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -725,8 +725,12 @@ static void test_reset(void)
hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no \
NULLREF here */, hwnd,
D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, \
&pDevice );
- ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", \
DXGetErrorString9(hr));
- if (FAILED(hr)) goto cleanup;
+
+ if(FAILED(hr))
+ {
+ trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr);
+ goto cleanup;
+ }
width = GetSystemMetrics(SM_CXSCREEN);
height = GetSystemMetrics(SM_CYSCREEN);
diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c
index c906f9e..c1d76c8 100644
--- a/dlls/d3d9/tests/shader.c
+++ b/dlls/d3d9/tests/shader.c
@@ -55,7 +55,12 @@ static IDirect3DDevice9 *init_d3d9(void)
present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD;
hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, \
NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, \
&device_ptr);
- ok(hres == D3D_OK, "IDirect3D_CreateDevice returned: 0x%x\n", hres);
+
+ if(FAILED(hres))
+ {
+ trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", \
hres); + return NULL;
+ }
return device_ptr;
}
diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c
index badfb3a..6471df9 100644
--- a/dlls/d3d9/tests/surface.c
+++ b/dlls/d3d9/tests/surface.c
@@ -54,7 +54,12 @@ static IDirect3DDevice9 *init_d3d9(HMODU
hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, \
&device_ptr);
- ok(SUCCEEDED(hr), "IDirect3D_CreateDevice returned %#x\n", hr);
+
+ if(FAILED(hr))
+ {
+ trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr);
+ return NULL;
+ }
return device_ptr;
}
diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c
index ac7c1ec..2f4b55d 100644
--- a/dlls/d3d9/tests/texture.c
+++ b/dlls/d3d9/tests/texture.c
@@ -53,7 +53,12 @@ static IDirect3DDevice9 *init_d3d9(HMODU
hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, \
&device_ptr);
- ok(SUCCEEDED(hr), "IDirect3D_CreateDevice returned %#x\n", hr);
+
+ if(FAILED(hr))
+ {
+ trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr);
+ return NULL;
+ }
return device_ptr;
}
diff --git a/dlls/d3d9/tests/vertexdeclaration.c \
b/dlls/d3d9/tests/vertexdeclaration.c index 643b744..aae2c29 100644
--- a/dlls/d3d9/tests/vertexdeclaration.c
+++ b/dlls/d3d9/tests/vertexdeclaration.c
@@ -60,7 +60,12 @@ static IDirect3DDevice9 *init_d3d9(void)
present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD;
hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, \
NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, \
&device_ptr);
- ok(hres == D3D_OK, "IDirect3D_CreateDevice returned: 0x%x\n", hres);
+
+ if(FAILED(hres))
+ {
+ trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", \
hres); + return NULL;
+ }
return device_ptr;
}
diff --git a/dlls/d3d9/tests/volume.c b/dlls/d3d9/tests/volume.c
index 8851c3a..ce18a77 100644
--- a/dlls/d3d9/tests/volume.c
+++ b/dlls/d3d9/tests/volume.c
@@ -53,7 +53,12 @@ static IDirect3DDevice9 *init_d3d9(HMODU
hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, \
&device_ptr);
- ok(SUCCEEDED(hr), "IDirect3D_CreateDevice returned %#x\n", hr);
+
+ if(FAILED(hr))
+ {
+ trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr);
+ return NULL;
+ }
return device_ptr;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic