Backed out 4 changesets (bug 1674904) for Build bustage in worker/checkouts/gecko/config/rules.mk. CLOSED TREE

Backed out changeset 50576e0fbd98 (bug 1674904)
Backed out changeset b3b7d68c33f6 (bug 1674904)
Backed out changeset 660cdea23685 (bug 1674904)
Backed out changeset 7322c3af8006 (bug 1674904)

Author: dgluca

accessible/ipc/win/handler/moz.build

@@ -121,8 +121,3 @@ LIBRARY_DEFINES["UNICODE"] = True
 LIBRARY_DEFINES["_UNICODE"] = True
 LIBRARY_DEFINES["MOZ_NO_MOZALLOC"] = True
 DisableStlWrapping()
-
-DELAYLOAD_DLLS += [
-    "advapi32.dll",
-    "ktmw32.dll",
-]

ipc/mscom/Registration.cpp

@@ -107,36 +107,10 @@ static bool RegisterPSClsids(const ProxyFileInfo** aProxyInfo,
   return true;
 }
 
-#if !defined(MOZILLA_INTERNAL_API)
-using GetProxyDllInfoFnT = decltype(&GetProxyDllInfo);
-
-static GetProxyDllInfoFnT ResolveGetProxyDllInfo() {
-  HMODULE thisModule = reinterpret_cast<HMODULE>(GetContainingModuleHandle());
-  if (!thisModule) {
-    return nullptr;
-  }
-
-  return reinterpret_cast<GetProxyDllInfoFnT>(
-      GetProcAddress(thisModule, "GetProxyDllInfo"));
-}
-#endif  // !defined(MOZILLA_INTERNAL_API)
-
 UniquePtr<RegisteredProxy> RegisterProxy() {
-#if !defined(MOZILLA_INTERNAL_API)
-  GetProxyDllInfoFnT GetProxyDllInfoFn = ResolveGetProxyDllInfo();
-  MOZ_ASSERT(!!GetProxyDllInfoFn);
-  if (!GetProxyDllInfoFn) {
-    return nullptr;
-  }
-#endif  // !defined(MOZILLA_INTERNAL_API)
-
   const ProxyFileInfo** proxyInfo = nullptr;
   const CLSID* proxyClsid = nullptr;
-#if defined(MOZILLA_INTERNAL_API)
   GetProxyDllInfo(&proxyInfo, &proxyClsid);
-#else
-  GetProxyDllInfoFn(&proxyInfo, &proxyClsid);
-#endif  // defined(MOZILLA_INTERNAL_API)
   if (!proxyInfo || !proxyClsid) {
     return nullptr;
   }

ipc/mscom/Utils.cpp

@@ -16,8 +16,6 @@
 #  endif
 #endif
 
-#include "mozilla/ArrayUtils.h"
-#include "mozilla/DebugOnly.h"
 #include "mozilla/mscom/Objref.h"
 #include "mozilla/mscom/Utils.h"
 #include "mozilla/RefPtr.h"
@@ -141,50 +139,6 @@ uintptr_t GetContainingModuleHandle() {
   return reinterpret_cast<uintptr_t>(thisModule);
 }
 
-namespace detail {
-
-long BuildRegGuidPath(REFGUID aGuid, const GuidType aGuidType, wchar_t* aBuf,
-                      const size_t aBufLen) {
-  constexpr wchar_t kClsid[] = L"CLSID\\";
-  constexpr wchar_t kAppid[] = L"AppID\\";
-  constexpr wchar_t kSubkeyBase[] = L"SOFTWARE\\Classes\\";
-
-  // We exclude null terminators in these length calculations because we include
-  // the stringified GUID's null terminator at the end. Since kClsid and kAppid
-  // have identical lengths, we just choose one to compute this length.
-  constexpr size_t kSubkeyBaseLen = mozilla::ArrayLength(kSubkeyBase) - 1;
-  constexpr size_t kSubkeyLen =
-      kSubkeyBaseLen + mozilla::ArrayLength(kClsid) - 1;
-  // Guid length as formatted for the registry (including curlies and dashes),
-  // but excluding null terminator.
-  constexpr size_t kGuidLen = kGuidRegFormatCharLenInclNul - 1;
-  constexpr size_t kExpectedPathLenInclNul = kSubkeyLen + kGuidLen + 1;
-
-  if (aBufLen < kExpectedPathLenInclNul) {
-    // Buffer is too short
-    return E_INVALIDARG;
-  }
-
-  if (wcscpy_s(aBuf, aBufLen, kSubkeyBase)) {
-    return E_INVALIDARG;
-  }
-
-  const wchar_t* strGuidType = aGuidType == GuidType::CLSID ? kClsid : kAppid;
-  if (wcscat_s(aBuf, aBufLen, strGuidType)) {
-    return E_INVALIDARG;
-  }
-
-  int guidConversionResult =
-      ::StringFromGUID2(aGuid, &aBuf[kSubkeyLen], aBufLen - kSubkeyLen);
-  if (!guidConversionResult) {
-    return E_INVALIDARG;
-  }
-
-  return S_OK;
-}
-
-}  // namespace detail
-
 long CreateStream(const uint8_t* aInitBuf, const uint32_t aInitBufSize,
                   IStream** aOutStream) {
   if (!aInitBufSize || !aOutStream) {
@@ -317,15 +271,6 @@ void GUIDToString(REFGUID aGuid, nsAString& aOutString) {
   }
 }
 
-#else
-
-void GUIDToString(REFGUID aGuid,
-                  wchar_t (&aOutBuf)[kGuidRegFormatCharLenInclNul]) {
-  DebugOnly<int> result =
-      ::StringFromGUID2(aGuid, aOutBuf, ArrayLength(aOutBuf));
-  MOZ_ASSERT(result);
-}
-
 #endif  // defined(MOZILLA_INTERNAL_API)
 
 #if defined(ACCESSIBILITY)

ipc/mscom/Utils.h

@@ -19,17 +19,6 @@ struct IUnknown;
 
 namespace mozilla {
 namespace mscom {
-namespace detail {
-
-enum class GuidType {
-  CLSID,
-  AppID,
-};
-
-long BuildRegGuidPath(REFGUID aGuid, const GuidType aGuidType, wchar_t* aBuf,
-                      const size_t aBufLen);
-
-}  // namespace detail
 
 bool IsCOMInitializedOnCurrentThread();
 bool IsCurrentThreadMTA();
@@ -42,16 +31,6 @@ bool IsProxy(IUnknown* aUnknown);
 bool IsValidGUID(REFGUID aCheckGuid);
 uintptr_t GetContainingModuleHandle();
 
-template <size_t N>
-inline long BuildAppidPath(REFGUID aAppId, wchar_t (&aPath)[N]) {
-  return detail::BuildRegGuidPath(aAppId, detail::GuidType::AppID, aPath, N);
-}
-
-template <size_t N>
-inline long BuildClsidPath(REFCLSID aClsid, wchar_t (&aPath)[N]) {
-  return detail::BuildRegGuidPath(aClsid, detail::GuidType::CLSID, aPath, N);
-}
-
 /**
  * Given a buffer, create a new IStream object.
  * @param aBuf Buffer containing data to initialize the stream. This parameter
@@ -99,9 +78,6 @@ long CopySerializedProxy(IStream* aInStream, IStream** aOutStream);
 bool IsClassThreadAwareInprocServer(REFCLSID aClsid);
 
 void GUIDToString(REFGUID aGuid, nsAString& aOutString);
-#else
-void GUIDToString(REFGUID aGuid,
-                  wchar_t (&aOutBuf)[kGuidRegFormatCharLenInclNul]);
 #endif  // defined(MOZILLA_INTERNAL_API)
 
 #if defined(ACCESSIBILITY)

ipc/mscom/oop/Handler.cpp

@@ -267,15 +267,116 @@ Handler::DisconnectObject(DWORD dwReserved) {
   return mUnmarshal->DisconnectObject(dwReserved);
 }
 
+template <size_t N>
+static HRESULT BuildClsidPath(wchar_t (&aPath)[N], REFCLSID aClsid) {
+  const wchar_t kSubkey[] = L"SOFTWARE\\Classes\\CLSID\\";
+
+  // We exclude kSubkey's null terminator in the length because we include
+  // the stringified GUID's null terminator.
+  constexpr uint32_t kSubkeyLen = mozilla::ArrayLength(kSubkey) - 1;
+
+  const size_t kReqdGuidLen = 39;
+  static_assert(N >= kReqdGuidLen + kSubkeyLen, "aPath array is too short");
+  if (wcsncpy_s(aPath, kSubkey, kSubkeyLen)) {
+    return E_INVALIDARG;
+  }
+
+  int guidConversionResult =
+      StringFromGUID2(aClsid, &aPath[kSubkeyLen], N - kSubkeyLen);
+  if (!guidConversionResult) {
+    return E_INVALIDARG;
+  }
+
+  return S_OK;
+}
+
 HRESULT
 Handler::Unregister(REFCLSID aClsid) {
-  return Module::Deregister(aClsid);
+  wchar_t path[256] = {};
+  HRESULT hr = BuildClsidPath(path, aClsid);
+  if (FAILED(hr)) {
+    return hr;
+  }
+
+  hr = HRESULT_FROM_WIN32(SHDeleteKey(HKEY_LOCAL_MACHINE, path));
+  if (FAILED(hr)) {
+    return hr;
+  }
+
+  return S_OK;
 }
 
 HRESULT
 Handler::Register(REFCLSID aClsid) {
-  return Module::Register(aClsid, Module::ThreadingModel::DedicatedUiThreadOnly,
-                          Module::ClassType::InprocHandler);
+  wchar_t path[256] = {};
+  HRESULT hr = BuildClsidPath(path, aClsid);
+  if (FAILED(hr)) {
+    return hr;
+  }
+
+  HKEY rawClsidKey;
+  DWORD disposition;
+  LONG result = RegCreateKeyEx(HKEY_LOCAL_MACHINE, path, 0, nullptr,
+                               REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, nullptr,
+                               &rawClsidKey, &disposition);
+  if (result != ERROR_SUCCESS) {
+    return HRESULT_FROM_WIN32(result);
+  }
+  nsAutoRegKey clsidKey(rawClsidKey);
+
+  if (wcscat_s(path, L"\\InprocHandler32")) {
+    return E_UNEXPECTED;
+  }
+
+  HKEY rawInprocHandlerKey;
+  result = RegCreateKeyEx(HKEY_LOCAL_MACHINE, path, 0, nullptr,
+                          REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, nullptr,
+                          &rawInprocHandlerKey, &disposition);
+  if (result != ERROR_SUCCESS) {
+    Unregister(aClsid);
+    return HRESULT_FROM_WIN32(result);
+  }
+  nsAutoRegKey inprocHandlerKey(rawInprocHandlerKey);
+
+  wchar_t absLibPath[MAX_PATH + 1] = {};
+  HMODULE thisModule;
+  if (!GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+                             GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                         reinterpret_cast<LPCTSTR>(&Handler::Register),
+                         &thisModule)) {
+    return HRESULT_FROM_WIN32(GetLastError());
+  }
+
+  DWORD size = GetModuleFileName(thisModule, absLibPath,
+                                 mozilla::ArrayLength(absLibPath));
+  if (!size || (size == mozilla::ArrayLength(absLibPath) &&
+                GetLastError() == ERROR_INSUFFICIENT_BUFFER)) {
+    DWORD lastError = GetLastError();
+    Unregister(aClsid);
+    return HRESULT_FROM_WIN32(lastError);
+  }
+
+  // The result of GetModuleFileName excludes the null terminator
+  DWORD valueSizeWithNullInBytes = (size + 1) * sizeof(wchar_t);
+
+  result = RegSetValueEx(inprocHandlerKey, L"", 0, REG_EXPAND_SZ,
+                         reinterpret_cast<const BYTE*>(absLibPath),
+                         valueSizeWithNullInBytes);
+  if (result != ERROR_SUCCESS) {
+    Unregister(aClsid);
+    return HRESULT_FROM_WIN32(result);
+  }
+
+  const wchar_t kApartment[] = L"Apartment";
+  result = RegSetValueEx(inprocHandlerKey, L"ThreadingModel", 0, REG_SZ,
+                         reinterpret_cast<const BYTE*>(kApartment),
+                         sizeof(kApartment));
+  if (result != ERROR_SUCCESS) {
+    Unregister(aClsid);
+    return HRESULT_FROM_WIN32(result);
+  }
+
+  return S_OK;
 }
 
 }  // namespace mscom