dinput/tests: Remove duplicate version dump.
We have the version already in the header of the winetest results.
This commit is contained in:
parent
8819156b49
commit
5599912e27
|
@ -1,19 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2005 Robert Reif
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
extern const char * get_file_version(const char * file_name);
|
|
@ -29,7 +29,6 @@
|
|||
#include "windef.h"
|
||||
#include "wingdi.h"
|
||||
#include "dinput.h"
|
||||
#include "dinput_test.h"
|
||||
|
||||
#define numObjects(x) (sizeof(x) / sizeof(x[0]))
|
||||
|
||||
|
@ -635,8 +634,6 @@ START_TEST(joystick)
|
|||
{
|
||||
CoInitialize(NULL);
|
||||
|
||||
trace("DLL Version: %s\n", get_file_version("dinput.dll"));
|
||||
|
||||
joystick_tests(0x0700);
|
||||
joystick_tests(0x0500);
|
||||
joystick_tests(0x0300);
|
||||
|
|
|
@ -29,41 +29,6 @@
|
|||
#include "windef.h"
|
||||
#include "wingdi.h"
|
||||
#include "dinput.h"
|
||||
#include "dinput_test.h"
|
||||
|
||||
const char * get_file_version(const char * file_name)
|
||||
{
|
||||
static char version[32];
|
||||
static char backslash[] = "\\";
|
||||
DWORD size;
|
||||
DWORD handle;
|
||||
|
||||
size = GetFileVersionInfoSizeA(file_name, &handle);
|
||||
if (size) {
|
||||
char * data = HeapAlloc(GetProcessHeap(), 0, size);
|
||||
if (data) {
|
||||
if (GetFileVersionInfoA(file_name, 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;
|
||||
}
|
||||
|
||||
static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd)
|
||||
{
|
||||
|
@ -201,8 +166,6 @@ START_TEST(keyboard)
|
|||
{
|
||||
CoInitialize(NULL);
|
||||
|
||||
trace("DLL Version: %s\n", get_file_version("dinput.dll"));
|
||||
|
||||
keyboard_tests(0x0700);
|
||||
|
||||
CoUninitialize();
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
#include "windef.h"
|
||||
#include "wingdi.h"
|
||||
#include "dinput.h"
|
||||
#include "dinput_test.h"
|
||||
|
||||
static const HRESULT SetCoop_null_window[16] = {
|
||||
E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG,
|
||||
|
@ -145,8 +144,6 @@ START_TEST(mouse)
|
|||
{
|
||||
CoInitialize(NULL);
|
||||
|
||||
trace("DLL Version: %s\n", get_file_version("dinput.dll"));
|
||||
|
||||
mouse_tests();
|
||||
|
||||
CoUninitialize();
|
||||
|
|
Loading…
Reference in New Issue