January 2007 - Wine-commits

Louis Lenders : d3d8: Fix failing tests on windows, when no 3d hardware acceleration is available.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: e236d91ab85afc3faefbc64ceb643a7c19e2fb60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e236d91ab85afc3faefbc64ce… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Dec 31 14:28:28 2006 +0000 d3d8: Fix failing tests on windows, when no 3d hardware acceleration is available. --- dlls/d3d8/tests/device.c | 35 +++++++++++++++++++++++++---------- dlls/d3d8/tests/surface.c | 7 ++++++- dlls/d3d8/tests/texture.c | 7 ++++++- dlls/d3d8/tests/volume.c | 7 ++++++- 4 files changed, 43 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 96f3a39..b9ed2c5 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); @@ -607,8 +616,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); @@ -683,8 +695,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..393223c 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..500b3c8 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..be4e771 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; }

1 0

Kai Blin : wrc: Fix comparison typo (Coverity).
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 802cf1a728b5c99d71958227b1443629a7334d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=802cf1a728b5c99d71958227b… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Jan 1 12:42:09 2007 +0100 wrc: Fix comparison typo (Coverity). --- tools/wrc/translation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index 4a5fafb..be1cb7f 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -831,7 +831,7 @@ static int compare_versioninfo(versionin } if(!different && ((ver_block1 && !ver_block2) || - (ver_block1 && !ver_block2))) + (!ver_block1 && ver_block2))) different = 1; } return different;

1 0

Kai Blin : imagehelp: Remove unused if() check in error path.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: b52983cb9daa39934c993134a643b5fd5db4f789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b52983cb9daa39934c993134a… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Jan 1 12:42:35 2007 +0100 imagehelp: Remove unused if() check in error path. --- dlls/imagehlp/access.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index e303896..cca765e 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -164,7 +164,7 @@ BOOL WINAPI MapAndLoad(LPSTR pszImageNam goto Error; } - hFile = CreateFileA(szFileName, GENERIC_READ, 1, /* FIXME: FILE_SHARE_READ not defined */ + hFile = CreateFileA(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) { @@ -212,7 +212,6 @@ BOOL WINAPI MapAndLoad(LPSTR pszImageNam return TRUE; Error: - if (mapping) UnmapViewOfFile(mapping); if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); return FALSE; }

1 0

Kai Blin : dnsapi: Fix entering the success case (Coverity).
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 2620cea3c2aa558f59164653448340668b229c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2620cea3c2aa558f591646534… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Jan 1 12:42:44 2007 +0100 dnsapi: Fix entering the success case (Coverity). --- dlls/dnsapi/query.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 509e281..38f8801 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -533,6 +533,7 @@ static DNS_STATUS dns_do_query_netbios( DNS_RRSET_ADD( rrset, (DNS_RECORD *)record ); } } + status = ERROR_SUCCESS; exit: DNS_RRSET_TERMINATE( rrset );

1 0

Vitaliy Margolen : user32: Initialize clip rectangle on first use.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: f9f6a4d5da7deaf5e15c90696940c735b85e6894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f6a4d5da7deaf5e15c90696… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Dec 29 12:31:08 2006 -0700 user32: Initialize clip rectangle on first use. --- dlls/user32/cursoricon.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7be797e..2f81840 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1577,6 +1577,9 @@ BOOL WINAPI ClipCursor( const RECT *rect */ BOOL WINAPI GetClipCursor( RECT *rect ) { + /* If this is first time - initialize the rect */ + if (IsRectEmpty( &CURSOR_ClipRect )) ClipCursor( NULL ); + return CopyRect( rect, &CURSOR_ClipRect ); }

1 0

Alexandre Julliard : Revert "wined3d: Simplify the get_write_mask and get_swizzle functions."
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: d46d7d13abc33e7be555062e51d55def527ea06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46d7d13abc33e7be555062e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 13:21:47 2007 +0100 Revert "wined3d: Simplify the get_write_mask and get_swizzle functions." This reverts commit a9f658f6a68fbe53bcf30ab0329e5ff91451bf30. --- dlls/wined3d/arb_program_shader.c | 38 ++++++++++++++++++++++++++---------- dlls/wined3d/glsl_shader.c | 38 ++++++++++++++++++++++++++---------- 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e0d10a6..a8e4c9a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -209,11 +209,14 @@ static const char * const shift_tab[] = static void shader_arb_get_write_mask(const DWORD param, char *write_mask) { char *ptr = write_mask; - *ptr++ = '.'; - if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; - if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; - if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; - if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { + *ptr++ = '.'; + if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; + if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; + if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; + if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + } + *ptr = '\0'; } @@ -223,15 +226,28 @@ static void shader_arb_get_swizzle(const * and z components. */ const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; char *ptr = swizzle_str; - DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; - size_t i = 0; - *ptr++ = '.'; /* swizzle bits fields: wwzzyyxx */ - for (i = 0; i < 4; ++i) { - *ptr++ = swizzle_chars[swizzle & 0x3]; - swizzle >>= 2; + DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; + DWORD swizzle_x = swizzle & 0x03; + DWORD swizzle_y = (swizzle >> 2) & 0x03; + DWORD swizzle_z = (swizzle >> 4) & 0x03; + DWORD swizzle_w = (swizzle >> 6) & 0x03; + + /* If the swizzle is the default swizzle (ie, "xyzw"), we don't need to + * generate a swizzle string. Unless we need to our own swizzling. */ + if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) != swizzle || fixup) { + *ptr++ = '.'; + if (swizzle_x == swizzle_y && swizzle_x == swizzle_z && swizzle_x == swizzle_w) { + *ptr++ = swizzle_chars[swizzle_x]; + } else { + *ptr++ = swizzle_chars[swizzle_x]; + *ptr++ = swizzle_chars[swizzle_y]; + *ptr++ = swizzle_chars[swizzle_z]; + *ptr++ = swizzle_chars[swizzle_w]; + } } + *ptr = '\0'; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 03d5dd3..4aed644 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -722,11 +722,14 @@ static void shader_glsl_get_register_nam static void shader_glsl_get_write_mask(const DWORD param, char *write_mask) { char *ptr = write_mask; - *ptr++ = '.'; - if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; - if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; - if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; - if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { + *ptr++ = '.'; + if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; + if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; + if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; + if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + } + *ptr = '\0'; } @@ -736,15 +739,28 @@ static void shader_glsl_get_swizzle(cons * and z components. */ const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; char *ptr = swizzle_str; - DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; - size_t i = 0; - *ptr++ = '.'; /* swizzle bits fields: wwzzyyxx */ - for (i = 0; i < 4; ++i) { - *ptr++ = swizzle_chars[swizzle & 0x3]; - swizzle >>= 2; + DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; + DWORD swizzle_x = swizzle & 0x03; + DWORD swizzle_y = (swizzle >> 2) & 0x03; + DWORD swizzle_z = (swizzle >> 4) & 0x03; + DWORD swizzle_w = (swizzle >> 6) & 0x03; + + /* If the swizzle is the default swizzle (ie, "xyzw"), we don't need to + * generate a swizzle string. Unless we need to our own swizzling. */ + if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) != swizzle || fixup) { + *ptr++ = '.'; + if (swizzle_x == swizzle_y && swizzle_x == swizzle_z && swizzle_x == swizzle_w) { + *ptr++ = swizzle_chars[swizzle_x]; + } else { + *ptr++ = swizzle_chars[swizzle_x]; + *ptr++ = swizzle_chars[swizzle_y]; + *ptr++ = swizzle_chars[swizzle_z]; + *ptr++ = swizzle_chars[swizzle_w]; + } } + *ptr = '\0'; }

