April 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : libwine: Make cfi annotations optional for x86_64.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: fd9c41ed20018c4070ea8e2fa96fbbb0e7208a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9c41ed20018c4070ea8e2fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 12 12:37:35 2010 +0200 libwine: Make cfi annotations optional for x86_64. --- libs/wine/port.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index ce32653..f4ad2e9 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -139,20 +139,20 @@ __declspec(naked) int wine_call_on_stack( int (*func)(void *), void *arg, void * #elif defined(__x86_64__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack, "pushq %rbp\n\t" - ".cfi_adjust_cfa_offset 8\n\t" - ".cfi_rel_offset %rbp,0\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" - ".cfi_def_cfa_register %rbp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "movq %rdi,%rax\n\t" /* func */ "movq %rsi,%rdi\n\t" /* arg */ "andq $~15,%rdx\n\t" /* stack */ "movq %rdx,%rsp\n\t" "callq *%rax\n\t" /* call func */ "movq %rbp,%rsp\n\t" - ".cfi_def_cfa_register %rsp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t" - ".cfi_adjust_cfa_offset -8\n\t" - ".cfi_same_value %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") #elif defined(__powerpc__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack,

1 0

Alexandre Julliard : ntdll: Make cfi annotations optional for x86_64.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 281f70188001885e214dd644e3d6baeff2942644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=281f70188001885e214dd644e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 12 12:38:27 2010 +0200 ntdll: Make cfi annotations optional for x86_64. --- dlls/ntdll/relay.c | 20 ++++++++++---------- dlls/ntdll/signal_x86_64.c | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index ee042de..95575bb 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -353,14 +353,14 @@ __ASM_GLOBAL_FUNC( call_entry_point, #else __ASM_GLOBAL_FUNC( call_entry_point, "pushq %rbp\n\t" - ".cfi_adjust_cfa_offset 8\n\t" - ".cfi_rel_offset %rbp,0\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" - ".cfi_def_cfa_register %rbp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "pushq %rsi\n\t" - ".cfi_rel_offset %rsi,-8\n\t" + __ASM_CFI(".cfi_rel_offset %rsi,-8\n\t") "pushq %rdi\n\t" - ".cfi_rel_offset %rdi,-16\n\t" + __ASM_CFI(".cfi_rel_offset %rdi,-16\n\t") "movq %rcx,%rax\n\t" "movq $4,%rcx\n\t" "cmp %rcx,%rdx\n\t" @@ -378,13 +378,13 @@ __ASM_GLOBAL_FUNC( call_entry_point, "callq *%rax\n\t" "leaq -16(%rbp),%rsp\n\t" "popq %rdi\n\t" - ".cfi_same_value %rdi\n\t" + __ASM_CFI(".cfi_same_value %rdi\n\t") "popq %rsi\n\t" - ".cfi_same_value %rsi\n\t" - ".cfi_def_cfa_register %rsp\n\t" + __ASM_CFI(".cfi_same_value %rsi\n\t") + __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t" - ".cfi_adjust_cfa_offset -8\n\t" - ".cfi_same_value %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") #endif diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 4900b43..688cafb 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1610,10 +1610,10 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); __ASM_GLOBAL_FUNC( raise_func_trampoline, - ".cfi_signal_frame\n\t" - ".cfi_def_cfa %rbp,144\n\t" /* red zone + rip + rbp */ - ".cfi_rel_offset %rip,8\n\t" - ".cfi_rel_offset %rbp,0\n\t" + __ASM_CFI(".cfi_signal_frame\n\t") + __ASM_CFI(".cfi_def_cfa %rbp,144\n\t") /* red zone + rip + rbp */ + __ASM_CFI(".cfi_rel_offset %rip,8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "call *%rdx\n\t" "int $3") @@ -2975,14 +2975,14 @@ void call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg, void *frame ) extern void DECLSPEC_NORETURN call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ); __ASM_GLOBAL_FUNC( call_thread_entry_point, "subq $8,%rsp\n\t" - ".cfi_adjust_cfa_offset 8\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") "movq %rsp,%rdx\n\t" "call " __ASM_NAME("call_thread_func") ); extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame ); __ASM_GLOBAL_FUNC( call_thread_exit_func, "subq $8,%rsp\n\t" - ".cfi_adjust_cfa_offset 8\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") "movq %rdx,%rsp\n\t" "call *%rsi" );

1 0

Christian Costa : mciqtz32: Only call CoUninitialize when CoInitializeEx succeeds.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 0d1cba8e4f1dbe0dd9c693da80e243fc29e2cdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1cba8e4f1dbe0dd9c693da8… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 12 11:21:27 2010 +0200 mciqtz32: Only call CoUninitialize when CoInitializeEx succeeds. --- dlls/mciqtz32/mciqtz.c | 9 ++++++--- dlls/mciqtz32/mciqtz_private.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index b98e163..c826de1 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -153,7 +153,8 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); - CoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + wma->uninit = SUCCEEDED(hr); hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&wma->pgraph); if (FAILED(hr)) { @@ -197,7 +198,8 @@ err: IMediaControl_Release(wma->pmctrl); wma->pmctrl = NULL; - CoUninitialize(); + if (wma->uninit) + CoUninitialize(); return MCIERR_INTERNAL; } @@ -220,7 +222,8 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP if (wma->opened) { IGraphBuilder_Release(wma->pgraph); IMediaControl_Release(wma->pmctrl); - CoUninitialize(); + if (wma->uninit) + CoUninitialize(); wma->opened = FALSE; } diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index dcfcad0..caf80de 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -28,6 +28,7 @@ typedef struct { MCIDEVICEID wDevID; BOOL opened; + BOOL uninit; IGraphBuilder* pgraph; IMediaControl* pmctrl; BOOL started;

1 0

Maarten Lankhorst : mmdevapi: Blacklist alsa hw devices.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: e9f520467d089becc7e5f30230b397c0b2e4c49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f520467d089becc7e5f3023… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 12 11:59:59 2010 +0200 mmdevapi: Blacklist alsa hw devices. --- dlls/mmdevapi/devenum.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b593eb6..9619aa6 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -732,11 +732,18 @@ static void openal_setformat(MMDevice *This, DWORD freq) } } +static int blacklist(const char *dev) { + if (strstr(dev, "ALSA") && strstr(dev, "hw:")) + return 1; + return 0; +} + static void openal_scanrender(void) { WCHAR name[MAX_PATH]; ALCdevice *dev; const ALCchar *devstr, *defaultstr; + int defblacklisted; EnterCriticalSection(&openal_crst); if (palcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT")) { defaultstr = palcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER); @@ -745,12 +752,20 @@ static void openal_scanrender(void) defaultstr = palcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER); devstr = palcGetString(NULL, ALC_DEVICE_SPECIFIER); } - if (devstr && *devstr) - do { + defblacklisted = blacklist(defaultstr); + if (defblacklisted) + WARN("Disabling blacklist because %s is blacklisted\n", defaultstr); + if (devstr) + for (; *devstr; devstr += strlen(devstr)+1) { MMDevice *mmdev; MultiByteToWideChar( CP_UNIXCP, 0, devstr, -1, name, sizeof(name)/sizeof(*name)-1 ); name[sizeof(name)/sizeof(*name)-1] = 0; + /* Only enable blacklist if the default device isn't blacklisted */ + if (!defblacklisted && blacklist(devstr)) { + WARN("Not adding %s: device is blacklisted\n", devstr); + continue; + } TRACE("Adding %s\n", devstr); dev = palcOpenDevice(devstr); MMDevice_Create(&mmdev, name, NULL, eRender, dev ? DEVICE_STATE_ACTIVE : DEVICE_STATE_NOTPRESENT, !strcmp(devstr, defaultstr)); @@ -763,8 +778,7 @@ static void openal_scanrender(void) } else WARN("Could not open device: %04x\n", palcGetError(NULL)); - devstr += strlen(devstr)+1; - } while (*devstr); + } LeaveCriticalSection(&openal_crst); } @@ -773,16 +787,24 @@ static void openal_scancapture(void) WCHAR name[MAX_PATH]; ALCdevice *dev; const ALCchar *devstr, *defaultstr; + int defblacklisted; EnterCriticalSection(&openal_crst); devstr = palcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER); defaultstr = palcGetString(NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER); + defblacklisted = blacklist(defaultstr); + if (defblacklisted) + WARN("Disabling blacklist because %s is blacklisted\n", defaultstr); if (devstr && *devstr) - do { + for (; *devstr; devstr += strlen(devstr)+1) { ALint freq = 44100; MultiByteToWideChar( CP_UNIXCP, 0, devstr, -1, name, sizeof(name)/sizeof(*name)-1 ); name[sizeof(name)/sizeof(*name)-1] = 0; + if (!defblacklisted && blacklist(devstr)) { + WARN("Not adding %s: device is blacklisted\n", devstr); + continue; + } TRACE("Adding %s\n", devstr); dev = palcCaptureOpenDevice(devstr, freq, AL_FORMAT_MONO16, 65536); MMDevice_Create(NULL, name, NULL, eCapture, dev ? DEVICE_STATE_ACTIVE : DEVICE_STATE_NOTPRESENT, !strcmp(devstr, defaultstr)); @@ -790,8 +812,7 @@ static void openal_scancapture(void) palcCaptureCloseDevice(dev); else WARN("Could not open device: %04x\n", palcGetError(NULL)); - devstr += strlen(devstr)+1; - } while (*devstr); + } LeaveCriticalSection(&openal_crst); } #endif /*HAVE_OPENAL*/

1 0

Jörg Höhle : winmm: MCI system commands are not eligible for auto-open.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: b84576fcefc7952798ae977aa9c49ec3a3c0d035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84576fcefc7952798ae977aa… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 28 20:34:03 2010 +0200 winmm: MCI system commands are not eligible for auto-open. --- dlls/winmm/mci.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index cde8c88..cef3872 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1232,8 +1232,10 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, LPCWSTR lpCmd = 0; static const WCHAR wszNew[] = {'n','e','w',0}; static const WCHAR wszSAliasS[] = {' ','a','l','i','a','s',' ',0}; - static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; + static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; static const WCHAR wszSysinfo[] = {'s','y','s','i','n','f','o',0}; + static const WCHAR wszSound[] = {'s','o','u','n','d',0}; + static const WCHAR wszBreak[] = {'b','r','e','a','k',0}; TRACE("(%s, %p, %d, %p)\n", debugstr_w(lpstrCommand), lpstrRet, uRetLen, hwndCallback); @@ -1341,6 +1343,8 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, if (wmd) data[4] = wmd->wType; } + } else if (!strcmpW(verb, wszSound) || !strcmpW(verb, wszBreak)) { + /* Prevent auto-open for system commands. */ } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev)))) { /* auto open */ static const WCHAR wszOpenWait[] = {'o','p','e','n',' ','%','s',' ','w','a','i','t',0}; @@ -1882,11 +1886,10 @@ static DWORD MCI_Break(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpParms) DWORD dwRet = 0; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + FIXME("(%04x) vkey %04X stub\n", dwFlags, lpParms->nVirtKey); - if (dwFlags & MCI_NOTIFY) - mciDriverNotify((HWND)lpParms->dwCallback, wDevID, - (dwRet == 0) ? MCI_NOTIFY_SUCCESSFUL : MCI_NOTIFY_FAILURE); - + if (MMSYSERR_NOERROR==dwRet && (dwFlags & MCI_NOTIFY)) + mciDriverNotify((HWND)lpParms->dwCallback, wDevID, MCI_NOTIFY_SUCCESSFUL); return dwRet; } @@ -1903,10 +1906,9 @@ static DWORD MCI_Sound(UINT wDevID, DWORD dwFlags, LPMCI_SOUND_PARMSW lpParms) dwRet = sndPlaySoundW(lpParms->lpstrSoundName, SND_SYNC) ? MMSYSERR_NOERROR : MMSYSERR_ERROR; else dwRet = MMSYSERR_ERROR; /* what should be done ??? */ - if (dwFlags & MCI_NOTIFY) - mciDriverNotify((HWND)lpParms->dwCallback, wDevID, - (dwRet == 0) ? MCI_NOTIFY_SUCCESSFUL : MCI_NOTIFY_FAILURE); + if (MMSYSERR_NOERROR==dwRet && (dwFlags & MCI_NOTIFY)) + mciDriverNotify((HWND)lpParms->dwCallback, wDevID, MCI_NOTIFY_SUCCESSFUL); return dwRet; }

