Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 71172: [XDK/DDK] Update ASSERT definitions based on latest WDK (with some modifications regarding cast to void and macro parameter expansion). Use NT_ASSERT for ASSERT globally on reacto...
by tkreuzer＠svn.reactos.org 16 Apr '16

16 Apr '16

Author: tkreuzer Date: Sat Apr 16 15:53:32 2016 New Revision: 71172 URL: http://svn.reactos.org/svn/reactos?rev=71172&view=rev Log: [XDK/DDK] Update ASSERT definitions based on latest WDK (with some modifications regarding cast to void and macro parameter expansion). Use NT_ASSERT for ASSERT globally on reactos MSVC builds. Modified: trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/rtlfuncs.h trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Sat Apr 16 15:53:32 2016 @@ -159,33 +159,34 @@ #define MAXIMUM_WAIT_OBJECTS 64 -#define ASSERT_APC(Object) NT_ASSERT((Object)->Type == ApcObject) +#define ASSERT_APC(Object) \ + NT_ASSERT((Object)->Type == ApcObject) #define ASSERT_DPC(Object) \ - ASSERT(((Object)->Type == 0) || \ - ((Object)->Type == DpcObject) || \ - ((Object)->Type == ThreadedDpcObject)) - -#define ASSERT_GATE(object) \ - NT_ASSERT((((object)->Header.Type & KOBJECT_TYPE_MASK) == GateObject) || \ - (((object)->Header.Type & KOBJECT_TYPE_MASK) == EventSynchronizationObject)) + NT_ASSERT(((Object)->Type == 0) || \ + ((Object)->Type == DpcObject) || \ + ((Object)->Type == ThreadedDpcObject)) + +#define ASSERT_GATE(Object) \ + NT_ASSERT((((Object)->Header.Type & KOBJECT_TYPE_MASK) == GateObject) || \ + (((Object)->Header.Type & KOBJECT_TYPE_MASK) == EventSynchronizationObject)) #define ASSERT_DEVICE_QUEUE(Object) \ NT_ASSERT((Object)->Type == DeviceQueueObject) -#define ASSERT_TIMER(E) \ - NT_ASSERT(((E)->Header.Type == TimerNotificationObject) || \ - ((E)->Header.Type == TimerSynchronizationObject)) - -#define ASSERT_MUTANT(E) \ - NT_ASSERT((E)->Header.Type == MutantObject) - -#define ASSERT_SEMAPHORE(E) \ - NT_ASSERT((E)->Header.Type == SemaphoreObject) - -#define ASSERT_EVENT(E) \ - NT_ASSERT(((E)->Header.Type == NotificationEvent) || \ - ((E)->Header.Type == SynchronizationEvent)) +#define ASSERT_TIMER(Object) \ + NT_ASSERT(((Object)->Header.Type == TimerNotificationObject) || \ + ((Object)->Header.Type == TimerSynchronizationObject)) + +#define ASSERT_MUTANT(Object) \ + NT_ASSERT((Object)->Header.Type == MutantObject) + +#define ASSERT_SEMAPHORE(Object) \ + NT_ASSERT((Object)->Header.Type == SemaphoreObject) + +#define ASSERT_EVENT(Object) \ + NT_ASSERT(((Object)->Header.Type == NotificationEvent) || \ + ((Object)->Header.Type == SynchronizationEvent)) #define DPC_NORMAL 0 #define DPC_THREADED 1 Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Sat Apr 16 15:53:32 2016 @@ -3188,43 +3188,6 @@ #define RtlUlongByteSwap(_x) _byteswap_ulong((_x)) #define RtlUlonglongByteSwap(_x) _byteswap_uint64((_x)) -#if DBG - -#define RTL_VERIFY(exp) \ - ((!(exp)) ? \ - RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE) - -#define RTL_VERIFYMSG(msg, exp) \ - ((!(exp)) ? \ - RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE) - -#define RTL_SOFT_VERIFY(exp) \ - ((!(exp)) ? \ - DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE) - -#define RTL_SOFT_VERIFYMSG(msg, exp) \ - ((!(exp)) ? \ - DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE) - -/* The ASSERTs must be cast to void to avoid warnings about unused results. - * We also cannot invoke the VERIFY versions because the indirection messes - * with stringify. */ -#define ASSERT(exp) \ - ((VOID)((!(exp)) ? \ - RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE)) - -#define ASSERTMSG(msg, exp) \ - ((VOID)((!(exp)) ? \ - RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE)) - -#define RTL_SOFT_ASSERT(exp) \ - ((VOID)((!(exp)) ? \ - DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE)) - -#define RTL_SOFT_ASSERTMSG(msg, exp) \ - ((VOID)((!(exp)) ? \ - DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE)) - #if defined(_MSC_VER) # define __assert_annotationA(msg) __annotation(L"Debug", L"AssertFail", L ## msg) # define __assert_annotationW(msg) __annotation(L"Debug", L"AssertFail", msg) @@ -3236,65 +3199,119 @@ #endif #ifdef _PREFAST_ -#define __analysis_unreachable() __assume(0) +# define NT_ANALYSIS_ASSUME(_exp) _Analysis_assume_(_exp) +#elif DBG +# define NT_ANALYSIS_ASSUME(_exp) ((void)0) #else -#define __analysis_unreachable() ((void)0) +# define NT_ANALYSIS_ASSUME(_exp) __noop(_exp) #endif -#define NT_VERIFY(exp) \ +#define NT_ASSERT_ACTION(exp) \ + (NT_ANALYSIS_ASSUME(exp), \ ((!(exp)) ? \ (__assert_annotationA(#exp), \ - DbgRaiseAssertionFailure(), FALSE) : TRUE) - -#define NT_VERIFYMSG(msg, exp) \ + DbgRaiseAssertionFailure(), FALSE) : TRUE)) + +#define NT_ASSERTMSG_ACTION(msg, exp) \ + (NT_ANALYSIS_ASSUME(exp), \ ((!(exp)) ? \ (__assert_annotationA(msg), \ - DbgRaiseAssertionFailure(), FALSE) : TRUE) - -#define NT_VERIFYMSGW(msg, exp) \ - ((!(exp)) ? \ - (__assert_annotationW(msg), \ - DbgRaiseAssertionFailure(), FALSE) : TRUE) - -/* Can't reuse verify, see above */ -#define NT_ASSERT(exp) \ - ((VOID)((!(exp)) ? \ - (__assert_annotationA(#exp), \ - DbgRaiseAssertionFailure(), __analysis_unreachable(), FALSE) : TRUE)) - -#define NT_ASSERTMSG(msg, exp) \ - ((VOID)((!(exp)) ? \ - (__assert_annotationA(msg), \ - DbgRaiseAssertionFailure(), __analysis_unreachable(), FALSE) : TRUE)) - -#define NT_ASSERTMSGW(msg, exp) \ - ((VOID)((!(exp)) ? \ - (__assert_annotationW(msg), \ - DbgRaiseAssertionFailure(), __analysis_unreachable(), FALSE) : TRUE)) + DbgRaiseAssertionFailure(), FALSE) : TRUE)) + +#define NT_ASSERTMSGW_ACTION(msg, exp) \ + (NT_ANALYSIS_ASSUME(exp), \ + ((!(exp)) ? \ + (__assert_annotationW(msg), \ + DbgRaiseAssertionFailure(), FALSE) : TRUE)) + +#if DBG + +#define RTL_VERIFY(exp) \ + ((!(exp)) ? \ + RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE) + +#define RTL_VERIFYMSG(msg, exp) \ + ((!(exp)) ? \ + RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE) + +#define RTL_SOFT_VERIFY(exp) \ + ((!(exp)) ? \ + DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE) + +#define RTL_SOFT_VERIFYMSG(msg, exp) \ + ((!(exp)) ? \ + DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE) + +/* The ASSERTs must be cast to void to avoid warnings about unused results. */ +#define ASSERT (void)RTL_VERIFY +#define ASSERTMSG (void)RTL_VERIFYMSG +#define RTL_SOFT_ASSERT (void)RTL_SOFT_VERIFY +#define RTL_SOFT_ASSERTMSG (void)RTL_SOFT_VERIFYMSG + +#define NT_VERIFY NT_ASSERT_ACTION +#define NT_VERIFYMSG NT_ASSERTMSG_ACTION +#define NT_VERIFYMSGW NT_ASSERTMSGW_ACTION + +#define NT_ASSERT_ASSUME (void)NT_ASSERT_ACTION +#define NT_ASSERTMSG_ASSUME (void)NT_ASSERTMSG_ACTION +#define NT_ASSERTMSGW_ASSUME (void)NT_ASSERTMSGW_ACTION + +#define NT_ASSERT_NOASSUME (void)NT_ASSERT_ACTION +#define NT_ASSERTMSG_NOASSUME (void)NT_ASSERTMSG_ACTION +#define NT_ASSERTMSGW_NOASSUME (void)NT_ASSERTMSGW_ACTION #else /* !DBG */ -#define ASSERT(exp) ((VOID) 0) -#define ASSERTMSG(msg, exp) ((VOID) 0) - -#define RTL_SOFT_ASSERT(exp) ((VOID) 0) -#define RTL_SOFT_ASSERTMSG(msg, exp) ((VOID) 0) - -#define RTL_VERIFY(exp) ((exp) ? TRUE : FALSE) -#define RTL_VERIFYMSG(msg, exp) ((exp) ? TRUE : FALSE) - -#define RTL_SOFT_VERIFY(exp) ((exp) ? TRUE : FALSE) +#define ASSERT(exp) ((void)0) +#define ASSERTMSG(msg, exp) ((void)0) + +#define RTL_SOFT_ASSERT(exp) ((void)0) +#define RTL_SOFT_ASSERTMSG(msg, exp) ((void)0) + +#define RTL_VERIFY(exp) ((exp) ? TRUE : FALSE) +#define RTL_VERIFYMSG(msg, exp) ((exp) ? TRUE : FALSE) + +#define RTL_SOFT_VERIFY(exp) ((exp) ? TRUE : FALSE) #define RTL_SOFT_VERIFYMSG(msg, exp) ((exp) ? TRUE : FALSE) -#define NT_ASSERT(exp) ((VOID)0) -#define NT_ASSERTMSG(msg, exp) ((VOID)0) -#define NT_ASSERTMSGW(msg, exp) ((VOID)0) - -#define NT_VERIFY(_exp) ((_exp) ? TRUE : FALSE) -#define NT_VERIFYMSG(_msg, _exp ) ((_exp) ? TRUE : FALSE) -#define NT_VERIFYMSGW(_msg, _exp) ((_exp) ? TRUE : FALSE) +#define NT_VERIFY(exp) (NT_ANALYSIS_ASSUME(exp), ((exp) ? TRUE : FALSE)) +#define NT_VERIFYMSG(msg, exp) (NT_ANALYSIS_ASSUME(exp), ((exp) ? TRUE : FALSE)) +#define NT_VERIFYMSGW(msg, exp) (NT_ANALYSIS_ASSUME(exp), ((exp) ? TRUE : FALSE)) + +#define NT_ASSERT_ASSUME(exp) (NT_ANALYSIS_ASSUME(exp), (void)0) +#define NT_ASSERTMSG_ASSUME(msg, exp) (NT_ANALYSIS_ASSUME(exp), (void)0) +#define NT_ASSERTMSGW_ASSUME(msg, exp) (NT_ANALYSIS_ASSUME(exp), (void)0) + +#define NT_ASSERT_NOASSUME(exp) ((void)0) +#define NT_ASSERTMSG_NOASSUME(msg, exp) ((void)0) +#define NT_ASSERTMSGW_NOASSUME(msg, exp) ((void)0) #endif /* DBG */ + +#define NT_FRE_ASSERT (void)NT_ASSERT_ACTION +#define NT_FRE_ASSERTMSG (void)NT_ASSERTMSG_ACTION +#define NT_FRE_ASSERTMSGW (void)NT_ASSERTMSGW_ACTION + +#ifdef NT_ASSERT_ALWAYS_ASSUMES +# define NT_ASSERT NT_ASSERT_ASSUME +# define NT_ASSERTMSG NT_ASSERTMSG_ASSUME +# define NT_ASSERTMSGW NT_ASSERTMSGW_ASSUME +#else +# define NT_ASSERT NT_ASSERT_NOASSUME +# define NT_ASSERTMSG NT_ASSERTMSG_NOASSUME +# define NT_ASSERTMSGW NT_ASSERTMSGW_NOASSUME +#endif /* NT_ASSERT_ALWAYS_ASSUMES */ + +#if defined(_MSC_VER) && (defined(__REACTOS__) || defined(ASSERT_ALWAYS_NT_ASSERT)) +#undef ASSERT +#define ASSERT NT_ASSERT +#undef ASSERTMSG +#define ASSERTMSG NT_ASSERT +#undef ASSERTMSGW +#define ASSERTMSGW NT_ASSERTMSGW +#undef RTL_VERIFY +#define RTL_VERIFY NT_VERIFY +#endif #define InitializeListHead32(ListHead) (\ (ListHead)->Flink = (ListHead)->Blink = PtrToUlong((ListHead))) Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Sat Apr 16 15:53:32 2016 @@ -94,15 +94,6 @@ #define ExRaiseStatus RtlRaiseStatus // -// NT_ASSERT Best Assert -// -#if defined(_MSC_VER) -#undef ASSERT -#define ASSERT NT_ASSERT -#endif - - -// // Switch for enabling global page support //

