January 2012 - Wine-Commits

Jörg Höhle : winecoreaudio: Fix the Start/Stop/ Reset cycle.
by Alexandre Julliard Jan. 31, 2012

Jan. 31, 2012

Module: wine Branch: master Commit: f489cc97c7b6e704545ec6941b8dfa8bbe12165a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f489cc97c7b6e704545ec6941… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jan 29 14:33:50 2012 +0100 winecoreaudio: Fix the Start/Stop/Reset cycle. --- dlls/winecoreaudio.drv/mmdevdrv.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 7dcaa53..a940cbf 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1459,6 +1459,11 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) return E_OUTOFMEMORY; } + if(This->dataflow == eCapture){ + UINT32 frames; /* enqueue packets */ + AudioCaptureClient_GetNextPacket(This, &frames); + } + This->playing = StateInTransition; sc = AudioQueueStart(This->aqueue, NULL); @@ -1523,12 +1528,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) }else WARN("GetCurrentTime failed: %lx\n", sc); - sc = AudioQueueFlush(This->aqueue); - if(sc != noErr){ - OSSpinLockUnlock(&This->lock); - WARN("Unable to flush audio queue: %lx\n", sc); - } - + /* Mac OS bug? Our capture callback is no more called past AQStop */ sc = AudioQueuePause(This->aqueue); if(sc != noErr){ OSSpinLockUnlock(&This->lock); @@ -1552,6 +1552,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) ACImpl *This = impl_from_IAudioClient(iface); OSStatus sc; QueuedBufInfo *bufinfo, *bufinfo2; + AQBuffer *buf; TRACE("(%p)\n", This); @@ -1572,8 +1573,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_BUFFER_OPERATION_PENDING; } - This->written_frames = 0; - This->inbuf_frames = 0; + avail_update(This); /* going to skip over inbuf_frames */ LIST_FOR_EACH_ENTRY_SAFE(bufinfo, bufinfo2, &This->queued_bufinfos, QueuedBufInfo, entry){ @@ -1588,6 +1588,18 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return E_FAIL; } + /* AQReset is synchronous */ + list_move_tail(&This->avail_buffers, &This->queued_buffers); + + if(This->dataflow == eRender){ + This->written_frames = 0; + }else{ + LIST_FOR_EACH_ENTRY(buf, &This->avail_buffers, AQBuffer, entry) + buf->buf->mAudioDataByteSize = 0; + This->written_frames += This->inbuf_frames; + } + This->inbuf_frames = 0; + OSSpinLockUnlock(&This->lock); return S_OK; @@ -1984,8 +1996,6 @@ static HRESULT AudioCaptureClient_GetNextPacket(ACImpl *This, UINT32 *frames) return S_OK; WARN("empty packet\n"); - /* fixme: for reasons not yet understood, the initially submitted - * packets are returned with 0 bytes. Resubmit them. */ buf->used = TRUE; sc = AudioQueueEnqueueBuffer(This->aqueue, This->public_buffer, 0, NULL); if(sc != noErr){

1 0

Alexandre Julliard : winex11: Consider zero-size windows mapped even when they are positioned at 0, 0.
by Alexandre Julliard Jan. 31, 2012

Jan. 31, 2012

Module: wine Branch: master Commit: 4f0f7dec9927eba84a98acd63b22f1d843d672fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0f7dec9927eba84a98acd63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 17:28:34 2012 +0100 winex11: Consider zero-size windows mapped even when they are positioned at 0,0. --- dlls/winex11.drv/x11drv.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8e3c4c3..78e7cd0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -648,8 +648,10 @@ static inline void mirror_rect( const RECT *window_rect, RECT *rect ) static inline BOOL is_window_rect_mapped( const RECT *rect ) { - return (rect->left < virtual_screen_rect.right && rect->top < virtual_screen_rect.bottom && - rect->right > virtual_screen_rect.left && rect->bottom > virtual_screen_rect.top); + return (rect->left < virtual_screen_rect.right && + rect->top < virtual_screen_rect.bottom && + max( rect->right, rect->left + 1 ) > virtual_screen_rect.left && + max( rect->bottom, rect->top + 1 ) > virtual_screen_rect.top); } static inline BOOL is_window_rect_fullscreen( const RECT *rect )

1 0

Stefan Dösinger : ddraw: Properly set the color key in texture::load.
by Alexandre Julliard Jan. 31, 2012

Jan. 31, 2012

Module: wine Branch: master Commit: 551c732d744d3f5991af114b3157b641ccdcbac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551c732d744d3f5991af114b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 31 14:49:16 2012 +0100 ddraw: Properly set the color key in texture::load. --- dlls/ddraw/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ced64a9..2e97510 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4967,12 +4967,12 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu { struct wined3d_mapped_rect src_rect, dst_rect; - /* Copy also the ColorKeying stuff */ + /* Copy the src blit color key if the source has one, don't erase + * the destination's ckey if the source has none */ if (src_desc->dwFlags & DDSD_CKSRCBLT) { - dst_desc->dwFlags |= DDSD_CKSRCBLT; - dst_desc->ddckCKSrcBlt.dwColorSpaceLowValue = src_desc->ddckCKSrcBlt.dwColorSpaceLowValue; - dst_desc->ddckCKSrcBlt.dwColorSpaceHighValue = src_desc->ddckCKSrcBlt.dwColorSpaceHighValue; + IDirectDrawSurface7_SetColorKey(&dst_surface->IDirectDrawSurface7_iface, + DDCKEY_SRCBLT, &src_desc->ddckCKSrcBlt); } /* Copy the main memory texture into the surface that corresponds

1 0

Thomas Faber : comctl32: Fix MSVC build in imagelist.c.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 2fb139ffe750e57942acd78e8ec915ee0d40e531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb139ffe750e57942acd78e8… Author: Thomas Faber <thfabba(a)gmx.de> Date: Mon Jan 30 18:26:43 2012 +0100 comctl32: Fix MSVC build in imagelist.c. --- dlls/comctl32/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ccc594f..28e2968 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3094,7 +3094,7 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count) if ((ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) || ilc == ILC_COLOR) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; TRACE("Creating DIBSection %d x %d, %d Bits per Pixel\n",

1 0

Piotr Caban : msvcp60: Fix _Lockit class implementation.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: e3174d93d8c898ea6ecd9c8d8f9bb5b9ff41b9b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3174d93d8c898ea6ecd9c8d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 30 17:47:36 2012 +0100 msvcp60: Fix _Lockit class implementation. --- dlls/msvcp60/misc.c | 59 ++++++------------------------------------------- dlls/msvcp60/msvcp.h | 2 +- 2 files changed, 9 insertions(+), 52 deletions(-) diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 94b673b..61cf4a5 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -89,56 +89,21 @@ void CDECL mutex_mutex_dtor(mutex *m) mutex_dtor(m); } -static CRITICAL_SECTION lockit_cs[_MAX_LOCK]; - -/* ?_Lockit_ctor(a)_Lockit@std@@SAXH(a)Z */ -void __cdecl _Lockit_init(int locktype) { - InitializeCriticalSection(&lockit_cs[locktype]); - lockit_cs[locktype].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); -} - -/* ?_Lockit_dtor(a)_Lockit@std@@SAXH(a)Z */ -void __cdecl _Lockit_free(int locktype) -{ - lockit_cs[locktype].DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&lockit_cs[locktype]); -} +static CRITICAL_SECTION lockit_cs; void init_lockit(void) { - int i; - - for(i=0; i<_MAX_LOCK; i++) - _Lockit_init(i); + InitializeCriticalSection(&lockit_cs); + lockit_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); } void free_lockit(void) { - int i; - - for(i=0; i<_MAX_LOCK; i++) - _Lockit_free(i); + lockit_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&lockit_cs); } -/* ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12(a)H@Z */ -/* ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12(a)H@Z */ -void __cdecl _Lockit__Lockit_ctor_locktype(_Lockit *lockit, int locktype) -{ - lockit->locktype = locktype; - EnterCriticalSection(&lockit_cs[locktype]); -} - -/* ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12@@Z */ -/* ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12@@Z */ -void __cdecl _Lockit__Lockit_ctor(_Lockit *lockit) -{ - _Lockit__Lockit_ctor_locktype(lockit, 0); -} - -/* ??0_Lockit(a)std@@QAE(a)H@Z */ -/* ??0_Lockit(a)std@@QEAA(a)H@Z */ -DEFINE_THISCALL_WRAPPER(_Lockit_ctor_locktype, 8) _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) { - _Lockit__Lockit_ctor_locktype(this, locktype); + EnterCriticalSection(&lockit_cs); return this; } @@ -147,15 +112,7 @@ _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) DEFINE_THISCALL_WRAPPER(_Lockit_ctor, 4) _Lockit* __thiscall _Lockit_ctor(_Lockit *this) { - _Lockit__Lockit_ctor_locktype(this, 0); - return this; -} - -/* ?_Lockit_dtor(a)_Lockit@std@@CAXPAV12@@Z */ -/* ?_Lockit_dtor(a)_Lockit@std@@CAXPEAV12@@Z */ -void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit) -{ - LeaveCriticalSection(&lockit_cs[lockit->locktype]); + return _Lockit_ctor_locktype(this, 0); } /* ??1_Lockit(a)std@@QAE(a)XZ */ @@ -163,7 +120,7 @@ void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit) DEFINE_THISCALL_WRAPPER(_Lockit_dtor, 4) void __thiscall _Lockit_dtor(_Lockit *this) { - _Lockit__Lockit_dtor(this); + LeaveCriticalSection(&lockit_cs); } /* wctype */ diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index ed31419..ef6f864 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -256,7 +256,7 @@ void __thiscall locale_dtor(locale*); /* class _Lockit */ typedef struct { - int locktype; + char empty_struct; } _Lockit; #define _LOCK_LOCALE 0

