Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 05/14: [NTOS:EX] Fix 64 bit issues in ExfWaitForRundownProtectionReleaseCacheAware

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42730f9373fb340bb0dd5… commit 42730f9373fb340bb0dd5639bc36d3c898d5999a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 13 13:35:51 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [NTOS:EX] Fix 64 bit issues in ExfWaitForRundownProtectionReleaseCacheAware --- ntoskrnl/ex/rundown.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/ex/rundown.c b/ntoskrnl/ex/rundown.c index e413fa2c7d..be9e6fc6f2 100644 --- a/ntoskrnl/ex/rundown.c +++ b/ntoskrnl/ex/rundown.c @@ -440,7 +440,7 @@ ExfWaitForRundownProtectionReleaseCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunR PEX_RUNDOWN_REF RunRef; EX_RUNDOWN_WAIT_BLOCK WaitBlock; PEX_RUNDOWN_WAIT_BLOCK WaitBlockPointer; - ULONG ProcCount, Current, Value, OldValue, TotalCount; + ULONG_PTR ProcCount, Current, Value, OldValue, TotalCount; ProcCount = RunRefCacheAware->Number; /* No proc, nothing to do */ @@ -480,7 +480,7 @@ ExfWaitForRundownProtectionReleaseCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunR } /* Sanity check: we didn't overflow */ - ASSERT((LONG)TotalCount >= 0); + ASSERT((LONG_PTR)TotalCount >= 0); if (TotalCount != 0) { /* Init the waitblock event */ @@ -490,8 +490,8 @@ ExfWaitForRundownProtectionReleaseCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunR /* Do we have to wait? If so, go ahead! */ if (InterlockedExchangeAddSizeT(&WaitBlock.Count, - (LONG)TotalCount >> EX_RUNDOWN_COUNT_SHIFT) == - -(LONG)(TotalCount >> EX_RUNDOWN_COUNT_SHIFT)) + (LONG_PTR)TotalCount >> EX_RUNDOWN_COUNT_SHIFT) == + -(LONG_PTR)(TotalCount >> EX_RUNDOWN_COUNT_SHIFT)) { KeWaitForSingleObject(&WaitBlock.WakeEvent, Executive, KernelMode, FALSE, NULL); }

5 years, 9 months

[reactos] 04/14: [PSDK] Improve definition of CBR_BLOCK

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=252114a3a163be3a61fb8… commit 252114a3a163be3a61fb8c8c29146cdb0b677dbf Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 13 13:42:23 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [PSDK] Improve definition of CBR_BLOCK The cast doesn't exist in native headers, but this causes warnings. --- sdk/include/psdk/ddeml.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/psdk/ddeml.h b/sdk/include/psdk/ddeml.h index b755497f93..33f1503e07 100644 --- a/sdk/include/psdk/ddeml.h +++ b/sdk/include/psdk/ddeml.h @@ -114,7 +114,7 @@ extern "C" { #define CBF_SKIP_DISCONNECTS 0x00200000 #define CBF_SKIP_ALLNOTIFICATIONS 0x003c0000 -#define CBR_BLOCK ((HDDEDATA)~0UL) +#define CBR_BLOCK ((HDDEDATA)(LONG_PTR)-1) /* * Application command flags

5 years, 9 months

