diff --git a/MAKE.bat b/MAKE.bat index e422029..befd161 100644 --- a/MAKE.bat +++ b/MAKE.bat @@ -201,9 +201,9 @@ if "%1"=="push" ( call make.bat tidy git status - if not "%2"=="dp" ( - call MAKE.bat dpush auto - ) + rem if not "%2"=="dp" ( + rem call MAKE.bat dpush auto + rem ) git add . git commit if not "%2"=="local" ( diff --git a/engine/joint/v4k.h b/engine/joint/v4k.h index c82eb4f..b245926 100644 --- a/engine/joint/v4k.h +++ b/engine/joint/v4k.h @@ -357036,5 +357036,6 @@ const struct in6_addr in6addr_any; // = IN6ADDR_ANY_INIT; //static const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; #endif +ifdef(retail, AUTORUN { fclose(stderr); fclose(stdout); } ) #line 0 #endif // V4K_IMPLEMENTATION diff --git a/engine/split/v4k_main.c b/engine/split/v4k_main.c index 4a3defc..33b33af 100644 --- a/engine/split/v4k_main.c +++ b/engine/split/v4k_main.c @@ -126,3 +126,4 @@ const struct in6_addr in6addr_any; // = IN6ADDR_ANY_INIT; //static const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; #endif +ifdef(retail, AUTORUN { fclose(stderr); fclose(stdout); } ) diff --git a/engine/v4k.c b/engine/v4k.c index ac738f7..023c40f 100644 --- a/engine/v4k.c +++ b/engine/v4k.c @@ -26051,4 +26051,5 @@ const struct in6_addr in6addr_any; // = IN6ADDR_ANY_INIT; //static const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; #endif +ifdef(retail, AUTORUN { fclose(stderr); fclose(stdout); } ) #line 0 diff --git a/tools/rh/.gitignore b/tools/rh/.gitignore index 510e5ae..aa02b62 100644 --- a/tools/rh/.gitignore +++ b/tools/rh/.gitignore @@ -1,2 +1,3 @@ ResourceHacker.ini ResourceHacker.def +ResourceHacker.log diff --git a/tools/rh/ReadMe.txt b/tools/rh/ReadMe.txt index 59d23c6..f0db164 100644 --- a/tools/rh/ReadMe.txt +++ b/tools/rh/ReadMe.txt @@ -1,19 +1,22 @@ Resource Hacker™ -Copyright © 1998-2023 Angus Johnson +Version 4.2.0 +Last updated: 20 June 2015 +Copyright © 1999-2015 Angus Johnson Freeware - no nags, no ads and fully functional. Overview: -Resource Hacker™ is a resource editor for 32bit and 64bit Windows® applications. It's both a resource compiler (for *.rc files), and a decompiler - enabling viewing and editing of resources in executables (*.exe; *.dll; *.scr; etc) and compiled resource libraries (*.res, *.mui). While Resource Hacker™ is primarily a GUI application, it also provides many options for compiling and decompiling resources from the command-line. +Resource Hacker™ has been designed to be the complete resource editing tool: compiling, viewing, decompiling and recompiling resources for both 32bit and 64bit Windows executables. Resource Hacker™ can open any type of Windows executable (*.exe; *.dll; *.scr; *.mui etc) so that individual resources can be added modified or deleted within these files. Resource Hacker™ can create and compile resource script files (*.rc), and edit resource files (*.res) too. + Licence to Use - Terms and Conditions: -This Resource Hacker™ software is released as freeware provided that you agree to the following terms and conditions: +This Resource HackerTM software is released as freeware provided that you agree to the following terms and conditions: This software is not to be distributed via any website domain or any other media without the prior written approval of the copyright owner. This software is not to be used in any way to illegally modify software. -DISCLAIMER: A user of this Resource Hacker™ software acknowledges that he or she is receiving this software on an "as is" basis and the user is not relying on the accuracy or functionality of the software for any purpose. The user further acknowledges that any use of this software will be at the user's own risk and the copyright owner accepts no responsibility whatsoever arising from the use or application of the software. +DISCLAIMER: A user of this Resource HackerTM software acknowledges that he or she is receiving this software on an "as is" basis and the user is not relying on the accuracy or functionality of the software for any purpose. The user further acknowledges that any use of this software will be at the user's own risk and the copyright owner accepts no responsibility whatsoever arising from the use or application of the software. The above licence terms constitute "copyright management information" within the meaning of Section 1202 of Title 17 of the United States Code and must not be altered or removed from the licensed works. Their alteration or removal from the licensed works, and the distribution of licensed works without all the above licence terms in an unaltered way, may contravene Section 1202 and give rise civil and/or criminal consequences. diff --git a/tools/rh/ResourceHacker.exe b/tools/rh/ResourceHacker.exe index eaa4a25..769b8ca 100644 Binary files a/tools/rh/ResourceHacker.exe and b/tools/rh/ResourceHacker.exe differ diff --git a/tools/rh/changes.txt b/tools/rh/changes.txt index 559c914..8e047c4 100644 --- a/tools/rh/changes.txt +++ b/tools/rh/changes.txt @@ -1,58 +1,3 @@ -Changes in 5.2.1 - minor bug fixes - Compiled with Delphi 11 (now with overflow checking). -Changes in 5.1.6 - Bugfix: Fixed broken Accelerator compiling. -Changes in 5.1.6 - Bugfix: Commandline syntax bug (some commas required trailing spaces) -Changes in 5.1.5 - Bugfix: Comments within some resource definitions would not compile -Changes in 5.1.4 - Bugfix: Editor font preferences not being applied on restart - Bugfix: Minor buges in commandline processing -Changes in 5.1.2 - Update: Update to commandline sytax and & bugfixes -Changes in 5.1.1 - Bugfix: incorrect editor fonts when displaying multibyte characters - Bugfix: compiler mishandled hex. escape chars with ambiguous trailing text. - Bugfix: incorrect handling of #define directive - Bugfix: incorrect handling of statusbar alignment in dialog resources - Bugfix: line numbering broken when swapping between editing and binary views - Bugfix: relative paths in filenames was broken - Bugfix: incorrect error reporting while parsing some #include files - Bugfix: extracting resources using commandline scripts was buggy. - Added: added support for multi-line comments /* ... */ - Updated: can now open and save non-resource type text files - Updated: context help improved -Changes in 5.0.42 - Added : a new menu resource designer. - Update: the dialog resource designer has had a major update - Added : a optional binary view for every resource type - Update: improved searching (with more context sensitive dialogs) - Bugfix: many bugfixes -Changes in 4.7.34 - Update: The dialog editor has been improved significantly. - Update; The menu editor has had a minor update too. - Bigfix: Saving RC files was saving the compiled script instead. - Other: A number of other minor updates and fixes too. -Changes in 4.6.32 - Bugfix: Fixed bugs when extracting text resources to RC files from the - commandline (related to ansi/unicode conversion). - Update: More logical naming of binary files when extracting to RC files. - Bugfix: Occasionally the pop-up display of menu resources was too narrow - to show all the menu items. - Update: Other minor cosmetic changes and fixes. -Changes in 4.5.28 - Update: Major changes (and improvements) to the commandline syntax -Changes in 4.5.28 - Update: Numerous changes and improvements to command line support. - Update: Filenames in resource scripts are no longer required to be - enclosed within double quotes unless they contain spaces. -Changes in 4.4.24 - Bugfix: The toolbar state wasn't being preserved between sessions -Changes in 4.3.20 - Bugfixes: Numerous fixes to commandline processing - Bugfixes: Other minor fixes Changes in 4.2.5 Bugfix: Compiling Delphi form resources was buggy. Bugfix: Adding a resource to a file without any resources was broken diff --git a/tools/rh/samples/Sample2.dll b/tools/rh/samples/Sample2.dll deleted file mode 100644 index 0d9f9db..0000000 Binary files a/tools/rh/samples/Sample2.dll and /dev/null differ diff --git a/tools/rh/samples/sample1.bmp b/tools/rh/samples/sample1.bmp deleted file mode 100644 index 0c578b2..0000000 Binary files a/tools/rh/samples/sample1.bmp and /dev/null differ diff --git a/tools/rh/samples/sample1.h b/tools/rh/samples/sample1.h deleted file mode 100644 index 2dc0c56..0000000 --- a/tools/rh/samples/sample1.h +++ /dev/null @@ -1,8 +0,0 @@ -#define IDC_ABOUT_BITMAP 100 -#define IDC_ABOUT_TITLE 101 -#define IDC_ABOUT_LINK 102 -#define IDC_ABOUT_OKBTN 103 - -//uncomment the following line to see how the compiler handles errors inside nested INCLUDEs ... -//#defin MISSPELLED_DEFINE - diff --git a/tools/rh/samples/sample1.inc b/tools/rh/samples/sample1.inc deleted file mode 100644 index 24c5d01..0000000 --- a/tools/rh/samples/sample1.inc +++ /dev/null @@ -1,26 +0,0 @@ -//sample1.inc next INCLUDEs sample1.h - demonstrating nested includes :) -#INCLUDE sample1.h - -#define IDS_APP_TITLE "Sample Application" -#define IDS_APP_NAME "SampleApp" -#define IDS_APP_AUTHOR "Angus Johnson" - -#define RELEASE - -#if defined(RELEASE) - #define MAJOR_VERSION 1 - #define MINOR_VERSION 2 - #define RELEASE_NUMBER 3 - //and just showing what's possible ... - #define BUILD_NUMBER (40*(5+5)+56) -#else - #define MAJOR_VERSION 0 - #define MINOR_VERSION 0 - #define RELEASE_NUMBER 0 - #define BUILD_NUMBER 0 -#endif - -//1. concatenating numbers with strings will produce a string variable -//2. to convert a number to a string variable, just concatenate it with an empty string -//3. the compiler will only accept integers (decimal, hex or octal) as numeric values. -#define IDS_DOTTED_VER_NO MAJOR_VERSION + "." + MINOR_VERSION + "." + RELEASE_NUMBER + "." + BUILD_NUMBER diff --git a/tools/rh/samples/sample1.rc b/tools/rh/samples/sample1.rc deleted file mode 100644 index b43f111..0000000 --- a/tools/rh/samples/sample1.rc +++ /dev/null @@ -1,61 +0,0 @@ -//SAMPLE 1 - Compiles a bitmap, a dialog and a version info resource demonstrating nested include statements, special characters & string concatenation. - -100 BITMAP "sample1.bmp" - -//sample1.inc defines several string constants needed for the dialog and it also contains a nested include to sample1.h that defines control IDs. -//I've done things this way simply to show that nested includes are possible. I'm not that suggesting this is normally a good way to do things. :) -#INCLUDE sample1.inc - -//The dialog's caption, and the 2nd to 6th control captions demonstrate -//the compiler's ability to parse escape characters and concatenate strings -//Note: there's no difference between \xFFFF and \uFFFF. Both accept any hexidecimal WORD value and convert it to a character (eg \u9 == \t). - -ABOUT DIALOGEX 0, 0, 179, 109 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION IDS_APP_TITLE + " - About" -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -FONT 9, "Arial" -{ - CONTROL 100, 100, STATIC, SS_BITMAP | WS_CHILD | WS_VISIBLE | WS_GROUP, 16, 12, 54, 54 - CONTROL IDS_APP_TITLE, 101, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 84, 11, 91, 18 - CONTROL "Version " + IDS_DOTTED_VER_NO, -1, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 84, 30, 90, 11 - CONTROL "Angus Johnson \u2764", -1, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 84, 39, 90, 11 - CONTROL "Copyright \xA9 1998-2018", -1, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 84, 50, 90, 11 - CONTROL "http://www.angusj.com", 102, "SysLink", WS_CHILD | WS_VISIBLE | WS_GROUP, 85, 59, 90, 11 , 0x00000000 - CONTROL "", -1, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 80, 179, 1 - CONTROL "hidden", -1, STATIC, SS_LEFT | WS_CHILD | NOT WS_VISIBLE, 16, 90, 26, 11 - CONTROL "&OK", 103, BUTTON, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 87, 58, 16 , 0x00000000 -} - -//String concatenation normally requires a plus (+) between strings. -//However when no parameters are expected to follow a string in a resource definition -//statement, implicit concatenation (ie without a +) is allowed between strings. -//This is demonstrated in the first StringFileInfo VALUE statement below. - -1 VERSIONINFO -FILEVERSION MAJOR_VERSION,MINOR_VERSION,RELEASE_NUMBER,BUILD_NUMBER -PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,RELEASE_NUMBER,BUILD_NUMBER -FILEOS 0x4 -FILETYPE 0x1 -{ -BLOCK "StringFileInfo" -{ - BLOCK "040904b0" - { - VALUE "Comments", IDS_APP_TITLE " - no nags, no ads and fully functional" - VALUE "FileDescription", IDS_APP_TITLE - VALUE "InternalName", IDS_APP_NAME - VALUE "ProductName", IDS_APP_NAME - VALUE "CompanyName", IDS_APP_AUTHOR - VALUE "FileVersion", IDS_DOTTED_VER_NO - VALUE "ProductVersion", IDS_DOTTED_VER_NO - VALUE "LegalCopyright", "Copyright \xA9 1998-2018 " + IDS_APP_AUTHOR - VALUE "OriginalFilename", IDS_APP_NAME - } -} - -BLOCK "VarFileInfo" -{ - VALUE "Translation", 0x0409 0x04B0 -} -}