1 0

Alexandre Julliard : dinput: Catch unsuccessful clipping attempts and fall back to warping.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: b0657c8623e7ed8745ffb87b3ed47afb55589bc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0657c8623e7ed8745ffb87b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 17:46:23 2012 +0100 dinput: Catch unsuccessful clipping attempts and fall back to warping. --- dlls/dinput/mouse.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 20de328..ead6c25 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -421,7 +421,7 @@ static void warp_check( SysMouseImpl* This, BOOL force ) if (force || (This->need_warp && (now - This->last_warped > interval))) { - RECT rect; + RECT rect, new_rect; POINT mapped_center; This->last_warped = now; @@ -442,7 +442,8 @@ static void warp_check( SysMouseImpl* This, BOOL force ) rect.right = min( rect.right, rect.left + GetSystemMetrics( SM_CXVIRTUALSCREEN ) - 2 ); rect.bottom = min( rect.bottom, rect.top + GetSystemMetrics( SM_CYVIRTUALSCREEN ) - 2 ); TRACE("Clipping mouse to %s\n", wine_dbgstr_rect( &rect )); - This->clipped = ClipCursor( &rect ); + ClipCursor( &rect ); + This->clipped = GetClipCursor( &new_rect ) && EqualRect( &rect, &new_rect ); } } }