[reactos] 03/14: [PSDK] Fix PRINTDLG structure definition

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6756e1adaff404e63754d… commit 6756e1adaff404e63754d0ed7e0b387cab1d950f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 7 02:21:10 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [PSDK] Fix PRINTDLG structure definition --- sdk/include/psdk/commdlg.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sdk/include/psdk/commdlg.h b/sdk/include/psdk/commdlg.h index 4680cca8c1..f69be04b55 100644 --- a/sdk/include/psdk/commdlg.h +++ b/sdk/include/psdk/commdlg.h @@ -464,8 +464,8 @@ typedef struct tagPSDW { typedef struct tagPDA { DWORD lStructSize; HWND hwndOwner; - HANDLE hDevMode; - HANDLE hDevNames; + HGLOBAL hDevMode; + HGLOBAL hDevNames; HDC hDC; DWORD Flags; WORD nFromPage; @@ -474,19 +474,19 @@ typedef struct tagPDA { WORD nMaxPage; WORD nCopies; HINSTANCE hInstance; - DWORD lCustData; + LPARAM lCustData; LPPRINTHOOKPROC lpfnPrintHook; LPSETUPHOOKPROC lpfnSetupHook; LPCSTR lpPrintTemplateName; LPCSTR lpSetupTemplateName; - HANDLE hPrintTemplate; - HANDLE hSetupTemplate; -} PRINTDLGA,*LPPRINTDLGA; + HGLOBAL hPrintTemplate; + HGLOBAL hSetupTemplate; +} PRINTDLGA, *LPPRINTDLGA; typedef struct tagPDW { DWORD lStructSize; HWND hwndOwner; - HANDLE hDevMode; - HANDLE hDevNames; + HGLOBAL hDevMode; + HGLOBAL hDevNames; HDC hDC; DWORD Flags; WORD nFromPage; @@ -495,14 +495,14 @@ typedef struct tagPDW { WORD nMaxPage; WORD nCopies; HINSTANCE hInstance; - DWORD lCustData; + LPARAM lCustData; LPPRINTHOOKPROC lpfnPrintHook; LPSETUPHOOKPROC lpfnSetupHook; LPCWSTR lpPrintTemplateName; LPCWSTR lpSetupTemplateName; - HANDLE hPrintTemplate; - HANDLE hSetupTemplate; -} PRINTDLGW,*LPPRINTDLGW; + HGLOBAL hPrintTemplate; + HGLOBAL hSetupTemplate; +} PRINTDLGW, *LPPRINTDLGW; #if (WINVER >= 0x0500) && !defined (__OBJC__) #include <prsht.h> /* for HPROPSHEETPAGE */ typedef struct tagPRINTPAGERANGE {

5 years, 9 months

[reactos] 02/14: [MKISOFS] Silence MSVC warnings

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ddf034ab4e40a84ed9fa… commit 6ddf034ab4e40a84ed9fad88b4f36a7a5f47d278 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 6 17:31:43 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [MKISOFS] Silence MSVC warnings --- sdk/tools/mkisofs/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk/tools/mkisofs/CMakeLists.txt b/sdk/tools/mkisofs/CMakeLists.txt index 37d85bcbe0..a045c03dd5 100644 --- a/sdk/tools/mkisofs/CMakeLists.txt +++ b/sdk/tools/mkisofs/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions( -DDUPLICATES_ONCE - -DINS_BASE="\\".\\"" + -DINS_BASE="\\\".\\\"" -DSCHILY_BUILD -DSORTING) @@ -84,6 +84,11 @@ if(MSVC) # mkisofs uses K&R-style function definitions to support very old compilers. # MSVC complains about the resulting foo() vs. foo(void) mismatches. add_target_compile_flags(mkisofs "/wd4113") + + if (ARCH STREQUAL "amd64") + # Disable warning "conversion from 'size_t' to 'int', possible loss of data" + add_target_compile_flags(mkisofs "/wd4267") + endif() else() # libschily implements an own printf function with support for the %r formatter. # Silence compilers checking for invalid formatting sequences.

5 years, 9 months

[reactos] 01/14: [WIDL] Fix non-x86 builds

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73c776c744f26b294a5e6… commit 73c776c744f26b294a5e6bc7e1fc11b374b05c17 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Feb 2 11:46:19 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [WIDL] Fix non-x86 builds --- sdk/tools/widl/widl.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sdk/tools/widl/widl.c b/sdk/tools/widl/widl.c index 77d4b7750a..ec1e61e22a 100644 --- a/sdk/tools/widl/widl.c +++ b/sdk/tools/widl/widl.c @@ -92,15 +92,16 @@ static const char usage[] = static const char version_string[] = "Wine IDL Compiler version " PACKAGE_VERSION "\n" "Copyright 2002 Ove Kaaven\n"; -#ifdef __i386__ +// __REACTOS__!! We must use TARGET_ macros here! +#ifdef TARGET_i386 enum target_cpu target_cpu = CPU_x86; -#elif defined(__x86_64__) +#elif defined(TARGET_amd64) enum target_cpu target_cpu = CPU_x86_64; -#elif defined(__powerpc__) +#elif defined(TARGET_ppc) enum target_cpu target_cpu = CPU_POWERPC; -#elif defined(__arm__) +#elif defined(TARGET_arm) enum target_cpu target_cpu = CPU_ARM; -#elif defined(__aarch64__) +#elif defined(TARGET_arm64) enum target_cpu target_cpu = CPU_ARM64; #else #error Unsupported CPU

5 years, 9 months

[reactos] 01/01: [NtGDI] Use flag for text align mode.

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf7bea11b2b15c0ce6734… commit cf7bea11b2b15c0ce6734dd84225bf93f2fe9e15 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Mon Mar 4 12:17:00 2019 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Mon Mar 4 12:17:00 2019 -0600 [NtGDI] Use flag for text align mode. Use the lTextAlign instead of the user one for internal use. --- win32ss/gdi/ntgdi/dcutil.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/win32ss/gdi/ntgdi/dcutil.c b/win32ss/gdi/ntgdi/dcutil.c index ca9e4c9929..aa130f02d7 100644 --- a/win32ss/gdi/ntgdi/dcutil.c +++ b/win32ss/gdi/ntgdi/dcutil.c @@ -158,6 +158,11 @@ IntGdiSetTextAlign(HDC hDC, pdcattr = dc->pdcattr; prevAlign = pdcattr->lTextAlign; pdcattr->lTextAlign = Mode; + if (pdcattr->dwLayout & LAYOUT_RTL) + { + if ((Mode & TA_CENTER) != TA_CENTER) Mode ^= TA_RIGHT; + } + pdcattr->flTextAlign = Mode & TA_MASK; DC_UnlockDc(dc); return prevAlign; }

5 years, 9 months

[reactos] 01/01: [MSV1_0] Check logon hours and workstation names on logon. Also return the machine name on logon and fix the LOGONSERVER environment variable.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac73ba7db6db781b23d09… commit ac73ba7db6db781b23d097d4518ec4f135f2e0bd Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Mar 4 17:25:11 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Mar 4 17:26:27 2019 +0100 [MSV1_0] Check logon hours and workstation names on logon. Also return the machine name on logon and fix the LOGONSERVER environment variable. --- dll/win32/msv1_0/msv1_0.c | 133 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 114 insertions(+), 19 deletions(-) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 9ff2b92234..6529cd0511 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -94,7 +94,7 @@ static NTSTATUS BuildInteractiveProfileBuffer(IN PLSA_CLIENT_REQUEST ClientRequest, IN PSAMPR_USER_INFO_BUFFER UserInfo, - IN PUNICODE_STRING LogonServer, + IN PWSTR ComputerName, OUT PMSV1_0_INTERACTIVE_PROFILE *ProfileBuffer, OUT PULONG ProfileBufferLength) { @@ -113,7 +113,7 @@ BuildInteractiveProfileBuffer(IN PLSA_CLIENT_REQUEST ClientRequest, UserInfo->All.HomeDirectoryDrive.Length + sizeof(WCHAR) + UserInfo->All.ScriptPath.Length + sizeof(WCHAR) + UserInfo->All.ProfilePath.Length + sizeof(WCHAR) + - LogonServer->Length + sizeof(WCHAR); + ((wcslen(ComputerName) + 3) * sizeof(WCHAR)); LocalBuffer = DispatchTable.AllocateLsaHeap(BufferLength); if (LocalBuffer == NULL) @@ -204,12 +204,11 @@ BuildInteractiveProfileBuffer(IN PLSA_CLIENT_REQUEST ClientRequest, Ptr = (LPWSTR)((ULONG_PTR)Ptr + LocalBuffer->HomeDirectoryDrive.MaximumLength); - LocalBuffer->LogonServer.Length = LogonServer->Length; - LocalBuffer->LogonServer.MaximumLength = LogonServer->Length + sizeof(WCHAR); + LocalBuffer->LogonServer.Length = (wcslen(ComputerName) + 2) * sizeof(WCHAR); + LocalBuffer->LogonServer.MaximumLength = LocalBuffer->LogonServer.Length + sizeof(WCHAR); LocalBuffer->LogonServer.Buffer = (LPWSTR)((ULONG_PTR)ClientBaseAddress + (ULONG_PTR)Ptr - (ULONG_PTR)LocalBuffer); - memcpy(Ptr, - LogonServer->Buffer, - LogonServer->Length); + wcscpy(Ptr, L"\\"); + wcscat(Ptr, ComputerName); LocalBuffer->UserFlags = 0; @@ -844,6 +843,73 @@ done: } +static +BOOL +MsvpCheckLogonHours( + _In_ PSAMPR_LOGON_HOURS LogonHours, + _In_ PLARGE_INTEGER LogonTime) +{ + LARGE_INTEGER LocalLogonTime; + TIME_FIELDS TimeFields; + USHORT MinutesPerUnit, Offset; + + TRACE("MsvpCheckLogonHours(%p %p)\n", LogonHours, LogonTime); + + if (LogonHours->UnitsPerWeek == 0 || LogonHours->LogonHours == NULL) + return TRUE; + + RtlSystemTimeToLocalTime(LogonTime, &LocalLogonTime); + RtlTimeToTimeFields(&LocalLogonTime, &TimeFields); + + TRACE("UnitsPerWeek: %u\n", LogonHours->UnitsPerWeek); + MinutesPerUnit = 10080 / LogonHours->UnitsPerWeek; + + Offset = ((TimeFields.Weekday * 24 + TimeFields.Hour) * 60 + TimeFields.Minute) / MinutesPerUnit; + + return (BOOL)(LogonHours->LogonHours[Offset / 8] & (1 << (Offset % 8))); +} + + +static +BOOL +MsvpCheckWorkstations( + _In_ PRPC_UNICODE_STRING WorkStations, + _In_ PWSTR ComputerName) +{ + PWSTR pStart, pEnd; + BOOL bFound = FALSE; + + TRACE("MsvpCheckWorkstations(%wZ %S)\n", WorkStations, ComputerName); + + if (WorkStations->Length == 0 || WorkStations->Buffer == NULL) + return TRUE; + + pStart = WorkStations->Buffer; + for (;;) + { + pEnd = wcschr(pStart, L','); + if (pEnd != NULL) + *pEnd = UNICODE_NULL; + + if (_wcsicmp(ComputerName, pStart) == 0) + { + bFound = TRUE; + if (pEnd != NULL) + *pEnd = L','; + break; + } + + if (pEnd == NULL) + break; + + *pEnd = L','; + pStart = pEnd + 1; + } + + return bFound; +} + + /* * @unimplemented */ @@ -944,7 +1010,7 @@ LsaApCallPackageUntrusted(IN PLSA_CLIENT_REQUEST ClientRequest, /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -1008,7 +1074,7 @@ LsaApLogonTerminated(IN PLUID LogonId) /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -1026,11 +1092,11 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, OUT PUNICODE_STRING *AccountName, OUT PUNICODE_STRING *AuthenticatingAuthority, OUT PUNICODE_STRING *MachineName, - OUT PSECPKG_PRIMARY_CRED PrimaryCredentials, - OUT PSECPKG_SUPPLEMENTAL_CRED_ARRAY *SupplementalCredentials) + OUT PSECPKG_PRIMARY_CRED PrimaryCredentials, /* Not supported yet */ + OUT PSECPKG_SUPPLEMENTAL_CRED_ARRAY *SupplementalCredentials) /* Not supported yet */ { PMSV1_0_INTERACTIVE_LOGON LogonInfo; - + WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; SAMPR_HANDLE ServerHandle = NULL; SAMPR_HANDLE DomainHandle = NULL; SAMPR_HANDLE UserHandle = NULL; @@ -1039,12 +1105,12 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, SAMPR_ULONG_ARRAY RelativeIds = {0, NULL}; SAMPR_ULONG_ARRAY Use = {0, NULL}; PSAMPR_USER_INFO_BUFFER UserInfo = NULL; - UNICODE_STRING LogonServer; BOOLEAN SessionCreated = FALSE; LARGE_INTEGER LogonTime; LARGE_INTEGER AccountExpires; LARGE_INTEGER PasswordMustChange; LARGE_INTEGER PasswordLastSet; + DWORD ComputerNameSize; BOOL SpecialAccount = FALSE; NTSTATUS Status; @@ -1078,8 +1144,6 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, TRACE("Domain: %S\n", LogonInfo->LogonDomainName.Buffer); TRACE("User: %S\n", LogonInfo->UserName.Buffer); TRACE("Password: %S\n", LogonInfo->Password.Buffer); - - RtlInitUnicodeString(&LogonServer, L"Testserver"); } else { @@ -1090,6 +1154,10 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, /* Get the logon time */ NtQuerySystemTime(&LogonTime); + /* Get the computer name */ + ComputerNameSize = MAX_COMPUTERNAME_LENGTH + 1; + GetComputerNameW(ComputerName, &ComputerNameSize); + /* Check for special accounts */ if (_wcsicmp(LogonInfo->LogonDomainName.Buffer, L"NT AUTHORITY") == 0) { @@ -1291,9 +1359,23 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, goto done; } - /* FIXME: more checks */ - // STATUS_INVALID_LOGON_HOURS; - // STATUS_INVALID_WORKSTATION; + /* Check logon hours */ + if (!MsvpCheckLogonHours(&UserInfo->All.LogonHours, &LogonTime)) + { + ERR("Invalid logon hours!\n"); + *SubStatus = STATUS_INVALID_LOGON_HOURS; + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } + + /* Check workstations */ + if (!MsvpCheckWorkstations(&UserInfo->All.WorkStations, ComputerName)) + { + ERR("Invalid workstation!\n"); + *SubStatus = STATUS_INVALID_WORKSTATION; + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } } } @@ -1320,7 +1402,7 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, /* Build and fill the interactive profile buffer */ Status = BuildInteractiveProfileBuffer(ClientRequest, UserInfo, - &LogonServer, + ComputerName, (PMSV1_0_INTERACTIVE_PROFILE*)ProfileBuffer, ProfileBufferSize); if (!NT_SUCCESS(Status)) @@ -1390,6 +1472,19 @@ done: } } + /* Return the machine name */ + *MachineName = DispatchTable.AllocateLsaHeap(sizeof(UNICODE_STRING)); + if (*MachineName != NULL) + { + (*MachineName)->Buffer = DispatchTable.AllocateLsaHeap((ComputerNameSize + 1) * sizeof(WCHAR)); + if ((*MachineName)->Buffer != NULL) + { + (*MachineName)->MaximumLength = (ComputerNameSize + 1) * sizeof(WCHAR); + (*MachineName)->Length = ComputerNameSize * sizeof(WCHAR); + RtlCopyMemory((*MachineName)->Buffer, ComputerName, (*MachineName)->MaximumLength); + } + } + if (!NT_SUCCESS(Status)) { if (SessionCreated != FALSE)

5 years, 9 months

[reactos] 01/01: [SHELL32] Implement SHTestTokenMembership and forward IsUserAnAdmin to it Moved to the bottom of the file with the other ros functions to help keep wine syncs easier.

by Ged Murphy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0649f25b48753ed057151… commit 0649f25b48753ed05715104cd83058c6d1d60f48 Author: Ged Murphy <ged.murphy(a)crowdstrike.com> AuthorDate: Mon Mar 4 11:02:38 2019 +0000 Commit: Ged Murphy <ged.murphy(a)crowdstrike.com> CommitDate: Mon Mar 4 11:54:43 2019 +0000 [SHELL32] Implement SHTestTokenMembership and forward IsUserAnAdmin to it Moved to the bottom of the file with the other ros functions to help keep wine syncs easier. --- dll/win32/shell32/stubs.cpp | 11 --- dll/win32/shell32/wine/shellord.c | 143 ++++++++++++++++++-------------------- sdk/include/psdk/shellapi.h | 8 +++ 3 files changed, 76 insertions(+), 86 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 8bc2f65296..1c7996df8a 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -1316,17 +1316,6 @@ SHGetProcessDword(DWORD dwUnknown1, DWORD dwUnknown2) return 0; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHTestTokenMembership(HANDLE TokenHandle, ULONG SidToCheck) -{ - FIXME("SHTestTokenMembership() stub\n"); - return FALSE; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index e0bfb46bb9..ca737c1665 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -3,7 +3,7 @@ * (NT uses Unicode strings, 95 uses ASCII strings) * * Copyright 1997 Marcus Meissner - * 1998 J�rgen Schmied + * 1998 Jürgen Schmied * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1300,80 +1300,6 @@ BOOL WINAPI FileIconInit(BOOL bFullInit) return SIC_Initialize(); } -/************************************************************************* - * IsUserAnAdmin [SHELL32.680] NT 4.0 - * - * Checks whether the current user is a member of the Administrators group. - * - * PARAMS - * None - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI IsUserAnAdmin(VOID) -{ - SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; - HANDLE hToken; - DWORD dwSize; - PTOKEN_GROUPS lpGroups; - PSID lpSid; - DWORD i; - BOOL bResult = FALSE; - - TRACE("\n"); - if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) - { - return FALSE; - } - - if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) - { - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - CloseHandle(hToken); - return FALSE; - } - } - - lpGroups = HeapAlloc(GetProcessHeap(), 0, dwSize); - if (lpGroups == NULL) - { - CloseHandle(hToken); - return FALSE; - } - - if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) - { - HeapFree(GetProcessHeap(), 0, lpGroups); - CloseHandle(hToken); - return FALSE; - } - - CloseHandle(hToken); - if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, - &lpSid)) - { - HeapFree(GetProcessHeap(), 0, lpGroups); - return FALSE; - } - - for (i = 0; i < lpGroups->GroupCount; i++) - { - if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) - { - bResult = TRUE; - break; - } - } - - FreeSid(lpSid); - HeapFree(GetProcessHeap(), 0, lpGroups); - return bResult; -} - /************************************************************************* * SetAppStartingCursor [SHELL32.99] */ @@ -2149,3 +2075,70 @@ HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pcsfv, return hRes; } #endif + + +/************************************************************************* + * SHTestTokenMembership [SHELL32.245] + * + * Checks whether a given token is a mamber of a local group with the + * specified RID. + * + */ +EXTERN_C BOOL +WINAPI +SHTestTokenMembership(HANDLE TokenHandle, ULONG ulRID) +{ + SID_IDENTIFIER_AUTHORITY ntAuth = {SECURITY_NT_AUTHORITY}; + DWORD nSubAuthority0, nSubAuthority1; + DWORD nSubAuthorityCount; + PSID SidToCheck; + BOOL IsMember = FALSE; + + if ((ulRID == SECURITY_SERVICE_RID) || ulRID == SECURITY_LOCAL_SYSTEM_RID) + { + nSubAuthority0 = ulRID; + nSubAuthority1 = 0; + nSubAuthorityCount= 1; + } + else + { + nSubAuthority0 = SECURITY_BUILTIN_DOMAIN_RID; + nSubAuthority1 = ulRID; + nSubAuthorityCount= 2; + } + + if (!AllocateAndInitializeSid(&ntAuth, + nSubAuthorityCount, + nSubAuthority0, + nSubAuthority1, + 0, 0, 0, 0, 0, 0, + &SidToCheck)) + { + return FALSE; + } + + if (!CheckTokenMembership(TokenHandle, SidToCheck, &IsMember)) + { + IsMember = FALSE; + } + + FreeSid(SidToCheck); + return IsMember; +} + +/************************************************************************* + * IsUserAnAdmin [SHELL32.680] NT 4.0 + * + * Checks whether the current user is a member of the Administrators group. + * + * PARAMS + * None + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI IsUserAnAdmin(VOID) +{ + return SHTestTokenMembership(NULL, DOMAIN_ALIAS_RID_ADMINS); +} \ No newline at end of file diff --git a/sdk/include/psdk/shellapi.h b/sdk/include/psdk/shellapi.h index 34116c1792..b4a5ecb4f7 100644 --- a/sdk/include/psdk/shellapi.h +++ b/sdk/include/psdk/shellapi.h @@ -632,6 +632,14 @@ DoEnvironmentSubstW( _Inout_updates_(cchSrc) LPWSTR pszSrc, UINT cchSrc); +#if (_WIN32_IE >= 0x0601) +BOOL +WINAPI +SHTestTokenMembership( + _In_opt_ HANDLE hToken, + _In_ ULONG ulRID); +#endif + #ifdef UNICODE #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE #define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE

5 years, 9 months

[reactos] 01/01: [MSV1_0] Export LsaApLogonUserEx2 instead of LsaApLogonUser and remove the outdated logon functions.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6748d72c9ffc401813901… commit 6748d72c9ffc401813901706c3c48d64fa1cffd5 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Mar 4 10:20:10 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Mar 4 10:20:10 2019 +0100 [MSV1_0] Export LsaApLogonUserEx2 instead of LsaApLogonUser and remove the outdated logon functions. --- dll/win32/msv1_0/msv1_0.c | 106 +++++++++---------------------------------- dll/win32/msv1_0/msv1_0.spec | 4 +- 2 files changed, 23 insertions(+), 87 deletions(-) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index bdcdfc2f84..9ff2b92234 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -1012,19 +1012,22 @@ LsaApLogonTerminated(IN PLUID LogonId) */ NTSTATUS NTAPI -LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, - IN SECURITY_LOGON_TYPE LogonType, - IN PVOID AuthenticationInformation, - IN PVOID ClientAuthenticationBase, - IN ULONG AuthenticationInformationLength, - OUT PVOID *ProfileBuffer, - OUT PULONG ProfileBufferLength, - OUT PLUID LogonId, - OUT PNTSTATUS SubStatus, - OUT PLSA_TOKEN_INFORMATION_TYPE TokenInformationType, - OUT PVOID *TokenInformation, - OUT PLSA_UNICODE_STRING *AccountName, - OUT PLSA_UNICODE_STRING *AuthenticatingAuthority) +LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, + IN SECURITY_LOGON_TYPE LogonType, + IN PVOID ProtocolSubmitBuffer, + IN PVOID ClientBufferBase, + IN ULONG SubmitBufferSize, + OUT PVOID *ProfileBuffer, + OUT PULONG ProfileBufferSize, + OUT PLUID LogonId, + OUT PNTSTATUS SubStatus, + OUT PLSA_TOKEN_INFORMATION_TYPE TokenInformationType, + OUT PVOID *TokenInformation, + OUT PUNICODE_STRING *AccountName, + OUT PUNICODE_STRING *AuthenticatingAuthority, + OUT PUNICODE_STRING *MachineName, + OUT PSECPKG_PRIMARY_CRED PrimaryCredentials, + OUT PSECPKG_SUPPLEMENTAL_CRED_ARRAY *SupplementalCredentials) { PMSV1_0_INTERACTIVE_LOGON LogonInfo; @@ -1048,11 +1051,11 @@ LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, TRACE("LsaApLogonUser()\n"); TRACE("LogonType: %lu\n", LogonType); - TRACE("AuthenticationInformation: %p\n", AuthenticationInformation); - TRACE("AuthenticationInformationLength: %lu\n", AuthenticationInformationLength); + TRACE("ProtocolSubmitBuffer: %p\n", ProtocolSubmitBuffer); + TRACE("SubmitBufferSize: %lu\n", SubmitBufferSize); *ProfileBuffer = NULL; - *ProfileBufferLength = 0; + *ProfileBufferSize = 0; *SubStatus = STATUS_SUCCESS; *AccountName = NULL; *AuthenticatingAuthority = NULL; @@ -1063,10 +1066,10 @@ LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, { ULONG_PTR PtrOffset; - LogonInfo = (PMSV1_0_INTERACTIVE_LOGON)AuthenticationInformation; + LogonInfo = (PMSV1_0_INTERACTIVE_LOGON)ProtocolSubmitBuffer; /* Fix-up pointers in the authentication info */ - PtrOffset = (ULONG_PTR)AuthenticationInformation - (ULONG_PTR)ClientAuthenticationBase; + PtrOffset = (ULONG_PTR)ProtocolSubmitBuffer - (ULONG_PTR)ClientBufferBase; LogonInfo->LogonDomainName.Buffer = FIXUP_POINTER(LogonInfo->LogonDomainName.Buffer, PtrOffset); LogonInfo->UserName.Buffer = FIXUP_POINTER(LogonInfo->UserName.Buffer, PtrOffset); @@ -1319,7 +1322,7 @@ LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, UserInfo, &LogonServer, (PMSV1_0_INTERACTIVE_PROFILE*)ProfileBuffer, - ProfileBufferLength); + ProfileBufferSize); if (!NT_SUCCESS(Status)) { TRACE("BuildInteractiveProfileBuffer failed (Status %08lx)\n", Status); @@ -1429,69 +1432,4 @@ done: return Status; } - -/* - * @unimplemented - */ -#if 0 -NTSTATUS -NTAPI -LsaApLogonUserEx(IN PLSA_CLIENT_REQUEST ClientRequest, - IN SECURITY_LOGON_TYPE LogonType, - IN PVOID AuthenticationInformation, - IN PVOID ClientAuthenticationBase, - IN ULONG AuthenticationInformationLength, - OUT PVOID *ProfileBuffer, - OUT PULONG ProfileBufferLength, - OUT PLUID LogonId, - OUT PNTSTATUS SubStatus, - OUT PLSA_TOKEN_INFORMATION_TYPE TokenInformationType, - OUT PVOID *TokenInformation, - OUT PUNICODE_STRING *AccountName, - OUT PUNICODE_STRING *AuthenticatingAuthority, - OUT PUNICODE_STRING *MachineName) -{ - TRACE("()\n"); - - TRACE("LogonType: %lu\n", LogonType); - TRACE("AuthenticationInformation: %p\n", AuthenticationInformation); - TRACE("AuthenticationInformationLength: %lu\n", AuthenticationInformationLength); - - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, - IN SECURITY_LOGON_TYPE LogonType, - IN PVOID ProtocolSubmitBuffer, - IN PVOID ClientBufferBase, - IN ULONG SubmitBufferSize, - OUT PVOID *ProfileBuffer, - OUT PULONG ProfileBufferSize, - OUT PLUID LogonId, - OUT PNTSTATUS SubStatus, - OUT PLSA_TOKEN_INFORMATION_TYPE TokenInformationType, - OUT PVOID *TokenInformation, - OUT PUNICODE_STRING *AccountName, - OUT PUNICODE_STRING *AuthenticatingAuthority, - OUT PUNICODE_STRING *MachineName, - OUT PSECPKG_PRIMARY_CRED PrimaryCredentials, - OUT PSECPKG_SUPPLEMENTAL_CRED_ARRAY *SupplementalCredentials) -{ - TRACE("()\n"); - - TRACE("LogonType: %lu\n", LogonType); - TRACE("ProtocolSubmitBuffer: %p\n", ProtocolSubmitBuffer); - TRACE("SubmitBufferSize: %lu\n", SubmitBufferSize); - - - return STATUS_NOT_IMPLEMENTED; -} -#endif - /* EOF */ diff --git a/dll/win32/msv1_0/msv1_0.spec b/dll/win32/msv1_0/msv1_0.spec index 954de3de6f..34fe25e6ca 100644 --- a/dll/win32/msv1_0/msv1_0.spec +++ b/dll/win32/msv1_0/msv1_0.spec @@ -3,9 +3,7 @@ @ stdcall LsaApCallPackageUntrusted(ptr ptr ptr long ptr ptr ptr) @ stdcall LsaApInitializePackage(long ptr ptr ptr ptr) @ stdcall LsaApLogonTerminated(ptr) -@ stdcall LsaApLogonUser(ptr long ptr ptr long ptr ptr ptr ptr ptr ptr ptr ptr) -#@ stdcall LsaApLogonUserEx(ptr long ptr ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) -#@ stdcall LsaApLogonUserEx2(ptr long ptr ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LsaApLogonUserEx2(ptr long ptr ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stub Msv1_0ExportSubAuthenticationRoutine @ stub Msv1_0SubAuthenticationPresent @ stub MsvGetLogonAttemptCount

