Version resources cleanup.

dlls/amstream/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "6.5.1.900"
 #define WINE_PRODUCTVERSION 6,5,1,900
 #define WINE_PRODUCTVERSION_STR "6.5"
-#define WINE_PRODUCTNAME_STR "DirectShow"
 
 #include "wine/wine_common_ver.rc"

dlls/cards/version.rc

@@ -24,6 +24,5 @@
 #define WINE_FILEVERSION_STR "5.00.2134.1"
 #define WINE_PRODUCTVERSION 5,0,2134,1
 #define WINE_PRODUCTVERSION_STR "5.00.2134.1"
-#define WINE_PRODUCTNAME_STR "Wine"
 
 #include "wine/wine_common_ver.rc"

dlls/d3d8/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3.0.900"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/d3d9/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.1.902"
 #define WINE_PRODUCTVERSION 5,3,1,902
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/d3dim/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.2180.14"
 #define WINE_PRODUCTVERSION 5,3,2180,14
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/d3drm/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.0.2134.14"
 #define WINE_PRODUCTVERSION 5,0,2134,14
 #define WINE_PRODUCTVERSION_STR "5.0"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/d3dxof/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.0.2135.1"
 #define WINE_PRODUCTVERSION 5,0,2135,1
 #define WINE_PRODUCTVERSION_STR "5.0.2135.1"
-#define WINE_PRODUCTNAME_STR "Direct3D"
 
 #include "wine/wine_common_ver.rc"

dlls/ddraw/version.rc

@@ -23,6 +23,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/devenum/devenum.rc

@@ -30,7 +30,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define WINE_FILEVERSION_STR "6.5.1.902"
 #define WINE_PRODUCTVERSION 6,5,1,902
 #define WINE_PRODUCTVERSION_STR "6.5"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"
 

dlls/dinput/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.1.2600.881"
 #define WINE_PRODUCTVERSION 5,1,2600,881
 #define WINE_PRODUCTVERSION_STR "5.1"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dinput8/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.1.2600.881"
 #define WINE_PRODUCTVERSION 5,1,2600,881
 #define WINE_PRODUCTVERSION_STR "5.1"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dmband/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dmcompos/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dmime/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dmloader/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dmscript/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dmstyle/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dmsynth/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dmusic/version.rc

@@ -23,6 +23,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dmusic32/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dplay/version.rc

@@ -23,6 +23,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dplayx/version.rc

@@ -23,6 +23,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dpnet/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "Wine DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dpnhpast/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.901"
 #define WINE_PRODUCTVERSION 5,3,0,901
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dsound/version.rc

@@ -23,6 +23,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dswave/version.rc

@@ -23,6 +23,5 @@
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/dxdiagn/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.3.1.902"
 #define WINE_PRODUCTVERSION 5,3,1,902
 #define WINE_PRODUCTVERSION_STR "5.3"
-#define WINE_PRODUCTNAME_STR "Wine DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/gdi/version.rc

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define WINE_FILEVERSION_STR "1.0"
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "gdi32.dll"
+#define WINE_FILEVERSION_STR "1.0"
 
 #include "wine/wine_common_ver.rc"

dlls/hhctrl.ocx/version.rc

@@ -2,6 +2,7 @@
  * Version information for hhctrl.ocx
  *
  * Copyright 2004 Hans Leidekker
+ * Copyright 2004 Tom Wickline
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,5 +21,9 @@
 
 #define WINE_FILEDESCRIPTION_STR "Wine htmlhelp OCX"
 #define WINE_FILENAME_STR "hhctrl.ocx"
+#define WINE_FILEVERSION 4,72,7325,0
+#define WINE_FILEVERSION_STR "4.72.7325.0"
+#define WINE_PRODUCTVERSION 4,72,7325,0
+#define WINE_PRODUCTVERSION_STR "4.72.7325.0"
 
 #include <wine/wine_common_ver.rc>

dlls/mpr/version.rc

