Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 65696: [WIN32K] - Simplify NtUserInitialize: we can check whether gpepCSRSS is != NULL to see if we are initialized or not (instead of using gbInitialized). - The UserInitialize helper d...
by hbelusca＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: hbelusca Date: Wed Dec 17 00:33:40 2014 New Revision: 65696 URL: http://svn.reactos.org/svn/reactos?rev=65696&view=rev Log: [WIN32K] - Simplify NtUserInitialize: we can check whether gpepCSRSS is != NULL to see if we are initialized or not (instead of using gbInitialized). - The UserInitialize helper doesn't need to take parameters. The two event handles (power and media, used when we receive a power event -- for sleep, etc... -- and a media event -- like USB key insertion and such --) just need to be used in the not-yet-implemented "Initialize Power Request List" and "Initialize Media Change" steps. - Something that should be done is to bugcheck if the USER version reported is != 5.0 (as windows does). [WINSRV] - Collapse common inclusions from usersrv and consrv into the common header winsrv.h. [USERSRV] - _UserSoundSentry is NTAPI - Stub UserClientConnect (Timo's patch contains more involved code. I will commit it later). - Our NtUserInitialize(0, NULL, NULL); call (that made Windows BSOD) is wrong. It should be done with its first parameter correctly set to the USER version (5.0) and the two other parameters are handles to power and media events (see above). We should create them before. This is part of patch by Timo Kreuzer. CORE-7505 #comment UserClientConnect stubbed (it should be better implemented, I will commit the code from the patch later on); power&media events initialized; NtUserInitialize corrected. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/ntuser.h trunk/reactos/win32ss/user/winsrv/consrv/consrv.h trunk/reactos/win32ss/user/winsrv/usersrv/api.h trunk/reactos/win32ss/user/winsrv/usersrv/init.c trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h trunk/reactos/win32ss/user/winsrv/winsrv.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -1029,6 +1029,9 @@ DWORD dwDispatchCount; SHAREDINFO siClient; } USERCONNECT, *PUSERCONNECT; + +// WinNT 5.0 compatible user32 / win32k +#define USER_VERSION MAKELONG(0x0000, 0x0005) typedef struct tagGETCLIPBDATA { Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -697,7 +697,7 @@ { /* Make sure that the first syscall is NtUserInitialize */ /* too bad this fails */ - //ASSERT(gbInitialized); + // ASSERT(gpepCSRSS); UserDbgAssertThreadInfo(TRUE); Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -890,7 +890,6 @@ IN USERTHREADINFOCLASS ThreadInformationClass, IN PVOID ThreadInformation, IN ULONG ThreadInformationLength) - { NTSTATUS Status = STATUS_SUCCESS; PETHREAD Thread; Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -17,7 +17,6 @@ ATOM AtomWndObj; // Window Object atom. ATOM AtomLayer; // Window Layer atom. ATOM AtomFlashWndState; // Window Flash State atom. -BOOL gbInitialized; HINSTANCE hModClient = NULL; BOOL ClientPfnInit = FALSE; PEPROCESS gpepCSRSS = NULL; @@ -98,9 +97,7 @@ NTSTATUS NTAPI -UserInitialize( - HANDLE hPowerRequestEvent, - HANDLE hMediaRequestEvent) +UserInitialize(VOID) { static const DWORD wPattern55AA[] = /* 32 bit aligned */ { 0x55555555, 0xaaaaaaaa, 0x55555555, 0xaaaaaaaa, @@ -153,7 +150,7 @@ } /* - Called from win32csr. + * Called from usersrv. */ NTSTATUS APIENTRY @@ -167,27 +164,26 @@ TRACE("Enter NtUserInitialize(%lx, %p, %p)\n", dwWinVersion, hPowerRequestEvent, hMediaRequestEvent); - /* Check the Windows version */ - if (dwWinVersion != 0) + /* Check if we are already initialized */ + if (gpepCSRSS) + return STATUS_UNSUCCESSFUL; + + /* Check Windows USER subsystem version */ + if (dwWinVersion != USER_VERSION) { + // FIXME: Should bugcheck! return STATUS_UNSUCCESSFUL; } /* Acquire exclusive lock */ UserEnterExclusive(); - /* Check if we are already initialized */ - if (gbInitialized) - { - UserLeave(); - return STATUS_UNSUCCESSFUL; - } - - /* Save EPROCESS of CSRSS */ + /* Save the EPROCESS of CSRSS */ gpepCSRSS = PsGetCurrentProcess(); -// Initialize Power Request List. -// Initialize Media Change. +// Initialize Power Request List (use hPowerRequestEvent). +// Initialize Media Change (use hMediaRequestEvent). + // InitializeGreCSRSS(); // { // Startup DxGraphics. @@ -196,10 +192,7 @@ // } /* Initialize USER */ - Status = UserInitialize(hPowerRequestEvent, hMediaRequestEvent); - - /* Set us as initialized */ - gbInitialized = TRUE; + Status = UserInitialize(); /* Return */ UserLeave(); Modified: trunk/reactos/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -9,7 +9,6 @@ #define UserEnterCo UserEnterExclusive #define UserLeaveCo UserLeave -extern BOOL gbInitialized; extern PSERVERINFO gpsi; extern PTHREADINFO gptiCurrent; extern PPROCESSINFO gppiList; Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -22,7 +22,6 @@ #include <wincon.h> #define NTOS_MODE_USER -#include <ndk/exfuncs.h> #include <ndk/mmfuncs.h> /* CONSOLE Headers */ Modified: trunk/reactos/win32ss/user/winsrv/usersrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/api.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/api.h [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -9,7 +9,7 @@ #pragma once /* init.c */ -BOOL WINAPI _UserSoundSentry(VOID); +BOOL NTAPI _UserSoundSentry(VOID); CSR_API(SrvCreateSystemThreads); CSR_API(SrvActivateDebugger); CSR_API(SrvGetThreadConsoleDesktop); Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -19,6 +19,10 @@ /* GLOBALS ********************************************************************/ HINSTANCE UserServerDllInstance = NULL; + +/* Handles for Power and Media events. Used by both usersrv and win32k. */ +HANDLE ghPowerRequestEvent; +HANDLE ghMediaRequestEvent; /* Memory */ HANDLE UserServerHeap = NULL; // Our own heap. @@ -84,7 +88,7 @@ /* FUNCTIONS ******************************************************************/ // PUSER_SOUND_SENTRY. Used in basesrv.dll -BOOL WINAPI _UserSoundSentry(VOID) +BOOL NTAPI _UserSoundSentry(VOID) { // TODO: Do something. return TRUE; @@ -128,6 +132,35 @@ { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UserClientConnect(IN PCSR_PROCESS CsrProcess, + IN OUT PVOID ConnectionInfo, + IN OUT PULONG ConnectionInfoLength) +{ + DPRINT1("UserClientConnect\n"); + +#if 0 + // NTSTATUS Status = STATUS_SUCCESS; + PBASESRV_API_CONNECTINFO ConnectInfo = (PBASESRV_API_CONNECTINFO)ConnectionInfo; + + if ( ConnectionInfo == NULL || + ConnectionInfoLength == NULL || + *ConnectionInfoLength != sizeof(*ConnectInfo) ) + { + DPRINT1("BASESRV: Connection failed - ConnectionInfo = 0x%p ; ConnectionInfoLength = 0x%p (%lu), expected %lu\n", + ConnectionInfo, + ConnectionInfoLength, + ConnectionInfoLength ? *ConnectionInfoLength : (ULONG)-1, + sizeof(*ConnectInfo)); + + return STATUS_INVALID_PARAMETER; + } +#else + return STATUS_SUCCESS; +#endif } CSR_SERVER_DLL_INIT(UserServerDllInitialization) @@ -141,9 +174,6 @@ /* Initialize the memory */ UserServerHeap = RtlGetProcessHeap(); - - /* Initialize the video */ - NtUserInitialize(0, NULL, NULL); /* Setup the DLL Object */ LoadedServerDll->ApiBase = USERSRV_FIRST_API_NUMBER; @@ -154,7 +184,7 @@ LoadedServerDll->NameTable = UserServerApiNameTable; #endif LoadedServerDll->SizeOfProcessData = 0; - LoadedServerDll->ConnectCallback = NULL; + LoadedServerDll->ConnectCallback = UserClientConnect; LoadedServerDll->DisconnectCallback = NULL; LoadedServerDll->HardErrorCallback = UserServerHardError; LoadedServerDll->ShutdownProcessCallback = UserClientShutdown; @@ -175,9 +205,45 @@ NtClose(ServerThread); } else + { DPRINT1("Cannot start Raw Input Thread!\n"); + } } /*** END - From win32csr... ***/ + + /* Create the power request event */ + Status = NtCreateEvent(&ghPowerRequestEvent, + EVENT_ALL_ACCESS, + NULL, + SynchronizationEvent, + FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Power request event creation failed with Status 0x%08x\n", Status); + return Status; + } + + /* Create the media request event */ + Status = NtCreateEvent(&ghMediaRequestEvent, + EVENT_ALL_ACCESS, + NULL, + SynchronizationEvent, + FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Media request event creation failed with Status 0x%08x\n", Status); + return Status; + } + + /* Initialize the kernel mode subsystem */ + Status = NtUserInitialize(USER_VERSION, + ghPowerRequestEvent, + ghMediaRequestEvent); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtUserInitialize failed with Status 0x%08x\n", Status); + return Status; + } /* All done */ return STATUS_SUCCESS; Modified: trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -9,6 +9,9 @@ #ifndef __USERSRV_H__ #define __USERSRV_H__ +/* Main header */ +#include "../winsrv.h" + /* PSDK/NDK Headers */ #include <stdarg.h> @@ -16,21 +19,7 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> - -#define NTOS_MODE_USER -#include <ndk/obfuncs.h> -#include <ndk/psfuncs.h> -#include <ndk/rtlfuncs.h> - -/* Public Win32K Headers */ -#include <ntuser.h> - -/* CSRSS Header */ -#include <csr/csrsrv.h> +// #define NTOS_MODE_USER /* USER Headers */ #include <win/winmsg.h> Modified: trunk/reactos/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/winsrv.h [iso-8859-1] Wed Dec 17 00:33:40 2014 @@ -21,11 +21,13 @@ #include <winbase.h> #include <wingdi.h> #include <winuser.h> + /* Undocumented user definitions */ #include <undocuser.h> #define NTOS_MODE_USER #include <ndk/cmfuncs.h> +#include <ndk/exfuncs.h> #include <ndk/obfuncs.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h>