1 0

Louis Lenders : d3d9: Fix failing tests on windows, when no 3d hardware acceleration is available.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: c1cc17d8273a93fe65feb88d0d26a9ce36d667fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cc17d8273a93fe65feb88d0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Dec 31 14:25:56 2006 +0000 d3d9: Fix failing tests on windows, when no 3d hardware acceleration is available. --- dlls/d3d9/tests/device.c | 8 ++++++-- dlls/d3d9/tests/shader.c | 7 ++++++- dlls/d3d9/tests/surface.c | 7 ++++++- dlls/d3d9/tests/texture.c | 7 ++++++- dlls/d3d9/tests/vertexdeclaration.c | 7 ++++++- dlls/d3d9/tests/volume.c | 7 ++++++- 6 files changed, 36 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d0347ca..88d1cf5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -735,8 +735,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..2273673 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..84ad723 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..cc48206 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..eafd0a4 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..61f3ee1 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; }

1 0

Vitaliy Margolen : wined3d: Clip mouse after resolution change while creating default swap chain.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: f9e5c12019e4aa64c556abc5b8579505cf42af09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e5c12019e4aa64c556abc5b… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Dec 29 12:25:25 2006 -0700 wined3d: Clip mouse after resolution change while creating default swap chain. --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cfb3354..58f512d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1437,6 +1437,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl DEVMODEW devmode; HDC hdc; int bpp = 0; + RECT clip_rc; /* Get info on the current display setup */ hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -1462,6 +1463,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl This->ddraw_width = devmode.dmPelsWidth; This->ddraw_height = devmode.dmPelsHeight; This->ddraw_format = *(pPresentationParameters->BackBufferFormat); + + /* And finally clip mouse to our screen */ + SetRect(&clip_rc, 0, 0, devmode.dmPelsWidth, devmode.dmPelsHeight); + ClipCursor(&clip_rc); }

1 0

Andrew Talbot : dmband: Remove unused file-static variable.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 6252ad28fe9ebb5016cf1a1a914125bef2ff9a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6252ad28fe9ebb5016cf1a1a9… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Dec 29 14:55:46 2006 +0000 dmband: Remove unused file-static variable. --- dlls/dmband/band.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 9b1dec3..b8c4d86 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -22,7 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmband); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -static const GUID IID_IDirectMusicBandPRIVATE = {0xda54db81,0x837d,0x11d1,{0x86,0xbc,0x00,0xc0,0x4f,0xbf,0x8f,0xef}}; /***************************************************************************** * IDirectMusicBandImpl implementation

1 0

Andrew Talbot : wnaspi32: Qualify use of WINE_DEFAULT_DEBUG_CHANNEL.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 2a6024504abab3238d91f3b59ccf4ea4d7e78721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a6024504abab3238d91f3b59… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 30 20:59:30 2006 +0000 wnaspi32: Qualify use of WINE_DEFAULT_DEBUG_CHANNEL. --- dlls/wnaspi32/winaspi16.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wnaspi32/winaspi16.c b/dlls/wnaspi32/winaspi16.c index c9adb51..ec451e4 100644 --- a/dlls/wnaspi32/winaspi16.c +++ b/dlls/wnaspi32/winaspi16.c @@ -41,8 +41,6 @@ #include "wine/winaspi.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(aspi); - /* FIXME! * 1) Residual byte length reporting not handled @@ -55,6 +53,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(aspi); #define PTR_TO_LIN(ptr,mode) \ ((mode) == ASPI_DOS ? ((void*)(((unsigned int)SELECTOROF(ptr) << 4) + OFFSETOF(ptr))) : MapSL(ptr)) +WINE_DEFAULT_DEBUG_CHANNEL(aspi); + static ASPI_DEVICE_INFO *ASPI_open_devices = NULL; static FARPROC16 ASPIChainFunc = NULL;

1 0