wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Dmitry Timoshkov : advapi32/tests: Add access tests for a file mapping.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 4229da7caecac5f906e13b1d472f0b77f10cedf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4229da7caecac5f906e13b1d4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:11 2014 +0900 advapi32/tests: Add access tests for a file mapping. --- dlls/advapi32/tests/security.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 274aee7..e6ae638 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4898,6 +4898,58 @@ todo_wine CloseHandle(file); } +static void test_filemap_security(void) +{ + DWORD ret, i, access; + HANDLE mapping, dup; + static const struct + { + int generic, mapped; + } map[] = + { + { 0, 0 }, + { GENERIC_READ, STANDARD_RIGHTS_READ | SECTION_QUERY | SECTION_MAP_READ }, + { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SECTION_MAP_WRITE }, + { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE }, + { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS } + }; + + SetLastError(0xdeadbeef); + mapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_EXECUTE_READWRITE, 0, 4096, NULL); + if (mapping) + { + access = get_obj_access(mapping); +todo_wine + ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE), + "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, got %#x\n", access); + } + else /* win2k fails to create EXECUTE mapping using system page file */ + { + SetLastError(0xdeadbeef); + mapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, NULL); + ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); + + access = get_obj_access(mapping); + ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE), + "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE, got %#x\n", access); + } + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), mapping, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + + CloseHandle(mapping); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -4973,6 +5025,7 @@ static void test_kernel_objects_security(void) test_named_pipe_security(token); test_semaphore_security(token); test_file_security(token); + test_filemap_security(); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Dmitry Timoshkov : advapi32/tests: Add more file access tests, add access tests for a directory.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: fa0b745d3fef0e2962d84e256a68c9022e072d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0b745d3fef0e2962d84e256… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:06 2014 +0900 advapi32/tests: Add more file access tests, add access tests for a directory. --- dlls/advapi32/tests/security.c | 81 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index df02d85..274aee7 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4776,7 +4776,7 @@ todo_wine static void test_file_security(HANDLE token) { - DWORD ret, i, access; + DWORD ret, i, access, bytes; HANDLE file, dup; static const struct { @@ -4791,10 +4791,12 @@ static void test_file_security(HANDLE token) }; char temp_path[MAX_PATH]; char file_name[MAX_PATH]; + char buf[16]; GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "tmp", 0, file_name); + /* file */ SetLastError(0xdeadbeef); file = CreateFileA(file_name, GENERIC_ALL, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); @@ -4816,7 +4818,84 @@ static void test_file_security(HANDLE token) } CloseHandle(file); + + SetLastError(0xdeadbeef); + file = CreateFileA(file_name, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); +todo_wine + ok(access == (FILE_READ_ATTRIBUTES | SYNCHRONIZE), "expected FILE_READ_ATTRIBUTES | SYNCHRONIZE, got %#x\n", access); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(file, buf, sizeof(buf), &bytes, NULL); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, got %u\n", bytes); + + CloseHandle(file); + + SetLastError(0xdeadbeef); + file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); +todo_wine + ok(access == (FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES), "expected FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES, got %#x\n", access); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(file, buf, sizeof(buf), &bytes, NULL); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, got %u\n", bytes); + + CloseHandle(file); DeleteFileA(file_name); + + /* directory */ + SetLastError(0xdeadbeef); + file = CreateFileA(temp_path, GENERIC_ALL, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); + ok(access == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), file, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + + CloseHandle(file); + + SetLastError(0xdeadbeef); + file = CreateFileA(temp_path, 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); +todo_wine + ok(access == (FILE_READ_ATTRIBUTES | SYNCHRONIZE), "expected FILE_READ_ATTRIBUTES | SYNCHRONIZE, got %#x\n", access); + + CloseHandle(file); + + SetLastError(0xdeadbeef); + file = CreateFileA(temp_path, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); +todo_wine + ok(access == (FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES), "expected FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES, got %#x\n", access); + + CloseHandle(file); } static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type)

1 0

