Changeset 48323 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Sep 5, 2013 7:41:45 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

88751

Message:

Main,Installer: 32-bit on 64-bit COM API support (windows). Currently disabled

Location:

trunk/src/VBox/Main/src-client/win

Files:

• VBoxClient-x86.def (copied) (copied from trunk/src/VBox/Main/src-client/win/VBoxC.def ) (3 diffs)
• VBoxClient-x86.rc (copied) (copied from trunk/src/VBox/Main/src-client/win/VBoxC.rc ) (2 diffs)
• dllmain.cpp (modified) (11 diffs)

trunk/src/VBox/Main/src-client/win/VBoxClient-x86.def

@@ +1 @@
+; $Id$
 ;; @file
-;
-; VBoxC DLL Definition File.
+; VBoxClient-x86 DLL Definition File.
 ;
 
-; Copyright (C) 2006-2010 Oracle Corporation
+;
+; Copyright (C) 2006-2013 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -15 +16 @@
 ;
 
-LIBRARY VBoxC.dll
+LIBRARY VBoxClient-x86.dll
 
 EXPORTS
@@ -23 +24 @@
     DllRegisterServer   PRIVATE
     DllUnregisterServer PRIVATE
-    ; private entry points
-    VBoxDriversRegister PRIVATE
+

trunk/src/VBox/Main/src-client/win/VBoxClient-x86.rc

@@ -39 +39 @@
     BEGIN
     VALUE "CompanyName",     VBOX_RC_COMPANY_NAME
-    VALUE "FileDescription", "VirtualBox Interface\0"
+    VALUE "FileDescription", "VirtualBox Interface (32-bit)\0"
     VALUE "FileVersion",     VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
-    VALUE "InternalName",    "VBoxC.dll\0"
+    VALUE "InternalName",    "VBoxClient-x86.dll\0"
     VALUE "LegalCopyright",  VBOX_RC_LEGAL_COPYRIGHT
-    VALUE "OriginalFilename","VBoxC.dll\0"
+    VALUE "OriginalFilename","VBoxClient-x86.dll\0"
     VALUE "ProductName",     VBOX_PRODUCT "\0"
     VALUE "ProductVersion",  VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
@@ -62 +62 @@
 //
 
-IDR_VIRTUALBOX REGISTRY "VBoxC.rgs"
+IDR_VIRTUALBOX REGISTRY "VBoxClient-x86.rgs"
 
-1 TYPELIB "VirtualBox.tlb"
+1 TYPELIB "VirtualBox-x86.tlb"
+

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

@@ -32 +32 @@
 #include <iprt/string.h>
 
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
 CComModule _Module;
 
@@ -40 +44 @@
 
 
+/** @def WITH_MANUAL_CLEANUP
+ * Manually clean up the registry. */
+#if defined(DEBUG) && !defined(VBOX_IN_32_ON_64_MAIN_API)
+//# define WITH_MANUAL_CLEANUP
+#endif
+
+
+#ifndef WITH_MANUAL_CLEANUP
+/** Type library GUIDs to clean up manually. */
+static const char * const g_apszTypelibGuids[] =
+{
+    "{46137EEC-703B-4FE5-AFD4-7C9BBBBA0259}",
+    "{d7569351-1750-46f0-936e-bd127d5bc264}",
+};
+
+/** Same as above but with a "Typelib\\" prefix. */
+static const char * const g_apszTypelibGuidKeys[] =
+{
+    "TypeLib\\{46137EEC-703B-4FE5-AFD4-7C9BBBBA0259}",
+    "TypeLib\\{d7569351-1750-46f0-936e-bd127d5bc264}",
+};
+
+/** Type library version to clean up manually. */
+static const char * const g_apszTypelibVersions[] =
+{
+    "1.0",
+    "1.3",
+};
+#endif
+
+
 /*******************************************************************************
 *   Internal Functions                                                         *
 *******************************************************************************/
+#ifndef WITH_MANUAL_CLEANUP
 static void removeOldMess(void);
+#endif
 
 
@@ -89 +126 @@
 {
     // registers object, typelib and all interfaces in typelib
-    removeOldMess();
     return _Module.RegisterServer(TRUE);
 }
