January 2014 - Wine-Commits

Dmitry Timoshkov : advapi32/tests: Add tests for access 0 mapping.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: df5affc13f54a1d9cb8b942df515a30b4ac69e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5affc13f54a1d9cb8b942df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:25:53 2014 +0900 advapi32/tests: Add tests for access 0 mapping. --- dlls/advapi32/tests/security.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9f1e611..57ad4ce 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4529,6 +4529,7 @@ static void test_mutex_security(HANDLE token) int todo, generic, mapped; } map[] = { + { 0, 0, 0 }, { 1, GENERIC_READ, STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE }, { 0, GENERIC_WRITE, STANDARD_RIGHTS_WRITE }, { 0, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, @@ -4582,6 +4583,7 @@ static void test_event_security(HANDLE token) int todo, generic, mapped; } map[] = { + { 0, 0, 0 }, { 1, GENERIC_READ, STANDARD_RIGHTS_READ | EVENT_QUERY_STATE }, { 1, GENERIC_WRITE, STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE }, { 1, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, @@ -4635,6 +4637,7 @@ static void test_semaphore_security(HANDLE token) int todo, generic, mapped; } map[] = { + { 0, 0, 0 }, { 1, GENERIC_READ, STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE }, { 0, GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE }, { 1, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, @@ -4689,6 +4692,7 @@ static void test_named_pipe_security(HANDLE token) int todo, generic, mapped; } map[] = { + { 0, 0, 0 }, { 1, GENERIC_READ, FILE_GENERIC_READ }, { 1, GENERIC_WRITE, FILE_GENERIC_WRITE }, { 1, GENERIC_EXECUTE, FILE_GENERIC_EXECUTE }, @@ -4765,6 +4769,7 @@ static void test_file_security(HANDLE token) int generic, mapped; } map[] = { + { 0, 0 }, { GENERIC_READ, FILE_GENERIC_READ }, { GENERIC_WRITE, FILE_GENERIC_WRITE }, { GENERIC_EXECUTE, FILE_GENERIC_EXECUTE },

1 0

Michael Stefaniuc : dmime/tests: Move the unrelated COM test out of performance.c.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: d4861c07c46bad1001274daf201a77af42747fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4861c07c46bad1001274daf2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 10:42:57 2014 +0100 dmime/tests: Move the unrelated COM test out of performance.c. --- dlls/dmime/tests/Makefile.in | 1 + dlls/dmime/tests/dmime.c | 106 ++++++++++++++++++++++++++++++++++++++++ dlls/dmime/tests/performance.c | 51 ------------------- 3 files changed, 107 insertions(+), 51 deletions(-) diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in index 10793cf..4d4e718 100644 --- a/dlls/dmime/tests/Makefile.in +++ b/dlls/dmime/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = dmime.dll IMPORTS = user32 ole32 C_SRCS = \ + dmime.c \ performance.c diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c new file mode 100644 index 0000000..185d76f --- /dev/null +++ b/dlls/dmime/tests/dmime.c @@ -0,0 +1,106 @@ +/* + * Copyright 2012, 2014 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <windef.h> +#include <wine/test.h> +#include <dmusici.h> + +static BOOL missing_dmime(void) +{ + IDirectMusicSegment8 *dms; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment, (void**)&dms); + + if (hr == S_OK && dms) + { + IDirectMusicSegment_Release(dms); + return FALSE; + } + return TRUE; +} + +static void test_COM_segment(void) +{ + IDirectMusicSegment8 *dms = (IDirectMusicSegment8*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *stream; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicSegment, (IUnknown*)&dms, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dms); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicSegment create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dms, "dms = %p\n", dms); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectSound, (void**)&dms); + ok(hr == E_NOINTERFACE, + "DirectMusicSegment create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount */ + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment8, (void**)&dms); + if (hr == E_NOINTERFACE) { + win_skip("DirectMusicSegment without IDirectMusicSegment8\n"); + return; + } + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicSegment8_AddRef(dms); + ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + IDirectMusicSegment8_AddRef(dms); + refcount = IDirectMusicSegment8_Release(dms); + ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IPersistStream, (void**)&stream); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IDirectMusicSegment8_Release(dms); + ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_Release(unk); + ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + refcount = IPersistStream_Release(stream); + ok (refcount == 1, "refcount == %u, expected 1\n", refcount); + refcount = IDirectMusicSegment8_Release(dms); + ok (refcount == 0, "refcount == %u, expected 0\n", refcount); +} + +START_TEST(dmime) +{ + CoInitialize(NULL); + + if (missing_dmime()) + { + skip("dmime not available\n"); + CoUninitialize(); + return; + } + test_COM_segment(); + + CoUninitialize(); +} diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index d0d5079..591ae1f 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -255,55 +255,6 @@ static void test_COM(void) ok (refcount == 0, "refcount == %u, expected 0\n", refcount); } -static void test_dms_COM(void) -{ - IDirectMusicSegment8 *dms = (IDirectMusicSegment8*)0xdeadbeef; - IDirectMusicObject *dmo; - IPersistStream *stream; - IUnknown *unk; - ULONG refcount; - HRESULT hr; - - /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectMusicSegment, (IUnknown*)&dms, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&dms); - ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicSegment create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); - ok(!dms, "dms = %p\n", dms); - - /* Invalid RIID */ - hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectSound, (void**)&dms); - ok(hr == E_NOINTERFACE, - "DirectMusicSegment create failed: %08x, expected E_NOINTERFACE\n", hr); - - /* Same refcount */ - hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectMusicSegment8, (void**)&dms); - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); - refcount = IDirectMusicSegment8_AddRef(dms); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); - hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); - IDirectMusicSegment8_AddRef(dms); - refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); - hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IPersistStream, (void**)&stream); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); - refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); - hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); - refcount = IUnknown_Release(unk); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); - refcount = IDirectMusicObject_Release(dmo); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); - refcount = IPersistStream_Release(stream); - ok (refcount == 1, "refcount == %u, expected 1\n", refcount); - refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 0, "refcount == %u, expected 0\n", refcount); -} - START_TEST( performance ) { HRESULT hr; @@ -323,7 +274,5 @@ START_TEST( performance ) test_COM(); test_createport(); - test_dms_COM(); - CoUninitialize(); }

