[PATCH v2 0/6] MR7989: include: Fix some typoed vtable call macros.
One of them found by @zfigura, the rest found by `grep -rI '\->lpVtbl->' | grep -P '#\s*define\s+I\w*_(\w+)\s*\(.*->lpVtbl->' | grep -vP '#\s*define\s+I\w*_(\w+)\s*\(.*->lpVtbl->(?:\w+_)?\1'` [02:21:31] \<zf> #define IXACT3Cue_Play(p) (p)->lpVtbl->Destroy(p) [02:21:44] \<zf> this kind of nonsense is why I want to compile everything with widl [02:21:56] \<zf> this took me hours to find -- v2: include/xact3.h: Fix some typoed vtable call macros. include/xact.h: Fix some typoed vtable call macros. include/objbase.h: Fix some typoed comments. include/mapidefs.h: Fix some typoed vtable call macros. include/dpnathlp.h: Fix a typoed vtable call macro. include/d3drmobj.h: Fix some typoed vtable call macros. https://gitlab.winehq.org/wine/wine/-/merge_requests/7989
From: Alfred Agrell <floating(a)muncher.se> --- include/dpnathlp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dpnathlp.h b/include/dpnathlp.h index 387733ce0ca..4182f4f059d 100644 --- a/include/dpnathlp.h +++ b/include/dpnathlp.h @@ -182,7 +182,7 @@ DECLARE_INTERFACE_(IDirectPlayNATHelp,IUnknown) #define IDirectPlayNATHelp_QueryAddress(p,a,b,c,d,e) (p)->lpVtbl->QueryAddress(p,a,b,c,d,e) #define IDirectPlayNATHelp_SetAlertEvent(p,a,b) (p)->lpVtbl->SetAlertEvent(p,a,b) #define IDirectPlayNATHelp_SetAlertIOCompletionPort(p,a,b,c,d) (p)->lpVtbl->SetAlertIOCompletionPort(p,a,b,c,d) -#define IDirectPlayNATHelp_ExtendRegisteredPortsLease(p,a,b,c) (p)->lpVtbl->SetAlertIOCompletionPort(p,a,b,c) +#define IDirectPlayNATHelp_ExtendRegisteredPortsLease(p,a,b,c) (p)->lpVtbl->ExtendRegisteredPortsLease(p,a,b,c) #endif #ifdef __cplusplus -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7989
From: Alfred Agrell <floating(a)muncher.se> --- include/mapidefs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mapidefs.h b/include/mapidefs.h index e3e2bd40b5f..5bf0a15e1c0 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -810,7 +810,7 @@ DECLARE_INTERFACE_(IMAPITable,IUnknown) #define IMAPITable_SeekRowApprox(p,a,b) (p)->lpVtbl->SeekRowApprox(p,a,b) #define IMAPITable_QueryPosition(p,a,b) (p)->lpVtbl->QueryPosition(p,a,b) #define IMAPITable_FindRow(p,a,b,c) (p)->lpVtbl->FindRow(p,a,b,c) -#define IMAPITable_Restrict(p,a,b) (p)->lpVtbl->Recstrict(p,a,b) +#define IMAPITable_Restrict(p,a,b) (p)->lpVtbl->Restrict(p,a,b) #define IMAPITable_CreateBookmark(p,a) (p)->lpVtbl->CreateBookmark(p,a) #define IMAPITable_FreeBookmark(p,a) (p)->lpVtbl->FreeBookmark(p,a) #define IMAPITable_SortTable(p,a,b) (p)->lpVtbl->SortTable(p,a,b) @@ -1133,7 +1133,7 @@ DECLARE_INTERFACE_(IMAPIFolder,IMAPIContainer) #define IMAPIFolder_DeleteMessages(p,a,b,c,d) (p)->lpVtbl->DeleteMessages(p,a,b,c,d) #define IMAPIFolder_CreateFolder(p,a,b,c,d,e,f) (p)->lpVtbl->CreateFolder(p,a,b,c,d,e,f) #define IMAPIFolder_CopyFolder(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->CopyFolder(p,a,b,c,d,e,f,g,h) -#define IMAPIFolder_DeleteFolder(p,a,b,c,d,e) (p)->lpVtbl->CreateFolder(p,a,b,c,d,e) +#define IMAPIFolder_DeleteFolder(p,a,b,c,d,e) (p)->lpVtbl->DeleteFolder(p,a,b,c,d,e) #define IMAPIFolder_SetReadFlags(p,a,b,c,d) (p)->lpVtbl->SetReadFlags(p,a,b,c,d) #define IMAPIFolder_GetMessageStatus(p,a,b,c,d) (p)->lpVtbl->GetMessageStatus(p,a,b,c,d) #define IMAPIFolder_SetMessageStatus(p,a,b,c,d,e) (p)->lpVtbl->SetMessageStatus(p,a,b,c,d,e) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7989
From: Alfred Agrell <floating(a)muncher.se> --- include/d3drmobj.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 7e48d9891dd..472a69e9cf5 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -278,7 +278,7 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown) #define IDirect3DRMObject2_AddDestroyCallback(p,a,b) (p)->lpVtbl->AddDestroyCallback(p,a,b) #define IDirect3DRMObject2_Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c) #define IDirect3DRMObject2_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b) -#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->lpVtbl->SetClientData(p,a,b) +#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->lpVtbl->GetClientData(p,a,b) #define IDirect3DRMObject2_GetDirect3DRM(p,a) (p)->lpVtbl->GetDirect3DRM(p,a) #define IDirect3DRMObject2_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) #define IDirect3DRMObject2_SetClientData(p,a,b,c) (p)->lpVtbl->SetClientData(p,a,b,c) @@ -293,7 +293,7 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown) #define IDirect3DRMObject2_AddDestroyCallback(p,a,b) (p)->AddDestroyCallback(a,b) #define IDirect3DRMObject2_Clone(p,a,b,c) (p)->Clone(a,b,c) #define IDirect3DRMObject2_DeleteDestroyCallback(p,a,b) (p)->DeleteDestroyCallback(a,b) -#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->SetClientData(a,b) +#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->GetClientData(a,b) #define IDirect3DRMObject2_GetDirect3DRM(p,a) (p)->GetDirect3DRM(a) #define IDirect3DRMObject2_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMObject2_SetClientData(p,a,b,c) (p)->SetClientData(a,b,c) @@ -990,7 +990,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) #define IDirect3DRMViewport2_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DRMViewport2_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DRMObject methods ***/ -#define IDirect3DRMViewport_2Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c) +#define IDirect3DRMViewport2_Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c) #define IDirect3DRMViewport2_AddDestroyCallback(p,a,b) (p)->lpVtbl->AddDestroyCallback(p,a,b) #define IDirect3DRMViewport2_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b) #define IDirect3DRMViewport2_SetAppData(p,a) (p)->lpVtbl->SetAppData(p,a) @@ -2154,7 +2154,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow,IDirect3DRMVisual) #define IDirect3DRMShadow_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) #define IDirect3DRMShadow_GetClassName(p,a,b) (p)->lpVtbl->GetClassName(p,a,b) /*** IDirect3DRMShadow methods ***/ -#define IDirect3DRMShadow_Init(p,a,b,c,d,e,f,g) (p)->lpVtbl->Load(p,a,b,c,d,e,f,g) +#define IDirect3DRMShadow_Init(p,a,b,c,d,e,f,g) (p)->lpVtbl->Init(p,a,b,c,d,e,f,g) #else /*** IUnknown methods ***/ #define IDirect3DRMShadow_QueryInterface(p,a,b) (p)->QueryInterface(a,b) @@ -2170,7 +2170,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow,IDirect3DRMVisual) #define IDirect3DRMShadow_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMShadow_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMShadow methods ***/ -#define IDirect3DRMShadow_Init(p,a,b,c,d,e,f,g) (p)->Load(a,b,c,d,e,f,g) +#define IDirect3DRMShadow_Init(p,a,b,c,d,e,f,g) (p)->Init(a,b,c,d,e,f,g) #endif /***************************************************************************** @@ -3250,7 +3250,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) #define IDirect3DRMTexture_SetDecalOrigin(p,a,b) (p)->lpVtbl->SetDecalOrigin(p,a,b) #define IDirect3DRMTexture_SetDecalScale(p,a) (p)->lpVtbl->SetDecalScale(p,a) #define IDirect3DRMTexture_SetDecalTransparency(p,a) (p)->lpVtbl->SetDecalTransparency(p,a) -#define IDirect3DRMTexture_SetDecalTransparencyColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a) +#define IDirect3DRMTexture_SetDecalTransparentColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a) #define IDirect3DRMTexture_GetDecalSize(p,a,b) (p)->lpVtbl->GetDecalSize(p,a,b) #define IDirect3DRMTexture_GetDecalOrigin(p,a,b) (p)->lpVtbl->GetDecalOrigin(p,a,b) #define IDirect3DRMTexture_GetImage(p) (p)->lpVtbl->GetImage(p) @@ -3366,7 +3366,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) #define IDirect3DRMTexture2_SetDecalOrigin(p,a,b) (p)->lpVtbl->SetDecalOrigin(p,a,b) #define IDirect3DRMTexture2_SetDecalScale(p,a) (p)->lpVtbl->SetDecalScale(p,a) #define IDirect3DRMTexture2_SetDecalTransparency(p,a) (p)->lpVtbl->SetDecalTransparency(p,a) -#define IDirect3DRMTexture2_SetDecalTransparencyColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a) +#define IDirect3DRMTexture2_SetDecalTransparentColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a) #define IDirect3DRMTexture2_GetDecalSize(p,a,b) (p)->lpVtbl->GetDecalSize(p,a,b) #define IDirect3DRMTexture2_GetDecalOrigin(p,a,b) (p)->lpVtbl->GetDecalOrigin(p,a,b) #define IDirect3DRMTexture2_GetImage(p) (p)->lpVtbl->GetImage(p) @@ -3536,7 +3536,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) #define IDirect3DRMTexture3_SetDecalOrigin(p,a,b) (p)->SetDecalOrigin(a,b) #define IDirect3DRMTexture3_SetDecalScale(p,a) (p)->SetDecalScale(a) #define IDirect3DRMTexture3_SetDecalTransparency(p,a) (p)->SetDecalTransparency(a) -#define IDirect3DRMTexture3_SetDecalTransparencyColor(p,a) (p)->SetDecalTransparentColor(a) +#define IDirect3DRMTexture3_SetDecalTransparentColor(p,a) (p)->SetDecalTransparentColor(a) #define IDirect3DRMTexture3_GetDecalSize(p,a,b) (p)->GetDecalSize(a,b) #define IDirect3DRMTexture3_GetDecalOrigin(p,a,b) (p)->GetDecalOrigin(a,b) #define IDirect3DRMTexture3_GetImage(p) (p)->GetImage() -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7989
From: Alfred Agrell <floating(a)muncher.se> --- include/objbase.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/objbase.h b/include/objbase.h index 024d96ca7da..7f7763e8d20 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -74,7 +74,7 @@ * #define IDirect3D_Release(p) (p)->lpVtbl->Release(p) * // *** IDirect3D methods *** // * #define IDirect3D_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) - * #define IDirect3D_EnumDevices(p,a,b) (p)->lpVtbl->EnumDevice(p,a,b) + * #define IDirect3D_EnumDevices(p,a,b) (p)->lpVtbl->EnumDevices(p,a,b) * #define IDirect3D_CreateLight(p,a,b) (p)->lpVtbl->CreateLight(p,a,b) * #define IDirect3D_CreateMaterial(p,a,b) (p)->lpVtbl->CreateMaterial(p,a,b) * #define IDirect3D_CreateViewport(p,a,b) (p)->lpVtbl->CreateViewport(p,a,b) @@ -130,7 +130,7 @@ * #define IDirect3D_Release(p) (p)->lpVtbl->Release(p) * // *** IDirect3D methods *** // * #define IDirect3D_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) - * #define IDirect3D_EnumDevices(p,a,b) (p)->lpVtbl->EnumDevice(p,a,b) + * #define IDirect3D_EnumDevices(p,a,b) (p)->lpVtbl->EnumDevices(p,a,b) * #define IDirect3D_CreateLight(p,a,b) (p)->lpVtbl->CreateLight(p,a,b) * #define IDirect3D_CreateMaterial(p,a,b) (p)->lpVtbl->CreateMaterial(p,a,b) * #define IDirect3D_CreateViewport(p,a,b) (p)->lpVtbl->CreateViewport(p,a,b) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7989
From: Alfred Agrell <floating(a)muncher.se> --- include/xact.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/xact.h b/include/xact.h index f58de7deb6b..d13446ef773 100644 --- a/include/xact.h +++ b/include/xact.h @@ -553,7 +553,7 @@ DECLARE_INTERFACE(IXACTCue) #undef INTERFACE #ifndef __cplusplus -#define IXACTCue_Play(p) (p)->lpVtbl->Destroy(p) +#define IXACTCue_Play(p) (p)->lpVtbl->Play(p) #define IXACTCue_Stop(p,a) (p)->lpVtbl->Stop(p,a) #define IXACTCue_GetState(p,a) (p)->lpVtbl->GetState(p,a) #define IXACTCue_Destroy(p) (p)->lpVtbl->Destroy(p) @@ -570,9 +570,9 @@ DECLARE_INTERFACE(IXACTCue) #define IXACTCue_GetProperties(p,a) (p)->lpVtbl->GetProperties(p,a) #endif #else -#define IXACTCue_Play(p) (p)->Destroy() +#define IXACTCue_Play(p) (p)->Play() #define IXACTCue_Stop(p,a) (p)->Stop(a) -#define IXACTCue_GetState(p,a) (p)->Stop(a) +#define IXACTCue_GetState(p,a) (p)->GetState(a) #define IXACTCue_Destroy(p) (p)->Destroy() #define IXACTCue_GetChannelMap(p,a,b,c) (p)->GetChannelMap(a,b,c) #define IXACTCue_SetChannelMap(p,a) (p)->SetChannelMap(a) @@ -605,7 +605,7 @@ DECLARE_INTERFACE(IXACTWave) #ifndef __cplusplus #define IXACTWave_Destroy(p) (p)->lpVtbl->Destroy(p) -#define IXACTWave_Play(p) (p)->lpVtbl->Destroy(p) +#define IXACTWave_Play(p) (p)->lpVtbl->Play(p) #define IXACTWave_Stop(p,a) (p)->lpVtbl->Stop(p,a) #define IXACTWave_Pause(p,a) (p)->lpVtbl->Pause(p,a) #define IXACTWave_GetState(p,a) (p)->lpVtbl->GetState(p,a) @@ -615,11 +615,11 @@ DECLARE_INTERFACE(IXACTWave) #define IXACTWave_GetProperties(p,a) (p)->lpVtbl->GetProperties(p,a) #else #define IXACTWave_Destroy(p) (p)->Destroy() -#define IXACTWave_Play(p) (p)->Destroy() +#define IXACTWave_Play(p) (p)->Play() #define IXACTWave_Stop(p,a) (p)->Stop(a) #define IXACTWave_Pause(p,a) (p)->Pause(a) -#define IXACTWave_GetState(p,a) (p)->Stop(a) -#define IXACTWave_SetPitch(p,a) (p)->SetVariable(a) +#define IXACTWave_GetState(p,a) (p)->GetState(a) +#define IXACTWave_SetPitch(p,a) (p)->SetPitch(a) #define IXACTWave_SetVolume(p,a) (p)->SetVolume(a) #define IXACTWave_SetMatrixCoefficients(p,a,b,c) (p)->SetMatrixCoefficients(a,b,c) #define IXACTWave_GetProperties(p,a) (p)->GetProperties(a) @@ -684,7 +684,7 @@ DECLARE_INTERFACE(IXACTWaveBank) #ifndef __cplusplus #define IXACTWaveBank_Destroy(p) (p)->lpVtbl->Destroy(p) #if XACT3_VER >= 0x0205 -#define IXACTWaveBank_GetNumWaves(p,a) (p)->lpVtbl->GetNumCues(p,a) +#define IXACTWaveBank_GetNumWaves(p,a) (p)->lpVtbl->GetNumWaves(p,a) #define IXACTWaveBank_GetWaveIndex(p,a) (p)->lpVtbl->GetWaveIndex(p,a) #define IXACTWaveBank_GetWaveProperties(p,a,b) (p)->lpVtbl->GetWaveProperties(p,a,b) #define IXACTWaveBank_Prepare(p,a,b,c,d,e) (p)->lpVtbl->Prepare(p,a,b,c,d,e) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7989
From: Alfred Agrell <floating(a)muncher.se> --- include/xact3.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/xact3.h b/include/xact3.h index 8de46d95468..31b256882b0 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -496,7 +496,7 @@ DECLARE_INTERFACE(IXACT3Cue) #if !defined(__cplusplus) || defined(CINTERFACE) /*** IXACT3Cue methods ***/ -#define IXACT3Cue_Play(p) (p)->lpVtbl->Destroy(p) +#define IXACT3Cue_Play(p) (p)->lpVtbl->Play(p) #define IXACT3Cue_Stop(p,a) (p)->lpVtbl->Stop(p,a) #define IXACT3Cue_GetState(p,a) (p)->lpVtbl->GetState(p,a) #define IXACT3Cue_Destroy(p) (p)->lpVtbl->Destroy(p) @@ -510,9 +510,9 @@ DECLARE_INTERFACE(IXACT3Cue) #define IXACT3Cue_SetOutputVoiceMatrix(p,a,b,c,d) (p)->lpVtbl->SetOutputVoiceMatrix(p,a,b,c,d) #else /*** IXACT3Cue methods ***/ -#define IXACT3Cue_Play(p) (p)->Destroy() +#define IXACT3Cue_Play(p) (p)->Play() #define IXACT3Cue_Stop(p,a) (p)->Stop(a) -#define IXACT3Cue_GetState(p,a) (p)->Stop(a) +#define IXACT3Cue_GetState(p,a) (p)->GetState(a) #define IXACT3Cue_Destroy(p) (p)->Destroy() #define IXACT3Cue_SetMatrixCoefficients(p,a,b,c) (p)->SetMatrixCoefficients(a,b,c) #define IXACT3Cue_GetVariableIndex(p,a) (p)->GetVariableIndex(a) @@ -546,7 +546,7 @@ DECLARE_INTERFACE(IXACT3Wave) #if !defined(__cplusplus) || defined(CINTERFACE) /*** IXACT3Wave methods ***/ #define IXACT3Wave_Destroy(p) (p)->lpVtbl->Destroy(p) -#define IXACT3Wave_Play(p) (p)->lpVtbl->Destroy(p) +#define IXACT3Wave_Play(p) (p)->lpVtbl->Play(p) #define IXACT3Wave_Stop(p,a) (p)->lpVtbl->Stop(p,a) #define IXACT3Wave_Pause(p,a) (p)->lpVtbl->Pause(p,a) #define IXACT3Wave_GetState(p,a) (p)->lpVtbl->GetState(p,a) @@ -557,10 +557,10 @@ DECLARE_INTERFACE(IXACT3Wave) #else /*** IXACT3Wave methods ***/ #define IXACT3Wave_Destroy(p) (p)->Destroy() -#define IXACT3Wave_Play(p) (p)->Destroy() +#define IXACT3Wave_Play(p) (p)->Play() #define IXACT3Wave_Stop(p,a) (p)->Stop(a) #define IXACT3Wave_Pause(p,a) (p)->Pause(a) -#define IXACT3Wave_GetState(p,a) (p)->Stop(a) +#define IXACT3Wave_GetState(p,a) (p)->GetState(a) #define IXACT3Wave_SetPitch(p,a) (p)->SetVariable(a) #define IXACT3Wave_SetVolume(p,a) (p)->SetVolume(a) #define IXACT3Wave_SetMatrixCoefficients(p,a,b,c) (p)->SetMatrixCoefficients(a,b,c) @@ -635,7 +635,7 @@ DECLARE_INTERFACE(IXACT3WaveBank) #if !defined(__cplusplus) || defined(CINTERFACE) /*** IXACT3WaveBank methods ***/ #define IXACT3WaveBank_Destroy(p) (p)->lpVtbl->Destroy(p) -#define IXACT3WaveBank_GetNumWaves(p,a) (p)->lpVtbl->GetNumCues(p,a) +#define IXACT3WaveBank_GetNumWaves(p,a) (p)->lpVtbl->GetNumWaves(p,a) #define IXACT3WaveBank_GetWaveIndex(p,a) (p)->lpVtbl->GetWaveIndex(p,a) #define IXACT3WaveBank_GetWaveProperties(p,a,b) (p)->lpVtbl->GetWaveProperties(p,a,b) #define IXACT3WaveBank_Prepare(p,a,b,c,d,e) (p)->lpVtbl->Prepare(p,a,b,c,d,e) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7989
participants (2)
-
Alfred Agrell -
Alfred Agrell (＠Alcaro)