[WINVER]: Remove wine'isms and add a resource file.

svn path=/trunk/; revision=63095

diff --git a/reactos/base/applications/winver/CMakeLists.txt b/reactos/base/applications/winver/CMakeLists.txt
index 09756ca..af0286d 100644 (file)
--- a/reactos/base/applications/winver/CMakeLists.txt
+++ b/reactos/base/applications/winver/CMakeLists.txt
@@ -1,6 +1,5 @@
 
-
-add_executable(winver winver.c)
+add_executable(winver winver.c winver.rc)
 set_module_type(winver win32gui UNICODE)
 add_importlibs(winver shell32 msvcrt kernel32)
 add_cd_file(TARGET winver DESTINATION reactos/system32 FOR all)

diff --git a/reactos/base/applications/winver/winver.c b/reactos/base/applications/winver/winver.c
index b969d14..b56230f 100644 (file)
--- a/reactos/base/applications/winver/winver.c
+++ b/reactos/base/applications/winver/winver.c
@@ -1,3 +1,9 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS Version Program
+ * FILE:            winver.c
+ */
+
 #include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
@@ -5,11 +11,10 @@
 
 int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
 {
-  static const WCHAR szROS[] = { 'R','e','a','c','t','O','S',0 };
-  UNREFERENCED_PARAMETER(lpCmdLine);
-  UNREFERENCED_PARAMETER(nCmdShow);
-  UNREFERENCED_PARAMETER(hPrevInstance);
-  UNREFERENCED_PARAMETER(hInstance);
-  ShellAboutW(0, szROS, 0, 0);
-  return 1;
+    UNREFERENCED_PARAMETER(hInstance);
+    UNREFERENCED_PARAMETER(hPrevInstance);
+    UNREFERENCED_PARAMETER(lpCmdLine);
+    UNREFERENCED_PARAMETER(nCmdShow);
+
+    return ShellAboutW(NULL, L"ReactOS", NULL, NULL);
 }

diff --git a/reactos/base/applications/winver/winver.rc b/reactos/base/applications/winver/winver.rc
new file mode 100644 (file)
index 0000000..bc853f8
--- /dev/null
+++ b/reactos/base/applications/winver/winver.rc
@@ -0,0 +1,5 @@
+
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Version Program"
+#define REACTOS_STR_INTERNAL_NAME     "winver"
+#define REACTOS_STR_ORIGINAL_FILENAME "winver.exe"
+#include <reactos/version.rc>