5 years, 9 months

[reactos] 02/02: [LSASRV] LsapLogonUser: Support LsaTokenInformationNull logins.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef4ee94febed026cfe3b3… commit ef4ee94febed026cfe3b3e86e8f24e554d0b33c7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Mar 4 01:35:26 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Mar 4 01:37:15 2019 +0100 [LSASRV] LsapLogonUser: Support LsaTokenInformationNull logins. --- dll/win32/lsasrv/authpackage.c | 77 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 5 deletions(-) diff --git a/dll/win32/lsasrv/authpackage.c b/dll/win32/lsasrv/authpackage.c index 8eef860c41..6c8b47a954 100644 --- a/dll/win32/lsasrv/authpackage.c +++ b/dll/win32/lsasrv/authpackage.c @@ -17,6 +17,12 @@ typedef enum _LSA_TOKEN_INFORMATION_TYPE LsaTokenInformationV1 } LSA_TOKEN_INFORMATION_TYPE, *PLSA_TOKEN_INFORMATION_TYPE; +typedef struct _LSA_TOKEN_INFORMATION_NULL +{ + LARGE_INTEGER ExpirationTime; + PTOKEN_GROUPS Groups; +} LSA_TOKEN_INFORMATION_NULL, *PLSA_TOKEN_INFORMATION_NULL; + typedef struct _LSA_TOKEN_INFORMATION_V1 { LARGE_INTEGER ExpirationTime; @@ -1365,6 +1371,7 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, SECURITY_QUALITY_OF_SERVICE Qos; LSA_TOKEN_INFORMATION_TYPE TokenInformationType; PVOID TokenInformation = NULL; + PLSA_TOKEN_INFORMATION_NULL TokenInfo0 = NULL; PLSA_TOKEN_INFORMATION_V1 TokenInfo1 = NULL; PUNICODE_STRING AccountName = NULL; PUNICODE_STRING AuthenticatingAuthority = NULL; @@ -1549,9 +1556,50 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, goto done; } - if (TokenInformationType == LsaTokenInformationV1) + if (TokenInformationType == LsaTokenInformationNull) + { + TOKEN_USER TokenUser; + TOKEN_PRIMARY_GROUP TokenPrimaryGroup; + TOKEN_GROUPS NoGroups = {0}; + TOKEN_PRIVILEGES NoPrivileges = {0}; + + TokenInfo0 = (PLSA_TOKEN_INFORMATION_NULL)TokenInformation; + + TokenUser.User.Sid = LsapWorldSid; + TokenUser.User.Attributes = 0; + TokenPrimaryGroup.PrimaryGroup = LsapWorldSid; + + Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); + Qos.ImpersonationLevel = SecurityImpersonation; + Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING; + Qos.EffectiveOnly = TRUE; + + ObjectAttributes.Length = sizeof(OBJECT_ATTRIBUTES); + ObjectAttributes.RootDirectory = NULL; + ObjectAttributes.ObjectName = NULL; + ObjectAttributes.Attributes = 0; + ObjectAttributes.SecurityDescriptor = NULL; + ObjectAttributes.SecurityQualityOfService = &Qos; + + /* Create the logon token */ + Status = NtCreateToken(&TokenHandle, + TOKEN_ALL_ACCESS, + &ObjectAttributes, + TokenImpersonation, + &RequestMsg->LogonUser.Reply.LogonId, + &TokenInfo0->ExpirationTime, + &TokenUser, + &NoGroups, + &NoPrivileges, + NULL, + &TokenPrimaryGroup, + NULL, + &RequestMsg->LogonUser.Request.SourceContext); + } + else if (TokenInformationType == LsaTokenInformationV1) { - TOKEN_PRIVILEGES NoPrivilege = {0}; + TOKEN_PRIVILEGES NoPrivileges = {0}; + TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); @@ -1575,8 +1623,7 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, &TokenInfo1->ExpirationTime, &TokenInfo1->User, TokenInfo1->Groups, - TokenInfo1->Privileges ? TokenInfo1->Privileges - : &NoPrivilege, + TokenInfo1->Privileges ? TokenInfo1->Privileges : &NoPrivileges, &TokenInfo1->Owner, &TokenInfo1->PrimaryGroup, &TokenInfo1->DefaultDacl, @@ -1659,7 +1706,27 @@ done: /* Free the token information */ if (TokenInformation != NULL) { - if (TokenInformationType == LsaTokenInformationV1) + if (TokenInformationType == LsaTokenInformationNull) + { + TokenInfo0 = (PLSA_TOKEN_INFORMATION_NULL)TokenInformation; + + if (TokenInfo0 != NULL) + { + if (TokenInfo0->Groups != NULL) + { + for (i = 0; i < TokenInfo0->Groups->GroupCount; i++) + { + if (TokenInfo0->Groups->Groups[i].Sid != NULL) + LsapFreeHeap(TokenInfo0->Groups->Groups[i].Sid); + } + + LsapFreeHeap(TokenInfo0->Groups); + } + + LsapFreeHeap(TokenInfo0); + } + } + else if (TokenInformationType == LsaTokenInformationV1) { TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation;

5 years, 9 months

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 March 2019