bin PATCH_SO_NAME crack

In VersionInfo of Windows executables the FileDescription property originally contained
80 times 'x' character. These executables were marked as PATCH_SO_NAME and later the
installer maker perl program replaced the xxxxxxxxxxx to the actual file description
which was defined in scp2. WHy was it good, I have no idea. The problem was that it
happened after postprocess, where we signed the binaries, thus diigital signature became
corrupted. It is better to give file descriptions via makefiles.

Change-Id: Id5ad4470bb7a6313b33fbba09d72d9a009163a89

crashrep/WinResTarget_crashrep.mk

@@ -14,7 +14,10 @@ $(eval $(call gb_WinResTarget_use_custom_headers,crashrep,\
 ))
 
 $(eval $(call gb_WinResTarget_add_defs,crashrep,\
-	-DVERVARIANT=$(BUILD) \
+    -DRES_APP_NAME=crashrep \
+    -DRES_APP_FILEDESC="$(PRODUCTNAME) Crashreporter" \
+    -DVERVARIANT=$(BUILD) \
+    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
 $(eval $(call gb_WinResTarget_set_rcfile,crashrep,crashrep/source/win32/crashrep))

crashrep/source/win32/rcheader.txt

@@ -58,13 +58,14 @@ VS_VERSION_INFO versioninfo
 			block "040904E4"
 			{
 				// International StringTable
-				value "CompanyName", 		"The Document Foundation\0"
-				value "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-				value "FileVersion",		PPS(VER_LEVEL) "\0"
-				value "ProductVersion",		PPS(VER_LEVEL) "\0"
-				value "OriginalFilename",	"SOREPORT.EXE\0"
-				value "InternalName", 		"CrashReport\0"
-				value "LegalCopyright", 	S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
+                VALUE "CompanyName",      PPS(RES_APP_VENDOR) "\0"
+                VALUE "FileDescription",  PPS(RES_APP_FILEDESC) "\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"
 			}
 		}
 

desktop/WinResTarget_sbase.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,sbase/src,\
 
 $(eval $(call gb_WinResTarget_add_defs,sbase/src,\
     -DRES_APP_NAME=sbase \
+    -DRES_APP_FILEDESC="$(PRODUCTNAME) Base" \
     -DRES_APP_ICON=icons/base_app.ico \
     -DVERVARIANT=$(BUILD) \
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \

desktop/WinResTarget_scalc.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,scalc/src,\
 
 $(eval $(call gb_WinResTarget_add_defs,scalc/src,\
     -DRES_APP_NAME=scalc \
+    -DRES_APP_FILEDESC="$(PRODUCTNAME) Calc" \
     -DRES_APP_ICON=icons/calc_app.ico \
     -DVERVARIANT=$(BUILD) \
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \

desktop/WinResTarget_sdraw.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,sdraw/src,\
 
 $(eval $(call gb_WinResTarget_add_defs,sdraw/src,\
     -DRES_APP_NAME=sdraw \
+    -DRES_APP_FILEDESC="$(PRODUCTNAME) Draw" \
     -DRES_APP_ICON=icons/draw_app.ico \
     -DVERVARIANT=$(BUILD) \
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \

desktop/WinResTarget_simpress.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,simpress/src,\
 
 $(eval $(call gb_WinResTarget_add_defs,simpress/src,\
     -DRES_APP_NAME=simpress \
+    -DRES_APP_FILEDESC="$(PRODUCTNAME) Impress" \
     -DRES_APP_ICON=icons/impress_app.ico \
     -DVERVARIANT=$(BUILD) \
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \

desktop/WinResTarget_smath.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,smath/src,\
 
 $(eval $(call gb_WinResTarget_add_defs,smath/src,\
     -DRES_APP_NAME=smath \
+    -DRES_APP_FILEDESC="$(PRODUCTNAME) Math" \
     -DRES_APP_ICON=icons/math_app.ico \
     -DVERVARIANT=$(BUILD) \
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \

desktop/WinResTarget_soffice.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,soffice/src,\
 
 $(eval $(call gb_WinResTarget_add_defs,soffice/src,\
     -DRES_APP_NAME=soffice \
+    -DRES_APP_FILEDESC="$(PRODUCTNAME)" \
     -DRES_APP_ICON=icons/main_app.ico \
     -DVERVARIANT=$(BUILD) \
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \

desktop/WinResTarget_sofficebin.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,sofficebin/src,\
 
 $(eval $(call gb_WinResTarget_add_defs,sofficebin/src,\
     -DRES_APP_NAME=soffice \
+    -DRES_APP_FILEDESC="$(PRODUCTNAME)" \
     -DRES_APP_ICON=icons/main_app.ico \
     -DVERVARIANT=$(BUILD) \
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \

desktop/WinResTarget_sweb.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,sweb/src,\
 
 $(eval $(call gb_WinResTarget_add_defs,sweb/src,\
     -DRES_APP_NAME=sweb \
+    -DRES_APP_FILEDESC="$(PRODUCTNAME) Writer (Web)" \
     -DRES_APP_ICON=icons/writer_app.ico \
     -DVERVARIANT=$(BUILD) \
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \

desktop/WinResTarget_swriter.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,swriter/src,\
 
 $(eval $(call gb_WinResTarget_add_defs,swriter/src,\
     -DRES_APP_NAME=swriter \
+    -DRES_APP_FILEDESC="$(PRODUCTNAME) Writer" \
     -DRES_APP_ICON=icons/writer_app.ico \
     -DVERVARIANT=$(BUILD) \
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \

desktop/util/officeloader.rc

@@ -44,7 +44,7 @@ VS_VERSION_INFO VERSIONINFO
             {
                 // International StringTable
                 VALUE "CompanyName",      PPS(RES_APP_VENDOR) "\0"
-                VALUE "FileDescription",  "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
+                VALUE "FileDescription",  PPS(RES_APP_FILEDESC) "\0"
                 VALUE "FileVersion",      PPS(VER_LEVEL) "\0"
                 VALUE "ProductVersion",   PPS(VER_LEVEL) "\0"
                 VALUE "ProductName",      "LibreOffice\0"

desktop/win32/source/applauncher/launcher.rc

@@ -44,7 +44,7 @@ VS_VERSION_INFO VERSIONINFO
             {
                 // International StringTable
                 VALUE "CompanyName",      PPS(RES_APP_VENDOR) "\0"
-                VALUE "FileDescription",  "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
+                VALUE "FileDescription",  PPS(RES_APP_FILEDESC) "\0"
                 VALUE "FileVersion",      PPS(VER_LEVEL) "\0"
                 VALUE "ProductVersion",   PPS(VER_LEVEL) "\0"
                 VALUE "ProductName",      "LibreOffice\0"

scp2/source/base/file_base.scp

@@ -31,12 +31,7 @@ File gid_File_Exe_Sbase
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(sbase);
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Base";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
     Styles = (PACKED);
-  #endif
 End
 
 #if defined WNT

scp2/source/calc/file_calc.scp

@@ -82,10 +82,5 @@ File gid_File_Exe_Scalc
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(scalc);
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Calc";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
     Styles = (PACKED);
-  #endif
 End

scp2/source/crashrep/file_crashrep.scp

@@ -33,12 +33,7 @@ File gid_Brand_File_Bin_Crashreport
     BIN_FILE_BODY;
     Name = EXENAME(crashrep);
     Dir = gid_Brand_Dir_Program;
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Crashreporter";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
     Styles = (PACKED);
-  #endif
 End
 
 #ifdef WNT

scp2/source/draw/file_draw.scp

@@ -47,10 +47,5 @@ File gid_File_Exe_Sdraw
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(sdraw);
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Draw";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
     Styles = (PACKED);
-  #endif
 End

scp2/source/impress/file_impress.scp

@@ -68,12 +68,7 @@ File gid_File_Exe_Simpress
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(simpress);
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Impress";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
     Styles = (PACKED);
-  #endif
 End
 
 // configuration files for custom animation effects

scp2/source/math/file_math.scp

@@ -63,10 +63,5 @@ File gid_File_Exe_Smath
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(smath);
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Math";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
     Styles = (PACKED);
-  #endif
 End

scp2/source/ooo/common_brand.scp

@@ -495,11 +495,7 @@ File gid_Brand_File_Bin_Soffice
     Styles = (PACKED, SUBST_FILENAME);
 #else
     Name = EXENAME(soffice);
-  #ifdef WNT
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
     Styles = (PACKED);
-  #endif
 #endif
 End
 
@@ -515,11 +511,7 @@ End
 File gid_Brand_File_Bin_Soffice_Bin
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-#if defined WNT
-    Styles = (PACKED, PATCH_SO_NAME);
-#else
     Styles = (PACKED);
-#endif
     Name = "soffice.bin";
 End
 

scp2/source/writer/file_writer.scp

@@ -35,12 +35,7 @@ File gid_File_Exe_Swriter
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(swriter);
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Writer";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
     Styles = (PACKED);
-  #endif
 End
 
 #ifdef WNT
@@ -48,8 +43,7 @@ File gid_File_Exe_Sweb
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(sweb);
-    FileDescription = "%PRODUCTNAME Writer(Web)";
-    Styles = (PACKED, PATCH_SO_NAME);
+    Styles = (PACKED);
 End
 #endif