- activex: globally use win32 unicode APIs, hopefully this will fix reported registra...

diff --git a/activex/main.cpp b/activex/main.cpp
index f40854ad4cf1b2ad95c0a146aca8f048ca12cc9f..43c7b3bfd0adac335f26a7fda6bcf4eacf382147 100644 (file)
--- a/activex/main.cpp
+++ b/activex/main.cpp
@@ -29,6 +29,7 @@
 #include <windows.h>
 #include <shlwapi.h>
 
+#include <tchar.h>
 #include <guiddef.h>
 
 using namespace std;
@@ -80,10 +81,10 @@ STDAPI DllCanUnloadNow(VOID)
     return (0 == i_class_ref) ? S_OK: S_FALSE;
 };
 
-static inline HKEY keyCreate(HKEY parentKey, LPCSTR keyName)
+static inline HKEY keyCreate(HKEY parentKey, LPCTSTR keyName)
 {
     HKEY childKey;
-    if( ERROR_SUCCESS == RegCreateKeyExA(parentKey, keyName, 0, NULL,
+    if( ERROR_SUCCESS == RegCreateKeyEx(parentKey, keyName, 0, NULL,
                 REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &childKey, NULL) )
     {
         return childKey;
@@ -91,24 +92,24 @@ static inline HKEY keyCreate(HKEY parentKey, LPCSTR keyName)
     return NULL;
 };
 
-static inline HKEY keySet(HKEY hKey, LPCSTR valueName, const void *s, size_t len)
+static inline HKEY keySet(HKEY hKey, LPCTSTR valueName, const void *s, size_t len, DWORD dwType = REG_SZ)
 {
     if( NULL != hKey )
     {
-        RegSetValueExA(hKey, valueName, 0, REG_SZ,
+        RegSetValueEx(hKey, valueName, 0, dwType,
             (const BYTE*)s, len);
     }
     return hKey;
 };
 
-static inline HKEY keySetDef(HKEY hKey, const void *s, size_t len)
+static inline HKEY keySetDef(HKEY hKey, const void *s, size_t len, DWORD dwType = REG_SZ)
 {
-    return keySet(hKey, NULL, s, len);
+    return keySet(hKey, NULL, s, len, dwType);
 };
 
-static inline HKEY keySetDef(HKEY hKey, LPCSTR s)
+static inline HKEY keySetDef(HKEY hKey, LPCTSTR s)
 {
-    return keySetDef(hKey, s, strlen(s)+1);
+    return keySetDef(hKey, s, sizeof(TCHAR)*(_tcslen(s)+1), REG_SZ);
 };
 
 static inline HKEY keyClose(HKEY hKey)
@@ -122,23 +123,21 @@ static inline HKEY keyClose(HKEY hKey)
 
 static HRESULT UnregisterProgID(REFCLSID rclsid, unsigned int version)
 {
-    LPCSTR psz_CLSID = CStrFromGUID(rclsid);
+    OLECHAR szCLSID[GUID_STRLEN];
 
-    if( NULL == psz_CLSID )
-        return E_OUTOFMEMORY;
+    StringFromGUID2(rclsid, szCLSID, GUID_STRLEN);
 
-    char progId[sizeof(PROGID_STR)+16];
-    sprintf(progId, "%s.%u", PROGID_STR, version);
+    TCHAR progId[sizeof(PROGID_STR)+16];
+    _stprintf(progId, TEXT("%s.%u"), TEXT(PROGID_STR), version);
 
-    SHDeleteKeyA(HKEY_CLASSES_ROOT, progId);
+    SHDeleteKey(HKEY_CLASSES_ROOT, progId);
 
     HKEY hClsIDKey;
-    if( ERROR_SUCCESS == RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_WRITE, &hClsIDKey) )
+    if( ERROR_SUCCESS == RegOpenKeyEx(HKEY_CLASSES_ROOT, TEXT("CLSID"), 0, KEY_WRITE, &hClsIDKey) )
     {
-        SHDeleteKey(hClsIDKey, psz_CLSID);
+        SHDeleteKey(hClsIDKey, szCLSID);
         RegCloseKey(hClsIDKey);
     }
-    CoTaskMemFree((void *)psz_CLSID);
 };
 
 STDAPI DllUnregisterServer(VOID)
@@ -173,20 +172,19 @@ STDAPI DllUnregisterServer(VOID)
     return S_OK;
 };
 
-static HRESULT RegisterClassID(HKEY hParent, REFCLSID rclsid, unsigned int version, BOOL isDefault, const char *path, size_t pathLen)
+static HRESULT RegisterClassID(HKEY hParent, REFCLSID rclsid, unsigned int version, BOOL isDefault, LPCTSTR path, size_t pathLen)
 {
-    char progId[sizeof(PROGID_STR)+16];
-    sprintf(progId, "%s.%u", PROGID_STR, version);
+    TCHAR progId[sizeof(PROGID_STR)+16];
+    _stprintf(progId, TEXT("%s.%u"), TEXT(PROGID_STR), version);
 
-    char description[sizeof(DESCRIPTION)+16];
-    sprintf(description, "%s v%u", DESCRIPTION, version);
+    TCHAR description[sizeof(DESCRIPTION)+16];
+    _stprintf(description, TEXT("%s v%u"), TEXT(DESCRIPTION), version);
 
     HKEY hClassKey;
     {
-        LPCSTR psz_CLSID = CStrFromGUID(rclsid);
+        OLECHAR szCLSID[GUID_STRLEN];
 
-        if( NULL == psz_CLSID )
-            return E_OUTOFMEMORY;
+        StringFromGUID2(rclsid, szCLSID, GUID_STRLEN);
 
         HKEY hProgKey = keyCreate(HKEY_CLASSES_ROOT, progId);
         if( NULL != hProgKey )
@@ -194,9 +192,9 @@ static HRESULT RegisterClassID(HKEY hParent, REFCLSID rclsid, unsigned int versi
             // default key value
             keySetDef(hProgKey, description);
 
-            keyClose(keySetDef(keyCreate(hProgKey, "CLSID"),
-                psz_CLSID,
-                GUID_STRLEN));
+            keyClose(keySetDef(keyCreate(hProgKey, TEXT("CLSID")),
+                szCLSID,
+                sizeof(szCLSID)));
 
             //hSubKey = keyClose(keyCreate(hBaseKey, "Insertable"));
  
@@ -204,22 +202,21 @@ static HRESULT RegisterClassID(HKEY hParent, REFCLSID rclsid, unsigned int versi
         }
         if( isDefault )
         {
-            hProgKey = keyCreate(HKEY_CLASSES_ROOT, PROGID_STR);
+            hProgKey = keyCreate(HKEY_CLASSES_ROOT, TEXT(PROGID_STR));
             if( NULL != hProgKey )
             {
                 // default key value
                 keySetDef(hProgKey, description);
 
-                keyClose(keySetDef(keyCreate(hProgKey, "CLSID"),
-                    psz_CLSID,
-                    GUID_STRLEN));
+                keyClose(keySetDef(keyCreate(hProgKey, TEXT("CLSID")),
+                    szCLSID,
+                    sizeof(szCLSID)));
 
-                keyClose(keySetDef(keyCreate(hProgKey, "CurVer"),
+                keyClose(keySetDef(keyCreate(hProgKey, TEXT("CurVer")),
                     progId));
             }
         }
-        hClassKey = keyCreate(hParent, psz_CLSID);
-        CoTaskMemFree((void *)psz_CLSID);
+        hClassKey = keyCreate(hParent, szCLSID);
     }
     if( NULL != hClassKey )
     {
@@ -227,45 +224,45 @@ static HRESULT RegisterClassID(HKEY hParent, REFCLSID rclsid, unsigned int versi
         keySetDef(hClassKey, description);
 
         // Control key value
-        keyClose(keyCreate(hClassKey, "Control"));
+        keyClose(keyCreate(hClassKey, TEXT("Control")));
 
         // Insertable key value
-        //keyClose(keyCreate(hClassKey, "Insertable"));
+        //keyClose(keyCreate(hClassKey, TEXT("Insertable")));
 
         // ToolboxBitmap32 key value
         {
-            char iconPath[pathLen+3];
-            memcpy(iconPath, path, pathLen);
-            strcpy(iconPath+pathLen, ",1");
+            TCHAR iconPath[pathLen+3];
+            memcpy(iconPath, path, sizeof(TCHAR)*pathLen);
+            _tcscpy(iconPath+pathLen, TEXT(",1"));
             keyClose(keySetDef(keyCreate(hClassKey,
-                "ToolboxBitmap32"),
+                TEXT("ToolboxBitmap32")),
                 iconPath, sizeof(iconPath)));
         }
 
 #ifdef BUILD_LOCALSERVER
         // LocalServer32 key value
         keyClose(keySetDef(keyCreate(hClassKey,
-            "LocalServer32", path, pathLen+1)));
+            TEXT("LocalServer32"), path, sizeof(TCHAR)*(pathLen+1))));
 #else
         // InprocServer32 key value
         {
             HKEY hSubKey = keySetDef(keyCreate(hClassKey,
-                "InprocServer32"),
-                path, pathLen+1);
+                TEXT("InprocServer32")),
+                path, sizeof(TCHAR)*(pathLen+1));
             keySet(hSubKey,
-                "ThreadingModel",
-                THREADING_MODEL, sizeof(THREADING_MODEL));
+                TEXT("ThreadingModel"),
+                TEXT(THREADING_MODEL), sizeof(TEXT(THREADING_MODEL)));
             keyClose(hSubKey);
         }
 #endif
 
         // MiscStatus key value
         keyClose(keySetDef(keyCreate(hClassKey,
-            "MiscStatus\\1"),
-            MISC_STATUS, sizeof(MISC_STATUS)));
+            TEXT("MiscStatus\\1")),
+            TEXT(MISC_STATUS), sizeof(TEXT(MISC_STATUS))));
 
         // Programmable key value
