winvfs: initial work

Done by ckamm and dschmidt

1 files changed, 19 insertions, 4 deletions

diff --git a/shell_integration/windows/OCContextMenu/OCContextMenuRegHandler.cpp b/shell_integration/windows/OCContextMenu/OCContextMenuRegHandler.cpp
index 1bbfc6605..f9d1f6385 100644
--- a/shell_integration/windows/OCContextMenu/OCContextMenuRegHandler.cpp
+++ b/shell_integration/windows/OCContextMenu/OCContextMenuRegHandler.cpp
@@ -33,14 +33,24 @@ HRESULT SetHKCRRegistryKeyAndValue(PCWSTR pszSubKey, PCWSTR pszValueName, PCWSTR
 
     if (SUCCEEDED(hr))
     {
+        DWORD cbData;
+        const BYTE * lpData;
+
         if (pszData != NULL)
         {
             // Set the specified value of the key.
-            DWORD cbData = lstrlen(pszData) * sizeof(*pszData);
-            hr = HRESULT_FROM_WIN32(RegSetValueEx(hKey, pszValueName, 0,
-                REG_SZ, reinterpret_cast<const BYTE *>(pszData), cbData));
+            cbData = lstrlen(pszData) * sizeof(*pszData);
+            lpData = reinterpret_cast<const BYTE *>(pszData);
+        }
+        else
+        {
+            cbData = 0;
+            lpData = NULL;
         }
 
+        hr = HRESULT_FROM_WIN32(RegSetValueEx(hKey, pszValueName, 0,
+            REG_SZ, lpData, cbData));
+
         RegCloseKey(hKey);
     }
 
@@ -90,6 +100,11 @@ HRESULT OCContextMenuRegHandler::RegisterInprocServer(PCWSTR pszModule, const CL
     {
         hr = SetHKCRRegistryKeyAndValue(szSubkey, NULL, pszFriendlyName);
 
+        // Create the HKCR\CLSID\{<CLSID>}\ContextMenuOptIn subkey.
+        if (SUCCEEDED(hr)) {
+            hr = SetHKCRRegistryKeyAndValue(szSubkey, L"ContextMenuOptIn", NULL);
+        }
+
         // Create the HKCR\CLSID\{<CLSID>}\InprocServer32 key.
         if (SUCCEEDED(hr))
         {
@@ -215,4 +230,4 @@ HRESULT OCContextMenuRegHandler::UnregisterShellExtContextMenuHandler(
     }
 
     return hr;
-}
\ No newline at end of file
+}