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

- Changed return code for failure on *_DllGetClassObject to 

CLASS_E_CLASSNOTAVAILABLE from E_NOTAVAILABLE as documented.
- Replaced memcmps with equivalent IsEqualCLSID or IsEqualGUID macros.
- Changed "return 0;" with S_OK or DS_OK as appropriate.
This commit is contained in:
Peter Hunnisett 1999-09-28 16:23:17 +00:00 committed by Alexandre Julliard
parent de5e1af2bd
commit 89391af7e9
2 changed files with 74 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
graphics/ddraw.c
View File

@ -1363,7 +1363,7 @@ static ULONG WINAPI DGA_IDirectDrawSurface4Impl_Release(LPDIRECTDRAWSURFACE4 ifa
} }
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return S_OK;
} }
#endif /* defined(HAVE_LIBXXF86DGA) */ #endif /* defined(HAVE_LIBXXF86DGA) */
@ -1427,7 +1427,7 @@ static ULONG WINAPI Xlib_IDirectDrawSurface4Impl_Release(LPDIRECTDRAWSURFACE4 if
} }
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return S_OK;
} }
static HRESULT WINAPI IDirectDrawSurface4Impl_GetAttachedSurface( static HRESULT WINAPI IDirectDrawSurface4Impl_GetAttachedSurface(
@ -1696,11 +1696,11 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_QueryInterface(LPDIRECTDRAWSURFACE
/* All DirectDrawSurface versions (1, 2, 3 and 4) use /* All DirectDrawSurface versions (1, 2, 3 and 4) use
* the same interface. And IUnknown does that too of course. * the same interface. And IUnknown does that too of course.
*/ */
if ( !memcmp(&IID_IDirectDrawSurface4,refiid,sizeof(IID)) || if ( IsEqualGUID( &IID_IDirectDrawSurface4, refiid ) ||
!memcmp(&IID_IDirectDrawSurface3,refiid,sizeof(IID)) || IsEqualGUID( &IID_IDirectDrawSurface3, refiid ) ||
!memcmp(&IID_IDirectDrawSurface2,refiid,sizeof(IID)) || IsEqualGUID( &IID_IDirectDrawSurface2, refiid ) ||
!memcmp(&IID_IDirectDrawSurface,refiid,sizeof(IID)) || IsEqualGUID( &IID_IDirectDrawSurface, refiid ) ||
!memcmp(&IID_IUnknown,refiid,sizeof(IID)) IsEqualGUID( &IID_IUnknown, refiid )
) { ) {
*obj = This; *obj = This;
IDirectDrawSurface4_AddRef(iface); IDirectDrawSurface4_AddRef(iface);
@ -1708,7 +1708,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_QueryInterface(LPDIRECTDRAWSURFACE
TRACE(" Creating IDirectDrawSurface interface (%p)\n", *obj); TRACE(" Creating IDirectDrawSurface interface (%p)\n", *obj);
return S_OK; return S_OK;
} }
else if (!memcmp(&IID_IDirect3DTexture2,refiid,sizeof(IID))) else if ( IsEqualGUID( &IID_IDirect3DTexture2, refiid ) )
{ {
/* Texture interface */ /* Texture interface */
*obj = d3dtexture2_create(This); *obj = d3dtexture2_create(This);
@ -1716,7 +1716,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_QueryInterface(LPDIRECTDRAWSURFACE
TRACE(" Creating IDirect3DTexture2 interface (%p)\n", *obj); TRACE(" Creating IDirect3DTexture2 interface (%p)\n", *obj);
return S_OK; return S_OK;
} }
else if (!memcmp(&IID_IDirect3DTexture,refiid,sizeof(IID))) else if ( IsEqualGUID( &IID_IDirect3DTexture, refiid ) )
{ {
/* Texture interface */ /* Texture interface */
*obj = d3dtexture_create(This); *obj = d3dtexture_create(This);
@ -2216,7 +2216,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_Release(LPDIRECTDRAWCLIPPER iface) {
if (This->ref) if (This->ref)
return This->ref; return This->ref;
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return S_OK;
} }
static HRESULT WINAPI IDirectDrawClipperImpl_GetClipList( static HRESULT WINAPI IDirectDrawClipperImpl_GetClipList(
@ -2408,7 +2408,7 @@ static ULONG WINAPI IDirectDrawPaletteImpl_Release(LPDIRECTDRAWPALETTE iface) {
This->cm = 0; This->cm = 0;
} }
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return S_OK;
} }
return This->ref; return This->ref;
} }
@ -2487,9 +2487,9 @@ static HRESULT WINAPI IDirect3DImpl_QueryInterface(
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj); TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj);
if ((!memcmp(&IID_IDirectDraw,refiid,sizeof(IID_IDirectDraw))) || if ( ( IsEqualGUID( &IID_IDirectDraw, refiid ) ) ||
(!memcmp(&IID_IDirectDraw2,refiid,sizeof(IID_IDirectDraw2))) || ( IsEqualGUID (&IID_IDirectDraw2, refiid ) ) ||
(!memcmp(&IID_IDirectDraw4,refiid,sizeof(IID_IDirectDraw4)))) { ( IsEqualGUID( &IID_IDirectDraw4, refiid ) ) ) {
*obj = This->ddraw; *obj = This->ddraw;
IDirect3D_AddRef(iface); IDirect3D_AddRef(iface);
@ -2497,8 +2497,8 @@ static HRESULT WINAPI IDirect3DImpl_QueryInterface(
return S_OK; return S_OK;
} }
if ((!memcmp(&IID_IDirect3D,refiid,sizeof(IID_IDirect3D))) || if ( ( IsEqualGUID( &IID_IDirect3D, refiid ) ) ||
(!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)))) { ( IsEqualGUID( &IID_IUnknown, refiid ) ) ) {
*obj = This; *obj = This;
IDirect3D_AddRef(iface); IDirect3D_AddRef(iface);
@ -2506,7 +2506,7 @@ static HRESULT WINAPI IDirect3DImpl_QueryInterface(
return S_OK; return S_OK;
} }
if (!memcmp(&IID_IDirect3D2,refiid,sizeof(IID_IDirect3D2))) { if ( IsEqualGUID( &IID_IDirect3D2, refiid ) ) {
IDirect3D2Impl* d3d; IDirect3D2Impl* d3d;
d3d = HeapAlloc(GetProcessHeap(),0,sizeof(*d3d)); d3d = HeapAlloc(GetProcessHeap(),0,sizeof(*d3d));
@ -2539,7 +2539,7 @@ static ULONG WINAPI IDirect3DImpl_Release(LPDIRECT3D iface)
if (!--(This->ref)) { if (!--(This->ref)) {
IDirectDraw2_Release((IDirectDraw2*)This->ddraw); IDirectDraw2_Release((IDirectDraw2*)This->ddraw);
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return S_OK;
} }
return This->ref; return This->ref;
} }
@ -2645,9 +2645,9 @@ static HRESULT WINAPI IDirect3D2Impl_QueryInterface(
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj); TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj);
if ((!memcmp(&IID_IDirectDraw,refiid,sizeof(IID_IDirectDraw))) || if ( ( IsEqualGUID( &IID_IDirectDraw, refiid ) ) ||
(!memcmp(&IID_IDirectDraw2,refiid,sizeof(IID_IDirectDraw2))) || ( IsEqualGUID( &IID_IDirectDraw2, refiid ) ) ||
(!memcmp(&IID_IDirectDraw4,refiid,sizeof(IID_IDirectDraw4)))) { ( IsEqualGUID( &IID_IDirectDraw4, refiid ) ) ) {
*obj = This->ddraw; *obj = This->ddraw;
IDirect3D2_AddRef(iface); IDirect3D2_AddRef(iface);
@ -2655,8 +2655,8 @@ static HRESULT WINAPI IDirect3D2Impl_QueryInterface(
return S_OK; return S_OK;
} }
if ((!memcmp(&IID_IDirect3D2,refiid,sizeof(IID_IDirect3D2))) || if ( ( IsEqualGUID( &IID_IDirect3D2, refiid ) ) ||
(!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)))) { ( IsEqualGUID( &IID_IUnknown, refiid ) ) ) {
*obj = This; *obj = This;
IDirect3D2_AddRef(iface); IDirect3D2_AddRef(iface);
@ -2664,7 +2664,7 @@ static HRESULT WINAPI IDirect3D2Impl_QueryInterface(
return S_OK; return S_OK;
} }
if (!memcmp(&IID_IDirect3D,refiid,sizeof(IID_IDirect3D))) { if ( IsEqualGUID( &IID_IDirect3D, refiid ) ) {
IDirect3DImpl* d3d; IDirect3DImpl* d3d;
d3d = HeapAlloc(GetProcessHeap(),0,sizeof(*d3d)); d3d = HeapAlloc(GetProcessHeap(),0,sizeof(*d3d));
@ -2696,7 +2696,7 @@ static ULONG WINAPI IDirect3D2Impl_Release(LPDIRECT3D2 iface) {
if (!--(This->ref)) { if (!--(This->ref)) {
IDirectDraw2_Release((IDirectDraw2*)This->ddraw); IDirectDraw2_Release((IDirectDraw2*)This->ddraw);
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return S_OK;
} }
return This->ref; return This->ref;
} }
@ -3972,7 +3972,7 @@ static ULONG WINAPI DGA_IDirectDraw2Impl_Release(LPDIRECTDRAW2 iface) {
SIGNAL_Init(); SIGNAL_Init();
#endif #endif
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return S_OK;
} }
return This->ref; return This->ref;
} }
@ -3986,7 +3986,7 @@ static ULONG WINAPI Xlib_IDirectDraw2Impl_Release(LPDIRECTDRAW2 iface) {
if (This->d.window && (This->d.mainWindow != This->d.window)) if (This->d.window && (This->d.mainWindow != This->d.window))
DestroyWindow(This->d.window); DestroyWindow(This->d.window);
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return S_OK;
} }
/* FIXME: destroy window ... */ /* FIXME: destroy window ... */
return This->ref; return This->ref;
@ -4001,7 +4001,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_QueryInterface(
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj); TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj);
if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) { if ( IsEqualGUID( &IID_IUnknown, refiid ) ) {
*obj = This; *obj = This;
IDirectDraw2_AddRef(iface); IDirectDraw2_AddRef(iface);
@ -4009,7 +4009,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_QueryInterface(
return S_OK; return S_OK;
} }
if (!memcmp(&IID_IDirectDraw,refiid,sizeof(IID_IDirectDraw))) { if ( IsEqualGUID( &IID_IDirectDraw, refiid ) ) {
This->lpvtbl = (ICOM_VTABLE(IDirectDraw2)*)&dga_ddvt; This->lpvtbl = (ICOM_VTABLE(IDirectDraw2)*)&dga_ddvt;
IDirectDraw2_AddRef(iface); IDirectDraw2_AddRef(iface);
*obj = This; *obj = This;
@ -4018,7 +4018,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_QueryInterface(
return S_OK; return S_OK;
} }
if (!memcmp(&IID_IDirectDraw2,refiid,sizeof(IID_IDirectDraw2))) { if ( IsEqualGUID( &IID_IDirectDraw2, refiid ) ) {
This->lpvtbl = (ICOM_VTABLE(IDirectDraw2)*)&dga_dd2vt; This->lpvtbl = (ICOM_VTABLE(IDirectDraw2)*)&dga_dd2vt;
IDirectDraw2_AddRef(iface); IDirectDraw2_AddRef(iface);
*obj = This; *obj = This;
@ -4027,7 +4027,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_QueryInterface(
return S_OK; return S_OK;
} }
if (!memcmp(&IID_IDirectDraw4,refiid,sizeof(IID_IDirectDraw4))) { if ( IsEqualGUID( &IID_IDirectDraw4, refiid ) ) {
This->lpvtbl = (ICOM_VTABLE(IDirectDraw2)*)&dga_dd4vt; This->lpvtbl = (ICOM_VTABLE(IDirectDraw2)*)&dga_dd4vt;
IDirectDraw2_AddRef(iface); IDirectDraw2_AddRef(iface);
*obj = This; *obj = This;
@ -4036,7 +4036,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_QueryInterface(
return S_OK; return S_OK;
} }
if (!memcmp(&IID_IDirect3D,refiid,sizeof(IID_IDirect3D))) { if ( IsEqualGUID( &IID_IDirect3D, refiid ) ) {
IDirect3DImpl* d3d; IDirect3DImpl* d3d;
d3d = HeapAlloc(GetProcessHeap(),0,sizeof(*d3d)); d3d = HeapAlloc(GetProcessHeap(),0,sizeof(*d3d));
@ -4050,7 +4050,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_QueryInterface(
return S_OK; return S_OK;
} }
if (!memcmp(&IID_IDirect3D2,refiid,sizeof(IID_IDirect3D2))) { if ( IsEqualGUID( &IID_IDirect3D2, refiid ) ) {
IDirect3D2Impl* d3d; IDirect3D2Impl* d3d;
d3d = HeapAlloc(GetProcessHeap(),0,sizeof(*d3d)); d3d = HeapAlloc(GetProcessHeap(),0,sizeof(*d3d));
@ -4077,7 +4077,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_QueryInterface(
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj); TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj);
if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) { if ( IsEqualGUID( &IID_IUnknown, refiid ) ) {
*obj = This; *obj = This;
IDirectDraw2_AddRef(iface); IDirectDraw2_AddRef(iface);
@ -4085,7 +4085,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_QueryInterface(
return S_OK; return S_OK;
} }
if (!memcmp(&IID_IDirectDraw,refiid,sizeof(IID_IDirectDraw))) { if ( IsEqualGUID( &IID_IDirectDraw, refiid ) ) {
This->lpvtbl = (ICOM_VTABLE(IDirectDraw2)*)&xlib_ddvt; This->lpvtbl = (ICOM_VTABLE(IDirectDraw2)*)&xlib_ddvt;
IDirectDraw2_AddRef(iface); IDirectDraw2_AddRef(iface);
*obj = This; *obj = This;
@ -4094,7 +4094,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_QueryInterface(
return S_OK; return S_OK;
} }
if (!memcmp(&IID_IDirectDraw2,refiid,sizeof(IID_IDirectDraw2))) { if ( IsEqualGUID( &IID_IDirectDraw2, refiid ) ) {
This->lpvtbl = (ICOM_VTABLE(IDirectDraw2)*)&xlib_dd2vt; This->lpvtbl = (ICOM_VTABLE(IDirectDraw2)*)&xlib_dd2vt;
IDirectDraw2_AddRef(iface); IDirectDraw2_AddRef(iface);
*obj = This; *obj = This;
@ -4103,7 +4103,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_QueryInterface(
return S_OK; return S_OK;
} }
if (!memcmp(&IID_IDirectDraw4,refiid,sizeof(IID_IDirectDraw4))) { if ( IsEqualGUID( &IID_IDirectDraw4, refiid ) ) {
This->lpvtbl = (ICOM_VTABLE(IDirectDraw2)*)&xlib_dd4vt; This->lpvtbl = (ICOM_VTABLE(IDirectDraw2)*)&xlib_dd4vt;
IDirectDraw2_AddRef(iface); IDirectDraw2_AddRef(iface);
*obj = This; *obj = This;
@ -4112,7 +4112,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_QueryInterface(
return S_OK; return S_OK;
} }
if (!memcmp(&IID_IDirect3D,refiid,sizeof(IID_IDirect3D))) { if ( IsEqualGUID( &IID_IDirect3D, refiid ) ) {
IDirect3DImpl* d3d; IDirect3DImpl* d3d;
d3d = HeapAlloc(GetProcessHeap(),0,sizeof(*d3d)); d3d = HeapAlloc(GetProcessHeap(),0,sizeof(*d3d));
@ -4126,7 +4126,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_QueryInterface(
return S_OK; return S_OK;
} }
if (!memcmp(&IID_IDirect3D2,refiid,sizeof(IID_IDirect3D))) { if ( IsEqualGUID( &IID_IDirect3D2, refiid ) ) {
IDirect3D2Impl* d3d; IDirect3D2Impl* d3d;
d3d = HeapAlloc(GetProcessHeap(),0,sizeof(*d3d)); d3d = HeapAlloc(GetProcessHeap(),0,sizeof(*d3d));
@ -5032,10 +5032,10 @@ HRESULT WINAPI DirectDrawCreate( LPGUID lpGUID, LPDIRECTDRAW *lplpDD, LPUNKNOWN
TRACE("(%s,%p,%p)\n",xclsid,ilplpDD,pUnkOuter); TRACE("(%s,%p,%p)\n",xclsid,ilplpDD,pUnkOuter);
if ((!lpGUID) || if ( ( !lpGUID ) ||
(!memcmp(lpGUID,&IID_IDirectDraw ,sizeof(IID_IDirectDraw ))) || ( IsEqualGUID( &IID_IDirectDraw, lpGUID ) ) ||
(!memcmp(lpGUID,&IID_IDirectDraw2,sizeof(IID_IDirectDraw2))) || ( IsEqualGUID( &IID_IDirectDraw2, lpGUID ) ) ||
(!memcmp(lpGUID,&IID_IDirectDraw4,sizeof(IID_IDirectDraw4)))) { ( IsEqualGUID( &IID_IDirectDraw4, lpGUID ) ) ) {
/* if they didn't request a particular interface, use the best /* if they didn't request a particular interface, use the best
* supported one */ * supported one */
if (DDRAW_DGA_Available()) if (DDRAW_DGA_Available())
@ -5066,12 +5066,15 @@ HRESULT WINAPI DirectDrawCreate( LPGUID lpGUID, LPDIRECTDRAW *lplpDD, LPUNKNOWN
wc.lpszClassName= "WINE_DirectDraw"; wc.lpszClassName= "WINE_DirectDraw";
RegisterClassA(&wc); RegisterClassA(&wc);
if (!memcmp(lpGUID, &DGA_DirectDraw_GUID, sizeof(GUID))) if ( IsEqualGUID( &DGA_DirectDraw_GUID, lpGUID ) ) {
ret = DGA_DirectDrawCreate(lplpDD, pUnkOuter); ret = DGA_DirectDrawCreate(lplpDD, pUnkOuter);
else if (!memcmp(lpGUID, &XLIB_DirectDraw_GUID, sizeof(GUID))) }
else if ( IsEqualGUID( &XLIB_DirectDraw_GUID, &XLIB_DirectDraw_GUID ) ) {
ret = Xlib_DirectDrawCreate(lplpDD, pUnkOuter); ret = Xlib_DirectDrawCreate(lplpDD, pUnkOuter);
else }
else {
goto err; goto err;
}
(*ilplpDD)->d.winclass = RegisterClassA(&wc); (*ilplpDD)->d.winclass = RegisterClassA(&wc);
@ -5128,13 +5131,13 @@ static HRESULT WINAPI DDCF_CreateInstance(
WINE_StringFromCLSID(riid,buf); WINE_StringFromCLSID(riid,buf);
TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,buf,ppobj); TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,buf,ppobj);
if ((!memcmp(riid,&IID_IDirectDraw ,sizeof(IID_IDirectDraw ))) || if ( ( IsEqualGUID( &IID_IDirectDraw, riid ) ) ||
(!memcmp(riid,&IID_IDirectDraw2,sizeof(IID_IDirectDraw2))) || ( IsEqualGUID( &IID_IDirectDraw2, riid ) ) ||
(!memcmp(riid,&IID_IDirectDraw4,sizeof(IID_IDirectDraw4)))) { ( IsEqualGUID( &IID_IDirectDraw4, riid ) ) ) {
/* FIXME: reuse already created DirectDraw if present? */ /* FIXME: reuse already created DirectDraw if present? */
return DirectDrawCreate((LPGUID) riid,(LPDIRECTDRAW*)ppobj,pOuter); return DirectDrawCreate((LPGUID) riid,(LPDIRECTDRAW*)ppobj,pOuter);
} }
return E_NOINTERFACE; return CLASS_E_CLASSNOTAVAILABLE;
} }
static HRESULT WINAPI DDCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI DDCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
@ -5185,13 +5188,13 @@ DWORD WINAPI DDRAW_DllGetClassObject(REFCLSID rclsid,REFIID riid,LPVOID *ppv)
sprintf(buf,"<guid-0x%04x>",LOWORD(riid)); sprintf(buf,"<guid-0x%04x>",LOWORD(riid));
WINE_StringFromCLSID(riid,xbuf); WINE_StringFromCLSID(riid,xbuf);
TRACE("(%p,%p,%p)\n", xbuf, buf, ppv); TRACE("(%p,%p,%p)\n", xbuf, buf, ppv);
if (!memcmp(riid,&IID_IClassFactory,sizeof(IID_IClassFactory))) { if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) {
*ppv = (LPVOID)&DDRAW_CF; *ppv = (LPVOID)&DDRAW_CF;
IClassFactory_AddRef((IClassFactory*)*ppv); IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK; return S_OK;
} }
FIXME("(%p,%p,%p): no interface found.\n", xbuf, buf, ppv); FIXME("(%p,%p,%p): no interface found.\n", xbuf, buf, ppv);
return E_NOINTERFACE; return CLASS_E_CLASSNOTAVAILABLE;
} }
@ -5267,7 +5270,7 @@ HRESULT WINAPI DirectDrawEnumerateW(
DWORD WINAPI DDRAW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DWORD WINAPI DDRAW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{ {
return E_NOINTERFACE; return CLASS_E_CLASSNOTAVAILABLE;
} }
DWORD WINAPI DDRAW_DllCanUnloadNow(void) DWORD WINAPI DDRAW_DllCanUnloadNow(void)

35
multimedia/dsound.c
View File

@ -207,7 +207,7 @@ HRESULT WINAPI DirectSoundEnumerateA(
"sound",context); "sound",context);
#endif #endif
return 0; return DS_OK;
} }
#ifdef HAVE_OSS #ifdef HAVE_OSS
@ -268,7 +268,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(LPDIRECTSOUND3DBUFFER iface
HeapFree(GetProcessHeap(),0,This->buffer); HeapFree(GetProcessHeap(),0,This->buffer);
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return S_OK;
} }
/* IDirectSound3DBuffer methods */ /* IDirectSound3DBuffer methods */
@ -742,7 +742,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(LPDIRECTSOUNDNOTIFY iface) {
if (!This->ref) { if (!This->ref) {
IDirectSoundNotify_Release((LPDIRECTSOUNDBUFFER)This->dsb); IDirectSoundNotify_Release((LPDIRECTSOUNDBUFFER)This->dsb);
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return S_OK;
} }
return This->ref; return This->ref;
} }
@ -766,7 +766,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(
); );
This->dsb->nrofnotifies+=howmuch; This->dsb->nrofnotifies+=howmuch;
return 0; return S_OK;
} }
ICOM_VTABLE(IDirectSoundNotify) dsnvt = ICOM_VTABLE(IDirectSoundNotify) dsnvt =
@ -1105,7 +1105,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition(
LeaveCriticalSection(&(This->lock)); LeaveCriticalSection(&(This->lock));
/* **** */ /* **** */
return 0; return DS_OK;
} }
static HRESULT WINAPI IDirectSoundBufferImpl_SetPan( static HRESULT WINAPI IDirectSoundBufferImpl_SetPan(
@ -1235,7 +1235,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface(
WINE_StringFromCLSID(riid,xbuf); WINE_StringFromCLSID(riid,xbuf);
TRACE("(%p,%s,%p)\n",This,xbuf,ppobj); TRACE("(%p,%s,%p)\n",This,xbuf,ppobj);
if (!memcmp(&IID_IDirectSoundNotify,riid,sizeof(*riid))) { if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) {
IDirectSoundNotifyImpl *dsn; IDirectSoundNotifyImpl *dsn;
dsn = (IDirectSoundNotifyImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(*dsn)); dsn = (IDirectSoundNotifyImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(*dsn));
@ -1244,10 +1244,10 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface(
IDirectSoundBuffer_AddRef(iface); IDirectSoundBuffer_AddRef(iface);
dsn->lpvtbl = &dsnvt; dsn->lpvtbl = &dsnvt;
*ppobj = (LPVOID)dsn; *ppobj = (LPVOID)dsn;
return 0; return S_OK;
} }
if (!memcmp(&IID_IDirectSound3DBuffer,riid,sizeof(*riid))) { if ( IsEqualGUID( &IID_IDirectSound3DBuffer, riid ) ) {
*ppobj = This->ds3db; *ppobj = This->ds3db;
if (*ppobj) if (*ppobj)
return DS_OK; return DS_OK;
@ -1290,7 +1290,7 @@ static HRESULT WINAPI IDirectSoundImpl_SetCooperativeLevel(
) { ) {
ICOM_THIS(IDirectSoundImpl,iface); ICOM_THIS(IDirectSoundImpl,iface);
FIXME("(%p,%08lx,%ld):stub\n",This,(DWORD)hwnd,level); FIXME("(%p,%08lx,%ld):stub\n",This,(DWORD)hwnd,level);
return 0; return DS_OK;
} }
static HRESULT WINAPI IDirectSoundImpl_CreateSoundBuffer( static HRESULT WINAPI IDirectSoundImpl_CreateSoundBuffer(
@ -1445,7 +1445,7 @@ static HRESULT WINAPI IDirectSoundImpl_DuplicateSoundBuffer(
This->buffers[This->nrofbuffers] = *ippdsb; This->buffers[This->nrofbuffers] = *ippdsb;
This->nrofbuffers++; This->nrofbuffers++;
IDirectSound_AddRef(iface); IDirectSound_AddRef(iface);
return 0; return DS_OK;
} }
@ -1498,7 +1498,7 @@ static HRESULT WINAPI IDirectSoundImpl_GetCaps(LPDIRECTSOUND iface,LPDSCAPS caps
caps->dwPlayCpuOverheadSwBuffers = 1; /* 1% */ caps->dwPlayCpuOverheadSwBuffers = 1; /* 1% */
return 0; return DS_OK;
} }
static ULONG WINAPI IDirectSoundImpl_AddRef(LPDIRECTSOUND iface) { static ULONG WINAPI IDirectSoundImpl_AddRef(LPDIRECTSOUND iface) {
@ -1515,7 +1515,7 @@ static ULONG WINAPI IDirectSoundImpl_Release(LPDIRECTSOUND iface) {
FIXME("need to release all buffers!\n"); FIXME("need to release all buffers!\n");
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
dsound = NULL; dsound = NULL;
return 0; return S_OK;
} }
return This->ref; return This->ref;
} }
@ -1525,7 +1525,7 @@ static HRESULT WINAPI IDirectSoundImpl_SetSpeakerConfig(
) { ) {
ICOM_THIS(IDirectSoundImpl,iface); ICOM_THIS(IDirectSoundImpl,iface);
FIXME("(%p,0x%08lx):stub\n",This,config); FIXME("(%p,0x%08lx):stub\n",This,config);
return 0; return DS_OK;
} }
static HRESULT WINAPI IDirectSoundImpl_QueryInterface( static HRESULT WINAPI IDirectSoundImpl_QueryInterface(
@ -1534,7 +1534,7 @@ static HRESULT WINAPI IDirectSoundImpl_QueryInterface(
ICOM_THIS(IDirectSoundImpl,iface); ICOM_THIS(IDirectSoundImpl,iface);
char xbuf[50]; char xbuf[50];
if (!memcmp(&IID_IDirectSound3DListener,riid,sizeof(*riid))) { if ( IsEqualGUID( &IID_IDirectSound3DListener, riid ) ) {
if (This->listener) { if (This->listener) {
*ppobj = This->listener; *ppobj = This->listener;
@ -2371,7 +2371,7 @@ static HRESULT WINAPI DSCF_CreateInstance(
WINE_StringFromCLSID(riid,buf); WINE_StringFromCLSID(riid,buf);
TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,buf,ppobj); TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,buf,ppobj);
if (!memcmp(riid,&IID_IDirectSound,sizeof(IID_IDirectSound))) { if ( IsEqualGUID( &IID_IDirectSound, riid ) ) {
/* FIXME: reuse already created dsound if present? */ /* FIXME: reuse already created dsound if present? */
return DirectSoundCreate(riid,(LPDIRECTSOUND*)ppobj,pOuter); return DirectSoundCreate(riid,(LPDIRECTSOUND*)ppobj,pOuter);
} }
@ -2424,13 +2424,14 @@ DWORD WINAPI DSOUND_DllGetClassObject(REFCLSID rclsid,REFIID riid,LPVOID *ppv)
sprintf(buf,"<guid-0x%04x>",LOWORD(riid)); sprintf(buf,"<guid-0x%04x>",LOWORD(riid));
WINE_StringFromCLSID(riid,xbuf); WINE_StringFromCLSID(riid,xbuf);
TRACE("(%p,%p,%p)\n", xbuf, buf, ppv); TRACE("(%p,%p,%p)\n", xbuf, buf, ppv);
if (!memcmp(riid,&IID_IClassFactory,sizeof(IID_IClassFactory))) { if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) {
*ppv = (LPVOID)&DSOUND_CF; *ppv = (LPVOID)&DSOUND_CF;
IClassFactory_AddRef((IClassFactory*)*ppv); IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK; return S_OK;
} }
FIXME("(%p,%p,%p): no interface found.\n", xbuf, buf, ppv); FIXME("(%p,%p,%p): no interface found.\n", xbuf, buf, ppv);
return E_NOINTERFACE; return CLASS_E_CLASSNOTAVAILABLE;
} }