-        keyClose(keyCreate(hClassKey, "Programmable"));
+        keyClose(keyCreate(hClassKey, TEXT("Programmable")));
 
         // ProgID key value
         keyClose(keySetDef(keyCreate(hClassKey,
@@ -274,23 +271,23 @@ static HRESULT RegisterClassID(HKEY hParent, REFCLSID rclsid, unsigned int versi
 
         // VersionIndependentProgID key value
         keyClose(keySetDef(keyCreate(hClassKey,
-            "VersionIndependentProgID"),
-            PROGID_STR, sizeof(PROGID_STR)));
+            TEXT("VersionIndependentProgID")),
+            TEXT(PROGID_STR), sizeof(TEXT(PROGID_STR))));
 
         // Version key value
         keyClose(keySetDef(keyCreate(hClassKey,
-            "Version"),
-            "1.0"));
+            TEXT("Version")),
+            TEXT("1.0")));
 
         // TypeLib key value
-        LPCSTR psz_LIBID = CStrFromGUID(LIBID_AXVLC);
-        if( NULL != psz_LIBID )
-        {
-            keyClose(keySetDef(keyCreate(hClassKey,
-                    "TypeLib"),
-                    psz_LIBID, GUID_STRLEN));
-            CoTaskMemFree((void *)psz_LIBID);
-        }
+        OLECHAR szLIBID[GUID_STRLEN];
+
+        StringFromGUID2(LIBID_AXVLC, szLIBID, GUID_STRLEN);
+
+        keyClose(keySetDef(keyCreate(hClassKey,
+                TEXT("TypeLib")),
+                szLIBID, sizeof(szLIBID)));
+ 
         RegCloseKey(hClassKey);
     }
     return S_OK;
@@ -300,14 +297,14 @@ STDAPI DllRegisterServer(VOID)
 {
     DllUnregisterServer();
 
-    char DllPath[MAX_PATH];
-    DWORD DllPathLen=GetModuleFileNameA(h_instance, DllPath, sizeof(DllPath)) ;
+    TCHAR DllPath[MAX_PATH];
+    DWORD DllPathLen=GetModuleFileName(h_instance, DllPath, MAX_PATH) ;
     if( 0 == DllPathLen )
         return E_UNEXPECTED;
 
     HKEY hBaseKey;
 
-    if( ERROR_SUCCESS != RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_CREATE_SUB_KEY, &hBaseKey) )
+    if( ERROR_SUCCESS != RegOpenKeyEx(HKEY_CLASSES_ROOT, TEXT("CLSID"), 0, KEY_CREATE_SUB_KEY, &hBaseKey) )
         return SELFREG_E_CLASS;
 
     RegisterClassID(hBaseKey, CLSID_VLCPlugin, 1, FALSE, DllPath, DllPathLen);
@@ -334,34 +331,19 @@ STDAPI DllRegisterServer(VOID)
         pcr->Release();
     }
 
-    // register type lib into the registry
-    ITypeLib *typeLib;
-
 #ifdef BUILD_LOCALSERVER
     // replace .exe by .tlb