Dmitry Timoshkov : advapi32/tests: Add a test for opening an event with access 0.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: b5c9bdaddba27c607c13d0d70e0777ecef4a46ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c9bdaddba27c607c13d0d70… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:02 2014 +0900 advapi32/tests: Add a test for opening an event with access 0. --- dlls/advapi32/tests/security.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 32aa395..df02d85 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4624,6 +4624,13 @@ todo_wine ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); CloseHandle(dup); + + SetLastError(0xdeadbeef); + dup = OpenEventA(0, FALSE, "WineTestEvent"); +todo_wine + ok(!dup, "OpenEvent should fail\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); } test_default_handle_security(token, event, &mapping);

1 0

Dmitry Timoshkov : advapi32/tests: Add a test for opening a mutex with access 0.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: bce1a2b3d5c90eb31052a13306b0b2e48f081be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce1a2b3d5c90eb31052a1330… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:25:58 2014 +0900 advapi32/tests: Add a test for opening a mutex with access 0. --- dlls/advapi32/tests/security.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 57ad4ce..32aa395 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4563,6 +4563,13 @@ todo_wine ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); CloseHandle(dup); + + SetLastError(0xdeadbeef); + dup = OpenMutexA(0, FALSE, "WineTestMutex"); +todo_wine + ok(!dup, "OpenMutex should fail\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); } test_default_handle_security(token, mutex, &mapping);

1 0

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

10 Jan '14

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

Alexandre Julliard : makedep: Expand the script names into the generated rules.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 09a75310daf932663683d78ba3969884ca8adbfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a75310daf932663683d78ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 10 12:53:15 2014 +0100 makedep: Expand the script names into the generated rules. --- Make.vars.in | 3 --- tools/makedep.c | 15 ++++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index d704687..75cb1e6 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -50,9 +50,6 @@ CROSSTARGET = @CROSSTARGET@ LINGUAS = @LINGUAS@ ALL_MO_FILES = $(LINGUAS:%=@top_builddir@/po/%.mo) PORCFLAGS = @PORCFLAGS@ -BUILDIMAGE = $(top_srcdir)/tools/buildimage -C2MAN = $(top_srcdir)/tools/c2man.pl -RUNTEST = $(top_srcdir)/tools/runtest RUNTESTFLAGS = -q -P wine MAKECTESTS = $(TOOLSDIR)/tools/make_ctests$(TOOLSEXT) MAKEXFTMPL = $(TOOLSDIR)/tools/make_xftmpl$(TOOLSEXT) diff --git a/tools/makedep.c b/tools/makedep.c index c06f80c..c968187 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1585,8 +1585,8 @@ static struct strarray output_sources(void) if (convert && rsvg && icotool && !src_dir) { output( "%s.ico %s.bmp: %s\n", obj, obj, source->filename ); - output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" $(BUILDIMAGE) %s $@\n", - convert, icotool, rsvg, source->filename ); + output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", + convert, icotool, rsvg, top_dir_path( "tools/buildimage" ), source->filename ); } free( convert ); free( rsvg ); @@ -1631,7 +1631,8 @@ static struct strarray output_sources(void) { strarray_add( &test_files, source->name ); output( "%s.ok:\n", obj ); - output( "\t$(RUNTEST) $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n", top_obj_dir, + output( "\t%s $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n", + top_dir_path( "tools/runtest" ), top_obj_dir, testdll, replace_extension( testdll, ".dll", "_test.exe" ), dllext, obj ); } if (!strcmp( ext, "c" ) && !(source->flags & FLAG_GENERATED)) @@ -1784,25 +1785,25 @@ static struct strarray output_sources(void) char *manext = get_expanded_make_variable( "api_manext" ); output( "manpages::\n" ); - output( "\t$(C2MAN) -w %s -R%s", spec_file, top_obj_dir ); + output( "\t%s -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); output_filename( strmake( "-I%s", top_dir_path( "include" ))); output_filename( strmake( "-o %s/documentation/man%s", top_obj_dir, manext ? manext : "3w" )); output_filenames( c2man_files ); output( "\n" ); output( "htmlpages::\n" ); - output( "\t$(C2MAN) -Th -w %s -R%s", spec_file, top_obj_dir ); + output( "\t%s -Th -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); output_filename( strmake( "-I%s", top_dir_path( "include" ))); output_filename( strmake( "-o %s/documentation/html", top_obj_dir )); output_filenames( c2man_files ); output( "\n" ); output( "sgmlpages::\n" ); - output( "\t$(C2MAN) -Ts -w %s -R%s", spec_file, top_obj_dir ); + output( "\t%s -Ts -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); output_filename( strmake( "-I%s", top_dir_path( "include" ))); output_filename( strmake( "-o %s/documentation/api-guide", top_obj_dir )); output_filenames( c2man_files ); output( "\n" ); output( "xmlpages::\n" ); - output( "\t$(C2MAN) -Tx -w %s -R%s", spec_file, top_obj_dir ); + output( "\t%s -Tx -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); output_filename( strmake( "-I%s", top_dir_path( "include" ))); output_filename( strmake( "-o %s/documentation/api-guide-xml", top_obj_dir )); output_filenames( c2man_files );

1 0

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

10 Jan '14

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 10 Jan '14

10 Jan '14

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 10 Jan '14

10 Jan '14

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/tests: COM tests for DirectMusicGraph.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 0991d3a9bc2de01a011a5b36cd7b688e51ab2621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0991d3a9bc2de01a011a5b36c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 10:48:05 2014 +0100 dmime/tests: COM tests for DirectMusicGraph. --- dlls/dmime/tests/dmime.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index df11c0d..7c3500d 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -39,6 +39,59 @@ static BOOL missing_dmime(void) return TRUE; } +static void test_COM_graph(void) +{ + IDirectMusicGraph *dmg = (IDirectMusicGraph*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicGraph, (IUnknown*)&dmg, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmg); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicGraph create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmg, "dmg = %p\n", dmg); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, + (void**)&dmg); + ok(hr == E_NOINTERFACE, "DirectMusicGraph create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicGraph interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicGraph, (void**)&dmg); + ok(hr == S_OK, "DirectMusicGraph create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicGraph_AddRef(dmg); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IDirectMusicObject, (void**)&dmo); + if (hr == E_NOINTERFACE) { + win_skip("DirectMusicGraph without IDirectMusicObject\n"); + return; + } + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicGraph_Release(dmg)); +} + static void test_COM_segment(void) { IDirectMusicSegment8 *dms = (IDirectMusicSegment8*)0xdeadbeef; @@ -213,6 +266,7 @@ START_TEST(dmime) CoUninitialize(); return; } + test_COM_graph(); test_COM_segment(); test_COM_segmentstate(); test_COM_track();

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014