Ros-diffs November 2022

ros-diffs@reactos.org

26 participants
175 discussions

[reactos] 01/06: [VGAMP/VGADDI] Be consistent in IOCTL_VIDEO_GET_CURRENT_MODE and IOCTL_VIDEO_SET_CURRENT_MODE

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79f16507c4835560bf6b2… commit 79f16507c4835560bf6b2285922a9781bd262a9a Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Oct 22 13:33:55 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Nov 15 23:15:26 2022 +0100 [VGAMP/VGADDI] Be consistent in IOCTL_VIDEO_GET_CURRENT_MODE and IOCTL_VIDEO_SET_CURRENT_MODE As IOCTL_VIDEO_GET_CURRENT_MODE returns 2 as ModeIndex, wait for the same value in IOCTL_VIDEO_SET_CURRENT_MODE. Also change vgaddi to send this hardcoded value. vga_new also uses 2 as index for 640x480x16 --- win32ss/drivers/displays/vga/objects/screen.c | 2 +- win32ss/drivers/miniport/vga/vgamp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/drivers/displays/vga/objects/screen.c b/win32ss/drivers/displays/vga/objects/screen.c index 8c11ef0cebe..8cd4de9e576 100644 --- a/win32ss/drivers/displays/vga/objects/screen.c +++ b/win32ss/drivers/displays/vga/objects/screen.c @@ -139,7 +139,7 @@ BOOL InitVGA(PPDEV ppdev, BOOL bFirst) ppdev->sizeSurf.cx = 640; ppdev->sizeSurf.cy = 480; - ppdev->ModeNum = 12; + ppdev->ModeNum = 2; /* Set the mode that was requested */ if (EngDeviceIoControl(ppdev->KMDriver, diff --git a/win32ss/drivers/miniport/vga/vgamp.c b/win32ss/drivers/miniport/vga/vgamp.c index 4b892cc281e..a477b643342 100644 --- a/win32ss/drivers/miniport/vga/vgamp.c +++ b/win32ss/drivers/miniport/vga/vgamp.c @@ -545,7 +545,7 @@ BOOLEAN VGASetColorRegisters(IN PVIDEO_CLUT ColorLookUpTable, BOOLEAN VGASetCurrentMode(IN PVIDEO_MODE RequestedMode, OUT PSTATUS_BLOCK StatusBlock) { - if(RequestedMode->RequestedMode == 12) + if(RequestedMode->RequestedMode == 2) { InitVGAMode(); return TRUE;

2 years, 1 month

[reactos] 01/01: [BOOTDATA][NTUSER] Add UserIsIMMEnabled and use it (#4882)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2c6af0da4acbba9c254d… commit a2c6af0da4acbba9c254d003e9d9f4ea6e03ed63 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 15 17:10:06 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 15 17:10:06 2022 +0900 [BOOTDATA][NTUSER] Add UserIsIMMEnabled and use it (#4882) This PR enables SRVINFO_IMM32 also for non-CJK. You can disable this flag by setting zero to the LoadIMM registry value if you're non-CJK. CORE-11700 --- boot/bootdata/hivesft.inf | 2 +- win32ss/gdi/ntgdi/misc.h | 4 ++++ win32ss/user/ntuser/ime.c | 4 ++-- win32ss/user/ntuser/metric.c | 32 +++++++++++++++++++++++++++----- win32ss/user/ntuser/misc/registry.c | 30 ++++++++++++++++++++++++++++++ win32ss/user/ntuser/simplecall.c | 9 ++------- win32ss/user/ntuser/userfuncs.h | 3 +++ 7 files changed, 69 insertions(+), 15 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 1804c2d9d72..3bf5db168d8 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -512,7 +512,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontMapper",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\HotFix",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IME Compatibility",,0x00000012 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","LoadIMM",0x00010003,0 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","LoadIMM",0x00010003,1 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","LoadCTFIME",0x00010003,0 ; DOS Device ports diff --git a/win32ss/gdi/ntgdi/misc.h b/win32ss/gdi/ntgdi/misc.h index eb25a53467e..6757acce4c0 100644 --- a/win32ss/gdi/ntgdi/misc.h +++ b/win32ss/gdi/ntgdi/misc.h @@ -54,6 +54,10 @@ BOOL NTAPI RegReadDWORD(HKEY hkey, PWSTR pwszValue, PDWORD pdwData); +DWORD +NTAPI +RegGetSectionDWORD(LPCWSTR pszSection, LPWSTR pszValue, DWORD dwDefault); + VOID FASTCALL SetLastNtError( NTSTATUS Status); diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 62e71747f50..57d2e3f0839 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -562,7 +562,7 @@ DWORD FASTCALL UserBuildHimcList(PTHREADINFO pti, DWORD dwCount, HIMC *phList) } else { - for (pti = GetW32ThreadInfo()->ppi->ptiList; pti; pti = pti->ptiSibling) + for (pti = gptiCurrent->ppi->ptiList; pti; pti = pti->ptiSibling) { for (pIMC = pti->spDefaultImc; pIMC; pIMC = pIMC->pImcNext) { @@ -716,7 +716,7 @@ NtUserBuildHimcList(DWORD dwThreadId, DWORD dwCount, HIMC *phList, LPDWORD pdwCo if (dwThreadId == 0) { - pti = GetW32ThreadInfo(); + pti = gptiCurrent; } else if (dwThreadId == INVALID_THREAD_ID) { diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c index b9801486024..a72e1856edf 100644 --- a/win32ss/user/ntuser/metric.c +++ b/win32ss/user/ntuser/metric.c @@ -14,6 +14,26 @@ static BOOL Setup = FALSE; /* FUNCTIONS *****************************************************************/ +BOOL FASTCALL UserIsDBCSEnabled(VOID) +{ + return NLS_MB_CODE_PAGE_TAG; +} + +BOOL FASTCALL UserIsIMMEnabled(VOID) +{ + static WCHAR s_szLoadIMM[] = L"LoadIMM"; + + if (NLS_MB_CODE_PAGE_TAG) + return TRUE; + + return !!RegGetSectionDWORD(L"IMM", s_szLoadIMM, TRUE); +} + +BOOL FASTCALL UserIsCiceroEnabled(VOID) +{ + return FALSE; /* FIXME: Cicero is not supported yet */ +} + BOOL NTAPI InitMetrics(VOID) @@ -169,12 +189,14 @@ InitMetrics(VOID) piSysMet[90] = 0; #endif - /*gpsi->dwSRVIFlags |= SRVINFO_CICERO_ENABLED;*/ /* Cicero is not supported yet */ + if (UserIsDBCSEnabled()) + gpsi->dwSRVIFlags |= SRVINFO_DBCSENABLED; /* DBCS Support */ - if (NLS_MB_CODE_PAGE_TAG) /* Is the system multi-byte codepage? */ - { - gpsi->dwSRVIFlags |= (SRVINFO_DBCSENABLED | SRVINFO_IMM32); /* DBCS+IME Support */ - } + if (UserIsIMMEnabled()) + gpsi->dwSRVIFlags |= SRVINFO_IMM32; /* IME Support */ + + if (UserIsCiceroEnabled()) + gpsi->dwSRVIFlags |= SRVINFO_CICERO_ENABLED; /* Cicero support */ Setup = TRUE; diff --git a/win32ss/user/ntuser/misc/registry.c b/win32ss/user/ntuser/misc/registry.c index 0e03e791da4..2d7ca4a3d0b 100644 --- a/win32ss/user/ntuser/misc/registry.c +++ b/win32ss/user/ntuser/misc/registry.c @@ -155,6 +155,36 @@ RegReadDWORD(HKEY hkey, PWSTR pwszValue, PDWORD pdwData) return NT_SUCCESS(Status); } +NTSTATUS +NTAPI +RegOpenSectionKey( + LPCWSTR pszSection, + PHKEY phkey) +{ + WCHAR szKey[MAX_PATH] = + L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\"; + + RtlStringCchCatW(szKey, _countof(szKey), pszSection); + return RegOpenKey(szKey, phkey); +} + +DWORD +NTAPI +RegGetSectionDWORD(LPCWSTR pszSection, LPWSTR pszValue, DWORD dwDefault) +{ + HKEY hKey; + DWORD dwValue; + + if (NT_ERROR(RegOpenSectionKey(pszSection, &hKey))) + return dwDefault; + + if (!RegReadDWORD(hKey, pszValue, &dwValue)) + dwValue = dwDefault; + + ZwClose(hKey); + return dwValue; +} + _Success_(return!=FALSE) BOOL NTAPI diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index b0e1d86f1d0..a52d184fe20 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -124,16 +124,11 @@ NtUserCallNoParam(DWORD Routine) break; case NOPARAM_ROUTINE_UPDATEPERUSERIMMENABLING: - // TODO: This should also check the registry! - // see https://www.pctipsbox.com/fix-available-for-ie7-memory-leaks-on-xp-sp3/ for more information - if (NLS_MB_CODE_PAGE_TAG) - { + if (UserIsIMMEnabled()) gpsi->dwSRVIFlags |= SRVINFO_IMM32; - } else - { gpsi->dwSRVIFlags &= ~SRVINFO_IMM32; - } + Result = TRUE; // Always return TRUE. break; diff --git a/win32ss/user/ntuser/userfuncs.h b/win32ss/user/ntuser/userfuncs.h index f91058dd539..740607530a4 100644 --- a/win32ss/user/ntuser/userfuncs.h +++ b/win32ss/user/ntuser/userfuncs.h @@ -83,6 +83,9 @@ NTSTATUS FASTCALL InitSessionImpl(VOID); BOOL NTAPI InitMetrics(VOID); LONG NTAPI UserGetSystemMetrics(ULONG Index); +BOOL FASTCALL UserIsDBCSEnabled(VOID); +BOOL FASTCALL UserIsIMMEnabled(VOID); +BOOL FASTCALL UserIsCiceroEnabled(VOID); /*************** KEYBOARD.C ***************/

2 years, 1 month

[reactos] 01/01: [HALX86] HalpQueryInterface(): Debug log InterfaceType param (#4772)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba1ed89f91664db2f7f1c… commit ba1ed89f91664db2f7f1c4a8915a99b3b72e26d5 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Nov 15 00:04:04 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 15 02:04:04 2022 +0300 [HALX86] HalpQueryInterface(): Debug log InterfaceType param (#4772) This should help to find out which GUIDs are actually wanted. Based on CircularTriangle06's patch. CORE-11632 --- hal/halx86/acpi/halpnpdd.c | 22 +++++++++++++++++++++- hal/halx86/legacy/halpnpdd.c | 7 ++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/hal/halx86/acpi/halpnpdd.c b/hal/halx86/acpi/halpnpdd.c index 3f3d895cf2c..0dabbcc6f5b 100644 --- a/hal/halx86/acpi/halpnpdd.c +++ b/hal/halx86/acpi/halpnpdd.c @@ -9,6 +9,10 @@ /* INCLUDES *******************************************************************/ #include <hal.h> + +#include <initguid.h> +#include <wdmguid.h> + #define NDEBUG #include <debug.h> @@ -153,7 +157,23 @@ HalpQueryInterface(IN PDEVICE_OBJECT DeviceObject, IN PINTERFACE Interface, OUT PULONG Length) { - UNIMPLEMENTED; + if (IsEqualIID(InterfaceType, &GUID_ACPI_REGS_INTERFACE_STANDARD)) + { + DPRINT1("HalpQueryInterface(GUID_ACPI_REGS_INTERFACE_STANDARD) is UNIMPLEMENTED\n"); + } + else if (IsEqualIID(InterfaceType, &GUID_ACPI_PORT_RANGES_INTERFACE_STANDARD)) + { + DPRINT1("HalpQueryInterface(GUID_ACPI_PORT_RANGES_INTERFACE_STANDARD) is UNIMPLEMENTED\n"); + } + else + { + DPRINT1("HalpQueryInterface({%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}) is UNIMPLEMENTED\n", + InterfaceType->Data1, InterfaceType->Data2, InterfaceType->Data3, + InterfaceType->Data4[0], InterfaceType->Data4[1], + InterfaceType->Data4[2], InterfaceType->Data4[3], + InterfaceType->Data4[4], InterfaceType->Data4[5], + InterfaceType->Data4[6], InterfaceType->Data4[7]); + } return STATUS_NOT_SUPPORTED; } diff --git a/hal/halx86/legacy/halpnpdd.c b/hal/halx86/legacy/halpnpdd.c index b2c03f2e417..90e7d1294ae 100644 --- a/hal/halx86/legacy/halpnpdd.c +++ b/hal/halx86/legacy/halpnpdd.c @@ -145,7 +145,12 @@ HalpQueryInterface(IN PDEVICE_OBJECT DeviceObject, IN PINTERFACE Interface, OUT PULONG Length) { - UNIMPLEMENTED; + DPRINT1("HalpQueryInterface({%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}) is UNIMPLEMENTED\n", + InterfaceType->Data1, InterfaceType->Data2, InterfaceType->Data3, + InterfaceType->Data4[0], InterfaceType->Data4[1], + InterfaceType->Data4[2], InterfaceType->Data4[3], + InterfaceType->Data4[4], InterfaceType->Data4[5], + InterfaceType->Data4[6], InterfaceType->Data4[7]); return STATUS_NOT_SUPPORTED; }

2 years, 1 month

[reactos] 01/01: [NTFS] NtfsCreateFCB(): Check allocation result (#4795)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5efb6e3d972ada88f49c1… commit 5efb6e3d972ada88f49c1feb5cf65e4240ae7383 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Nov 14 23:28:33 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 15 01:28:33 2022 +0300 [NTFS] NtfsCreateFCB(): Check allocation result (#4795) --- drivers/filesystems/ntfs/fcb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/filesystems/ntfs/fcb.c b/drivers/filesystems/ntfs/fcb.c index 7badedba171..e63b73ee5f0 100644 --- a/drivers/filesystems/ntfs/fcb.c +++ b/drivers/filesystems/ntfs/fcb.c @@ -74,6 +74,11 @@ NtfsCreateFCB(PCWSTR FileName, ASSERT(Vcb->Identifier.Type == NTFS_TYPE_VCB); Fcb = ExAllocateFromNPagedLookasideList(&NtfsGlobalData->FcbLookasideList); + if (Fcb == NULL) + { + return NULL; + } + RtlZeroMemory(Fcb, sizeof(NTFS_FCB)); Fcb->Identifier.Type = NTFS_TYPE_FCB;

2 years, 1 month

[reactos] 01/01: [SHELL32] CDrivesFolder: Unhardcode pqcminfo->idCmdFirst value

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a09e9033983611a9485d0… commit a09e9033983611a9485d006948a3edf836927a7b Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Nov 8 17:52:04 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Nov 14 21:56:01 2022 +0300 [SHELL32] CDrivesFolder: Unhardcode pqcminfo->idCmdFirst value DFM_MERGECONTEXTMENU handler works better now. However there is difference between ours and Windows' menu building systems, which has to be fixed. Addendum to 64657051c3c. CORE-13841 CORE-18577 --- dll/win32/shell32/folders/CDrivesFolder.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 805bfee1ac0..bf0dde7c9d6 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -286,38 +286,52 @@ HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, GetVolumeInformationA(szDrive, NULL, 0, NULL, NULL, &dwFlags, NULL, 0); // custom command IDs +#if 0 // Disabled until our menu building system is fixed +#define CMDID_FORMAT 0 +#define CMDID_EJECT 1 +#define CMDID_DISCONNECT 2 +#else +/* FIXME: These IDs should start from 0, however there is difference + * between ours and Windows' menu building systems, which should be fixed. */ #define CMDID_FORMAT 1 #define CMDID_EJECT 2 #define CMDID_DISCONNECT 3 +#endif if (uMsg == DFM_MERGECONTEXTMENU) { QCMINFO *pqcminfo = (QCMINFO *)lParam; UINT idCmdFirst = pqcminfo->idCmdFirst; + UINT idCmd = 0; if (!(dwFlags & FILE_READ_ONLY_VOLUME) && nDriveType != DRIVE_REMOTE) { /* add separator and Format */ - UINT idCmd = idCmdFirst + CMDID_FORMAT; + idCmd = idCmdFirst + CMDID_FORMAT; _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, idCmd, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); } if (nDriveType == DRIVE_REMOVABLE || nDriveType == DRIVE_CDROM) { /* add separator and Eject */ - UINT idCmd = idCmdFirst + CMDID_EJECT; + idCmd = idCmdFirst + CMDID_EJECT; _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, idCmd, MFT_STRING, MAKEINTRESOURCEW(IDS_EJECT), MFS_ENABLED); } if (nDriveType == DRIVE_REMOTE) { /* add separator and Disconnect */ - UINT idCmd = idCmdFirst + CMDID_DISCONNECT; + idCmd = idCmdFirst + CMDID_DISCONNECT; _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, idCmd, MFT_STRING, MAKEINTRESOURCEW(IDS_DISCONNECT), MFS_ENABLED); } - pqcminfo->idCmdFirst += 3; + if (idCmd) +#if 0 // see FIXME above + pqcminfo->idCmdFirst = ++idCmd; +#else + pqcminfo->idCmdFirst = (idCmd + 2); +#endif } else if (uMsg == DFM_INVOKECOMMAND) {

2 years, 1 month

[reactos] 01/01: [IMM32_APITEST] Follow-up of #4876 (7355810)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2628309baf9f258fe71d0… commit 2628309baf9f258fe71d0029598b1fd307c7a2b6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 14 22:02:17 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Nov 14 22:02:17 2022 +0900 [IMM32_APITEST] Follow-up of #4876 (7355810) CORE-11700 --- .../rostests/apitests/imm32/ImmEnumInputContext.c | 26 +++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/modules/rostests/apitests/imm32/ImmEnumInputContext.c b/modules/rostests/apitests/imm32/ImmEnumInputContext.c index cc9cd1df233..f424bb7ac90 100644 --- a/modules/rostests/apitests/imm32/ImmEnumInputContext.c +++ b/modules/rostests/apitests/imm32/ImmEnumInputContext.c @@ -13,6 +13,7 @@ static INT s_nCounter = 0; static HIMC s_hImc1 = NULL; static HIMC s_hImc2 = NULL; static HIMC s_hImc3 = NULL; +static HIMC s_hImc4 = NULL; static BOOL CALLBACK ImcEnumProc(HIMC hImc, LPARAM lParam) @@ -42,23 +43,29 @@ ImcEnumProc(HIMC hImc, LPARAM lParam) break; case 5: ok_long((LONG)lParam, 0xDEADBEEF); + s_hImc3 = hImc; ok(hImc != s_hImc1, "hImc was %p, s_hImc1 was %p\n", hImc, s_hImc1); - ok(hImc != s_hImc2, "hImc was %p, s_hImc2 was %p\n", hImc, s_hImc2); break; case 6: ok_long((LONG)lParam, 0xBEEFCAFE); - ok(hImc != s_hImc1, "hImc was %p, s_hImc1 was %p\n", hImc, s_hImc1); - ok(hImc != s_hImc2, "hImc was %p, s_hImc2 was %p\n", hImc, s_hImc2); + ok(hImc == s_hImc3, "hImc was %p, s_hImc3 was %p\n", hImc, s_hImc3); break; case 7: ok_long((LONG)lParam, 0xDEADFACE); - ok(hImc != s_hImc1, "hImc was %p, s_hImc1 was %p\n", hImc, s_hImc1); - ok(hImc != s_hImc2, "hImc was %p, s_hImc2 was %p\n", hImc, s_hImc2); + ok(hImc == s_hImc3, "hImc was %p, s_hImc3 was %p\n", hImc, s_hImc3); break; case 8: ok_long((LONG)lParam, 0xDEADFACE); + ok(hImc == s_hImc4, "hImc was %p, s_hImc4 was %p\n", hImc, s_hImc4); + break; + case 9: + ok_long((LONG)lParam, 0xFEEDF00D); ok(hImc == s_hImc3, "hImc was %p, s_hImc3 was %p\n", hImc, s_hImc3); break; + case 10: + ok_long((LONG)lParam, 0xFEEDF00D); + ok(hImc == s_hImc1, "hImc was %p, s_hImc1 was %p\n", hImc, s_hImc1); + break; default: ok_long(0, 1); ok_int(0, 1); @@ -76,13 +83,16 @@ static DWORD WINAPI AnotherThreadFunc(LPVOID arg) ok_int(ImmEnumInputContext(GetCurrentThreadId(), ImcEnumProc, 0xBEEFCAFE), TRUE); ok_int(s_nCounter, 7); - s_hImc3 = ImmCreateContext(); + s_hImc4 = ImmCreateContext(); ok_int(ImmEnumInputContext(0, ImcEnumProc, 0xDEADFACE), TRUE); ok_int(s_nCounter, 9); - ok_int(ImmDestroyContext(s_hImc3), TRUE); - s_hImc3 = NULL; + ok_int(ImmDestroyContext(s_hImc4), TRUE); + s_hImc4 = NULL; + + ok_int(ImmEnumInputContext((DWORD)-1, ImcEnumProc, 0xFEEDF00D), TRUE); + ok_int(s_nCounter, 11); PostMessageW(s_hwnd, WM_COMMAND, IDYES, 0); return 0;

2 years, 1 month

[reactos] 01/01: [IMM32_APITEST] Add ImmEnumInputContext testcase (#4876)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73558102e778598f85d6e… commit 73558102e778598f85d6e9f21d6dcc12a6177681 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 14 18:01:42 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 14 18:01:42 2022 +0900 [IMM32_APITEST] Add ImmEnumInputContext testcase (#4876) Verify the IMM implementation. CORE-11700 --- modules/rostests/apitests/imm32/CMakeLists.txt | 1 + .../rostests/apitests/imm32/ImmEnumInputContext.c | 166 +++++++++++++++++++++ modules/rostests/apitests/imm32/testlist.c | 2 + 3 files changed, 169 insertions(+) diff --git a/modules/rostests/apitests/imm32/CMakeLists.txt b/modules/rostests/apitests/imm32/CMakeLists.txt index 9c6486a8508..0b428e03bbe 100644 --- a/modules/rostests/apitests/imm32/CMakeLists.txt +++ b/modules/rostests/apitests/imm32/CMakeLists.txt @@ -5,6 +5,7 @@ list(APPEND SOURCE clientimc.c himc.c imcc.c + ImmEnumInputContext.c ImmGetImeInfoEx.c ImmIsUIMessage.c JapanImeConvTestA.c diff --git a/modules/rostests/apitests/imm32/ImmEnumInputContext.c b/modules/rostests/apitests/imm32/ImmEnumInputContext.c new file mode 100644 index 00000000000..cc9cd1df233 --- /dev/null +++ b/modules/rostests/apitests/imm32/ImmEnumInputContext.c @@ -0,0 +1,166 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for ImmEnumInputContext + * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "precomp.h" +#include <windowsx.h> + +static HWND s_hwnd = NULL; +static INT s_nCounter = 0; +static HIMC s_hImc1 = NULL; +static HIMC s_hImc2 = NULL; +static HIMC s_hImc3 = NULL; + +static BOOL CALLBACK +ImcEnumProc(HIMC hImc, LPARAM lParam) +{ + trace("s_nCounter %d\n", s_nCounter); + switch (s_nCounter) + { + case 0: + ok_long((LONG)lParam, 0xDEADBEEF); + ok(hImc == s_hImc1, "hImc was %p, s_hImc1 was %p\n", hImc, s_hImc1); + break; + case 1: + ok_long((LONG)lParam, 0xDEADFACE); + ok(hImc == s_hImc1, "hImc was %p, s_hImc1 was %p\n", hImc, s_hImc1); + break; + case 2: + ok_long((LONG)lParam, 0xDEADFACE); + ok(hImc == s_hImc2, "hImc was %p, s_hImc2 was %p\n", hImc, s_hImc1); + break; + case 3: + ok_long((LONG)lParam, 0xBEEFCAFE); + ok(hImc == s_hImc1, "hImc was %p, s_hImc1 was %p\n", hImc, s_hImc1); + break; + case 4: + ok_long((LONG)lParam, 0xAC1DFACE); + ok(hImc == s_hImc1, "hImc was %p, s_hImc1 was %p\n", hImc, s_hImc1); + break; + case 5: + ok_long((LONG)lParam, 0xDEADBEEF); + ok(hImc != s_hImc1, "hImc was %p, s_hImc1 was %p\n", hImc, s_hImc1); + ok(hImc != s_hImc2, "hImc was %p, s_hImc2 was %p\n", hImc, s_hImc2); + break; + case 6: + ok_long((LONG)lParam, 0xBEEFCAFE); + ok(hImc != s_hImc1, "hImc was %p, s_hImc1 was %p\n", hImc, s_hImc1); + ok(hImc != s_hImc2, "hImc was %p, s_hImc2 was %p\n", hImc, s_hImc2); + break; + case 7: + ok_long((LONG)lParam, 0xDEADFACE); + ok(hImc != s_hImc1, "hImc was %p, s_hImc1 was %p\n", hImc, s_hImc1); + ok(hImc != s_hImc2, "hImc was %p, s_hImc2 was %p\n", hImc, s_hImc2); + break; + case 8: + ok_long((LONG)lParam, 0xDEADFACE); + ok(hImc == s_hImc3, "hImc was %p, s_hImc3 was %p\n", hImc, s_hImc3); + break; + default: + ok_long(0, 1); + ok_int(0, 1); + break; + } + ++s_nCounter; + return TRUE; +} + +static DWORD WINAPI AnotherThreadFunc(LPVOID arg) +{ + ok_int(ImmEnumInputContext(0, ImcEnumProc, 0xDEADBEEF), TRUE); + ok_int(s_nCounter, 6); + + ok_int(ImmEnumInputContext(GetCurrentThreadId(), ImcEnumProc, 0xBEEFCAFE), TRUE); + ok_int(s_nCounter, 7); + + s_hImc3 = ImmCreateContext(); + + ok_int(ImmEnumInputContext(0, ImcEnumProc, 0xDEADFACE), TRUE); + ok_int(s_nCounter, 9); + + ok_int(ImmDestroyContext(s_hImc3), TRUE); + s_hImc3 = NULL; + + PostMessageW(s_hwnd, WM_COMMAND, IDYES, 0); + return 0; +} + +/* WM_INITDIALOG */ +static BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) +{ + HANDLE hThread; + + s_hwnd = hwnd; + s_nCounter = 0; + + s_hImc1 = ImmGetContext(hwnd); + ok(s_hImc1 != NULL, "s_hImc1 was NULL\n"); + + ok_int(ImmEnumInputContext(0, ImcEnumProc, 0xDEADBEEF), TRUE); + ok_int(s_nCounter, 1); + + ok_int(ImmEnumInputContext(1, ImcEnumProc, 0xFEEDF00D), FALSE); + ok_int(s_nCounter, 1); + + s_hImc2 = ImmCreateContext(); + ok(s_hImc2 != NULL, "s_hImc1 was NULL\n"); + + ok_int(ImmEnumInputContext(0, ImcEnumProc, 0xDEADFACE), TRUE); + ok_int(s_nCounter, 3); + + ok_int(ImmDestroyContext(s_hImc2), TRUE); + s_hImc2 = NULL; + + ok_int(ImmEnumInputContext(0, ImcEnumProc, 0xBEEFCAFE), TRUE); + ok_int(s_nCounter, 4); + + ok_int(ImmEnumInputContext(GetCurrentThreadId(), ImcEnumProc, 0xAC1DFACE), TRUE); + ok_int(s_nCounter, 5); + + hThread = CreateThread(NULL, 0, AnotherThreadFunc, NULL, 0, NULL); + if (hThread == NULL) + { + skip("hThread was NULL\n"); + PostMessageW(hwnd, WM_COMMAND, IDNO, 0); + } + CloseHandle(hThread); + + return TRUE; +} + +/* WM_COMMAND */ +static void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) +{ + switch (id) + { + case IDOK: + case IDCANCEL: + case IDYES: + EndDialog(hwnd, id); + break; + } +} + +static INT_PTR CALLBACK +DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + HANDLE_MSG(hwnd, WM_INITDIALOG, OnInitDialog); + HANDLE_MSG(hwnd, WM_COMMAND, OnCommand); + } + return 0; +} + +START_TEST(ImmEnumInputContext) +{ + INT_PTR id; + id = DialogBoxW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(1), NULL, DialogProc); + if (id != IDYES) + { + skip("Tests skipped\n"); + } +} diff --git a/modules/rostests/apitests/imm32/testlist.c b/modules/rostests/apitests/imm32/testlist.c index b9c16be52cf..51005448c3d 100644 --- a/modules/rostests/apitests/imm32/testlist.c +++ b/modules/rostests/apitests/imm32/testlist.c @@ -5,6 +5,7 @@ extern void func_clientimc(void); extern void func_himc(void); extern void func_imcc(void); +extern void func_ImmEnumInputContext(void); extern void func_ImmGetImeInfoEx(void); extern void func_ImmIsUIMessage(void); extern void func_JapanImeConvTestA(void); @@ -15,6 +16,7 @@ const struct test winetest_testlist[] = { "clientimc", func_clientimc }, { "himc", func_himc }, { "imcc", func_imcc }, + { "ImmEnumInputContext", func_ImmEnumInputContext }, { "ImmGetImeInfoEx", func_ImmGetImeInfoEx }, { "ImmIsUIMessage", func_ImmIsUIMessage }, { "JapanImeConvTestA", func_JapanImeConvTestA },

2 years, 1 month

[reactos] 04/04: [SMSS] Fix three SmpLoadSubSystem bugs related to the SB_CREATE_SESSION callback.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dddbd5c5495a8a521e5b… commit 2dddbd5c5495a8a521e5b4addc0396fe2cde1f9f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 13 01:47:26 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 14 00:10:35 2022 +0100 [SMSS] Fix three SmpLoadSubSystem bugs related to the SB_CREATE_SESSION callback. This fixes starting the Windows 2000 POSIX subsystem in ReactOS. - The CreateSession pointer was initialized against the SbApiMsg variable, but it was the other SbApiMsg2 that was being initialized and sent through LPC. - Do not overwrite the MuSessionId (Terminal Services session ID) variable with the generated environment subsystem session ID from SmpAllocateSessionId(). - Actually initialize the SbApiMsg ApiNumber for the CreateSession LPC call. (dll\win32\kernel32\client\proc.c:3690) Retrying with: POSIX /P C:\ReactOS\system32\posix\ls.exe /C ls Breakpoint 1 hit csrsrv!CsrSbApiRequestThread+0x64: 001b:1000ac34 837dfc00 cmp dword ptr [ebp-4],0 kd> ??ReceiveMsg struct _SB_API_MSG +0x000 h : _PORT_MESSAGE +0x018 ConnectionInfo : _SB_CONNECTION_INFO +0x018 ApiNumber : 0xcccccccc (No matching name) +0x01c ReturnValue : 0n0 +0x020 u : <unnamed-tag> kd> p ... (base\system\smss\smsubsys.c:393) SMSS: SmpLoadSubSystem - NtRequestWaitReplyPort Failed with Status c0000002 for sessionid 2 ... <Retrying> ... (base\system\smss\smsubsys.c:393) SMSS: SmpLoadSubSystem - NtRequestWaitReplyPort Failed with Status c0000002 for sessionid 3 All those bugs could have been avoided *IF*, rather than (badly) duplicating its code, the existing SmpSbCreateSession() function had been used instead. - "Not sure these field mean what I think they do -- but clear them" ... ◔_◔ Those fields are related to the debug client interface (DbgUi) and session in case the subsystem being started is going to be debugged. These have nothing to do with the MuSessionId. Clarify this in the SB_CREATE_SESSION_MSG structure and in the SmpSbCreateSession() function. --- base/system/smss/smsbapi.c | 46 +++++++++++++++++++++-------------- base/system/smss/smss.h | 4 +-- base/system/smss/smsubsys.c | 31 +++++++++++------------ sdk/include/reactos/subsys/sm/smmsg.h | 6 ++--- 4 files changed, 47 insertions(+), 40 deletions(-) diff --git a/base/system/smss/smsbapi.c b/base/system/smss/smsbapi.c index e1b21f7bdb3..f8eafe45a3f 100644 --- a/base/system/smss/smsbapi.c +++ b/base/system/smss/smsbapi.c @@ -36,28 +36,28 @@ NTAPI SmpSbCreateSession(IN PVOID Reserved, IN PSMP_SUBSYSTEM OtherSubsystem, IN PRTL_USER_PROCESS_INFORMATION ProcessInformation, - IN ULONG MuSessionId, - IN PCLIENT_ID DbgClientId) + IN ULONG DbgSessionId, + IN PCLIENT_ID DbgUiClientId) { NTSTATUS Status; ULONG SubSystemType = ProcessInformation->ImageInformation.SubSystemType; - PSMP_SUBSYSTEM KnownSubsys; - SB_API_MSG SbApiMsg; + ULONG MuSessionId; ULONG SessionId; - PSB_CREATE_SESSION_MSG CreateSessionMsg; + PSMP_SUBSYSTEM KnownSubsys; + SB_API_MSG SbApiMsg = {0}; + PSB_CREATE_SESSION_MSG CreateSessionMsg = &SbApiMsg.u.CreateSession; /* Write out the create session message including its initial process */ - CreateSessionMsg = &SbApiMsg.u.CreateSession; CreateSessionMsg->ProcessInfo = *ProcessInformation; - CreateSessionMsg->MuSessionId = MuSessionId; - if (DbgClientId) + CreateSessionMsg->DbgSessionId = DbgSessionId; + if (DbgUiClientId) { - CreateSessionMsg->ClientId = *DbgClientId; + CreateSessionMsg->DbgUiClientId = *DbgUiClientId; } else { - CreateSessionMsg->ClientId.UniqueThread = NULL; - CreateSessionMsg->ClientId.UniqueProcess = NULL; + CreateSessionMsg->DbgUiClientId.UniqueThread = NULL; + CreateSessionMsg->DbgUiClientId.UniqueProcess = NULL; } /* Find a subsystem responsible for this session */ @@ -70,7 +70,7 @@ SmpSbCreateSession(IN PVOID Reserved, return STATUS_OBJECT_NAME_NOT_FOUND; } - /* Find the subsystem we have for this initial process */ + /* Find the subsystem suitable for this initial process */ KnownSubsys = SmpLocateKnownSubSysByType(MuSessionId, SubSystemType); if (KnownSubsys) { @@ -169,8 +169,13 @@ SmpSbCreateSession(IN PVOID Reserved, } #if 0 - /* This code handles debug applications, but it seems vestigial... */ - if ((*(ULONGLONG)&CreateSessionMsg.ClientId) && (SmpDbgSsLoaded)) + /* + * This code is part of the LPC-based legacy debugging support for native + * applications, implemented with the debug client interface (DbgUi) and + * debug subsystem (DbgSs). It is now vestigial since WinXP+ and is here + * for informational purposes only. + */ + if ((*(ULONGLONG)&CreateSessionMsg.DbgUiClientId) && SmpDbgSsLoaded) { Process = RtlAllocateHeap(SmpHeap, SmBaseTag, sizeof(SMP_PROCESS)); if (!Process) @@ -183,12 +188,17 @@ SmpSbCreateSession(IN PVOID Reserved, return STATUS_NO_MEMORY; } - Process->DbgClientId = CreateSessionMsg->ClientId; + Process->DbgUiClientId = CreateSessionMsg->DbgUiClientId; Process->ClientId = ProcessInformation->ClientId; InsertHeadList(&NativeProcessList, &Process->Entry); - DPRINT1("Native Debug App %lx.%lx\n", Process->ClientId.UniqueProcess, Process->ClientId.UniqueThread); - - Status = NtSetInformationProcess(ProcessInformation->ProcessHandle, 7, &SmpDebugPort, 4); + DPRINT1("Native Debug App %lx.%lx\n", + Process->ClientId.UniqueProcess, + Process->ClientId.UniqueThread); + + Status = NtSetInformationProcess(ProcessInformation->ProcessHandle, + ProcessDebugPort, + &SmpDebugPort, + sizeof(SmpDebugPort)); ASSERT(NT_SUCCESS(Status)); } #endif diff --git a/base/system/smss/smss.h b/base/system/smss/smss.h index fb63117cea5..4798f570d2f 100644 --- a/base/system/smss/smss.h +++ b/base/system/smss/smss.h @@ -168,8 +168,8 @@ SmpSbCreateSession( IN PVOID Reserved, IN PSMP_SUBSYSTEM OtherSubsystem, IN PRTL_USER_PROCESS_INFORMATION ProcessInformation, - IN ULONG MuSessionId, - IN PCLIENT_ID DbgClientId + IN ULONG DbgSessionId, + IN PCLIENT_ID DbgUiClientId ); /* smsessn.c */ diff --git a/base/system/smss/smsubsys.c b/base/system/smss/smsubsys.c index 1d6738c8237..40bcfa946f6 100644 --- a/base/system/smss/smsubsys.c +++ b/base/system/smss/smsubsys.c @@ -145,7 +145,7 @@ SmpLoadSubSystem(IN PUNICODE_STRING FileName, PSMP_SUBSYSTEM Subsystem, NewSubsystem, KnownSubsystem = NULL; HANDLE SubSysProcessId; NTSTATUS Status = STATUS_SUCCESS; - SB_API_MSG SbApiMsg, SbApiMsg2; + SB_API_MSG SbApiMsg; RTL_USER_PROCESS_INFORMATION ProcessInformation; LARGE_INTEGER Timeout; PVOID State; @@ -316,13 +316,10 @@ SmpLoadSubSystem(IN PUNICODE_STRING FileName, else { /* This is the POSIX or OS/2 subsystem process, copy its information */ - RtlCopyMemory(&CreateSession->ProcessInfo, - &ProcessInformation, - sizeof(CreateSession->ProcessInfo)); + CreateSession->ProcessInfo = ProcessInformation; - /* Not sure these field mean what I think they do -- but clear them */ - *(PULONGLONG)&CreateSession->ClientId = 0; - CreateSession->MuSessionId = 0; + CreateSession->DbgSessionId = 0; + *(PULONGLONG)&CreateSession->DbgUiClientId = 0; /* This should find CSRSS because they are POSIX or OS/2 subsystems */ Subsystem = SmpLocateKnownSubSysByType(MuSessionId, @@ -372,25 +369,25 @@ SmpLoadSubSystem(IN PUNICODE_STRING FileName, } /* Allocate an internal Session ID for this subsystem */ - MuSessionId = SmpAllocateSessionId(Subsystem, 0); - CreateSession->SessionId = MuSessionId; + CreateSession->SessionId = SmpAllocateSessionId(Subsystem, NULL); /* Send the create session message to the subsystem */ - SbApiMsg2.ReturnValue = STATUS_SUCCESS; - SbApiMsg2.h.u2.ZeroInit = 0; - SbApiMsg2.h.u1.s1.DataLength = sizeof(SB_CREATE_SESSION_MSG) + 8; - SbApiMsg2.h.u1.s1.TotalLength = sizeof(SB_API_MSG); + SbApiMsg.ReturnValue = STATUS_SUCCESS; + SbApiMsg.h.u2.ZeroInit = 0; + SbApiMsg.h.u1.s1.DataLength = sizeof(SB_CREATE_SESSION_MSG) + 8; + SbApiMsg.h.u1.s1.TotalLength = sizeof(SB_API_MSG); + SbApiMsg.ApiNumber = SbpCreateSession; Status = NtRequestWaitReplyPort(Subsystem->SbApiPort, - &SbApiMsg2.h, - &SbApiMsg2.h); - if (NT_SUCCESS(Status)) Status = SbApiMsg2.ReturnValue; + &SbApiMsg.h, + &SbApiMsg.h); + if (NT_SUCCESS(Status)) Status = SbApiMsg.ReturnValue; if (!NT_SUCCESS(Status)) { /* Delete the session and handle failure if the LPC call failed */ SmpDeleteSession(CreateSession->SessionId); DPRINT1("SMSS: SmpLoadSubSystem - NtRequestWaitReplyPort Failed with Status %lx for sessionid %lu\n", Status, - CreateSession->SessionId); + MuSessionId); goto Quickie; } } diff --git a/sdk/include/reactos/subsys/sm/smmsg.h b/sdk/include/reactos/subsys/sm/smmsg.h index ada3ae670bc..50601e38409 100644 --- a/sdk/include/reactos/subsys/sm/smmsg.h +++ b/sdk/include/reactos/subsys/sm/smmsg.h @@ -159,9 +159,9 @@ typedef struct _SB_CREATE_SESSION_MSG { ULONG SessionId; RTL_USER_PROCESS_INFORMATION ProcessInfo; - PVOID Unknown; - ULONG MuSessionId; - CLIENT_ID ClientId; + PVOID Reserved; + ULONG DbgSessionId; + CLIENT_ID DbgUiClientId; } SB_CREATE_SESSION_MSG, *PSB_CREATE_SESSION_MSG; #ifndef _WIN64 C_ASSERT(sizeof(SB_CREATE_SESSION_MSG) == 0x58);

2 years, 1 month

[reactos] 03/04: [SMSS] Improve comments/code/some DPRINTs. Reorganize smss.h header.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f43ce465663f188d1ae0b… commit f43ce465663f188d1ae0b37ad7db9f8e7145a3d2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 12 01:57:56 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 14 00:10:35 2022 +0100 [SMSS] Improve comments/code/some DPRINTs. Reorganize smss.h header. --- base/system/smss/sminit.c | 29 +++--- base/system/smss/smloop.c | 10 +- base/system/smss/smsessn.c | 8 +- base/system/smss/smss.c | 44 ++++----- base/system/smss/smss.h | 235 ++++++++++++++++++++++++-------------------- base/system/smss/smsubsys.c | 8 +- base/system/smss/smutil.c | 6 +- sdk/lib/smlib/smclient.c | 6 +- 8 files changed, 180 insertions(+), 166 deletions(-) diff --git a/base/system/smss/sminit.c b/base/system/smss/sminit.c index 03743dda4b6..bba8faf7cbe 100644 --- a/base/system/smss/sminit.c +++ b/base/system/smss/sminit.c @@ -1282,14 +1282,14 @@ SmpInitializeDosDevices(VOID) PSMP_REGISTRY_VALUE RegEntry; SECURITY_DESCRIPTOR_CONTROL OldFlag = 0; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING DestinationString; + UNICODE_STRING GlobalName; HANDLE DirHandle; PLIST_ENTRY NextEntry, Head; - /* Open the GLOBAL?? directory */ - RtlInitUnicodeString(&DestinationString, L"\\??"); + /* Open the \GLOBAL?? directory */ + RtlInitUnicodeString(&GlobalName, L"\\??"); InitializeObjectAttributes(&ObjectAttributes, - &DestinationString, + &GlobalName, OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_PERMANENT, NULL, NULL); @@ -1299,7 +1299,7 @@ SmpInitializeDosDevices(VOID) if (!NT_SUCCESS(Status)) { DPRINT1("SMSS: Unable to open %wZ directory - Status == %lx\n", - &DestinationString, Status); + &GlobalName, Status); return Status; } @@ -1426,7 +1426,7 @@ SmpInitializeKnownDllsInternal(IN PUNICODE_STRING Directory, IN PUNICODE_STRING Path) { HANDLE DirFileHandle, DirHandle, SectionHandle, FileHandle, LinkHandle; - UNICODE_STRING NtPath, DestinationString; + UNICODE_STRING NtPath, SymLinkName; OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status, Status1; PLIST_ENTRY NextEntry; @@ -1499,9 +1499,9 @@ SmpInitializeKnownDllsInternal(IN PUNICODE_STRING Directory, } /* Create a symbolic link to the directory in the object manager */ - RtlInitUnicodeString(&DestinationString, L"KnownDllPath"); + RtlInitUnicodeString(&SymLinkName, L"KnownDllPath"); InitializeObjectAttributes(&ObjectAttributes, - &DestinationString, + &SymLinkName, OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_PERMANENT, DirHandle, SmpPrimarySecurityDescriptor); @@ -1518,7 +1518,7 @@ SmpInitializeKnownDllsInternal(IN PUNICODE_STRING Directory, { /* It wasn't, so bail out since the OS needs it to exist */ DPRINT1("SMSS: Unable to create %wZ symbolic link - Status == %lx\n", - &DestinationString, Status); + &SymLinkName, Status); LinkHandle = NULL; goto Quickie; } @@ -1653,12 +1653,12 @@ SmpInitializeKnownDlls(VOID) { NTSTATUS Status; PSMP_REGISTRY_VALUE RegEntry; - UNICODE_STRING DestinationString; + UNICODE_STRING KnownDllsName; PLIST_ENTRY Head, NextEntry; /* Call the internal function */ - RtlInitUnicodeString(&DestinationString, L"\\KnownDlls"); - Status = SmpInitializeKnownDllsInternal(&DestinationString, &SmpKnownDllPath); + RtlInitUnicodeString(&KnownDllsName, L"\\KnownDlls"); + Status = SmpInitializeKnownDllsInternal(&KnownDllsName, &SmpKnownDllPath); /* Wipe out the list regardless of success */ Head = &SmpKnownDllsList; @@ -2268,6 +2268,7 @@ SmpLoadDataFromRegistry(OUT PUNICODE_STRING InitialCommand) InitializeListHead(&SmpSubSystemsToLoad); InitializeListHead(&SmpSubSystemsToDefer); InitializeListHead(&SmpExecuteList); + SmpPagingFileInitialize(); /* Initialize the SMSS environment */ @@ -2479,7 +2480,7 @@ SmpInit(IN PUNICODE_STRING InitialCommand, /* Initialize session parameters */ SmpNextSessionId = 1; - SmpNextSessionIdScanMode = 0; + SmpNextSessionIdScanMode = FALSE; SmpDbgSsLoaded = FALSE; /* Create the initial security descriptors */ @@ -2557,7 +2558,7 @@ SmpInit(IN PUNICODE_STRING InitialCommand, { /* Autochk should've run now. Set the event and save the CSRSS handle */ *ProcessHandle = SmpWindowsSubSysProcess; - NtSetEvent(EventHandle, 0); + NtSetEvent(EventHandle, NULL); NtClose(EventHandle); } diff --git a/base/system/smss/smloop.c b/base/system/smss/smloop.c index ce5707bff73..8913c56477c 100644 --- a/base/system/smss/smloop.c +++ b/base/system/smss/smloop.c @@ -17,10 +17,10 @@ typedef struct _SMP_CLIENT_CONTEXT { - PVOID Subsystem; + PSMP_SUBSYSTEM Subsystem; HANDLE ProcessHandle; HANDLE PortHandle; - ULONG dword10; + PVOID Reserved; } SMP_CLIENT_CONTEXT, *PSMP_CLIENT_CONTEXT; typedef @@ -277,7 +277,7 @@ SmpHandleConnectionRequest(IN HANDLE SmApiPort, HANDLE PortHandle, ProcessHandle; ULONG SessionId; UNICODE_STRING SubsystemPort; - SMP_CLIENT_CONTEXT *ClientContext; + PSMP_CLIENT_CONTEXT ClientContext; NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; REMOTE_PORT_VIEW PortView; @@ -343,13 +343,13 @@ SmpHandleConnectionRequest(IN HANDLE SmApiPort, { ClientContext->ProcessHandle = ProcessHandle; ClientContext->Subsystem = CidSubsystem; - ClientContext->dword10 = 0; + ClientContext->Reserved = NULL; ClientContext->PortHandle = NULL; } else { /* Failed to allocate a client context, so reject the connection */ - DPRINT1("Rejecting connectiond due to lack of memory\n"); + DPRINT1("Rejecting connection due to lack of memory\n"); Accept = FALSE; } } diff --git a/base/system/smss/smsessn.c b/base/system/smss/smsessn.c index 8b3aed81e78..b999c2aaaa9 100644 --- a/base/system/smss/smsessn.c +++ b/base/system/smss/smsessn.c @@ -26,7 +26,7 @@ typedef struct _SMP_SESSION RTL_CRITICAL_SECTION SmpSessionListLock; LIST_ENTRY SmpSessionListHead; ULONG SmpNextSessionId; -ULONG SmpNextSessionIdScanMode; +BOOLEAN SmpNextSessionIdScanMode; BOOLEAN SmpDbgSsLoaded; HANDLE SmpSessionsObjectDirectory; @@ -134,13 +134,13 @@ SmpAllocateSessionId(IN PSMP_SUBSYSTEM Subsystem, if (SmpNextSessionIdScanMode) { /* Break if it happened */ - DbgPrint("SMSS: SessionId's Wrapped\n"); - DbgBreakPoint(); + UNIMPLEMENTED_DBGBREAK("SMSS: SessionId's Wrapped\n"); } else { /* Detect it for next time */ - if (!SmpNextSessionId) SmpNextSessionIdScanMode = 1; + if (!SmpNextSessionId) + SmpNextSessionIdScanMode = TRUE; } /* Allocate a session structure */ diff --git a/base/system/smss/smss.c b/base/system/smss/smss.c index d568becc6dc..ddbe409eb04 100644 --- a/base/system/smss/smss.c +++ b/base/system/smss/smss.c @@ -65,7 +65,7 @@ SmpExecuteImage(IN PUNICODE_STRING FileName, } /* Set the size field as required */ - ProcessInfo->Size = sizeof(RTL_USER_PROCESS_INFORMATION); + ProcessInfo->Size = sizeof(*ProcessInfo); /* Check if the debug flag was requested */ if (Flags & SMP_DEBUG_FLAG) @@ -88,7 +88,7 @@ SmpExecuteImage(IN PUNICODE_STRING FileName, /* And always force NX for anything that SMSS launches */ ProcessParameters->Flags |= RTL_USER_PROCESS_PARAMETERS_NX; - /* Now create the process */ + /* Now create the process in suspended state */ Status = RtlCreateUserProcess(FileName, OBJ_CASE_INSENSITIVE, ProcessParameters, @@ -134,7 +134,7 @@ SmpExecuteImage(IN PUNICODE_STRING FileName, /* This image is invalid, so kill it, close our handles, and fail */ Status = STATUS_INVALID_IMAGE_FORMAT; NtTerminateProcess(ProcessInfo->ProcessHandle, Status); - NtWaitForSingleObject(ProcessInfo->ThreadHandle, 0, 0); + NtWaitForSingleObject(ProcessInfo->ThreadHandle, FALSE, NULL); NtClose(ProcessInfo->ThreadHandle); NtClose(ProcessInfo->ProcessHandle); DPRINT1("SMSS: Not an NT image - %wZ\n", FileName); @@ -255,7 +255,7 @@ SmpExecuteCommand(IN PUNICODE_STRING CommandLine, } else { - /* An actual image name was present -- execute it */ + /* An actual image name was present, execute it */ Status = SmpExecuteImage(&FileName, &Directory, CommandLine, @@ -265,7 +265,7 @@ SmpExecuteCommand(IN PUNICODE_STRING CommandLine, } /* Free all the token parameters */ - if (FileName.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, FileName.Buffer); + if (FileName.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, FileName.Buffer); if (Directory.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Directory.Buffer); if (Arguments.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Arguments.Buffer); @@ -287,7 +287,7 @@ SmpExecuteInitialCommand(IN ULONG MuSessionId, { NTSTATUS Status; RTL_USER_PROCESS_INFORMATION ProcessInfo; - UNICODE_STRING Arguments, ImageFileDirectory, ImageFileName; + UNICODE_STRING Arguments, Directory, FileName; ULONG Flags = 0; /* Check if we haven't yet connected to ourselves */ @@ -305,14 +305,14 @@ SmpExecuteInitialCommand(IN ULONG MuSessionId, /* Parse the initial command line */ Status = SmpParseCommandLine(InitialCommand, &Flags, - &ImageFileName, - &ImageFileDirectory, + &FileName, + &Directory, &Arguments); if (Flags & SMP_INVALID_PATH) { /* Fail if it doesn't exist */ - DPRINT1("SMSS: Initial command image (%wZ) not found\n", &ImageFileName); - if (ImageFileName.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, ImageFileName.Buffer); + DPRINT1("SMSS: Initial command image (%wZ) not found\n", &FileName); + if (FileName.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, FileName.Buffer); return STATUS_OBJECT_NAME_NOT_FOUND; } @@ -324,23 +324,17 @@ SmpExecuteInitialCommand(IN ULONG MuSessionId, return Status; } - /* Execute the initial command -- but defer its full execution */ - Status = SmpExecuteImage(&ImageFileName, - &ImageFileDirectory, + /* Execute the initial command, but defer its full execution */ + Status = SmpExecuteImage(&FileName, + &Directory, InitialCommand, MuSessionId, SMP_DEFERRED_FLAG, &ProcessInfo); - /* Free any buffers we had lying around */ - if (ImageFileName.Buffer) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, ImageFileName.Buffer); - } - if (ImageFileDirectory.Buffer) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, ImageFileDirectory.Buffer); - } + /* Free all the token parameters */ + if (FileName.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, FileName.Buffer); + if (Directory.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Directory.Buffer); if (Arguments.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Arguments.Buffer); /* Bail out if we couldn't execute the initial command */ @@ -409,7 +403,7 @@ LONG SmpUnhandledExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo) { ULONG_PTR Parameters[4]; - UNICODE_STRING DestinationString; + UNICODE_STRING ErrorString; /* Print and breakpoint into the debugger */ DbgPrint("SMSS: Unhandled exception - Status == %x IP == %p\n", @@ -421,8 +415,8 @@ SmpUnhandledExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo) DbgBreakPoint(); /* Build the hard error and terminate */ - RtlInitUnicodeString(&DestinationString, L"Unhandled Exception in Session Manager"); - Parameters[0] = (ULONG_PTR)&DestinationString; + RtlInitUnicodeString(&ErrorString, L"Unhandled Exception in Session Manager"); + Parameters[0] = (ULONG_PTR)&ErrorString; Parameters[1] = ExceptionInfo->ExceptionRecord->ExceptionCode; Parameters[2] = (ULONG_PTR)ExceptionInfo->ExceptionRecord->ExceptionAddress; Parameters[3] = (ULONG_PTR)ExceptionInfo->ContextRecord; diff --git a/base/system/smss/smss.h b/base/system/smss/smss.h index 46f8dd18f87..fb63117cea5 100644 --- a/base/system/smss/smss.h +++ b/base/system/smss/smss.h @@ -6,10 +6,13 @@ * PROGRAMMERS: Alex Ionescu */ -/* DEPENDENCIES ***************************************************************/ #ifndef _SM_ #define _SM_ +#pragma once + +/* DEPENDENCIES ***************************************************************/ + #include <stdio.h> /* Native Headers */ @@ -19,17 +22,17 @@ #include <winreg.h> #define NTOS_MODE_USER -#include <ndk/iofuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/rtlfuncs.h> #include <ndk/cmfuncs.h> #include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/lpcfuncs.h> #include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> #include <ndk/psfuncs.h> -#include <ndk/lpcfuncs.h> +#include <ndk/rtlfuncs.h> #include <ndk/setypes.h> #include <ndk/umfuncs.h> -#include <ndk/kefuncs.h> #include <ntstrsafe.h> @@ -78,7 +81,7 @@ extern LIST_ENTRY SmpKnownSubSysHead; extern RTL_CRITICAL_SECTION SmpSessionListLock; extern LIST_ENTRY SmpSessionListHead; extern ULONG SmpNextSessionId; -extern ULONG SmpNextSessionIdScanMode; +extern BOOLEAN SmpNextSessionIdScanMode; extern BOOLEAN SmpDbgSsLoaded; extern HANDLE SmpWindowsSubSysProcess; extern HANDLE SmpSessionsObjectDirectory; @@ -100,139 +103,153 @@ extern BOOLEAN SmpDebug; /* FUNCTIONS ******************************************************************/ -NTSTATUS +/* crashdmp.c */ + +BOOLEAN NTAPI -SmpTerminate( - IN PULONG_PTR Parameters, - IN ULONG ParameterMask, - IN ULONG ParameterCount +SmpCheckForCrashDump( + IN PUNICODE_STRING FileName ); -NTSTATUS +/* pagefile.c */ + +VOID NTAPI -SmpCreateSecurityDescriptors( - IN BOOLEAN InitialCall +SmpPagingFileInitialize( + VOID ); NTSTATUS NTAPI -SmpInit( - IN PUNICODE_STRING InitialCommand, - OUT PHANDLE ProcessHandle +SmpCreatePagingFileDescriptor( + IN PUNICODE_STRING PageFileToken ); NTSTATUS NTAPI -SmpAcquirePrivilege( - IN ULONG Privilege, - OUT PVOID *PrivilegeStat +SmpCreatePagingFiles( + VOID ); +/* sminit.c */ + VOID NTAPI -SmpReleasePrivilege( - IN PVOID State +SmpTranslateSystemPartitionInformation( + VOID +); + +NTSTATUS +NTAPI +SmpCreateSecurityDescriptors( + IN BOOLEAN InitialCall +); + +NTSTATUS +NTAPI +SmpInit( + IN PUNICODE_STRING InitialCommand, + OUT PHANDLE ProcessHandle ); +/* smloop.c */ + ULONG NTAPI SmpApiLoop( IN PVOID Parameter ); +/* smsbapi.c */ + NTSTATUS NTAPI -SmpExecuteCommand( - IN PUNICODE_STRING CommandLine, +SmpSbCreateSession( + IN PVOID Reserved, + IN PSMP_SUBSYSTEM OtherSubsystem, + IN PRTL_USER_PROCESS_INFORMATION ProcessInformation, IN ULONG MuSessionId, - OUT PHANDLE ProcessId, - IN ULONG Flags + IN PCLIENT_ID DbgClientId ); -NTSTATUS +/* smsessn.c */ + +BOOLEAN NTAPI -SmpLoadSubSystemsForMuSession( - IN PULONG MuSessionId, - OUT PHANDLE ProcessId, - IN PUNICODE_STRING InitialCommand +SmpCheckDuplicateMuSessionId( + IN ULONG MuSessionId ); VOID NTAPI -SmpPagingFileInitialize( - VOID +SmpDeleteSession( + IN ULONG SessionId ); -NTSTATUS +ULONG NTAPI -SmpCreatePagingFileDescriptor( - IN PUNICODE_STRING PageFileToken +SmpAllocateSessionId( + IN PSMP_SUBSYSTEM Subsystem, + IN PSMP_SUBSYSTEM OtherSubsystem ); NTSTATUS NTAPI -SmpCreatePagingFiles( - VOID +SmpGetProcessMuSessionId( + IN HANDLE ProcessHandle, + OUT PULONG SessionId ); NTSTATUS NTAPI -SmpParseCommandLine( - IN PUNICODE_STRING CommandLine, - OUT PULONG Flags, - OUT PUNICODE_STRING FileName, - OUT PUNICODE_STRING Directory, - OUT PUNICODE_STRING Arguments +SmpSetProcessMuSessionId( + IN HANDLE ProcessHandle, + IN ULONG SessionId ); +/* smss.c */ + NTSTATUS NTAPI -SmpLoadSubSystem( +SmpExecuteImage( IN PUNICODE_STRING FileName, IN PUNICODE_STRING Directory, IN PUNICODE_STRING CommandLine, IN ULONG MuSessionId, - OUT PHANDLE ProcessId, - IN ULONG Flags + IN ULONG Flags, + IN PRTL_USER_PROCESS_INFORMATION ProcessInformation ); NTSTATUS NTAPI -SmpSetProcessMuSessionId( - IN HANDLE ProcessHandle, - IN ULONG SessionId -); - -BOOLEAN -NTAPI -SmpQueryRegistrySosOption( - VOID +SmpExecuteCommand( + IN PUNICODE_STRING CommandLine, + IN ULONG MuSessionId, + OUT PHANDLE ProcessId, + IN ULONG Flags ); -BOOLEAN +NTSTATUS NTAPI -SmpSaveAndClearBootStatusData( - OUT PBOOLEAN BootOkay, - OUT PBOOLEAN ShutdownOkay -); +SmpExecuteInitialCommand(IN ULONG MuSessionId, + IN PUNICODE_STRING InitialCommand, + IN HANDLE InitialCommandProcess, + OUT PHANDLE ReturnPid); -VOID +NTSTATUS NTAPI -SmpRestoreBootStatusData( - IN BOOLEAN BootOkay, - IN BOOLEAN ShutdownOkay +SmpTerminate( + IN PULONG_PTR Parameters, + IN ULONG ParameterMask, + IN ULONG ParameterCount ); -BOOLEAN -NTAPI -SmpCheckForCrashDump( - IN PUNICODE_STRING FileName -); +/* smsubsys.c */ VOID NTAPI -SmpTranslateSystemPartitionInformation( - VOID +SmpDereferenceSubsystem( + IN PSMP_SUBSYSTEM SubSystem ); PSMP_SUBSYSTEM @@ -250,62 +267,66 @@ SmpLocateKnownSubSysByType( NTSTATUS NTAPI -SmpGetProcessMuSessionId( - IN HANDLE ProcessHandle, - OUT PULONG SessionId +SmpLoadSubSystem( + IN PUNICODE_STRING FileName, + IN PUNICODE_STRING Directory, + IN PUNICODE_STRING CommandLine, + IN ULONG MuSessionId, + OUT PHANDLE ProcessId, + IN ULONG Flags ); -VOID +NTSTATUS NTAPI -SmpDereferenceSubsystem( - IN PSMP_SUBSYSTEM SubSystem +SmpLoadSubSystemsForMuSession( + IN PULONG MuSessionId, + OUT PHANDLE ProcessId, + IN PUNICODE_STRING InitialCommand ); +/* smutil.c */ + NTSTATUS NTAPI -SmpSbCreateSession( - IN PVOID Reserved, - IN PSMP_SUBSYSTEM OtherSubsystem, - IN PRTL_USER_PROCESS_INFORMATION ProcessInformation, - IN ULONG MuSessionId, - IN PCLIENT_ID DbgClientId +SmpAcquirePrivilege( + IN ULONG Privilege, + OUT PVOID *PrivilegeStat ); -ULONG +VOID NTAPI -SmpAllocateSessionId( - IN PSMP_SUBSYSTEM Subsystem, - IN PSMP_SUBSYSTEM OtherSubsystem +SmpReleasePrivilege( + IN PVOID State ); -VOID +NTSTATUS NTAPI -SmpDeleteSession( - IN ULONG SessionId +SmpParseCommandLine( + IN PUNICODE_STRING CommandLine, + OUT PULONG Flags, + OUT PUNICODE_STRING FileName, + OUT PUNICODE_STRING Directory, + OUT PUNICODE_STRING Arguments ); BOOLEAN NTAPI -SmpCheckDuplicateMuSessionId( - IN ULONG MuSessionId +SmpQueryRegistrySosOption( + VOID ); -NTSTATUS +BOOLEAN NTAPI -SmpExecuteInitialCommand(IN ULONG MuSessionId, - IN PUNICODE_STRING InitialCommand, - IN HANDLE InitialCommandProcess, - OUT PHANDLE ReturnPid); +SmpSaveAndClearBootStatusData( + OUT PBOOLEAN BootOkay, + OUT PBOOLEAN ShutdownOkay +); -NTSTATUS +VOID NTAPI -SmpExecuteImage( - IN PUNICODE_STRING FileName, - IN PUNICODE_STRING Directory, - IN PUNICODE_STRING CommandLine, - IN ULONG MuSessionId, - IN ULONG Flags, - IN PRTL_USER_PROCESS_INFORMATION ProcessInformation +SmpRestoreBootStatusData( + IN BOOLEAN BootOkay, + IN BOOLEAN ShutdownOkay ); #endif /* _SM_ */ diff --git a/base/system/smss/smsubsys.c b/base/system/smss/smsubsys.c index ecae4cb1db0..1d6738c8237 100644 --- a/base/system/smss/smsubsys.c +++ b/base/system/smss/smsubsys.c @@ -87,7 +87,7 @@ SmpLocateKnownSubSysByCid(IN PCLIENT_ID ClientId) break; } - /* Reset the current pointer and keep earching */ + /* Reset the current pointer and keep searching */ Subsystem = NULL; NextEntry = NextEntry->Flink; } @@ -123,7 +123,7 @@ SmpLocateKnownSubSysByType(IN ULONG MuSessionId, break; } - /* Reset the current pointer and keep earching */ + /* Reset the current pointer and keep searching */ Subsystem = NULL; NextEntry = NextEntry->Flink; } @@ -499,7 +499,7 @@ Quickie2: if (!NT_SUCCESS(Status)) { RemoveEntryList(&NewSubsystem->Entry); - NtSetEvent(NewSubsystem->Event, 0); + NtSetEvent(NewSubsystem->Event, NULL); SmpDereferenceSubsystem(NewSubsystem); } @@ -619,7 +619,7 @@ SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId, } if (!NT_SUCCESS(Status)) { - DbgPrint("SMSS: Subsystem execute failed (%wZ)\n", &RegEntry->Value); + DPRINT1("SMSS: Subsystem execute failed (%wZ)\n", &RegEntry->Value); return Status; } diff --git a/base/system/smss/smutil.c b/base/system/smss/smutil.c index 8b61ab37813..7b1c7c9df1b 100644 --- a/base/system/smss/smutil.c +++ b/base/system/smss/smutil.c @@ -173,7 +173,7 @@ SmpParseToken(IN PUNICODE_STRING Input, Length = 0; while (Length < InputLength) { - if (*p > L' ' ) break; + if (*p > L' ') break; ++p; Length += sizeof(WCHAR); } @@ -191,7 +191,7 @@ SmpParseToken(IN PUNICODE_STRING Input, pp = p; while (Length < InputLength) { - if (*pp <= L' ' ) break; + if (*pp <= L' ') break; ++pp; Length += sizeof(WCHAR); } @@ -200,7 +200,7 @@ SmpParseToken(IN PUNICODE_STRING Input, TokenLength = (ULONG_PTR)pp - (ULONG_PTR)p; while (Length < InputLength) { - if (*pp > L' ' ) break; + if (*pp > L' ') break; ++pp; Length += sizeof(WCHAR); } diff --git a/sdk/lib/smlib/smclient.c b/sdk/lib/smlib/smclient.c index 440ff4fe2e0..ff765898639 100644 --- a/sdk/lib/smlib/smclient.c +++ b/sdk/lib/smlib/smclient.c @@ -280,9 +280,7 @@ SmExecPgm( #endif /* Set the message data */ - RtlCopyMemory(&ExecPgm->ProcessInformation, - ProcessInformation, - sizeof(ExecPgm->ProcessInformation)); + ExecPgm->ProcessInformation = *ProcessInformation; ExecPgm->DebugFlag = DebugFlag; /* Send the message and wait for a reply */ @@ -420,7 +418,7 @@ SmStartCsr( SmApiMsg.ApiNumber = SmpStartCsrApi; Status = SmSendMsgToSm(SmApiPort, &SmApiMsg); - /* Give back informations to caller */ + /* Give back information to caller */ *pMuSessionId = StartCsr->MuSessionId; *pWindowsSubSysProcessId = StartCsr->WindowsSubSysProcessId; *pInitialCommandProcessId = StartCsr->SmpInitialCommandProcessId;

2 years, 1 month

[reactos] 02/04: [SMSS][CSRSRV] Undefine CreateProcess symbol. Name the union inside SB_API_MSG.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06a0451415221a84c5f17… commit 06a0451415221a84c5f17443ab7edb8cf132b4d0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 11 21:18:28 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 14 00:10:32 2022 +0100 [SMSS][CSRSRV] Undefine CreateProcess symbol. Name the union inside SB_API_MSG. Undefine CreateProcess because it can be #define'd (to CreateProcessA/W) if winbase.h is included prior (as it is in SMSS). --- base/system/smss/smsbapi.c | 2 +- base/system/smss/smsubsys.c | 4 ++-- sdk/include/reactos/subsys/sm/smmsg.h | 6 +++++- subsystems/csr/csrsrv/session.c | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/base/system/smss/smsbapi.c b/base/system/smss/smsbapi.c index 60a081a548c..e1b21f7bdb3 100644 --- a/base/system/smss/smsbapi.c +++ b/base/system/smss/smsbapi.c @@ -47,7 +47,7 @@ SmpSbCreateSession(IN PVOID Reserved, PSB_CREATE_SESSION_MSG CreateSessionMsg; /* Write out the create session message including its initial process */ - CreateSessionMsg = &SbApiMsg.CreateSession; + CreateSessionMsg = &SbApiMsg.u.CreateSession; CreateSessionMsg->ProcessInfo = *ProcessInformation; CreateSessionMsg->MuSessionId = MuSessionId; if (DbgClientId) diff --git a/base/system/smss/smsubsys.c b/base/system/smss/smsubsys.c index a504a185900..ecae4cb1db0 100644 --- a/base/system/smss/smsubsys.c +++ b/base/system/smss/smsubsys.c @@ -149,8 +149,8 @@ SmpLoadSubSystem(IN PUNICODE_STRING FileName, RTL_USER_PROCESS_INFORMATION ProcessInformation; LARGE_INTEGER Timeout; PVOID State; - PSB_CREATE_PROCESS_MSG CreateProcess = &SbApiMsg.CreateProcess; - PSB_CREATE_SESSION_MSG CreateSession = &SbApiMsg.CreateSession; + PSB_CREATE_PROCESS_MSG CreateProcess = &SbApiMsg.u.CreateProcess; + PSB_CREATE_SESSION_MSG CreateSession = &SbApiMsg.u.CreateSession; /* Make sure this is a found subsystem */ if (Flags & SMP_INVALID_PATH) diff --git a/sdk/include/reactos/subsys/sm/smmsg.h b/sdk/include/reactos/subsys/sm/smmsg.h index e72f0917fb2..ada3ae670bc 100644 --- a/sdk/include/reactos/subsys/sm/smmsg.h +++ b/sdk/include/reactos/subsys/sm/smmsg.h @@ -211,6 +211,10 @@ C_ASSERT(sizeof(SB_CREATE_PROCESS_MSG) == 0x18); C_ASSERT(sizeof(SB_CREATE_PROCESS_MSG) == 0x28); #endif +#ifdef CreateProcess +#undef CreateProcess +#endif + // // 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_FOREIGN_SESSION_COMPLETE_MSG ForeignSessionComplete; SB_CREATE_PROCESS_MSG CreateProcess; - }; + } u; }; }; } SB_API_MSG, *PSB_API_MSG; diff --git a/subsystems/csr/csrsrv/session.c b/subsystems/csr/csrsrv/session.c index 381bb16df6f..75aff353638 100644 --- a/subsystems/csr/csrsrv/session.c +++ b/subsystems/csr/csrsrv/session.c @@ -207,7 +207,7 @@ BOOLEAN NTAPI CsrSbCreateSession(IN PSB_API_MSG ApiMessage) { - PSB_CREATE_SESSION_MSG CreateSession = &ApiMessage->CreateSession; + PSB_CREATE_SESSION_MSG CreateSession = &ApiMessage->u.CreateSession; HANDLE hProcess, hThread; PCSR_PROCESS CsrProcess; PCSR_THREAD CsrThread;

2 years, 1 month

← Newer
1
...
6
7
8
9
10
11
12
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2022