Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/02: [WIN32SS:USER] Code formatting only.
by Hermès Bélusca-Maïto 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bf7fb6f423f8915d9ea8… commit 9bf7fb6f423f8915d9ea8fc34548565a98419996 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 16 19:43:40 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 22 19:26:50 2018 +0200 [WIN32SS:USER] Code formatting only. --- win32ss/user/ntuser/main.c | 2 +- win32ss/user/ntuser/winsta.c | 26 +++---- win32ss/user/ntuser/winsta.h | 6 +- win32ss/user/user32/misc/winsta.c | 145 +++++++++++++++++++++----------------- 4 files changed, 95 insertions(+), 84 deletions(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index f9aed03b77..c10e48230e 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -941,7 +941,7 @@ DriverEntry( CalloutData.DesktopOkToCloseProcedure = IntDesktopOkToClose; CalloutData.DesktopCloseProcedure = IntDesktopObjectClose; CalloutData.DesktopDeleteProcedure = IntDesktopObjectDelete; - CalloutData.WindowStationOkToCloseProcedure = IntWinstaOkToClose; + CalloutData.WindowStationOkToCloseProcedure = IntWinStaOkToClose; // CalloutData.WindowStationCloseProcedure = NULL; CalloutData.WindowStationDeleteProcedure = IntWinStaObjectDelete; CalloutData.WindowStationParseProcedure = IntWinStaObjectParse; diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index d9ca3ca999..e999ba8a2c 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -96,7 +96,7 @@ UserCreateWinstaDirectory(VOID) /* OBJECT CALLBACKS **********************************************************/ NTSTATUS -APIENTRY +NTAPI IntWinStaObjectDelete( _In_ PVOID Parameters) { @@ -117,7 +117,7 @@ IntWinStaObjectDelete( } NTSTATUS -APIENTRY +NTAPI IntWinStaObjectParse( _In_ PVOID Parameters) { @@ -183,7 +183,7 @@ IntWinStaObjectParse( NTSTATUS NTAPI -IntWinstaOkToClose( +IntWinStaOkToClose( _In_ PVOID Parameters) { PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS OkToCloseParameters = Parameters; @@ -370,7 +370,7 @@ CheckWinstaAttributeAccess(ACCESS_MASK DesiredAccess) * lpSecurity * Security descriptor * - * Unknown3, Unknown4, Unknown5 + * Unknown3, Unknown4, Unknown5, Unknown6 * Unused * * Return Value @@ -379,10 +379,6 @@ CheckWinstaAttributeAccess(ACCESS_MASK DesiredAccess) * exists, the function succeeds and returns a handle to the existing * window station. If the function fails, the return value is NULL. * - * Todo - * Correct the prototype to match the Windows one (with 7 parameters - * on Windows XP). - * * Status * @implemented */ @@ -940,7 +936,7 @@ UserSetProcessWindowStation(HWINSTA hWindowStation) ppi = PsGetCurrentProcessWin32Process(); /* Reference the new window station */ - if(hWindowStation !=NULL) + if (hWindowStation != NULL) { Status = IntValidateWindowStationHandle(hWindowStation, UserMode, @@ -960,13 +956,13 @@ UserSetProcessWindowStation(HWINSTA hWindowStation) hwinstaOld = PsGetProcessWin32WindowStation(ppi->peProcess); /* Dereference the previous window station */ - if(OldWinSta != NULL) + if (OldWinSta != NULL) { ObDereferenceObject(OldWinSta); } /* Check if we have a stale handle (it should happen for console apps) */ - if(hwinstaOld != ppi->hwinsta) + if (hwinstaOld != ppi->hwinsta) { ObCloseHandle(hwinstaOld, UserMode); } @@ -991,7 +987,7 @@ UserSetProcessWindowStation(HWINSTA hWindowStation) ppi->W32PF_flags &= ~W32PF_READSCREENACCESSGRANTED; } - if (NewWinSta && !(NewWinSta->Flags & WSS_NOIO) ) + if (NewWinSta && !(NewWinSta->Flags & WSS_NOIO)) { ppi->W32PF_flags |= W32PF_IOWINSTA; } @@ -1529,8 +1525,8 @@ NtUserSetWindowStationUser( _SEH2_TRY { - ProbeForRead( psid, size, 1); - ProbeForRead( pluid, sizeof(LUID), 1); + ProbeForRead(psid, size, 1); + ProbeForRead(pluid, sizeof(LUID), 1); RtlCopyMemory(WindowStation->psidUser, psid, size); WindowStation->luidUser = *pluid; @@ -1544,7 +1540,7 @@ NtUserSetWindowStationUser( if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); - WindowStation->psidUser = 0; + WindowStation->psidUser = NULL; goto Leave; } diff --git a/win32ss/user/ntuser/winsta.h b/win32ss/user/ntuser/winsta.h index 6ac08cf297..b41834e7c1 100644 --- a/win32ss/user/ntuser/winsta.h +++ b/win32ss/user/ntuser/winsta.h @@ -84,18 +84,18 @@ NTAPI UserCreateWinstaDirectory(VOID); NTSTATUS -APIENTRY +NTAPI IntWinStaObjectDelete( _In_ PVOID Parameters); NTSTATUS -APIENTRY +NTAPI IntWinStaObjectParse( _In_ PVOID Parameters); NTSTATUS NTAPI -IntWinstaOkToClose( +IntWinStaOkToClose( _In_ PVOID Parameters); NTSTATUS diff --git a/win32ss/user/user32/misc/winsta.c b/win32ss/user/user32/misc/winsta.c index b3b888747f..11d4bb5a00 100644 --- a/win32ss/user/user32/misc/winsta.c +++ b/win32ss/user/user32/misc/winsta.c @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS user32.dll - * FILE: win32ss/user/user32/misc/winsta.c - * PURPOSE: Window stations - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * 04-06-2001 CSH Created + * PROJECT: ReactOS user32.dll + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Window stations + * COPYRIGHT: Copyright 2001-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2011-2018 Giannis Adamopoulos */ #include <user32.h> @@ -15,14 +13,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsta); /* * @implemented */ -HWINSTA WINAPI -CreateWindowStationA(LPCSTR lpwinsta, - DWORD dwReserved, - ACCESS_MASK dwDesiredAccess, - LPSECURITY_ATTRIBUTES lpsa) +HWINSTA +WINAPI +CreateWindowStationA( + IN LPCSTR lpwinsta OPTIONAL, + IN DWORD dwReserved, + IN ACCESS_MASK dwDesiredAccess, + IN LPSECURITY_ATTRIBUTES lpsa OPTIONAL) { - UNICODE_STRING WindowStationNameU; HWINSTA hWinSta; + UNICODE_STRING WindowStationNameU; if (lpwinsta) { @@ -39,7 +39,7 @@ CreateWindowStationA(LPCSTR lpwinsta, dwDesiredAccess, lpsa); - /* Free the string, if it was allocated */ + /* Free the string if it was allocated */ if (lpwinsta) RtlFreeUnicodeString(&WindowStationNameU); return hWinSta; @@ -49,30 +49,32 @@ CreateWindowStationA(LPCSTR lpwinsta, /* * @implemented */ -HWINSTA WINAPI -CreateWindowStationW(LPCWSTR lpwinsta, - DWORD dwReserved, - ACCESS_MASK dwDesiredAccess, - LPSECURITY_ATTRIBUTES lpsa) +HWINSTA +WINAPI +CreateWindowStationW( + IN LPCWSTR lpwinsta OPTIONAL, + IN DWORD dwReserved, + IN ACCESS_MASK dwDesiredAccess, + IN LPSECURITY_ATTRIBUTES lpsa OPTIONAL) { + NTSTATUS Status; + HWINSTA hWinSta; UNICODE_STRING WindowStationName; UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hWindowStationsDir; - NTSTATUS Status; - HWINSTA hwinsta; /* Open WindowStations directory */ InitializeObjectAttributes(&ObjectAttributes, &WindowStationsDir, OBJ_CASE_INSENSITIVE, - 0, - 0); + NULL, + NULL); - Status = NtOpenDirectoryObject(&hWindowStationsDir, - DIRECTORY_CREATE_OBJECT, + Status = NtOpenDirectoryObject(&hWindowStationsDir, + DIRECTORY_CREATE_OBJECT, &ObjectAttributes); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ERR("Failed to open WindowStations directory\n"); return NULL; @@ -85,27 +87,28 @@ CreateWindowStationW(LPCWSTR lpwinsta, &WindowStationName, OBJ_CASE_INSENSITIVE, hWindowStationsDir, - 0); + NULL); /* Check if the handle should be inheritable */ if (lpsa && lpsa->bInheritHandle) - { + { ObjectAttributes.Attributes |= OBJ_INHERIT; } - hwinsta = NtUserCreateWindowStation(&ObjectAttributes, + hWinSta = NtUserCreateWindowStation(&ObjectAttributes, dwDesiredAccess, 0, 0, 0, 0, 0); NtClose(hWindowStationsDir); - return hwinsta; + return hWinSta; } /* * Common code for EnumDesktopsA/W and EnumWindowStationsA/W */ -BOOL FASTCALL +BOOL +FASTCALL EnumNamesW(HWINSTA WindowStation, NAMEENUMPROCW EnumFunc, LPARAM Context, @@ -174,7 +177,6 @@ EnumNamesW(HWINSTA WindowStation, return Ret; } - /* For W->A conversion */ typedef struct tagENUMNAMESASCIICONTEXT { @@ -186,7 +188,8 @@ typedef struct tagENUMNAMESASCIICONTEXT * Callback used by Ascii versions. Converts the Unicode name to * Ascii and then calls the user callback */ -BOOL CALLBACK +BOOL +CALLBACK EnumNamesCallback(LPWSTR Name, LPARAM Param) { PENUMNAMESASCIICONTEXT Context = (PENUMNAMESASCIICONTEXT) Param; @@ -247,7 +250,8 @@ EnumNamesCallback(LPWSTR Name, LPARAM Param) /* * Common code for EnumDesktopsA and EnumWindowStationsA */ -BOOL FASTCALL +BOOL +FASTCALL EnumNamesA(HWINSTA WindowStation, NAMEENUMPROCA EnumFunc, LPARAM Context, @@ -264,9 +268,11 @@ EnumNamesA(HWINSTA WindowStation, /* * @implemented */ -BOOL WINAPI -EnumWindowStationsA(WINSTAENUMPROCA EnumFunc, - LPARAM Context) +BOOL +WINAPI +EnumWindowStationsA( + IN WINSTAENUMPROCA EnumFunc, + IN LPARAM Context) { return EnumNamesA(NULL, EnumFunc, Context, FALSE); } @@ -275,9 +281,11 @@ EnumWindowStationsA(WINSTAENUMPROCA EnumFunc, /* * @implemented */ -BOOL WINAPI -EnumWindowStationsW(WINSTAENUMPROCW EnumFunc, - LPARAM Context) +BOOL +WINAPI +EnumWindowStationsW( + IN WINSTAENUMPROCW EnumFunc, + IN LPARAM Context) { return EnumNamesW(NULL, EnumFunc, Context, FALSE); } @@ -286,7 +294,8 @@ EnumWindowStationsW(WINSTAENUMPROCW EnumFunc, /* * @unimplemented on Win32k side */ -BOOL WINAPI +BOOL +WINAPI GetWinStationInfo(PVOID pUnknown) { return (BOOL)NtUserCallOneParam((DWORD_PTR)pUnknown, ONEPARAM_ROUTINE_GETWINSTAINFO); @@ -296,13 +305,15 @@ GetWinStationInfo(PVOID pUnknown) /* * @implemented */ -HWINSTA WINAPI -OpenWindowStationA(LPCSTR lpszWinSta, - BOOL fInherit, - ACCESS_MASK dwDesiredAccess) +HWINSTA +WINAPI +OpenWindowStationA( + IN LPCSTR lpszWinSta, + IN BOOL fInherit, + IN ACCESS_MASK dwDesiredAccess) { - UNICODE_STRING WindowStationNameU; HWINSTA hWinSta; + UNICODE_STRING WindowStationNameU; if (lpszWinSta) { @@ -318,7 +329,7 @@ OpenWindowStationA(LPCSTR lpszWinSta, fInherit, dwDesiredAccess); - /* Free the string, if it was allocated */ + /* Free the string if it was allocated */ if (lpszWinSta) RtlFreeUnicodeString(&WindowStationNameU); return hWinSta; @@ -328,27 +339,29 @@ OpenWindowStationA(LPCSTR lpszWinSta, /* * @implemented */ -HWINSTA WINAPI -OpenWindowStationW(LPCWSTR lpszWinSta, - BOOL fInherit, - ACCESS_MASK dwDesiredAccess) +HWINSTA +WINAPI +OpenWindowStationW( + IN LPCWSTR lpszWinSta, + IN BOOL fInherit, + IN ACCESS_MASK dwDesiredAccess) { + NTSTATUS Status; + HWINSTA hWinSta; UNICODE_STRING WindowStationName; UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hWindowStationsDir; - NTSTATUS Status; - HWINSTA hwinsta; /* Open WindowStations directory */ InitializeObjectAttributes(&ObjectAttributes, &WindowStationsDir, OBJ_CASE_INSENSITIVE, - 0, - 0); + NULL, + NULL); - Status = NtOpenDirectoryObject(&hWindowStationsDir, - DIRECTORY_TRAVERSE, + Status = NtOpenDirectoryObject(&hWindowStationsDir, + DIRECTORY_TRAVERSE, &ObjectAttributes); if(!NT_SUCCESS(Status)) { @@ -363,18 +376,19 @@ OpenWindowStationW(LPCWSTR lpszWinSta, &WindowStationName, OBJ_CASE_INSENSITIVE, hWindowStationsDir, - 0); + NULL); - if(fInherit) + /* Check if the handle should be inheritable */ + if (fInherit) { ObjectAttributes.Attributes |= OBJ_INHERIT; } - hwinsta = NtUserOpenWindowStation(&ObjectAttributes, dwDesiredAccess); + hWinSta = NtUserOpenWindowStation(&ObjectAttributes, dwDesiredAccess); NtClose(hWindowStationsDir); - return hwinsta; + return hWinSta; } @@ -383,10 +397,11 @@ OpenWindowStationW(LPCWSTR lpszWinSta, */ BOOL WINAPI -SetWindowStationUser(HWINSTA hWindowStation, - PLUID pluid, - PSID psid, - DWORD size) +SetWindowStationUser( + IN HWINSTA hWindowStation, + IN PLUID pluid OPTIONAL, + IN PSID psid, + IN DWORD size) { BOOL Success;

1 0

03/03: [USER32_APITEST] Add few other tests (validation of the desktop path string); improve the output of some messages, displaying the expected values in case of test failure. See also PR #621.
by Hermès Bélusca-Maïto 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e90316aeaa4c844b0f589… commit e90316aeaa4c844b0f589a349bd8178b06eaeea2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 17 23:17:52 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 22 19:03:17 2018 +0200 [USER32_APITEST] Add few other tests (validation of the desktop path string); improve the output of some messages, displaying the expected values in case of test failure. See also PR #621. --- modules/rostests/apitests/user32/desktop.c | 175 ++++++++++++++++++----------- 1 file changed, 112 insertions(+), 63 deletions(-) diff --git a/modules/rostests/apitests/user32/desktop.c b/modules/rostests/apitests/user32/desktop.c index f7bffe0721..05f0c13301 100644 --- a/modules/rostests/apitests/user32/desktop.c +++ b/modules/rostests/apitests/user32/desktop.c @@ -15,16 +15,26 @@ struct test_info { WCHAR* ExpectedDesktp; }; -struct test_info TestResults[] = {{L"WinSta0",L"Default"}, - {L"WinSta0",L"Default"}, - {L"WinSta0",L"Default"}, - {NULL, NULL}, - {NULL, NULL}, - {NULL, NULL}, - {NULL, NULL}, - {L"WinSta0",L"Default"}, - {L"TestWinsta", L"TestDesktop"}, - {NULL, NULL}}; +struct test_info TestResults[] = +{ + {L"WinSta0",L"Default"}, + {L"WinSta0",L"Default"}, + {NULL, NULL}, + {NULL, NULL}, + {L"WinSta0",L"Default"}, + {NULL, NULL}, + {NULL, NULL}, + {NULL, NULL}, + {NULL, NULL}, + {L"WinSta0",L"Default"}, + {NULL, NULL}, + {NULL, NULL}, + {NULL, NULL}, + {L"TestWinsta", L"TestDesktop"}, + {NULL, NULL}, + {L"WinSta0",L"Default"}, + {NULL, NULL} +}; void do_InitialDesktop_child(int i) { @@ -34,11 +44,8 @@ void do_InitialDesktop_child(int i) DWORD size; BOOL ret; - if(TestResults[i].ExpectedWinsta == NULL) - { - trace("Process should have failed to initialize\n"); - return; - } + if (TestResults[i].ExpectedWinsta == NULL) + ok(FALSE, "%d: Process should have failed to initialize\n", i); IsGUIThread(TRUE); @@ -47,11 +54,15 @@ void do_InitialDesktop_child(int i) ret = GetUserObjectInformationW( hwinsta, UOI_NAME, buffer, sizeof(buffer), &size ); ok(ret == TRUE, "ret = %d\n", ret); - ok(wcscmp(buffer, TestResults[i].ExpectedWinsta) == 0, "Wrong winsta %S insted of %S\n", buffer, TestResults[i].ExpectedWinsta); + if (TestResults[i].ExpectedWinsta) + ok(wcscmp(buffer, TestResults[i].ExpectedWinsta) == 0, "%d: Wrong winsta %S instead of %S\n", i, buffer, TestResults[i].ExpectedWinsta); + trace("%d: We run on winstation %S\n", i, buffer); ret = GetUserObjectInformationW( hdesktop, UOI_NAME, buffer, sizeof(buffer), &size ); ok(ret == TRUE, "ret = %d\n", ret); - ok(wcscmp(buffer, TestResults[i].ExpectedDesktp) == 0, "Wrong desktop %S insted of %S\n", buffer, TestResults[i].ExpectedDesktp); + if (TestResults[i].ExpectedDesktp) + ok(wcscmp(buffer, TestResults[i].ExpectedDesktp) == 0, "%d: Wrong desktop %S instead of %S\n", i, buffer, TestResults[i].ExpectedDesktp); + trace("%d: We run on desktop %S\n", i, buffer); } void test_CreateProcessWithDesktop(int i, char *argv0, char* Desktop, DWORD expectedExitCode) @@ -77,29 +88,37 @@ void test_CreateProcessWithDesktop(int i, char *argv0, char* Desktop, DWORD expe /* the exit code varies from version to version */ /* xp returns error 128 and 7 returns STATUS_DLL_INIT_FAILED */ - if(ExitCode == 128) ExitCode = STATUS_DLL_INIT_FAILED; + if (ExitCode == 128) ExitCode = STATUS_DLL_INIT_FAILED; ok(ExitCode == expectedExitCode, "%d: expected error 0x%x in child process got 0x%x\n", i, (int)expectedExitCode, (int)ExitCode); CloseHandle(pi.hProcess); } -HWINSTA CreateInheritableWinsta(WCHAR* name, ACCESS_MASK dwDesiredAccess, BOOL inheritable) +HWINSTA CreateInheritableWinsta(WCHAR* name, ACCESS_MASK dwDesiredAccess, BOOL inheritable, DWORD *error) { - SECURITY_ATTRIBUTES sa; - sa.nLength = sizeof(sa); - sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = inheritable; - return CreateWindowStationW(name, 0, dwDesiredAccess, &sa ); + HWINSTA hwinsta; + SECURITY_ATTRIBUTES sa; + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = inheritable; + SetLastError(0xfeedf00d); + hwinsta = CreateWindowStationW(name, 0, dwDesiredAccess, &sa); + *error = GetLastError(); + return hwinsta; } -HDESK CreateInheritableDesktop(WCHAR* name, ACCESS_MASK dwDesiredAccess, BOOL inheritable) +HDESK CreateInheritableDesktop(WCHAR* name, ACCESS_MASK dwDesiredAccess, BOOL inheritable, DWORD *error) { - SECURITY_ATTRIBUTES sa; - sa.nLength = sizeof(sa); - sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = inheritable; - return CreateDesktopW(name, NULL, NULL, 0, dwDesiredAccess, &sa ); + HDESK hdesk; + SECURITY_ATTRIBUTES sa; + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = inheritable; + SetLastError(0xfeedf00d); + hdesk = CreateDesktopW(name, NULL, NULL, 0, dwDesiredAccess, &sa); + *error = GetLastError(); + return hdesk; } void Test_InitialDesktop(char *argv0) @@ -107,36 +126,66 @@ void Test_InitialDesktop(char *argv0) HWINSTA hwinsta = NULL, hwinstaInitial; HDESK hdesktop = NULL; BOOL ret; + DWORD error; hwinstaInitial = GetProcessWindowStation(); + /* Use the default (interactive) window station */ test_CreateProcessWithDesktop(0, argv0, NULL, 0); test_CreateProcessWithDesktop(1, argv0, "Default", 0); - test_CreateProcessWithDesktop(2, argv0, "WinSta0\\Default", 0); - test_CreateProcessWithDesktop(3, argv0, "Winlogon", STATUS_DLL_INIT_FAILED); - test_CreateProcessWithDesktop(4, argv0, "WinSta0/Default", STATUS_DLL_INIT_FAILED); - test_CreateProcessWithDesktop(5, argv0, "NonExistantDesktop", STATUS_DLL_INIT_FAILED); - test_CreateProcessWithDesktop(6, argv0, "NonExistantWinsta\\NonExistantDesktop", STATUS_DLL_INIT_FAILED); - - hwinsta = CreateInheritableWinsta(L"TestWinsta", WINSTA_ALL_ACCESS, TRUE); - ok(hwinsta!=NULL, "CreateWindowStation failed\n"); + test_CreateProcessWithDesktop(2, argv0, "WinSta0\\", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(3, argv0, "\\Default", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(4, argv0, "WinSta0\\Default", 0); + test_CreateProcessWithDesktop(5, argv0, "Winlogon", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(6, argv0, "WinSta0/Default", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(7, argv0, "NonExistantDesktop", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(8, argv0, "NonExistantWinsta\\NonExistantDesktop", STATUS_DLL_INIT_FAILED); + + /* Test on an (non-interactive) window station */ + hwinsta = CreateInheritableWinsta(L"TestWinsta", WINSTA_ALL_ACCESS, TRUE, &error); + ok(hwinsta != NULL && error == NO_ERROR, "CreateWindowStation failed, got 0x%p, 0x%lx\n", hwinsta, error); ret = SetProcessWindowStation(hwinsta); - ok(ret != 0, "SetProcessWindowStation failed\n"); - hdesktop = CreateInheritableDesktop(L"TestDesktop", DESKTOP_ALL_ACCESS, TRUE); - ok(hdesktop!=NULL, "CreateDesktop failed\n"); + ok(ret != FALSE, "SetProcessWindowStation failed\n"); + hdesktop = CreateInheritableDesktop(L"TestDesktop", DESKTOP_ALL_ACCESS, TRUE, &error); + ok(hdesktop != NULL && error == 0xfeedf00d, "CreateDesktop failed, got 0x%p, 0x%lx\n", hdesktop, error); - test_CreateProcessWithDesktop(7, argv0, NULL, 0); - test_CreateProcessWithDesktop(8, argv0, "TestWinsta\\TestDesktop", 0); - test_CreateProcessWithDesktop(8, argv0, "NonExistantWinsta\\NonExistantDesktop", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(9, argv0, NULL, 0); + test_CreateProcessWithDesktop(10, argv0, "TestDesktop", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(11, argv0, "TestWinsta\\", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(12, argv0, "\\TestDesktop", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(13, argv0, "TestWinsta\\TestDesktop", 0); + test_CreateProcessWithDesktop(14, argv0, "NonExistantWinsta\\NonExistantDesktop", STATUS_DLL_INIT_FAILED); + + ret = SetProcessWindowStation(hwinstaInitial); + ok(ret != FALSE, "SetProcessWindowStation failed\n"); + + ret = CloseDesktop(hdesktop); + ok(ret != FALSE, "CloseDesktop failed\n"); + + ret = CloseWindowStation(hwinsta); + ok(ret != FALSE, "CloseWindowStation failed\n"); + +#if 0 + /* Test on an non-interactive Service-0xXXXX-YYYY$ window station */ + hwinsta = CreateInheritableWinsta(NULL, WINSTA_ALL_ACCESS, TRUE, &error); + ok(hwinsta != NULL && error == NO_ERROR, "CreateWindowStation failed, got 0x%p, 0x%lx\n", hwinsta, error); + ret = SetProcessWindowStation(hwinsta); + ok(ret != FALSE, "SetProcessWindowStation failed\n"); + hdesktop = CreateInheritableDesktop(L"TestDesktop", DESKTOP_ALL_ACCESS, TRUE, &error); + ok(hdesktop != NULL && error == 0xfeedf00d, "CreateDesktop failed, got 0x%p, 0x%lx\n", hdesktop, error); + + test_CreateProcessWithDesktop(15, argv0, NULL, 0); + test_CreateProcessWithDesktop(16, "TestDesktop", NULL, 0 /*ERROR_ACCESS_DENIED*/); ret = SetProcessWindowStation(hwinstaInitial); - ok(ret != 0, "SetProcessWindowStation failed\n"); + ok(ret != FALSE, "SetProcessWindowStation failed\n"); ret = CloseDesktop(hdesktop); - ok(ret != 0, "CloseDesktop failed\n"); + ok(ret != FALSE, "CloseDesktop failed\n"); ret = CloseWindowStation(hwinsta); - ok(ret != 0, "CloseWindowStation failed\n"); + ok(ret != FALSE, "CloseWindowStation failed\n"); +#endif } void Test_OpenInputDesktop() @@ -175,7 +224,7 @@ void Test_OpenInputDesktop() ok(hwinsta != 0, "CreateWindowStationW failed\n"); ret = SetProcessWindowStation(hwinsta); - ok(ret != 0, "SetProcessWindowStation failed\n"); + ok(ret != FALSE, "SetProcessWindowStation failed\n"); hDeskInput = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); ok(hDeskInput == 0, "OpenInputDesktop should fail\n"); @@ -184,10 +233,10 @@ void Test_OpenInputDesktop() ok(err == ERROR_INVALID_FUNCTION, "Got last error: %lu\n", err); ret = SetProcessWindowStation(hwinstaInitial); - ok(ret != 0, "SetProcessWindowStation failed\n"); + ok(ret != FALSE, "SetProcessWindowStation failed\n"); ret = CloseWindowStation(hwinsta); - ok(ret != 0, "CloseWindowStation failed\n"); + ok(ret != FALSE, "CloseWindowStation failed\n"); } @@ -244,17 +293,17 @@ static void Test_References(void) #define check_ref(handle, hdlcnt, ptrcnt) \ status = NtQueryObject(handle, ObjectBasicInformation, &objectInfo, sizeof(objectInfo), NULL); \ - ok(status == STATUS_SUCCESS, "status = %lx\n", status); \ - ok(objectInfo.HandleCount == (hdlcnt), "HandleCount = %lx\n", objectInfo.HandleCount); \ - ok(objectInfo.PointerCount == (ptrcnt), "PointerCount = %lx\n", objectInfo.PointerCount); + ok(status == STATUS_SUCCESS, "status = 0x%lx\n", status); \ + ok(objectInfo.HandleCount == (hdlcnt), "HandleCount = %lu, expected %lu\n", objectInfo.HandleCount, (ULONG)(hdlcnt)); \ + ok(objectInfo.PointerCount == (ptrcnt), "PointerCount = %lu, expected %lu\n", objectInfo.PointerCount, (ULONG)(ptrcnt)); /* Winsta shouldn't exist */ hwinsta = open_winsta(winstaName, &error); - ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got 0x%p, 0x%lx\n", hwinsta, error); /* Create it -- we get 1/4 instead of 1/3 because Winstas are kept in a list */ hwinsta = create_winsta(winstaName, &error); - ok(hwinsta != NULL && error == NO_ERROR, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta != NULL && error == NO_ERROR, "Got 0x%p, 0x%lx\n", hwinsta, error); check_ref(hwinsta, 1, 4); baseRefs = objectInfo.PointerCount; ok(baseRefs == 4, "Window station initially has %lu references, expected 4\n", baseRefs); @@ -262,7 +311,7 @@ static void Test_References(void) /* Open a second handle */ hwinsta2 = open_winsta(winstaName, &error); - ok(hwinsta2 != NULL && error == 0xfeedf00d, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta2 != NULL && error == 0xfeedf00d, "Got 0x%p, 0x%lx\n", hwinsta, error); check_ref(hwinsta, 2, baseRefs + 1); /* Close second handle -- back to 1/4 */ @@ -272,7 +321,7 @@ static void Test_References(void) /* Same game but using CloseWindowStation */ hwinsta2 = open_winsta(winstaName, &error); - ok(hwinsta2 != NULL && error == 0xfeedf00d, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta2 != NULL && error == 0xfeedf00d, "Got 0x%p, 0x%lx\n", hwinsta, error); check_ref(hwinsta, 2, baseRefs + 1); ret = CloseWindowStation(hwinsta2); ok(ret == TRUE, "ret = %d\n", ret); @@ -285,7 +334,7 @@ static void Test_References(void) /* Create a desktop. It takes a reference */ hdesk = create_desk(deskName, &error); - ok(hdesk != NULL && error == 0xfeedf00d, "Got %p, %lu\n", hdesk, error); + ok(hdesk != NULL && error == 0xfeedf00d, "Got 0x%p, 0x%lx\n", hdesk, error); check_ref(hwinsta, 2, baseRefs + 3); /* CloseHandle fails, must use CloseDesktop */ @@ -298,7 +347,7 @@ static void Test_References(void) /* Desktop no longer exists */ hdesk = open_desk(deskName, &error); - ok(hdesk == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hdesk, error); + ok(hdesk == NULL && error == ERROR_FILE_NOT_FOUND, "Got 0x%p, 0x%lx\n", hdesk, error); check_ref(hwinsta, 2, baseRefs + 2); /* Restore the original process Winsta */ @@ -311,18 +360,18 @@ static void Test_References(void) /* Winsta no longer exists */ hwinsta = open_winsta(winstaName, &error); - ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got 0x%p, 0x%lx\n", hwinsta, error); /* Create the Winsta again, and close it while there's still a desktop */ hwinsta = create_winsta(winstaName, &error); - ok(hwinsta != NULL && error == NO_ERROR, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta != NULL && error == NO_ERROR, "Got 0x%p, 0x%lx\n", hwinsta, error); check_ref(hwinsta, 1, baseRefs); hwinstaProcess = GetProcessWindowStation(); SetProcessWindowStation(hwinsta); check_ref(hwinsta, 2, baseRefs + 2); hdesk = create_desk(deskName, &error); - ok(hdesk != NULL && error == 0xfeedf00d, "Got %p, %lu\n", hdesk, error); + ok(hdesk != NULL && error == 0xfeedf00d, "Got 0x%p, 0x%lx\n", hdesk, error); check_ref(hwinsta, 2, baseRefs + 3); /* The reference from the desktop is still there, hence 1/5 */ @@ -331,7 +380,7 @@ static void Test_References(void) ret = CloseHandle(hwinsta); ok(ret == TRUE, "ret = %d\n", ret); hwinsta = open_winsta(winstaName, &error); - ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got 0x%p, 0x%lx\n", hwinsta, error); /* Test references by SetThreadDesktop */ hdesk1 = GetThreadDesktop(GetCurrentThreadId());

1 0

02/03: [ROSTESTS] Add an interactive test for window stations. See also PR #621.
by Hermès Bélusca-Maïto 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67adf7ab786bc43616802… commit 67adf7ab786bc43616802799ce4f3b49034150ab Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 17 21:39:44 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 22 19:03:17 2018 +0200 [ROSTESTS] Add an interactive test for window stations. See also PR #621. --- modules/rostests/win32/user32/CMakeLists.txt | 1 + .../win32/user32/winstation/CMakeLists.txt | 5 + .../rostests/win32/user32/winstation/resource.h | 2 + .../rostests/win32/user32/winstation/winstation.c | 239 +++++++++++++++++++++ .../rostests/win32/user32/winstation/winstation.rc | 15 ++ 5 files changed, 262 insertions(+) diff --git a/modules/rostests/win32/user32/CMakeLists.txt b/modules/rostests/win32/user32/CMakeLists.txt index 8298a919d3..d1d83974bd 100644 --- a/modules/rostests/win32/user32/CMakeLists.txt +++ b/modules/rostests/win32/user32/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory(biditext) add_subdirectory(paintdesktop) add_subdirectory(sysicon) +add_subdirectory(winstation) diff --git a/modules/rostests/win32/user32/winstation/CMakeLists.txt b/modules/rostests/win32/user32/winstation/CMakeLists.txt new file mode 100644 index 0000000000..88d6ea8173 --- /dev/null +++ b/modules/rostests/win32/user32/winstation/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(winstation winstation.c winstation.rc) +set_module_type(winstation win32gui UNICODE) +add_importlibs(winstation user32 msvcrt kernel32) +add_rostests_file(TARGET winstation SUBDIR suppl) diff --git a/modules/rostests/win32/user32/winstation/resource.h b/modules/rostests/win32/user32/winstation/resource.h new file mode 100644 index 0000000000..795deabfbd --- /dev/null +++ b/modules/rostests/win32/user32/winstation/resource.h @@ -0,0 +1,2 @@ +#define IDD_ABOUTBOX 101 +#define IDC_STATIC -1 diff --git a/modules/rostests/win32/user32/winstation/winstation.c b/modules/rostests/win32/user32/winstation/winstation.c new file mode 100644 index 0000000000..f2434dbad0 --- /dev/null +++ b/modules/rostests/win32/user32/winstation/winstation.c @@ -0,0 +1,239 @@ +/* + * PROJECT: ReactOS Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests some aspects of the Window Station API. + * COPYRIGHT: Copyright 2018 Hermes Belusca-Maito + */ + +#include <windef.h> +#include <winbase.h> +#include <wincon.h> +#include <winuser.h> + +#include <strsafe.h> + +#include "resource.h" + + +/* + * Logging facilities + */ + +typedef struct _LOG_FILE +{ + HANDLE hLogFile; + PWCHAR pBuffer; + size_t cbBufferSize; +} LOG_FILE, *PLOG_FILE; + +BOOL +InitLog( + OUT PLOG_FILE LogFile, + IN LPCWSTR LogFileName, + IN PWCHAR pBuffer, + IN size_t cbBufferSize) +{ + HANDLE hLogFile; + + ZeroMemory(LogFile, sizeof(*LogFile)); + + hLogFile = CreateFileW(LogFileName, + GENERIC_WRITE, + FILE_SHARE_READ, + NULL, + OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (hLogFile == INVALID_HANDLE_VALUE) + return FALSE; + + LogFile->hLogFile = hLogFile; + LogFile->pBuffer = pBuffer; + LogFile->cbBufferSize = cbBufferSize; + + return TRUE; +} + +VOID +CloseLog( + IN PLOG_FILE LogFile) +{ + CloseHandle(LogFile->hLogFile); + ZeroMemory(LogFile, sizeof(*LogFile)); +} + +BOOL +WriteToLog( + IN PLOG_FILE LogFile, + IN LPCVOID Buffer, + IN DWORD dwBufferSize) +{ + return WriteFile(LogFile->hLogFile, + Buffer, + dwBufferSize, + &dwBufferSize, NULL); +} + +BOOL +WriteToLogPuts( + IN PLOG_FILE LogFile, + IN LPCWSTR String) +{ + return WriteToLog(LogFile, + String, + wcslen(String) * sizeof(WCHAR)); +} + +BOOL +WriteToLogPrintfV( + IN PLOG_FILE LogFile, + IN LPCWSTR Format, + IN va_list args) +{ + StringCbVPrintfW(LogFile->pBuffer, + LogFile->cbBufferSize, + Format, args); + + return WriteToLog(LogFile, + LogFile->pBuffer, + wcslen(LogFile->pBuffer) * sizeof(WCHAR)); +} + +BOOL +WriteToLogPrintf( + IN PLOG_FILE LogFile, + IN LPCWSTR Format, + ...) +{ + BOOL bRet; + va_list args; + + va_start(args, Format); + bRet = WriteToLogPrintfV(LogFile, Format, args); + va_end(args); + + return bRet; +} + + +/* + * Window Station tests + */ + +BOOL +CALLBACK +EnumDesktopProc( + IN LPWSTR lpszDesktop, + IN LPARAM lParam) +{ + PLOG_FILE LogFile = (PLOG_FILE)lParam; + + WriteToLogPrintf(LogFile, L" :: Found desktop '%s'\r\n", lpszDesktop); + + /* Continue the enumeration */ + return TRUE; +} + +/* + * This test inspects the same window station aspects that are used in the + * Cygwin fhandler_console.cc!fhandler_console::create_invisible_console() + * function, see: + * https://github.com/cygwin/cygwin/blob/7b9bfb4136f23655e243bab89fb62b04bdbac… + */ +VOID DoTest(HWND hWnd) +{ + HWINSTA hWinSta; + LPCWSTR lpszWinSta = L"Test-WinSta"; + BOOL bIsItOk; + LOG_FILE LogFile; + WCHAR szBuffer[2048]; + + bIsItOk = InitLog(&LogFile, L"test_winsta.log", szBuffer, sizeof(szBuffer)); + if (!bIsItOk) + { + MessageBoxW(hWnd, L"Could not create the log file, stopping test now...", L"Error", MB_ICONERROR | MB_OK); + return; + } + + /* Switch output to UTF-16 (little endian) */ + WriteToLog(&LogFile, "\xFF\xFE", 2); + + WriteToLogPrintf(&LogFile, L"Creating Window Station '%s'\r\n", lpszWinSta); + hWinSta = CreateWindowStationW(lpszWinSta, 0, WINSTA_ALL_ACCESS, NULL); + WriteToLogPrintf(&LogFile, L"--> Returned handle 0x%p ; last error: %lu\r\n", hWinSta, GetLastError()); + + if (!hWinSta) + { + WriteToLogPuts(&LogFile, L"\r\nHandle is NULL, cannot proceed further, stopping the test!\r\n\r\n"); + return; + } + + WriteToLogPrintf(&LogFile, L"Enumerate desktops on Window Station '%s' (0x%p) (before process attach)\r\n", lpszWinSta, hWinSta); + bIsItOk = EnumDesktopsW(hWinSta, EnumDesktopProc, (LPARAM)&LogFile); + WriteToLogPrintf(&LogFile, L"--> Returned %s ; last error: %lu\r\n", + (bIsItOk ? L"success" : L"failure"), GetLastError()); + + WriteToLogPrintf(&LogFile, L"Setting current process to Window Station '%s' (0x%p)\r\n", lpszWinSta, hWinSta); + bIsItOk = SetProcessWindowStation(hWinSta); + WriteToLogPrintf(&LogFile, L"--> Returned %s ; last error: %lu\r\n", + (bIsItOk ? L"success" : L"failure"), GetLastError()); + + WriteToLogPrintf(&LogFile, L"Enumerate desktops on Window Station '%s' (0x%p) (after process attach, before allocating console)\r\n", lpszWinSta, hWinSta); + bIsItOk = EnumDesktopsW(hWinSta, EnumDesktopProc, (LPARAM)&LogFile); + WriteToLogPrintf(&LogFile, L"--> Returned %s ; last error: %lu\r\n", + (bIsItOk ? L"success" : L"failure"), GetLastError()); + + WriteToLogPrintf(&LogFile, L"Allocating a new console on Window Station '%s' (0x%p)\r\n", lpszWinSta, hWinSta); + bIsItOk = AllocConsole(); + WriteToLogPrintf(&LogFile, L"--> Returned %s ; last error: %lu\r\n", + (bIsItOk ? L"success" : L"failure"), GetLastError()); + + WriteToLogPrintf(&LogFile, L"Enumerate desktops on Window Station '%s' (0x%p) (after allocating console)\r\n", lpszWinSta, hWinSta); + bIsItOk = EnumDesktopsW(hWinSta, EnumDesktopProc, (LPARAM)&LogFile); + WriteToLogPrintf(&LogFile, L"--> Returned %s ; last error: %lu\r\n", + (bIsItOk ? L"success" : L"failure"), GetLastError()); + + WriteToLogPrintf(&LogFile, L"Now closing Window Station '%s' (0x%p)\r\n", lpszWinSta, hWinSta); + bIsItOk = CloseWindowStation(hWinSta); + WriteToLogPrintf(&LogFile, L"--> Returned %s ; last error: %lu\r\n\r\n", + (bIsItOk ? L"success" : L"failure"), GetLastError()); + + CloseLog(&LogFile); +} + +INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + switch (message) + { + case WM_INITDIALOG: + return (INT_PTR)TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + DoTest(hDlg); + EndDialog(hDlg, LOWORD(wParam)); + break; + + case IDCANCEL: + default: + EndDialog(hDlg, LOWORD(wParam)); + break; + } + return (INT_PTR)TRUE; + } + return (INT_PTR)FALSE; +} + +int APIENTRY wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + int nCmdShow) +{ + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); + + return DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_ABOUTBOX), NULL, About); +} diff --git a/modules/rostests/win32/user32/winstation/winstation.rc b/modules/rostests/win32/user32/winstation/winstation.rc new file mode 100644 index 0000000000..0e9e05ffe0 --- /dev/null +++ b/modules/rostests/win32/user32/winstation/winstation.rc @@ -0,0 +1,15 @@ + +#include <windef.h> +#include <winuser.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDD_ABOUTBOX DIALOGEX 0, 0, 170, 62 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Test WindowStation" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CTEXT "Test for WindowStation\nTo start the test, press on the button below.",IDC_STATIC,7,7,156,20,SS_NOPREFIX + DEFPUSHBUTTON "Start!",IDOK,7,32,156,23,WS_GROUP +END

1 0

01/03: [WINLOGON] Allow WinSta0 access only when needed. Also, reset the WinSta0 user as soon as we have logged-off.
by Hermès Bélusca-Maïto 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02eee253b2674f1a88d0d… commit 02eee253b2674f1a88d0dc1fd68e3deae8abbb16 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 17 01:44:00 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 22 19:03:17 2018 +0200 [WINLOGON] Allow WinSta0 access only when needed. Also, reset the WinSta0 user as soon as we have logged-off. --- base/system/winlogon/sas.c | 182 ++++++++++++++++++++-------------------- base/system/winlogon/winlogon.h | 22 ++++- base/system/winlogon/wlx.c | 5 +- 3 files changed, 115 insertions(+), 94 deletions(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index 1a57a4ad6e..0189953cff 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -43,6 +43,8 @@ typedef struct tagLOGOFF_SHUTDOWN_DATA static BOOL ExitReactOSInProgress = FALSE; +LUID LuidNone = {0, 0}; + /* FUNCTIONS ****************************************************************/ static BOOL @@ -425,6 +427,87 @@ PlayLogonSound( CloseHandle(hThread); } +static BOOL +AllowWinstaAccess(PWLSESSION Session) +{ + BOOL bSuccess = FALSE; + DWORD dwIndex; + DWORD dwLength = 0; + PTOKEN_GROUPS ptg = NULL; + PSID psid; + TOKEN_STATISTICS Stats; + DWORD cbStats; + DWORD ret; + + // Get required buffer size and allocate the TOKEN_GROUPS buffer. + + if (!GetTokenInformation(Session->UserToken, + TokenGroups, + ptg, + 0, + &dwLength)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return FALSE; + + ptg = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength); + if (ptg == NULL) + return FALSE; + } + + // Get the token group information from the access token. + if (!GetTokenInformation(Session->UserToken, + TokenGroups, + ptg, + dwLength, + &dwLength)) + { + goto Cleanup; + } + + // Loop through the groups to find the logon SID. + + for (dwIndex = 0; dwIndex < ptg->GroupCount; dwIndex++) + { + if ((ptg->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID) + == SE_GROUP_LOGON_ID) + { + psid = ptg->Groups[dwIndex].Sid; + break; + } + } + + dwLength = GetLengthSid(psid); + + if (!GetTokenInformation(Session->UserToken, + TokenStatistics, + &Stats, + sizeof(TOKEN_STATISTICS), + &cbStats)) + { + WARN("Couldn't get Authentication id from user token!\n"); + goto Cleanup; + } + + AddAceToWindowStation(Session->InteractiveWindowStation, psid); + + ret = SetWindowStationUser(Session->InteractiveWindowStation, + &Stats.AuthenticationId, + psid, + dwLength); + TRACE("SetWindowStationUser returned 0x%x\n", ret); + + bSuccess = TRUE; + +Cleanup: + + // Free the buffer for the token groups. + if (ptg != NULL) + HeapFree(GetProcessHeap(), 0, (LPVOID)ptg); + + return bSuccess; +} + static BOOL HandleLogon( @@ -485,6 +568,8 @@ HandleLogon( goto cleanup; } + AllowWinstaAccess(Session); + if (!StartUserShell(Session)) { //WCHAR StatusMsg[256]; @@ -520,6 +605,8 @@ cleanup: RemoveStatusMessage(Session); if (!ret) { + SetWindowStationUser(Session->InteractiveWindowStation, + &LuidNone, NULL, 0); CloseHandle(Session->UserToken); Session->UserToken = NULL; } @@ -792,6 +879,11 @@ HandleLogoff( SwitchDesktop(Session->WinlogonDesktop); + // TODO: Play logoff sound! + + SetWindowStationUser(Session->InteractiveWindowStation, + &LuidNone, NULL, 0); + // DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOGGINGOFF); // FIXME: Closing network connections! @@ -1045,94 +1137,6 @@ DoGenericAction( } } -DWORD WINAPI SetWindowStationUser(HWINSTA hWinSta, LUID* pluid, PSID psid, DWORD sidSize); - -BOOL -AddAceToWindowStation( - IN HWINSTA WinSta, - IN PSID Sid); - -static -BOOL AllowWinstaAccess(PWLSESSION Session) -{ - BOOL bSuccess = FALSE; - DWORD dwIndex; - DWORD dwLength = 0; - PTOKEN_GROUPS ptg = NULL; - PSID psid; - TOKEN_STATISTICS Stats; - DWORD cbStats; - DWORD ret; - - // Get required buffer size and allocate the TOKEN_GROUPS buffer. - - if (!GetTokenInformation(Session->UserToken, - TokenGroups, - ptg, - 0, - &dwLength)) - { - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - return FALSE; - - ptg = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength); - if (ptg == NULL) - return FALSE; - } - - // Get the token group information from the access token. - if (!GetTokenInformation(Session->UserToken, - TokenGroups, - ptg, - dwLength, - &dwLength)) - { - goto Cleanup; - } - - // Loop through the groups to find the logon SID. - - for (dwIndex = 0; dwIndex < ptg->GroupCount; dwIndex++) - { - if ((ptg->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID) - == SE_GROUP_LOGON_ID) - { - psid = ptg->Groups[dwIndex].Sid; - break; - } - } - - dwLength = GetLengthSid(psid); - - if (!GetTokenInformation(Session->UserToken, - TokenStatistics, - &Stats, - sizeof(TOKEN_STATISTICS), - &cbStats)) - { - WARN("Couldn't get Authentication id from user token!\n"); - goto Cleanup; - } - - AddAceToWindowStation(Session->InteractiveWindowStation, psid); - - ret = SetWindowStationUser(Session->InteractiveWindowStation, - &Stats.AuthenticationId, - psid, - dwLength); - TRACE("SetWindowStationUser returned 0x%x\n", ret); - - bSuccess = TRUE; - -Cleanup: - - // Free the buffer for the token groups. - if (ptg != NULL) - HeapFree(GetProcessHeap(), 0, (LPVOID)ptg); - - return bSuccess; -} - static VOID DispatchSAS( @@ -1169,8 +1173,6 @@ DispatchSAS( &Session->UserToken, &Session->MprNotifyInfo, (PVOID*)&Session->Profile); - - AllowWinstaAccess(Session); break; case STATE_LOGGED_OFF_SAS: diff --git a/base/system/winlogon/winlogon.h b/base/system/winlogon/winlogon.h index 37960e2367..f1467c9c5c 100644 --- a/base/system/winlogon/winlogon.h +++ b/base/system/winlogon/winlogon.h @@ -43,6 +43,14 @@ #include <reactos/undocuser.h> +BOOL +WINAPI +SetWindowStationUser( + IN HWINSTA hWindowStation, + IN PLUID pluid, + IN PSID psid OPTIONAL, + IN DWORD size); + #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winlogon); @@ -292,9 +300,15 @@ BOOL StartRpcServer(VOID); /* sas.c */ +extern LUID LuidNone; + BOOL SetDefaultLanguage(IN PWLSESSION Session); +NTSTATUS +HandleShutdown(IN OUT PWLSESSION Session, + IN DWORD wlxAction); + BOOL InitializeSAS(IN OUT PWLSESSION Session); @@ -348,12 +362,14 @@ CloseAllDialogWindows(VOID); BOOL GinaInit(IN OUT PWLSESSION Session); +BOOL +AddAceToWindowStation( + IN HWINSTA WinSta, + IN PSID Sid); + BOOL CreateWindowStationAndDesktops(IN OUT PWLSESSION Session); -NTSTATUS -HandleShutdown(IN OUT PWLSESSION Session, - IN DWORD wlxAction); VOID WINAPI WlxUseCtrlAltDel(HANDLE hWlx); VOID WINAPI WlxSetContextPointer(HANDLE hWlx, PVOID pWlxContext); diff --git a/base/system/winlogon/wlx.c b/base/system/winlogon/wlx.c index 5557e7fbf5..89289c08a9 100644 --- a/base/system/winlogon/wlx.c +++ b/base/system/winlogon/wlx.c @@ -1271,7 +1271,7 @@ CreateWindowStationAndDesktops( NULL, 0, MAXIMUM_ALLOWED, - &DefaultSecurity); + &DefaultSecurity); // FIXME: Must use restricted Winlogon-only security!! if (!Session->WinlogonDesktop) { ERR("WL: Failed to create Winlogon desktop (%lu)\n", GetLastError()); @@ -1304,6 +1304,9 @@ CreateWindowStationAndDesktops( goto cleanup; } + SetWindowStationUser(Session->InteractiveWindowStation, + &LuidNone, NULL, 0); + ret = TRUE; cleanup:

1 0

01/01: [LDR] Release the loader lock the same way it was acquired
by Mark Jansen 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c48edb58c478cf6ab8df… commit 9c48edb58c478cf6ab8df0b6bf4b7cd3edab7983 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 22 17:17:36 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jul 22 17:17:36 2018 +0200 [LDR] Release the loader lock the same way it was acquired --- dll/ntdll/ldr/ldrutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 2542a9a324..5459d4a5d2 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -2626,7 +2626,7 @@ LdrpLoadDll(IN BOOLEAN Redirected, Quickie: /* Release the lock */ - if (!InInit) RtlLeaveCriticalSection(Peb->LoaderLock); + if (!InInit) RtlLeaveCriticalSection(&LdrpLoaderLock); /* Check for success */ if (NT_SUCCESS(Status))

1 0

01/01: [SERVICES] Add a checks for vaild info level to RChangeServiceConfig2A/W and RQueryServiceConfig2A/W
by Eric Kohl 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91a5ee334d3961157b1b5… commit 91a5ee334d3961157b1b52140911ae1f03b6cc71 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 22 12:45:23 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 22 12:45:23 2018 +0200 [SERVICES] Add a checks for vaild info level to RChangeServiceConfig2A/W and RQueryServiceConfig2A/W CORE-14837 --- base/system/services/rpcserver.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 0d75aae927..2e6e8087f1 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -5104,6 +5104,10 @@ RChangeServiceConfig2A( DPRINT("RChangeServiceConfig2A() called\n"); DPRINT("dwInfoLevel = %lu\n", Info.dwInfoLevel); + if ((Info.dwInfoLevel < SERVICE_CONFIG_DESCRIPTION) || + (Info.dwInfoLevel > SERVICE_CONFIG_FAILURE_ACTIONS)) + return ERROR_INVALID_LEVEL; + InfoW.dwInfoLevel = Info.dwInfoLevel; if (InfoW.dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) @@ -5502,6 +5506,10 @@ RChangeServiceConfig2W( if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; + if ((Info.dwInfoLevel < SERVICE_CONFIG_DESCRIPTION) || + (Info.dwInfoLevel > SERVICE_CONFIG_FAILURE_ACTIONS)) + return ERROR_INVALID_LEVEL; + hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { @@ -5638,6 +5646,10 @@ RQueryServiceConfig2A( if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; + if ((dwInfoLevel < SERVICE_CONFIG_DESCRIPTION) || + (dwInfoLevel > SERVICE_CONFIG_FAILURE_ACTIONS)) + return ERROR_INVALID_LEVEL; + hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { @@ -5876,6 +5888,10 @@ RQueryServiceConfig2W( if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; + if ((dwInfoLevel < SERVICE_CONFIG_DESCRIPTION) || + (dwInfoLevel > SERVICE_CONFIG_FAILURE_ACTIONS)) + return ERROR_INVALID_LEVEL; + hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) {

1 0

01/01: [NET] Add the workstations option to the user command
by Eric Kohl 21 Jul '18

21 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=add1be24a7ee38687218f… commit add1be24a7ee38687218f09e3960bf633d383a07 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jul 21 22:13:49 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jul 21 22:13:49 2018 +0200 [NET] Add the workstations option to the user command --- base/applications/network/net/cmdUser.c | 126 +++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index 3e188de932..ec96c8163b 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -387,6 +387,107 @@ GenerateRandomPassword( } +static +NET_API_STATUS +BuildWorkstationsList( + _Out_ PWSTR *pWorkstationsList, + _In_ PWSTR pRaw) +{ + BOOL isLastSep, isSep; + INT i, j; + WCHAR c; + INT nLength = 0; + INT nArgs = 0; + INT nRawLength; + PWSTR pList; + + /* Check for invalid characters in the raw string */ + if (wcspbrk(pRaw, L"/[]=?\\+:.") != NULL) + return 3952; + + /* Count the number of workstations in the list and + * the required buffer size */ + isLastSep = FALSE; + isSep = FALSE; + nRawLength = wcslen(pRaw); + for (i = 0; i < nRawLength; i++) + { + c = pRaw[i]; + if (c == L',' || c == L';') + isSep = TRUE; + + if (isSep == TRUE) + { + if ((isLastSep == FALSE) && (i != 0) && (i != nRawLength - 1)) + nLength++; + } + else + { + nLength++; + + if (isLastSep == TRUE || (isLastSep == FALSE && i == 0)) + nArgs++; + } + + isLastSep = isSep; + isSep = FALSE; + } + + nLength++; + + /* Leave, if there are no workstations in the list */ + if (nArgs == 0) + { + pWorkstationsList = NULL; + return NERR_Success; + } + + /* Fail if there are more than eight workstations in the list */ + if (nArgs > 8) + return 3951; + + /* Allocate the buffer for the clean workstation list */ + pList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength * sizeof(WCHAR)); + if (pList == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + /* Build the clean workstation list */ + isLastSep = FALSE; + isSep = FALSE; + nRawLength = wcslen(pRaw); + for (i = 0, j = 0; i < nRawLength; i++) + { + c = pRaw[i]; + if (c == L',' || c == L';') + isSep = TRUE; + + if (isSep == TRUE) + { + if ((isLastSep == FALSE) && (i != 0) && (i != nRawLength - 1)) + { + pList[j] = L','; + j++; + } + } + else + { + pList[j] = c; + j++; + + if (isLastSep == TRUE || (isLastSep == FALSE && i == 0)) + nArgs++; + } + + isLastSep = isSep; + isSep = FALSE; + } + + *pWorkstationsList = pList; + + return NERR_Success; +} + + INT cmdUser( INT argc, @@ -404,6 +505,7 @@ cmdUser( LPWSTR lpPassword = NULL; PUSER_INFO_4 pUserInfo = NULL; USER_INFO_4 UserInfo; + LPWSTR pWorkstations = NULL; LPWSTR p; LPWSTR endptr; DWORD value; @@ -622,8 +724,25 @@ cmdUser( } else if (_wcsnicmp(argv[j], L"/workstations:", 14) == 0) { - /* FIXME */ - ConResPrintf(StdErr, IDS_ERROR_OPTION_NOT_SUPPORTED, L"/WORKSTATIONS"); + p = &argv[i][14]; + if (wcscmp(p, L"*") == 0 || wcscmp(p, L"") == 0) + { + pUserInfo->usri4_workstations = NULL; + } + else + { + Status = BuildWorkstationsList(&pWorkstations, p); + if (Status == NERR_Success) + { + pUserInfo->usri4_workstations = pWorkstations; + } + else + { + ConPrintf(StdOut, L"Status %lu\n\n", Status); + result = 1; + goto done; + } + } } } @@ -662,6 +781,9 @@ cmdUser( } done: + if (pWorkstations != NULL) + HeapFree(GetProcessHeap(), 0, pWorkstations); + if ((bPasswordAllocated == TRUE) && (lpPassword != NULL)) HeapFree(GetProcessHeap(), 0, lpPassword);

1 0

02/02: [WINLOGON] When starting Setup (which runs with SYSTEM credentials), explicitly specify on which window station and desktop we start it, so as to avoid the default choice of the non-interactive Service-0x0-3e7$ window station. Also, switch to the WinSta0\Default desktop just only before starting Setup, and restore Winlogon setup when it finishes.
by Hermès Bélusca-Maïto 17 Jul '18

17 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcec1fd6c37677d46d689… commit bcec1fd6c37677d46d6890d270bb1e27d17f8f34 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 17 01:49:07 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jul 17 01:59:51 2018 +0200 [WINLOGON] When starting Setup (which runs with SYSTEM credentials), explicitly specify on which window station and desktop we start it, so as to avoid the default choice of the non-interactive Service-0x0-3e7$ window station. Also, switch to the WinSta0\Default desktop just only before starting Setup, and restore Winlogon setup when it finishes. --- base/system/winlogon/setup.c | 9 +++++++-- base/system/winlogon/winlogon.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/base/system/winlogon/setup.c b/base/system/winlogon/setup.c index 7cec968e0e..f5ef367318 100644 --- a/base/system/winlogon/setup.c +++ b/base/system/winlogon/setup.c @@ -96,7 +96,7 @@ RunSetupThreadProc( /* Expand string (if applicable) */ if (dwType == REG_EXPAND_SZ) - ExpandEnvironmentStringsW(Shell, CommandLine, MAX_PATH); + ExpandEnvironmentStringsW(Shell, CommandLine, ARRAYSIZE(CommandLine)); else if (dwType == REG_SZ) wcscpy(CommandLine, Shell); else @@ -104,10 +104,12 @@ RunSetupThreadProc( TRACE("Should run '%s' now\n", debugstr_w(CommandLine)); + SwitchDesktop(WLSession->ApplicationDesktop); + /* Start process */ StartupInfo.cb = sizeof(StartupInfo); StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = NULL; + StartupInfo.lpDesktop = L"WinSta0\\Default"; StartupInfo.lpTitle = NULL; StartupInfo.dwFlags = 0; StartupInfo.cbReserved2 = 0; @@ -126,6 +128,7 @@ RunSetupThreadProc( if (!Result) { TRACE("Failed to run setup process\n"); + SwitchDesktop(WLSession->WinlogonDesktop); return FALSE; } @@ -138,6 +141,8 @@ RunSetupThreadProc( CloseHandle(ProcessInformation.hThread); CloseHandle(ProcessInformation.hProcess); + SwitchDesktop(WLSession->WinlogonDesktop); + TRACE ("RunSetup() done\n"); return TRUE; diff --git a/base/system/winlogon/winlogon.c b/base/system/winlogon/winlogon.c index 2b2e5303f6..eeba3a2334 100644 --- a/base/system/winlogon/winlogon.c +++ b/base/system/winlogon/winlogon.c @@ -453,14 +453,14 @@ WinMain( /* Check for pending setup */ if (GetSetupType() != 0) { - TRACE("WL: Setup mode detected\n"); - /* Run setup and reboot when done */ - SwitchDesktop(WLSession->ApplicationDesktop); + TRACE("WL: Setup mode detected\n"); RunSetup(); } else + { PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_CTRL_ALT_DEL, 0); + } (void)LoadLibraryW(L"sfc_os.dll");

1 0

01/02: [PSDK] Fix a typo. Has also been caught independently by George Bișoc (#686).
by Hermès Bélusca-Maïto 17 Jul '18

17 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1c7fd08e9ec38e97914f… commit b1c7fd08e9ec38e97914f31127bc6568a851f77a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 15 23:18:32 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jul 17 01:59:51 2018 +0200 [PSDK] Fix a typo. Has also been caught independently by George Bișoc (#686). --- sdk/include/psdk/winuser.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 60a92d6dfc..07613795e4 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -5406,7 +5406,7 @@ BOOL WINAPI GetLayeredWindowAttributes(_In_ HWND, _Out_opt_ COLORREF*, _Out_opt_ #define EDITWORDBREAKPROC EDITWORDBREAKPROCW #define PROPENUMPROC PROPENUMPROCW #define PROPENUMPROCEX PROPENUMPROCEXW -#define DEKSTOPENUMPROC DEKSTOPENUMPROCW +#define DESKTOPENUMPROC DESKTOPENUMPROCW #define WINSTAENUMPROC WINSTAENUMPROCW #define PROPENUMPROC PROPENUMPROCW #define PROPENUMPROCEX PROPENUMPROCEXW @@ -5572,7 +5572,7 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX; #define EDITWORDBREAKPROC EDITWORDBREAKPROCA #define PROPENUMPROC PROPENUMPROCA #define PROPENUMPROCEX PROPENUMPROCEXA -#define DEKSTOPENUMPROC DEKSTOPENUMPROCA +#define DESKTOPENUMPROC DESKTOPENUMPROCA #define WINSTAENUMPROC WINSTAENUMPROCA #define PROPENUMPROC PROPENUMPROCA #define PROPENUMPROCEX PROPENUMPROCEXA

1 0

01/01: [ASM] Fixed ".double" macro in asm.inc. GAS uses ".double" symbol for declaring floating-point constants and ".quad" symbol for declaring 64-bit numbers. This is not compatible with our macro for MASM and introduces bugs. Now 64-bit constants are supposed to be declared using ".quad" macro.
by Victor Perevertkin 15 Jul '18

15 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ae1675208bb05e43c91b… commit 2ae1675208bb05e43c91b5762a10d1292298f420 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Sun Jul 15 18:49:49 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 15 23:25:23 2018 +0200 [ASM] Fixed ".double" macro in asm.inc. GAS uses ".double" symbol for declaring floating-point constants and ".quad" symbol for declaring 64-bit numbers. This is not compatible with our macro for MASM and introduces bugs. Now 64-bit constants are supposed to be declared using ".quad" macro. --- boot/freeldr/freeldr/arch/amd64/entry.S | 4 ++-- sdk/include/asm/asm.inc | 6 +++++- sdk/lib/crt/except/amd64/cpp.s | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/arch/amd64/entry.S b/boot/freeldr/freeldr/arch/amd64/entry.S index a5b7fd6770..075778f884 100644 --- a/boot/freeldr/freeldr/arch/amd64/entry.S +++ b/boot/freeldr/freeldr/arch/amd64/entry.S @@ -25,7 +25,7 @@ RealEntryPoint: jmp qword ptr [ContinueAddress] ContinueAddress: - .double offset FrldrStartup + .quad offset FrldrStartup FrldrStartup: @@ -120,7 +120,7 @@ CallRealMode_return: /* 64-bit stack pointer */ stack64: - .double STACKADDR + .quad STACKADDR PUBLIC FrldrBootDrive FrldrBootDrive: diff --git a/sdk/include/asm/asm.inc b/sdk/include/asm/asm.inc index 3b4dfe1458..e94a078445 100644 --- a/sdk/include/asm/asm.inc +++ b/sdk/include/asm/asm.inc @@ -136,10 +136,14 @@ ENDM dd args ENDM -.double MACRO args:VARARG +.quad MACRO args:VARARG dq args ENDM +.double MACRO args:VARARG + real8 args +ENDM + .org MACRO value ORG value ENDM diff --git a/sdk/lib/crt/except/amd64/cpp.s b/sdk/lib/crt/except/amd64/cpp.s index a5ead9508b..3be32c9648 100644 --- a/sdk/lib/crt/except/amd64/cpp.s +++ b/sdk/lib/crt/except/amd64/cpp.s @@ -8,18 +8,18 @@ MACRO(START_VTABLE, shortname, cxxname) EXTERN shortname&_rtti:PROC EXTERN MSVCRT_&shortname&_vector_dtor:PROC - .double shortname&_rtti + .quad shortname&_rtti PUBLIC MSVCRT_&shortname&_vtable MSVCRT_&shortname&_vtable: PUBLIC &cxxname &cxxname: - .double MSVCRT_&shortname&_vector_dtor + .quad MSVCRT_&shortname&_vector_dtor ENDM MACRO(DEFINE_EXCEPTION_VTABLE, shortname, cxxname) START_VTABLE shortname, cxxname EXTERN MSVCRT_what_exception:ABS - .double MSVCRT_what_exception + .quad MSVCRT_what_exception ENDM START_VTABLE type_info, __dummyname_type_info

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs