enhance VersionInfo resource of Windows executables

+ added ProductName (a required parameter), It is LibreOffice
+ CompanyName is configurable, it is $(OOO_VENDOR), that is set
  --with-vendor configure switch. If not set, then CompanyName is
  empty string which is fine, too.
+ Binary file version and FileVersion string show the same value,
  and version number is sane: main version + subversion + microversion
  + build number, such as 3.5.0.0
+ LegalCopyright text is the same as in the About box, year range
  can be set in minor.mk
- removed archaic and overcomplicated version number calculating macros
- removed version.lst, copied relevant content to minor.mk
- removed binary RCDATA resources, I don't think they were of any use

10 files changed, 19 insertions, 8 deletions

diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index 8472601397bc..f3f33f1ee75c 100644
--- a/desktop/WinResTarget_sbase.mk
+++ b/desktop/WinResTarget_sbase.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,sbase/src,\
     -DRES_APP_NAME=sbase \
     -DRES_APP_ICON=icons/base_app.ico \
     -DVERVARIANT=$(BUILD) \
+    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,sbase/src,\
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index 8470b2d23b78..3b9fc0ec9de9 100644
--- a/desktop/WinResTarget_scalc.mk
+++ b/desktop/WinResTarget_scalc.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,scalc/src,\
     -DRES_APP_NAME=scalc \
     -DRES_APP_ICON=icons/calc_app.ico \
     -DVERVARIANT=$(BUILD) \
+    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,scalc/src,\
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
index e208b320558b..9bda5ceb5d48 100644
--- a/desktop/WinResTarget_sdraw.mk
+++ b/desktop/WinResTarget_sdraw.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,sdraw/src,\
     -DRES_APP_NAME=sdraw \
     -DRES_APP_ICON=icons/draw_app.ico \
     -DVERVARIANT=$(BUILD) \
+    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,sdraw/src,\
@@ -46,3 +47,4 @@ $(eval $(call gb_WinResTarget_add_dependency,sdraw/src,\
 $(eval $(call gb_WinResTarget_add_file,sdraw/src,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
+
diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk
index 7d4778f5d9cc..79aa10cc3f7d 100644
--- a/desktop/WinResTarget_simpress.mk
+++ b/desktop/WinResTarget_simpress.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,simpress/src,\
     -DRES_APP_NAME=simpress \
     -DRES_APP_ICON=icons/impress_app.ico \
     -DVERVARIANT=$(BUILD) \
+    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,simpress/src,\
diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk
index f00da3a91663..9dbbcd07d4a4 100644
--- a/desktop/WinResTarget_smath.mk
+++ b/desktop/WinResTarget_smath.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,smath/src,\
     -DRES_APP_NAME=smath \
     -DRES_APP_ICON=icons/math_app.ico \
     -DVERVARIANT=$(BUILD) \
+    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,smath/src,\
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index aa404c3c2239..b1333355a802 100644
--- a/desktop/WinResTarget_soffice.mk
+++ b/desktop/WinResTarget_soffice.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,soffice/src,\
     -DRES_APP_NAME=soffice \
     -DRES_APP_ICON=icons/main_app.ico \
     -DVERVARIANT=$(BUILD) \
+    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,soffice/src,\
diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk
index 0c5cafdee0d4..0ae85d99af39 100644
--- a/desktop/WinResTarget_sweb.mk
+++ b/desktop/WinResTarget_sweb.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,sweb/src,\
     -DRES_APP_NAME=sweb \
     -DRES_APP_ICON=icons/writer_app.ico \
     -DVERVARIANT=$(BUILD) \
+    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,sweb/src,\
diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk
index 59561f69f7f5..7b9ff2fdb149 100644
--- a/desktop/WinResTarget_swriter.mk
+++ b/desktop/WinResTarget_swriter.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,swriter/src,\
     -DRES_APP_NAME=swriter \
     -DRES_APP_ICON=icons/writer_app.ico \
     -DVERVARIANT=$(BUILD) \
+    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,swriter/src,\
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index f968f8ad84d7..b6e2687b0e8a 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -35,8 +35,8 @@
 // -----------------------------------------------------------------------
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-	PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+	FILEVERSION    VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+	PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
 	FILEFLAGSMASK 0x3F
 	FILEFLAGS
 #if defined(DEBUG)
@@ -54,12 +54,13 @@ VS_VERSION_INFO VERSIONINFO
 			BLOCK "040904E4"
 			{
 				// International StringTable
-                VALUE "CompanyName", 		"The Document Foundation\0"
+                VALUE "CompanyName", 		PPS(RES_APP_VENDOR) "\0"
 				VALUE "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
 				VALUE "FileVersion",		PPS(VER_LEVEL) "\0"
 				VALUE "ProductVersion",		PPS(VER_LEVEL) "\0"
-				VALUE "OriginalFilename",	"SOFFICE.EXE\0"
-				VALUE "InternalName", 		"SOFFICE\0"
+				VALUE "ProductName",		"LibreOffice\0"
+				VALUE "OriginalFilename",	PPS(RES_APP_NAME) ".exe\0"
+				VALUE "InternalName", 		PPS(RES_APP_NAME) "\0"
 				VALUE "LegalCopyright", 	S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
 			}
 		}
diff --git a/desktop/win32/source/applauncher/launcher.rc b/desktop/win32/source/applauncher/launcher.rc
index e8715348a680..b7c84b13780f 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -35,8 +35,8 @@
 // -----------------------------------------------------------------------
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-	PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+	FILEVERSION    VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+	PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
 	FILEFLAGSMASK 0x3F
 	FILEFLAGS
 #if defined(DEBUG)
@@ -54,10 +54,11 @@ VS_VERSION_INFO VERSIONINFO
 			BLOCK "040904E4"
 			{
 				// International StringTable
-				VALUE "CompanyName", 		"The Document Foundation\0"
+				VALUE "CompanyName", 		PPS(RES_APP_VENDOR) "\0"
 				VALUE "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
 				VALUE "FileVersion",		PPS(VER_LEVEL) "\0"
 				VALUE "ProductVersion",		PPS(VER_LEVEL) "\0"
+				VALUE "ProductName",		"LibreOffice\0"
 				VALUE "OriginalFilename",	PPS(RES_APP_NAME) ".exe\0"
 				VALUE "InternalName",		PPS(RES_APP_NAME) "\0"
 				VALUE "LegalCopyright", 	S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"