ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddrawex: Avoid LPVOID.

This commit is contained in:
Henri Verbeet 2013-09-12 09:20:54 +02:00 committed by Alexandre Julliard
parent 3c6d11706f
commit 545f83bc8f
5 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ddrawex/ddrawex_private.h
View File

@ -30,7 +30,7 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown)
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;
STDMETHOD(_DirectDrawEnumerate)(THIS_ LPDDENUMCALLBACKW cb, void *ctx) PURE;
};
#undef INTERFACE

23
dlls/ddrawex/main.c
View File

@ -43,7 +43,7 @@ typedef struct
{
IClassFactory IClassFactory_iface;
LONG ref;
HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj);
HRESULT (*pfnCreateInstance)(IUnknown *outer, REFIID iid, void **out);
} IClassFactoryImpl;
static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
@ -215,13 +215,8 @@ static ULONG WINAPI IDirectDrawFactoryImpl_Release(IDirectDrawFactory *iface)
return ref;
}
/*******************************************************************************
* IDirectDrawFactoryImpl_DirectDrawEnumerate
*******************************************************************************/
static HRESULT WINAPI
IDirectDrawFactoryImpl_DirectDrawEnumerate(IDirectDrawFactory* iface,
LPDDENUMCALLBACKW lpCallback,
LPVOID lpContext)
static HRESULT WINAPI IDirectDrawFactoryImpl_DirectDrawEnumerate(IDirectDrawFactory *iface,
LPDDENUMCALLBACKW cb, void *ctx)
{
FIXME("Stub!\n");
return E_FAIL;
@ -286,11 +281,11 @@ HRESULT WINAPI DllCanUnloadNow(void)
/*******************************************************************************
* DllGetClassObject [DDRAWEX.@]
*/
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out)
{
IClassFactoryImpl *factory;
TRACE("ddrawex (%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
TRACE("rclsid %s, riid %s, out %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), out);
if (!IsEqualGUID( &IID_IClassFactory, riid)
&& !IsEqualGUID( &IID_IUnknown, riid))
@ -310,7 +305,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
factory->pfnCreateInstance = CreateDirectDrawFactory;
*ppv = factory;
*out = factory;
return S_OK;
}
@ -319,13 +314,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
/***********************************************************************
* DllMain
*/
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv)
BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
{
switch (reason)
{
case DLL_PROCESS_ATTACH:
instance = hInstDLL;
DisableThreadLibraryCalls( hInstDLL );
instance = inst;
DisableThreadLibraryCalls( inst );
break;
}
return TRUE;

2
dlls/ddrawex/tests/ddrawex.c
View File

@ -25,7 +25,7 @@
#include "unknwn.h"
static IDirectDrawFactory *factory;
static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv);
static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out);
static IDirectDraw *createDD(void)
{

2
dlls/ddrawex/tests/ddrawex.h
View File

@ -30,7 +30,7 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown)
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;
STDMETHOD(_DirectDrawEnumerate)(THIS_ LPDDENUMCALLBACKW cb, void *ctx) PURE;
};
#undef INTERFACE

2
dlls/ddrawex/tests/surface.c
View File

@ -27,7 +27,7 @@
#include "unknwn.h"
static IDirectDrawFactory *factory;
static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv);
static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out);
static IDirectDraw *createDD(void)
{