Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SMSS][CSRSRV] Undefine CreateProcess symbol. Name the union inside SB_API_MSG.

Browse source 
Undefine CreateProcess because it can be #define'd (to CreateProcessA/W)
if winbase.h is included prior (as it is in SMSS).
This commit is contained in:
Hermès Bélusca-Maïto 2022-11-11 21:18:28 +01:00
parent 9c8a8cf2aa
commit 06a0451415
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/system/smss/smsbapi.c
View file

@ -47,7 +47,7 @@ SmpSbCreateSession(IN PVOID Reserved,
PSB_CREATE_SESSION_MSG CreateSessionMsg; PSB_CREATE_SESSION_MSG CreateSessionMsg;
/* Write out the create session message including its initial process */ /* Write out the create session message including its initial process */
CreateSessionMsg = &SbApiMsg.CreateSession; CreateSessionMsg = &SbApiMsg.u.CreateSession;
CreateSessionMsg->ProcessInfo = *ProcessInformation; CreateSessionMsg->ProcessInfo = *ProcessInformation;
CreateSessionMsg->MuSessionId = MuSessionId; CreateSessionMsg->MuSessionId = MuSessionId;
if (DbgClientId) if (DbgClientId)

4
base/system/smss/smsubsys.c
View file

@ -149,8 +149,8 @@ SmpLoadSubSystem(IN PUNICODE_STRING FileName,
RTL_USER_PROCESS_INFORMATION ProcessInformation; RTL_USER_PROCESS_INFORMATION ProcessInformation;
LARGE_INTEGER Timeout; LARGE_INTEGER Timeout;
PVOID State; PVOID State;
PSB_CREATE_PROCESS_MSG CreateProcess = &SbApiMsg.CreateProcess; PSB_CREATE_PROCESS_MSG CreateProcess = &SbApiMsg.u.CreateProcess;
PSB_CREATE_SESSION_MSG CreateSession = &SbApiMsg.CreateSession; PSB_CREATE_SESSION_MSG CreateSession = &SbApiMsg.u.CreateSession;
/* Make sure this is a found subsystem */ /* Make sure this is a found subsystem */
if (Flags & SMP_INVALID_PATH) if (Flags & SMP_INVALID_PATH)

6
sdk/include/reactos/subsys/sm/smmsg.h
View file

@ -211,6 +211,10 @@ C_ASSERT(sizeof(SB_CREATE_PROCESS_MSG) == 0x18);
C_ASSERT(sizeof(SB_CREATE_PROCESS_MSG) == 0x28); C_ASSERT(sizeof(SB_CREATE_PROCESS_MSG) == 0x28);
#endif #endif
#ifdef CreateProcess
#undef CreateProcess
#endif
// //
// When the server connects to a client, this structure is exchanged // When the server connects to a client, this structure is exchanged
// //
@ -239,7 +243,7 @@ typedef struct _SB_API_MSG
SB_TERMINATE_SESSION_MSG TerminateSession; SB_TERMINATE_SESSION_MSG TerminateSession;
SB_FOREIGN_SESSION_COMPLETE_MSG ForeignSessionComplete; SB_FOREIGN_SESSION_COMPLETE_MSG ForeignSessionComplete;
SB_CREATE_PROCESS_MSG CreateProcess; SB_CREATE_PROCESS_MSG CreateProcess;
}; } u;
}; };
}; };
} SB_API_MSG, *PSB_API_MSG; } SB_API_MSG, *PSB_API_MSG;

2
subsystems/csr/csrsrv/session.c
View file

@ -207,7 +207,7 @@ BOOLEAN
NTAPI NTAPI
CsrSbCreateSession(IN PSB_API_MSG ApiMessage) CsrSbCreateSession(IN PSB_API_MSG ApiMessage)
{ {
PSB_CREATE_SESSION_MSG CreateSession = &ApiMessage->CreateSession; PSB_CREATE_SESSION_MSG CreateSession = &ApiMessage->u.CreateSession;
HANDLE hProcess, hThread; HANDLE hProcess, hThread;
PCSR_PROCESS CsrProcess; PCSR_PROCESS CsrProcess;
PCSR_THREAD CsrThread; PCSR_THREAD CsrThread;