September 2011 - Wine-Commits

Stefan Dösinger : d3d9/tests: Add a slop to the fog tests for X1600 GPUs.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 6bf2eb76bb1f9c9bc7ea52079ec3e274d1bb0ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf2eb76bb1f9c9bc7ea52079… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 22:25:44 2011 +0200 d3d9/tests: Add a slop to the fog tests for X1600 GPUs. --- dlls/d3d9/tests/visual.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fd7f387..972f8d6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1231,9 +1231,11 @@ static void fog_test(IDirect3DDevice9 *device) } color = getPixelColor(device, 160, 360); - ok(color_match(color, 0x00ff0000, 4), "Unfogged quad has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00), 4), + "Unfogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Fogged out quad has color %08x\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); @@ -1270,7 +1272,8 @@ static void fog_test(IDirect3DDevice9 *device) color = getPixelColor(device, 160, 360); todo_wine ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Fogged out quad has color %08x\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); @@ -1357,13 +1360,17 @@ static void fog_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); } color = getPixelColor(device, 10, 10); - ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Rangefog with vertex fog returned color 0x%08x\n", color); color = getPixelColor(device, 630, 10); - ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Rangefog with vertex fog returned color 0x%08x\n", color); color = getPixelColor(device, 10, 470); - ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Rangefog with vertex fog returned color 0x%08x\n", color); color = getPixelColor(device, 630, 470); - ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Rangefog with vertex fog returned color 0x%08x\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed, hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_ps_consts_f() const.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: a61fe27fb838cef82abcbe0a917056ddd8278648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61fe27fb838cef82abcbe0a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 15 20:01:52 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_ps_consts_f() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed43810..2916b2d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3213,7 +3213,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_ps_consts_f(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_ps_consts_f(const struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count) { int count = min(vector4f_count, device->d3d_pshader_constantF - start_register); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6c31e14..85f47b4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2233,7 +2233,7 @@ struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct win void __cdecl wined3d_device_get_primitive_type(struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_topology); HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); -HRESULT __cdecl wined3d_device_get_ps_consts_f(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count);

1 0

