Add ddrawex dll.

Makefile.in

@@ -197,6 +197,7 @@ ALL_MAKEFILES = \
 	dlls/dciman32/Makefile \
 	dlls/ddraw/Makefile \
 	dlls/ddraw/tests/Makefile \
+	dlls/ddrawex/Makefile \
 	dlls/devenum/Makefile \
 	dlls/dinput/Makefile \
 	dlls/dinput/tests/Makefile \
@@ -520,6 +521,7 @@ dlls/dbghelp/Makefile: dlls/dbghelp/Makefile.in dlls/Makedll.rules
 dlls/dciman32/Makefile: dlls/dciman32/Makefile.in dlls/Makedll.rules
 dlls/ddraw/Makefile: dlls/ddraw/Makefile.in dlls/Makedll.rules
 dlls/ddraw/tests/Makefile: dlls/ddraw/tests/Makefile.in dlls/Maketest.rules
+dlls/ddrawex/Makefile: dlls/ddrawex/Makefile.in dlls/Makedll.rules
 dlls/devenum/Makefile: dlls/devenum/Makefile.in dlls/Makedll.rules
 dlls/dinput/Makefile: dlls/dinput/Makefile.in dlls/Makedll.rules
 dlls/dinput/tests/Makefile: dlls/dinput/tests/Makefile.in dlls/Maketest.rules

configure.ac

@@ -1561,6 +1561,7 @@ dlls/dbghelp/Makefile
 dlls/dciman32/Makefile
 dlls/ddraw/Makefile
 dlls/ddraw/tests/Makefile
+dlls/ddrawex/Makefile
 dlls/devenum/Makefile
 dlls/dinput/Makefile
 dlls/dinput/tests/Makefile

dlls/Makefile.in

@@ -46,6 +46,7 @@ BASEDIRS = \
 	dbghelp \
 	dciman32 \
 	ddraw \
+	ddrawex \
 	devenum \
 	dinput \
 	dinput8 \

dlls/ddrawex/Makefile.in

@@ -0,0 +1,14 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = ddrawex.dll
+IMPORTS   = ddraw kernel32
+EXTRALIBS = -ldxguid -luuid
+
+C_SRCS = \
+	main.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend

dlls/ddrawex/ddrawex.spec

@@ -0,0 +1,4 @@
+@ stdcall -private DllCanUnloadNow()
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()

