May 2017 - Wine-commits - list.winehq.org

Michael Stefaniuc : dmime/tests: Use simpler variable names in test_InitAudio().
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: a306577803473fa5917b62ebd344c5cc0c6ed015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a306577803473fa5917b62ebd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 4 17:17:02 2017 +0200 dmime/tests: Use simpler variable names in test_InitAudio(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 48 ++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 90fd6ee..8531e38 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -33,56 +33,54 @@ DEFINE_GUID(GUID_Bunk,0xFFFFFFFF,0xFFFF,0xFFFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF static HRESULT test_InitAudio(void) { - IDirectMusicPerformance8 *idmusicperformance; - IDirectSound *pDirectSound; - IDirectMusicPort *pDirectMusicPort; - IDirectMusicAudioPath *pDirectMusicAudioPath; + IDirectMusicPerformance8 *performance; + IDirectSound *dsound; + IDirectMusicPort *port; + IDirectMusicAudioPath *path; HRESULT hr; - hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, - CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (LPVOID *)&idmusicperformance); + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicPerformance8, (void **)&performance); if (hr != S_OK) { skip("Cannot create DirectMusicPerformance object (%x)\n", hr); CoUninitialize(); return hr; } - pDirectSound = NULL; - hr = IDirectMusicPerformance8_InitAudio(idmusicperformance ,NULL, - &pDirectSound, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 128, DMUS_AUDIOF_ALL, NULL); + dsound = NULL; + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, + DMUS_APATH_SHARED_STEREOPLUSREVERB, 128, DMUS_AUDIOF_ALL, NULL); if(hr != S_OK) return hr; - pDirectMusicPort = NULL; - hr = IDirectMusicPerformance8_PChannelInfo(idmusicperformance, 0, &pDirectMusicPort, NULL, NULL); + port = NULL; + hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); ok(hr == S_OK, "Failed to call PChannelInfo (%x)\n", hr); - ok(pDirectMusicPort != NULL, "IDirectMusicPort not set\n"); - if (hr == S_OK && pDirectMusicPort != NULL) - IDirectMusicPort_Release(pDirectMusicPort); + ok(port != NULL, "IDirectMusicPort not set\n"); + if (hr == S_OK && port != NULL) + IDirectMusicPort_Release(port); - hr = IDirectMusicPerformance8_GetDefaultAudioPath(idmusicperformance, &pDirectMusicAudioPath); + hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &path); ok(hr == S_OK, "Failed to call GetDefaultAudioPath (%x)\n", hr); if (hr == S_OK) - IDirectMusicAudioPath_Release(pDirectMusicAudioPath); + IDirectMusicAudioPath_Release(path); - hr = IDirectMusicPerformance8_CloseDown(idmusicperformance); + hr = IDirectMusicPerformance8_CloseDown(performance); ok(hr == S_OK, "Failed to call CloseDown (%x)\n", hr); - IDirectMusicPerformance8_Release(idmusicperformance); + IDirectMusicPerformance8_Release(performance); - hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, - CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, - (void**)&idmusicperformance); + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicPerformance8, (void**)&performance); ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); - hr = IDirectMusicPerformance8_InitAudio(idmusicperformance, NULL, NULL, - NULL, 0, 64, 0, NULL); + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); - hr = IDirectMusicPerformance8_CloseDown(idmusicperformance); + hr = IDirectMusicPerformance8_CloseDown(performance); ok(hr == S_OK, "CloseDown failed: %08x\n", hr); - IDirectMusicPerformance8_Release(idmusicperformance); + IDirectMusicPerformance8_Release(performance); return S_OK; }

1 0

