again

CMakeLists.txt

@@ -27,6 +27,11 @@ if (WIN32 AND NOT MSVC)
     set(CMAKE_CXX_COMPILER "C:/TDM-GCC-64/bin/g++.exe" CACHE FILEPATH "C++ Compiler" FORCE)
     message(STATUS "[UMSKT] Forcing use of TDM-GCC in C:/TDM-GCC-64")
     
+    # Add size optimization flags for GCC
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os -s -fno-exceptions -fno-rtti -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -fno-stack-protector")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os -s -fno-exceptions -fno-rtti -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -fno-stack-protector")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -Wl,--gc-sections -Wl,--strip-all")
+    
     # Configure windres for resource compilation
     set(CMAKE_RC_COMPILER "C:/TDM-GCC-64/bin/windres.exe")
     set(CMAKE_RC_COMPILER_INIT windres)
@@ -123,13 +128,13 @@ ENDIF()
 IF(MSVC)
     SET(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
     IF(NOT BUILD_SHARED_LIBS)
-        SET(CMAKE_CXX_FLAGS_RELEASE "/MT")
+        SET(CMAKE_CXX_FLAGS_RELEASE "/MT /Os /GL /GS- /Gy")
         SET(CMAKE_CXX_FLAGS_DEBUG "/MTd")
     ELSE()
-        SET(CMAKE_CXX_FLAGS_RELEASE "/MD")
+        SET(CMAKE_CXX_FLAGS_RELEASE "/MD /Os /GL /GS- /Gy")
         SET(CMAKE_CXX_FLAGS_DEBUG "/MDd")
     ENDIF()
-    SET(CMAKE_EXE_LINKER_FLAGS "/INCREMENTAL:NO /NODEFAULTLIB:MSVCRT")
+    SET(CMAKE_EXE_LINKER_FLAGS "/INCREMENTAL:NO /NODEFAULTLIB:MSVCRT /OPT:REF /OPT:ICF")
     SET(CMAKE_ENABLE_EXPORTS ON)
     SET(UMSKT_EXE_WINDOWS_EXTRA src/windows/umskt.rc)
     SET(UMSKT_EXE_WINDOWS_DLL src/windows/dllmain.cpp)

src/cli.cpp

@@ -61,7 +61,7 @@ void CLI::showHelp(char *argv[]) {
     fmt::print("\t-v --verbose\tenable verbose output\n");
     fmt::print("\t-n --number\tnumber of keys to generate (defaults to 1)\n");
     fmt::print("\t-f --file\tspecify which keys file to load\n");
-    fmt::print("\t-i --instid\tinstallation ID used to generate confirmation ID\n");
+    fmt::print("\t-i --instid\tinstallation ID used to generate confirmation ID (reads from stdin if no argument provided)\n");
     fmt::print("\t-m --mode\tproduct family to activate.\n\t\t\tvalid options are \"WINDOWS\", \"OFFICEXP\", \"OFFICE2K3\", \"OFFICE2K7\" or \"PLUSDME\"\n\t\t\t(defaults to \"WINDOWS\")\n");
     fmt::print("\t-p --productid\tthe product ID of the Program to activate. only required for Office 2K3 and Office 2K7 programs\n");
     fmt::print("\t-b --binkid\tspecify which BINK identifier to load (defaults to 2E)\n");
@@ -168,14 +168,14 @@ int CLI::parseCommandLine(int argc, char* argv[], Options* options) {
             options->keysFilename = argv[i+1];
             i++;
         } else if (arg == "-i" || arg == "--instid") {
-            if (i == argc - 1) {
-                options->error = true;
-                break;
-            }
-
-            options->instid = argv[i+1];
             options->applicationMode = MODE_CONFIRMATION_ID;
+            if (i == argc - 1 || argv[i+1][0] == '-') {
+                // No argument provided, will read from stdin later
+                options->instid = "";
+            } else {
+                options->instid = argv[i+1];
                 i++;
+            }
         } else if (arg == "-m" || arg == "--mode") {
             std::string mode = argv[i+1];
             char *p = &mode[0];
@@ -369,6 +369,12 @@ bool CLI::stripKey(const char *in_key, char out_key[PK_LENGTH]) {
     return (i == PK_LENGTH);
 }
 
+std::string CLI::readFromStdin() {
+    std::string input;
+    std::getline(std::cin, input);
+    return input;
+}
+
 CLI::CLI(Options options, json keys) {
     this->options = options;
     this->keys = keys;
@@ -572,7 +578,14 @@ int CLI::BINK2002Validate() {
 
 int CLI::ConfirmationID() {
     char confirmation_id[49];
-    int err = ConfirmationID::Generate(this->options.instid.c_str(), confirmation_id, options.activationMode, options.productid, options.overrideVersion);
+    std::string instid = this->options.instid;
+    
+    // If instid is empty, read from stdin
+    if (instid.empty()) {
+        instid = readFromStdin();
+    }
+    
+    int err = ConfirmationID::Generate(instid.c_str(), confirmation_id, options.activationMode, options.productid, options.overrideVersion);
 
     switch (err) {
         case ERR_TOO_SHORT:

src/cli.h

@@ -96,6 +96,7 @@ public:
     static void printID(DWORD *pid);
     void printKey(char *pk);
     static bool stripKey(const char *in_key, char out_key[PK_LENGTH]);
+    static std::string readFromStdin();
 
     int BINK1998Generate();
     int BINK2002Generate();