[PATCH v2 0/1] MR6893: msi: Use mybool instead of bool as variable name.

[Gerald Pfeifer (＠gerald)]

bool is a reserved identifier in C23 and would break with GCC 15
moving to -std=gnu23 (based on C23). Use mybool instead, along the
line of myint in the same context.

--
  v2: msi: Use mybool instead of bool as variable name.

https://gitlab.winehq.org/wine/wine/-/merge_requests/6893

[PATCH v2 1/1] msi: Use mybool instead of bool as variable name.

[Gerald Pfeifer]

From: Gerald Pfeifer

bool is a reserved identifier in C23 and would break with GCC 15
moving to -std=gnu23 (based on C23). Use mybool instead, along the
line of myint in the same context.
---
 dlls/msi/tests/automation.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c
index 0ec0820a48b..3309c648c8a 100644
--- a/dlls/msi/tests/automation.c
+++ b/dlls/msi/tests/automation.c
@@ -1725,7 +1725,7 @@ static void test_Session(IDispatch *pSession)
     WCHAR stringw[MAX_PATH];
     CHAR string[MAX_PATH];
     UINT len;
-    VARIANT_BOOL bool;
+    VARIANT_BOOL mybool;
     int myint;
     IDispatch *pDatabase = NULL, *pInst = NULL, *record = NULL;
     ULONG refs_before, refs_after;
@@ -1784,20 +1784,20 @@ static void test_Session(IDispatch *pSession)
     /* Not sure how to check the language is correct */

/* Session::Mode, get */
-    hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool);
+    hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &mybool);
     ok(hr == S_OK, "Session_ModeGet failed, hresult %#lx\n", hr);
-    ok(!bool, "Reboot at end session mode is %d\n", bool);
+    ok(!mybool, "Reboot at end session mode is %d\n", mybool);

-    hr = Session_ModeGet(pSession, MSIRUNMODE_MAINTENANCE, &bool);
+    hr = Session_ModeGet(pSession, MSIRUNMODE_MAINTENANCE, &mybool);
     ok(hr == S_OK, "Session_ModeGet failed, hresult %#lx\n", hr);
-    ok(!bool, "Maintenance mode is %d\n", bool);
+    ok(!mybool, "Maintenance mode is %d\n", mybool);

/* Session::Mode, put */
     hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_TRUE);
     ok(hr == S_OK, "Session_ModePut failed, hresult %#lx\n", hr);
-    hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool);
+    hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &mybool);
     ok(hr == S_OK, "Session_ModeGet failed, hresult %#lx\n", hr);
-    ok(bool, "Reboot at end session mode is %d, expected 1\n", bool);
+    ok(mybool, "Reboot at end session mode is %d, expected 1\n", mybool);
     hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_FALSE);  /* set it again so we don't reboot */
     ok(hr == S_OK, "Session_ModePut failed, hresult %#lx\n", hr);

@@ -1805,9 +1805,9 @@ static void test_Session(IDispatch *pSession)
     ok(hr == S_OK, "Session_ModePut failed, hresult %#lx\n", hr);
     ok_exception(hr, L"Mode,Flag");

-    hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTNOW, &bool);
+    hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTNOW, &mybool);
     ok(hr == S_OK, "Session_ModeGet failed, hresult %#lx\n", hr);
-    ok(bool, "Reboot now mode is %d, expected 1\n", bool);
+    ok(mybool, "Reboot now mode is %d, expected 1\n", mybool);

hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_FALSE);  /* set it again so we don't reboot */
     ok(hr == S_OK, "Session_ModePut failed, hresult %#lx\n", hr);

[PATCH v2 0/1] MR6893: msi: Use mybool instead of bool as variable name. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.