fusion: Implement the IAssemblyEnum interface.

dlls/fusion/Makefile.in

@@ -7,6 +7,7 @@ IMPORTS   = advapi32 dbghelp kernel32 shlwapi version
 
 C_SRCS = \
 	asmcache.c \
+	asmenum.c \
 	asmname.c \
 	assembly.c \
 	fusion.c \

dlls/fusion/asmcache.c

@@ -391,86 +391,3 @@ static const IAssemblyCacheItemVtbl AssemblyCacheItemVtbl = {
     IAssemblyCacheItemImpl_Commit,
     IAssemblyCacheItemImpl_AbortItem
 };
-
-/* IAssemblyEnum */
-
-typedef struct {
-    const IAssemblyEnumVtbl *lpIAssemblyEnumVtbl;
-
-    LONG ref;
-} IAssemblyEnumImpl;
-
-static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface,
-                                                       REFIID riid, LPVOID *ppobj)
-{
-    IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface;
-
-    TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj);
-
-    *ppobj = NULL;
-
-    if (IsEqualIID(riid, &IID_IUnknown) ||
-        IsEqualIID(riid, &IID_IAssemblyEnum))
-    {
-        IUnknown_AddRef(iface);
-        *ppobj = This;
-        return S_OK;
-    }
-
-    WARN("(%p, %s, %p): not found\n", This, debugstr_guid(riid), ppobj);
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI IAssemblyEnumImpl_AddRef(IAssemblyEnum *iface)
-{
-    IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface;
-    ULONG refCount = InterlockedIncrement(&This->ref);
-
-    TRACE("(%p)->(ref before = %u)\n", This, refCount - 1);
-
-    return refCount;
-}
-
-static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface)
-{
-    IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface;
-    ULONG refCount = InterlockedDecrement(&This->ref);
-
-    TRACE("(%p)->(ref before = %u)\n", This, refCount + 1);
-
-    if (!refCount)
-        HeapFree(GetProcessHeap(), 0, This);
-
-    return refCount;
-}
-
-static HRESULT WINAPI IAssemblyEnumImpl_GetNextAssembly(IAssemblyEnum *iface,
-                                                        LPVOID pvReserved,
-                                                        IAssemblyName **ppName,
-                                                        DWORD dwFlags)
-{
-    FIXME("(%p, %p, %p, %d) stub!\n", iface, pvReserved, ppName, dwFlags);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IAssemblyEnumImpl_Reset(IAssemblyEnum *iface)
-{
-    FIXME("(%p) stub!\n", iface);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IAssemblyEnumImpl_Clone(IAssemblyEnum *iface,
-                                               IAssemblyEnum **ppEnum)
-{
-    FIXME("(%p, %p) stub!\n", iface, ppEnum);
-    return E_NOTIMPL;
-}
-
-static const IAssemblyEnumVtbl AssemblyEnumVtbl = {
-    IAssemblyEnumImpl_QueryInterface,
-    IAssemblyEnumImpl_AddRef,
-    IAssemblyEnumImpl_Release,
-    IAssemblyEnumImpl_GetNextAssembly,
-    IAssemblyEnumImpl_Reset,
-    IAssemblyEnumImpl_Clone
-};

dlls/fusion/asmname.c

@@ -33,23 +33,10 @@
 
 #include "wine/debug.h"
 #include "wine/unicode.h"
+#include "fusionpriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(fusion);
 
-static inline LPWSTR strdupW(LPCWSTR src)
-{
-    LPWSTR dest;
-
-    if (!src)
-        return NULL;
-
-    dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR));
-    if (dest)
-        lstrcpyW(dest, src);
-
-    return dest;
-}
-
 typedef struct {
     const IAssemblyNameVtbl *lpIAssemblyNameVtbl;
 

dlls/fusion/fusion.c

@@ -55,18 +55,6 @@ HRESULT WINAPI CompareAssemblyIdentity(LPCWSTR pwzAssemblyIdentity1, BOOL fUnifi
 }
 
 /******************************************************************
- *  CreateAssemblyEnum   (FUSION.@)
- */
-HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved,
-                                  IAssemblyName *pName, DWORD dwFlags, LPVOID pvReserved)
-{
-    FIXME("(%p, %p, %p, %08x, %p) stub!\n", pEnum, pUnkReserved,
-          pName, dwFlags, pvReserved);
-
-    return E_NOTIMPL;
-}
-
-/******************************************************************
  *  CreateInstallReferenceEnum   (FUSION.@)
  */
 HRESULT WINAPI CreateInstallReferenceEnum(IInstallReferenceEnum **ppRefEnum,

dlls/fusion/fusionpriv.h

@@ -26,6 +26,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
+#include "winver.h"
 
 #include <pshpack1.h>
 
@@ -435,4 +436,18 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPSTR *version);
 HRESULT assembly_get_architecture(ASSEMBLY *assembly, DWORD fixme);
 HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPSTR *token);
 
+static inline LPWSTR strdupW(LPCWSTR src)
+{
+    LPWSTR dest;
+
+    if (!src)
+        return NULL;
+
+    dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR));
+    if (dest)
+        lstrcpyW(dest, src);
+
+    return dest;
+}
+
 #endif /* __WINE_FUSION_PRIVATE__ */