1 0

Henri Verbeet : d3d9/tests: Add some depth buffer tests.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 6ecdad06a3e92e4e2fe23b52dc9305a1c7419c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ecdad06a3e92e4e2fe23b52d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 11 21:47:45 2010 +0200 d3d9/tests: Add some depth buffer tests. --- dlls/d3d9/tests/visual.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 130 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2695b46..173de96 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10853,6 +10853,135 @@ static void depth_clamp_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); } +static void depth_buffer_test(IDirect3DDevice9 *device) +{ + static const struct vertex quad1[] = + { + { -1.0, 1.0, 0.33f, 0xff00ff00}, + { 1.0, 1.0, 0.33f, 0xff00ff00}, + { -1.0, -1.0, 0.33f, 0xff00ff00}, + { 1.0, -1.0, 0.33f, 0xff00ff00}, + }; + static const struct vertex quad2[] = + { + { -1.0, 1.0, 0.50f, 0xffff00ff}, + { 1.0, 1.0, 0.50f, 0xffff00ff}, + { -1.0, -1.0, 0.50f, 0xffff00ff}, + { 1.0, -1.0, 0.50f, 0xffff00ff}, + }; + static const struct vertex quad3[] = + { + { -1.0, 1.0, 0.66f, 0xffff0000}, + { 1.0, 1.0, 0.66f, 0xffff0000}, + { -1.0, -1.0, 0.66f, 0xffff0000}, + { 1.0, -1.0, 0.66f, 0xffff0000}, + }; + static const DWORD expected_colors[4][4] = + { + {0x000000ff, 0x000000ff, 0x0000ff00, 0x00ff0000}, + {0x000000ff, 0x000000ff, 0x0000ff00, 0x00ff0000}, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x00ff0000}, + {0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000}, + }; + + IDirect3DSurface9 *backbuffer, *rt1, *rt2, *rt3; + unsigned int i, j; + D3DVIEWPORT9 vp; + D3DCOLOR color; + HRESULT hr; + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuffer); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 320, 240, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt1, NULL); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 480, 360, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt2, NULL); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt3, NULL); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt3); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt1); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt2); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + IDirect3DSurface9_Release(backbuffer); + IDirect3DSurface9_Release(rt3); + IDirect3DSurface9_Release(rt2); + IDirect3DSurface9_Release(rt1); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(*quad1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, sizeof(*quad3)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, 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 = getPixelColor(device, x, y); + ok(color_match(color, expected_colors[i][j], 0), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); + } + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -11021,6 +11150,7 @@ START_TEST(visual) texop_range_test(device_ptr); alphareplicate_test(device_ptr); dp3_alpha_test(device_ptr); + depth_buffer_test(device_ptr); cleanup: if(device_ptr) {

1 0

Henri Verbeet : d3d8/tests: Add some depth buffer tests.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 51ccd69e7c3a1e86a0884d600e8b74abaca79540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ccd69e7c3a1e86a0884d600… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 11 21:47:46 2010 +0200 d3d8/tests: Add some depth buffer tests. --- dlls/d3d8/tests/visual.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 136 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index dd4d372..42f5f21 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1286,6 +1286,8 @@ static void texop_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); } + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "SetTexture failed with 0x%08x\n", hr); if (texture) IDirect3DTexture8_Release(texture); } @@ -1421,6 +1423,139 @@ static void depth_clamp_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); } +static void depth_buffer_test(IDirect3DDevice8 *device) +{ + static const struct vertex quad1[] = + { + { -1.0, 1.0, 0.33f, 0xff00ff00}, + { 1.0, 1.0, 0.33f, 0xff00ff00}, + { -1.0, -1.0, 0.33f, 0xff00ff00}, + { 1.0, -1.0, 0.33f, 0xff00ff00}, + }; + static const struct vertex quad2[] = + { + { -1.0, 1.0, 0.50f, 0xffff00ff}, + { 1.0, 1.0, 0.50f, 0xffff00ff}, + { -1.0, -1.0, 0.50f, 0xffff00ff}, + { 1.0, -1.0, 0.50f, 0xffff00ff}, + }; + static const struct vertex quad3[] = + { + { -1.0, 1.0, 0.66f, 0xffff0000}, + { 1.0, 1.0, 0.66f, 0xffff0000}, + { -1.0, -1.0, 0.66f, 0xffff0000}, + { 1.0, -1.0, 0.66f, 0xffff0000}, + }; + static const DWORD expected_colors[4][4] = + { + {0x000000ff, 0x000000ff, 0x0000ff00, 0x00ff0000}, + {0x000000ff, 0x000000ff, 0x0000ff00, 0x00ff0000}, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x00ff0000}, + {0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000}, + }; + + IDirect3DSurface8 *backbuffer, *rt1, *rt2, *rt3; + IDirect3DSurface8 *depth_stencil; + unsigned int i, j; + D3DVIEWPORT8 vp; + D3DCOLOR color; + HRESULT hr; + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + + hr = IDirect3DDevice8_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &depth_stencil); + ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderTarget(device, &backbuffer); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateRenderTarget(device, 320, 240, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, FALSE, &rt1); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateRenderTarget(device, 480, 360, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, FALSE, &rt2); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, FALSE, &rt3); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt3, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt1, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt2, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + IDirect3DSurface8_Release(depth_stencil); + IDirect3DSurface8_Release(backbuffer); + IDirect3DSurface8_Release(rt3); + IDirect3DSurface8_Release(rt2); + IDirect3DSurface8_Release(rt1); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(*quad1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, sizeof(*quad3)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, 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 = getPixelColor(device, x, y); + ok(color_match(color, expected_colors[i][j], 0), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); + } + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -1495,6 +1630,7 @@ START_TEST(visual) p8_texture_test(device_ptr); texop_test(device_ptr); + depth_buffer_test(device_ptr); cleanup: if(device_ptr) {

1 0

Henri Verbeet : wined3d: Fix a GL extension prototype.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 5f7e087644beb50c9ea287a590ea1526327e5adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7e087644beb50c9ea287a59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 11 21:47:47 2010 +0200 wined3d: Fix a GL extension prototype. --- dlls/wined3d/wined3d_gl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b529c52..0fd7fb0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3919,7 +3919,7 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma glUniform3iARB, ARB_SHADER_OBJECTS, NULL) \ USE_GL_FUNC(WINED3D_PFNGLUNIFORM4IARBPROC, \ glUniform4iARB, ARB_SHADER_OBJECTS, NULL) \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM1IARBPROC, \ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM1FARBPROC, \ glUniform1fARB, ARB_SHADER_OBJECTS, NULL) \ USE_GL_FUNC(WINED3D_PFNGLUNIFORM2FARBPROC, \ glUniform2fARB, ARB_SHADER_OBJECTS, NULL) \