1 0

[tfaber] 71171: [CMLIB] - Turn down a noisy DPRINT
by tfaber＠svn.reactos.org 16 Apr '16

16 Apr '16

Author: tfaber Date: Sat Apr 16 14:19:47 2016 New Revision: 71171 URL: http://svn.reactos.org/svn/reactos?rev=71171&view=rev Log: [CMLIB] - Turn down a noisy DPRINT Modified: trunk/reactos/lib/cmlib/cmse.c Modified: trunk/reactos/lib/cmlib/cmse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmse.c?rev=71171… ============================================================================== --- trunk/reactos/lib/cmlib/cmse.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmse.c [iso-8859-1] Sat Apr 16 14:19:47 2016 @@ -84,7 +84,7 @@ // a BSOD at the end... if (CellData->Security == HCELL_NIL) { - DPRINT1("Cell 0x%08x (data 0x%p) has no security block!\n", Cell, CellData); + DPRINT("Cell 0x%08x (data 0x%p) has no security block!\n", Cell, CellData); HvReleaseCell(Hive, Cell); return; }

1 0

[tkreuzer] 71170: [XDK/DDK] Fix prototype of FsRtlRegisterUncProvider, based on latest WDK
by tkreuzer＠svn.reactos.org 16 Apr '16

16 Apr '16

Author: tkreuzer Date: Sat Apr 16 13:14:31 2016 New Revision: 71170 URL: http://svn.reactos.org/svn/reactos?rev=71170&view=rev Log: [XDK/DDK] Fix prototype of FsRtlRegisterUncProvider, based on latest WDK Modified: trunk/reactos/include/xdk/fsrtlfuncs.h trunk/reactos/ntoskrnl/fsrtl/unc.c Modified: trunk/reactos/include/xdk/fsrtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/fsrtlfuncs.h?r… ============================================================================== --- trunk/reactos/include/xdk/fsrtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/fsrtlfuncs.h [iso-8859-1] Sat Apr 16 13:14:31 2016 @@ -833,7 +833,7 @@ NTAPI FsRtlRegisterUncProvider( _Out_ PHANDLE MupHandle, - _In_ PUNICODE_STRING RedirectorDeviceName, + _In_ PCUNICODE_STRING RedirectorDeviceName, _In_ BOOLEAN MailslotsSupported); _IRQL_requires_max_(PASSIVE_LEVEL) Modified: trunk/reactos/ntoskrnl/fsrtl/unc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/unc.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/unc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/unc.c [iso-8859-1] Sat Apr 16 13:14:31 2016 @@ -114,7 +114,7 @@ } VOID -FsRtlpSetSymbolicLink(IN PUNICODE_STRING DeviceName) +FsRtlpSetSymbolicLink(IN PCUNICODE_STRING DeviceName) { NTSTATUS Status; UNICODE_STRING UncDevice; @@ -126,14 +126,14 @@ IoDeleteSymbolicLink(&UncDevice); if (DeviceName != NULL) { - Status = IoCreateSymbolicLink(&UncDevice, DeviceName); + Status = IoCreateSymbolicLink(&UncDevice, (PUNICODE_STRING)DeviceName); ASSERT(NT_SUCCESS(Status)); } } NTSTATUS FsRtlpRegisterProviderWithMUP(IN HANDLE MupHandle, - IN PUNICODE_STRING RedirectorDeviceName, + IN PCUNICODE_STRING RedirectorDeviceName, IN BOOLEAN MailslotsSupported) { NTSTATUS Status; @@ -278,7 +278,7 @@ NTSTATUS NTAPI FsRtlRegisterUncProvider(OUT PHANDLE Handle, - IN PUNICODE_STRING RedirectorDeviceName, + IN PCUNICODE_STRING RedirectorDeviceName, IN BOOLEAN MailslotsSupported) { NTSTATUS Status;

1 0

[tfaber] 71169: [RTL] - Silence noisy DPRINTs
by tfaber＠svn.reactos.org 16 Apr '16

16 Apr '16

Author: tfaber Date: Sat Apr 16 11:43:57 2016 New Revision: 71169 URL: http://svn.reactos.org/svn/reactos?rev=71169&view=rev Log: [RTL] - Silence noisy DPRINTs Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=71169… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sat Apr 16 11:43:57 2016 @@ -1407,8 +1407,8 @@ } else if (xmlstr_cmp(&attr_name, languageW)) { - DPRINT1("Unsupported yet language attribute (%.*S)\n", - attr_value.len, attr_value.ptr); + DPRINT("Unsupported yet language attribute (%.*S)\n", + attr_value.len, attr_value.ptr); if (!(ai->language = xmlstrdupW(&attr_value))) return FALSE; } else @@ -2435,6 +2435,12 @@ } } } +#ifdef __REACTOS__ + else if (xml_elem_cmp(&elem, L"trustInfo", asmv1W)) + { + ret = parse_unknown_elem(xmlbuf, &elem); + } +#endif else { attr_nameU = xmlstr2unicode(&elem);

1 0

[tfaber] 71168: [NTOS][WIN32K] - Disable some noisy DPRINTs
by tfaber＠svn.reactos.org 16 Apr '16

16 Apr '16

Author: tfaber Date: Sat Apr 16 10:38:58 2016 New Revision: 71168 URL: http://svn.reactos.org/svn/reactos?rev=71168&view=rev Log: [NTOS][WIN32K] - Disable some noisy DPRINTs Modified: trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/ps/apphelp.c trunk/reactos/win32ss/user/ntuser/class.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sat Apr 16 10:38:58 2016 @@ -787,7 +787,7 @@ if (ProfileHandle) NtClose(ProfileHandle); if (ParentHandle) NtClose(ParentHandle); - DPRINT1("CmpCreateControlSet() done\n"); + DPRINT("CmpCreateControlSet() done\n"); /* Return success */ return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/ps/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/apphelp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/apphelp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/apphelp.c [iso-8859-1] Sat Apr 16 10:38:58 2016 @@ -274,7 +274,7 @@ } NumEntries = Header->NumEntries; - DPRINT1("SHIMS: ApphelpCacheParse walking %d entries\n", NumEntries); + DPRINT("SHIMS: ApphelpCacheParse walking %d entries\n", NumEntries); for (Cur = 0; Cur < NumEntries; ++Cur) { Persistent = (PSHIM_PERSISTENT_CACHE_ENTRY)(Data + SHIM_CACHE_HEADER_SIZE + @@ -382,9 +382,9 @@ ++NumEntries; ListEntry = ListEntry->Flink; } - DPRINT1("SHIMS: ApphelpCacheWrite, %d Entries, total size: %d\n", NumEntries, Length); + DPRINT("SHIMS: ApphelpCacheWrite, %d Entries, total size: %d\n", NumEntries, Length); Length = ROUND_UP(Length, sizeof(ULONGLONG)); - DPRINT1("SHIMS: ApphelpCacheWrite, Rounded to: %d\n", Length); + DPRINT("SHIMS: ApphelpCacheWrite, Rounded to: %d\n", Length); /* Now we allocate and prepare some helpers */ Buffer = ApphelpAlloc(Length); @@ -439,7 +439,7 @@ INIT_FUNCTION ApphelpCacheInitialize(VOID) { - DPRINT1("SHIMS: ApphelpCacheInitialize\n"); + DPRINT("SHIMS: ApphelpCacheInitialize\n"); /* If we are booting in safemode we do not want to use the apphelp cache */ if (InitSafeBootMode) { @@ -457,7 +457,7 @@ InitializeListHead(&ApphelpShimCacheAge); ApphelpCacheEnabled = ApphelpCacheRead(); } - DPRINT1("SHIMS: ApphelpCacheInitialize: %d\n", ApphelpCacheEnabled); + DPRINT("SHIMS: ApphelpCacheInitialize: %d\n", ApphelpCacheEnabled); return STATUS_SUCCESS; } Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Sat Apr 16 10:38:58 2016 @@ -379,7 +379,7 @@ if (IntRegisterClassAtom(&ClassName, &Atom)) { gpsi->atomSysClass[i] = Atom; - ERR("Reg Control Atoms 0x%x\n",Atom); + TRACE("Reg Control Atom %ls: 0x%x\n", ControlsList[i], Atom); } i++; } @@ -2299,15 +2299,17 @@ wc.hIcon = NULL; //// System Cursors should be initilized!!! - if (DefaultServerClasses[i].hCursor == (HICON)OCR_NORMAL && - SYSTEMCUR(ARROW) != NULL) - { - wc.hCursor = UserHMGetHandle(SYSTEMCUR(ARROW)); - } - else - { - ERR("SYSTEMCUR(ARROW) == NULL, should not happen!!\n"); - wc.hCursor = NULL; + wc.hCursor = NULL; + if (DefaultServerClasses[i].hCursor == (HICON)OCR_NORMAL) + { + if (SYSTEMCUR(ARROW) == NULL) + { + ERR("SYSTEMCUR(ARROW) == NULL, should not happen!!\n"); + } + else + { + wc.hCursor = UserHMGetHandle(SYSTEMCUR(ARROW)); + } } hBrush = DefaultServerClasses[i].hBrush;