1 0

[dquintana] 65695: [SHELL32] * Revert r65589, since it breaks tray icons.
by dquintana＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: dquintana Date: Wed Dec 17 00:32:34 2014 New Revision: 65695 URL: http://svn.reactos.org/svn/reactos?rev=65695&view=rev Log: [SHELL32] * Revert r65589, since it breaks tray icons. Modified: trunk/reactos/dll/win32/shell32/systray.cpp Modified: trunk/reactos/dll/win32/shell32/systray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/systray.… ============================================================================== --- trunk/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] Wed Dec 17 00:32:34 2014 @@ -50,8 +50,8 @@ data.lpData = pnotify_data; for(hwnd = 0; (hwnd = FindWindowExW(0, hwnd, L"Shell_TrayWnd", NULL)); ) - if ((unicode ? SendMessageTimeoutW : SendMessageTimeoutA)(hwnd, WM_COPYDATA, (WPARAM)nid_hwnd, (LPARAM)&data, SMTO_BLOCK|SMTO_ABORTIFHUNG, 4000, (PDWORD_PTR)&ret)) - return ret; + if ((unicode ? SendMessageW : SendMessageA)(hwnd, WM_COPYDATA, (WPARAM)nid_hwnd, (LPARAM)&data)) + ret = TRUE; return ret; }