1 0

Alexandre Julliard : makedep: Add helper functions for computing source dir paths.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 623cfef4a0559f6d766d724d95544313eebb3f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=623cfef4a0559f6d766d724d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 10 12:47:19 2014 +0100 makedep: Add helper functions for computing source dir paths. --- tools/makedep.c | 130 +++++++++++++++++++++++++------------------------------ 1 file changed, 60 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=623cfef4a0559f6d766d7…

1 0

Michael Stefaniuc : include: There is no need to duplicate CLSID_DirectMusicAudioPathConfig as CLSID_DirectMusicAudioPath.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: edddda2374eadf607f4b1d9e1e7aac992d7dcee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edddda2374eadf607f4b1d9e1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 11:08:38 2014 +0100 include: There is no need to duplicate CLSID_DirectMusicAudioPathConfig as CLSID_DirectMusicAudioPath. CLSID_DirectMusicAudioPath is private to Wine and produces the confusion between the COM objects DirectMusicAudioPath and DirectMusicAudioPathConfig. But those are totally different things. --- dlls/dmband/dmutils.c | 1 - dlls/dmcompos/dmcompos_main.c | 1 - dlls/dmime/audiopath.c | 4 ++-- dlls/dmime/dmime_main.c | 3 ++- dlls/dmime/dmutils.c | 1 - dlls/dmloader/debug.c | 1 - dlls/dmscript/dmscript_main.c | 1 - dlls/dmstyle/dmutils.c | 1 - dlls/dmsynth/dmsynth_main.c | 1 - dlls/dmusic/dmusic_main.c | 1 - dlls/dswave/dswave_main.c | 1 - include/dmusici.h | 1 - 12 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 7915af5..9ca2809 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -337,7 +337,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 480914c..b9f1444 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -220,7 +220,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index cafffe3..6b7a2f0 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -296,7 +296,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_ParseDescript /* FIXME: should this be determined from stream? */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - pDesc->guidClass = CLSID_DirectMusicAudioPath; + pDesc->guidClass = This->pDesc->guidClass; IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); @@ -650,7 +650,7 @@ HRESULT WINAPI create_dmaudiopath(REFIID lpcGUID, void **ppobj) obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - obj->pDesc->guidClass = CLSID_DirectMusicAudioPath; + obj->pDesc->guidClass = CLSID_DirectMusicAudioPathConfig; obj->ref = 0; /* will be inited by QueryInterface */ return IDirectMusicAudioPathImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c index 9bd6878..d069a01 100644 --- a/dlls/dmime/dmime_main.c +++ b/dlls/dmime/dmime_main.c @@ -204,7 +204,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) *ppv = &SegTriggerTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; - } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicAudioPath) && IsEqualIID (riid, &IID_IClassFactory)) { + } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicAudioPathConfig) && + IsEqualIID (riid, &IID_IClassFactory)) { *ppv = &AudioPath_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 73d5e43..6e61e16 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -273,7 +273,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 9e5c576..9d48776 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -101,7 +101,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 96e4b42..e3dc8b7 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -253,7 +253,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 11b9c7f..5008134 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -270,7 +270,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 6c00395..a95a613 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -188,7 +188,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index d317538..8708787 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -226,7 +226,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index a5f8390..36eb266 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -188,7 +188,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/include/dmusici.h b/include/dmusici.h index 81fc3f8..60f5f01 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -63,7 +63,6 @@ DEFINE_GUID(CLSID_DirectMusicSynthSink, 0xaec17ce3,0xa514,0x1 DEFINE_GUID(CLSID_DirectMusicSection, 0x3f037241,0x414e,0x11d1,0xa7,0xce,0x00,0xa0,0xc9,0x13,0xf7,0x3c); DEFINE_GUID(CLSID_DirectMusicAuditionTrack, 0xd2ac2897,0xb39b,0x11d1,0x87,0x04,0x00,0x60,0x08,0x93,0xb1,0xbd); DEFINE_GUID(CLSID_DirectMusicSegTriggerTrack, 0xbae4d665,0x4ea1,0x11d3,0x8b,0xda,0x00,0x60,0x08,0x93,0xb1,0xb6); -DEFINE_GUID(CLSID_DirectMusicAudioPath, 0xee0b9ca0,0xa81e,0x11d3,0x9b,0xd1,0x00,0x80,0xc7,0x15,0x0a,0x74); DEFINE_GUID(CLSID_DirectMusicTemplate, 0xd30bcc65,0x60e8,0x11d1,0xa7,0xce,0x00,0xa0,0xc9,0x13,0xf7,0x3c); DEFINE_GUID(CLSID_DirectMusicScriptAutoImpSegment, 0x4062c116,0x0270,0x11d3,0x8b,0xcb,0x00,0x60,0x08,0x93,0xb1,0xb6); DEFINE_GUID(CLSID_AudioVBScript, 0x4ee17959,0x931e,0x49e4,0xa2,0xc6,0x97,0x7e,0xcf,0x36,0x28,0xf3);

1 0

Michael Stefaniuc : dmime/tests: COM tests for DirectMusicAudioPath and DirectMusicAudioPathConfig.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: a64bda5b1bc14dba993a036adbd0917de10cacbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64bda5b1bc14dba993a036ad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 10:54:48 2014 +0100 dmime/tests: COM tests for DirectMusicAudioPath and DirectMusicAudioPathConfig. --- dlls/dmime/tests/dmime.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 7c3500d..3d5a426 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -39,6 +39,113 @@ static BOOL missing_dmime(void) return TRUE; } +static void test_COM_audiopath(void) +{ + IDirectMusicAudioPath *dmap; + IUnknown *unk; + IDirectMusicPerformance8 *performance; + ULONG refcount; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicPerformance8, (void**)&performance); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), + "DirectMusicPerformance create failed: %08x\n", hr); + if (!performance) { + win_skip("IDirectMusicPerformance8 not available\n"); + return; + } + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, + DMUS_APATH_SHARED_STEREOPLUSREVERB, 64, DMUS_AUDIOF_ALL, NULL); + ok(hr == S_OK, "DirectMusicPerformance_InitAudio failed: %08x\n", hr); + hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &dmap); + ok(hr == S_OK, "DirectMusicPerformance_GetDefaultAudioPath failed: %08x\n", hr); + + /* IDirectMusicObject and IPersistStream are not supported */ + hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IDirectMusicObject, (void**)&unk); + todo_wine ok(FAILED(hr) && !unk, "Unexpected IDirectMusicObject interface: hr=%08x, iface=%p\n", + hr, unk); + if (unk) IUnknown_Release(unk); + hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IPersistStream, (void**)&unk); + todo_wine ok(FAILED(hr) && !unk, "Unexpected IPersistStream interface: hr=%08x, iface=%p\n", + hr, unk); + if (unk) IUnknown_Release(unk); + + /* Same refcount for all DirectMusicAudioPath interfaces */ + refcount = IDirectMusicAudioPath_AddRef(dmap); + ok(refcount == 3, "refcount == %u, expected 3\n", refcount); + + hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicAudioPath_Release(dmap) > 1); /* performance has a reference too */ + IDirectMusicPerformance8_CloseDown(performance); + IDirectMusicPerformance8_Release(performance); +} + +static void test_COM_audiopathconfig(void) +{ + IDirectMusicAudioPath *dmap = (IDirectMusicAudioPath*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, (IUnknown*)&dmap, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmap); + if (hr == REGDB_E_CLASSNOTREG) { + win_skip("DirectMusicAudioPathConfig not registered\n"); + return; + } + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicAudioPathConfig create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmap, "dmap = %p\n", dmap); + + /* IDirectMusicAudioPath not supported */ + hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicAudioPath, (void**)&dmap); + todo_wine ok(FAILED(hr) && !dmap, + "Unexpected IDirectMusicAudioPath interface: hr=%08x, iface=%p\n", hr, dmap); + + /* IDirectMusicObject and IPersistStream supported */ + hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, + &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "DirectMusicObject create failed: %08x, expected S_OK\n", hr); + IPersistStream_Release(ps); + hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "DirectMusicObject create failed: %08x, expected S_OK\n", hr); + + /* Same refcount for all DirectMusicObject interfaces */ + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + /* IDirectMusicAudioPath still not supported */ + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IDirectMusicAudioPath, (void**)&dmap); + todo_wine ok(FAILED(hr) && !dmap, + "Unexpected IDirectMusicAudioPath interface: hr=%08x, iface=%p\n", hr, dmap); + + while (IDirectMusicObject_Release(dmo)); +} + + static void test_COM_graph(void) { IDirectMusicGraph *dmg = (IDirectMusicGraph*)0xdeadbeef; @@ -266,6 +373,8 @@ START_TEST(dmime) CoUninitialize(); return; } + test_COM_audiopath(); + test_COM_audiopathconfig(); test_COM_graph(); test_COM_segment(); test_COM_segmentstate();

