A general cleanup of the version resources in Wine DLLs.

dlls/avifil32/rsrc.rc

@@ -26,34 +26,13 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-1 VERSIONINFO
-FILEVERSION	4, 3, 0, 1998
-PRODUCTVERSION	4, 3, 0, 1998
-FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-#ifdef NDEBUG
-FILEFLAGS	0
-#else
-FILEFLAGS	VS_FF_DEBUG
-#endif
-FILEOS		VOS_DOS_WINDOWS32
-FILETYPE	VFT_DLL
-{
-  BLOCK "StringFileInfo"
-  {
-    BLOCK "040604B0" /* Deutschland (Standard) */
-    {
-      VALUE "CompanyName", "Wine Developer Team\000"
-      VALUE "FileDescription", "Wine Bibliothek zur Untersttzung von AVI-Dateien\000"
-      VALUE "FileVersion", "4.03.1998\000"
-      VALUE "InternalName", "AVIFIL32\000"
-      VALUE "LegalCopyright", "Copyright \251 Michael Gnnewig 2002\000"
-      VALUE "OriginalFileName", "AVIFIL32.DLL\000"
-      VALUE "ProductName", "Wine\000"
-      VALUE "ProductVersion", "1.00\000"
-      VALUE "OLESelfRegister", ""
-    }
-  }
-}
+#define WINE_OLESELFREGISTER
+#define WINE_FILEDESCRIPTION_STR "Wine AVI file support library"
+#define WINE_FILENAME_STR "avifil32.dll"
+#define WINE_FILEVERSION 4,3,0,1998
+#define WINE_FILEVERSION_STR "4.03.1998"
+
+#include "wine/wine_common_ver.rc"
 
 /*
  * Everything specific to any language goes

dlls/comctl32/rsrc.rc

@@ -24,10 +24,11 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "comctl32.h"
-#include "wine/wine_common_ver.rc"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
+#include "wine/wine_common_ver.rc"
+
 IDT_CHECK BITMAP LOADONCALL DISCARDABLE
 {
  '42 4D 8E 01 00 00 00 00 00 00 5E 00 00 00 28 00'

dlls/commdlg/cdlg_xx.rc

@@ -25,36 +25,12 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-1 VERSIONINFO
-FILEVERSION	4, 0, 0, 950	/* Maybe 4.1.0.980 for win98?? */
-PRODUCTVERSION	4, 0, 0, 950	/* id. */
-FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-FILEOS		VOS_DOS_WINDOWS16
-FILETYPE	VFT_DLL
-{
-	BLOCK "StringFileInfo"
-	{
-		BLOCK "040604B0"
-		{
-			VALUE "CompanyName", "Wine Developer Team\000"
-			VALUE "FileDescription", "Common Dialog Boxes\000"
-			VALUE "FileVersion", "0.01\000"
-			VALUE "InternalName", "COMDLG32\000"
-			VALUE "LegalCopyright", "Copyright \251 B. A. Stultiens 1998,1999\000"
-			VALUE "OriginalFilename", "COMDLG32.DLL\000"
-			VALUE "ProductName", "Wine\000"
-			VALUE "ProductVersion", "1.00\000"
-		}
-	}
+#define WINE_FILEDESCRIPTION_STR "Common Dialog Boxes"
+#define WINE_FILENAME_STR "comdlg32.dll"
+#define WINE_FILEVERSION 4,0,0,950 /* Maybe 4.1.0.980 for win98?? */
+#define WINE_FILEVERSION_STR "4.0"
 
-	/* Do we need this? It isn't a translation, but we have all languages at once... */
-/*
-	BLOCK "VarFileInfo"
-	{
-		VALUE "Translation", 1030, 1200
-	}
-*/
-}
+#include "wine/wine_common_ver.rc"
 
 /* BINRES pd32_collate.ico */
 PD32_COLLATE ICON DISCARDABLE LOADONCALL pd32_collate.ico

dlls/devenum/devenum.rc

@@ -22,6 +22,15 @@
 #include "winbase.h"
 #include "winnls.h"
 
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define WINE_FILEDESCRIPTION_STR "Wine Device Enumerator Library"
+#define WINE_FILENAME_STR "devenum.dll"
+#define WINE_FILEVERSION 6,3,1,881
+#define WINE_FILEVERSION_STR "6.3.1.881"
+
+#include "wine/wine_common_ver.rc"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
@@ -31,31 +40,3 @@ STRINGTABLE DISCARDABLE
 	9  "Default WaveOut Device"
 	10 "Default MidiOut Device"
 }
-
-1 VERSIONINFO
- FILEVERSION 6,3,1,881
- PRODUCTVERSION 6,3,1,881
- FILEFLAGSMASK 0x30003fL
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "04090000"
-	BEGIN
-            VALUE "CompanyName", "Wine Developer Team\000"
-            VALUE "FileDescription", "Wine Device Enumerator Library\000"
-            VALUE "FileVersion", "6.3.1.881\000"
-            VALUE "InternalName", "DEVENUM\000"
-            VALUE "LegalCopyright", "Copyright \251 2002\000"
-            VALUE "OriginalFilename", "DEVENUM.DLL\000"
-            VALUE "ProductName", "Wine\000"
-            VALUE "ProductVersion", "6.3.1.881\000"
-	END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 0
-    END
-END

dlls/shell32/shell32_xx.rc

@@ -18,30 +18,3 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-1 VERSIONINFO
-FILEVERSION	4, 0, 0, 0457
-PRODUCTVERSION	4, 0, 0, 0457
-FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-FILEOS		VOS_DOS_WINDOWS16
-FILETYPE	VFT_DLL
-{
-	BLOCK "StringFileInfo"
-	{
-		BLOCK "040604B0"
-		{
-			VALUE "CompanyName", "Wine Developer Team\000"
-			VALUE "FileDescription", "Wine  Shell (32bit) Library\000"
-			VALUE "FileVersion", "0.01\000"
-			VALUE "InternalName", "SHELL32\000"
-			VALUE "LegalCopyright", "Copyright \251 2002\000"
-			VALUE "OriginalFilename", "SHELL32.DLL\000"
-			VALUE "ProductName", "Wine\000"
-			VALUE "ProductVersion", "1.00\000"
-		}
-	}
-	BLOCK "VarFileInfo"
-	{
-		VALUE "Translation", 1030, 1200
-	}
-}

dlls/shell32/version.rc

@@ -19,6 +19,8 @@
  */
 
 #define WINE_OLESELFREGISTER
+#define WINE_FILEVERSION 4,0,0,0
+#define WINE_FILEVERSION_STR "4.0"
 #define WINE_FILENAME_STR "shell32.dll"
 
 #include <wine/wine_common_ver.rc>

dlls/shell32/version16.rc

@@ -16,6 +16,7 @@
  * 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"

include/wine/wine_common_ver.rc

@@ -75,7 +75,7 @@ FILESUBTYPE    VFT2_UNKNOWN
 	    VALUE "FileDescription", WINE_FILEDESCRIPTION_STR
 	    VALUE "FileVersion", WINE_FILEVERSION_STR
 	    VALUE "InternalName", WINE_FILENAME_STR
-	    VALUE "LegalCopyright", "Copyright (c) 1993-2001 the Wine project authors " \
+	    VALUE "LegalCopyright", "Copyright (c) 1993-2003 the Wine project authors " \
 				    "(see the file AUTHORS for a complete list)"
 	    VALUE "OriginalFilename", WINE_FILENAME_STR
 	    VALUE "ProductName", WINE_PRODUCTNAME_STR