1 0

[hbelusca] 65694: [WIN32K]: Some code formatting in csr.c before revampering it.
by hbelusca＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: hbelusca Date: Wed Dec 17 00:17:44 2014 New Revision: 65694 URL: http://svn.reactos.org/svn/reactos?rev=65694&view=rev Log: [WIN32K]: Some code formatting in csr.c before revampering it. Modified: trunk/reactos/win32ss/user/ntuser/csr.c trunk/reactos/win32ss/user/ntuser/csr.h Modified: trunk/reactos/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/csr.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/csr.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/csr.c [iso-8859-1] Wed Dec 17 00:17:44 2014 @@ -1,49 +1,49 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Interface to csrss - * FILE: subsys/win32k/ntuser/csr.c + * PROJECT: ReactOS Win32k subsystem + * PURPOSE: Interface to CSRSS / USERSRV + * FILE: subsystems/win32/win32k/ntuser/csr.c * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) */ #include <win32k.h> static HANDLE WindowsApiPort = NULL; +// See gpepCSRSS in ntuser/ntuser.c and its initialization into NtUserInitialize() PEPROCESS CsrProcess = NULL; NTSTATUS FASTCALL CsrInit(void) { - NTSTATUS Status; - UNICODE_STRING PortName; - ULONG ConnectInfoLength; - SECURITY_QUALITY_OF_SERVICE Qos; + NTSTATUS Status; + UNICODE_STRING PortName; + ULONG ConnectInfoLength; + SECURITY_QUALITY_OF_SERVICE Qos; - RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort"); - ConnectInfoLength = 0; - Qos.Length = sizeof(Qos); - Qos.ImpersonationLevel = SecurityDelegation; - Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING; - Qos.EffectiveOnly = FALSE; + RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort"); + ConnectInfoLength = 0; + Qos.Length = sizeof(Qos); + Qos.ImpersonationLevel = SecurityDelegation; + Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING; + Qos.EffectiveOnly = FALSE; - Status = ZwConnectPort(&WindowsApiPort, - &PortName, - &Qos, - NULL, - NULL, - NULL, - NULL, - &ConnectInfoLength); - if (! NT_SUCCESS(Status)) - { - return Status; - } + Status = ZwConnectPort(&WindowsApiPort, + &PortName, + &Qos, + NULL, + NULL, + NULL, + NULL, + &ConnectInfoLength); + if (!NT_SUCCESS(Status)) + { + return Status; + } - CsrProcess = PsGetCurrentProcess(); + CsrProcess = PsGetCurrentProcess(); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } - NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request) Modified: trunk/reactos/win32ss/user/ntuser/csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/csr.h?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/csr.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/csr.h [iso-8859-1] Wed Dec 17 00:17:44 2014 @@ -1,8 +1,8 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Interface to csrss - * FILE: subsys/win32k/include/csr.h + * PROJECT: ReactOS Win32k subsystem + * PURPOSE: Interface to CSRSS / USERSRV + * FILE: subsystems/win32/win32k/ntuser/csr.h * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) */ @@ -12,9 +12,5 @@ NTSTATUS FASTCALL CsrInit(void); NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request); -NTSTATUS FASTCALL CsrCloseHandle(HANDLE Handle); -NTSTATUS WINAPI CsrInsertObject(HANDLE ObjectHandle, - ACCESS_MASK DesiredAccess, - PHANDLE Handle); /* EOF */