1 0

Michael Stefaniuc : dmime: None of the COM classes support COM aggregation.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 2343eeff91346eef661bc72baa1979746973da91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2343eeff91346eef661bc72ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 10:41:27 2014 +0100 dmime: None of the COM classes support COM aggregation. --- dlls/dmime/audiopath.c | 7 ++++--- dlls/dmime/dmime_main.c | 43 ++++++++++++++++++---------------------- dlls/dmime/dmime_private.h | 30 ++++++++++++++-------------- dlls/dmime/graph.c | 3 ++- dlls/dmime/lyricstrack.c | 3 ++- dlls/dmime/markertrack.c | 3 ++- dlls/dmime/paramcontroltrack.c | 3 ++- dlls/dmime/performance.c | 20 ++++++++----------- dlls/dmime/segment.c | 10 +++------- dlls/dmime/segmentstate.c | 3 ++- dlls/dmime/segtriggertrack.c | 3 ++- dlls/dmime/seqtrack.c | 3 ++- dlls/dmime/sysextrack.c | 3 ++- dlls/dmime/tempotrack.c | 3 ++- dlls/dmime/timesigtrack.c | 3 ++- dlls/dmime/wavetrack.c | 3 ++- 16 files changed, 71 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2343eeff91346eef661bc…

1 0

