Changeset 19239 in vbox for trunk/src/VBox/Main/win

Timestamp:

Apr 28, 2009 1:19:14 PM (16 years ago)

Author:

vboxsync

Message:

Main: support for using VBox from Python on Windows (still certain limitation apply, such as enum visibility)

Location:

trunk/src/VBox/Main/win

Files:

• NetIf-win.cpp (modified) (6 diffs)
• dllmain.cpp (modified) (2 diffs)
• svchlp.cpp (modified) (1 diff)

trunk/src/VBox/Main/win/NetIf-win.cpp

@@ -1025 +1025 @@
     if(hr == S_OK)
     {
-        GUID                IfGuid;
-        hr = pIf->COMGETTER(Id)(&IfGuid);
+        Bstr                IfGuid;
+        hr = pIf->COMGETTER(Id)(IfGuid.asOutParam());
         Assert(hr == S_OK);
         if (hr == S_OK)
@@ -1156 +1156 @@
 #else
     HRESULT rc;
-    GUID guid;
-    rc = pIf->COMGETTER(Id) (&guid);
+    Bstr guid;
+    rc = pIf->COMGETTER(Id) (guid.asOutParam());
     if(SUCCEEDED(rc))
     {
@@ -1185 +1185 @@
 
                     d->msgCode = SVCHlpMsg::EnableStaticIpConfig;
-                    d->guid = guid;
+                    d->guid = Guid(guid);
                     d->iface = pIf;
                     d->u.StaticIP.IPAddress = ip;
@@ -1218 +1218 @@
 #else
     HRESULT rc;
-    GUID guid;
-    rc = pIf->COMGETTER(Id) (&guid);
+    Bstr guid;
+    rc = pIf->COMGETTER(Id) (guid.asOutParam());
     if(SUCCEEDED(rc))
     {
@@ -1280 +1280 @@
 #else
     HRESULT rc;
-    GUID guid;
-    rc = pIf->COMGETTER(Id) (&guid);
+    Bstr guid;
+    rc = pIf->COMGETTER(Id) (guid.asOutParam());
     if(SUCCEEDED(rc))
     {
@@ -1340 +1340 @@
 #else
     HRESULT rc;
-    GUID guid;
-    rc = pIf->COMGETTER(Id) (&guid);
+    Bstr guid;
+    rc = pIf->COMGETTER(Id) (guid.asOutParam());
     if(SUCCEEDED(rc))
     {

trunk/src/VBox/Main/win/dllmain.cpp

@@ -28 +28 @@
 #include <atlcom.h>
 
+#include <iprt/initterm.h>
+
 CComModule _Module;
 
@@ -44 +46 @@
         _Module.Init(ObjectMap, hInstance, &LIBID_VirtualBox);
         DisableThreadLibraryCalls(hInstance);
+
+        // idempotent, so doesn't harm, and needed for COM embedding scenario
+        RTR3Init();        
     }
     else if (dwReason == DLL_PROCESS_DETACH)

trunk/src/VBox/Main/win/svchlp.cpp

@@ -248 +248 @@
     int vrc = read (guidStr);
     if (RT_SUCCESS (vrc))
-        aGuid = Guid (guidStr);
+        aGuid = Guid (guidStr.c_str());
     return vrc;
 }