[PATCH 0/5] MR4028: objsel: Various cleanups.

[Zebediah Figura (＠zfigura)]

I originally wrote 1/1 while looking for non-multimedia DLLs that included uuids.h, and then noticed some of the other particularly egregious problems with this DLL.

[PATCH 1/5] objsel: Remove unnecessary includes.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/objsel/objsel.c         |  1 -
 dlls/objsel/objsel_private.h | 16 +---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c
index e42ac5ab898..90873191691 100644
--- a/dlls/objsel/objsel.c
+++ b/dlls/objsel/objsel.c
@@ -19,7 +19,6 @@
  */

#include "objsel_private.h"
-#include "rpcproxy.h"

#include "wine/debug.h"

diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h
index 9289c00d8c9..b0a2e956733 100644
--- a/dlls/objsel/objsel_private.h
+++ b/dlls/objsel/objsel_private.h
@@ -18,24 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include "winerror.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "wingdi.h"
-#include "winuser.h"
-
 #define COBJMACROS

-#include "ole2.h"
-#include "strmif.h"
-#include "olectl.h"
-#include "unknwn.h"
+#include "objidl.h"
 #include "objsel.h"
-#include "uuids.h"

/**********************************************************************
  * Dll lifetime tracking declaration for objsel.dll

[PATCH 2/5] objsel: Remove DLL refcount tracking.

[Zebediah Figura]

From: Zebediah Figura

Recent consensus seems to be that this isn't worth the effort.
---
 dlls/objsel/factory.c        | 20 ++------------------
 dlls/objsel/objsel.c         | 24 +-----------------------
 dlls/objsel/objsel_private.h |  6 ------
 3 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/dlls/objsel/factory.c b/dlls/objsel/factory.c
index cb0fb491cb4..c3e64f0568a 100644
--- a/dlls/objsel/factory.c
+++ b/dlls/objsel/factory.c
@@ -66,20 +66,12 @@ static HRESULT WINAPI OBJSEL_IClassFactory_QueryInterface(
 static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface)
 {
     ClassFactoryImpl *This = impl_from_IClassFactory(iface);
-    ULONG ref;

TRACE("\n");

if (This == NULL) return E_POINTER;

-    ref = InterlockedIncrement(&This->ref);
-    
-    if (ref == 1)
-    {
-        InterlockedIncrement(&dll_refs);
-    }
-
-    return ref;
+    return InterlockedIncrement(&This->ref);
 }

@@ -89,20 +81,12 @@ static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface)
 static ULONG WINAPI OBJSEL_IClassFactory_Release(LPCLASSFACTORY iface)
 {
     ClassFactoryImpl *This = impl_from_IClassFactory(iface);
-    ULONG ref;

TRACE("\n");

if (This == NULL) return E_POINTER;

-    ref = InterlockedDecrement(&This->ref);
-    
-    if (ref == 0)
-    {
-        InterlockedDecrement(&dll_refs);
-    }
-
-    return ref;
+    return InterlockedDecrement(&This->ref);
 }

diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c
index 90873191691..026a6d594af 100644
--- a/dlls/objsel/objsel.c
+++ b/dlls/objsel/objsel.c
@@ -24,8 +24,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(objsel);

-LONG dll_refs = 0;
-
 /***********************************************************************
  *		DllGetClassObject (OBJSEL.@)
  */
@@ -43,15 +41,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
 }

-/***********************************************************************
- *		DllCanUnloadNow (OBJSEL.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return dll_refs != 0 ? S_FALSE : S_OK;
-}
-
-
 /**********************************************************************
  * OBJSEL_IDsObjectPicker_Destroy (also IUnknown)
  */
@@ -74,20 +63,12 @@ static inline IDsObjectPickerImpl *impl_from_IDsObjectPicker(IDsObjectPicker *if
 static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface)
 {
     IDsObjectPickerImpl *This = impl_from_IDsObjectPicker(iface);
-    ULONG ref;

TRACE("\n");

if (This == NULL) return E_POINTER;

-    ref = InterlockedIncrement(&This->ref);
-
-    if (ref == 1)
-    {
-        InterlockedIncrement(&dll_refs);
-    }
-
-    return ref;
+    return InterlockedIncrement(&This->ref);
 }

@@ -106,10 +87,7 @@ static ULONG WINAPI OBJSEL_IDsObjectPicker_Release(IDsObjectPicker * iface)
     ref = InterlockedDecrement(&This->ref);