Henri Verbeet : ddraw: Pass the monitor to the callback in ddraw_enumerate_secondary_devices().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: c7d05d2d604064c96c5a6c8107c297b3bd9f488c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d05d2d604064c96c5a6c810… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:06 2014 +0100 ddraw: Pass the monitor to the callback in ddraw_enumerate_secondary_devices(). --- dlls/ddraw/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 2dd0393..3bcd9b8 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -85,7 +85,7 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC { TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); cont_enum = callback(&adapter_id.device_identifier, adapter_id.description, - adapter_id.device_name, context, 0); + adapter_id.device_name, context, wined3d_get_adapter_monitor(wined3d, adapter)); } } }

1 0

Henri Verbeet : wined3d: Explicitly request alpha testing for blitting the cursor and logo textures to screen.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 51cdeeacd4b4b8d48bcf938b5763ad1a5036812f URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cdeeacd4b4b8d48bcf938b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:04 2014 +0100 wined3d: Explicitly request alpha testing for blitting the cursor and logo textures to screen. --- dlls/wined3d/surface.c | 9 +++++---- dlls/wined3d/swapchain.c | 4 ++-- include/wine/wined3d.h | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 35e3783..832caa5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4321,7 +4321,7 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW } static void surface_blt_to_drawable(const struct wined3d_device *device, - enum wined3d_texture_filter_type filter, BOOL color_key, + enum wined3d_texture_filter_type filter, BOOL alpha_test, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { @@ -4348,7 +4348,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, device->blitter->set_shader(device->blit_priv, context, src_surface); - if (color_key) + if (alpha_test) { gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); checkGLcall("glEnable(GL_ALPHA_TEST)"); @@ -4372,7 +4372,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); - if (color_key) + if (alpha_test) { gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); checkGLcall("glDisable(GL_ALPHA_TEST)"); @@ -4571,7 +4571,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE src_surface->container->color_key_flags &= ~WINEDDSD_CKSRCBLT; } - surface_blt_to_drawable(device, filter, flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE), + surface_blt_to_drawable(device, filter, + flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_ALPHATEST), src_surface, src_rect, dst_surface, dst_rect); /* Restore the color key parameters */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 40fabc6..0e7d79f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -432,7 +432,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; /* Blit the logo into the upper left corner of the drawable. */ - wined3d_surface_blt(back_buffer, &rect, src_surface, &rect, WINEDDBLT_KEYSRC, + wined3d_surface_blt(back_buffer, &rect, src_surface, &rect, WINEDDBLT_ALPHATEST, NULL, WINED3D_TEXF_POINT); } @@ -453,7 +453,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT if (swapchain->desc.windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&destRect, 2); - wined3d_surface_blt(back_buffer, &destRect, cursor, NULL, WINEDDBLT_KEYSRC, + wined3d_surface_blt(back_buffer, &destRect, cursor, NULL, WINEDDBLT_ALPHATEST, NULL, WINED3D_TEXF_POINT); } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0f23fa2..7ddd466 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1268,6 +1268,7 @@ enum wined3d_display_rotation #define WINEDDBLT_WAIT 0x01000000 #define WINEDDBLT_DEPTHFILL 0x02000000 #define WINEDDBLT_DONOTWAIT 0x08000000 +#define WINEDDBLT_ALPHATEST 0x80000000 /* DDSURFACEDESC.dwFlags */ #define WINEDDSD_CAPS 0x00000001