Alexandre Julliard : winex11: Use the original unclipped coordinates for XRender blits to avoid rounding errors .
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 9ea45ac6023a68d19a9ff62e724486120cde6f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea45ac6023a68d19a9ff62e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 17:10:41 2011 +0200 winex11: Use the original unclipped coordinates for XRender blits to avoid rounding errors. --- dlls/winex11.drv/xrender.c | 44 ++++++++++++++++++++++++++++---------------- 1 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ce3bc03..f85c5c1 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2336,10 +2336,10 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr Drawable drawable, const struct bitblt_coords *src, const struct bitblt_coords *dst ) { - int width = dst->visrect.right - dst->visrect.left; - int height = dst->visrect.bottom - dst->visrect.top; - int x_src = physdev_src->x11dev->dc_rect.left + src->visrect.left; - int y_src = physdev_src->x11dev->dc_rect.top + src->visrect.top; + int width = abs( dst->width ); + int height = abs( dst->height ); + int x_src = physdev_src->x11dev->dc_rect.left + src->x; + int y_src = physdev_src->x11dev->dc_rect.top + src->y; int x_dst, y_dst; Picture src_pict = 0, dst_pict, mask_pict = 0; BOOL use_repeat; @@ -2357,7 +2357,8 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr { XRenderPictureAttributes pa; - x_dst = y_dst = 0; + x_dst = dst->x; + y_dst = dst->y; pa.repeat = RepeatNone; wine_tsx11_lock(); dst_pict = pXRenderCreatePicture( gdi_display, drawable, physdev_dst->pict_format, CPRepeat, &pa ); @@ -2365,11 +2366,16 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr } else { - x_dst = physdev_dst->x11dev->dc_rect.left + dst->visrect.left; - y_dst = physdev_dst->x11dev->dc_rect.top + dst->visrect.top; + x_dst = physdev_dst->x11dev->dc_rect.left + dst->x; + y_dst = physdev_dst->x11dev->dc_rect.top + dst->y; dst_pict = get_xrender_picture( physdev_dst ); } + if (src->width < 0) x_src += src->width + 1; + if (src->height < 0) y_src += src->height + 1; + if (dst->width < 0) x_dst += dst->width + 1; + if (dst->height < 0) y_dst += dst->height + 1; + /* mono -> color */ if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) { @@ -2463,16 +2469,23 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, { GC tmpGC; Pixmap tmp_pixmap; + struct bitblt_coords tmp; + + /* make coordinates relative to tmp pixmap */ + tmp = *dst; + tmp.x -= tmp.visrect.left; + tmp.y -= tmp.visrect.top; + OffsetRect( &tmp.visrect, -tmp.visrect.left, -tmp.visrect.top ); wine_tsx11_lock(); tmpGC = XCreateGC( gdi_display, physdev_dst->x11dev->drawable, 0, NULL ); XSetSubwindowMode( gdi_display, tmpGC, IncludeInferiors ); XSetGraphicsExposures( gdi_display, tmpGC, False ); - tmp_pixmap = XCreatePixmap( gdi_display, root_window, dst->visrect.right - dst->visrect.left, - dst->visrect.bottom - dst->visrect.top, physdev_dst->x11dev->depth ); + tmp_pixmap = XCreatePixmap( gdi_display, root_window, tmp.visrect.right - tmp.visrect.left, + tmp.visrect.bottom - tmp.visrect.top, physdev_dst->x11dev->depth ); wine_tsx11_unlock(); - xrender_stretch_blit( physdev_src, physdev_dst, tmp_pixmap, src, dst ); + xrender_stretch_blit( physdev_src, physdev_dst, tmp_pixmap, src, &tmp ); execute_rop( physdev_dst->x11dev, tmp_pixmap, tmpGC, &dst->visrect, rop ); wine_tsx11_lock(); @@ -2547,12 +2560,11 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, wine_tsx11_lock(); xrender_blit( PictOpOver, src_pict, mask_pict, dst_pict, - physdev_src->x11dev->dc_rect.left + src->visrect.left, - physdev_src->x11dev->dc_rect.top + src->visrect.top, - physdev_dst->x11dev->dc_rect.left + dst->visrect.left, - physdev_dst->x11dev->dc_rect.top + dst->visrect.top, - xscale, yscale, - dst->visrect.right - dst->visrect.left, dst->visrect.bottom - dst->visrect.top ); + physdev_src->x11dev->dc_rect.left + src->x, + physdev_src->x11dev->dc_rect.top + src->y, + physdev_dst->x11dev->dc_rect.left + dst->x, + physdev_dst->x11dev->dc_rect.top + dst->y, + xscale, yscale, dst->width, dst->height ); if (tmp_pict) pXRenderFreePicture( gdi_display, tmp_pict ); wine_tsx11_unlock();

1 0

Francois Gouget : pdh/tests: Make the test pass on Windows 2000.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 770537011a0ecd6a22b56dc1042c3d7266198c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=770537011a0ecd6a22b56dc10… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:04:03 2011 +0200 pdh/tests: Make the test pass on Windows 2000. --- dlls/pdh/tests/pdh.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 5ca1c24..f6fac16 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -130,7 +130,9 @@ static void test_PdhAddCounterA( void ) ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterA failed 0x%08x\n", ret); ret = PdhAddCounterA( query, "\\System\\Nonexistent Counter", 0, &counter ); - ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterA failed 0x%08x\n", ret); + ok(ret == PDH_CSTATUS_NO_COUNTER || + broken(ret == PDH_INVALID_PATH), /* Win2K */ + "PdhAddCounterA failed 0x%08x\n", ret); ok(!counter, "PdhAddCounterA failed %p\n", counter); ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter ); @@ -177,7 +179,9 @@ static void test_PdhAddCounterW( void ) ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret); ret = PdhAddCounterW( query, nonexistent_counter, 0, &counter ); - ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterW failed 0x%08x\n", ret); + ok(ret == PDH_CSTATUS_NO_COUNTER || + broken(ret == PDH_INVALID_PATH), /* Win2K */ + "PdhAddCounterW failed 0x%08x\n", ret); ok(!counter, "PdhAddCounterW failed %p\n", counter); ret = PdhAddCounterW( query, percentage_processor_time, 0, &counter );