1 0

[tfaber] 71167: [WIN32K:NTUSER] - Don't leak desktop reference in failure case of NtUserSwitchDesktop
by tfaber＠svn.reactos.org 16 Apr '16

16 Apr '16

Author: tfaber Date: Sat Apr 16 10:22:35 2016 New Revision: 71167 URL: http://svn.reactos.org/svn/reactos?rev=71167&view=rev Log: [WIN32K:NTUSER] - Don't leak desktop reference in failure case of NtUserSwitchDesktop Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sat Apr 16 10:22:35 2016 @@ -1791,12 +1791,14 @@ if (PsGetCurrentProcessSessionId() != pdesk->rpwinstaParent->dwSessionId) { + ObDereferenceObject(pdesk); ERR("NtUserSwitchDesktop called for a desktop of a different session\n"); RETURN(FALSE); } if(pdesk == gpdeskInputDesktop) { + ObDereferenceObject(pdesk); WARN("NtUserSwitchDesktop called for active desktop\n"); RETURN(TRUE); }

1 0

[pschweitzer] 71166: [NTOSKRNL] In FsRtlAddBaseMcbEntry(), don't merge runs in case there's a hole in LBNs CORE-11002
by pschweitzer＠svn.reactos.org 15 Apr '16

15 Apr '16

Author: pschweitzer Date: Fri Apr 15 20:50:40 2016 New Revision: 71166 URL: http://svn.reactos.org/svn/reactos?rev=71166&view=rev Log: [NTOSKRNL] In FsRtlAddBaseMcbEntry(), don't merge runs in case there's a hole in LBNs CORE-11002 Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Fri Apr 15 20:50:40 2016 @@ -184,7 +184,7 @@ NeedleRun.StartingLbn.QuadPart = ~0ULL; Mcb->Mapping->Table.CompareRoutine = McbMappingIntersectCompare; if ((LowerRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRun)) && - (LowerRun->StartingLbn.QuadPart < Node.StartingLbn.QuadPart)) + (LowerRun->StartingLbn.QuadPart + (LowerRun->RunEndVbn.QuadPart - LowerRun->RunStartVbn.QuadPart) == Node.StartingLbn.QuadPart)) { ASSERT(LowerRun->RunEndVbn.QuadPart == Node.RunStartVbn.QuadPart); Node.RunStartVbn.QuadPart = LowerRun->RunStartVbn.QuadPart;

1 0

[tfaber] 71165: [WIN32K:NTUSER] - Don't access WindowStationName after free - Handle RtlCreateAtomTable failure
by tfaber＠svn.reactos.org 15 Apr '16

15 Apr '16

Author: tfaber Date: Fri Apr 15 20:43:25 2016 New Revision: 71165 URL: http://svn.reactos.org/svn/reactos?rev=71165&view=rev Log: [WIN32K:NTUSER] - Don't access WindowStationName after free - Handle RtlCreateAtomTable failure Modified: trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Fri Apr 15 20:43:25 2016 @@ -454,7 +454,7 @@ if (!NT_SUCCESS(Status)) { - ERR("ObCreateObject failed for window station %wZ\n", &WindowStationName); + ERR("ObCreateObject failed with %lx for window station %wZ\n", Status, &WindowStationName); ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); return 0; @@ -464,9 +464,16 @@ RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); InitializeListHead(&WindowStationObject->DesktopListHead); - Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); WindowStationObject->Name = WindowStationName; WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId; + Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); + if (!NT_SUCCESS(Status)) + { + ERR("RtlCreateAtomTable failed with %lx for window station %wZ\n", Status, &WindowStationName); + ObDereferenceObject(WindowStationObject); + SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); + return 0; + } Status = ObInsertObject((PVOID)WindowStationObject, NULL, @@ -477,7 +484,7 @@ if (!NT_SUCCESS(Status)) { - ERR("ObInsertObject failed for window station %wZ\n", &WindowStationName); + ERR("ObInsertObject failed with %lx for window station\n", Status); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); return 0; }

1 0

[tfaber] 71164: [WIN32K:NTUSER] - Initialize the window station object before calling ObInsertObject, since the object will be deleted in case of failure. CORE-11124
by tfaber＠svn.reactos.org 15 Apr '16

15 Apr '16

Author: tfaber Date: Fri Apr 15 20:24:44 2016 New Revision: 71164 URL: http://svn.reactos.org/svn/reactos?rev=71164&view=rev Log: [WIN32K:NTUSER] - Initialize the window station object before calling ObInsertObject, since the object will be deleted in case of failure. CORE-11124 Modified: trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Fri Apr 15 20:24:44 2016 @@ -460,6 +460,14 @@ return 0; } + /* Initialize the window station */ + RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); + + InitializeListHead(&WindowStationObject->DesktopListHead); + Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); + WindowStationObject->Name = WindowStationName; + WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId; + Status = ObInsertObject((PVOID)WindowStationObject, NULL, dwDesiredAccess, @@ -470,19 +478,9 @@ if (!NT_SUCCESS(Status)) { ERR("ObInsertObject failed for window station %wZ\n", &WindowStationName); - ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - ObDereferenceObject(WindowStationObject); return 0; } - - /* Initialize the window station */ - RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); - - InitializeListHead(&WindowStationObject->DesktopListHead); - Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); - WindowStationObject->Name = WindowStationName; - WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId; if (InputWindowStation == NULL) {

1 0

[tfaber] 71163: [WIN32K:NTUSER] - Fix indentation. No code changes.
by tfaber＠svn.reactos.org 15 Apr '16

15 Apr '16