Michael Stefaniuc : dmime/tests: Add more InitAudio() tests.
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: f221298e610b334f02a30bcc86517c6e3dfb7dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f221298e610b334f02a30bcc8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 4 17:17:03 2017 +0200 dmime/tests: Add more InitAudio() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/Makefile.in | 2 +- dlls/dmime/tests/performance.c | 124 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 118 insertions(+), 8 deletions(-) diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in index 4d4e718..f4c4703 100644 --- a/dlls/dmime/tests/Makefile.in +++ b/dlls/dmime/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dmime.dll -IMPORTS = user32 ole32 +IMPORTS = user32 ole32 dsound C_SRCS = \ dmime.c \ diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 8531e38..0932cd9 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -31,13 +31,59 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(GUID_Bunk,0xFFFFFFFF,0xFFFF,0xFFFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF); +static void create_performance(IDirectMusicPerformance8 **performance, IDirectMusic **dmusic, + IDirectSound **dsound, BOOL set_cooplevel) +{ + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicPerformance8, (void **)performance); + ok(hr == S_OK, "DirectMusicPerformance create failed: %08x\n", hr); + if (dmusic) { + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, + (void **)dmusic); + ok(hr == S_OK, "DirectMusic create failed: %08x\n", hr); + } + if (dsound) { + hr = DirectSoundCreate8(NULL, (IDirectSound8 **)dsound, NULL); + ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + if (set_cooplevel) { + hr = IDirectSound_SetCooperativeLevel(*dsound, GetForegroundWindow(), DSSCL_PRIORITY); + ok(hr == S_OK, "SetCooperativeLevel failed: %08x\n", hr); + } + } +} + +static void destroy_performance(IDirectMusicPerformance8 *performance, IDirectMusic *dmusic, + IDirectSound *dsound) +{ + HRESULT hr; + + hr = IDirectMusicPerformance8_CloseDown(performance); + ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + IDirectMusicPerformance8_Release(performance); + if (dmusic) + IDirectMusic_Release(dmusic); + if (dsound) + IDirectSound_Release(dsound); +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static HRESULT test_InitAudio(void) { IDirectMusicPerformance8 *performance; + IDirectMusic *dmusic; IDirectSound *dsound; IDirectMusicPort *port; IDirectMusicAudioPath *path; HRESULT hr; + ULONG ref; hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void **)&performance); @@ -70,17 +116,81 @@ static HRESULT test_InitAudio(void) IDirectMusicPerformance8_Release(performance); - hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectMusicPerformance8, (void**)&performance); - ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); - + /* Auto generated dmusic and dsound */ + create_performance(&performance, NULL, NULL, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + destroy_performance(performance, NULL, NULL); + + /* dsound without SetCooperativeLevel() */ + create_performance(&performance, NULL, &dsound, FALSE); + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); + todo_wine ok(hr == DSERR_PRIOLEVELNEEDED, "InitAudio failed: %08x\n", hr); + destroy_performance(performance, NULL, dsound); + + /* Using the wrong CLSID_DirectSound */ + create_performance(&performance, NULL, NULL, FALSE); + hr = DirectSoundCreate(NULL, &dsound, NULL); + ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); + todo_wine ok(hr == E_NOINTERFACE, "InitAudio failed: %08x\n", hr); + destroy_performance(performance, NULL, dsound); + + /* Init() works with just a CLSID_DirectSound */ + create_performance(&performance, NULL, NULL, FALSE); + hr = DirectSoundCreate(NULL, &dsound, NULL); + ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + hr = IDirectSound_SetCooperativeLevel(dsound, GetForegroundWindow(), DSSCL_PRIORITY); + ok(hr == S_OK, "SetCooperativeLevel failed: %08x\n", hr); + hr = IDirectMusicPerformance8_Init(performance, NULL, dsound, NULL); + ok(hr == S_OK, "Init failed: %08x\n", hr); + destroy_performance(performance, NULL, dsound); - hr = IDirectMusicPerformance8_CloseDown(performance); - ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + /* Init() followed by InitAudio() */ + create_performance(&performance, NULL, &dsound, TRUE); + hr = IDirectMusicPerformance8_Init(performance, NULL, dsound, NULL); + ok(hr == S_OK, "Init failed: %08x\n", hr); + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); + ok(hr == DMUS_E_ALREADY_INITED, "InitAudio failed: %08x\n", hr); + destroy_performance(performance, NULL, dsound); - IDirectMusicPerformance8_Release(performance); + /* Provided dmusic and dsound */ + create_performance(&performance, &dmusic, &dsound, TRUE); + hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ref = get_refcount(dsound); + ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ref = get_refcount(dmusic); + ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + destroy_performance(performance, dmusic, dsound); + + /* Provided dmusic initialized with SetDirectSound */ + create_performance(&performance, &dmusic, &dsound, TRUE); + IDirectMusic_SetDirectSound(dmusic, dsound, NULL); + ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, NULL, NULL, 0, 64, 0, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ref = get_refcount(dmusic); + ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + destroy_performance(performance, dmusic, dsound); + + /* Provided dmusic and dsound, dmusic initialized with SetDirectSound */ + create_performance(&performance, &dmusic, &dsound, TRUE); + IDirectMusic_SetDirectSound(dmusic, dsound, NULL); + ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ref = get_refcount(dmusic); + ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + destroy_performance(performance, dmusic, dsound); return S_OK; }

