From 77d381cd1dae306118cfdc68b645a0eebb6215b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Thu, 14 Sep 2023 14:53:26 +0200 Subject: [PATCH] vrclient: Use standard fixed size integer types. CW-Bug-Id: #22729 --- vrclient_x64/gen_wrapper.py | 19 ++++++---- .../cppIVRChaperone_IVRChaperone_002.h | 2 +- .../cppIVRChaperone_IVRChaperone_003.h | 2 +- .../cppIVRChaperone_IVRChaperone_004.h | 2 +- .../cppIVRScreenshots_IVRScreenshots_001.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_003.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_004.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_005.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_006.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_009.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_010.h | 4 +-- .../vrclient_x64/cppIVRSystem_IVRSystem_011.h | 4 +-- .../vrclient_x64/cppIVRSystem_IVRSystem_012.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_014.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_015.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_016.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_017.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_019.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_020.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_021.h | 2 +- .../vrclient_x64/cppIVRSystem_IVRSystem_022.h | 2 +- vrclient_x64/vrclient_x64/winIVRChaperone.c | 6 ++-- vrclient_x64/vrclient_x64/winIVRScreenshots.c | 2 +- vrclient_x64/vrclient_x64/winIVRSystem.c | 36 +++++++++---------- 24 files changed, 57 insertions(+), 50 deletions(-) diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py index 9d9b3157..29880f21 100755 --- a/vrclient_x64/gen_wrapper.py +++ b/vrclient_x64/gen_wrapper.py @@ -333,16 +333,23 @@ def declspec(decl, name): real_name = real_name.removeprefix("vr::") if real_name in SDK_STRUCTS: - typename = f"win{real_name}_{display_sdkver(sdkver)}" + type_name = f"win{real_name}_{display_sdkver(sdkver)}" elif struct_needs_conversion(decl.get_canonical()) \ and not decl.is_const_qualified(): # FIXME - typename = f"win{real_name}_{display_sdkver(sdkver)}" + type_name = f"win{real_name}_{display_sdkver(sdkver)}" else: - typename = decl.spelling - typename = typename.removeprefix("const ") - typename = typename.removeprefix("vr::") + type_name = decl.spelling + type_name = type_name.removeprefix("const ") + type_name = type_name.removeprefix("vr::") - return f'{const}{typename}{name}' + if type_name in ('void', 'bool', 'char', 'float', 'double'): + return f'{const}{type_name}{name}' + if type_name.startswith(('int', 'long', 'short', 'signed')): + return f'{const}int{decl.get_size() * 8}_t{name}' + if type_name.startswith(('uint', 'unsigned')): + return f'{const}uint{decl.get_size() * 8}_t{name}' + + return f'{const}{type_name}{name}' def handle_method_hpp(method, cppname, out): diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_002.h b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_002.h index ea6e71ed..29ad9c2c 100644 --- a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_002.h +++ b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_002.h @@ -50,7 +50,7 @@ struct cppIVRChaperone_IVRChaperone_002_GetBoundsColor_params { void *linux_side; HmdColor_t *pOutputColorArray; - int nNumOutputColors; + int32_t nNumOutputColors; }; extern void cppIVRChaperone_IVRChaperone_002_GetBoundsColor( struct cppIVRChaperone_IVRChaperone_002_GetBoundsColor_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.h b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.h index 8f28b6ae..1cea5cf2 100644 --- a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.h +++ b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.h @@ -42,7 +42,7 @@ struct cppIVRChaperone_IVRChaperone_003_GetBoundsColor_params { void *linux_side; HmdColor_t *pOutputColorArray; - int nNumOutputColors; + int32_t nNumOutputColors; float flCollisionBoundsFadeDistance; HmdColor_t *pOutputCameraColor; }; diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_004.h b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_004.h index 3204ed88..ec0d67af 100644 --- a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_004.h +++ b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_004.h @@ -42,7 +42,7 @@ struct cppIVRChaperone_IVRChaperone_004_GetBoundsColor_params { void *linux_side; HmdColor_t *pOutputColorArray; - int nNumOutputColors; + int32_t nNumOutputColors; float flCollisionBoundsFadeDistance; HmdColor_t *pOutputCameraColor; }; diff --git a/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.h b/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.h index 4122f80e..dca12dfe 100644 --- a/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.h +++ b/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.h @@ -17,7 +17,7 @@ struct cppIVRScreenshots_IVRScreenshots_001_HookScreenshot_params void *linux_side; EVRScreenshotError _ret; const EVRScreenshotType *pSupportedTypes; - int numTypes; + int32_t numTypes; }; extern void cppIVRScreenshots_IVRScreenshots_001_HookScreenshot( struct cppIVRScreenshots_IVRScreenshots_001_HookScreenshot_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h index 926e370a..4474c4e5 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h @@ -286,7 +286,7 @@ struct cppIVRSystem_IVRSystem_003_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_003_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_003_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h index c0566d1d..f151d09a 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h @@ -270,7 +270,7 @@ struct cppIVRSystem_IVRSystem_004_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_004_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_004_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h index 8db02efc..7fbc809b 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h @@ -281,7 +281,7 @@ struct cppIVRSystem_IVRSystem_005_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_005_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_005_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h index dfce4b0c..f07ab737 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h @@ -296,7 +296,7 @@ struct cppIVRSystem_IVRSystem_006_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_006_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_006_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h index c16aa66e..4d418eaa 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h @@ -290,7 +290,7 @@ struct cppIVRSystem_IVRSystem_009_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_009_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_009_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h index 6868354c..66d4871b 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h @@ -306,7 +306,7 @@ struct cppIVRSystem_IVRSystem_010_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_010_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_010_TriggerHapticPulse_params *params ); @@ -387,7 +387,7 @@ extern void cppIVRSystem_IVRSystem_010_PerformanceTestEnableCapture( struct cppI struct cppIVRSystem_IVRSystem_010_PerformanceTestReportFidelityLevelChange_params { void *linux_side; - int nFidelityLevel; + int32_t nFidelityLevel; }; extern void cppIVRSystem_IVRSystem_010_PerformanceTestReportFidelityLevelChange( struct cppIVRSystem_IVRSystem_010_PerformanceTestReportFidelityLevelChange_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.h index 1c52e1e5..e42eea66 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.h @@ -308,7 +308,7 @@ struct cppIVRSystem_IVRSystem_011_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_011_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_011_TriggerHapticPulse_params *params ); @@ -389,7 +389,7 @@ extern void cppIVRSystem_IVRSystem_011_PerformanceTestEnableCapture( struct cppI struct cppIVRSystem_IVRSystem_011_PerformanceTestReportFidelityLevelChange_params { void *linux_side; - int nFidelityLevel; + int32_t nFidelityLevel; }; extern void cppIVRSystem_IVRSystem_011_PerformanceTestReportFidelityLevelChange( struct cppIVRSystem_IVRSystem_011_PerformanceTestReportFidelityLevelChange_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.h index 21ed41eb..802239a0 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.h @@ -308,7 +308,7 @@ struct cppIVRSystem_IVRSystem_012_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_012_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_012_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.h index e4b1b909..e6ff036c 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.h @@ -312,7 +312,7 @@ struct cppIVRSystem_IVRSystem_014_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_014_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_014_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.h index 44b272f4..99b540ba 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.h @@ -311,7 +311,7 @@ struct cppIVRSystem_IVRSystem_015_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_015_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_015_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.h index d7171ca7..e65f3a8a 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.h @@ -319,7 +319,7 @@ struct cppIVRSystem_IVRSystem_016_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_016_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_016_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.h index f8dca629..2a8d553f 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.h @@ -320,7 +320,7 @@ struct cppIVRSystem_IVRSystem_017_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_017_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_017_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.h index f9c0ac58..86fa3c30 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.h @@ -333,7 +333,7 @@ struct cppIVRSystem_IVRSystem_019_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_019_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_019_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.h index 460b3480..3b1424b4 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.h @@ -333,7 +333,7 @@ struct cppIVRSystem_IVRSystem_020_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_020_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_020_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.h index ad4f6418..b6f02544 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.h @@ -333,7 +333,7 @@ struct cppIVRSystem_IVRSystem_021_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_021_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_021_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.h index 86da60d8..21ea9d98 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.h @@ -327,7 +327,7 @@ struct cppIVRSystem_IVRSystem_022_TriggerHapticPulse_params void *linux_side; TrackedDeviceIndex_t unControllerDeviceIndex; uint32_t unAxisId; - unsigned short usDurationMicroSec; + uint16_t usDurationMicroSec; }; extern void cppIVRSystem_IVRSystem_022_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_022_TriggerHapticPulse_params *params ); diff --git a/vrclient_x64/vrclient_x64/winIVRChaperone.c b/vrclient_x64/vrclient_x64/winIVRChaperone.c index 7d30017f..f7c2a52f 100644 --- a/vrclient_x64/vrclient_x64/winIVRChaperone.c +++ b/vrclient_x64/vrclient_x64/winIVRChaperone.c @@ -97,7 +97,7 @@ void __thiscall winIVRChaperone_IVRChaperone_002_SetSceneColor(struct w_steam_if cppIVRChaperone_IVRChaperone_002_SetSceneColor( ¶ms ); } -void __thiscall winIVRChaperone_IVRChaperone_002_GetBoundsColor(struct w_steam_iface *_this, HmdColor_t *pOutputColorArray, int nNumOutputColors) +void __thiscall winIVRChaperone_IVRChaperone_002_GetBoundsColor(struct w_steam_iface *_this, HmdColor_t *pOutputColorArray, int32_t nNumOutputColors) { struct cppIVRChaperone_IVRChaperone_002_GetBoundsColor_params params = { @@ -266,7 +266,7 @@ void __thiscall winIVRChaperone_IVRChaperone_003_SetSceneColor(struct w_steam_if cppIVRChaperone_IVRChaperone_003_SetSceneColor( ¶ms ); } -void __thiscall winIVRChaperone_IVRChaperone_003_GetBoundsColor(struct w_steam_iface *_this, HmdColor_t *pOutputColorArray, int nNumOutputColors, float flCollisionBoundsFadeDistance, HmdColor_t *pOutputCameraColor) +void __thiscall winIVRChaperone_IVRChaperone_003_GetBoundsColor(struct w_steam_iface *_this, HmdColor_t *pOutputColorArray, int32_t nNumOutputColors, float flCollisionBoundsFadeDistance, HmdColor_t *pOutputCameraColor) { struct cppIVRChaperone_IVRChaperone_003_GetBoundsColor_params params = { @@ -436,7 +436,7 @@ void __thiscall winIVRChaperone_IVRChaperone_004_SetSceneColor(struct w_steam_if cppIVRChaperone_IVRChaperone_004_SetSceneColor( ¶ms ); } -void __thiscall winIVRChaperone_IVRChaperone_004_GetBoundsColor(struct w_steam_iface *_this, HmdColor_t *pOutputColorArray, int nNumOutputColors, float flCollisionBoundsFadeDistance, HmdColor_t *pOutputCameraColor) +void __thiscall winIVRChaperone_IVRChaperone_004_GetBoundsColor(struct w_steam_iface *_this, HmdColor_t *pOutputColorArray, int32_t nNumOutputColors, float flCollisionBoundsFadeDistance, HmdColor_t *pOutputCameraColor) { struct cppIVRChaperone_IVRChaperone_004_GetBoundsColor_params params = { diff --git a/vrclient_x64/vrclient_x64/winIVRScreenshots.c b/vrclient_x64/vrclient_x64/winIVRScreenshots.c index 365406e6..fd350d42 100644 --- a/vrclient_x64/vrclient_x64/winIVRScreenshots.c +++ b/vrclient_x64/vrclient_x64/winIVRScreenshots.c @@ -45,7 +45,7 @@ EVRScreenshotError __thiscall winIVRScreenshots_IVRScreenshots_001_RequestScreen return params._ret; } -EVRScreenshotError __thiscall winIVRScreenshots_IVRScreenshots_001_HookScreenshot(struct w_steam_iface *_this, const EVRScreenshotType *pSupportedTypes, int numTypes) +EVRScreenshotError __thiscall winIVRScreenshots_IVRScreenshots_001_HookScreenshot(struct w_steam_iface *_this, const EVRScreenshotType *pSupportedTypes, int32_t numTypes) { struct cppIVRScreenshots_IVRScreenshots_001_HookScreenshot_params params = { diff --git a/vrclient_x64/vrclient_x64/winIVRSystem.c b/vrclient_x64/vrclient_x64/winIVRSystem.c index dc9fde91..308faff0 100644 --- a/vrclient_x64/vrclient_x64/winIVRSystem.c +++ b/vrclient_x64/vrclient_x64/winIVRSystem.c @@ -457,7 +457,7 @@ bool __thiscall winIVRSystem_IVRSystem_003_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_003_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_003_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_003_TriggerHapticPulse_params params = { @@ -1082,7 +1082,7 @@ bool __thiscall winIVRSystem_IVRSystem_004_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_004_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_004_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_004_TriggerHapticPulse_params params = { @@ -1718,7 +1718,7 @@ bool __thiscall winIVRSystem_IVRSystem_005_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_005_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_005_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_005_TriggerHapticPulse_params params = { @@ -2385,7 +2385,7 @@ bool __thiscall winIVRSystem_IVRSystem_006_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_006_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_006_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_006_TriggerHapticPulse_params params = { @@ -3092,7 +3092,7 @@ bool __thiscall winIVRSystem_IVRSystem_009_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_009_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_009_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_009_TriggerHapticPulse_params params = { @@ -3824,7 +3824,7 @@ bool __thiscall winIVRSystem_IVRSystem_010_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_010_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_010_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_010_TriggerHapticPulse_params params = { @@ -3951,7 +3951,7 @@ void __thiscall winIVRSystem_IVRSystem_010_PerformanceTestEnableCapture(struct w cppIVRSystem_IVRSystem_010_PerformanceTestEnableCapture( ¶ms ); } -void __thiscall winIVRSystem_IVRSystem_010_PerformanceTestReportFidelityLevelChange(struct w_steam_iface *_this, int nFidelityLevel) +void __thiscall winIVRSystem_IVRSystem_010_PerformanceTestReportFidelityLevelChange(struct w_steam_iface *_this, int32_t nFidelityLevel) { struct cppIVRSystem_IVRSystem_010_PerformanceTestReportFidelityLevelChange_params params = { @@ -4588,7 +4588,7 @@ bool __thiscall winIVRSystem_IVRSystem_011_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_011_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_011_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_011_TriggerHapticPulse_params params = { @@ -4715,7 +4715,7 @@ void __thiscall winIVRSystem_IVRSystem_011_PerformanceTestEnableCapture(struct w cppIVRSystem_IVRSystem_011_PerformanceTestEnableCapture( ¶ms ); } -void __thiscall winIVRSystem_IVRSystem_011_PerformanceTestReportFidelityLevelChange(struct w_steam_iface *_this, int nFidelityLevel) +void __thiscall winIVRSystem_IVRSystem_011_PerformanceTestReportFidelityLevelChange(struct w_steam_iface *_this, int32_t nFidelityLevel) { struct cppIVRSystem_IVRSystem_011_PerformanceTestReportFidelityLevelChange_params params = { @@ -5350,7 +5350,7 @@ bool __thiscall winIVRSystem_IVRSystem_012_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_012_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_012_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_012_TriggerHapticPulse_params params = { @@ -6089,7 +6089,7 @@ bool __thiscall winIVRSystem_IVRSystem_014_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_014_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_014_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_014_TriggerHapticPulse_params params = { @@ -6827,7 +6827,7 @@ bool __thiscall winIVRSystem_IVRSystem_015_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_015_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_015_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_015_TriggerHapticPulse_params params = { @@ -7578,7 +7578,7 @@ bool __thiscall winIVRSystem_IVRSystem_016_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_016_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_016_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_016_TriggerHapticPulse_params params = { @@ -8321,7 +8321,7 @@ bool __thiscall winIVRSystem_IVRSystem_017_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_017_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_017_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_017_TriggerHapticPulse_params params = { @@ -9083,7 +9083,7 @@ bool __thiscall winIVRSystem_IVRSystem_019_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_019_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_019_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_019_TriggerHapticPulse_params params = { @@ -9862,7 +9862,7 @@ bool __thiscall winIVRSystem_IVRSystem_020_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_020_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_020_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_020_TriggerHapticPulse_params params = { @@ -10651,7 +10651,7 @@ bool __thiscall winIVRSystem_IVRSystem_021_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_021_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_021_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_021_TriggerHapticPulse_params params = { @@ -11417,7 +11417,7 @@ bool __thiscall winIVRSystem_IVRSystem_022_GetControllerStateWithPose(struct w_s return params._ret; } -void __thiscall winIVRSystem_IVRSystem_022_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, unsigned short usDurationMicroSec) +void __thiscall winIVRSystem_IVRSystem_022_TriggerHapticPulse(struct w_steam_iface *_this, TrackedDeviceIndex_t unControllerDeviceIndex, uint32_t unAxisId, uint16_t usDurationMicroSec) { struct cppIVRSystem_IVRSystem_022_TriggerHapticPulse_params params = {