[prev in list] [next in list] [prev in thread] [next in thread]
List: wine-patches
Subject: Resend: d3d8: fix failing tests on windows,
From: "Louis. Lenders" <xerox_xerox2000 () yahoo ! co ! uk>
Date: 2006-12-31 14:28:28
Message-ID: 20061231142828.48791.qmail () web23202 ! 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:
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:<br><p> Send instant messages to your online friends \
http://uk.messenger.yahoo.com
--0-1851213195-1167575308=:48421--
["t.txt" (text/plain)]
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index a7f8d0c..0fdb45c 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -120,8 +120,11 @@ static void test_mipmap_levels(void)
hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd,
D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, \
&pDevice );
- ok(SUCCEEDED(hr), "Failed to create IDirect3D8Device (%s)\n", \
DXGetErrorString8(hr));
- if (FAILED(hr)) goto cleanup;
+ if(FAILED(hr))
+ {
+ trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr);
+ goto cleanup;
+ }
check_mipmap_levels(pDevice, 32, 32, 6);
check_mipmap_levels(pDevice, 256, 1, 9);
@@ -162,8 +165,11 @@ static void test_swapchain(void)
hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd,
D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, \
&pDevice );
- ok(SUCCEEDED(hr), "Failed to create IDirect3D8Device (%s)\n", \
DXGetErrorString8(hr));
- if (FAILED(hr)) goto cleanup;
+ if(FAILED(hr))
+ {
+ trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr);
+ goto cleanup;
+ }
/* Check if the back buffer count was modified */
ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams \
struct is %d\n", d3dpp.BackBufferCount); @@ -315,8 +321,11 @@ static void \
test_refcount(void)
hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd,
D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, \
&pDevice );
- ok(SUCCEEDED(hr), "Failed to create IDirect3D8Device (%s)\n", \
DXGetErrorString8(hr));
- if (FAILED(hr)) goto cleanup;
+ if(FAILED(hr))
+ {
+ trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr);
+ goto cleanup;
+ }
refcount = get_refcount( (IUnknown *)pDevice );
ok(refcount == 1, "Invalid device RefCount %d\n", refcount);
@@ -598,8 +607,11 @@ static void test_cursor(void)
hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd,
D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, \
&pDevice );
- ok(SUCCEEDED(hr), "Failed to create IDirect3D8Device (%s)\n", \
DXGetErrorString8(hr));
- if (FAILED(hr)) goto cleanup;
+ if(FAILED(hr))
+ {
+ trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr);
+ goto cleanup;
+ }
IDirect3DDevice8_CreateImageSurface(pDevice, 32, 32, D3DFMT_A8R8G8B8, &cursor);
ok(cursor != NULL, "IDirect3DDevice8_CreateOffscreenPlainSurface failed with \
%08x\n", hr); @@ -674,8 +686,11 @@ static void test_states(void)
hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no \
NULLREF here */, hwnd,
D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, \
&pDevice );
- ok(SUCCEEDED(hr), "Failed to create IDirect3D8Device (%s)\n", \
DXGetErrorString8(hr));
- if (FAILED(hr)) goto cleanup;
+ if(FAILED(hr))
+ {
+ trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr);
+ goto cleanup;
+ }
hr = IDirect3DDevice8_SetRenderState(pDevice, D3DRS_ZVISIBLE, TRUE);
ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState(D3DRS_ZVISIBLE, TRUE) returned \
%s\n", DXGetErrorString8(hr));
diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c
index 0709cd1..480b30c 100644
--- a/dlls/d3d8/tests/surface.c
+++ b/dlls/d3d8/tests/surface.c
@@ -56,7 +56,12 @@ static IDirect3DDevice8 *init_d3d8(HMODU
hr = IDirect3D8_CreateDevice(d3d8_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, IDirect3D8_CreateDevice returned %#x\n", hr);
+ return NULL;
+ }
return device_ptr;
}
diff --git a/dlls/d3d8/tests/texture.c b/dlls/d3d8/tests/texture.c
index 5da7619..e6d7bfc 100644
--- a/dlls/d3d8/tests/texture.c
+++ b/dlls/d3d8/tests/texture.c
@@ -56,7 +56,12 @@ static IDirect3DDevice8 *init_d3d8(HMODU
hr = IDirect3D8_CreateDevice(d3d8_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, IDirect3D8_CreateDevice returned %#x\n", hr);
+ return NULL;
+ }
return device_ptr;
}
diff --git a/dlls/d3d8/tests/volume.c b/dlls/d3d8/tests/volume.c
index d05ec86..c226de6 100644
--- a/dlls/d3d8/tests/volume.c
+++ b/dlls/d3d8/tests/volume.c
@@ -56,7 +56,12 @@ static IDirect3DDevice8 *init_d3d8(HMODU
hr = IDirect3D8_CreateDevice(d3d8_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, IDirect3D8_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