@@ -24,6 +24,5 @@
 #define WINE_FILEVERSION_STR "5.00.2195.6611"
 #define WINE_PRODUCTVERSION 5,0,2195,6611
 #define WINE_PRODUCTVERSION_STR "5.00.2195.6611"
-#define WINE_PRODUCTNAME_STR "Wine"
 
 #include "wine/wine_common_ver.rc"

dlls/msdmo/rsrc.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "6.5.1.900"
 #define WINE_PRODUCTVERSION 6,5,1,900
 #define WINE_PRODUCTVERSION_STR "6.5"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/msi/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "2.0.2600.0"
 #define WINE_PRODUCTVERSION 2,0,2600,0
 #define WINE_PRODUCTVERSION_STR "2.0.2600.0"
-#define WINE_PRODUCTNAME_STR "MSI Installer"
 
 #include "wine/wine_common_ver.rc"

dlls/mswsock/version.rc

@@ -17,11 +17,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define WINE_FILEVERSION 4,0,0,0
-#define WINE_FILEVERSION_STR "4.0.0.0"
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "mswsock.dll"
-
+#define WINE_FILEVERSION 4,0,0,0
+#define WINE_FILEVERSION_STR "4.0.0.0"
 #define WINE_PRODUCTVERSION 4,0,0,0
 #define WINE_PRODUCTVERSION_STR "4.0"
 

dlls/opengl32/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "5.1.2600.2082"
 #define WINE_PRODUCTVERSION 5,1,2600,2082
 #define WINE_PRODUCTVERSION_STR "5.1"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/qcap/version.rc

@@ -22,6 +22,5 @@
 #define WINE_FILEVERSION_STR "6.5.1.900"
 #define WINE_PRODUCTVERSION 6,5,1,900
 #define WINE_PRODUCTVERSION_STR "6.5"
-#define WINE_PRODUCTNAME_STR "DirectShow"
 
 #include "wine/wine_common_ver.rc"

dlls/quartz/version.rc

@@ -23,6 +23,5 @@
 #define WINE_FILEVERSION_STR "6.5.1.902"
 #define WINE_PRODUCTVERSION 6,5,1,902
 #define WINE_PRODUCTVERSION_STR "6.5"
-#define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"

dlls/shell32/version16.rc

@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define WINE_FILEVERSION 4,0,0,0
-#define WINE_FILEVERSION_STR "4.0"
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "shell.dll"
+#define WINE_FILEVERSION 4,0,0,0
+#define WINE_FILEVERSION_STR "4.0"
 
 #include "wine/wine_common_ver.rc"

dlls/wininet/version.rc

@@ -24,6 +24,5 @@
 #define WINE_FILEVERSION_STR "5.0.0.0"
 #define WINE_PRODUCTVERSION 5,0,0,0
 #define WINE_PRODUCTVERSION_STR "5.0"
-#define WINE_PRODUCTNAME_STR "wininet"
 
 #include "wine/wine_common_ver.rc"

dlls/winsock/version.rc

@@ -16,11 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define WINE_FILEVERSION 4,0,0,0
-#define WINE_FILEVERSION_STR "4.0.0.0"
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "ws2_32.dll"
-
+#define WINE_FILEVERSION 4,0,0,0
+#define WINE_FILEVERSION_STR "4.0.0.0"
 #define WINE_PRODUCTVERSION 4,0,0,0
 #define WINE_PRODUCTVERSION_STR "4.0"
 

dlls/wsock32/version.rc

@@ -16,11 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define WINE_FILEVERSION 4,0,0,0
-#define WINE_FILEVERSION_STR "4.0.0.0"
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "wsock32.dll"
-
+#define WINE_FILEVERSION 4,0,0,0
+#define WINE_FILEVERSION_STR "4.0.0.0"
 #define WINE_PRODUCTVERSION 4,0,0,0
 #define WINE_PRODUCTVERSION_STR "4.0"