[PATCH 0/1] MR6836: Dpwsockx: Avoid using true as a variable namd

[Gerald Pfeifer (＠gerald)]

Revision 78bdd23406 (Oct 13 2023) introduced "true" as a variable name
in DPWSCB_EnumSessions.

This is a reserved identifier in C++ and recent versions of C and with
GCC 15 going to move to -std=gnu23 (so essentically C23) we'd break.

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

[PATCH 1/1] dpwsockx: Don't use true as a variable name

[Gerald Pfeifer]

From: Gerald Pfeifer <gerald(a)pfeifer.com>

Revision 78bdd23406 (Oct 13 2023) introduced "true" as a variable name
in DPWSCB_EnumSessions.

This is a reserved identifier in C++ and recent versions of C and with
GCC 15 going to move to -std=gnu23 (so essentically C23) we'd break.
---
 dlls/dpwsockx/dpwsockx_main.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c
index 6bfa70e916b..430901b452c 100644
--- a/dlls/dpwsockx/dpwsockx_main.c
+++ b/dlls/dpwsockx/dpwsockx_main.c
@@ -516,7 +516,7 @@ static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data )
     DPWS_DATA *dpwsData;
     DWORD dpwsDataSize;
     SOCKADDR_IN addr;
-    BOOL true = TRUE;
+    BOOL trueflag = TRUE;
     SOCKET sock;
     HRESULT hr;
 
@@ -539,8 +539,9 @@ static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data )
         return DPERR_UNAVAILABLE;
     }
 
-    if ( SOCKET_ERROR == setsockopt( sock, SOL_SOCKET, SO_BROADCAST, (const char *) &true,
-                                     sizeof( true ) ) )
+    if ( SOCKET_ERROR == setsockopt( sock, SOL_SOCKET, SO_BROADCAST,
+                                     (const char *) &trueflag,
+                                     sizeof( trueflag ) ) )
     {
         ERR( "setsockopt() failed\n" );
         closesocket( sock );
-- 
GitLab

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

[PATCH 1/1] dpwsockx: Don't use true as a variable name

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=149736

Your paranoid android.


=== debian11b (64 bit WoW report) ===

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000025500FA, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032
win.c:4073: Test succeeded inside todo block: Expected active window 000000000341014E, got 000000000341014E.
win.c:4074: Test succeeded inside todo block: Expected focus window 000000000341014E, got 000000000341014E.

[PATCH 0/1] MR6836: dpwsockx: Avoid using true as a variable name - approved

[Alistair Leslie-Hughes (＠alesliehughes)]

This merge request was approved by Alistair Leslie-Hughes.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6836