1 0

Andrew Eikum : mmdevapi: Correctly convert UINT32 to LONG32.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 5860a5b386a5d3c0acbe0d5e59f94e8a259cb490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5860a5b386a5d3c0acbe0d5e5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 30 11:04:17 2012 -0600 mmdevapi: Correctly convert UINT32 to LONG32. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index ba29fde..0bedcc5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -117,7 +117,7 @@ struct ACImpl { HANDLE timer; BYTE *local_buffer, *tmp_buffer; - long getbuf_last; /* <0 when using tmp_buffer */ + LONG32 getbuf_last; /* <0 when using tmp_buffer */ CRITICAL_SECTION lock; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 650c46d..22ee924 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -121,7 +121,7 @@ struct ACImpl { BYTE *local_buffer, *tmp_buffer; int buf_state; - long getbuf_last; /* <0 when using tmp_buffer */ + LONG32 getbuf_last; /* <0 when using tmp_buffer */ HANDLE timer; CRITICAL_SECTION lock;

1 0

Piotr Caban : urlmon: Fix debug message in canonicalize_scheme.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 01947e08dabd0cb9305ba845cb381de9d4a6d32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=01947e08dabd0cb9305ba845c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 30 18:36:53 2012 +0100 urlmon: Fix debug message in canonicalize_scheme. --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1e25952..4cefaa0 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3301,7 +3301,7 @@ static BOOL canonicalize_scheme(const parse_data *data, Uri *uri, DWORD flags, B uri->scheme_start = pos; TRACE("(%p %p %x): Canonicalized scheme=%s, len=%d.\n", data, uri, flags, - debugstr_wn(uri->canon_uri, uri->scheme_len), data->scheme_len); + debugstr_wn(uri->canon_uri+uri->scheme_start, data->scheme_len), data->scheme_len); } /* This happens in both computation modes. */

1 0

Stefan Leichter : msi: Update version resource.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: f3caa7684695edb2aab932bd2987ff8f55af5932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3caa7684695edb2aab932bd2… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jan 30 14:27:39 2012 +0100 msi: Update version resource. --- dlls/msi/msi.rc | 8 ++++---- programs/msiexec/rsrc.rc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index f58de7e..fd67807 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -77,9 +77,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Wine MSI dll" #define WINE_FILENAME_STR "msi.dll" -#define WINE_FILEVERSION 4,5,6001,22159 -#define WINE_FILEVERSION_STR "4.5.6001.22159" -#define WINE_PRODUCTVERSION 4,5,6001,22159 -#define WINE_PRODUCTVERSION_STR "4.5.6001.22159" +#define WINE_FILEVERSION 4,5,6001,22299 +#define WINE_FILEVERSION_STR "4.5.6001.22299" +#define WINE_PRODUCTVERSION 4,5,6001,22299 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" #include "wine/wine_common_ver.rc" diff --git a/programs/msiexec/rsrc.rc b/programs/msiexec/rsrc.rc index 2594c51..b9994ef 100644 --- a/programs/msiexec/rsrc.rc +++ b/programs/msiexec/rsrc.rc @@ -21,10 +21,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine Installer" #define WINE_FILENAME_STR "msiexec.exe" #define WINE_FILETYPE VFT_APP -#define WINE_FILEVERSION 3,1,4000,1823 -#define WINE_FILEVERSION_STR "3.1.4000.1823" -#define WINE_PRODUCTVERSION 3,1,4000,1823 -#define WINE_PRODUCTVERSION_STR "3.1.4000.1823" +#define WINE_FILEVERSION 4,5,6001,22299 +#define WINE_FILEVERSION_STR "4.5.6001.22299" +#define WINE_PRODUCTVERSION 4,5,6001,22299 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" #define WINE_PRODUCTNAME_STR "Wine Installer" #include "wine/wine_common_ver.rc"

1 0

Stefan Dösinger : ddraw/tests: Port the depth blit test to ddraw4.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: b16248898b5299a09c17d057a8ae8c698d810308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16248898b5299a09c17d057a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 30 08:41:58 2012 +0100 ddraw/tests: Port the depth blit test to ddraw4. --- dlls/ddraw/tests/ddraw4.c | 209 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 209 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3471779..34cab7f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1004,6 +1004,214 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } +static IDirectDrawSurface4 *get_depth_stencil(IDirect3DDevice3 *device) +{ + IDirectDrawSurface4 *rt, *ret; + DDSCAPS2 caps = {DDSCAPS_ZBUFFER, 0, 0, 0}; + HRESULT hr; + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get the render target, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(rt, &caps, &ret); + ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); + IDirectDrawSurface4_Release(rt); + return ret; +} + +static void test_depth_blit(void) +{ + static struct + { + float x, y, z; + DWORD color; + } + quad1[] = + { + { -1.0, 1.0, 0.50f, 0xff00ff00}, + { 1.0, 1.0, 0.50f, 0xff00ff00}, + { -1.0, -1.0, 0.50f, 0xff00ff00}, + { 1.0, -1.0, 0.50f, 0xff00ff00}, + }; + static const D3DCOLOR expected_colors[4][4] = + { + {0x00ff0000, 0x00ff0000, 0x0000ff00, 0x0000ff00}, + {0x00ff0000, 0x00ff0000, 0x0000ff00, 0x0000ff00}, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, + }; + DDSURFACEDESC2 ddsd_new, ddsd_existing; + + IDirect3DDevice3 *device; + IDirectDrawSurface4 *ds1, *ds2, *ds3, *rt; + IDirect3DViewport3 *viewport; + D3DVIEWPORT2 vp_data; + RECT src_rect, dst_rect; + unsigned int i, j; + D3DCOLOR color; + HRESULT hr; + IDirect3D3 *d3d; + IDirectDraw4 *ddraw; + DDBLTFX fx; + HWND window; + D3DRECT d3drect; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get DirectDraw4 interface, hr %#x.\n", hr); + hr = IDirect3D3_CreateViewport(d3d, &viewport, NULL); + ok(SUCCEEDED(hr), "Failed to create a viewport, hr %#x.\n", hr); + IDirect3D3_Release(d3d); + + ds1 = get_depth_stencil(device); + + memset(&ddsd_new, 0, sizeof(ddsd_new)); + ddsd_new.dwSize = sizeof(ddsd_new); + memset(&ddsd_existing, 0, sizeof(ddsd_existing)); + ddsd_existing.dwSize = sizeof(ddsd_existing); + hr = IDirectDrawSurface4_GetSurfaceDesc(ds1, &ddsd_existing); + ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + ddsd_new.dwWidth = ddsd_existing.dwWidth; + ddsd_new.dwHeight = ddsd_existing.dwHeight; + U4(ddsd_new).ddpfPixelFormat = U4(ddsd_existing).ddpfPixelFormat; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd_new, &ds2, NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd_new, &ds3, NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + IDirectDraw4_Release(ddraw); + + hr = IDirect3DDevice3_AddViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); + memset(&vp_data, 0, sizeof(vp_data)); + vp_data.dwSize = sizeof(vp_data); + vp_data.dwWidth = ddsd_existing.dwWidth; + vp_data.dwHeight = ddsd_existing.dwHeight; + vp_data.dvMaxZ = 1.0; + vp_data.dvClipX = -1.0f; + vp_data.dvClipWidth = 2.0f; + vp_data.dvClipY = 1.0f; + vp_data.dvClipHeight = 2.0f; + hr = IDirect3DViewport3_SetViewport2(viewport, &vp_data); + ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "Failed to set the z function, hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + U1(d3drect).x1 = U2(d3drect).y1 = 0; + U3(d3drect).x2 = vp_data.dwWidth; U4(d3drect).y2 = vp_data.dwHeight; + hr = IDirect3DViewport3_Clear2(viewport, 1, &d3drect, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear the z buffer, hr %#x.\n", hr); + + /* Partial blit. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 0, 0, 320, 240); + hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Different locations. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 320, 240, 640, 480); + hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Streched. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Flipped. */ + SetRect(&src_rect, 0, 480, 640, 0); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDRECT, "Got unexpected hr %#x.\n", hr); + SetRect(&src_rect, 0, 0, 640, 480); + SetRect(&dst_rect, 0, 480, 640, 0); + hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDRECT, "Got unexpected hr %#x.\n", hr); + /* Full, explicit. */ + SetRect(&src_rect, 0, 0, 640, 480); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Depth -> color blit: Succeeds on Win7 + Radeon HD 5700, fails on WinXP + Radeon X1600 */ + + /* Depth blit inside a BeginScene / EndScene pair */ + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to start a scene, hr %#x.\n", hr); + /* From the current depth stencil */ + hr = IDirectDrawSurface4_Blt(ds2, NULL, ds1, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* To the current depth stencil */ + hr = IDirectDrawSurface4_Blt(ds1, NULL, ds2, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Between unbound surfaces */ + hr = IDirectDrawSurface4_Blt(ds3, NULL, ds2, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end a scene, hr %#x.\n", hr); + + /* Avoid changing the depth stencil, it doesn't work properly on Windows. + * Instead use DDBLT_DEPTHFILL to clear the depth stencil. Unfortunately + * drivers disagree on the meaning of dwFillDepth. Only 0 seems to produce + * a reliable result(z = 0.0) */ + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + hr = IDirectDrawSurface4_Blt(ds2, NULL, NULL, NULL, DDBLT_DEPTHFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to clear the source z buffer, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &d3drect, D3DCLEAR_ZBUFFER | D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear the color and z buffers, hr %#x.\n", hr); + SetRect(&dst_rect, 0, 0, 320, 240); + hr = IDirectDrawSurface4_Blt(ds1, &dst_rect, ds2, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface4_Release(ds3); + IDirectDrawSurface4_Release(ds2); + IDirectDrawSurface4_Release(ds1); + + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to start a scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, + quad1, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end a scene, hr %#x.\n", hr); + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + unsigned int x = 80 * ((2 * j) + 1); + unsigned int y = 60 * ((2 * i) + 1); + color = get_surface_color(rt, x, y); + ok(compare_color(color, expected_colors[i][j], 1), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); + } + } + IDirectDrawSurface4_Release(rt); + + hr = IDirect3DDevice3_DeleteViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to delete viewport from device, hr %#x.\n", hr); + IDirect3DViewport3_Release(viewport); + IDirect3DDevice3_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -1012,4 +1220,5 @@ START_TEST(ddraw4) test_coop_level_d3d_state(); test_surface_interface_mismatch(); test_coop_level_threaded(); + test_depth_blit(); }

1 0