1 0

[hbelusca] 65693: [WIN32K] Stubplement NtUserQueryInformationThread and NtUserSetInformationThread that will be used for: - shutdown support: CORE-8322 - communicating a CSR Port handle to win32k: ...
by hbelusca＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: hbelusca Date: Tue Dec 16 23:09:29 2014 New Revision: 65693 URL: http://svn.reactos.org/svn/reactos?rev=65693&view=rev Log: [WIN32K] Stubplement NtUserQueryInformationThread and NtUserSetInformationThread that will be used for: - shutdown support: CORE-8322 - communicating a CSR Port handle to win32k: CORE-7505 CORE-7505 CORE-8322 Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Tue Dec 16 23:09:29 2014 @@ -761,8 +761,39 @@ OUT PVOID ThreadInformation, IN ULONG ThreadInformationLength) { - STUB; - return STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; + PETHREAD Thread; + + /* Allow only CSRSS to perform this operation */ + if (PsGetCurrentProcess() != gpepCSRSS) + return STATUS_ACCESS_DENIED; + + UserEnterExclusive(); + + /* Get the Thread */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_QUERY_INFORMATION, + *PsThreadType, + UserMode, + (PVOID)&Thread, + NULL); + if (!NT_SUCCESS(Status)) goto Quit; + + switch (ThreadInformationClass) + { + default: + { + STUB; + Status = STATUS_NOT_IMPLEMENTED; + break; + } + } + + ObDereferenceObject(Thread); + +Quit: + UserLeave(); + return Status; } DWORD @@ -861,20 +892,63 @@ IN ULONG ThreadInformationLength) { - if (ThreadInformationClass == UserThreadInitiateShutdown) + NTSTATUS Status = STATUS_SUCCESS; + PETHREAD Thread; + + /* Allow only CSRSS to perform this operation */ + if (PsGetCurrentProcess() != gpepCSRSS) + return STATUS_ACCESS_DENIED; + + UserEnterExclusive(); + + /* Get the Thread */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_SET_INFORMATION, + *PsThreadType, + UserMode, + (PVOID)&Thread, + NULL); + if (!NT_SUCCESS(Status)) goto Quit; + + switch (ThreadInformationClass) { - ERR("Shutdown initiated\n"); + case UserThreadInitiateShutdown: + { + ERR("Shutdown initiated\n"); + STUB; + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + case UserThreadEndShutdown: + { + ERR("Shutdown ended\n"); + STUB; + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + case UserThreadCsrApiPort: + { + ERR("Set CSR API Port for Win32k\n"); + STUB; + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + default: + { + STUB; + Status = STATUS_NOT_IMPLEMENTED; + break; + } } - else if (ThreadInformationClass == UserThreadEndShutdown) - { - ERR("Shutdown ended\n"); - } - else - { - STUB; - } - - return STATUS_SUCCESS; + + ObDereferenceObject(Thread); + +Quit: + UserLeave(); + return Status; } DWORD