Author: tfaber Date: Fri Apr 15 19:49:33 2016 New Revision: 71163 URL: http://svn.reactos.org/svn/reactos?rev=71163&view=rev Log: [WIN32K:NTUSER] - Fix indentation. No code changes. Modified: trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Fri Apr 15 19:49:33 2016 @@ -30,17 +30,17 @@ NTAPI InitWindowStationImpl(VOID) { - GENERIC_MAPPING IntWindowStationMapping = { WINSTA_READ, - WINSTA_WRITE, - WINSTA_EXECUTE, - WINSTA_ACCESS_ALL}; - - /* Set Winsta Object Attributes */ - ExWindowStationObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(WINSTATION_OBJECT); - ExWindowStationObjectType->TypeInfo.GenericMapping = IntWindowStationMapping; - ExWindowStationObjectType->TypeInfo.ValidAccessMask = WINSTA_ACCESS_ALL; - - return STATUS_SUCCESS; + GENERIC_MAPPING IntWindowStationMapping = { WINSTA_READ, + WINSTA_WRITE, + WINSTA_EXECUTE, + WINSTA_ACCESS_ALL}; + + /* Set Winsta Object Attributes */ + ExWindowStationObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(WINSTATION_OBJECT); + ExWindowStationObjectType->TypeInfo.GenericMapping = IntWindowStationMapping; + ExWindowStationObjectType->TypeInfo.ValidAccessMask = WINSTA_ACCESS_ALL; + + return STATUS_SUCCESS; } NTSTATUS @@ -76,21 +76,21 @@ } } - InitializeObjectAttributes(&ObjectAttributes, - &gustrWindowStationsDir, - 0, - NULL, - NULL); - Status = ZwCreateDirectoryObject(&hWinstaDir, 0, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - ERR("Could not create %wZ directory (Status 0x%X)\n", &gustrWindowStationsDir, Status); - return Status; - } - - TRACE("Created directory %wZ for session %lu\n", &gustrWindowStationsDir, Peb->SessionId); - - return Status; + InitializeObjectAttributes(&ObjectAttributes, + &gustrWindowStationsDir, + 0, + NULL, + NULL); + Status = ZwCreateDirectoryObject(&hWinstaDir, 0, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ERR("Could not create %wZ directory (Status 0x%X)\n", &gustrWindowStationsDir, Status); + return Status; + } + + TRACE("Created directory %wZ for session %lu\n", &gustrWindowStationsDir, Peb->SessionId); + + return Status; } /* OBJECT CALLBACKS **********************************************************/ @@ -101,19 +101,19 @@ _In_ PVOID Parameters) { PWIN32_DELETEMETHOD_PARAMETERS DeleteParameters = Parameters; - PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)DeleteParameters->Object; - - TRACE("Deleting window station (0x%p)\n", WinSta); - - WinSta->Flags |= WSS_DYING; - - UserEmptyClipboardData(WinSta); - - RtlDestroyAtomTable(WinSta->AtomTable); - - RtlFreeUnicodeString(&WinSta->Name); - - return STATUS_SUCCESS; + PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)DeleteParameters->Object; + + TRACE("Deleting window station (0x%p)\n", WinSta); + + WinSta->Flags |= WSS_DYING; + + UserEmptyClipboardData(WinSta); + + RtlDestroyAtomTable(WinSta->AtomTable); + + RtlFreeUnicodeString(&WinSta->Name); + + return STATUS_SUCCESS; } NTSTATUS @@ -213,140 +213,139 @@ NTSTATUS FASTCALL IntValidateWindowStationHandle( - HWINSTA WindowStation, - KPROCESSOR_MODE AccessMode, - ACCESS_MASK DesiredAccess, - PWINSTATION_OBJECT *Object, - POBJECT_HANDLE_INFORMATION pObjectHandleInfo) -{ - NTSTATUS Status; - - if (WindowStation == NULL) - { - ERR("Invalid window station handle\n"); - EngSetLastError(ERROR_INVALID_HANDLE); - return STATUS_INVALID_HANDLE; - } - - Status = ObReferenceObjectByHandle( - WindowStation, - DesiredAccess, - ExWindowStationObjectType, - AccessMode, - (PVOID*)Object, - pObjectHandleInfo); - - if (!NT_SUCCESS(Status)) - SetLastNtError(Status); - - return Status; + HWINSTA WindowStation, + KPROCESSOR_MODE AccessMode, + ACCESS_MASK DesiredAccess, + PWINSTATION_OBJECT *Object, + POBJECT_HANDLE_INFORMATION pObjectHandleInfo) +{ + NTSTATUS Status; + + if (WindowStation == NULL) + { + ERR("Invalid window station handle\n"); + EngSetLastError(ERROR_INVALID_HANDLE); + return STATUS_INVALID_HANDLE; + } + + Status = ObReferenceObjectByHandle(WindowStation, + DesiredAccess, + ExWindowStationObjectType, + AccessMode, + (PVOID*)Object, + pObjectHandleInfo); + + if (!NT_SUCCESS(Status)) + SetLastNtError(Status); + + return Status; } BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID) { - TEXTMETRICW tmw; - UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"DISPLAY"); - PDESKTOP pdesk; - - ScreenDeviceContext = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); - if (NULL == ScreenDeviceContext) - { - IntDestroyPrimarySurface(); - return FALSE; - } - GreSetDCOwner(ScreenDeviceContext, GDI_OBJ_HMGR_PUBLIC); - - if (! IntCreatePrimarySurface()) - { - return FALSE; - } - - hSystemBM = NtGdiCreateCompatibleDC(ScreenDeviceContext); - - NtGdiSelectFont(hSystemBM, NtGdiGetStockObject(SYSTEM_FONT)); - GreSetDCOwner(hSystemBM, GDI_OBJ_HMGR_PUBLIC); - - /* Update the SERVERINFO */ - gpsi->aiSysMet[SM_CXSCREEN] = gppdevPrimary->gdiinfo.ulHorzRes; - gpsi->aiSysMet[SM_CYSCREEN] = gppdevPrimary->gdiinfo.ulVertRes; - gpsi->Planes = NtGdiGetDeviceCaps(ScreenDeviceContext, PLANES); - gpsi->BitsPixel = NtGdiGetDeviceCaps(ScreenDeviceContext, BITSPIXEL); - gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; - gpsi->dmLogPixels = NtGdiGetDeviceCaps(ScreenDeviceContext, LOGPIXELSY); - if (NtGdiGetDeviceCaps(ScreenDeviceContext, RASTERCAPS) & RC_PALETTE) - { - gpsi->PUSIFlags |= PUSIF_PALETTEDISPLAY; - } - else - gpsi->PUSIFlags &= ~PUSIF_PALETTEDISPLAY; - // Font is realized and this dc was previously set to internal DC_ATTR. - gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, (DWORD*)&gpsi->cySysFontChar); - gpsi->tmSysFont = tmw; - - /* Put the pointer in the center of the screen */ - gpsi->ptCursor.x = gpsi->aiSysMet[SM_CXSCREEN] / 2; - gpsi->ptCursor.y = gpsi->aiSysMet[SM_CYSCREEN] / 2; - - /* Attach monitor */ - UserAttachMonitor((HDEV)gppdevPrimary); - - /* Setup the cursor */ - co_IntLoadDefaultCursors(); - - /* Setup the icons */ - co_IntSetWndIcons(); - - /* Setup Menu */ - MenuInit(); - - /* Show the desktop */ - pdesk = IntGetActiveDesktop(); - ASSERT(pdesk); - co_IntShowDesktop(pdesk, gpsi->aiSysMet[SM_CXSCREEN], gpsi->aiSysMet[SM_CYSCREEN], TRUE); - - return TRUE; + TEXTMETRICW tmw; + UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"DISPLAY"); + PDESKTOP pdesk; + + ScreenDeviceContext = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); + if (NULL == ScreenDeviceContext) + { + IntDestroyPrimarySurface(); + return FALSE; + } + GreSetDCOwner(ScreenDeviceContext, GDI_OBJ_HMGR_PUBLIC); + + if (! IntCreatePrimarySurface()) + { + return FALSE; + } + + hSystemBM = NtGdiCreateCompatibleDC(ScreenDeviceContext); + + NtGdiSelectFont(hSystemBM, NtGdiGetStockObject(SYSTEM_FONT)); + GreSetDCOwner(hSystemBM, GDI_OBJ_HMGR_PUBLIC); + + /* Update the SERVERINFO */ + gpsi->aiSysMet[SM_CXSCREEN] = gppdevPrimary->gdiinfo.ulHorzRes; + gpsi->aiSysMet[SM_CYSCREEN] = gppdevPrimary->gdiinfo.ulVertRes; + gpsi->Planes = NtGdiGetDeviceCaps(ScreenDeviceContext, PLANES); + gpsi->BitsPixel = NtGdiGetDeviceCaps(ScreenDeviceContext, BITSPIXEL); + gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; + gpsi->dmLogPixels = NtGdiGetDeviceCaps(ScreenDeviceContext, LOGPIXELSY); + if (NtGdiGetDeviceCaps(ScreenDeviceContext, RASTERCAPS) & RC_PALETTE) + { + gpsi->PUSIFlags |= PUSIF_PALETTEDISPLAY; + } + else + gpsi->PUSIFlags &= ~PUSIF_PALETTEDISPLAY; + // Font is realized and this dc was previously set to internal DC_ATTR. + gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, (DWORD*)&gpsi->cySysFontChar); + gpsi->tmSysFont = tmw; + + /* Put the pointer in the center of the screen */ + gpsi->ptCursor.x = gpsi->aiSysMet[SM_CXSCREEN] / 2; + gpsi->ptCursor.y = gpsi->aiSysMet[SM_CYSCREEN] / 2; + + /* Attach monitor */ + UserAttachMonitor((HDEV)gppdevPrimary); + + /* Setup the cursor */ + co_IntLoadDefaultCursors(); + + /* Setup the icons */ + co_IntSetWndIcons(); + + /* Setup Menu */ + MenuInit(); + + /* Show the desktop */ + pdesk = IntGetActiveDesktop(); + ASSERT(pdesk); + co_IntShowDesktop(pdesk, gpsi->aiSysMet[SM_CXSCREEN], gpsi->aiSysMet[SM_CYSCREEN], TRUE); + + return TRUE; } VOID FASTCALL IntEndDesktopGraphics(VOID) { - if (NULL != ScreenDeviceContext) - { // No need to allocate a new dcattr. - GreSetDCOwner(ScreenDeviceContext, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(ScreenDeviceContext); - ScreenDeviceContext = NULL; - } - IntHideDesktop(IntGetActiveDesktop()); - IntDestroyPrimarySurface(); + if (NULL != ScreenDeviceContext) + { // No need to allocate a new dcattr. + GreSetDCOwner(ScreenDeviceContext, GDI_OBJ_HMGR_POWNED); + GreDeleteObject(ScreenDeviceContext); + ScreenDeviceContext = NULL; + } + IntHideDesktop(IntGetActiveDesktop()); + IntDestroyPrimarySurface(); } HDC FASTCALL IntGetScreenDC(VOID) { - return ScreenDeviceContext; + return ScreenDeviceContext; } BOOL FASTCALL CheckWinstaAttributeAccess(ACCESS_MASK DesiredAccess) { - PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); - if ( gpidLogon != PsGetCurrentProcessId() ) - { - if (!(ppi->W32PF_flags & W32PF_IOWINSTA)) - { - ERR("Requires Interactive Window Station\n"); - EngSetLastError(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); - return FALSE; - } - if (!RtlAreAllAccessesGranted(ppi->amwinsta, DesiredAccess)) - { - ERR("Access Denied\n"); - EngSetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - } - return TRUE; + PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); + if ( gpidLogon != PsGetCurrentProcessId() ) + { + if (!(ppi->W32PF_flags & W32PF_IOWINSTA)) + { + ERR("Requires Interactive Window Station\n"); + EngSetLastError(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); + return FALSE; + } + if (!RtlAreAllAccessesGranted(ppi->amwinsta, DesiredAccess)) + { + ERR("Access Denied\n"); + EngSetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + } + return TRUE; } @@ -390,121 +389,118 @@ HWINSTA APIENTRY NtUserCreateWindowStation( - POBJECT_ATTRIBUTES ObjectAttributes, - ACCESS_MASK dwDesiredAccess, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6) -{ - UNICODE_STRING WindowStationName; - PWINSTATION_OBJECT WindowStationObject; - HWINSTA WindowStation; - NTSTATUS Status; - - TRACE("NtUserCreateWindowStation called\n"); - - Status = ObOpenObjectByName( - ObjectAttributes, - ExWindowStationObjectType, - UserMode, - NULL, - dwDesiredAccess, - NULL, - (PVOID*)&WindowStation); - - if (NT_SUCCESS(Status)) - { - TRACE("NtUserCreateWindowStation opened window station %wZ\n", ObjectAttributes->ObjectName); - return (HWINSTA)WindowStation; - } - - /* - * No existing window station found, try to create new one - */ - - /* Capture window station name */ - _SEH2_TRY - { - ProbeForRead( ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), 1); - Status = IntSafeCopyUnicodeStringTerminateNULL(&WindowStationName, ObjectAttributes->ObjectName); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status =_SEH2_GetExceptionCode(); - } - _SEH2_END - - if (! NT_SUCCESS(Status)) - { - ERR("Failed reading capturing window station name\n"); - SetLastNtError(Status); - return NULL; - } - - /* Create the window station object */ - Status = ObCreateObject( - UserMode, - ExWindowStationObjectType, - ObjectAttributes, - UserMode, - NULL, - sizeof(WINSTATION_OBJECT), - 0, - 0, - (PVOID*)&WindowStationObject); - - if (!NT_SUCCESS(Status)) - { - ERR("ObCreateObject failed for window station %wZ\n", &WindowStationName); - ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - return 0; - } - - Status = ObInsertObject( - (PVOID)WindowStationObject, - NULL, - dwDesiredAccess, - 0, - NULL, - (PVOID*)&WindowStation); - - if (!NT_SUCCESS(Status)) - { - ERR("ObInsertObject failed for window station %wZ\n", &WindowStationName); - ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - ObDereferenceObject(WindowStationObject); - return 0; - } - - /* Initialize the window station */ - RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); - - InitializeListHead(&WindowStationObject->DesktopListHead); - Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); - WindowStationObject->Name = WindowStationName; - WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId; - - if (InputWindowStation == NULL) - { - ERR("Initializing input window station\n"); - InputWindowStation = WindowStationObject; - - WindowStationObject->Flags &= ~WSS_NOIO; - - InitCursorImpl(); - } - else - { - WindowStationObject->Flags |= WSS_NOIO; - } - - TRACE("NtUserCreateWindowStation created object %p with name %wZ handle %p\n", + POBJECT_ATTRIBUTES ObjectAttributes, + ACCESS_MASK dwDesiredAccess, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4, + DWORD Unknown5, + DWORD Unknown6) +{ + UNICODE_STRING WindowStationName; + PWINSTATION_OBJECT WindowStationObject; + HWINSTA WindowStation; + NTSTATUS Status; + + TRACE("NtUserCreateWindowStation called\n"); + + Status = ObOpenObjectByName(ObjectAttributes, + ExWindowStationObjectType, + UserMode, + NULL, + dwDesiredAccess, + NULL, + (PVOID*)&WindowStation); + + if (NT_SUCCESS(Status)) + { + TRACE("NtUserCreateWindowStation opened window station %wZ\n", ObjectAttributes->ObjectName); + return (HWINSTA)WindowStation; + } + + /* + * No existing window station found, try to create new one + */ + + /* Capture window station name */ + _SEH2_TRY + { + ProbeForRead( ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), 1); + Status = IntSafeCopyUnicodeStringTerminateNULL(&WindowStationName, ObjectAttributes->ObjectName); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status =_SEH2_GetExceptionCode(); + } + _SEH2_END + + if (! NT_SUCCESS(Status)) + { + ERR("Failed reading capturing window station name\n"); + SetLastNtError(Status); + return NULL; + } + + /* Create the window station object */ + Status = ObCreateObject(UserMode, + ExWindowStationObjectType, + ObjectAttributes, + UserMode, + NULL, + sizeof(WINSTATION_OBJECT), + 0, + 0, + (PVOID*)&WindowStationObject); + + if (!NT_SUCCESS(Status)) + { + ERR("ObCreateObject failed for window station %wZ\n", &WindowStationName); + ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); + SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); + return 0; + } + + Status = ObInsertObject((PVOID)WindowStationObject, + NULL, + dwDesiredAccess, + 0, + NULL, + (PVOID*)&WindowStation); + + if (!NT_SUCCESS(Status)) + { + ERR("ObInsertObject failed for window station %wZ\n", &WindowStationName); + ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); + SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); + ObDereferenceObject(WindowStationObject); + return 0; + } + + /* Initialize the window station */ + RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); + + InitializeListHead(&WindowStationObject->DesktopListHead); + Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); + WindowStationObject->Name = WindowStationName; + WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId; + + if (InputWindowStation == NULL) + { + ERR("Initializing input window station\n"); + InputWindowStation = WindowStationObject; + + WindowStationObject->Flags &= ~WSS_NOIO; + + InitCursorImpl(); + } + else + { + WindowStationObject->Flags |= WSS_NOIO; + } + + TRACE("NtUserCreateWindowStation created object %p with name %wZ handle %p\n", WindowStation, &WindowStationObject->Name, WindowStation); - return WindowStation; + return WindowStation; } /* @@ -533,31 +529,30 @@ HWINSTA APIENTRY NtUserOpenWindowStation( - POBJECT_ATTRIBUTES ObjectAttributes, - ACCESS_MASK dwDesiredAccess) -{ - HWINSTA hwinsta; - NTSTATUS Status; - - Status = ObOpenObjectByName( - ObjectAttributes, - ExWindowStationObjectType, - UserMode, - NULL, - dwDesiredAccess, - NULL, - (PVOID*)&hwinsta); - - if (!NT_SUCCESS(Status)) - { - ERR("NtUserOpenWindowStation failed\n"); - SetLastNtError(Status); - return 0; - } - - TRACE("Opened window station %wZ with handle %p\n", ObjectAttributes->ObjectName, hwinsta); - - return hwinsta; + POBJECT_ATTRIBUTES ObjectAttributes, + ACCESS_MASK dwDesiredAccess) +{ + HWINSTA hwinsta; + NTSTATUS Status; + + Status = ObOpenObjectByName(ObjectAttributes, + ExWindowStationObjectType, + UserMode, + NULL, + dwDesiredAccess, + NULL, + (PVOID*)&hwinsta); + + if (!NT_SUCCESS(Status)) + { + ERR("NtUserOpenWindowStation failed\n"); + SetLastNtError(Status); + return 0; + } + + TRACE("Opened window station %wZ with handle %p\n", ObjectAttributes->ObjectName, hwinsta); + + return hwinsta; } /* @@ -584,44 +579,43 @@ BOOL APIENTRY NtUserCloseWindowStation( - HWINSTA hWinSta) -{ - PWINSTATION_OBJECT Object; - NTSTATUS Status; - - TRACE("NtUserCloseWindowStation called (%p)\n", hWinSta); - - if (hWinSta == UserGetProcessWindowStation()) - { + HWINSTA hWinSta) +{ + PWINSTATION_OBJECT Object; + NTSTATUS Status; + + TRACE("NtUserCloseWindowStation called (%p)\n", hWinSta); + + if (hWinSta == UserGetProcessWindowStation()) + { ERR("Attempted to close process window station\n"); - return FALSE; - } - - Status = IntValidateWindowStationHandle( - hWinSta, - UserMode, - 0, - &Object, - 0); - - if (!NT_SUCCESS(Status)) - { - ERR("Validation of window station handle (%p) failed\n", hWinSta); - return FALSE; - } - - ObDereferenceObject(Object); - - TRACE("Closing window station handle (%p)\n", hWinSta); - - Status = ObCloseHandle(hWinSta, UserMode); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - return TRUE; + return FALSE; + } + + Status = IntValidateWindowStationHandle(hWinSta, + UserMode, + 0, + &Object, + 0); + + if (!NT_SUCCESS(Status)) + { + ERR("Validation of window station handle (%p) failed\n", hWinSta); + return FALSE; + } + + ObDereferenceObject(Object); + + TRACE("Closing window station handle (%p)\n", hWinSta); + + Status = ObCloseHandle(hWinSta, UserMode); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + + return TRUE; } /* @@ -666,148 +660,146 @@ BOOL APIENTRY NtUserGetObjectInformation( - HANDLE hObject, - DWORD nIndex, - PVOID pvInformation, - DWORD nLength, - PDWORD nLengthNeeded) -{ - PWINSTATION_OBJECT WinStaObject; - PDESKTOP DesktopObject = NULL; - NTSTATUS Status; - PVOID pvData = NULL; - DWORD nDataSize = 0; - - _SEH2_TRY - { - if (nLengthNeeded) - ProbeForWrite(nLengthNeeded, sizeof(*nLengthNeeded), 1); - ProbeForWrite(pvInformation, nLength, 1); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - return FALSE; - } - _SEH2_END; - - /* try windowstation */ - TRACE("Trying to open window station %p\n", hObject); - Status = ObReferenceObjectByHandle( - hObject, - 0, - ExWindowStationObjectType, - UserMode, - (PVOID*)&WinStaObject, - NULL); - - if (Status == STATUS_OBJECT_TYPE_MISMATCH) - { - /* try desktop */ - TRACE("Trying to open desktop %p\n", hObject); - WinStaObject = NULL; - Status = IntValidateDesktopHandle( - hObject, - UserMode, - 0, - &DesktopObject); - } - - if (!NT_SUCCESS(Status)) - { - ERR("Failed: 0x%x\n", Status); - goto Exit; - } - - TRACE("WinSta or Desktop opened!!\n"); - - /* get data */ - switch (nIndex) - { - case UOI_FLAGS: - Status = STATUS_NOT_IMPLEMENTED; - ERR("UOI_FLAGS unimplemented!\n"); - break; - - case UOI_NAME: - if (WinStaObject != NULL) - { - pvData = WinStaObject->Name.Buffer; - nDataSize = WinStaObject->Name.Length + sizeof(WCHAR); - Status = STATUS_SUCCESS; - } - else if (DesktopObject != NULL) - { - pvData = DesktopObject->pDeskInfo->szDesktopName; - nDataSize = (wcslen(DesktopObject->pDeskInfo->szDesktopName) + 1) * sizeof(WCHAR); - Status = STATUS_SUCCESS; - } - else + HANDLE hObject, + DWORD nIndex, + PVOID pvInformation, + DWORD nLength, + PDWORD nLengthNeeded) +{ + PWINSTATION_OBJECT WinStaObject; + PDESKTOP DesktopObject = NULL; + NTSTATUS Status; + PVOID pvData = NULL; + DWORD nDataSize = 0; + + _SEH2_TRY + { + if (nLengthNeeded) + ProbeForWrite(nLengthNeeded, sizeof(*nLengthNeeded), 1); + ProbeForWrite(pvInformation, nLength, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + return FALSE; + } + _SEH2_END; + + /* try windowstation */ + TRACE("Trying to open window station %p\n", hObject); + Status = ObReferenceObjectByHandle(hObject, + 0, + ExWindowStationObjectType, + UserMode, + (PVOID*)&WinStaObject, + NULL); + + if (Status == STATUS_OBJECT_TYPE_MISMATCH) + { + /* try desktop */ + TRACE("Trying to open desktop %p\n", hObject); + WinStaObject = NULL; + Status = IntValidateDesktopHandle(hObject, + UserMode, + 0, + &DesktopObject); + } + + if (!NT_SUCCESS(Status)) + { + ERR("Failed: 0x%x\n", Status); + goto Exit; + } + + TRACE("WinSta or Desktop opened!!\n"); + + /* get data */ + switch (nIndex) + { + case UOI_FLAGS: + Status = STATUS_NOT_IMPLEMENTED; + ERR("UOI_FLAGS unimplemented!\n"); + break; + + case UOI_NAME: + if (WinStaObject != NULL) + { + pvData = WinStaObject->Name.Buffer; + nDataSize = WinStaObject->Name.Length + sizeof(WCHAR); + Status = STATUS_SUCCESS; + } + else if (DesktopObject != NULL) + { + pvData = DesktopObject->pDeskInfo->szDesktopName; + nDataSize = (wcslen(DesktopObject->pDeskInfo->szDesktopName) + 1) * sizeof(WCHAR); + Status = STATUS_SUCCESS; + } + else + Status = STATUS_INVALID_PARAMETER; + break; + + case UOI_TYPE: + if (WinStaObject != NULL) + { + pvData = L"WindowStation"; + nDataSize = sizeof(L"WindowStation"); + Status = STATUS_SUCCESS; + } + else if (DesktopObject != NULL) + { + pvData = L"Desktop"; + nDataSize = sizeof(L"Desktop"); + Status = STATUS_SUCCESS; + } + else + Status = STATUS_INVALID_PARAMETER; + break; + + case UOI_USER_SID: + Status = STATUS_NOT_IMPLEMENTED; + ERR("UOI_USER_SID unimplemented!\n"); + break; + + default: Status = STATUS_INVALID_PARAMETER; - break; - - case UOI_TYPE: - if (WinStaObject != NULL) - { - pvData = L"WindowStation"; - nDataSize = sizeof(L"WindowStation"); - Status = STATUS_SUCCESS; - } - else if (DesktopObject != NULL) - { - pvData = L"Desktop"; - nDataSize = sizeof(L"Desktop"); - Status = STATUS_SUCCESS; - } - else - Status = STATUS_INVALID_PARAMETER; - break; - - case UOI_USER_SID: - Status = STATUS_NOT_IMPLEMENTED; - ERR("UOI_USER_SID unimplemented!\n"); - break; - - default: - Status = STATUS_INVALID_PARAMETER; - break; - } + break; + } Exit: - if (Status == STATUS_SUCCESS && nLength < nDataSize) - Status = STATUS_BUFFER_TOO_SMALL; - - _SEH2_TRY - { - if (nLengthNeeded) - *nLengthNeeded = nDataSize; - - /* try to copy data to caller */ - if (Status == STATUS_SUCCESS) - { - TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize); - RtlCopyMemory(pvInformation, pvData, nDataSize); - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - /* release objects */ - if (WinStaObject != NULL) - ObDereferenceObject(WinStaObject); - if (DesktopObject != NULL) - ObDereferenceObject(DesktopObject); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - return TRUE; + if (Status == STATUS_SUCCESS && nLength < nDataSize) + Status = STATUS_BUFFER_TOO_SMALL; + + _SEH2_TRY + { + if (nLengthNeeded) + *nLengthNeeded = nDataSize; + + /* try to copy data to caller */ + if (Status == STATUS_SUCCESS) + { + TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize); + RtlCopyMemory(pvInformation, pvData, nDataSize); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* release objects */ + if (WinStaObject != NULL) + ObDereferenceObject(WinStaObject); + if (DesktopObject != NULL) + ObDereferenceObject(DesktopObject); + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + + return TRUE; } /* @@ -843,15 +835,15 @@ BOOL APIENTRY NtUserSetObjectInformation( - HANDLE hObject, - DWORD nIndex, - PVOID pvInformation, - DWORD nLength) -{ - /* FIXME: ZwQueryObject */ - /* FIXME: ZwSetInformationObject */ - SetLastNtError(STATUS_UNSUCCESSFUL); - return FALSE; + HANDLE hObject, + DWORD nIndex, + PVOID pvInformation, + DWORD nLength) +{ + /* FIXME: ZwQueryObject */ + /* FIXME: ZwSetInformationObject */ + SetLastNtError(STATUS_UNSUCCESSFUL); + return FALSE; } @@ -883,7 +875,7 @@ HWINSTA APIENTRY NtUserGetProcessWindowStation(VOID) { - return UserGetProcessWindowStation(); + return UserGetProcessWindowStation(); } BOOL FASTCALL @@ -900,64 +892,64 @@ /* Reference the new window station */ if(hWindowStation !=NULL) { - Status = IntValidateWindowStationHandle( hWindowStation, - UserMode, - 0, - &NewWinSta, - &ObjectHandleInfo); - if (!NT_SUCCESS(Status)) - { - TRACE("Validation of window station handle (%p) failed\n", - hWindowStation); - SetLastNtError(Status); - return FALSE; - } - } - - OldWinSta = ppi->prpwinsta; - hwinstaOld = PsGetProcessWin32WindowStation(ppi->peProcess); - - /* Dereference the previous window station */ - if(OldWinSta != NULL) - { - ObDereferenceObject(OldWinSta); - } - - /* Check if we have a stale handle (it should happen for console apps) */ - if(hwinstaOld != ppi->hwinsta) - { - ObCloseHandle(hwinstaOld, UserMode); - } - - /* - * FIXME: Don't allow changing the window station if there are threads that are attached to desktops and own GUI objects. - */ - - PsSetProcessWindowStation(ppi->peProcess, hWindowStation); - - ppi->prpwinsta = NewWinSta; - ppi->hwinsta = hWindowStation; - ppi->amwinsta = hWindowStation != NULL ? ObjectHandleInfo.GrantedAccess : 0; - TRACE("WS : Granted Access 0x%08lx\n",ppi->amwinsta); - - if (RtlAreAllAccessesGranted(ppi->amwinsta, WINSTA_READSCREEN)) - { - ppi->W32PF_flags |= W32PF_READSCREENACCESSGRANTED; - } - else - { - ppi->W32PF_flags &= ~W32PF_READSCREENACCESSGRANTED; - } - - if (NewWinSta && !(NewWinSta->Flags & WSS_NOIO) ) - { - ppi->W32PF_flags |= W32PF_IOWINSTA; - } - else // Might be closed if the handle is null. - { - ppi->W32PF_flags &= ~W32PF_IOWINSTA; - } - return TRUE; + Status = IntValidateWindowStationHandle(hWindowStation, + UserMode, + 0, + &NewWinSta, + &ObjectHandleInfo); + if (!NT_SUCCESS(Status)) + { + TRACE("Validation of window station handle (%p) failed\n", + hWindowStation); + SetLastNtError(Status); + return FALSE; + } + } + + OldWinSta = ppi->prpwinsta; + hwinstaOld = PsGetProcessWin32WindowStation(ppi->peProcess); + + /* Dereference the previous window station */ + if(OldWinSta != NULL) + { + ObDereferenceObject(OldWinSta); + } + + /* Check if we have a stale handle (it should happen for console apps) */ + if(hwinstaOld != ppi->hwinsta) + { + ObCloseHandle(hwinstaOld, UserMode); + } + + /* + * FIXME: Don't allow changing the window station if there are threads that are attached to desktops and own GUI objects. + */ + + PsSetProcessWindowStation(ppi->peProcess, hWindowStation); + + ppi->prpwinsta = NewWinSta; + ppi->hwinsta = hWindowStation; + ppi->amwinsta = hWindowStation != NULL ? ObjectHandleInfo.GrantedAccess : 0; + TRACE("WS : Granted Access 0x%08lx\n",ppi->amwinsta); + + if (RtlAreAllAccessesGranted(ppi->amwinsta, WINSTA_READSCREEN)) + { + ppi->W32PF_flags |= W32PF_READSCREENACCESSGRANTED; + } + else + { + ppi->W32PF_flags &= ~W32PF_READSCREENACCESSGRANTED; + } + + if (NewWinSta && !(NewWinSta->Flags & WSS_NOIO) ) + { + ppi->W32PF_flags |= W32PF_IOWINSTA; + } + else // Might be closed if the handle is null. + { + ppi->W32PF_flags &= ~W32PF_IOWINSTA; + } + return TRUE; } /* @@ -1002,37 +994,36 @@ BOOL APIENTRY NtUserLockWindowStation(HWINSTA hWindowStation) { - PWINSTATION_OBJECT Object; - NTSTATUS Status; - - TRACE("About to set process window station with handle (%p)\n", - hWindowStation); - - if (gpidLogon != PsGetCurrentProcessId()) - { - ERR("Unauthorized process attempted to lock the window station!\n"); - EngSetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - - Status = IntValidateWindowStationHandle( - hWindowStation, - UserMode, - 0, - &Object, - 0); - if (!NT_SUCCESS(Status)) - { - TRACE("Validation of window station handle (%p) failed\n", - hWindowStation); - SetLastNtError(Status); - return FALSE; - } - - Object->Flags |= WSS_LOCKED; - - ObDereferenceObject(Object); - return TRUE; + PWINSTATION_OBJECT Object; + NTSTATUS Status; + + TRACE("About to set process window station with handle (%p)\n", + hWindowStation); + + if (gpidLogon != PsGetCurrentProcessId()) + { + ERR("Unauthorized process attempted to lock the window station!\n"); + EngSetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + + Status = IntValidateWindowStationHandle(hWindowStation, + UserMode, + 0, + &Object, + 0); + if (!NT_SUCCESS(Status)) + { + TRACE("Validation of window station handle (%p) failed\n", + hWindowStation); + SetLastNtError(Status); + return FALSE; + } + + Object->Flags |= WSS_LOCKED; + + ObDereferenceObject(Object); + return TRUE; } /* @@ -1047,315 +1038,319 @@ BOOL APIENTRY NtUserUnlockWindowStation(HWINSTA hWindowStation) { - PWINSTATION_OBJECT Object; - NTSTATUS Status; - BOOL Ret; - - TRACE("About to set process window station with handle (%p)\n", - hWindowStation); - - if (gpidLogon != PsGetCurrentProcessId()) - { - ERR("Unauthorized process attempted to unlock the window station!\n"); - EngSetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - - Status = IntValidateWindowStationHandle( - hWindowStation, - UserMode, - 0, - &Object, - 0); - if (!NT_SUCCESS(Status)) - { - TRACE("Validation of window station handle (%p) failed\n", - hWindowStation); - SetLastNtError(Status); - return FALSE; - } - - Ret = (Object->Flags & WSS_LOCKED) == WSS_LOCKED; - Object->Flags &= ~WSS_LOCKED; - - ObDereferenceObject(Object); - return Ret; + PWINSTATION_OBJECT Object; + NTSTATUS Status; + BOOL Ret; + + TRACE("About to set process window station with handle (%p)\n", + hWindowStation); + + if (gpidLogon != PsGetCurrentProcessId()) + { + ERR("Unauthorized process attempted to unlock the window station!\n"); + EngSetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + + Status = IntValidateWindowStationHandle(hWindowStation, + UserMode, + 0, + &Object, + 0); + if (!NT_SUCCESS(Status)) + { + TRACE("Validation of window station handle (%p) failed\n", + hWindowStation); + SetLastNtError(Status); + return FALSE; + } + + Ret = (Object->Flags & WSS_LOCKED) == WSS_LOCKED; + Object->Flags &= ~WSS_LOCKED; + + ObDereferenceObject(Object); + return Ret; } static NTSTATUS FASTCALL BuildWindowStationNameList( - ULONG dwSize, - PVOID lpBuffer, - PULONG pRequiredSize) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - HANDLE DirectoryHandle; - char InitialBuffer[256], *Buffer; - ULONG Context, ReturnLength, BufferSize; - DWORD EntryCount; - POBJECT_DIRECTORY_INFORMATION DirEntry; - WCHAR NullWchar; - - /* - * Try to open the directory. - */ - InitializeObjectAttributes( - &ObjectAttributes, - &gustrWindowStationsDir, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, - NULL, - NULL); - - Status = ZwOpenDirectoryObject( - &DirectoryHandle, - DIRECTORY_QUERY, - &ObjectAttributes); - - if (!NT_SUCCESS(Status)) - { - return Status; - } - - /* First try to query the directory using a fixed-size buffer */ - Context = 0; - Buffer = NULL; - Status = ZwQueryDirectoryObject(DirectoryHandle, InitialBuffer, sizeof(InitialBuffer), - FALSE, TRUE, &Context, &ReturnLength); - if (NT_SUCCESS(Status)) - { - if (STATUS_NO_MORE_ENTRIES == ZwQueryDirectoryObject(DirectoryHandle, NULL, 0, FALSE, - FALSE, &Context, NULL)) - { - /* Our fixed-size buffer is large enough */ - Buffer = InitialBuffer; - } - } - - if (NULL == Buffer) - { - /* Need a larger buffer, check how large exactly */ - Status = ZwQueryDirectoryObject(DirectoryHandle, NULL, 0, FALSE, TRUE, &Context, - &ReturnLength); - if (!NT_SUCCESS(Status)) - { - ERR("ZwQueryDirectoryObject failed\n"); - ZwClose(DirectoryHandle); - return Status; - } - - BufferSize = ReturnLength; - Buffer = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_WINSTA); - if (NULL == Buffer) - { - ZwClose(DirectoryHandle); - return STATUS_NO_MEMORY; - } - - /* We should have a sufficiently large buffer now */ - Context = 0; - Status = ZwQueryDirectoryObject(DirectoryHandle, Buffer, BufferSize, - FALSE, TRUE, &Context, &ReturnLength); - if (! NT_SUCCESS(Status) || - STATUS_NO_MORE_ENTRIES != ZwQueryDirectoryObject(DirectoryHandle, NULL, 0, FALSE, - FALSE, &Context, NULL)) - { - /* Something went wrong, maybe someone added a directory entry? Just give up. */ - ExFreePoolWithTag(Buffer, TAG_WINSTA); - ZwClose(DirectoryHandle); - return NT_SUCCESS(Status) ? STATUS_INTERNAL_ERROR : Status; - } - } - - ZwClose(DirectoryHandle); - - /* - * Count the required size of buffer. - */ - ReturnLength = sizeof(DWORD); - EntryCount = 0; - for (DirEntry = (POBJECT_DIRECTORY_INFORMATION) Buffer; 0 != DirEntry->Name.Length; + ULONG dwSize, + PVOID lpBuffer, + PULONG pRequiredSize) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + HANDLE DirectoryHandle; + char InitialBuffer[256], *Buffer; + ULONG Context, ReturnLength, BufferSize; + DWORD EntryCount; + POBJECT_DIRECTORY_INFORMATION DirEntry; + WCHAR NullWchar; + + /* + * Try to open the directory. + */ + InitializeObjectAttributes(&ObjectAttributes, + &gustrWindowStationsDir, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + Status = ZwOpenDirectoryObject(&DirectoryHandle, + DIRECTORY_QUERY, + &ObjectAttributes); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* First try to query the directory using a fixed-size buffer */ + Context = 0; + Buffer = NULL; + Status = ZwQueryDirectoryObject(DirectoryHandle, + InitialBuffer, + sizeof(InitialBuffer), + FALSE, + TRUE, + &Context, + &ReturnLength); + if (NT_SUCCESS(Status)) + { + if (STATUS_NO_MORE_ENTRIES == ZwQueryDirectoryObject(DirectoryHandle, NULL, 0, FALSE, + FALSE, &Context, NULL)) + { + /* Our fixed-size buffer is large enough */ + Buffer = InitialBuffer; + } + } + + if (NULL == Buffer) + { + /* Need a larger buffer, check how large exactly */ + Status = ZwQueryDirectoryObject(DirectoryHandle, NULL, 0, FALSE, TRUE, &Context, + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + ERR("ZwQueryDirectoryObject failed\n"); + ZwClose(DirectoryHandle); + return Status; + } + + BufferSize = ReturnLength; + Buffer = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_WINSTA); + if (NULL == Buffer) + { + ZwClose(DirectoryHandle); + return STATUS_NO_MEMORY; + } + + /* We should have a sufficiently large buffer now */ + Context = 0; + Status = ZwQueryDirectoryObject(DirectoryHandle, Buffer, BufferSize, + FALSE, TRUE, &Context, &ReturnLength); + if (! NT_SUCCESS(Status) || + STATUS_NO_MORE_ENTRIES != ZwQueryDirectoryObject(DirectoryHandle, NULL, 0, FALSE, + FALSE, &Context, NULL)) + { + /* Something went wrong, maybe someone added a directory entry? Just give up. */ + ExFreePoolWithTag(Buffer, TAG_WINSTA); + ZwClose(DirectoryHandle); + return NT_SUCCESS(Status) ? STATUS_INTERNAL_ERROR : Status; + } + } + + ZwClose(DirectoryHandle); + + /* + * Count the required size of buffer. + */ + ReturnLength = sizeof(DWORD); + EntryCount = 0; + for (DirEntry = (POBJECT_DIRECTORY_INFORMATION) Buffer; + 0 != DirEntry->Name.Length; DirEntry++) - { - ReturnLength += DirEntry->Name.Length + sizeof(WCHAR); - EntryCount++; - } - TRACE("Required size: %lu Entry count: %lu\n", ReturnLength, EntryCount); - if (NULL != pRequiredSize) - { - Status = MmCopyToCaller(pRequiredSize, &ReturnLength, sizeof(ULONG)); - if (! NT_SUCCESS(Status)) - { - if (Buffer != InitialBuffer) - { + { + ReturnLength += DirEntry->Name.Length + sizeof(WCHAR); + EntryCount++; + } + TRACE("Required size: %lu Entry count: %lu\n", ReturnLength, EntryCount); + if (NULL != pRequiredSize) + { + Status = MmCopyToCaller(pRequiredSize, &ReturnLength, sizeof(ULONG)); + if (! NT_SUCCESS(Status)) + { + if (Buffer != InitialBuffer) + { + ExFreePoolWithTag(Buffer, TAG_WINSTA); + } + return STATUS_BUFFER_TOO_SMALL; + } + } + + /* + * Check if the supplied buffer is large enough. + */ + if (dwSize < ReturnLength) + { + if (Buffer != InitialBuffer) + { ExFreePoolWithTag(Buffer, TAG_WINSTA); - } - return STATUS_BUFFER_TOO_SMALL; - } - } - - /* - * Check if the supplied buffer is large enough. - */ - if (dwSize < ReturnLength) - { - if (Buffer != InitialBuffer) - { - ExFreePoolWithTag(Buffer, TAG_WINSTA); - } - return STATUS_BUFFER_TOO_SMALL; - } - - /* - * Generate the resulting buffer contents. - */ - Status = MmCopyToCaller(lpBuffer, &EntryCount, sizeof(DWORD)); - if (! NT_SUCCESS(Status)) - { - if (Buffer != InitialBuffer) - { - ExFreePoolWithTag(Buffer, TAG_WINSTA); - } - return Status; - } - lpBuffer = (PVOID) ((PCHAR) lpBuffer + sizeof(DWORD)); - - NullWchar = L'\0'; - for (DirEntry = (POBJECT_DIRECTORY_INFORMATION) Buffer; 0 != DirEntry->Name.Length; + } + return STATUS_BUFFER_TOO_SMALL; + } + + /* + * Generate the resulting buffer contents. + */ + Status = MmCopyToCaller(lpBuffer, &EntryCount, sizeof(DWORD)); + if (! NT_SUCCESS(Status)) + { + if (Buffer != InitialBuffer) + { + ExFreePoolWithTag(Buffer, TAG_WINSTA); + } + return Status; + } + lpBuffer = (PVOID) ((PCHAR) lpBuffer + sizeof(DWORD)); + + NullWchar = L'\0'; + for (DirEntry = (POBJECT_DIRECTORY_INFORMATION) Buffer; + 0 != DirEntry->Name.Length; DirEntry++) - { - Status = MmCopyToCaller(lpBuffer, DirEntry->Name.Buffer, DirEntry->Name.Length); - if (! NT_SUCCESS(Status)) - { - if (Buffer != InitialBuffer) - { - ExFreePoolWithTag(Buffer, TAG_WINSTA); - } - return Status; - } - lpBuffer = (PVOID) ((PCHAR) lpBuffer + DirEntry->Name.Length); - Status = MmCopyToCaller(lpBuffer, &NullWchar, sizeof(WCHAR)); - if (! NT_SUCCESS(Status)) - { - if (Buffer != InitialBuffer) - { - ExFreePoolWithTag(Buffer, TAG_WINSTA); - } - return Status; - } - lpBuffer = (PVOID) ((PCHAR) lpBuffer + sizeof(WCHAR)); - } - - /* - * Clean up - */ - if (Buffer != InitialBuffer) - { - ExFreePoolWithTag(Buffer, TAG_WINSTA); - } - - return STATUS_SUCCESS; + { + Status = MmCopyToCaller(lpBuffer, DirEntry->Name.Buffer, DirEntry->Name.Length); + if (! NT_SUCCESS(Status)) + { + if (Buffer != InitialBuffer) + { + ExFreePoolWithTag(Buffer, TAG_WINSTA); + } + return Status; + } + lpBuffer = (PVOID) ((PCHAR) lpBuffer + DirEntry->Name.Length); + Status = MmCopyToCaller(lpBuffer, &NullWchar, sizeof(WCHAR)); + if (! NT_SUCCESS(Status)) + { + if (Buffer != InitialBuffer) + { + ExFreePoolWithTag(Buffer, TAG_WINSTA); + } + return Status; + } + lpBuffer = (PVOID) ((PCHAR) lpBuffer + sizeof(WCHAR)); + } + + /* + * Clean up + */ + if (Buffer != InitialBuffer) + { + ExFreePoolWithTag(Buffer, TAG_WINSTA); + } + + return STATUS_SUCCESS; } static NTSTATUS FASTCALL BuildDesktopNameList( - HWINSTA hWindowStation, - ULONG dwSize, - PVOID lpBuffer, - PULONG pRequiredSize) -{ - NTSTATUS Status; - PWINSTATION_OBJECT WindowStation; - PLIST_ENTRY DesktopEntry; - PDESKTOP DesktopObject; - DWORD EntryCount; - ULONG ReturnLength; - WCHAR NullWchar; - UNICODE_STRING DesktopName; - - Status = IntValidateWindowStationHandle(hWindowStation, - UserMode, - 0, - &WindowStation, - 0); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - /* - * Count the required size of buffer. - */ - ReturnLength = sizeof(DWORD); - EntryCount = 0; - for (DesktopEntry = WindowStation->DesktopListHead.Flink; + HWINSTA hWindowStation, + ULONG dwSize, + PVOID lpBuffer, + PULONG pRequiredSize) +{ + NTSTATUS Status; + PWINSTATION_OBJECT WindowStation; + PLIST_ENTRY DesktopEntry; + PDESKTOP DesktopObject; + DWORD EntryCount; + ULONG ReturnLength; + WCHAR NullWchar; + UNICODE_STRING DesktopName; + + Status = IntValidateWindowStationHandle(hWindowStation, + UserMode, + 0, + &WindowStation, + 0); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + /* + * Count the required size of buffer. + */ + ReturnLength = sizeof(DWORD); + EntryCount = 0; + for (DesktopEntry = WindowStation->DesktopListHead.Flink; DesktopEntry != &WindowStation->DesktopListHead; DesktopEntry = DesktopEntry->Flink) - { - DesktopObject = CONTAINING_RECORD(DesktopEntry, DESKTOP, ListEntry); - RtlInitUnicodeString(&DesktopName, DesktopObject->pDeskInfo->szDesktopName); - ReturnLength += DesktopName.Length + sizeof(WCHAR); - EntryCount++; - } - TRACE("Required size: %lu Entry count: %lu\n", ReturnLength, EntryCount); - if (NULL != pRequiredSize) - { - Status = MmCopyToCaller(pRequiredSize, &ReturnLength, sizeof(ULONG)); - if (! NT_SUCCESS(Status)) - { - ObDereferenceObject(WindowStation); - return STATUS_BUFFER_TOO_SMALL; - } - } - - /* - * Check if the supplied buffer is large enough. - */ - if (dwSize < ReturnLength) - { - ObDereferenceObject(WindowStation); - return STATUS_BUFFER_TOO_SMALL; - } - - /* - * Generate the resulting buffer contents. - */ - Status = MmCopyToCaller(lpBuffer, &EntryCount, sizeof(DWORD)); - if (! NT_SUCCESS(Status)) - { - ObDereferenceObject(WindowStation); - return Status; - } - lpBuffer = (PVOID) ((PCHAR) lpBuffer + sizeof(DWORD)); - - NullWchar = L'\0'; - for (DesktopEntry = WindowStation->DesktopListHead.Flink; + { + DesktopObject = CONTAINING_RECORD(DesktopEntry, DESKTOP, ListEntry); + RtlInitUnicodeString(&DesktopName, DesktopObject->pDeskInfo->szDesktopName); + ReturnLength += DesktopName.Length + sizeof(WCHAR); + EntryCount++; + } + TRACE("Required size: %lu Entry count: %lu\n", ReturnLength, EntryCount); + if (NULL != pRequiredSize) + { + Status = MmCopyToCaller(pRequiredSize, &ReturnLength, sizeof(ULONG)); + if (! NT_SUCCESS(Status)) + { + ObDereferenceObject(WindowStation); + return STATUS_BUFFER_TOO_SMALL; + } + } + + /* + * Check if the supplied buffer is large enough. + */ + if (dwSize < ReturnLength) + { + ObDereferenceObject(WindowStation); + return STATUS_BUFFER_TOO_SMALL; + } + + /* + * Generate the resulting buffer contents. + */ + Status = MmCopyToCaller(lpBuffer, &EntryCount, sizeof(DWORD)); + if (! NT_SUCCESS(Status)) + { + ObDereferenceObject(WindowStation); + return Status; + } + lpBuffer = (PVOID) ((PCHAR) lpBuffer + sizeof(DWORD)); + + NullWchar = L'\0'; + for (DesktopEntry = WindowStation->DesktopListHead.Flink; DesktopEntry != &WindowStation->DesktopListHead; DesktopEntry = DesktopEntry->Flink) - { - DesktopObject = CONTAINING_RECORD(DesktopEntry, DESKTOP, ListEntry); - RtlInitUnicodeString(&DesktopName, DesktopObject->pDeskInfo->szDesktopName); - Status = MmCopyToCaller(lpBuffer, DesktopName.Buffer, DesktopName.Length); - if (! NT_SUCCESS(Status)) - { - ObDereferenceObject(WindowStation); - return Status; - } - lpBuffer = (PVOID) ((PCHAR)lpBuffer + DesktopName.Length); - Status = MmCopyToCaller(lpBuffer, &NullWchar, sizeof(WCHAR)); - if (! NT_SUCCESS(Status)) - { - ObDereferenceObject(WindowStation); - return Status; - } - lpBuffer = (PVOID) ((PCHAR) lpBuffer + sizeof(WCHAR)); - } - - /* - * Clean up and return - */ - ObDereferenceObject(WindowStation); - return STATUS_SUCCESS; + { + DesktopObject = CONTAINING_RECORD(DesktopEntry, DESKTOP, ListEntry); + RtlInitUnicodeString(&DesktopName, DesktopObject->pDeskInfo->szDesktopName); + Status = MmCopyToCaller(lpBuffer, DesktopName.Buffer, DesktopName.Length); + if (! NT_SUCCESS(Status)) + { + ObDereferenceObject(WindowStation); + return Status; + } + lpBuffer = (PVOID) ((PCHAR)lpBuffer + DesktopName.Length); + Status = MmCopyToCaller(lpBuffer, &NullWchar, sizeof(WCHAR)); + if (! NT_SUCCESS(Status)) + { + ObDereferenceObject(WindowStation); + return Status; + } + lpBuffer = (PVOID) ((PCHAR) lpBuffer + sizeof(WCHAR)); + } + + /* + * Clean up and return + */ + ObDereferenceObject(WindowStation); + return STATUS_SUCCESS; } /* @@ -1386,15 +1381,15 @@ NTSTATUS APIENTRY NtUserBuildNameList( - HWINSTA hWindowStation, - ULONG dwSize, - PVOID lpBuffer, - PULONG pRequiredSize) -{ - /* The WindowStation name list and desktop name list are build in completely - different ways. Call the appropriate function */ - return NULL == hWindowStation ? BuildWindowStationNameList(dwSize, lpBuffer, pRequiredSize) : - BuildDesktopNameList(hWindowStation, dwSize, lpBuffer, pRequiredSize); + HWINSTA hWindowStation, + ULONG dwSize, + PVOID lpBuffer, + PULONG pRequiredSize) +{ + /* The WindowStation name list and desktop name list are build in completely + different ways. Call the appropriate function */ + return NULL == hWindowStation ? BuildWindowStationNameList(dwSize, lpBuffer, pRequiredSize) : + BuildDesktopNameList(hWindowStation, dwSize, lpBuffer, pRequiredSize); } /* @@ -1438,77 +1433,77 @@ UserLeave(); - return ret; + return ret; } BOOL APIENTRY NtUserSetWindowStationUser( - HWINSTA hWindowStation, - PLUID pluid, - PSID psid, - DWORD size) -{ - NTSTATUS Status; - PWINSTATION_OBJECT WindowStation = NULL; - BOOL Ret = FALSE; - - UserEnterExclusive(); - - if (gpidLogon != PsGetCurrentProcessId()) - { - EngSetLastError(ERROR_ACCESS_DENIED); - goto Leave; - } - - Status = IntValidateWindowStationHandle(hWindowStation, - UserMode, - 0, - &WindowStation, - 0); - if (!NT_SUCCESS(Status)) - { - goto Leave; - } - - if (WindowStation->psidUser) - { - ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); - } - - WindowStation->psidUser = ExAllocatePoolWithTag(PagedPool, size, USERTAG_SECURITY); - if (WindowStation->psidUser == NULL) - { - EngSetLastError(ERROR_OUTOFMEMORY); - goto Leave; - } - - _SEH2_TRY - { - ProbeForRead( psid, size, 1); - ProbeForRead( pluid, sizeof(LUID), 1); - - RtlCopyMemory(WindowStation->psidUser, psid, size); - WindowStation->luidUser = *pluid; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); - WindowStation->psidUser = 0; - goto Leave; - } - - Ret = TRUE; + HWINSTA hWindowStation, + PLUID pluid, + PSID psid, + DWORD size) +{ + NTSTATUS Status; + PWINSTATION_OBJECT WindowStation = NULL; + BOOL Ret = FALSE; + + UserEnterExclusive(); + + if (gpidLogon != PsGetCurrentProcessId()) + { + EngSetLastError(ERROR_ACCESS_DENIED); + goto Leave; + } + + Status = IntValidateWindowStationHandle(hWindowStation, + UserMode, + 0, + &WindowStation, + 0); + if (!NT_SUCCESS(Status)) + { + goto Leave; + } + + if (WindowStation->psidUser) + { + ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); + } + + WindowStation->psidUser = ExAllocatePoolWithTag(PagedPool, size, USERTAG_SECURITY); + if (WindowStation->psidUser == NULL) + { + EngSetLastError(ERROR_OUTOFMEMORY); + goto Leave; + } + + _SEH2_TRY + { + ProbeForRead( psid, size, 1); + ProbeForRead( pluid, sizeof(LUID), 1); + + RtlCopyMemory(WindowStation->psidUser, psid, size); + WindowStation->luidUser = *pluid; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); + WindowStation->psidUser = 0; + goto Leave; + } + + Ret = TRUE; Leave: - if (WindowStation) ObDereferenceObject(WindowStation); - UserLeave(); - return Ret; + if (WindowStation) ObDereferenceObject(WindowStation); + UserLeave(); + return Ret; }

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