1 0

Henri Verbeet : wined3d: Don't write past the end of the buffer' s conversion_map.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: a4fad54134ec8f547218b61e2a20e87c6692ceaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fad54134ec8f547218b61e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 11 21:47:48 2010 +0200 wined3d: Don't write past the end of the buffer's conversion_map. --- dlls/wined3d/buffer.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8bb1f63..a8fc0d1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -275,12 +275,13 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This, attrib_size = attrib->format_desc->component_count * attrib->format_desc->component_size; for (i = 0; i < attrib_size; ++i) { - if (This->conversion_map[data + i] != conversion_type) + DWORD_PTR idx = (data + i) % This->stride; + if (This->conversion_map[idx] != conversion_type) { - TRACE("Byte %ld in vertex changed\n", i + data); - TRACE("It was type %d, is %d now\n", This->conversion_map[data + i], conversion_type); + TRACE("Byte %ld in vertex changed\n", idx); + TRACE("It was type %d, is %d now\n", This->conversion_map[idx], conversion_type); ret = TRUE; - This->conversion_map[data + i] = conversion_type; + This->conversion_map[idx] = conversion_type; } }

1 0

Henri Verbeet : winex11.drv: Allow OpenGL on minimized windows.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 3255b21456622769c783db8350d70fab38b04005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3255b21456622769c783db835… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 11 21:47:49 2010 +0200 winex11.drv: Allow OpenGL on minimized windows. --- dlls/opengl32/tests/opengl.c | 70 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 12 +++--- 2 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index b2d8e18..d0eb24f 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -650,6 +650,75 @@ static void test_opengl3(HDC hdc) } } +static void test_minimized(void) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window; + LONG style; + HGLRC ctx; + BOOL ret; + HDC dc; + + window = CreateWindowA("static", "opengl32_test", + WS_POPUP | WS_MINIMIZE, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create window, last error %#x.\n", GetLastError()); + + dc = GetDC(window); + ok(!!dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window, dc); + DestroyWindow(window); + return; + } + + ret = SetPixelFormat(dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + style = GetWindowLongA(window, GWL_STYLE); + ok(style & WS_MINIMIZE, "Window should be minimized, got style %#x.\n", style); + + ctx = wglCreateContext(dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + style = GetWindowLongA(window, GWL_STYLE); + ok(style & WS_MINIMIZE, "window should be minimized, got style %#x.\n", style); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window, dc); + DestroyWindow(window); +} + START_TEST(opengl) { HWND hwnd; @@ -704,6 +773,7 @@ START_TEST(opengl) res = SetPixelFormat(hdc, iPixelFormat, &pfd); ok(res, "SetPixelformat failed: %x\n", GetLastError()); + test_minimized(); test_dc(hwnd, hdc); hglrc = wglCreateContext(hdc); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ef197ca..a9a3769 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1951,16 +1951,16 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, escape.pixmap = 0; escape.gl_copy = FALSE; - if (top == hwnd && data && IsIconic( hwnd ) && data->icon_window) - { - escape.drawable = data->icon_window; - } - else if (top == hwnd) + if (top == hwnd) { escape.fbconfig_id = data ? data->fbconfig_id : (XID)GetPropA( hwnd, fbconfig_id_prop ); /* GL draws to the client area even for window DCs */ escape.gl_drawable = data ? data->client_window : X11DRV_get_client_window( hwnd ); - if (flags & DCX_WINDOW) + if (data && IsIconic( hwnd ) && data->icon_window) + { + escape.drawable = data->icon_window; + } + else if (flags & DCX_WINDOW) escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd ); else escape.drawable = escape.gl_drawable;

1 0