1 0

[hbelusca] 65692: ... And as a result of the previous commit, finally get rid of the "deprecated" directory!
by hbelusca＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: hbelusca Date: Tue Dec 16 21:59:50 2014 New Revision: 65692 URL: http://svn.reactos.org/svn/reactos?rev=65692&view=rev Log: ... And as a result of the previous commit, finally get rid of the "deprecated" directory! Removed: trunk/reactos/deprecated/

1 0

[hbelusca] 65691: [WIN32SS]: Push back csr code into win32k (not compiled yet). The thing is that win32k uses a LPC port to communicate with winsrv.dll . But it's winsrv.dll that gives a handle of ...
by hbelusca＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: hbelusca Date: Tue Dec 16 21:58:18 2014 New Revision: 65691 URL: http://svn.reactos.org/svn/reactos?rev=65691&view=rev Log: [WIN32SS]: Push back csr code into win32k (not compiled yet). The thing is that win32k uses a LPC port to communicate with winsrv.dll . But it's winsrv.dll that gives a handle of the CSR port to win32k via a call to NtUserSetInformationThread with the UserThreadCsrApiPort information class. See part of Timo's patch in CORE-7505 that will be submitted later on. Also I need to somewhat stub the UserThreadCsrApiPort info class in NtUserSetInformationThread :) Added: trunk/reactos/win32ss/user/ntuser/csr.c - copied unchanged from r65683, trunk/reactos/deprecated/csr.c trunk/reactos/win32ss/user/ntuser/csr.h - copied unchanged from r65683, trunk/reactos/deprecated/csr.h Removed: trunk/reactos/deprecated/csr.c trunk/reactos/deprecated/csr.h Removed: trunk/reactos/deprecated/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/deprecated/csr.c?rev=65690 ============================================================================== --- trunk/reactos/deprecated/csr.c [iso-8859-1] (original) +++ trunk/reactos/deprecated/csr.c (removed) @@ -1,91 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Interface to csrss - * FILE: subsys/win32k/ntuser/csr.c - * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) - */ - -#include <win32k.h> - -static HANDLE WindowsApiPort = NULL; -PEPROCESS CsrProcess = NULL; - -NTSTATUS FASTCALL -CsrInit(void) -{ - NTSTATUS Status; - UNICODE_STRING PortName; - ULONG ConnectInfoLength; - SECURITY_QUALITY_OF_SERVICE Qos; - - RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort"); - ConnectInfoLength = 0; - Qos.Length = sizeof(Qos); - Qos.ImpersonationLevel = SecurityDelegation; - Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING; - Qos.EffectiveOnly = FALSE; - - Status = ZwConnectPort(&WindowsApiPort, - &PortName, - &Qos, - NULL, - NULL, - NULL, - NULL, - &ConnectInfoLength); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - CsrProcess = PsGetCurrentProcess(); - - return STATUS_SUCCESS; -} - - -NTSTATUS FASTCALL -co_CsrNotify(PCSR_API_MESSAGE Request) -{ - NTSTATUS Status; - PEPROCESS OldProcess; - - if (NULL == CsrProcess) - { - return STATUS_INVALID_PORT_HANDLE; - } - - Request->Header.u2.ZeroInit = 0; - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - - /* Switch to the process in which the WindowsApiPort handle is valid */ - OldProcess = PsGetCurrentProcess(); - if (CsrProcess != OldProcess) - { - KeAttachProcess(&CsrProcess->Pcb); - } - - UserLeaveCo(); - - Status = ZwRequestWaitReplyPort(WindowsApiPort, - &Request->Header, - &Request->Header); - - UserEnterCo(); - - if (CsrProcess != OldProcess) - { - KeDetachProcess(); - } - - if (NT_SUCCESS(Status)) - { - Status = Request->Status; - } - - return Status; -} - -/* EOF */ Removed: trunk/reactos/deprecated/csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/deprecated/csr.h?rev=65690 ============================================================================== --- trunk/reactos/deprecated/csr.h [iso-8859-1] (original) +++ trunk/reactos/deprecated/csr.h (removed) @@ -1,20 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Interface to csrss - * FILE: subsys/win32k/include/csr.h - * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) - */ - -#pragma once - -extern PEPROCESS CsrProcess; - -NTSTATUS FASTCALL CsrInit(void); -NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request); -NTSTATUS FASTCALL CsrCloseHandle(HANDLE Handle); -NTSTATUS WINAPI CsrInsertObject(HANDLE ObjectHandle, - ACCESS_MASK DesiredAccess, - PHANDLE Handle); - -/* EOF */