@@ -98 +134 @@
 STDAPI DllUnregisterServer(void)
 {
-    return _Module.UnregisterServer(TRUE);
-}
-
-
-
-/**
- * Hack to clean out the interfaces belonging to the old typelib on development
+    HRESULT hrc = _Module.UnregisterServer(TRUE);
+#ifndef WITH_MANUAL_CLEANUP
+    removeOldMess();
+#endif
+    return hrc;
+}
+
+#ifndef WITH_MANUAL_CLEANUP
+
+/**
+ * Checks if the typelib GUID is one of the ones we wish to clean up.
+ *
+ * @returns true if it should be cleaned up, false if not.
+ * @param   pszTypelibGuid  The typelib GUID as bracketed string.
+ */
+static bool isTypelibGuidToRemove(const char *pszTypelibGuid)
+{
+    unsigned i = RT_ELEMENTS(g_apszTypelibGuids);
+    while (i-- > 0)
+        if (!stricmp(g_apszTypelibGuids[i], pszTypelibGuid))
+            return true;
+    return false;
+}
+
+
+/**
+ * Checks if the typelib version is one of the ones we wish to clean up.
+ *
+ * @returns true if it should be cleaned up, false if not.
+ * @param   pszTypelibVer   The typelib version as string.
+ */
+static bool isTypelibVersionToRemove(const char *pszTypelibVer)
+{
+    unsigned i = RT_ELEMENTS(g_apszTypelibVersions);
+    while (i-- > 0)
+        if (!strcmp(g_apszTypelibVersions[i], pszTypelibVer))
+            return true;
+    return false;
+}
+
+
+/**
+ * Hack to clean out the class IDs belonging to obsolete typelibs on development
  * boxes and such likes.
+ */
+static void removeOldClassIDs(HKEY hkeyClassesRoot)
+{
+    HKEY hkeyClsId;
+    LONG rc = RegOpenKeyExA(hkeyClassesRoot, "CLSID", NULL, DELETE | KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE,
+                            &hkeyClsId);
+    if (rc == ERROR_SUCCESS)
+    {
+        for (DWORD idxKey = 0;; idxKey++)
+        {
+            char szCurNm[128 + 128];
+            DWORD cbCurNm = 128;
+            rc = RegEnumKeyExA(hkeyClsId, idxKey, szCurNm, &cbCurNm, NULL, NULL, NULL, NULL);
+            if (rc == ERROR_NO_MORE_ITEMS)
+                break;
+
+            /*
+             * Get the typelib GUID and program ID with the class ID.
+             */
+            AssertBreak(rc == ERROR_SUCCESS);
+            strcpy(&szCurNm[cbCurNm], "\\TypeLib");
+            HKEY hkeyIfTypelib;
+            rc = RegOpenKeyExA(hkeyClsId, szCurNm, NULL, KEY_QUERY_VALUE, &hkeyIfTypelib);
+            if (rc != ERROR_SUCCESS)
+                continue;
+
+            char szTypelibGuid[128];
+            DWORD cbValue = sizeof(szTypelibGuid) - 1;
+            rc = RegQueryValueExA(hkeyIfTypelib, NULL, NULL, NULL, (PBYTE)&szTypelibGuid[0], &cbValue);
+            if (rc != ERROR_SUCCESS)
+                cbValue = 0;
+            szTypelibGuid[cbValue] = '\0';
+            RegCloseKey(hkeyIfTypelib);
+            if (!isTypelibGuidToRemove(szTypelibGuid))
+                continue;
+
+            /* ProgId */
+            strcpy(&szCurNm[cbCurNm], "\\ProgId");
+            HKEY hkeyIfProgId;
+            rc = RegOpenKeyExA(hkeyClsId, szCurNm, NULL, KEY_QUERY_VALUE, &hkeyIfProgId);
+            if (rc != ERROR_SUCCESS)
+                continue;
+
+            char szProgId[64];
+            cbValue = sizeof(szProgId) - 1;
+            rc = RegQueryValueExA(hkeyClsId, NULL, NULL, NULL, (PBYTE)&szProgId[0], &cbValue);
+            if (rc != ERROR_SUCCESS)
+                cbValue = 0;
+            szProgId[cbValue] = '\0';
+            RegCloseKey(hkeyClsId);
+            if (strnicmp(szProgId, RT_STR_TUPLE("VirtualBox.")))
+                continue;
+
+            /*
+             * Ok, it's an orphaned VirtualBox interface. Delete it.
+             */
+            szCurNm[cbCurNm] = '\0';
+            RTAssertMsg2("Should delete HCR/CLSID/%s\n", szCurNm);
+            //rc = SHDeleteKeyA(hkeyClsId, szCurNm);
+            Assert(rc == ERROR_SUCCESS);
+        }
+
+        RegCloseKey(hkeyClsId);
+    }
+}
+
+
+/**
+ * Hack to clean out the interfaces belonging to obsolete typelibs on
+ * development boxes and such likes.
  */
 static void removeOldInterfaces(HKEY hkeyClassesRoot)
@@ -138 +280 @@
                 cbValue = 0;
             szTypelibGuid[cbValue] = '\0';
