From 8ff2cf5e8e3c6749ad93fb90f0a17dae9c22b1cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 4 Oct 2023 21:32:49 +0200
Subject: [PATCH] vrclient: Make sure the param structs are consistently
 aligned.

CW-Bug-Id: #22729
---
 vrclient_x64/gen_wrapper.py      | 2 ++
 vrclient_x64/unixlib.h           | 5 +++++
 vrclient_x64/unixlib_generated.h | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py
index 81df8f55..aa74d5c9 100755
--- a/vrclient_x64/gen_wrapper.py
+++ b/vrclient_x64/gen_wrapper.py
@@ -1584,9 +1584,11 @@ with open(u"unixlib_generated.h", "w") as file:
     out(u'#endif /* __cplusplus */\n')
     out(u'\n')
 
+    out(u'#include <pshpack1.h>\n\n')
     for klass, method in all_methods:
         sdkver = klass._sdkver
         method.write_params(out)
+    out(u'#include <poppack.h>\n\n')
 
     out(u'enum unix_funcs\n')
     out(u'{\n')
diff --git a/vrclient_x64/unixlib.h b/vrclient_x64/unixlib.h
index b7a6f81c..fdf6989b 100644
--- a/vrclient_x64/unixlib.h
+++ b/vrclient_x64/unixlib.h
@@ -3,6 +3,7 @@
 
 #include <stdarg.h>
 #include <stddef.h>
+#include <assert.h>
 
 #include <windef.h>
 #include <winbase.h>
@@ -17,6 +18,8 @@ extern "C"
 {
 #endif /* __cplusplus */
 
+#include <pshpack1.h>
+
 struct render_model
 {
     union
@@ -64,6 +67,8 @@ struct vrclient_VRClientCoreFactory_params
     int *return_code;
 };
 
+#include <poppack.h>
+
 typedef NTSTATUS (*unixlib_entry_t)( void *args );
 extern const unixlib_entry_t __wine_unix_call_funcs[];
 
diff --git a/vrclient_x64/unixlib_generated.h b/vrclient_x64/unixlib_generated.h
index 00d148a9..93720fd2 100644
--- a/vrclient_x64/unixlib_generated.h
+++ b/vrclient_x64/unixlib_generated.h
@@ -7,6 +7,8 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#include <pshpack1.h>
+
 struct IVRApplications_IVRApplications_001_AddApplicationManifest_params
 {
     void *linux_side;
@@ -28856,6 +28858,8 @@ struct IVRTrackedCamera_IVRTrackedCamera_006_GetCameraTrackingSpace_params
     uint32_t _ret;
 };
 
+#include <poppack.h>
+
 enum unix_funcs
 {
     unix_vrclient_init,