1 0

[hbelusca] 65690: [KERNEL32][BASESRV] On Windows 2k3, BASESRV_API_CONNECTINFO went under a slimming treatment and now is only 4 bytes. In fact all its information was already existing in the static...
by hbelusca＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: hbelusca Date: Tue Dec 16 21:48:23 2014 New Revision: 65690 URL: http://svn.reactos.org/svn/reactos?rev=65690&view=rev Log: [KERNEL32][BASESRV] On Windows 2k3, BASESRV_API_CONNECTINFO went under a slimming treatment and now is only 4 bytes. In fact all its information was already existing in the static base data structure (BaseStaticServerData). We should now be more 2k3-compatible :) Fix also the testbots. Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/include/reactos/subsys/win/base.h trunk/reactos/include/reactos/subsys/win/basemsg.h Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Tue Dec 16 21:48:23 2014 @@ -88,8 +88,8 @@ LPVOID lpReserved) { NTSTATUS Status; - ULONG Dummy; - ULONG DummySize = sizeof(Dummy); + BASESRV_API_CONNECTINFO ConnectInfo; + ULONG ConnectInfoSize = sizeof(ConnectInfo); WCHAR SessionDir[256]; DPRINT("DllMain(hInst %p, dwReason %lu)\n", @@ -133,11 +133,11 @@ WIN_OBJ_DIR); } - /* Connect to the base server */ + /* Connect to the Base Server */ Status = CsrClientConnectToServer(SessionDir, BASESRV_SERVERDLL_INDEX, - &Dummy, - &DummySize, + &ConnectInfo, + &ConnectInfoSize, &BaseRunningInServerProcess); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] Tue Dec 16 21:48:23 2014 @@ -131,7 +131,8 @@ BOOLEAN LUIDDeviceMapsEnabled; ULONG TermsrvClientTimeZoneChangeNum; } BASE_STATIC_SERVER_DATA, *PBASE_STATIC_SERVER_DATA; -#ifndef _WIN64 + +#if defined(_M_IX86) C_ASSERT(sizeof(BASE_STATIC_SERVER_DATA) == 0x1AC8); #endif Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Tue Dec 16 21:48:23 2014 @@ -53,19 +53,14 @@ BasepMaxApiNumber } BASESRV_API_NUMBER, *PBASESRV_API_NUMBER; - typedef struct _BASESRV_API_CONNECTINFO { - ULONG ExpectedVersion; - HANDLE DefaultObjectDirectory; - ULONG WindowsVersion; - ULONG CurrentVersion; - ULONG DebugFlags; - WCHAR WindowsDirectory[MAX_PATH]; - WCHAR WindowsSystemDirectory[MAX_PATH]; + ULONG DebugFlags; } BASESRV_API_CONNECTINFO, *PBASESRV_API_CONNECTINFO; -#define BASESRV_VERSION 0x10000 +#if defined(_M_IX86) +C_ASSERT(sizeof(BASESRV_API_CONNECTINFO) == 0x04); +#endif typedef struct _BASE_SXS_CREATEPROCESS_MSG

