Update Win32 resource files

They still aren't perfectly compliant though...

diff --git a/bin/vlc_win32_rc.rc.in b/bin/vlc_win32_rc.rc.in
index d2bb7fe314f015d2161b9493403cde446a4ffab5..58fc5a9081be0955a84a479ec5d05be1f8b05a41 100644 (file)
--- a/bin/vlc_win32_rc.rc.in
+++ b/bin/vlc_win32_rc.rc.in
@@ -13,14 +13,15 @@ BEGIN
   BEGIN
     BLOCK "040904E4"
     BEGIN
-      VALUE "CompanyName", "the VideoLAN Team"
+      VALUE "CompanyName", "VideoLAN"
       VALUE "ProductName", "VLC media player"
       VALUE "ProductVersion", VERSION_NUMBER_STR
-      VALUE "InternalName", ""
+      VALUE "InternalName", "vlc"
       VALUE "OriginalFilename", "vlc.exe"
       VALUE "FileVersion", "@VERSION@"
-      VALUE "FileDescription", "VLC media player"
-      VALUE "LegalCopyright", "(c) @COPYRIGHT_YEARS@ the VideoLAN Team"
+      VALUE "FileDescription", "VLC media player @VERSION@"
+      VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ VideoLAN and VLC Authors"
+      VALUE "LegalTrademarks", "VLC media player, VideoLAN and x264 are registered trademarks from VideoLAN"
     END
   END
   BLOCK "VarFileInfo"

diff --git a/src/libvlc_win32_rc.rc.in b/src/libvlc_win32_rc.rc.in
index ecd58a1aca66aa759c2c26ec24cbaa6a56035749..8626486be90cddd4f3f0437793b642386df5aee2 100644 (file)
--- a/src/libvlc_win32_rc.rc.in
+++ b/src/libvlc_win32_rc.rc.in
@@ -1,4 +1,5 @@
 #define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@
+#define VERSION_NUMBER_STR "@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@"
 
 1 VERSIONINFO
 FILETYPE 1
@@ -10,10 +11,13 @@ BEGIN
   BEGIN
     BLOCK "040904E4"
     BEGIN
-      VALUE "CompanyName", "the VideoLAN Team"
-      VALUE "FileVersion", "@VERSION@" 
-      VALUE "FileDescription", "VLC media player"
-      VALUE "LegalCopyright", "(c) @COPYRIGHT_YEARS@ the VideoLAN Team"
+      VALUE "CompanyName", "VideoLAN"
+      VALUE "ProductName", "VLC media player"
+      VALUE "ProductVersion", VERSION_NUMBER_STR
+      VALUE "FileVersion", "@VERSION@"
+      VALUE "FileDescription", "VLC media player @VERSION@"
+      VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ VideoLAN and VLC Authors"
+      VALUE "LegalTrademarks", "VLC media player, VideoLAN and x264 are registered trademarks from VideoLAN"
     END
   END
   BLOCK "VarFileInfo"