-    strcpy(DllPath+DllPathLen-4, ".tlb");
+    _tcscpy(DllPath+DllPathLen-4, TEXT(".tlb"));
 #endif
 
-#ifndef OLE2ANSI
-    size_t typeLibPathLen = MultiByteToWideChar(CP_ACP, 0, DllPath, -1, NULL, 0);
-    if( typeLibPathLen > 0 )
-    {
-        LPOLESTR typeLibPath = (LPOLESTR)CoTaskMemAlloc(typeLibPathLen*sizeof(wchar_t));
-        MultiByteToWideChar(CP_ACP, 0, DllPath, DllPathLen, typeLibPath, typeLibPathLen);
-        if( FAILED(LoadTypeLibEx(typeLibPath, REGKIND_REGISTER, &typeLib)) )
-#ifndef BUILD_LOCALSERVER
-            return SELFREG_E_TYPELIB;
+    // register type lib into the registry
+    ITypeLib *typeLib;
+
+    HRESULT result = LoadTypeLibEx(DllPath, REGKIND_REGISTER, &typeLib);
+    if( SUCCEEDED(result) )
         typeLib->Release();
-#endif
-        CoTaskMemFree((void *)typeLibPath);
-    }
-#else
-    if( FAILED(LoadTypeLibEx((LPOLESTR)DllPath, REGKIND_REGISTER, &typeLib)) )
-        return SELFREG_E_TYPELIB;
-    typeLib->Release();
-#endif
 
-    return S_OK;
+    return result;
 };
 
 #ifdef BUILD_LOCALSERVER

diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index eed61162602e6f06af4592db2416c0298afec097..d5e2791bc80881f529886fd0d5b28f10b85bca4a 100644 (file)
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -430,30 +430,43 @@ HRESULT VLCPlugin::getVLC(libvlc_instance_t** pp_libvlc)
         int   ppsz_argc = 1;
 
         HKEY h_key;
-        DWORD i_type, i_data = MAX_PATH + 1;
-        char p_data[MAX_PATH + 1];
-        if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, "Software\\VideoLAN\\VLC",
+        char p_data[MAX_PATH];
+        if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, TEXT("Software\\VideoLAN\\VLC"),
                           0, KEY_READ, &h_key ) == ERROR_SUCCESS )
         {
-            if( RegQueryValueEx( h_key, "InstallDir", 0, &i_type,
-                                 (LPBYTE)p_data, &i_data ) == ERROR_SUCCESS )
+            DWORD i_type, i_data = MAX_PATH;
+            TCHAR w_data[MAX_PATH];
+            if( RegQueryValueEx( h_key, TEXT("InstallDir"), 0, &i_type,
+                                 (LPBYTE)w_data, &i_data ) == ERROR_SUCCESS )
             {
                 if( i_type == REG_SZ )
                 {
-                    strcat( p_data, "\\plugins" );
-                    ppsz_argv[ppsz_argc++] = "--plugin-path";
-                    ppsz_argv[ppsz_argc++] = p_data;
+                    if( WideCharToMultiByte(CP_UTF8, 0, w_data, -1, p_data,
+                             sizeof(p_data)-sizeof("\\plugins")+1, NULL, NULL) )
+                    {
+                        strcat( p_data, "\\plugins" );
+                        ppsz_argv[ppsz_argc++] = "--plugin-path";
+                        ppsz_argv[ppsz_argc++] = p_data;
+                    }
                 }
             }
             RegCloseKey( h_key );
         }
 
-        char p_path[MAX_PATH+1];
-        DWORD len = GetModuleFileNameA(DllGetModule(), p_path, sizeof(p_path));
-        if( len > 0 )
+        char p_path[MAX_PATH];
         {
-            p_path[len] = '\0';
-            ppsz_argv[0] = p_path;
+            TCHAR w_path[MAX_PATH];
+            DWORD len = GetModuleFileName(DllGetModule(), w_path, MAX_PATH);
+            if( len > 0 )
+            {
+                len = WideCharToMultiByte(CP_UTF8, 0, w_path, len, p_path,
+                           sizeof(p_path)-1, NULL, NULL);
+                if( len > 0 )
+                {
+                    p_path[len] = '\0';
+                    ppsz_argv[0] = p_path;
+                }
+            }
         }
 
         // make sure plugin isn't affected with VLC single instance mode