1 0

Francois Gouget : pdh/tests: Rename a counter to make the purpose of the test immediately clear.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 4c531edfd2d7e5fdd9faec5edae0fdfe4c9a9724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c531edfd2d7e5fdd9faec5ed… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:01:27 2011 +0200 pdh/tests: Rename a counter to make the purpose of the test immediately clear. --- dlls/pdh/tests/pdh.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 094ad74..5ca1c24 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -54,7 +54,7 @@ static const WCHAR uptime[] = static const WCHAR system_uptime[] = {'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; -static const WCHAR system_downtime[] = /* does not exist */ +static const WCHAR nonexistent_counter[] = {'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m',' ','D','o','w','n',' ','T','i','m','e',0}; static const WCHAR percentage_processor_time[] = {'\\','P','r','o','c','e','s','s','o','r','(','_','T','o','t','a','l',')', @@ -129,7 +129,7 @@ static void test_PdhAddCounterA( void ) ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterA failed 0x%08x\n", ret); - ret = PdhAddCounterA( query, "\\System\\System Down Time", 0, &counter ); + ret = PdhAddCounterA( query, "\\System\\Nonexistent Counter", 0, &counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterA failed 0x%08x\n", ret); ok(!counter, "PdhAddCounterA failed %p\n", counter); @@ -176,7 +176,7 @@ static void test_PdhAddCounterW( void ) ret = PdhAddCounterW( query, percentage_processor_time, 0, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret); - ret = PdhAddCounterW( query, system_downtime, 0, &counter ); + ret = PdhAddCounterW( query, nonexistent_counter, 0, &counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterW failed 0x%08x\n", ret); ok(!counter, "PdhAddCounterW failed %p\n", counter); @@ -267,7 +267,7 @@ static void test_PdhAddEnglishCounterW( void ) ret = pPdhAddEnglishCounterW( query, system_uptime, 0, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n", ret); - ret = pPdhAddEnglishCounterW( query, system_downtime, 0, &counter ); + ret = pPdhAddEnglishCounterW( query, nonexistent_counter, 0, &counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddEnglishCounterW failed 0x%08x\n", ret); ok(!counter, "PdhAddEnglishCounterA failed %p\n", counter); @@ -705,7 +705,7 @@ static void test_PdhValidatePathA( void ) ret = PdhValidatePathA( "System Up Time" ); ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathA failed 0x%08x\n", ret); - ret = PdhValidatePathA( "\\System\\System Down Time" ); + ret = PdhValidatePathA( "\\System\\Nonexistent Counter" ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathA failed 0x%08x\n", ret); ret = PdhValidatePathA( "\\System\\System Up Time" ); @@ -731,7 +731,7 @@ static void test_PdhValidatePathW( void ) ret = PdhValidatePathW( uptime ); ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathW failed 0x%08x\n", ret); - ret = PdhValidatePathW( system_downtime ); + ret = PdhValidatePathW( nonexistent_counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathW failed 0x%08x\n", ret); ret = PdhValidatePathW( system_uptime ); @@ -780,7 +780,7 @@ static void test_PdhValidatePathExW( void ) ret = pPdhValidatePathExW( NULL, uptime ); ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathExW failed 0x%08x\n", ret); - ret = pPdhValidatePathExW( NULL, system_downtime ); + ret = pPdhValidatePathExW( NULL, nonexistent_counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathExW failed 0x%08x\n", ret); ret = pPdhValidatePathExW( NULL, system_uptime );

1 0

Stefan Dösinger : d3d9/tests: Fix the depth stencil size tests on AMD.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: f3644a513f21ec589acc7b442fa1b364e15a9d28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3644a513f21ec589acc7b442… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 22:10:36 2011 +0200 d3d9/tests: Fix the depth stencil size tests on AMD. --- dlls/d3d9/tests/visual.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f583a89..fd7f387 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12179,7 +12179,6 @@ static void ds_size_test(IDirect3DDevice9 *device) { IDirect3DSurface9 *ds, *rt, *old_rt, *old_ds, *readback; HRESULT hr; - DWORD color; DWORD num_passes; struct { @@ -12228,29 +12227,20 @@ static void ds_size_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff0000, 0.5f, 0); ok(SUCCEEDED(hr), "Target and Z Buffer clear failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_GetRenderTargetData(device, rt, readback); - ok(SUCCEEDED(hr), "IDirect3DDevice9_GetRenderTargetData failed, hr %#x.\n", hr); - color = getPixelColorFromSurface(readback, 2, 2); - ok(color == 0x000000FF, "DS size test: Pixel (2, 2) after clear is %#x, expected 0x000000FF\n", color); - color = getPixelColorFromSurface(readback, 31, 31); - ok(color == 0x000000FF, "DS size test: Pixel (31, 31) after clear is %#x, expected 0x000000FF\n", color); - color = getPixelColorFromSurface(readback, 32, 32); - ok(color == 0x000000FF, "DS size test: Pixel (32, 32) after clear is %#x, expected 0x000000FF\n", color); - color = getPixelColorFromSurface(readback, 63, 63); - ok(color == 0x000000FF, "DS size test: Pixel (63, 63) after clear is %#x, expected 0x000000FF\n", color); + /* Nvidia does not clear the surface(The color is still 0x000000ff), AMD does(the color is 0x00ff0000) */ /* Turning on any depth-related state results in a ValidateDevice failure */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice9_ValidateDevice(device, &num_passes); - ok(hr == D3DERR_CONFLICTINGRENDERSTATE, "IDirect3DDevice9_ValidateDevice returned %#x, expected " + ok(hr == D3DERR_CONFLICTINGRENDERSTATE || hr == D3D_OK, "IDirect3DDevice9_ValidateDevice returned %#x, expected " "D3DERR_CONFLICTINGRENDERSTATE.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice9_ValidateDevice(device, &num_passes); - ok(hr == D3DERR_CONFLICTINGRENDERSTATE, "IDirect3DDevice9_ValidateDevice returned %#x, expected " + ok(hr == D3DERR_CONFLICTINGRENDERSTATE || hr == D3D_OK, "IDirect3DDevice9_ValidateDevice returned %#x, expected " "D3DERR_CONFLICTINGRENDERSTATE.\n", hr); /* Try to draw with the device in an invalid state */ @@ -12264,6 +12254,10 @@ static void ds_size_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "IDirect3DDevice9_DrawPrimitiveUP failed, hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); + + /* Don't check the resulting draw unless we find an app that needs it. On nvidia ValidateDevice + * returns CONFLICTINGRENDERSTATE, so the result is undefined. On AMD d3d seems to assume the + * stored Z buffer value is 0.0 for all pixels, even those that are covered by the depth buffer */ } hr = IDirect3DDevice9_SetRenderTarget(device, 0, old_rt);

1 0

Stefan Dösinger : d3d9/Tests: State getters don' t work with PUREDEVICEs.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 7759729fc70edca0770d39f0624c9243a60e84ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=7759729fc70edca0770d39f06… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 22:56:08 2011 +0200 d3d9/Tests: State getters don't work with PUREDEVICEs. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 1e1527a..625dce9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2004,7 +2004,7 @@ static void test_lights(void) present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &present_parameters, &device ); + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device ); ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, "IDirect3D9_CreateDevice failed with %08x\n", hr); if(!device)