if (ref == 0)
-    {
-        InterlockedDecrement(&dll_refs);
         OBJSEL_IDsObjectPicker_Destroy(This);
-    }

return ref;
 }
diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h
index b0a2e956733..86ea129089b 100644
--- a/dlls/objsel/objsel_private.h
+++ b/dlls/objsel/objsel_private.h
@@ -23,12 +23,6 @@
 #include "objidl.h"
 #include "objsel.h"

-/**********************************************************************
- * Dll lifetime tracking declaration for objsel.dll
- */
-
-extern LONG dll_refs DECLSPEC_HIDDEN;
-
 /**********************************************************************
  * ClassFactory declaration for objsel.dll
  */

[PATCH 3/5] objsel: Merge factory.c into objsel.c.

[Zebediah Figura]

From: Zebediah Figura

A separate file for the class factory is not justified.
---
 dlls/objsel/Makefile.in      |   1 -
 dlls/objsel/factory.c        | 152 -----------------------------------
 dlls/objsel/objsel.c         | 151 +++++++++++++++++++++++++++++-----
 dlls/objsel/objsel_private.h |  43 ----------
 4 files changed, 131 insertions(+), 216 deletions(-)
 delete mode 100644 dlls/objsel/factory.c
 delete mode 100644 dlls/objsel/objsel_private.h

diff --git a/dlls/objsel/Makefile.in b/dlls/objsel/Makefile.in
index 4032c398d39..d177686067e 100644
--- a/dlls/objsel/Makefile.in
+++ b/dlls/objsel/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = objsel.dll
 IMPORTS   = strmiids uuid ole32 advapi32

C_SRCS = \
-	factory.c \
    objsel.c

IDL_SRCS = objsel_classes.idl
diff --git a/dlls/objsel/factory.c b/dlls/objsel/factory.c
deleted file mode 100644
index c3e64f0568a..00000000000
--- a/dlls/objsel/factory.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *	ClassFactory implementation for OBJSEL.dll
- *
- * Copyright (C) 2002 John K. Hohm
- * Copyright (C) 2002 Robert Shearman
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "objsel_private.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(objsel);
-
-
-static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
-{
-    return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface);
-}
-
-/**********************************************************************
- * OBJSEL_IClassFactory_QueryInterface (also IUnknown)
- */
-static HRESULT WINAPI OBJSEL_IClassFactory_QueryInterface(
-    LPCLASSFACTORY iface,
-    REFIID riid,
-    LPVOID *ppvObj)
-{
-    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
-
-    if (ppvObj == NULL) return E_POINTER;
-
-    if (IsEqualGUID(riid, &IID_IUnknown) ||
-	IsEqualGUID(riid, &IID_IClassFactory))
-    {
-        *ppvObj = iface;
-	IClassFactory_AddRef(iface);
-	return S_OK;
-    }
-    else if (IsEqualGUID(riid, &IID_IDsObjectPicker))
-    {
-        return IClassFactory_CreateInstance(iface, NULL, riid, ppvObj);
-    }
-
-    FIXME("- no interface IID: %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-
-/**********************************************************************
- * OBJSEL_IClassFactory_AddRef (also IUnknown)
- */
-static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface)
-{
-    ClassFactoryImpl *This = impl_from_IClassFactory(iface);
-    
-    TRACE("\n");
-
-    if (This == NULL) return E_POINTER;
-    
-    return InterlockedIncrement(&This->ref);
-}
-
-
-/**********************************************************************
- * OBJSEL_IClassFactory_Release (also IUnknown)
- */
-static ULONG WINAPI OBJSEL_IClassFactory_Release(LPCLASSFACTORY iface)
-{
-    ClassFactoryImpl *This = impl_from_IClassFactory(iface);
-    
-    TRACE("\n");
-
-    if (This == NULL) return E_POINTER;
-    
-    return InterlockedDecrement(&This->ref);
-}
-
-
-/**********************************************************************
- * OBJSEL_IClassFactory_CreateInstance
- */
-static HRESULT WINAPI OBJSEL_IClassFactory_CreateInstance(
-    LPCLASSFACTORY iface,
-    LPUNKNOWN pUnkOuter,
-    REFIID riid,
-    LPVOID *ppvObj)
-{
-    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
-
-    if (ppvObj == NULL) return E_POINTER;
-
-    /* Don't support aggregation (Windows doesn't) */
-    if (pUnkOuter != NULL) return CLASS_E_NOAGGREGATION;
-
-    if (IsEqualGUID(&IID_IDsObjectPicker, riid))
-    {
-        return OBJSEL_IDsObjectPicker_Create(ppvObj);
-    }
-
-    return CLASS_E_CLASSNOTAVAILABLE;
-}
-
-
-/**********************************************************************
- * OBJSEL_IClassFactory_LockServer
- */
-static HRESULT WINAPI OBJSEL_IClassFactory_LockServer(
-    LPCLASSFACTORY iface,
-    BOOL fLock)
-{
-    TRACE("\n");
-
-    if (fLock)
-        IClassFactory_AddRef(iface);
-    else
-        IClassFactory_Release(iface);
-    return S_OK;
-}
-
-
-/**********************************************************************
- * IClassFactory_Vtbl
- */
-static IClassFactoryVtbl IClassFactory_Vtbl =
-{
-    OBJSEL_IClassFactory_QueryInterface,
-    OBJSEL_IClassFactory_AddRef,
-    OBJSEL_IClassFactory_Release,
-    OBJSEL_IClassFactory_CreateInstance,
-    OBJSEL_IClassFactory_LockServer
-};
-
-
-/**********************************************************************
- * static ClassFactory instance
- */
-
-ClassFactoryImpl OBJSEL_ClassFactory = { { &IClassFactory_Vtbl }, 0 };
diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c
index 026a6d594af..0c809673c44 100644
--- a/dlls/objsel/objsel.c
+++ b/dlls/objsel/objsel.c
@@ -1,6 +1,8 @@
 /*
  * Object Picker Dialog
  *
+ * Copyright (C) 2002 John K. Hohm
+ * Copyright (C) 2002 Robert Shearman
  * Copyright 2005 Thomas Weidenmueller 
  *
  * This library is free software; you can redistribute it and/or
@@ -18,28 +20,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "objsel_private.h"
+#define COBJMACROS
+#include "objidl.h"
+#include "objsel.h"

#include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(objsel);

-/***********************************************************************
- *		DllGetClassObject (OBJSEL.@)
- */
-HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
+typedef struct
 {
-    TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv);
-
-    *ppv = NULL;
-
-    if (IsEqualGUID(rclsid, &CLSID_DsObjectPicker))
-        return IClassFactory_QueryInterface(&OBJSEL_ClassFactory.IClassFactory_iface, iid, ppv);
-
-    FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid));
-    return CLASS_E_CLASSNOTAVAILABLE;
-}
-
+    IDsObjectPicker IDsObjectPicker_iface;
+    LONG ref;
+} IDsObjectPickerImpl;

/**********************************************************************
  * OBJSEL_IDsObjectPicker_Destroy (also IUnknown)
@@ -156,10 +149,7 @@ static IDsObjectPickerVtbl IDsObjectPicker_Vtbl =
 };

-/**********************************************************************
- * OBJSEL_IDsObjectPicker_Create
- */
-HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj)
+static HRESULT object_picker_create(void **ppvObj)
 {
     IDsObjectPickerImpl *Instance = HeapAlloc(GetProcessHeap(),
                                               HEAP_ZERO_MEMORY,
@@ -175,3 +165,124 @@ HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj)
     else
         return E_OUTOFMEMORY;
 }
+
+
+struct class_factory
+{
+    IClassFactory IClassFactory_iface;
+    LONG ref;
+};
+
+
+static struct class_factory *impl_from_IClassFactory(IClassFactory *iface)
+{
+    return CONTAINING_RECORD(iface, struct class_factory, IClassFactory_iface);
+}
+
+
+static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID iid, void **out)
+{
+    TRACE("iid %s, out %p.\n", debugstr_guid(iid), out);
+
+    if (!out)
+        return E_POINTER;
+
+    if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IClassFactory))
+    {
+        *out = iface;
+        IClassFactory_AddRef(iface);
+        return S_OK;
+    }
+    else if (IsEqualGUID(iid, &IID_IDsObjectPicker))
+    {
+        return IClassFactory_CreateInstance(iface, NULL, iid, out);
+    }
+
+    WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+    return E_NOINTERFACE;
+}
+
+
+static ULONG WINAPI class_factory_AddRef(IClassFactory *iface)
+{
+    struct class_factory *factory = impl_from_IClassFactory(iface);
+
+    TRACE("\n");
+
+    if (!factory)
+        return E_POINTER;
+
+    return InterlockedIncrement(&factory->ref);
+}
+
+
+static ULONG WINAPI class_factory_Release(IClassFactory *iface)
+{
+    struct class_factory *factory = impl_from_IClassFactory(iface);
+
+    TRACE("\n");
+
+    if (!factory)
+        return E_POINTER;
+
+    return InterlockedDecrement(&factory->ref);
+}
+
+
+static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface,
+        IUnknown *outer, REFIID iid, void **out)
+{
+    TRACE("outer %p, iid %s, out %p.\n", outer, debugstr_guid(iid), out);
+
+    if (!out)
+        return E_POINTER;
+
+    if (outer)
+        return CLASS_E_NOAGGREGATION;
+
+    if (IsEqualGUID(&IID_IDsObjectPicker, iid))
+        return object_picker_create(out);
+
+    return CLASS_E_CLASSNOTAVAILABLE;
+}
+
+
+static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock)
+{
+    TRACE("lock %d.\n", lock);
+
+    if (lock)
+        IClassFactory_AddRef(iface);
+    else
+        IClassFactory_Release(iface);
+    return S_OK;
+}
+
+
+static IClassFactoryVtbl class_factory_vtbl =
+{
+    class_factory_QueryInterface,
+    class_factory_AddRef,
+    class_factory_Release,
+    class_factory_CreateInstance,
+    class_factory_LockServer
+};
+
+
+static struct class_factory class_factory = {{&class_factory_vtbl}, 0};
+
+/***********************************************************************
+ *		DllGetClassObject (OBJSEL.@)
+ */
+HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out)
+{
+    TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out);
+
+    *out = NULL;
+
+    if (IsEqualGUID(clsid, &CLSID_DsObjectPicker))
+        return IClassFactory_QueryInterface(&class_factory.IClassFactory_iface, iid, out);
+
+    FIXME("%s not available, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(clsid));
+    return CLASS_E_CLASSNOTAVAILABLE;
+}
diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h
deleted file mode 100644
index 86ea129089b..00000000000
--- a/dlls/objsel/objsel_private.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Object Picker Dialog Includes
- *
- * Copyright 2005 Thomas Weidenmueller 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define COBJMACROS
-
-#include "objidl.h"
-#include "objsel.h"
-
-/**********************************************************************
- * ClassFactory declaration for objsel.dll
- */
-typedef struct
-{
-    IClassFactory IClassFactory_iface;
-    LONG ref;
-} ClassFactoryImpl;
-
-typedef struct
-{
-    IDsObjectPicker IDsObjectPicker_iface;
-    LONG ref;
-} IDsObjectPickerImpl;
-
-HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj) DECLSPEC_HIDDEN;
-
-extern ClassFactoryImpl OBJSEL_ClassFactory DECLSPEC_HIDDEN;

