June 2014 - Wine-commits - list.winehq.org

Andrei Slăvoiu : wined3d: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don' t support EXT_GPU_SHADER4.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: fbdf618251c7d9c3f01f53bc53266d081089361c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdf618251c7d9c3f01f53bc5… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Fri May 23 01:23:30 2014 +0300 wined3d: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don't support EXT_GPU_SHADER4. --- dlls/wined3d/directx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 224992d..d6bb3836 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1667,7 +1667,8 @@ static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) if (level == 8 && gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[ARB_VERTEX_SHADER]) level = 9; - if (level == 9 && gl_info->supported[EXT_GPU_SHADER4]) + if (level == 9 && (gl_info->supported[EXT_GPU_SHADER4] + || gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30))) level = 10; return level;

1 0

Michael Stefaniuc : dmusic: Return S_FALSE for the unimplemented IPersistStream_IsDirty().
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 5d7e93dc54d0b5ad86ad57ad7e8537ad0278d162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7e93dc54d0b5ad86ad57ad7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:06:00 2014 +0200 dmusic: Return S_FALSE for the unimplemented IPersistStream_IsDirty(). --- dlls/dmusic/collection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index acbc2a5..3d09815 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -499,7 +499,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetClassID(LPPER static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_IsDirty(LPPERSISTSTREAM iface) { - return E_NOTIMPL; + return S_FALSE; } static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTSTREAM iface, IStream* stream)

1 0

Michael Stefaniuc : dmusic/tests: Test unimplemented IPersistStream methods in DMCollection.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 3115e4901709c6ff9a49fb4bb591c31532e0a1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3115e4901709c6ff9a49fb4bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:08:34 2014 +0200 dmusic/tests: Test unimplemented IPersistStream methods in DMCollection. --- dlls/dmusic/tests/dmusic.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 528d182..b28a187 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -314,7 +314,10 @@ static void test_dmcoll(void) { IDirectMusicCollection *dmc; IDirectMusicObject *dmo; + IPersistStream *ps; DMUS_OBJECTDESC desc; + CLSID class; + ULARGE_INTEGER size; HRESULT hr; hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER, @@ -347,6 +350,18 @@ static void test_dmcoll(void) ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicCollection), "guidClass changed, should be CLSID_DirectMusicCollection\n"); + /* Unimplemented IPersistStream methods*/ + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + while (IDirectMusicCollection_Release(dmc)); }

1 0

Michael Stefaniuc : dmstyle/tests: Test some IPersistStream methods of DMStyle.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 834bae99359bf122a9d0fa4ac4b034699723162e URL: http://source.winehq.org/git/wine.git/?a=commit;h=834bae99359bf122a9d0fa4ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:10:43 2014 +0200 dmstyle/tests: Test some IPersistStream methods of DMStyle. --- dlls/dmstyle/tests/dmstyle.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 58c15eb..be9de42 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -208,6 +208,37 @@ static void test_COM_track(void) } } +static void test_dmstyle(void) +{ + IDirectMusicStyle *dms; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicStyle, (void**)&dms); + ok(hr == S_OK, "DirectMusicStyle create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicStyle_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicStyle), + "Expected class CLSID_DirectMusicStyle got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods*/ + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicStyle_Release(dms)); +} + START_TEST(dmstyle) { CoInitialize(NULL); @@ -221,6 +252,7 @@ START_TEST(dmstyle) test_COM(); test_COM_section(); test_COM_track(); + test_dmstyle(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmscript: IPersistStream_GetClassID() is not implemented for DMScript.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 444fff43437cb74e911b7d04c34eb1e0fd1848f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444fff43437cb74e911b7d04c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:12:40 2014 +0200 dmscript: IPersistStream_GetClassID() is not implemented for DMScript. --- dlls/dmscript/script.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index a7f26a6..872b7af 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -424,10 +424,9 @@ static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_Release (LPPERSISTSTRE } static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); - TRACE("(%p, %p)\n", This, pClassID); - *pClassID = CLSID_DirectMusicScript; - return S_OK; + TRACE("(%p, %p) method not implemented\n", iface, pClassID); + + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {

1 0

Michael Stefaniuc : dmscript/tests: Test unimplemented IPersistStream methods in DMScript.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 41b1dce0e241684d11a31b54be046d3abbd5b08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b1dce0e241684d11a31b54b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:41:10 2014 +0200 dmscript/tests: Test unimplemented IPersistStream methods in DMScript. --- dlls/dmscript/script.c | 2 -- dlls/dmscript/tests/dmscript.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 872b7af..6b9be6f 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -430,8 +430,6 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSIS } static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); - FIXME("(%p): stub, always S_FALSE\n", This); return S_FALSE; } diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index b2912a4..204cf7c 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -175,6 +175,33 @@ static void test_COM_scripttrack(void) while (IDirectMusicTrack_Release(dmt)); } +static void test_dmscript(void) +{ + IDirectMusicScript *dms; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicScript, (void**)&dms); + ok(hr == S_OK, "DirectMusicScript create failed: %08x, expected S_OK\n", hr); + + /* Unimplemented IPersistStream methods */ + hr = IDirectMusicScript_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicScript_Release(dms)); +} + START_TEST(dmscript) { CoInitialize(NULL); @@ -187,6 +214,7 @@ START_TEST(dmscript) } test_COM(); test_COM_scripttrack(); + test_dmscript(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmband/tests: Test some IPersistStream methods of DMBand.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 32699d6f6664cf9532f2961729aedb033239cee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32699d6f6664cf9532f296172… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:43:14 2014 +0200 dmband/tests: Test some IPersistStream methods of DMBand. --- dlls/dmband/tests/dmband.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 60dbaca..cfbf34d 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -146,6 +146,33 @@ static void test_COM_bandtrack(void) while (IDirectMusicTrack_Release(dmbt)); } +static void test_dmband(void) +{ + IDirectMusicBand *dmb; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicBand, (void**)&dmb); + ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + + /* Unimplemented IPersistStream methods */ + hr = IDirectMusicBand_QueryInterface(dmb, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicBand_Release(dmb)); +} + START_TEST(dmband) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -159,6 +186,7 @@ START_TEST(dmband) test_COM(); test_COM_bandtrack(); + test_dmband(); CoUninitialize(); }

1 0

Michael Stefaniuc : dswave/tests: Test some IPersistStream methods of DirectSoundWave.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 0ade62e03c62fb97e37eeec3aae932bec12a1df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ade62e03c62fb97e37eeec3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:43:58 2014 +0200 dswave/tests: Test some IPersistStream methods of DirectSoundWave. --- dlls/dswave/tests/dswave.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index 154c899..1a96548 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -86,6 +86,37 @@ static void test_COM(void) while (IDirectMusicObject_Release(dmo)); } +static void test_dswave(void) +{ + IDirectMusicObject *dmo; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectSoundWave, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "DirectSoundWave create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectSoundWave), + "Expected class CLSID_DirectSoundWave got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicObject_Release(dmo)); +} + START_TEST(dswave) { CoInitialize(NULL); @@ -97,6 +128,7 @@ START_TEST(dswave) return; } test_COM(); + test_dswave(); CoUninitialize(); }

1 0