Module: wine Branch: master Commit: 8819156b493408c97c53fc62f7634e6abffab9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8819156b493408c97c53fc62f7...
Author: Detlef Riekenberg wine.dev@web.de Date: Fri Mar 27 22:37:27 2009 +0100
dsound/tests: Remove duplicate version dump.
We have the version already in the header of the winetest results.
---
dlls/dsound/tests/capture.c | 1 - dlls/dsound/tests/ds3d.c | 1 - dlls/dsound/tests/ds3d8.c | 1 - dlls/dsound/tests/dsound.c | 1 - dlls/dsound/tests/dsound8.c | 34 ---------------------------------- dlls/dsound/tests/dsound_test.h | 1 - dlls/dsound/tests/duplex.c | 1 - dlls/dsound/tests/propset.c | 1 - 8 files changed, 0 insertions(+), 41 deletions(-)
diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index b2a377a..87a5a59 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -687,7 +687,6 @@ START_TEST(capture) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll"));
pDirectSoundCaptureCreate=(void*)GetProcAddress(hDsound, "DirectSoundCaptureCreate"); diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index db662c0..8f5b88a 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1280,7 +1280,6 @@ START_TEST(ds3d) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll"));
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index ba9f2d2..1f5f28a 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -1133,7 +1133,6 @@ START_TEST(ds3d8) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll"));
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 10a3fa8..114dbb6 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1083,7 +1083,6 @@ START_TEST(dsound) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll"));
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 2e02a92..c79a7ac 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -874,39 +874,6 @@ static void dsound8_tests(void) ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); }
-const char * get_file_version(const char * file_name) -{ - static char version[32]; - static char backslash[] = "\"; - DWORD size; - DWORD handle; - - size = GetFileVersionInfoSizeA("dsound.dll", &handle); - if (size) { - char * data = HeapAlloc(GetProcessHeap(), 0, size); - if (data) { - if (GetFileVersionInfoA("dsound.dll", handle, size, data)) { - VS_FIXEDFILEINFO *pFixedVersionInfo; - UINT len; - if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) { - sprintf(version, "%d.%d.%d.%d", - pFixedVersionInfo->dwFileVersionMS >> 16, - pFixedVersionInfo->dwFileVersionMS & 0xffff, - pFixedVersionInfo->dwFileVersionLS >> 16, - pFixedVersionInfo->dwFileVersionLS & 0xffff); - } else - sprintf(version, "not available"); - } else - sprintf(version, "failed"); - - HeapFree(GetProcessHeap(), 0, data); - } else - sprintf(version, "failed"); - } else - sprintf(version, "not available"); - - return version; -}
START_TEST(dsound8) { @@ -917,7 +884,6 @@ START_TEST(dsound8) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll"));
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/dsound_test.h b/dlls/dsound/tests/dsound_test.h index 23ca169..b09c98b 100644 --- a/dlls/dsound/tests/dsound_test.h +++ b/dlls/dsound/tests/dsound_test.h @@ -85,5 +85,4 @@ extern void test_buffer8(LPDIRECTSOUND8,LPDIRECTSOUNDBUFFER*, LPDIRECTSOUND3DLISTENER,BOOL,BOOL); extern const char * getDSBCAPS(DWORD xmask); extern int align(int length, int align); -extern const char * get_file_version(const char * file_name); extern const char * format_string(const WAVEFORMATEX* wfx); diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index ae816a4..11fb2a7 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -231,7 +231,6 @@ START_TEST(duplex) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll"));
pDirectSoundFullDuplexCreate=(void*)GetProcAddress(hDsound, "DirectSoundFullDuplexCreate"); diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index fba6e06..70a8e0d 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -720,7 +720,6 @@ START_TEST(propset) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll"));
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA");