Revert the sync.

[reactos.git] / dll / win32 / sti / sti_main.c

diff --git a/dll/win32/sti/sti_main.c b/dll/win32/sti/sti_main.c
index 711c17f..1d4e6ad 100644 (file)
--- a/dll/win32/sti/sti_main.c
+++ b/dll/win32/sti/sti_main.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2002 Aric Stewart for CodeWeavers
- * Copyright (C) 2009 Damjan Jovanovic
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,148 +18,31 @@
 
 #include <stdarg.h>
 
-#define COBJMACROS
-
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
 #include "winerror.h"
-#include "objbase.h"
-#include "sti.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(sti);
-
-extern HRESULT WINAPI STI_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN;
-extern BOOL WINAPI STI_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;
-
-typedef HRESULT (*fnCreateInstance)(REFIID riid, IUnknown *pUnkOuter, LPVOID *ppObj);
-
-typedef struct
-{
-    const struct IClassFactoryVtbl *vtbl;
-    fnCreateInstance pfnCreateInstance;
-} sti_cf;
-
-static inline sti_cf *impl_from_IClassFactory( IClassFactory *iface )
-{
-    return (sti_cf *)((char *)iface - FIELD_OFFSET( sti_cf, vtbl ));
-}
-
-static HRESULT sti_create( REFIID riid, IUnknown *pUnkOuter, LPVOID *ppObj )
-{
-    if (pUnkOuter != NULL && !IsEqualIID(riid, &IID_IUnknown))
-        return CLASS_E_NOAGGREGATION;
-
-    if (IsEqualGUID(riid, &IID_IUnknown))
-        return StiCreateInstanceW(GetCurrentProcess(), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, (PSTIW*) ppObj, pUnkOuter);
-    else if (IsEqualGUID(riid, &IID_IStillImageW))
-        return StiCreateInstanceW(GetCurrentProcess(), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, (PSTIW*) ppObj, NULL);
-    else if (IsEqualGUID(riid, &IID_IStillImageA))
-        return StiCreateInstanceA(GetCurrentProcess(), STI_VERSION_REAL, (PSTIA*) ppObj, NULL);
-    else
-    {
-        FIXME("no interface %s\n", debugstr_guid(riid));
-        return E_NOINTERFACE;
-    }
-}
-
-static HRESULT WINAPI sti_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj )
-{
-    if (IsEqualGUID(riid, &IID_IUnknown) ||
-        IsEqualGUID(riid, &IID_IClassFactory))
-    {
-        IClassFactory_AddRef( iface );
-        *ppobj = iface;
-        return S_OK;
-    }
-    FIXME("interface %s not implemented\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
 
-static ULONG WINAPI sti_cf_AddRef( IClassFactory *iface )
-{
-    return 2;
-}
-
-static ULONG WINAPI sti_cf_Release( IClassFactory *iface )
-{
-    return 1;
-}
-
-static HRESULT WINAPI sti_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOuter,
-                                             REFIID riid, LPVOID *ppobj )
-{
-    sti_cf *This = impl_from_IClassFactory( iface );
-    HRESULT r;
-    IUnknown *punk;
-
-    TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj);
-
-    *ppobj = NULL;
-
-    r = This->pfnCreateInstance( riid, pOuter, (LPVOID *)&punk );
-    if (FAILED(r))
-        return r;
-
-    r = IUnknown_QueryInterface( punk, riid, ppobj );
-    if (FAILED(r))
-        return r;
-
-    IUnknown_Release( punk );
-    return r;
-}
-
-static HRESULT WINAPI sti_cf_LockServer( IClassFactory *iface, BOOL dolock )
-{
-    FIXME("(%p)->(%d)\n", iface, dolock);
-    return S_OK;
-}
-
-static const struct IClassFactoryVtbl sti_cf_vtbl =
-{
-    sti_cf_QueryInterface,
-    sti_cf_AddRef,
-    sti_cf_Release,
-    sti_cf_CreateInstance,
-    sti_cf_LockServer
-};
-
-static sti_cf the_sti_cf = { &sti_cf_vtbl, sti_create };
-
-BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
+/******************************************************************************
+ *           StiCreateInstance   (STI.@)
+ */
+HRESULT WINAPI StiCreateInstance( HINSTANCE a, DWORD b, LPVOID c, LPVOID d)
 {
-    TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved);
-
-    if (fdwReason == DLL_WINE_PREATTACH)
-        return FALSE;
-    return STI_DllMain(hInstDLL, fdwReason, lpvReserved);
+    return STG_E_UNIMPLEMENTEDFUNCTION;
 }
 
 /******************************************************************************
- *           DllGetClassObject   (STI.@)
+ *           StiCreateInstanceA   (STI.@)
  */
-HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
+HRESULT WINAPI StiCreateInstanceA( HINSTANCE a, DWORD b, LPVOID c, LPVOID d)
 {
-    IClassFactory *cf = NULL;
-
-    TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv);
-
-    if (IsEqualGUID( rclsid, &CLSID_Sti ))
-    {
-       cf = (IClassFactory *)&the_sti_cf.vtbl;
-    }
-
-    if (cf)
-        return IClassFactory_QueryInterface( cf, iid, ppv );
-    return STI_DllGetClassObject( rclsid, iid, ppv );
+    return STG_E_UNIMPLEMENTEDFUNCTION;
 }
 
 /******************************************************************************
- *           DllCanUnloadNow   (STI.@)
+ *           StiCreateInstanceW   (STI.@)
  */
-HRESULT WINAPI DllCanUnloadNow( void )
+HRESULT WINAPI StiCreateInstanceW( HINSTANCE a, DWORD b, LPVOID c, LPVOID d)
 {
-    return S_FALSE;
+    return STG_E_UNIMPLEMENTEDFUNCTION;
 }