1 0

[tkreuzer] 65689: [SPEC2DEF] Improve error output
by tkreuzer＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: tkreuzer Date: Tue Dec 16 21:21:14 2014 New Revision: 65689 URL: http://svn.reactos.org/svn/reactos?rev=65689&view=rev Log: [SPEC2DEF] Improve error output Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Tue Dec 16 21:21:14 2014 @@ -879,7 +879,7 @@ /* Go to next token */ if (!(pc = NextToken(pc))) { - fprintf(stderr, "fail4\n"); + fprintf(stderr, "error: line %d, expected token\n", nLine); return -13; }

1 0

[tkreuzer] 65688: [NTOSKRNL] Hey Arch, using uninitialized variables is bad, mkay?
by tkreuzer＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: tkreuzer Date: Tue Dec 16 21:15:57 2014 New Revision: 65688 URL: http://svn.reactos.org/svn/reactos?rev=65688&view=rev Log: [NTOSKRNL] Hey Arch, using uninitialized variables is bad, mkay? Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Tue Dec 16 21:15:57 2014 @@ -1245,7 +1245,7 @@ PIRP MasterIrp; ULONG Flags; NTSTATUS ErrorCode = STATUS_SUCCESS; - PREPARSE_DATA_BUFFER DataBuffer; + PREPARSE_DATA_BUFFER DataBuffer = NULL; IOTRACE(IO_IRP_DEBUG, "%s - Completing IRP %p\n", __FUNCTION__,

