[dsound] Remove NULL This pointer checks.
Robert Reif
reif at earthlink.net
Sat Apr 8 08:16:29 CDT 2006
Windows doesn't check for NULL This pointers so remove the checks.
-------------- next part --------------
Index: dlls/dsound/capture.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/capture.c,v
retrieving revision 1.60
diff -p -u -r1.60 capture.c
--- dlls/dsound/capture.c 16 Jan 2006 20:40:21 -0000 1.60
+++ dlls/dsound/capture.c 8 Apr 2006 13:13:02 -0000
@@ -458,11 +458,6 @@ HRESULT WINAPI IDirectSoundCaptureImpl_C
TRACE( "(%p,%p,%p,%p)\n",iface,lpcDSCBufferDesc,lplpDSCaptureBuffer,pUnk);
- if (This == NULL) {
- WARN("invalid parameter: This == NULL\n");
- return DSERR_INVALIDPARAM;
- }
-
if (lpcDSCBufferDesc == NULL) {
WARN("invalid parameter: lpcDSCBufferDesc == NULL)\n");
return DSERR_INVALIDPARAM;
@@ -816,11 +811,6 @@ IDirectSoundCaptureBufferImpl_GetCaps(
IDirectSoundCaptureBufferImpl *This = (IDirectSoundCaptureBufferImpl *)iface;
TRACE( "(%p,%p)\n", This, lpDSCBCaps );
- if (This == NULL) {
- WARN("invalid parameter: This == NULL\n");
- return DSERR_INVALIDPARAM;
- }
-
if (lpDSCBCaps == NULL) {
WARN("invalid parameter: lpDSCBCaps == NULL\n");
return DSERR_INVALIDPARAM;
@@ -856,11 +846,6 @@ IDirectSoundCaptureBufferImpl_GetCurrent
HRESULT hres = DS_OK;
TRACE( "(%p,%p,%p)\n", This, lpdwCapturePosition, lpdwReadPosition );
- if (This == NULL) {
- WARN("invalid parameter: This == NULL\n");
- return DSERR_INVALIDPARAM;
- }
-
if (This->device == NULL) {
WARN("invalid parameter: This->device == NULL\n");
return DSERR_INVALIDPARAM;
@@ -916,11 +901,6 @@ IDirectSoundCaptureBufferImpl_GetFormat(
TRACE( "(%p,%p,0x%08lx,%p)\n", This, lpwfxFormat, dwSizeAllocated,
lpdwSizeWritten );
- if (This == NULL) {
- WARN("invalid parameter: This == NULL\n");
- return DSERR_INVALIDPARAM;
- }
-
if (This->device == NULL) {
WARN("invalid parameter: This->device == NULL\n");
return DSERR_INVALIDPARAM;
@@ -954,11 +934,6 @@ IDirectSoundCaptureBufferImpl_GetStatus(
IDirectSoundCaptureBufferImpl *This = (IDirectSoundCaptureBufferImpl *)iface;
TRACE( "(%p, %p), thread is %04lx\n", This, lpdwStatus, GetCurrentThreadId() );
- if (This == NULL) {
- WARN("invalid parameter: This == NULL\n");
- return DSERR_INVALIDPARAM;
- }
-
if (This->device == NULL) {
WARN("invalid parameter: This->device == NULL\n");
return DSERR_INVALIDPARAM;
@@ -1019,11 +994,6 @@ IDirectSoundCaptureBufferImpl_Lock(
dwReadBytes, lplpvAudioPtr1, lpdwAudioBytes1, lplpvAudioPtr2,
lpdwAudioBytes2, dwFlags, GetTickCount() );
- if (This == NULL) {
- WARN("invalid parameter: This == NULL\n");
- return DSERR_INVALIDPARAM;
- }
-
if (This->device == NULL) {
WARN("invalid parameter: This->device == NULL\n");
return DSERR_INVALIDPARAM;
@@ -1083,11 +1053,6 @@ IDirectSoundCaptureBufferImpl_Start(
IDirectSoundCaptureBufferImpl *This = (IDirectSoundCaptureBufferImpl *)iface;
TRACE( "(%p,0x%08lx)\n", This, dwFlags );
- if (This == NULL) {
- WARN("invalid parameter: This == NULL\n");
- return DSERR_INVALIDPARAM;
- }
-
if (This->device == NULL) {
WARN("invalid parameter: This->device == NULL\n");
return DSERR_INVALIDPARAM;
@@ -1240,11 +1205,6 @@ IDirectSoundCaptureBufferImpl_Stop( LPDI
IDirectSoundCaptureBufferImpl *This = (IDirectSoundCaptureBufferImpl *)iface;
TRACE( "(%p)\n", This );
- if (This == NULL) {
- WARN("invalid parameter: This == NULL\n");
- return DSERR_INVALIDPARAM;
- }
-
if (This->device == NULL) {
WARN("invalid parameter: This->device == NULL\n");
return DSERR_INVALIDPARAM;
@@ -1291,11 +1251,6 @@ IDirectSoundCaptureBufferImpl_Unlock(
TRACE( "(%p,%p,%08lu,%p,%08lu)\n", This, lpvAudioPtr1, dwAudioBytes1,
lpvAudioPtr2, dwAudioBytes2 );
- if (This == NULL) {
- WARN("invalid parameter: This == NULL\n");
- return DSERR_INVALIDPARAM;
- }
-
if (lpvAudioPtr1 == NULL) {
WARN("invalid parameter: lpvAudioPtr1 == NULL\n");
return DSERR_INVALIDPARAM;
More information about the wine-patches
mailing list