1 0

Michael Stefaniuc : dmime: Properly use SetCooperativeLevel() on the dsound ifaces we create.
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: 9a90a3e8e505bb92ca80289c3896e28eff034dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a90a3e8e505bb92ca80289c3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 4 17:17:01 2017 +0200 dmime: Properly use SetCooperativeLevel() on the dsound ifaces we create. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 7e115bf..a0f70b0 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -256,10 +256,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init(IDirectMusicPerformance8 FIXME("(iface = %p, dmusic = %p, dsound = %p, hwnd = %p)\n", This, ppDirectMusic, pDirectSound, hWnd); if (This->pDirectMusic || This->pDirectSound) return DMUS_E_ALREADY_INITED; - - if (NULL == hWnd) { - hWnd = GetForegroundWindow(); - } if (NULL != pDirectSound) { This->pDirectSound = pDirectSound; @@ -268,12 +264,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init(IDirectMusicPerformance8 DirectSoundCreate8(NULL, (LPDIRECTSOUND8*) &This->pDirectSound, NULL); if (!This->pDirectSound) return DSERR_NODRIVER; - if (NULL != hWnd) { - IDirectSound8_SetCooperativeLevel(This->pDirectSound, hWnd, DSSCL_PRIORITY); - } else { - /* how to get the ForeGround window handle ? */ - /*IDirectSound8_SetCooperativeLevel(This->pDirectSound, hWnd, DSSCL_PRIORITY);*/ - } + if (!hWnd) + hWnd = GetForegroundWindow(); + IDirectSound_SetCooperativeLevel(This->pDirectSound, hWnd, DSSCL_PRIORITY); } if (NULL != ppDirectMusic && NULL != *ppDirectMusic) { @@ -917,6 +910,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform FIXME("return dsound(%p,%d)\n", dsound, hr); if (FAILED(hr) || !dsound) return DSERR_NODRIVER; + if (!hWnd) + hWnd = GetForegroundWindow(); + IDirectSound_SetCooperativeLevel(dsound, hWnd, DSSCL_PRIORITY); if (ppDirectSound) *ppDirectSound = dsound; }

1 0

Paul Gofman : d3dx9/tests: Factor out test_effect_preshader_compare_shader_bytecode() function.
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: f525c218967e116bf28c2858ec61c5eff17e8fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f525c218967e116bf28c2858e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 5 00:03:48 2017 +0200 d3dx9/tests: Factor out test_effect_preshader_compare_shader_bytecode() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 3e9d255..baa2a7a 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3987,6 +3987,33 @@ static const DWORD test_effect_preshader_effect_blob[] = #define TEST_EFFECT_PRESHADER_VSHADER_POS 2710 #define TEST_EFFECT_PRESHADER_VSHADER_LEN 13 +#define test_effect_preshader_compare_shader_bytecode(a, b, c, d) \ + test_effect_preshader_compare_shader_bytecode_(__LINE__, a, b, c, d) +static void test_effect_preshader_compare_shader_bytecode_(unsigned int line, + const DWORD *bytecode, unsigned int bytecode_size, int expected_shader_index, BOOL todo) +{ + unsigned int i = 0; + + todo_wine_if(todo) + ok_(__FILE__, line)(!!bytecode, "NULL shader bytecode.\n"); + + if (!bytecode) + return; + + while (bytecode[i++] != 0x0000ffff) + ; + + if (!bytecode_size) + bytecode_size = i * sizeof(*bytecode); + else + ok(i * sizeof(*bytecode) == bytecode_size, "Unexpected byte code size %u.\n", bytecode_size); + + todo_wine_if(todo) + ok_(__FILE__, line)(!memcmp(bytecode, &test_effect_preshader_effect_blob[TEST_EFFECT_PRESHADER_VSHADER_POS + + expected_shader_index * TEST_EFFECT_PRESHADER_VSHADER_LEN], bytecode_size), + "Incorrect shader selected.\n"); +} + #define test_effect_preshader_compare_shader(a, b, c) \ test_effect_preshader_compare_shader_(__LINE__, a, b, c) static void test_effect_preshader_compare_shader_(unsigned int line, IDirect3DDevice9 *device, @@ -4013,10 +4040,9 @@ static void test_effect_preshader_compare_shader_(unsigned int line, IDirect3DDe hr = IDirect3DVertexShader9_GetFunction(vshader, byte_code, &byte_code_size); ok_(__FILE__, line)(hr == D3D_OK, "Got result %#x.\n", hr); - todo_wine_if(todo) - ok_(__FILE__, line)(!memcmp(byte_code, &test_effect_preshader_effect_blob[TEST_EFFECT_PRESHADER_VSHADER_POS - + expected_shader_index * TEST_EFFECT_PRESHADER_VSHADER_LEN], byte_code_size), - "Incorrect shader selected.\n"); + test_effect_preshader_compare_shader_bytecode_(line, byte_code, + byte_code_size, expected_shader_index, todo); + HeapFree(GetProcessHeap(), 0, byte_code); IDirect3DVertexShader9_Release(vshader); }

1 0

Paul Gofman : d3dx9/tests: Add test for GetPassDesc() function.
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: 911f8ffaaeedf966f47663bf999b950520ffcf0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=911f8ffaaeedf966f47663bf9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu May 4 01:33:46 2017 +0300 d3dx9/tests: Add test for GetPassDesc() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index baa2a7a..8b2fb5d 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -6209,6 +6209,88 @@ static void test_effect_large_address_aware_flag(IDirect3DDevice9 *device) effect->lpVtbl->Release(effect); } +static void test_effect_get_pass_desc(IDirect3DDevice9 *device) +{ + unsigned int passes_count; + ID3DXEffect *effect; + D3DXPASS_DESC desc; + D3DXVECTOR4 fvect; + D3DXHANDLE pass; + HRESULT hr; + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + pass = effect->lpVtbl->GetPass(effect, "tech0", 1); + ok(!!pass, "GetPass() failed.\n"); + + hr = effect->lpVtbl->GetPassDesc(effect, pass, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + test_effect_preshader_compare_shader_bytecode(desc.pVertexShaderFunction, 0, 2, TRUE); + + fvect.x = fvect.y = fvect.w = 0.0f; + fvect.z = 0.0f; + hr = effect->lpVtbl->SetVector(effect, "g_iVect", &fvect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->GetPassDesc(effect, pass, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!desc.pPixelShaderFunction, "Unexpected non null desc.pPixelShaderFunction.\n"); + + test_effect_preshader_compare_shader_bytecode(desc.pVertexShaderFunction, 0, 0, TRUE); + + fvect.z = 3.0f; + hr = effect->lpVtbl->SetVector(effect, "g_iVect", &fvect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->GetPassDesc(effect, pass, &desc); + todo_wine + ok(hr == E_FAIL, "Got result %#x.\n", hr); + ok(!desc.pVertexShaderFunction, "Unexpected non null desc.pVertexShaderFunction.\n"); + + /* Repeating call to confirm GetPassDesc() returns same error on the second call, + * as it is not the case sometimes for BeginPass() with out of bound access. */ + hr = effect->lpVtbl->GetPassDesc(effect, pass, &desc); + todo_wine + ok(hr == E_FAIL, "Got result %#x.\n", hr); + ok(!desc.pVertexShaderFunction, "Unexpected non null desc.pVertexShaderFunction.\n"); + + hr = effect->lpVtbl->Begin(effect, &passes_count, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->GetPassDesc(effect, pass, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_compare_shader_bytecode(desc.pVertexShaderFunction, 0, 0, TRUE); + + fvect.z = 2.0f; + hr = effect->lpVtbl->SetVector(effect, "g_iVect", &fvect); + hr = effect->lpVtbl->GetPassDesc(effect, pass, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + test_effect_preshader_compare_shader_bytecode(desc.pVertexShaderFunction, 0, 2, TRUE); + + effect->lpVtbl->Release(effect); + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, D3DXFX_NOT_CLONEABLE, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + pass = effect->lpVtbl->GetPass(effect, "tech0", 1); + ok(!!pass, "GetPass() failed.\n"); + + hr = effect->lpVtbl->GetPassDesc(effect, pass, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ok(!desc.pVertexShaderFunction, "Unexpected non null desc.pVertexShaderFunction.\n"); + ok(!desc.pPixelShaderFunction, "Unexpected non null desc.pPixelShaderFunction.\n"); + + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { HWND wnd; @@ -6259,6 +6341,7 @@ START_TEST(effect) test_cross_effect_handle(device); test_effect_shared_parameters(device); test_effect_large_address_aware_flag(device); + test_effect_get_pass_desc(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Paul Gofman : d3dx9: Return shader functions in d3dx9_base_effect_get_pass_desc().
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: b7198efd42ad56ce587c8d608ea32068ea43fb72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7198efd42ad56ce587c8d608… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 5 00:03:50 2017 +0200 d3dx9: Return shader functions in d3dx9_base_effect_get_pass_desc(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 210 +++++++++++++++++++++++++------------------ dlls/d3dx9_36/tests/effect.c | 9 +- 2 files changed, 125 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7198efd42ad56ce587c8…

1 0

Huw Davies : comdlg32: Scale the control size limits with dpi.
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: 6df0198a2b069eee907d551b109f06f8a29ffc25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df0198a2b069eee907d551b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 4 19:31:34 2017 +0100 comdlg32: Scale the control size limits with dpi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index ccc9eb6..5d0c6e9 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -856,7 +856,7 @@ static inline customctrl *get_cctrl(FileDialogImpl *This, DWORD ctlid) static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multiline) { LPWSTR text; - UINT len, final_width; + UINT len, final_width, dpi; UINT lines, final_height; SIZE size; RECT rc; @@ -872,8 +872,12 @@ static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multili hdc = GetDC(hctrl); GetTextExtentPoint32W(hdc, text, lstrlenW(text), &size); + dpi = GetDeviceCaps(hdc, LOGPIXELSX); ReleaseDC(hctrl, hdc); + min_width = MulDiv(min_width, dpi, USER_DEFAULT_SCREEN_DPI); + max_width = MulDiv(max_width, dpi, USER_DEFAULT_SCREEN_DPI); + if(len && multiline) { /* FIXME: line-wrap */

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHEvalDirection().
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: 1d165b559f10d0212b2b77e5e433053d54aca958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d165b559f10d0212b2b77e5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 4 12:05:55 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHEvalDirection(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 93d31a7..6daad35 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2785,16 +2785,20 @@ static void test_D3DXSHEvalConeLight(void) static void test_D3DXSHEvalDirection(void) { + float a[49], expected, *received_ptr; unsigned int i, order; D3DXVECTOR3 d; - FLOAT a[49], expected[49], *received_ptr; - const FLOAT table[36] = - { 0.282095f, -0.977205f, 1.465808f, -0.488603f, 2.185097f, -6.555291f, - 8.200181f, -3.277646f, -1.638823f, 1.180087f, 17.343668f, -40.220032f, - 47.020218f, -20.110016f, -13.007751f, 6.490479f, -15.020058f, 10.620785f, - 117.325661f, -240.856750f, 271.657288f, -120.428375f, -87.994247f, 58.414314f, - -4.380850f, 24.942520f, -149.447693f, 78.278130f, 747.791748f, -1427.687866f, - 1574.619141, -713.843933f, -560.843811f, 430.529724, -43.588909, -26.911665, }; + BOOL equal; + + static const float table[36] = + { + 2.82094806e-01f, -9.77205038e-01f, 1.46580756e+00f, -4.88602519e-01f, 2.18509698e+00f, -6.55529118e+00f, + 8.20018101e+00f, -3.27764559e-00f, -1.63882279e+00f, 1.18008721e+00f, 1.73436680e+01f, -4.02200317e+01f, + 4.70202179e+01f, -2.01100159e+01f, -1.30077515e+01f, 6.49047947e+00f, -1.50200577e+01f, 1.06207848e+01f, + 1.17325661e+02f, -2.40856750e+02f, 2.71657288e+02f, -1.20428375e+02f, -8.79942474e+01f, 5.84143143e+01f, + -4.38084984e+00f, 2.49425201e+01f, -1.49447693e+02f, 7.82781296e+01f, 7.47791748e+02f, -1.42768787e+03f, + 1.57461914e+03f, -7.13843933e+02f, -5.60843811e+02f, 4.30529724e+02f, -4.35889091e+01f, -2.69116650e+01f, + }; d.x = 1.0; d.y = 2.0f; d.z = 3.0f; @@ -2808,13 +2812,17 @@ static void test_D3DXSHEvalDirection(void) for (i = 0; i < 49; i++) { - /* if the order is < D3DXSH_MINORDER or order > D3DXSH_MAXORDER or the index of the element is greater than order * order - 1, D3DXSHEvalDirection does not modify the output */ - if ( (order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER) || (i >= order * order) ) - expected[i] = 1.5f + i; + /* if the order is < D3DXSH_MINORDER or order > D3DXSH_MAXORDER or + * the index of the element is greater than order * order - 1, + * D3DXSHEvalDirection() does not modify the output. */ + if ((order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER) || (i >= order * order)) + expected = 1.5f + i; else - expected[i] = table[i]; + expected = table[i]; - ok(relative_error(a[i], expected[i]) < admitted_error, "order %u, index %u: expected %f, received %f\n", order, i, expected[i], a[i]); + equal = compare_float(a[i], expected, 2); + ok(equal, "order %u, index %u: Got unexpected result %.8e, expected %.8e.\n", + order, i, a[i], expected); } } }

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHEvalDirectionalLight().
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: f96a7743044a0e774acfc100717521356ea2bae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96a7743044a0e774acfc1007… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 4 12:05:56 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHEvalDirectionalLight(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 6daad35..f1468dc 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2829,9 +2829,14 @@ static void test_D3DXSHEvalDirection(void) static void test_D3DXSHEvalDirectionalLight(void) { + float *blue_out, bout[49], expected, gout[49], *green_out, *red_out, rout[49]; + unsigned int j, l, order, startindex; D3DXVECTOR3 dir; - FLOAT *blue_out, bout[49], expected, gout[49], *green_out, *red_out, rout[49]; - static const FLOAT table[] = { + HRESULT hr; + BOOL equal; + + static const float table[] = + { /* Red colour */ 2.008781f, -4.175174f, 9.602900f, -3.827243f, 1.417963f, -2.947181f, 6.778517f, -2.701583f, 7.249108f, -18.188671f, 34.643921f, -16.672949f, @@ -2880,13 +2885,15 @@ static void test_D3DXSHEvalDirectionalLight(void) 741.729919f, -1265.671997f, 2167.789307f, -1160.199219f, -64.620430f, 189.702820f, -49.132126f, 71.788422f, -78.964867f, -985.896790f, 4331.640625f, -6866.027344f, 11494.852539f, -6293.858398f, -377.377899f, 1283.391479f, -449.749817f, 45.826328f, }; - struct + const struct { - FLOAT *red_in, *green_in, *blue_in; - const FLOAT *red_out, *green_out, *blue_out; - FLOAT roffset, goffset, boffset; - } test[] = - { { rout, gout, bout, table, &table[90], &table[180], 1.01f, 1.02f, 1.03f, }, + float *red_in, *green_in, *blue_in; + const float *red_out, *green_out, *blue_out; + float roffset, goffset, boffset; + } + test[] = + { + { rout, gout, bout, table, &table[90], &table[180], 1.01f, 1.02f, 1.03f, }, { rout, rout, rout, &table[180], &table[180], &table[180], 1.03f, 1.03f, 1.03f, }, { rout, rout, bout, &table[90], &table[90], &table[180], 1.02f, 1.02f, 1.03f, }, { rout, gout, gout, table, &table[180], &table[180], 1.01f, 1.03f, 1.03f, }, @@ -2894,9 +2901,8 @@ static void test_D3DXSHEvalDirectionalLight(void) /* D3DXSHEvalDirectionaLight accepts NULL green or blue colour. */ { rout, NULL, bout, table, NULL, &table[180], 1.01f, 0.0f, 1.03f, }, { rout, gout, NULL, table, &table[90], NULL, 1.01f, 1.02f, 0.0f, }, - { rout, NULL, NULL, table, NULL, NULL, 1.01f, 0.0f, 0.0f, }, }; - HRESULT hr; - unsigned int j, l, order, startindex; + { rout, NULL, NULL, table, NULL, NULL, 1.01f, 0.0f, 0.0f, }, + }; dir.x = 1.1f; dir.y= 1.2f; dir.z = 2.76f; @@ -2928,8 +2934,9 @@ static void test_D3DXSHEvalDirectionalLight(void) expected = j + test[l].roffset; else expected = test[l].red_out[startindex + j]; - ok(relative_error(expected, red_out[j]) < admitted_error, - "Red: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, red_out[j]); + equal = compare_float(expected, red_out[j], 8); + ok(equal, "Red: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", + l, order, j, expected, red_out[j]); if ( green_out ) { @@ -2937,8 +2944,9 @@ static void test_D3DXSHEvalDirectionalLight(void) expected = j + test[l].goffset; else expected = test[l].green_out[startindex + j]; - ok(relative_error(expected, green_out[j]) < admitted_error, - "Green: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, green_out[j]); + equal = compare_float(expected, green_out[j], 8); + ok(equal, "Green: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", + l, order, j, expected, green_out[j]); } if ( blue_out ) @@ -2947,8 +2955,9 @@ static void test_D3DXSHEvalDirectionalLight(void) expected = j + test[l].boffset; else expected = test[l].blue_out[startindex + j]; - ok(relative_error(expected, blue_out[j]) < admitted_error, - "Blue: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, blue_out[j]); + equal = compare_float(expected, blue_out[j], 4); + ok(equal, "Blue: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", + l, order, j, expected, blue_out[j]); } }

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHEvalHemisphereLight().
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: 5fd1fb70f2709022e5f1c0acda712b89b63a2311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd1fb70f2709022e5f1c0acd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 4 12:05:57 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHEvalHemisphereLight(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 54 +++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index f1468dc..989d654 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2976,22 +2976,30 @@ static void test_D3DXSHEvalDirectionalLight(void) static void test_D3DXSHEvalHemisphereLight(void) { + float bout[49], expected, gout[49], rout[49]; + unsigned int j, l, order; D3DXCOLOR bottom, top; D3DXVECTOR3 dir; - FLOAT bout[49], expected, gout[49], rout[49]; - const FLOAT table[] = { - /* Red colour */ - 23.422981f, 15.859521f, -36.476898f, 14.537894f, - /* Green colour */ - 19.966694f, 6.096982f, -14.023058f, 5.588900f, - /* Blue colour */ - 24.566214f, 8.546826f, -19.657701f, 7.834591f, }; - struct + HRESULT hr; + BOOL equal; + + static const float table[] = + { + /* Red colour. */ + 23.422981f, 15.859521f, -36.476898f, 14.537894f, + /* Green colour. */ + 19.966694f, 6.096982f, -14.023058f, 5.588900f, + /* Blue colour. */ + 24.566214f, 8.546826f, -19.657701f, 7.834591f, + }; + const struct + { + float *red_received, *green_received, *blue_received; + const float *red_expected, *green_expected, *blue_expected; + const float roffset, goffset, boffset; + } + test[] = { - FLOAT *red_received, *green_received, *blue_received; - const FLOAT *red_expected, *green_expected, *blue_expected; - const FLOAT roffset, goffset, boffset; - } test[] = { { rout, gout, bout, table, &table[4], &table[8], 1.01f, 1.02f, 1.03f, }, { rout, rout, rout, &table[8], &table[8], &table[8], 1.03f, 1.03f, 1.03f, }, { rout, rout, bout, &table[4], &table[4], &table[8], 1.02f, 1.02f, 1.03f, }, @@ -3000,9 +3008,8 @@ static void test_D3DXSHEvalHemisphereLight(void) /* D3DXSHEvalHemisphereLight accepts NULL green or blue colour. */ { rout, NULL, bout, table, NULL, &table[8], 1.01f, 1.02f, 1.03f, }, { rout, gout, NULL, table, &table[4], NULL, 1.01f, 1.02f, 1.03f, }, - { rout, NULL, NULL, table, NULL, NULL, 1.01f, 1.02f, 1.03f, }, }; - HRESULT hr; - unsigned int j, l, order; + { rout, NULL, NULL, table, NULL, NULL, 1.01f, 1.02f, 1.03f, }, + }; dir.x = 1.1f; dir.y = 1.2f; dir.z = 2.76f; top.r = 0.1f; top.g = 2.1f; top.b = 2.3f; top.a = 4.3f; @@ -3031,8 +3038,9 @@ static void test_D3DXSHEvalHemisphereLight(void) expected = 0.0f; else expected = test[l].roffset + j; - ok(relative_error(test[l].red_received[j], expected) < admitted_error, - "Red: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, test[l].red_received[j]); + equal = compare_float(test[l].red_received[j], expected, 4); + ok(equal, "Red: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", + l, order, j, expected, test[l].red_received[j]); if (test[l].green_received) { @@ -3042,8 +3050,9 @@ static void test_D3DXSHEvalHemisphereLight(void) expected = 0.0f; else expected = test[l].goffset + j; - ok(relative_error(expected, test[l].green_received[j]) < admitted_error, - "Green: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, test[l].green_received[j]); + equal = compare_float(expected, test[l].green_received[j], 4); + ok(equal, "Green: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", + l, order, j, expected, test[l].green_received[j]); } if (test[l].blue_received) @@ -3054,8 +3063,9 @@ static void test_D3DXSHEvalHemisphereLight(void) expected = 0.0f; else expected = test[l].boffset + j; - ok(relative_error(expected, test[l].blue_received[j]) < admitted_error, - "Blue: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, test[l].blue_received[j]); + equal = compare_float(expected, test[l].blue_received[j], 4); + ok(equal, "Blue: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", + l, order, j, expected, test[l].blue_received[j]); } } }

1 0