1 0

Stefan Dösinger : d3d8/test: Add slop to some fog tests.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 8b57a585ad3afd3a8ea79eeb0cc19f84c74b5537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b57a585ad3afd3a8ea79eeb0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 23:01:44 2011 +0200 d3d8/test: Add slop to some fog tests. --- dlls/d3d8/tests/visual.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 33e9841..e90553a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -509,13 +509,17 @@ static void fog_test(IDirect3DDevice8 *device) } color = getPixelColor(device, 160, 360); - ok(color == 0x00FF0000, "Untransformed vertex with no table or vertex fog has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xFF, 0x00, 0x00), 1), + "Untransformed vertex with no table or vertex fog has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000FF00, "Untransformed vertex with linear vertex fog has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xFF, 0x00), 1), + "Untransformed vertex with linear vertex fog has color %08x\n", color); color = getPixelColor(device, 480, 120); - ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xFF, 0xFF, 0x00), 1), + "Transformed vertex with linear vertex fog has color %08x\n", color); color = getPixelColor(device, 480, 360); - ok(color == 0x0000FF00, "Transformed vertex with linear table fog has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xFF, 0x00), 1), + "Transformed vertex with linear table fog has color %08x\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); @@ -557,7 +561,8 @@ static void fog_test(IDirect3DDevice8 *device) color = getPixelColor(device, 160, 360); ok(color_match(color, 0x00ff0000, 4), "Unfogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Fogged out quad has color %08x\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); @@ -594,7 +599,8 @@ static void fog_test(IDirect3DDevice8 *device) color = getPixelColor(device, 160, 360); todo_wine ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Fogged out quad has color %08x\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);