dlls/ddrawex/ddrawex_private.h

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2006 Ulrich Czekalla
+ *
+ * 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
+ */
+
+#ifndef __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H
+#define __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H
+
+DEFINE_GUID(CLSID_DirectDrawFactory, 0x4fd2a832, 0x86c8, 0x11d0, 0x8f, 0xca, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);
+DEFINE_GUID(IID_IDirectDrawFactory, 0x4fd2a833, 0x86c8, 0x11d0, 0x8f, 0xca, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);
+
+#define INTERFACE IDirectDrawFactory
+DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown)
+{
+    STDMETHOD_(HRESULT, QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    STDMETHOD(CreateDirectDraw)(THIS_ GUID * pGUID, HWND hWnd, DWORD dwCoopLevelFlags,
+        DWORD dwReserved, IUnknown *pUnkOuter, IDirectDraw **ppDirectDraw) PURE;
+    STDMETHOD(_DirectDrawEnumerate)(THIS_ LPDDENUMCALLBACKW lpCallback, LPVOID lpContext) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDrawFactory_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDrawFactory_AddRef(p)             (p)->lpVtbl->AddRef(p)
+#define IDirectDrawFactory_Release(p)            (p)->lpVtbl->Release(p)
+#define IDirectDrawFactory_CreateDirectDraw(p,a,b,c,d,e,f)  (p)->lpVtbl->CreateDirectDraw(p,a,b,c,d,e,f)
+#define IDirectDrawFactory_DirectDrawEnumerate(p,a,b)  (p)->lpVtbl->_DirectDrawEnumerate(p,a,b)
+#endif
+
+/******************************************************************************
+ * DirectDraw ClassFactory implementation - incomplete
+ ******************************************************************************/
+typedef struct
+{
+    IClassFactory *lpVtbl;
+    LONG ref;
+    HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj);
+} IClassFactoryImpl;
+
+
+/******************************************************************************
+ * DirectDrawFactopry implementation
+ ******************************************************************************/
+typedef struct
+{
+    IDirectDrawFactory *lpVtbl;
+    LONG ref;
+} IDirectDrawFactoryImpl;
+
+#endif /* __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H */

dlls/ddrawex/main.c

@@ -0,0 +1,359 @@
+/*        DirectDrawEx
+ *
+ * Copyright 2006 Ulrich Czekalla
+ *
+ * This file contains the (internal) driver registration functions,
+ * driver enumeration APIs and DirectDraw creation functions.
+ *
+ * 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 "wine/debug.h"
+
+#define COBJMACROS
+
+#include "winbase.h"
+#include "wingdi.h"
+
+#include "ddraw.h"
+
+#include "initguid.h"
+#include "ddrawex_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
+
+
+/*******************************************************************************
+ * IDirectDrawClassFactory::QueryInterface
+ *
+ *******************************************************************************/
+static HRESULT WINAPI
+IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface,
+                    REFIID riid,
+                    void **obj)
+{
+    IClassFactoryImpl *This = (IClassFactoryImpl*) iface;
+
+    TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obj);
+
+    if (IsEqualGUID(riid, &IID_IUnknown)
+        || IsEqualGUID(riid, &IID_IClassFactory))
+    {
+        IClassFactory_AddRef(iface);
+        *obj = This;
+        return S_OK;
+    }
+
+    WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),obj);
+    return E_NOINTERFACE;
+}
+
+/*******************************************************************************
+ * IDirectDrawClassFactory::AddRef
+ *
+ *******************************************************************************/
+static ULONG WINAPI
+IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface)
+{
+    IClassFactoryImpl *This = (IClassFactoryImpl*) iface;
+    ULONG ref = InterlockedIncrement(&This->ref);
+
+    TRACE("(%p)->() incrementing from %d.\n", This, ref - 1);
+
+    return ref;
+}
+
+/*******************************************************************************
+ * IDirectDrawClassFactory::Release
+ *
+ *******************************************************************************/
+static ULONG WINAPI
+IDirectDrawClassFactoryImpl_Release(IClassFactory *iface)
+{
+    IClassFactoryImpl *This = (IClassFactoryImpl*) iface;
+    ULONG ref = InterlockedDecrement(&This->ref);
+    TRACE("(%p)->() decrementing from %d.\n", This, ref+1);
+
+    if (ref == 0)
+        HeapFree(GetProcessHeap(), 0, This);
+
+    return ref;
+}
+
+
+/*******************************************************************************
+ * IDirectDrawClassFactory::CreateInstance
+ *
+ *******************************************************************************/
+static HRESULT WINAPI
+IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface,
+                                           IUnknown *UnkOuter,
+                                           REFIID riid,
+                                           void **obj)
+{
+    IClassFactoryImpl *This = (IClassFactoryImpl*) iface;
+
+    TRACE("(%p)->(%p,%s,%p)\n",This,UnkOuter,debugstr_guid(riid),obj);
+
+    return This->pfnCreateInstance(UnkOuter, riid, obj);
+}
+
+/*******************************************************************************
+ * IDirectDrawClassFactory::LockServer
+ *
+ *******************************************************************************/
+static HRESULT WINAPI
+IDirectDrawClassFactoryImpl_LockServer(IClassFactory *iface,BOOL dolock)
+{
+    IClassFactoryImpl *This = (IClassFactoryImpl*) iface;
+    FIXME("(%p)->(%d),stub!\n",This,dolock);
+    return S_OK;
+}
+
+
+/*******************************************************************************
+ * The class factory VTable
+ *******************************************************************************/
+static const IClassFactoryVtbl IClassFactory_Vtbl =
+{
+    IDirectDrawClassFactoryImpl_QueryInterface,
+    IDirectDrawClassFactoryImpl_AddRef,
+    IDirectDrawClassFactoryImpl_Release,
+    IDirectDrawClassFactoryImpl_CreateInstance,
+    IDirectDrawClassFactoryImpl_LockServer
+};
+
+
+/*******************************************************************************
+ * IDirectDrawFactory::QueryInterface
+ *
+ *******************************************************************************/
+static HRESULT WINAPI
+IDirectDrawFactoryImpl_QueryInterface(IDirectDrawFactory *iface,
+                    REFIID riid,
+                    void **obj)
+{
+    IDirectDrawFactoryImpl *This = (IDirectDrawFactoryImpl*) iface;
+
+    TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obj);
+
+    if (IsEqualGUID(riid, &IID_IUnknown)
+        || IsEqualGUID(riid, &IID_IDirectDrawFactory))
+    {
+        IDirectDrawFactory_AddRef(iface);
+        *obj = This;
+        return S_OK;
+    }
+
+    WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),obj);
+    return E_NOINTERFACE;
+}
+
+/*******************************************************************************
+ * IDirectDrawFactory::AddRef
+ *
+ *******************************************************************************/
+static ULONG WINAPI
+IDirectDrawFactoryImpl_AddRef(IDirectDrawFactory *iface)
+{
+    IDirectDrawFactoryImpl *This = (IDirectDrawFactoryImpl*) iface;
+    ULONG ref = InterlockedIncrement(&This->ref);
+
+    TRACE("(%p)->() incrementing from %d.\n", This, ref - 1);
+
+    return ref;
+}
+
+/*******************************************************************************
+ * IDirectDrawFactory::Release
+ *
+ *******************************************************************************/
+static ULONG WINAPI
+IDirectDrawFactoryImpl_Release(IDirectDrawFactory *iface)
+{
+    IDirectDrawFactoryImpl *This = (IDirectDrawFactoryImpl*) iface;
+    ULONG ref = InterlockedDecrement(&This->ref);
+    TRACE("(%p)->() decrementing from %d.\n", This, ref+1);
+
+    if (ref == 0)
+        HeapFree(GetProcessHeap(), 0, This);
+
+    return ref;
+}
+
+
+/*******************************************************************************
+ * IDirectDrawFactoryImpl_CreateDirectDraw
+ *******************************************************************************/
+static HRESULT WINAPI
+IDirectDrawFactoryImpl_CreateDirectDraw(IDirectDrawFactory* iface,
+                                        GUID * pGUID,
+                                        HWND hWnd,
+                                        DWORD dwCoopLevelFlags,
+                                        DWORD dwReserved,
+                                        IUnknown *pUnkOuter,
+                                        IDirectDraw **ppDirectDraw)
+{
+    HRESULT hr;
+
+    TRACE("\n");
+
+    hr = DirectDrawCreateEx(pGUID, (void**)ppDirectDraw, &IID_IDirectDraw3, pUnkOuter);
+
+    if (FAILED(hr))
+        return hr;
+
+    hr = IDirectDraw_SetCooperativeLevel(*ppDirectDraw, hWnd, dwCoopLevelFlags);
+    if (FAILED(hr))
+        IDirectDraw_Release(*ppDirectDraw);
+
+    return hr;
+}
+
+
+/*******************************************************************************
+ * IDirectDrawFactoryImpl_DirectDrawEnumerate
+ *******************************************************************************/
+static HRESULT WINAPI
+IDirectDrawFactoryImpl_DirectDrawEnumerate(IDirectDrawFactory* iface,
+                                           LPDDENUMCALLBACKW lpCallback,
+                                           LPVOID lpContext)
+{
+    FIXME("Stub!\n");
+    return E_FAIL;
+}
+
+
+/*******************************************************************************
+ * Direct Draw Factory VTable
+ *******************************************************************************/
+static const IDirectDrawFactoryVtbl IDirectDrawFactory_Vtbl =
+{
+    IDirectDrawFactoryImpl_QueryInterface,
+    IDirectDrawFactoryImpl_AddRef,
+    IDirectDrawFactoryImpl_Release,
+    IDirectDrawFactoryImpl_CreateDirectDraw,
+    IDirectDrawFactoryImpl_DirectDrawEnumerate,
+};
+
+/***********************************************************************
+ * CreateDirectDrawFactory
+ *
+ ***********************************************************************/
+static HRESULT
+CreateDirectDrawFactory(IUnknown* UnkOuter, REFIID iid, void **obj)
+{
+    HRESULT hr;
+    IDirectDrawFactoryImpl *This = NULL;
+
+    TRACE("(%p,%s,%p)\n", UnkOuter, debugstr_guid(iid), obj);
+
+    if (UnkOuter != NULL)
+        return CLASS_E_NOAGGREGATION;
+
+    This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawFactoryImpl));
+
+    if(!This)
+    {
+        ERR("Out of memory when creating DirectDraw\n");
+        return E_OUTOFMEMORY;
+    }
+
+    This->lpVtbl = (IDirectDrawFactory*) &IDirectDrawFactory_Vtbl;
+
+    hr = IDirectDrawFactory_QueryInterface(This->lpVtbl, iid,  obj);
+
+    if (FAILED(hr))
+        HeapFree(GetProcessHeap(), 0, This);
+
+    return hr;
+}
+
+
+/*******************************************************************************
+ * DllCanUnloadNow [DDRAWEX.@]  Determines whether the DLL is in use.
+ */
+HRESULT WINAPI DllCanUnloadNow(void)
+{
+    FIXME("(void): stub\n");
+    return S_FALSE;
+}
+
+
+/*******************************************************************************
+ * DllGetClassObject [DDRAWEX.@]
+ */
+HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
+{
+    IClassFactoryImpl *factory;
+
+    TRACE("ddrawex (%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
+
+    if (!IsEqualGUID( &IID_IClassFactory, riid)
+        && !IsEqualGUID( &IID_IUnknown, riid))
+        return E_NOINTERFACE;
+
+    if (!IsEqualGUID(&CLSID_DirectDrawFactory, rclsid))
+    {
+        FIXME("%s: no class found.\n", debugstr_guid(rclsid));
+        return CLASS_E_CLASSNOTAVAILABLE;
+    }
+
+    factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory));
+    if (factory == NULL) return E_OUTOFMEMORY;
+
+    factory->lpVtbl = (IClassFactory*) &IClassFactory_Vtbl;
+    factory->ref = 1;
+
+    factory->pfnCreateInstance = CreateDirectDrawFactory;
+
+    *ppv = (IClassFactory*) factory;
+
+    return S_OK;
+}
+
+
+/***********************************************************************
+ * DllMain (DDRAWEX.0)
+ *
+ ***********************************************************************/
+BOOL WINAPI
+DllMain(HINSTANCE hInstDLL,
+        DWORD Reason,
+        void *lpv)
+{
+    TRACE("(%p,%x,%p)\n", hInstDLL, Reason, lpv);
+    return TRUE;
+}
+
+
+/***********************************************************************
+ * DllRegisterServer (DDRAWEX.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+    FIXME("stub\n");
+    return E_FAIL;
+}
+
+/***********************************************************************
+ * DllUnregisterServer (DDRAWEX.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+    FIXME("stub\n");
+    return E_FAIL;
+}