Changeset 7987 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 15, 2008 1:29:05 PM (17 years ago)

Author:

vboxsync

Message:

Backed out 29633 & 29635 for now

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManage.cpp (modified) (5 diffs)
• VirtualBox/src/HappyHttp.cpp (modified) (1 diff)
• VirtualBox/src/main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -326 +326 @@
                  "                            [-acpi on|off]\n"
                  "                            [-ioapic on|off]\n"
-                 "                            [-pae on|off]\n"
                  "                            [-hwvirtex on|off|default]\n"
                  "                            [-monitorcount <number>]\n"
@@ -920 +919 @@
     else
         RTPrintf("IOAPIC:          %s\n", ioapicEnabled ? "on" : "off");
-
-    BOOL PAEEnabled;
-    machine->COMGETTER(PAEEnabled)(&PAEEnabled);
-    if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("pae=\"%s\"\n", PAEEnabled ? "on" : "off");
-    else
-        RTPrintf("PAE: %s\n", PAEEnabled ? "on" : "off");
 
     LONG64 timeOffset;
@@ -3722 +3714 @@
     char *acpi = NULL;
     char *hwvirtex = NULL;
-    char *pae = NULL;
     char *ioapic = NULL;
     int monitorcount = -1;
@@ -3859 +3850 @@
             hwvirtex = argv[i];
         }
-        else if (strcmp(argv[i], "-pae") == 0)
-        {
-            if (argc <= i + 1)
-            {
-                return errorArgument("Missing argument to '%s'", argv[i]);
-            }
-            i++;
-            pae = argv[i];
-        }
         else if (strcmp(argv[i], "-monitorcount") == 0)
         {
@@ -4551 +4533 @@
             {
                 errorArgument("Invalid -hwvirtex argument '%s'", hwvirtex);
-                rc = E_FAIL;
-                break;
-            }
-        }
-        if (pae)
-        {
-            if (strcmp(pae, "on") == 0)
-            {
-                CHECK_ERROR(machine, COMSETTER(PAEEnabled)(true));
-            }
-            else if (strcmp(pae, "off") == 0)
-            {
-                CHECK_ERROR(machine, COMSETTER(PAEEnabled)(false));
-            }
-            else
-            {
-                errorArgument("Invalid -pae argument '%s'", ioapic);
                 rc = E_FAIL;
                 break;

trunk/src/VBox/Frontends/VirtualBox/src/HappyHttp.cpp

@@ -272 +272 @@
     m_Sock(-1)
 {
-#ifdef RT_OS_WINDOWS
-    WSADATA wsaData;
-
-    int ret = WSAStartup(MAKEWORD(1,1), &wsaData);
-#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -168 +168 @@
          * thread to several seconds). */
         PlaySound (NULL, NULL, 0);
+
+    /* Initialize windows sockets for the process */
+    WSADATA wsaData;
+    int ret = WSAStartup(MAKEWORD(1,1), &wsaData);
 #endif