Detlef Riekenberg : dinput/tests: Remove duplicate version dump.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5599912e2735a0e0aaf97165acc4c6a78548cf5f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5599912e2735a0e0aaf97165ac...

Author: Detlef Riekenberg <wine.dev(a)web.de>
Date:   Fri Mar 27 22:45:59 2009 +0100

dinput/tests: Remove duplicate version dump.

We have the version already in the header of the winetest results.

---

 dlls/dinput/tests/dinput_test.h |   19 -------------------
 dlls/dinput/tests/joystick.c    |    3 ---
 dlls/dinput/tests/keyboard.c    |   37 -------------------------------------
 dlls/dinput/tests/mouse.c       |    3 ---
 4 files changed, 0 insertions(+), 62 deletions(-)

diff --git a/dlls/dinput/tests/dinput_test.h b/dlls/dinput/tests/dinput_test.h
deleted file mode 100644
index 9a9af6c..0000000
--- a/dlls/dinput/tests/dinput_test.h
+++ /dev/null
@@ -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);
diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c
index 944dbb1..aad8049 100644
--- a/dlls/dinput/tests/joystick.c
+++ b/dlls/dinput/tests/joystick.c
@@ -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);
diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c
index de55d32..2d4a12f 100644
--- a/dlls/dinput/tests/keyboard.c
+++ b/dlls/dinput/tests/keyboard.c
@@ -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();
diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c
index 42e5982..520a867 100644
--- a/dlls/dinput/tests/mouse.c
+++ b/dlls/dinput/tests/mouse.c
@@ -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();