1 0

Francois Gouget : pdh: Add more Pdh macros and prototypes to the headers.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: fe9b079286476d436e985902d9e6565a10f08674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe9b079286476d436e985902d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:00:00 2011 +0200 pdh: Add more Pdh macros and prototypes to the headers. --- include/pdh.h | 28 ++++++++++++++++++++ include/pdhmsg.h | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 6 ++++ include/winperf.h | 5 +++ 4 files changed, 111 insertions(+), 0 deletions(-) diff --git a/include/pdh.h b/include/pdh.h index 7f3d334..30591ac 100644 --- a/include/pdh.h +++ b/include/pdh.h @@ -37,6 +37,10 @@ typedef HANDLE PDH_HQUERY; typedef HANDLE PDH_HCOUNTER; typedef HANDLE PDH_HLOG; +typedef PDH_HCOUNTER HCOUNTER; +typedef PDH_HQUERY HQUERY; +typedef PDH_HLOG HLOG; + #define PDH_CVERSION_WIN40 0x0400 #define PDH_CVERSION_WIN50 0x0500 #define PDH_VERSION 0x0503 @@ -57,6 +61,16 @@ typedef HANDLE PDH_HLOG; #define DATA_SOURCE_LOGFILE 0x00000002 #define DATA_SOURCE_WBEM 0x00000004 +#ifdef WINE_NO_UNICODE_MACROS +# define DECL_PDH_TYPE_AW(name) /* nothing */ +#else /* WINE_NO_UNICODE_MACROS */ +# ifdef UNICODE +# define DECL_PDH_TYPE_AW(name) typedef name##_W name; +# else +# define DECL_PDH_TYPE_AW(name) typedef name##_A name; +# endif +#endif /* WINE_NO_UNICODE_MACROS */ + typedef struct _PDH_FMT_COUNTERVALUE { DWORD CStatus; @@ -99,6 +113,9 @@ typedef struct _PDH_COUNTER_PATH_ELEMENTS_W LPWSTR szCounterName; } PDH_COUNTER_PATH_ELEMENTS_W, *PPDH_COUNTER_PATH_ELEMENTS_W; +DECL_PDH_TYPE_AW(PDH_COUNTER_PATH_ELEMENTS) +DECL_PDH_TYPE_AW(PPDH_COUNTER_PATH_ELEMENTS) + typedef struct _PDH_DATA_ITEM_PATH_ELEMENTS_A { LPSTR szMachineName; @@ -115,6 +132,9 @@ typedef struct _PDH_DATA_ITEM_PATH_ELEMENTS_W LPWSTR szInstanceName; } PDH_DATA_ITEM_PATH_ELEMENTS_W, *PPDH_DATA_ITEM_PATH_ELEMENTS_W; +DECL_PDH_TYPE_AW(PDH_DATA_ITEM_PATH_ELEMENTS) +DECL_PDH_TYPE_AW(PPDH_DATA_ITEM_PATH_ELEMENTS) + typedef struct _PDH_COUNTER_INFO_A { DWORD dwLength; @@ -173,6 +193,11 @@ typedef struct _PDH_COUNTER_INFO_W DWORD DataBuffer[1]; } PDH_COUNTER_INFO_W, *PPDH_COUNTER_INFO_W; +DECL_PDH_TYPE_AW(PDH_COUNTER_INFO) +DECL_PDH_TYPE_AW(PPDH_COUNTER_INFO) + +#undef DECL_PDH_TYPE_AW + PDH_STATUS WINAPI PdhAddCounterA(PDH_HQUERY, LPCSTR, DWORD_PTR, PDH_HCOUNTER *); PDH_STATUS WINAPI PdhAddCounterW(PDH_HQUERY, LPCWSTR, DWORD_PTR, PDH_HCOUNTER *); #define PdhAddCounter WINELIB_NAME_AW(PdhAddCounter) @@ -183,6 +208,9 @@ PDH_STATUS WINAPI PdhCloseQuery(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryData(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryDataEx(PDH_HQUERY, DWORD, HANDLE); PDH_STATUS WINAPI PdhCollectQueryDataWithTime(PDH_HQUERY,LONGLONG *); +PDH_STATUS WINAPI PdhEnumObjectsA(LPCSTR,LPCSTR,PZZSTR,LPDWORD,DWORD,BOOL); +PDH_STATUS WINAPI PdhEnumObjectsW(LPCWSTR,LPCWSTR,PZZWSTR,LPDWORD,DWORD,BOOL); +#define PdhEnumObjects WINELIB_NAME_AW(PdhEnumObjects) PDH_STATUS WINAPI PdhEnumObjectItemsA(LPCSTR, LPCSTR, LPCSTR, LPSTR, LPDWORD, LPSTR, LPDWORD, DWORD, DWORD); PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR, LPCWSTR, LPCWSTR, LPWSTR, LPDWORD, LPWSTR, LPDWORD, DWORD, DWORD); #define PdhEnumObjectItems WINELIB_NAME_AW(PdhEnumObjectItems) diff --git a/include/pdhmsg.h b/include/pdhmsg.h index f5bcbb3..bb7534a 100644 --- a/include/pdhmsg.h +++ b/include/pdhmsg.h @@ -22,18 +22,90 @@ #define _PDH_MSG_H_ #define PDH_CSTATUS_VALID_DATA 0x00000000 +#define PDH_CSTATUS_NEW_DATA 0x00000001 #define PDH_CSTATUS_NO_MACHINE 0x800007d0 +#define PDH_CSTATUS_NO_INSTANCE 0x800007d1 #define PDH_MORE_DATA 0x800007d2 +#define PDH_CSTATUS_ITEM_NOT_VALIDATED 0x800007d3 +#define PDH_RETRY 0x800007d4 #define PDH_NO_DATA 0x800007d5 +#define PDH_CALC_NEGATIVE_DENOMINATOR 0x800007d6 +#define PDH_CALC_NEGATIVE_TIMEBASE 0x800007d7 +#define PDH_CALC_NEGATIVE_VALUE 0x800007d8 +#define PDH_DIALOG_CANCELLED 0x800007d9 +#define PDH_END_OF_LOG_FILE 0x800007da +#define PDH_ASYNC_QUERY_TIMEOUT 0x800007db +#define PDH_CANNOT_SET_DEFAULT_REALTIME_DATASOURCE 0x800007dc +#define PDH_UNABLE_MAP_NAME_FILES 0x80000bd5 +#define PDH_PLA_VALIDATION_WARNING 0x80000bf3 #define PDH_CSTATUS_NO_OBJECT 0xc0000bb8 #define PDH_CSTATUS_NO_COUNTER 0xc0000bb9 +#define PDH_CSTATUS_INVALID_DATA 0xc0000bba #define PDH_MEMORY_ALLOCATION_FAILURE 0xc0000bbb #define PDH_INVALID_HANDLE 0xc0000bbc #define PDH_INVALID_ARGUMENT 0xc0000bbd +#define PDH_FUNCTION_NOT_FOUND 0xc0000bbe +#define PDH_CSTATUS_NO_COUNTERNAME 0xc0000bbf #define PDH_CSTATUS_BAD_COUNTERNAME 0xc0000bc0 +#define PDH_INVALID_BUFFER 0xc0000bc1 #define PDH_INSUFFICIENT_BUFFER 0xc0000bc2 +#define PDH_CANNOT_CONNECT_MACHINE 0xc0000bc3 +#define PDH_INVALID_PATH 0xc0000bc4 +#define PDH_INVALID_INSTANCE 0xc0000bc5 #define PDH_INVALID_DATA 0xc0000bc6 +#define PDH_NO_DIALOG_DATA 0xc0000bc7 +#define PDH_CANNOT_READ_NAME_STRINGS 0xc0000bc8 +#define PDH_LOG_FILE_CREATE_ERROR 0xc0000bc9 +#define PDH_LOG_FILE_OPEN_ERROR 0xc0000bca +#define PDH_LOG_TYPE_NOT_FOUND 0xc0000bcb +#define PDH_NO_MORE_DATA 0xc0000bcc +#define PDH_ENTRY_NOT_IN_LOG_FILE 0xc0000bcd +#define PDH_DATA_SOURCE_IS_LOG_FILE 0xc0000bce +#define PDH_DATA_SOURCE_IS_REAL_TIME 0xc0000bcf +#define PDH_UNABLE_READ_LOG_HEADER 0xc0000bd0 +#define PDH_FILE_NOT_FOUND 0xc0000bd1 +#define PDH_FILE_ALREADY_EXISTS 0xc0000bd2 #define PDH_NOT_IMPLEMENTED 0xc0000bd3 #define PDH_STRING_NOT_FOUND 0xc0000bd4 +#define PDH_UNKNOWN_LOG_FORMAT 0xc0000bd6 +#define PDH_UNKNOWN_LOGSVC_COMMAND 0xc0000bd7 +#define PDH_LOGSVC_QUERY_NOT_FOUND 0xc0000bd8 +#define PDH_LOGSVC_NOT_OPENED 0xc0000bd9 +#define PDH_WBEM_ERROR 0xc0000bda +#define PDH_ACCESS_DENIED 0xc0000bdb +#define PDH_LOG_FILE_TOO_SMALL 0xc0000bdc +#define PDH_INVALID_DATASOURCE 0xc0000bdd +#define PDH_INVALID_SQLDB 0xc0000bde +#define PDH_NO_COUNTERS 0xc0000bdf +#define PDH_SQL_ALLOC_FAILED 0xc0000be0 +#define PDH_SQL_ALLOCCON_FAILED 0xc0000be1 +#define PDH_SQL_EXEC_DIRECT_FAILED 0xc0000be2 +#define PDH_SQL_FETCH_FAILED 0xc0000be3 +#define PDH_SQL_ROWCOUNT_FAILED 0xc0000be4 +#define PDH_SQL_MORE_RESULTS_FAILED 0xc0000be5 +#define PDH_SQL_CONNECT_FAILED 0xc0000be6 +#define PDH_SQL_BIND_FAILED 0xc0000be7 +#define PDH_CANNOT_CONNECT_WMI_SERVER 0xc0000be8 +#define PDH_PLA_COLLECTION_ALREADY_RUNNING 0xc0000be9 +#define PDH_PLA_ERROR_SCHEDULE_OVERLAP 0xc0000bea +#define PDH_PLA_COLLECTION_NOT_FOUND 0xc0000beb +#define PDH_PLA_ERROR_SCHEDULE_ELAPSED 0xc0000bec +#define PDH_PLA_ERROR_NOSTART 0xc0000bed +#define PDH_PLA_ERROR_ALREADY_EXISTS 0xc0000bee +#define PDH_PLA_ERROR_TYPE_MISMATCH 0xc0000bef +#define PDH_PLA_ERROR_FILEPATH 0xc0000bf0 +#define PDH_PLA_SERVICE_ERROR 0xc0000bf1 +#define PDH_PLA_VALIDATION_ERROR 0xc0000bf2 +#define PDH_PLA_ERROR_NAME_TOO_LONG 0xc0000bf4 +#define PDH_INVALID_SQL_LOG_FORMAT 0xc0000bf5 +#define PDH_COUNTER_ALREADY_IN_QUERY 0xc0000bf6 +#define PDH_BINARY_LOG_CORRUPT 0xc0000bf7 +#define PDH_LOG_SAMPLE_TOO_SMALL 0xc0000bf8 +#define PDH_OS_LATER_VERSION 0xc0000bf9 +#define PDH_OS_EARLIER_VERSION 0xc0000bfa +#define PDH_INCORRECT_APPEND_TIME 0xc0000bfb +#define PDH_UNMATCHED_APPEND_COUNTER 0xc0000bfc +#define PDH_SQL_ALTER_DETAIL_FAILED 0xc0000bfd +#define PDH_QUERY_PERF_DATA_TIMEOUT 0xc0000bfe #endif /* _PDH_MSG_H_ */ diff --git a/include/winnt.h b/include/winnt.h index 8ff6a7f..f8adbcb 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -431,6 +431,8 @@ typedef CHAR *PCH, *LPCH; typedef const CHAR *PCCH, *LPCCH; typedef CHAR *PSTR, *LPSTR, *NPSTR; typedef const CHAR *PCSTR, *LPCSTR; +typedef CHAR *PZZSTR; +typedef const CHAR *PCZZSTR; /* Unicode string types */ typedef WCHAR *PWCH, *LPWCH; @@ -453,6 +455,8 @@ typedef WCHAR TCHAR, *PTCHAR; #endif typedef LPWSTR PTSTR, LPTSTR; typedef LPCWSTR PCTSTR, LPCTSTR; +typedef PZZSTR PZZTSTR; +typedef PCZZSTR PCZZTSTR; # define __TEXT(string) L##string # else /* UNICODE */ # ifndef _TCHAR_DEFINED @@ -461,6 +465,8 @@ typedef CHAR TCHAR, *PTCHAR; # endif typedef LPSTR PTSTR, LPTSTR; typedef LPCSTR PCTSTR, LPCTSTR; +typedef PZZWSTR PZZTSTR; +typedef PCZZWSTR PCZZTSTR; # define __TEXT(string) string # endif /* UNICODE */ # define TEXT(quote) __TEXT(quote) diff --git a/include/winperf.h b/include/winperf.h index eb68ac3..b62f24b 100644 --- a/include/winperf.h +++ b/include/winperf.h @@ -62,4 +62,9 @@ #define PERF_DISPLAY_SECONDS 0x30000000 #define PERF_DISPLAY_NOSHOW 0x40000000 +#define PERF_DETAIL_NOVICE 100 +#define PERF_DETAIL_ADVANCED 200 +#define PERF_DETAIL_EXPERT 300 +#define PERF_DETAIL_WIZARD 400 + #endif /* _WINPERF_ */