-            if (strcmp(szTypelibGuid, "{46137EEC-703B-4FE5-AFD4-7C9BBBBA0259}"))
+            if (!isTypelibGuidToRemove(szTypelibGuid))
             {
                 RegCloseKey(hkeyIfTypelib);
@@ -153 +295 @@
             RegCloseKey(hkeyIfTypelib);
 
-            if (strcmp(szTypelibVer, "1.3"))
+            if (!isTypelibVersionToRemove(szTypelibVer))
                 continue;
 
@@ -172 +314 @@
 
 /**
- * Hack to clean out the old typelib on development boxes and such.
+ * Hack to clean obsolete typelibs on development boxes and such.
  */
 static void removeOldTypelib(HKEY hkeyClassesRoot)
@@ -179 +321 @@
      * Open it and verify the identity.
      */
-    HKEY hkeyOldTyplib;
-    LONG rc = RegOpenKeyExA(hkeyClassesRoot, "TypeLib\\{46137EEC-703B-4FE5-AFD4-7C9BBBBA0259}", NULL,
-                            DELETE | KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, &hkeyOldTyplib);
-    if (rc == ERROR_SUCCESS)
-    {
-        HKEY hkeyVer1Dot3;
-        rc = RegOpenKeyExA(hkeyOldTyplib, "1.3", NULL, KEY_READ, &hkeyVer1Dot3);
+    unsigned i = RT_ELEMENTS(g_apszTypelibGuidKeys);
+    while (i-- > 0)
+    {
+        HKEY hkeyTyplib;
+        LONG rc = RegOpenKeyExA(hkeyClassesRoot, g_apszTypelibGuidKeys[i], NULL,
+                                DELETE | KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, &hkeyTyplib);
         if (rc == ERROR_SUCCESS)
         {
-            char szValue[128];
-            DWORD cbValue = sizeof(szValue) - 1;
-            rc = RegQueryValueExA(hkeyVer1Dot3, NULL, NULL, NULL, (PBYTE)&szValue[0], &cbValue);
-            if (rc == ERROR_SUCCESS)
+            unsigned iVer = RT_ELEMENTS(g_apszTypelibVersions);
+            while (iVer-- > 0)
             {
-                szValue[cbValue] = '\0';
-                if (!strcmp(szValue, "VirtualBox Type Library"))
+                HKEY hkeyVer;
+                rc = RegOpenKeyExA(hkeyTyplib, g_apszTypelibVersions[iVer], NULL, KEY_READ, &hkeyVer);
+                if (rc == ERROR_SUCCESS)
                 {
-                    RegCloseKey(hkeyVer1Dot3);
-                    hkeyVer1Dot3 = NULL;
-
-                    /*
-                     * Delete the type library.
-                     */
-                    //RTAssertMsg2("Should delete HCR/TypeLib/{46137EEC-703B-4FE5-AFD4-7C9BBBBA0259}/1.3\n");
-                    rc = SHDeleteKeyA(hkeyOldTyplib, "1.3");
-                    Assert(rc == ERROR_SUCCESS);
+                    char szValue[128];
+                    DWORD cbValue = sizeof(szValue) - 1;
+                    rc = RegQueryValueExA(hkeyVer, NULL, NULL, NULL, (PBYTE)&szValue[0], &cbValue);
+                    if (rc == ERROR_SUCCESS)
+                    {
+                        szValue[cbValue] = '\0';
+                        if (!strcmp(szValue, "VirtualBox Type Library"))
+                        {
+                            RegCloseKey(hkeyVer);
+                            hkeyVer = NULL;
+
+                            /*
+                             * Delete the type library.
+                             */
+                            //RTAssertMsg2("Should delete HCR\\%s\\%s\n", g_apszTypelibGuidKeys[i], g_apszTypelibVersions[iVer]);
+                            rc = SHDeleteKeyA(hkeyTyplib, g_apszTypelibVersions[iVer]);
+                            Assert(rc == ERROR_SUCCESS);
+                        }
+                    }
+
+                    if (hkeyVer != NULL)
+                        RegCloseKey(hkeyVer);
                 }
             }
-
-            if (hkeyVer1Dot3 != NULL)
-                RegCloseKey(hkeyVer1Dot3);
+            RegCloseKey(hkeyTyplib);
+
+            /*
+             * The typelib key should be empty now, so we can try remove it (non-recursively).
+             */
+            rc = RegDeleteKeyA(hkeyClassesRoot, g_apszTypelibGuidKeys[i]);
+            Assert(rc == ERROR_SUCCESS);
         }
-        RegCloseKey(hkeyOldTyplib);
-
-        /*
-         * The typelib key should be empty now, so we can try remove it (non-recursively).
-         */
-        rc = RegDeleteKeyA(hkeyClassesRoot, "TypeLib\\{46137EEC-703B-4FE5-AFD4-7C9BBBBA0259}");
-        Assert(rc == ERROR_SUCCESS);
-    }
-}
-
-
-/**
- * Hack to clean out the old typelib on development boxes and such.
+    }
+}
+
+
+/**
+ * Hack to clean out obsolete typelibs on development boxes and such.
  */
 static void removeOldMess(void)
@@ -232 +382 @@
     removeOldTypelib(HKEY_CLASSES_ROOT);
     removeOldInterfaces(HKEY_CLASSES_ROOT);
+    removeOldClassIDs(HKEY_CLASSES_ROOT);
 
     /*
@@ -243 +394 @@
         removeOldTypelib(hkeyWow64);
         removeOldInterfaces(hkeyWow64);
+        removeOldClassIDs(hkeyWow64);
 
         RegCloseKey(hkeyWow64);
@@ -248 +400 @@
 }
 
+#endif /* WITH_MANUAL_CLEANUP */
+