dsound/tests: Remove duplicate version dump.
We have the version already in the header of the winetest results.
This commit is contained in:
parent
f02e4dcf27
commit
8819156b49
|
@ -687,7 +687,6 @@ START_TEST(capture)
|
||||||
hDsound = LoadLibrary("dsound.dll");
|
hDsound = LoadLibrary("dsound.dll");
|
||||||
if (hDsound)
|
if (hDsound)
|
||||||
{
|
{
|
||||||
trace("DLL Version: %s\n", get_file_version("dsound.dll"));
|
|
||||||
|
|
||||||
pDirectSoundCaptureCreate=(void*)GetProcAddress(hDsound,
|
pDirectSoundCaptureCreate=(void*)GetProcAddress(hDsound,
|
||||||
"DirectSoundCaptureCreate");
|
"DirectSoundCaptureCreate");
|
||||||
|
|
|
@ -1280,7 +1280,6 @@ START_TEST(ds3d)
|
||||||
hDsound = LoadLibrary("dsound.dll");
|
hDsound = LoadLibrary("dsound.dll");
|
||||||
if (hDsound)
|
if (hDsound)
|
||||||
{
|
{
|
||||||
trace("DLL Version: %s\n", get_file_version("dsound.dll"));
|
|
||||||
|
|
||||||
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound,
|
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound,
|
||||||
"DirectSoundEnumerateA");
|
"DirectSoundEnumerateA");
|
||||||
|
|
|
@ -1133,7 +1133,6 @@ START_TEST(ds3d8)
|
||||||
hDsound = LoadLibrary("dsound.dll");
|
hDsound = LoadLibrary("dsound.dll");
|
||||||
if (hDsound)
|
if (hDsound)
|
||||||
{
|
{
|
||||||
trace("DLL Version: %s\n", get_file_version("dsound.dll"));
|
|
||||||
|
|
||||||
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound,
|
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound,
|
||||||
"DirectSoundEnumerateA");
|
"DirectSoundEnumerateA");
|
||||||
|
|
|
@ -1083,7 +1083,6 @@ START_TEST(dsound)
|
||||||
hDsound = LoadLibrary("dsound.dll");
|
hDsound = LoadLibrary("dsound.dll");
|
||||||
if (hDsound)
|
if (hDsound)
|
||||||
{
|
{
|
||||||
trace("DLL Version: %s\n", get_file_version("dsound.dll"));
|
|
||||||
|
|
||||||
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound,
|
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound,
|
||||||
"DirectSoundEnumerateA");
|
"DirectSoundEnumerateA");
|
||||||
|
|
|
@ -874,39 +874,6 @@ static void dsound8_tests(void)
|
||||||
ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc);
|
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)
|
START_TEST(dsound8)
|
||||||
{
|
{
|
||||||
|
@ -917,7 +884,6 @@ START_TEST(dsound8)
|
||||||
hDsound = LoadLibrary("dsound.dll");
|
hDsound = LoadLibrary("dsound.dll");
|
||||||
if (hDsound)
|
if (hDsound)
|
||||||
{
|
{
|
||||||
trace("DLL Version: %s\n", get_file_version("dsound.dll"));
|
|
||||||
|
|
||||||
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound,
|
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound,
|
||||||
"DirectSoundEnumerateA");
|
"DirectSoundEnumerateA");
|
||||||
|
|
|
@ -85,5 +85,4 @@ extern void test_buffer8(LPDIRECTSOUND8,LPDIRECTSOUNDBUFFER*,
|
||||||
LPDIRECTSOUND3DLISTENER,BOOL,BOOL);
|
LPDIRECTSOUND3DLISTENER,BOOL,BOOL);
|
||||||
extern const char * getDSBCAPS(DWORD xmask);
|
extern const char * getDSBCAPS(DWORD xmask);
|
||||||
extern int align(int length, int align);
|
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);
|
extern const char * format_string(const WAVEFORMATEX* wfx);
|
||||||
|
|
|
@ -231,7 +231,6 @@ START_TEST(duplex)
|
||||||
hDsound = LoadLibrary("dsound.dll");
|
hDsound = LoadLibrary("dsound.dll");
|
||||||
if (hDsound)
|
if (hDsound)
|
||||||
{
|
{
|
||||||
trace("DLL Version: %s\n", get_file_version("dsound.dll"));
|
|
||||||
|
|
||||||
pDirectSoundFullDuplexCreate=(void*)GetProcAddress(hDsound,
|
pDirectSoundFullDuplexCreate=(void*)GetProcAddress(hDsound,
|
||||||
"DirectSoundFullDuplexCreate");
|
"DirectSoundFullDuplexCreate");
|
||||||
|
|
|
@ -720,7 +720,6 @@ START_TEST(propset)
|
||||||
hDsound = LoadLibrary("dsound.dll");
|
hDsound = LoadLibrary("dsound.dll");
|
||||||
if (hDsound)
|
if (hDsound)
|
||||||
{
|
{
|
||||||
trace("DLL Version: %s\n", get_file_version("dsound.dll"));
|
|
||||||
|
|
||||||
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound,
|
pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound,
|
||||||
"DirectSoundEnumerateA");
|
"DirectSoundEnumerateA");
|
||||||
|
|
Loading…
Reference in New Issue