ole32: Compare the class contexts in COM_GetRegisteredClassObject.

Only objects that have been registered for a class context that matches the requested class context should be returned.

ole32: Compare the class contexts in COM_GetRegisteredClassObject.
87155d65 · Rob Shearman · Alexandre Julliard · 356fdcbb · 87155d65
Commit 87155d65 authored Mar 05, 2007 by Rob Shearman Committed by Alexandre Julliard Mar 06, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

compobj.c dlls/ole32/compobj.c +3 -7

No files found.
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -1461,16 +1461,12 @@ static HRESULT COM_GetRegisteredClassObject(
  while (curClass != 0)
  {
    /*
-     * Check if we have a match on the class ID.
+     * Check if we have a match on the class ID and context.
     */
-    if (IsEqualGUID(&(curClass->classIdentifier), rclsid))
+    if ((dwClsContext & curClass->runContext) &&
+        IsEqualGUID(&(curClass->classIdentifier), rclsid))
    {
      /*
-       * Since we don't do out-of process or DCOM just right away, let's ignore the
-       * class context.
-       */
-      /*
       * We have a match, return the pointer to the class object.
       */
      *ppUnk = curClass->classObject;