1 0

Alexandre Julliard : winex11: Disable the XRender StretchBlt implementation if XRender wasn't loaded.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: c2edf4399ca69ae9c176e4d00254249ee4dca30e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2edf4399ca69ae9c176e4d00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 11:36:59 2011 +0200 winex11: Disable the XRender StretchBlt implementation if XRender wasn't loaded. --- dlls/winex11.drv/xrender.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 77b0aeb..ce3bc03 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2435,13 +2435,14 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, return dst_dev->funcs->pStretchBlt( dst_dev, dst, src_dev, src, rop ); } + if (!X11DRV_XRender_Installed) goto x11drv_fallback; + /* XRender is of no use for color -> mono */ if (physdev_dst->format == WXR_FORMAT_MONO && physdev_src->format != WXR_FORMAT_MONO) - return X11DRV_StretchBlt( &physdev_dst->x11dev->dev, dst, &physdev_src->x11dev->dev, src, rop ); + goto x11drv_fallback; /* if not stretching, we only need to handle format conversion */ - if (!stretch && physdev_dst->format == physdev_src->format) - return X11DRV_StretchBlt( &physdev_dst->x11dev->dev, dst, &physdev_src->x11dev->dev, src, rop ); + if (!stretch && physdev_dst->format == physdev_src->format) goto x11drv_fallback; sSrc = sDst = X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_None ); if (physdev_dst != physdev_src) sSrc = X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_None ); @@ -2484,6 +2485,9 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (physdev_dst != physdev_src) X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); X11DRV_UnlockDIBSection( physdev_dst->x11dev, TRUE ); return TRUE; + +x11drv_fallback: + return X11DRV_StretchBlt( &physdev_dst->x11dev->dev, dst, &physdev_src->x11dev->dev, src, rop ); }

1 0