Remove unneeded NULL casts.
This commit is contained in:
parent
9db0e072b1
commit
ee0344a4a2
|
@ -682,7 +682,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicBandImpl (LPCGUID lpcGUID, LPVOID* ppobj,
|
||||||
|
|
||||||
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandImpl));
|
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandImpl));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->UnknownVtbl = &DirectMusicBand_Unknown_Vtbl;
|
obj->UnknownVtbl = &DirectMusicBand_Unknown_Vtbl;
|
||||||
|
|
|
@ -582,7 +582,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicBandTrack (LPCGUID lpcGUID, LPVOID *ppobj
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicBandTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicBandTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -522,7 +522,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapImpl (LPCGUID lpcGUID, LPVOID* pp
|
||||||
|
|
||||||
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapImpl));
|
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapImpl));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->UnknownVtbl = &DirectMusicChordMap_Unknown_Vtbl;
|
obj->UnknownVtbl = &DirectMusicChordMap_Unknown_Vtbl;
|
||||||
|
|
|
@ -265,7 +265,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapTrack (LPCGUID lpcGUID, LPVOID *p
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicChordMapTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicChordMapTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -263,7 +263,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSignPostTrack (LPCGUID lpcGUID, LPVOID *p
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSignPostTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSignPostTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicSignPostTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicSignPostTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -631,7 +631,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicAudioPathImpl (LPCGUID lpcGUID, LPVOID* p
|
||||||
|
|
||||||
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicAudioPathImpl));
|
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicAudioPathImpl));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->UnknownVtbl = &DirectMusicAudioPath_Unknown_Vtbl;
|
obj->UnknownVtbl = &DirectMusicAudioPath_Unknown_Vtbl;
|
||||||
|
|
|
@ -596,7 +596,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicGraphImpl (LPCGUID lpcGUID, LPVOID* ppobj
|
||||||
|
|
||||||
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicGraphImpl));
|
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicGraphImpl));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->UnknownVtbl = &DirectMusicGraph_Unknown_Vtbl;
|
obj->UnknownVtbl = &DirectMusicGraph_Unknown_Vtbl;
|
||||||
|
|
|
@ -259,7 +259,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLyricsTrack (LPCGUID lpcGUID, LPVOID *ppo
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLyricsTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLyricsTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicLyricsTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicLyricsTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -259,7 +259,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicMarkerTrack (LPCGUID lpcGUID, LPVOID *ppo
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMarkerTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMarkerTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicMarkerTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicMarkerTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -259,7 +259,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicParamControlTrack (LPCGUID lpcGUID, LPVOI
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicParamControlTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicParamControlTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicParamControlTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicParamControlTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -87,7 +87,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicPatternTrackImpl (LPCGUID lpcGUID, LPVOID
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicPatternTrackImpl));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicPatternTrackImpl));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->lpVtbl = &DirectMusicPatternTrack_Vtbl;
|
track->lpVtbl = &DirectMusicPatternTrack_Vtbl;
|
||||||
|
|
|
@ -1283,7 +1283,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID* ppo
|
||||||
|
|
||||||
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegment8Impl));
|
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegment8Impl));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->UnknownVtbl = &DirectMusicSegment8_Unknown_Vtbl;
|
obj->UnknownVtbl = &DirectMusicSegment8_Unknown_Vtbl;
|
||||||
|
|
|
@ -116,7 +116,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentStateImpl (LPCGUID lpcGUID, LPVOID
|
||||||
|
|
||||||
obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegmentState8Impl));
|
obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegmentState8Impl));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->lpVtbl = &DirectMusicSegmentState8_Vtbl;
|
obj->lpVtbl = &DirectMusicSegmentState8_Vtbl;
|
||||||
|
|
|
@ -506,7 +506,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegTriggerTrack (LPCGUID lpcGUID, LPVOID
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegTriggerTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegTriggerTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicSegTriggerTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicSegTriggerTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -259,7 +259,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSeqTrack (LPCGUID lpcGUID, LPVOID *ppobj,
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSeqTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSeqTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicSeqTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicSeqTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -259,7 +259,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSysExTrack (LPCGUID lpcGUID, LPVOID *ppob
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSysExTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSysExTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicSysExTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicSysExTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -393,7 +393,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicTempoTrack (LPCGUID lpcGUID, LPVOID *ppob
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTempoTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTempoTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicTempoTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicTempoTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -264,7 +264,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicTimeSigTrack (LPCGUID lpcGUID, LPVOID *pp
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTimeSigTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTimeSigTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicTimeSigTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicTimeSigTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -115,7 +115,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicobjImpl (LPCGUID lpcGUID, LPVOID *ppobj,
|
||||||
|
|
||||||
obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTool8Impl));
|
obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTool8Impl));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->lpVtbl = &DirectMusicTool8_Vtbl;
|
obj->lpVtbl = &DirectMusicTool8_Vtbl;
|
||||||
|
|
|
@ -265,7 +265,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicWaveTrack (LPCGUID lpcGUID, LPVOID *ppobj
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicWaveTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicWaveTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicWaveTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicWaveTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -886,7 +886,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicContainerImpl (LPCGUID lpcGUID, LPVOID* p
|
||||||
|
|
||||||
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicContainerImpl));
|
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicContainerImpl));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->ContainerVtbl = &DirectMusicContainer_Container_Vtbl;
|
obj->ContainerVtbl = &DirectMusicContainer_Container_Vtbl;
|
||||||
|
|
|
@ -286,7 +286,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID* ppobj) {
|
||||||
TRACE("(%p)\n", ppobj);
|
TRACE("(%p)\n", ppobj);
|
||||||
obj = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderFileStream));
|
obj = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderFileStream));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->StreamVtbl = &DirectMusicLoaderFileStream_Stream_Vtbl;
|
obj->StreamVtbl = &DirectMusicLoaderFileStream_Stream_Vtbl;
|
||||||
|
@ -552,7 +552,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID* ppobj) {
|
||||||
TRACE("(%p)\n", ppobj);
|
TRACE("(%p)\n", ppobj);
|
||||||
obj = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderResourceStream));
|
obj = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderResourceStream));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->StreamVtbl = &DirectMusicLoaderResourceStream_Stream_Vtbl;
|
obj->StreamVtbl = &DirectMusicLoaderResourceStream_Stream_Vtbl;
|
||||||
|
@ -810,7 +810,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID* ppobj) {
|
||||||
TRACE("(%p)\n", ppobj);
|
TRACE("(%p)\n", ppobj);
|
||||||
obj = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderGenericStream));
|
obj = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderGenericStream));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->StreamVtbl = &DirectMusicLoaderGenericStream_Stream_Vtbl;
|
obj->StreamVtbl = &DirectMusicLoaderGenericStream_Stream_Vtbl;
|
||||||
|
|
|
@ -259,7 +259,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID *ppo
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicScriptTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicScriptTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicScriptTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicScriptTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -259,7 +259,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicAuditionTrack (LPCGUID lpcGUID, LPVOID *p
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicAuditionTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicAuditionTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicAuditionTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicAuditionTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -387,7 +387,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicChordTrack (LPCGUID lpcGUID, LPVOID *ppob
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicChordTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicChordTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -321,7 +321,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCommandTrack (LPCGUID lpcGUID, LPVOID *pp
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCommandTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCommandTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicCommandTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicCommandTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -265,7 +265,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicMotifTrack (LPCGUID lpcGUID, LPVOID *ppob
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMotifTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMotifTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicMotifTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicMotifTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -262,7 +262,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicMuteTrack (LPCGUID lpcGUID, LPVOID *ppobj
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMuteTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMuteTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicMuteTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicMuteTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -1041,7 +1041,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicStyleImpl (LPCGUID lpcGUID, LPVOID* ppobj
|
||||||
|
|
||||||
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyle8Impl));
|
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyle8Impl));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->UnknownVtbl = &DirectMusicStyle8_Unknown_Vtbl;
|
obj->UnknownVtbl = &DirectMusicStyle8_Unknown_Vtbl;
|
||||||
|
|
|
@ -432,7 +432,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicStyleTrack (LPCGUID lpcGUID, LPVOID *ppob
|
||||||
|
|
||||||
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyleTrack));
|
track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyleTrack));
|
||||||
if (NULL == track) {
|
if (NULL == track) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
track->UnknownVtbl = &DirectMusicStyleTrack_Unknown_Vtbl;
|
track->UnknownVtbl = &DirectMusicStyleTrack_Unknown_Vtbl;
|
||||||
|
|
|
@ -155,7 +155,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl (LPCGUID lpcGUID, LPVOID* ppob
|
||||||
|
|
||||||
dmbuff = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBufferImpl));
|
dmbuff = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBufferImpl));
|
||||||
if (NULL == dmbuff) {
|
if (NULL == dmbuff) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
dmbuff->lpVtbl = &DirectMusicBuffer_Vtbl;
|
dmbuff->lpVtbl = &DirectMusicBuffer_Vtbl;
|
||||||
|
|
|
@ -742,7 +742,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl (LPCGUID lpcGUID, LPVOID*
|
||||||
|
|
||||||
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCollectionImpl));
|
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCollectionImpl));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->UnknownVtbl = &DirectMusicCollection_Unknown_Vtbl;
|
obj->UnknownVtbl = &DirectMusicCollection_Unknown_Vtbl;
|
||||||
|
|
|
@ -72,7 +72,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* pp
|
||||||
|
|
||||||
dmdl = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadImpl));
|
dmdl = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadImpl));
|
||||||
if (NULL == dmdl) {
|
if (NULL == dmdl) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
dmdl->lpVtbl = &DirectMusicDownload_Vtbl;
|
dmdl->lpVtbl = &DirectMusicDownload_Vtbl;
|
||||||
|
|
|
@ -67,7 +67,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID
|
||||||
|
|
||||||
dmdlinst = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadedInstrumentImpl));
|
dmdlinst = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadedInstrumentImpl));
|
||||||
if (NULL == dmdlinst) {
|
if (NULL == dmdlinst) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
dmdlinst->lpVtbl = &DirectMusicDownloadedInstrument_Vtbl;
|
dmdlinst->lpVtbl = &DirectMusicDownloadedInstrument_Vtbl;
|
||||||
|
|
|
@ -118,7 +118,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID*
|
||||||
|
|
||||||
dminst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicInstrumentImpl));
|
dminst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicInstrumentImpl));
|
||||||
if (NULL == dminst) {
|
if (NULL == dminst) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
dminst->UnknownVtbl = &DirectMusicInstrument_Unknown_Vtbl;
|
dminst->UnknownVtbl = &DirectMusicInstrument_Unknown_Vtbl;
|
||||||
|
|
|
@ -715,7 +715,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicWaveImpl (LPCGUID lpcGUID, LPVOID* ppobj,
|
||||||
|
|
||||||
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicWaveImpl));
|
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicWaveImpl));
|
||||||
if (NULL == obj) {
|
if (NULL == obj) {
|
||||||
*ppobj = (LPVOID) NULL;
|
*ppobj = NULL;
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
obj->UnknownVtbl = &DirectMusicWave_Unknown_Vtbl;
|
obj->UnknownVtbl = &DirectMusicWave_Unknown_Vtbl;
|
||||||
|
|
|
@ -438,7 +438,7 @@ HIC MSVIDEO_OpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode,
|
||||||
|
|
||||||
whic->driverId = (DWORD)MSVIDEO_SendMessage(whic, DRV_OPEN, 0, (DWORD)&icopen);
|
whic->driverId = (DWORD)MSVIDEO_SendMessage(whic, DRV_OPEN, 0, (DWORD)&icopen);
|
||||||
/* FIXME: What should we put here? */
|
/* FIXME: What should we put here? */
|
||||||
whic->hdrv = (HDRVR)0;
|
whic->hdrv = NULL;
|
||||||
|
|
||||||
if (whic->driverId == 0)
|
if (whic->driverId == 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1936,7 +1936,7 @@ HMENU WINAPI SHGetMenuFromID(HMENU hMenu, UINT uID)
|
||||||
mi.fMask = MIIM_SUBMENU;
|
mi.fMask = MIIM_SUBMENU;
|
||||||
|
|
||||||
if (!GetMenuItemInfoA(hMenu, uID, 0, &mi))
|
if (!GetMenuItemInfoA(hMenu, uID, 0, &mi))
|
||||||
return (HMENU)NULL;
|
return NULL;
|
||||||
|
|
||||||
return mi.hSubMenu;
|
return mi.hSubMenu;
|
||||||
}
|
}
|
||||||
|
@ -2418,8 +2418,8 @@ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle
|
||||||
wc.cbClsExtra = 0;
|
wc.cbClsExtra = 0;
|
||||||
wc.cbWndExtra = 4;
|
wc.cbWndExtra = 4;
|
||||||
wc.hInstance = shlwapi_hInstance;
|
wc.hInstance = shlwapi_hInstance;
|
||||||
wc.hIcon = (HICON)0;
|
wc.hIcon = NULL;
|
||||||
wc.hCursor = LoadCursorA((HINSTANCE)0, (LPSTR)IDC_ARROW);
|
wc.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW);
|
||||||
wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW;
|
wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW;
|
||||||
wc.lpszMenuName = NULL;
|
wc.lpszMenuName = NULL;
|
||||||
wc.lpszClassName = szClass;
|
wc.lpszClassName = szClass;
|
||||||
|
@ -2705,8 +2705,8 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle
|
||||||
wc.cbClsExtra = 0;
|
wc.cbClsExtra = 0;
|
||||||
wc.cbWndExtra = 4;
|
wc.cbWndExtra = 4;
|
||||||
wc.hInstance = shlwapi_hInstance;
|
wc.hInstance = shlwapi_hInstance;
|
||||||
wc.hIcon = (HICON)0;
|
wc.hIcon = NULL;
|
||||||
wc.hCursor = LoadCursorA((HINSTANCE)0, (LPSTR)IDC_ARROW);
|
wc.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW);
|
||||||
wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW;
|
wc.hbrBackground = (HBRUSH)COLOR_BTNSHADOW;
|
||||||
wc.lpszMenuName = NULL;
|
wc.lpszMenuName = NULL;
|
||||||
wc.lpszClassName = szClass;
|
wc.lpszClassName = szClass;
|
||||||
|
|
|
@ -703,7 +703,7 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo,
|
||||||
{
|
{
|
||||||
INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL );
|
INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL );
|
||||||
szFn = HeapAlloc( GetProcessHeap(), 0, len );
|
szFn = HeapAlloc( GetProcessHeap(), 0, len );
|
||||||
if (!szFn) return (HMMIO)NULL;
|
if (!szFn) return NULL;
|
||||||
WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL );
|
WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ static VOID TABLET_Register()
|
||||||
wndClass.lpfnWndProc = TABLET_WindowProc;
|
wndClass.lpfnWndProc = TABLET_WindowProc;
|
||||||
wndClass.cbClsExtra = 0;
|
wndClass.cbClsExtra = 0;
|
||||||
wndClass.cbWndExtra = 0;
|
wndClass.cbWndExtra = 0;
|
||||||
wndClass.hCursor = (HCURSOR)NULL;
|
wndClass.hCursor = NULL;
|
||||||
wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1);
|
wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1);
|
||||||
wndClass.lpszClassName = WC_TABLETCLASSNAME;
|
wndClass.lpszClassName = WC_TABLETCLASSNAME;
|
||||||
RegisterClassW(&wndClass);
|
RegisterClassW(&wndClass);
|
||||||
|
@ -60,7 +60,7 @@ static VOID TABLET_Register()
|
||||||
|
|
||||||
static VOID TABLET_Unregister()
|
static VOID TABLET_Unregister()
|
||||||
{
|
{
|
||||||
UnregisterClassW(WC_TABLETCLASSNAME, (HINSTANCE)NULL);
|
UnregisterClassW(WC_TABLETCLASSNAME, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved)
|
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved)
|
||||||
|
|
|
@ -573,7 +573,7 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
|
||||||
case WM_CREATE:
|
case WM_CREATE:
|
||||||
CreateWindowEx(0, szChildClass, _T("regedit child window"), WS_CHILD | WS_VISIBLE,
|
CreateWindowEx(0, szChildClass, _T("regedit child window"), WS_CHILD | WS_VISIBLE,
|
||||||
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
|
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
|
||||||
hWnd, (HMENU)0, hInst, 0);
|
hWnd, NULL, hInst, 0);
|
||||||
break;
|
break;
|
||||||
case WM_COMMAND:
|
case WM_COMMAND:
|
||||||
if (!_CmdWndProc(hWnd, message, wParam, lParam))
|
if (!_CmdWndProc(hWnd, message, wParam, lParam))
|
||||||
|
|
|
@ -181,7 +181,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
|
||||||
hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_REGEDIT);
|
hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_REGEDIT);
|
||||||
|
|
||||||
/* Main message loop */
|
/* Main message loop */
|
||||||
while (GetMessage(&msg, (HWND)NULL, 0, 0)) {
|
while (GetMessage(&msg, NULL, 0, 0)) {
|
||||||
if (!TranslateAccelerator(hFrameWnd, hAccel, &msg)
|
if (!TranslateAccelerator(hFrameWnd, hAccel, &msg)
|
||||||
&& !TranslateChildTabMessage(&msg)) {
|
&& !TranslateChildTabMessage(&msg)) {
|
||||||
TranslateMessage(&msg);
|
TranslateMessage(&msg);
|
||||||
|
|
Loading…
Reference in New Issue