[PATCH 4/5] objsel: Do not check for a NULL interface in COM methods.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/objsel/objsel.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c
index 0c809673c44..41f548bbc75 100644
--- a/dlls/objsel/objsel.c
+++ b/dlls/objsel/objsel.c
@@ -59,8 +59,6 @@ static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface)

TRACE("\n");

-    if (This == NULL) return E_POINTER;
-
     return InterlockedIncrement(&This->ref);
 }

@@ -75,8 +73,6 @@ static ULONG WINAPI OBJSEL_IDsObjectPicker_Release(IDsObjectPicker * iface)

TRACE("\n");

-    if (This == NULL) return E_POINTER;
-
     ref = InterlockedDecrement(&This->ref);

if (ref == 0)
@@ -209,9 +205,6 @@ static ULONG WINAPI class_factory_AddRef(IClassFactory *iface)

TRACE("\n");

-    if (!factory)
-        return E_POINTER;
-
     return InterlockedIncrement(&factory->ref);
 }

@@ -222,9 +215,6 @@ static ULONG WINAPI class_factory_Release(IClassFactory *iface)

TRACE("\n");

-    if (!factory)
-        return E_POINTER;
-
     return InterlockedDecrement(&factory->ref);
 }

[PATCH 5/5] objsel: Do not create an object from IClassFactory::QueryInterface().

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/objsel/objsel.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c
index 41f548bbc75..fce397cf557 100644
--- a/dlls/objsel/objsel.c
+++ b/dlls/objsel/objsel.c
@@ -189,10 +189,6 @@ static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID
         IClassFactory_AddRef(iface);
         return S_OK;
     }
-    else if (IsEqualGUID(iid, &IID_IDsObjectPicker))
-    {
-        return IClassFactory_CreateInstance(iface, NULL, iid, out);
-    }

WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
     return E_NOINTERFACE;