1 0

[tkreuzer] 65687: [EVENTVWR] Fix MSVC build and x64 warnings
by tkreuzer＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: tkreuzer Date: Tue Dec 16 21:03:24 2014 New Revision: 65687 URL: http://svn.reactos.org/svn/reactos?rev=65687&view=rev Log: [EVENTVWR] Fix MSVC build and x64 warnings Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Tue Dec 16 21:03:24 2014 @@ -54,6 +54,7 @@ #define EVENT_PARAMETER_MESSAGE_FILE L"ParameterMessageFile" #define MAX_LOADSTRING 255 +#define ENTRY_SIZE 2056 /* Globals */ HINSTANCE hInst; /* current instance */ @@ -723,7 +724,7 @@ 0, szTitleTemplate, szTitle, lpLogName); /* i = number of characters written */ /* lpComputerName can be NULL here if no records was read */ - dwMaxLength = cchRemaining; + dwMaxLength = (DWORD)cchRemaining; if (!lpComputerName) GetComputerNameW(lpTitleTemplateEnd, &dwMaxLength); else @@ -880,7 +881,7 @@ WCHAR *KeyPath; WCHAR szModuleName[MAX_PATH]; DWORD cbData; - DWORD cbKeyPath; + SIZE_T cbKeyPath; cbKeyPath = (wcslen(EVENTLOG_BASE_KEY) + wcslen(lpLogName) + 1) * sizeof(WCHAR); KeyPath = HeapAlloc(GetProcessHeap(), 0, cbKeyPath); @@ -916,7 +917,7 @@ WCHAR *KeyPath; DWORD dwMessageID = 0; DWORD cbData; - DWORD cbKeyPath; + SIZE_T cbKeyPath; cbKeyPath = (wcslen(EVENTLOG_BASE_KEY) + wcslen(lpLogName) + 1) * sizeof(WCHAR); KeyPath = HeapAlloc(GetProcessHeap(), 0, cbKeyPath); @@ -1444,7 +1445,6 @@ VOID CopyEventEntry(HWND hWnd) { - const SIZE_T entrySize = 2056; WCHAR output[4130], tmpHeader[512]; WCHAR szEventType[MAX_PATH]; WCHAR szSource[MAX_PATH]; @@ -1454,7 +1454,7 @@ WCHAR szTime[MAX_PATH]; WCHAR szUser[MAX_PATH]; WCHAR szComputer[MAX_PATH]; - WCHAR evtDesc[entrySize]; + WCHAR evtDesc[ENTRY_SIZE]; HGLOBAL hMem; if (!OpenClipboard(hWnd)) @@ -1475,14 +1475,14 @@ GetDlgItemText(hWnd, IDC_EVENTTIMESTATIC, szTime, MAX_PATH); GetDlgItemText(hWnd, IDC_EVENTUSERSTATIC, szUser, MAX_PATH); GetDlgItemText(hWnd, IDC_EVENTCOMPUTERSTATIC, szComputer, MAX_PATH); - GetDlgItemText(hWnd, IDC_EVENTTEXTEDIT, evtDesc, entrySize); + GetDlgItemText(hWnd, IDC_EVENTTEXTEDIT, evtDesc, ENTRY_SIZE); /* Consolidate the information into on big piece */ wsprintfW(output, tmpHeader, szEventType, szSource, szCategory, szEventID, szDate, szTime, szUser, szComputer, evtDesc); /* Sort out the memory needed to write to the clipboard */ - hMem = GlobalAlloc(GMEM_MOVEABLE, entrySize); - memcpy(GlobalLock(hMem), output, entrySize); + hMem = GlobalAlloc(GMEM_MOVEABLE, ENTRY_SIZE); + memcpy(GlobalLock(hMem), output, ENTRY_SIZE); GlobalUnlock(hMem); /* Write the final content to the clipboard */

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