Changeset 95863 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 27, 2022 1:10:09 AM (3 years ago)

Author:

vboxsync

Message:

VBoxTray/VBoxTray.cpp: Use RTStrPrintf instead of sprintf; in VBOX_WITH_NOCRT_STATIC we have main() function instead of WinMain. Left angry @todo about non-sensical argv handling. bugref:10261

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -225 +225 @@
     g_NotifyIconData.hIcon            = hIcon;
 
-    sprintf(g_NotifyIconData.szTip, "%s Guest Additions %d.%d.%dr%d",
-            VBOX_PRODUCT, VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD, VBOX_SVN_REV);
+    RTStrPrintf(g_NotifyIconData.szTip, sizeof(g_NotifyIconData.szTip), "%s Guest Additions %d.%d.%dr%d",
+                VBOX_PRODUCT, VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD, VBOX_SVN_REV);
 
     int rc = VINF_SUCCESS;
@@ -999 +999 @@
  * Main function
  */
+#ifdef IPRT_NO_CRT
+int main(int cArgs, char **papszArgs)
+#else
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
-{
+#endif
+{
+    char szLogFile[RTPATH_MAX] = {0};
+
+#ifdef IPRT_NO_CRT
+    int rc = RTR3InitExe(cArgs, &papszArgs, RTR3INIT_FLAGS_STANDALONE_APP);
+    if (RT_FAILURE(rc))
+        return RTMsgInitFailure(rc);
+#else
     RT_NOREF(hPrevInstance, lpCmdLine, nCmdShow);
-
+    /** @todo r=bird: WTF do you use __argc & __argv here only to parse the
+     *        command line furthe down?!? Makes no effing sense, espcially given
+     *        that RTR3InitExe will return valid UTF-8, doing exactly the
+     *        same stuff as you do here.
+     *        aaaaaaaaaaaaaaaaaaaaaaaaaaAAAAAAAAAAAAAAAAAAAAAAAAAAARG! */
     int rc = RTR3InitExe(__argc, &__argv, RTR3INIT_FLAGS_STANDALONE_APP);
     if (RT_FAILURE(rc))
@@ -1016 +1031 @@
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to convert the command line: %Rrc", rc);
 
-    char szLogFile[RTPATH_MAX] = {0};
-
     int    cArgs;
     char **papszArgs;
     rc = RTGetOptArgvFromString(&papszArgs, &cArgs, pszCmdLine, RTGETOPTARGV_CNV_QUOTE_MS_CRT, NULL);
     if (RT_SUCCESS(rc))
+#endif
     {
         /*
@@ -1081 +1095 @@
                         rc = RTPathAbs(ValueUnion.psz, szLogFile, sizeof(szLogFile));
                         if (RT_FAILURE(rc))
-                            return RTMsgErrorExit(RTEXITCODE_FAILURE, "Log file path is too long (%Rrc)", rc);
+                            return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAbs failed on log file path: %Rrc (%s)",
+                                                  rc, ValueUnion.psz);
                     }
                     break;
@@ -1103 +1118 @@
         RTGetOptArgvFree(papszArgs);
     }
+#ifndef IPRT_NO_CRT
     else
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptArgvFromString failed: %Rrc", rc);
+#endif
 
     /* Note: Do not use a global namespace ("Global\\") for mutex name here,
@@ -1131 +1148 @@
                     RTSYSTEM_NT_VERSION_GET_MINOR(uNtVersion), RTSYSTEM_NT_VERSION_GET_BUILD(uNtVersion), uNtVersion ));
 
-            /* Save instance handle. */
+            /* Set the instance handle. */
+#ifdef IPRT_NO_CRT
+            g_hInstance = GetModuleHandleW(NULL);
+#else
             g_hInstance = hInstance;
+#endif
 
             hlpReportStatus(VBoxGuestFacilityStatus_Init);