1 0

Ken Thomases : winemac: For ChangeDisplaySettingsEx(), if caller didn' t specify, prefer non-interlaced and unstretched modes.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: c072a4564e55d38b3279e598a0b4a276639ab5d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c072a4564e55d38b3279e598a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 10 03:11:36 2014 -0600 winemac: For ChangeDisplaySettingsEx(), if caller didn't specify, prefer non-interlaced and unstretched modes. --- dlls/winemac.drv/display.c | 72 +++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index e44415d..2f801f0 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -235,7 +235,9 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, struct macdrv_display *displays; int num_displays; CFArrayRef display_modes; - CFIndex count, i, safe; + CFIndex count, i, safe, best; + CGDisplayModeRef best_display_mode; + uint32_t best_io_flags; TRACE("%s %p %p 0x%08x %p\n", debugstr_w(devname), devmode, hwnd, flags, lpvoid); @@ -299,6 +301,7 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, TRACE("\n"); safe = -1; + best_display_mode = NULL; count = CFArrayGetCount(display_modes); for (i = 0; i < count; i++) { @@ -334,57 +337,78 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (devmode->dmDisplayFrequency != (DWORD)refresh_rate) continue; } + if (devmode->dmFields & DM_DISPLAYFLAGS) + { + if (!(devmode->dmDisplayFlags & DM_INTERLACED) != !(io_flags & kDisplayModeInterlacedFlag)) + continue; + } + else if (best_display_mode) + { + if (io_flags & kDisplayModeInterlacedFlag && !(best_io_flags & kDisplayModeInterlacedFlag)) + continue; + else if (!(io_flags & kDisplayModeInterlacedFlag) && best_io_flags & kDisplayModeInterlacedFlag) + goto better; + } if (devmode->dmFields & DM_DISPLAYFIXEDOUTPUT) { if (!(devmode->dmDisplayFixedOutput == DMDFO_STRETCH) != !(io_flags & kDisplayModeStretchedFlag)) continue; } - if (devmode->dmFields & DM_DISPLAYFLAGS) + else if (best_display_mode) { - if (!(devmode->dmDisplayFlags & DM_INTERLACED) != !(io_flags & kDisplayModeInterlacedFlag)) + if (io_flags & kDisplayModeStretchedFlag && !(best_io_flags & kDisplayModeStretchedFlag)) continue; + else if (!(io_flags & kDisplayModeStretchedFlag) && best_io_flags & kDisplayModeStretchedFlag) + goto better; } + if (best_display_mode) + continue; + +better: + best_display_mode = display_mode; + best = safe; + best_io_flags = io_flags; + } + + if (best_display_mode) + { /* we have a valid mode */ - TRACE("Requested display settings match mode %ld\n", safe); + TRACE("Requested display settings match mode %ld\n", best); if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devmode)) { WARN("Failed to update registry\n"); ret = DISP_CHANGE_NOTUPDATED; - break; } + else if (flags & (CDS_TEST | CDS_NORESET)) + ret = DISP_CHANGE_SUCCESSFUL; + else if (macdrv_set_display_mode(&displays[0], best_display_mode)) + { + int mode_bpp = display_mode_bits_per_pixel(best_display_mode); + size_t width = CGDisplayModeGetWidth(best_display_mode); + size_t height = CGDisplayModeGetHeight(best_display_mode); - if (flags & (CDS_TEST | CDS_NORESET)) + SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, + MAKELPARAM(width, height)); ret = DISP_CHANGE_SUCCESSFUL; + } else { - if (macdrv_set_display_mode(&displays[0], display_mode)) - { - SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, - MAKELPARAM(width, height)); - ret = DISP_CHANGE_SUCCESSFUL; - } - else - { - WARN("Failed to set display mode\n"); - ret = DISP_CHANGE_FAILED; - } + WARN("Failed to set display mode\n"); + ret = DISP_CHANGE_FAILED; } - - break; } - - CFRelease(display_modes); - macdrv_free_displays(displays); - - if (i >= count) + else { /* no valid modes found */ ERR("No matching mode found %ux%ux%d @%u!\n", devmode->dmPelsWidth, devmode->dmPelsHeight, bpp, devmode->dmDisplayFrequency); } + CFRelease(display_modes); + macdrv_free_displays(displays); + return ret; }

1 0

Ken Thomases : winemac: Clear the latentDisplayModes instance variable before realizing the latent modes.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: d4d92a759e78355fbf2301fa6a3c903c9d59996e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d92a759e78355fbf2301fa6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 10 03:11:31 2014 -0600 winemac: Clear the latentDisplayModes instance variable before realizing the latent modes. --- dlls/winemac.drv/cocoa_app.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 3e622b7..13d9c87 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2080,13 +2080,14 @@ int macdrv_err_on; - (void)applicationDidBecomeActive:(NSNotification *)notification { NSNumber* displayID; + NSDictionary* modesToRealize = [latentDisplayModes autorelease]; - for (displayID in latentDisplayModes) + latentDisplayModes = [[NSMutableDictionary alloc] init]; + for (displayID in modesToRealize) { - CGDisplayModeRef mode = (CGDisplayModeRef)[latentDisplayModes objectForKey:displayID]; + CGDisplayModeRef mode = (CGDisplayModeRef)[modesToRealize objectForKey:displayID]; [self setMode:mode forDisplay:[displayID unsignedIntValue]]; } - [latentDisplayModes removeAllObjects]; [self updateCursorClippingState];

1 0