summaryrefslogtreecommitdiff
path: root/crashrep
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-02-28 13:17:39 +0100
committerAndras Timar <atimar@suse.com>2013-02-28 13:24:57 +0100
commit6851c5fd4337af38884d16c05695da7e4e059dcc (patch)
tree2dd2c7ea52c723d5991f52f825ecb2825efa8a7a /crashrep
parent889ec0e4d4afac36d4d462bfeaf146398baa4082 (diff)
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
Diffstat (limited to 'crashrep')
-rw-r--r--crashrep/WinResTarget_crashrep.mk5
-rw-r--r--crashrep/source/win32/rcheader.txt15
2 files changed, 12 insertions, 8 deletions
diff --git a/crashrep/WinResTarget_crashrep.mk b/crashrep/WinResTarget_crashrep.mk
index 6206dc752927..6036157c8bea 100644
--- a/crashrep/WinResTarget_crashrep.mk
+++ b/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))
diff --git a/crashrep/source/win32/rcheader.txt b/crashrep/source/win32/rcheader.txt
index be3c0600d685..bace84b1ff93 100644
--- a/crashrep/source/win32/rcheader.txt
+++ b/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"
}
}