Remove unneeded NULL casts
Francois Gouget
fgouget at free.fr
Wed Dec 22 05:08:26 CST 2004
It's >90% NULL casts but there's also a couple of things like '(HMENU)0'
which are better written as 'NULL'.
Changelog:
* dlls/dmband/band.c
dlls/dmband/bandtrack.c
dlls/dmcompos/chordmap.c
dlls/dmcompos/chordmaptrack.c
dlls/dmcompos/signposttrack.c
dlls/dmime/audiopath.c
dlls/dmime/graph.c
dlls/dmime/lyricstrack.c
dlls/dmime/markertrack.c
dlls/dmime/paramcontroltrack.c
dlls/dmime/patterntrack.c
dlls/dmime/segment.c
dlls/dmime/segmentstate.c
dlls/dmime/segtriggertrack.c
dlls/dmime/seqtrack.c
dlls/dmime/sysextrack.c
dlls/dmime/tempotrack.c
dlls/dmime/timesigtrack.c
dlls/dmime/tool.c
dlls/dmime/wavetrack.c
dlls/dmloader/container.c
dlls/dmloader/loaderstream.c
dlls/dmscript/scripttrack.c
dlls/dmstyle/auditiontrack.c
dlls/dmstyle/chordtrack.c
dlls/dmstyle/commandtrack.c
dlls/dmstyle/motiftrack.c
dlls/dmstyle/mutetrack.c
dlls/dmstyle/style.c
dlls/dmstyle/styletrack.c
dlls/dmusic/buffer.c
dlls/dmusic/collection.c
dlls/dmusic/download.c
dlls/dmusic/downloadedinstrument.c
dlls/dmusic/instrument.c
dlls/dswave/dswave.c
dlls/msvideo/msvideo_main.c
dlls/shlwapi/ordinal.c
dlls/winmm/mmio.c
dlls/wintab32/wintab32.c
programs/regedit/framewnd.c
programs/regedit/main.c
Remove unneeded NULL casts.
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
Linux: It is now safe to turn on your computer.
-------------- next part --------------
Index: dlls/dmband/band.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmband/band.c,v
retrieving revision 1.11
diff -u -r1.11 band.c
--- dlls/dmband/band.c 23 Aug 2004 19:39:57 -0000 1.11
+++ dlls/dmband/band.c 13 Dec 2004 12:59:55 -0000
@@ -682,7 +682,7 @@
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandImpl));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->UnknownVtbl = &DirectMusicBand_Unknown_Vtbl;
Index: dlls/dmband/bandtrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmband/bandtrack.c,v
retrieving revision 1.10
diff -u -r1.10 bandtrack.c
--- dlls/dmband/bandtrack.c 23 Aug 2004 19:39:57 -0000 1.10
+++ dlls/dmband/bandtrack.c 13 Dec 2004 12:59:55 -0000
@@ -582,7 +582,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicBandTrack_Unknown_Vtbl;
Index: dlls/dmcompos/chordmap.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmcompos/chordmap.c,v
retrieving revision 1.8
diff -u -r1.8 chordmap.c
--- dlls/dmcompos/chordmap.c 9 Dec 2004 13:46:47 -0000 1.8
+++ dlls/dmcompos/chordmap.c 13 Dec 2004 12:59:55 -0000
@@ -522,7 +522,7 @@
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapImpl));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->UnknownVtbl = &DirectMusicChordMap_Unknown_Vtbl;
Index: dlls/dmcompos/chordmaptrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmcompos/chordmaptrack.c,v
retrieving revision 1.7
diff -u -r1.7 chordmaptrack.c
--- dlls/dmcompos/chordmaptrack.c 9 Dec 2004 13:46:47 -0000 1.7
+++ dlls/dmcompos/chordmaptrack.c 13 Dec 2004 12:59:55 -0000
@@ -265,7 +265,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicChordMapTrack_Unknown_Vtbl;
Index: dlls/dmcompos/signposttrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmcompos/signposttrack.c,v
retrieving revision 1.8
diff -u -r1.8 signposttrack.c
--- dlls/dmcompos/signposttrack.c 9 Dec 2004 13:46:47 -0000 1.8
+++ dlls/dmcompos/signposttrack.c 13 Dec 2004 12:59:55 -0000
@@ -263,7 +263,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSignPostTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicSignPostTrack_Unknown_Vtbl;
Index: dlls/dmime/audiopath.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/audiopath.c,v
retrieving revision 1.11
diff -u -r1.11 audiopath.c
--- dlls/dmime/audiopath.c 23 Aug 2004 19:39:56 -0000 1.11
+++ dlls/dmime/audiopath.c 13 Dec 2004 12:59:55 -0000
@@ -631,7 +631,7 @@
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicAudioPathImpl));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->UnknownVtbl = &DirectMusicAudioPath_Unknown_Vtbl;
Index: dlls/dmime/graph.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/graph.c,v
retrieving revision 1.8
diff -u -r1.8 graph.c
--- dlls/dmime/graph.c 23 Aug 2004 19:39:56 -0000 1.8
+++ dlls/dmime/graph.c 13 Dec 2004 12:59:55 -0000
@@ -596,7 +596,7 @@
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicGraphImpl));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->UnknownVtbl = &DirectMusicGraph_Unknown_Vtbl;
Index: dlls/dmime/lyricstrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/lyricstrack.c,v
retrieving revision 1.6
diff -u -r1.6 lyricstrack.c
--- dlls/dmime/lyricstrack.c 23 Aug 2004 19:39:56 -0000 1.6
+++ dlls/dmime/lyricstrack.c 13 Dec 2004 12:59:55 -0000
@@ -259,7 +259,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLyricsTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicLyricsTrack_Unknown_Vtbl;
Index: dlls/dmime/markertrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/markertrack.c,v
retrieving revision 1.6
diff -u -r1.6 markertrack.c
--- dlls/dmime/markertrack.c 23 Aug 2004 19:39:56 -0000 1.6
+++ dlls/dmime/markertrack.c 13 Dec 2004 12:59:56 -0000
@@ -259,7 +259,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMarkerTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicMarkerTrack_Unknown_Vtbl;
Index: dlls/dmime/paramcontroltrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/paramcontroltrack.c,v
retrieving revision 1.6
diff -u -r1.6 paramcontroltrack.c
--- dlls/dmime/paramcontroltrack.c 23 Aug 2004 19:39:56 -0000 1.6
+++ dlls/dmime/paramcontroltrack.c 13 Dec 2004 12:59:56 -0000
@@ -259,7 +259,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicParamControlTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicParamControlTrack_Unknown_Vtbl;
Index: dlls/dmime/patterntrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/patterntrack.c,v
retrieving revision 1.8
diff -u -r1.8 patterntrack.c
--- dlls/dmime/patterntrack.c 6 Sep 2004 21:34:26 -0000 1.8
+++ dlls/dmime/patterntrack.c 13 Dec 2004 12:59:56 -0000
@@ -87,7 +87,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicPatternTrackImpl));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->lpVtbl = &DirectMusicPatternTrack_Vtbl;
Index: dlls/dmime/segment.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/segment.c,v
retrieving revision 1.19
diff -u -r1.19 segment.c
--- dlls/dmime/segment.c 23 Aug 2004 19:39:56 -0000 1.19
+++ dlls/dmime/segment.c 13 Dec 2004 12:59:56 -0000
@@ -1283,7 +1283,7 @@
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegment8Impl));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->UnknownVtbl = &DirectMusicSegment8_Unknown_Vtbl;
Index: dlls/dmime/segmentstate.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/segmentstate.c,v
retrieving revision 1.8
diff -u -r1.8 segmentstate.c
--- dlls/dmime/segmentstate.c 6 Sep 2004 21:34:26 -0000 1.8
+++ dlls/dmime/segmentstate.c 13 Dec 2004 12:59:56 -0000
@@ -116,7 +116,7 @@
obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegmentState8Impl));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->lpVtbl = &DirectMusicSegmentState8_Vtbl;
Index: dlls/dmime/segtriggertrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/segtriggertrack.c,v
retrieving revision 1.12
diff -u -r1.12 segtriggertrack.c
--- dlls/dmime/segtriggertrack.c 23 Aug 2004 19:39:56 -0000 1.12
+++ dlls/dmime/segtriggertrack.c 13 Dec 2004 12:59:56 -0000
@@ -506,7 +506,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegTriggerTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicSegTriggerTrack_Unknown_Vtbl;
Index: dlls/dmime/seqtrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/seqtrack.c,v
retrieving revision 1.6
diff -u -r1.6 seqtrack.c
--- dlls/dmime/seqtrack.c 23 Aug 2004 19:39:56 -0000 1.6
+++ dlls/dmime/seqtrack.c 13 Dec 2004 12:59:56 -0000
@@ -259,7 +259,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSeqTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicSeqTrack_Unknown_Vtbl;
Index: dlls/dmime/sysextrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/sysextrack.c,v
retrieving revision 1.6
diff -u -r1.6 sysextrack.c
--- dlls/dmime/sysextrack.c 23 Aug 2004 19:39:56 -0000 1.6
+++ dlls/dmime/sysextrack.c 13 Dec 2004 12:59:56 -0000
@@ -259,7 +259,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSysExTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicSysExTrack_Unknown_Vtbl;
Index: dlls/dmime/tempotrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/tempotrack.c,v
retrieving revision 1.10
diff -u -r1.10 tempotrack.c
--- dlls/dmime/tempotrack.c 23 Aug 2004 19:39:56 -0000 1.10
+++ dlls/dmime/tempotrack.c 13 Dec 2004 12:59:56 -0000
@@ -393,7 +393,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTempoTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicTempoTrack_Unknown_Vtbl;
Index: dlls/dmime/timesigtrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/timesigtrack.c,v
retrieving revision 1.6
diff -u -r1.6 timesigtrack.c
--- dlls/dmime/timesigtrack.c 23 Aug 2004 19:39:56 -0000 1.6
+++ dlls/dmime/timesigtrack.c 13 Dec 2004 12:59:56 -0000
@@ -264,7 +264,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTimeSigTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicTimeSigTrack_Unknown_Vtbl;
Index: dlls/dmime/tool.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/tool.c,v
retrieving revision 1.8
diff -u -r1.8 tool.c
--- dlls/dmime/tool.c 6 Sep 2004 21:34:26 -0000 1.8
+++ dlls/dmime/tool.c 13 Dec 2004 12:59:56 -0000
@@ -115,7 +115,7 @@
obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTool8Impl));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->lpVtbl = &DirectMusicTool8_Vtbl;
Index: dlls/dmime/wavetrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/wavetrack.c,v
retrieving revision 1.6
diff -u -r1.6 wavetrack.c
--- dlls/dmime/wavetrack.c 23 Aug 2004 19:39:56 -0000 1.6
+++ dlls/dmime/wavetrack.c 13 Dec 2004 12:59:56 -0000
@@ -265,7 +265,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicWaveTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicWaveTrack_Unknown_Vtbl;
Index: dlls/dmloader/container.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmloader/container.c,v
retrieving revision 1.10
diff -u -r1.10 container.c
--- dlls/dmloader/container.c 23 Aug 2004 19:39:55 -0000 1.10
+++ dlls/dmloader/container.c 13 Dec 2004 12:59:56 -0000
@@ -886,7 +886,7 @@
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicContainerImpl));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->ContainerVtbl = &DirectMusicContainer_Container_Vtbl;
Index: dlls/dmloader/loaderstream.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmloader/loaderstream.c,v
retrieving revision 1.12
diff -u -r1.12 loaderstream.c
--- dlls/dmloader/loaderstream.c 23 Aug 2004 19:39:55 -0000 1.12
+++ dlls/dmloader/loaderstream.c 13 Dec 2004 12:59:56 -0000
@@ -286,7 +286,7 @@
TRACE("(%p)\n", ppobj);
obj = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderFileStream));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->StreamVtbl = &DirectMusicLoaderFileStream_Stream_Vtbl;
@@ -552,7 +552,7 @@
TRACE("(%p)\n", ppobj);
obj = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderResourceStream));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->StreamVtbl = &DirectMusicLoaderResourceStream_Stream_Vtbl;
@@ -810,7 +810,7 @@
TRACE("(%p)\n", ppobj);
obj = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderGenericStream));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->StreamVtbl = &DirectMusicLoaderGenericStream_Stream_Vtbl;
Index: dlls/dmscript/scripttrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmscript/scripttrack.c,v
retrieving revision 1.7
diff -u -r1.7 scripttrack.c
--- dlls/dmscript/scripttrack.c 23 Aug 2004 19:39:54 -0000 1.7
+++ dlls/dmscript/scripttrack.c 13 Dec 2004 12:59:56 -0000
@@ -259,7 +259,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicScriptTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicScriptTrack_Unknown_Vtbl;
Index: dlls/dmstyle/auditiontrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmstyle/auditiontrack.c,v
retrieving revision 1.6
diff -u -r1.6 auditiontrack.c
--- dlls/dmstyle/auditiontrack.c 23 Aug 2004 19:39:54 -0000 1.6
+++ dlls/dmstyle/auditiontrack.c 13 Dec 2004 12:59:56 -0000
@@ -259,7 +259,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicAuditionTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicAuditionTrack_Unknown_Vtbl;
Index: dlls/dmstyle/chordtrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmstyle/chordtrack.c,v
retrieving revision 1.9
diff -u -r1.9 chordtrack.c
--- dlls/dmstyle/chordtrack.c 23 Aug 2004 19:39:54 -0000 1.9
+++ dlls/dmstyle/chordtrack.c 13 Dec 2004 12:59:56 -0000
@@ -387,7 +387,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicChordTrack_Unknown_Vtbl;
Index: dlls/dmstyle/commandtrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmstyle/commandtrack.c,v
retrieving revision 1.6
diff -u -r1.6 commandtrack.c
--- dlls/dmstyle/commandtrack.c 23 Aug 2004 19:39:54 -0000 1.6
+++ dlls/dmstyle/commandtrack.c 13 Dec 2004 12:59:56 -0000
@@ -321,7 +321,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCommandTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicCommandTrack_Unknown_Vtbl;
Index: dlls/dmstyle/motiftrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmstyle/motiftrack.c,v
retrieving revision 1.6
diff -u -r1.6 motiftrack.c
--- dlls/dmstyle/motiftrack.c 23 Aug 2004 19:39:54 -0000 1.6
+++ dlls/dmstyle/motiftrack.c 13 Dec 2004 12:59:56 -0000
@@ -265,7 +265,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMotifTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicMotifTrack_Unknown_Vtbl;
Index: dlls/dmstyle/mutetrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmstyle/mutetrack.c,v
retrieving revision 1.6
diff -u -r1.6 mutetrack.c
--- dlls/dmstyle/mutetrack.c 23 Aug 2004 19:39:54 -0000 1.6
+++ dlls/dmstyle/mutetrack.c 13 Dec 2004 12:59:56 -0000
@@ -262,7 +262,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMuteTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicMuteTrack_Unknown_Vtbl;
Index: dlls/dmstyle/style.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmstyle/style.c,v
retrieving revision 1.9
diff -u -r1.9 style.c
--- dlls/dmstyle/style.c 23 Aug 2004 19:39:54 -0000 1.9
+++ dlls/dmstyle/style.c 13 Dec 2004 12:59:56 -0000
@@ -1041,7 +1041,7 @@
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyle8Impl));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->UnknownVtbl = &DirectMusicStyle8_Unknown_Vtbl;
Index: dlls/dmstyle/styletrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmstyle/styletrack.c,v
retrieving revision 1.7
diff -u -r1.7 styletrack.c
--- dlls/dmstyle/styletrack.c 23 Aug 2004 19:39:54 -0000 1.7
+++ dlls/dmstyle/styletrack.c 13 Dec 2004 12:59:56 -0000
@@ -432,7 +432,7 @@
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyleTrack));
if (NULL == track) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
track->UnknownVtbl = &DirectMusicStyleTrack_Unknown_Vtbl;
Index: dlls/dmusic/buffer.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmusic/buffer.c,v
retrieving revision 1.8
diff -u -r1.8 buffer.c
--- dlls/dmusic/buffer.c 6 Sep 2004 21:34:25 -0000 1.8
+++ dlls/dmusic/buffer.c 13 Dec 2004 12:59:56 -0000
@@ -155,7 +155,7 @@
dmbuff = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBufferImpl));
if (NULL == dmbuff) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
dmbuff->lpVtbl = &DirectMusicBuffer_Vtbl;
Index: dlls/dmusic/collection.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmusic/collection.c,v
retrieving revision 1.8
diff -u -r1.8 collection.c
--- dlls/dmusic/collection.c 8 Sep 2004 01:37:25 -0000 1.8
+++ dlls/dmusic/collection.c 13 Dec 2004 12:59:56 -0000
@@ -742,7 +742,7 @@
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCollectionImpl));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->UnknownVtbl = &DirectMusicCollection_Unknown_Vtbl;
Index: dlls/dmusic/download.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmusic/download.c,v
retrieving revision 1.8
diff -u -r1.8 download.c
--- dlls/dmusic/download.c 6 Sep 2004 21:34:25 -0000 1.8
+++ dlls/dmusic/download.c 13 Dec 2004 12:59:56 -0000
@@ -72,7 +72,7 @@
dmdl = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadImpl));
if (NULL == dmdl) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
dmdl->lpVtbl = &DirectMusicDownload_Vtbl;
Index: dlls/dmusic/downloadedinstrument.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmusic/downloadedinstrument.c,v
retrieving revision 1.8
diff -u -r1.8 downloadedinstrument.c
--- dlls/dmusic/downloadedinstrument.c 6 Sep 2004 21:34:25 -0000 1.8
+++ dlls/dmusic/downloadedinstrument.c 13 Dec 2004 12:59:56 -0000
@@ -67,7 +67,7 @@
dmdlinst = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadedInstrumentImpl));
if (NULL == dmdlinst) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
dmdlinst->lpVtbl = &DirectMusicDownloadedInstrument_Vtbl;
Index: dlls/dmusic/instrument.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmusic/instrument.c,v
retrieving revision 1.7
diff -u -r1.7 instrument.c
--- dlls/dmusic/instrument.c 23 Aug 2004 19:39:53 -0000 1.7
+++ dlls/dmusic/instrument.c 13 Dec 2004 12:59:56 -0000
@@ -118,7 +118,7 @@
dminst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicInstrumentImpl));
if (NULL == dminst) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
dminst->UnknownVtbl = &DirectMusicInstrument_Unknown_Vtbl;
Index: dlls/dswave/dswave.c
===================================================================
RCS file: /var/cvs/wine/dlls/dswave/dswave.c,v
retrieving revision 1.4
diff -u -r1.4 dswave.c
--- dlls/dswave/dswave.c 23 Aug 2004 19:39:51 -0000 1.4
+++ dlls/dswave/dswave.c 13 Dec 2004 12:59:57 -0000
@@ -715,7 +715,7 @@
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicWaveImpl));
if (NULL == obj) {
- *ppobj = (LPVOID) NULL;
+ *ppobj = NULL;
return E_OUTOFMEMORY;
}
obj->UnknownVtbl = &DirectMusicWave_Unknown_Vtbl;
Index: dlls/msvideo/msvideo_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/msvideo/msvideo_main.c,v
retrieving revision 1.58
diff -u -r1.58 msvideo_main.c
--- dlls/msvideo/msvideo_main.c 8 Sep 2004 01:37:24 -0000 1.58
+++ dlls/msvideo/msvideo_main.c 13 Dec 2004 13:00:00 -0000
@@ -438,7 +438,7 @@
whic->driverId = (DWORD)MSVIDEO_SendMessage(whic, DRV_OPEN, 0, (DWORD)&icopen);
/* FIXME: What should we put here? */
- whic->hdrv = (HDRVR)0;
+ whic->hdrv = NULL;
if (whic->driverId == 0)
{
Index: dlls/shlwapi/ordinal.c
===================================================================
RCS file: /var/cvs/wine/dlls/shlwapi/ordinal.c,v
retrieving revision 1.99
diff -u -r1.99 ordinal.c
--- dlls/shlwapi/ordinal.c 17 Dec 2004 19:09:29 -0000 1.99
+++ dlls/shlwapi/ordinal.c 17 Dec 2004 18:28:03 -0000
@@ -1936,7 +1936,7 @@
mi.fMask = MIIM_SUBMENU;
if (!GetMenuItemInfoA(hMenu, uID, 0, &mi))
- return (HMENU)NULL;
+ return NULL;
return mi.hSubMenu;
}
@@ -2418,8 +2418,8 @@
wc.cbClsExtra = 0;
wc.cbWndExtra = 4;
wc.hInstance = shlwapi_hInstance;
- wc.hIcon = (HICON)0;
- wc.hCursor = LoadCursorA((HINSTANCE)0, (LPSTR)IDC_ARROW);
+ wc.hIcon = NULL;
+ wc.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW);
wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW;
wc.lpszMenuName = NULL;
wc.lpszClassName = szClass;
@@ -2705,8 +2705,8 @@
wc.cbClsExtra = 0;
wc.cbWndExtra = 4;
wc.hInstance = shlwapi_hInstance;
- wc.hIcon = (HICON)0;
- wc.hCursor = LoadCursorA((HINSTANCE)0, (LPSTR)IDC_ARROW);
+ wc.hIcon = NULL;
+ wc.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW);
wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW;
wc.lpszMenuName = NULL;
wc.lpszClassName = szClass;
Index: dlls/winmm/mmio.c
===================================================================
RCS file: /var/cvs/wine/dlls/winmm/mmio.c,v
retrieving revision 1.45
diff -u -r1.45 mmio.c
--- dlls/winmm/mmio.c 16 Mar 2004 01:14:07 -0000 1.45
+++ dlls/winmm/mmio.c 13 Dec 2004 13:00:06 -0000
@@ -703,7 +703,7 @@
{
INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL );
szFn = HeapAlloc( GetProcessHeap(), 0, len );
- if (!szFn) return (HMMIO)NULL;
+ if (!szFn) return NULL;
WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL );
}
Index: dlls/wintab32/wintab32.c
===================================================================
RCS file: /var/cvs/wine/dlls/wintab32/wintab32.c,v
retrieving revision 1.2
diff -u -r1.2 wintab32.c
--- dlls/wintab32/wintab32.c 16 Jan 2004 21:26:08 -0000 1.2
+++ dlls/wintab32/wintab32.c 13 Dec 2004 13:00:06 -0000
@@ -52,7 +52,7 @@
wndClass.lpfnWndProc = TABLET_WindowProc;
wndClass.cbClsExtra = 0;
wndClass.cbWndExtra = 0;
- wndClass.hCursor = (HCURSOR)NULL;
+ wndClass.hCursor = NULL;
wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1);
wndClass.lpszClassName = WC_TABLETCLASSNAME;
RegisterClassW(&wndClass);
@@ -60,7 +60,7 @@
static VOID TABLET_Unregister()
{
- UnregisterClassW(WC_TABLETCLASSNAME, (HINSTANCE)NULL);
+ UnregisterClassW(WC_TABLETCLASSNAME, NULL);
}
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved)
Index: programs/regedit/framewnd.c
===================================================================
RCS file: /var/cvs/wine/programs/regedit/framewnd.c,v
retrieving revision 1.16
diff -u -r1.16 framewnd.c
--- programs/regedit/framewnd.c 9 Dec 2004 14:07:59 -0000 1.16
+++ programs/regedit/framewnd.c 13 Dec 2004 13:00:08 -0000
@@ -573,7 +573,7 @@
case WM_CREATE:
CreateWindowEx(0, szChildClass, _T("regedit child window"), WS_CHILD | WS_VISIBLE,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
- hWnd, (HMENU)0, hInst, 0);
+ hWnd, NULL, hInst, 0);
break;
case WM_COMMAND:
if (!_CmdWndProc(hWnd, message, wParam, lParam))
Index: programs/regedit/main.c
===================================================================
RCS file: /var/cvs/wine/programs/regedit/main.c,v
retrieving revision 1.11
diff -u -r1.11 main.c
--- programs/regedit/main.c 4 May 2004 02:55:28 -0000 1.11
+++ programs/regedit/main.c 13 Dec 2004 12:58:11 -0000
@@ -181,7 +181,7 @@
hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_REGEDIT);
/* Main message loop */
- while (GetMessage(&msg, (HWND)NULL, 0, 0)) {
+ while (GetMessage(&msg, NULL, 0, 0)) {
if (!TranslateAccelerator(hFrameWnd, hAccel, &msg)
&& !TranslateChildTabMessage(&msg)) {
TranslateMessage(&msg);
More information about the wine-patches
mailing list