@@ -681,7 +694,7 @@ HRESULT VLCPlugin::onActivateInPlace(LPMSG lpMesg, HWND hwndParent, LPCRECT lprc
     ** properly displayed.
     */
     _inplacewnd = CreateWindow(_p_class->getInPlaceWndClassName(),
-            "VLC Plugin In-Place Window",
+            TEXT("VLC Plugin In-Place Window"),
             WS_CHILD|WS_CLIPCHILDREN|WS_CLIPSIBLINGS,
             lprcPosRect->left,
             lprcPosRect->top,

diff --git a/activex/plugin.h b/activex/plugin.h
index 864fac43f7183ce21c3fff39fa2ace86bd7a1339..873c39c715733c1e9a6cff1ad8d728a775abc6c0 100644 (file)
--- a/activex/plugin.h
+++ b/activex/plugin.h
@@ -51,7 +51,7 @@ public:
 
     REFCLSID getClassID(void) { return (REFCLSID)_classid; };
 
-    LPCSTR getInPlaceWndClassName(void) const { return TEXT("VLC Plugin In-Place"); };
+    LPCTSTR getInPlaceWndClassName(void) const { return TEXT("VLC Plugin In-Place"); };
     HINSTANCE getHInstance(void) const { return _hinstance; };
     LPPICTURE getInPlacePict(void) const
         { if( NULL != _inplace_picture) _inplace_picture->AddRef(); return _inplace_picture; };

diff --git a/activex/utils.cpp b/activex/utils.cpp
index 15040bf233eac7d6df1eb21bbf7849ac73ff3dcc..8750aa1ce2e6749e3e3b9492829a4d2dd58b975f 100644 (file)
--- a/activex/utils.cpp
+++ b/activex/utils.cpp
@@ -77,28 +77,6 @@ BSTR BSTRFromCStr(UINT codePage, LPCSTR s)
     return NULL;
 };
 
-char *CStrFromGUID(REFGUID clsid)
-{
-    LPOLESTR oleStr;
-
-    if( FAILED(StringFromIID(clsid, &oleStr)) )
-        return NULL;
-
-#ifdef OLE2ANSI
-    return (LPCSTR)oleStr;
-#else
-    char *pct_CLSID = NULL;
-    size_t len = WideCharToMultiByte(CP_ACP, 0, oleStr, -1, NULL, 0, NULL, NULL);
-    if( len > 0 )
-    {
-        pct_CLSID = (char *)CoTaskMemAlloc(len);
-        WideCharToMultiByte(CP_ACP, 0, oleStr, -1, pct_CLSID, len, NULL, NULL);
-    }
-    CoTaskMemFree(oleStr);
-    return pct_CLSID;
-#endif
-};
-
 /*
 **  properties
 */

diff --git a/activex/utils.h b/activex/utils.h
index 7b1e217c13044b07b23716bdce9011cd58c2617b..5b5cbf6dddf0e64fed58c929d8c5bb06dde07fd1 100644 (file)
--- a/activex/utils.h
+++ b/activex/utils.h
@@ -32,8 +32,6 @@ extern char *CStrFromWSTR(UINT codePage, LPCWSTR wstr, UINT len);
 extern char *CStrFromBSTR(UINT codePage, BSTR bstr);
 extern BSTR BSTRFromCStr(UINT codePage, LPCSTR s);
 
-extern char *CStrFromGUID(REFGUID clsid);
-
 // properties
 extern HRESULT GetObjectProperty(LPUNKNOWN object, DISPID dispID, VARIANT& v);
 

diff --git a/configure.ac b/configure.ac
index 74ae3bdbd52b95d748fb7f29300bc6c738a2abe2..e3877bad7a339e5c1e1fa87f1cb5caa50f2c468c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5268,7 +5268,7 @@ then
     AC_LANG_PUSH(C++)
     AC_CHECK_HEADERS(ole2.h, 
       [AC_CHECK_HEADERS(olectl.h,
-        [ VLC_ADD_CPPFLAGS([activex],[-D_MIDL_USE_GUIDDEF_])
+        [ VLC_ADD_CPPFLAGS([activex],[-DUNICODE -D_UNICODE -D_MIDL_USE_GUIDDEF_])
           VLC_ADD_CXXFLAGS([activex],[-fno-exceptions])
           VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi]) 
           AC_CHECK_HEADERS(objsafe.h,