Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57667: [KERNEL32] - Use new messaging structures, defined-names instead of hardcoded values. - Enable temporary debugging tracing and add some DPRINTs. - Delete an unused variable.
by hbelusca＠svn.reactos.org 02 Nov '12

02 Nov '12

Author: hbelusca Date: Fri Nov 2 18:28:42 2012 New Revision: 57667 URL: http://svn.reactos.org/svn/reactos?rev=57667&view=rev Log: [KERNEL32] - Use new messaging structures, defined-names instead of hardcoded values. - Enable temporary debugging tracing and add some DPRINTs. - Delete an unused variable. Modified: branches/ros-csrss/dll/win32/kernel32/client/dllmain.c Modified: branches/ros-csrss/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Fri Nov 2 18:28:42 2012 @@ -1,10 +1,9 @@ -/* $Id: dllmain.c 56414 2012-04-25 10:17:29Z tfaber $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/misc/dllmain.c * PURPOSE: Initialization - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * PROGRAMMERS: Ariadne (ariadne(a)xs4all.nl) * Aleksey Bragin (aleksey(a)reactos.org) * UPDATE HISTORY: * Created 01/11/98 @@ -14,7 +13,7 @@ #include <k32.h> -#define NDEBUG +// #define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ @@ -33,24 +32,18 @@ BOOL ConsoleInitialized = FALSE; static BOOL DllInitialized = FALSE; -BOOL WINAPI -DllMain(HANDLE hInst, - DWORD dwReason, - LPVOID lpReserved); - /* Critical section for various kernel32 data structures */ RTL_CRITICAL_SECTION BaseDllDirectoryLock; RTL_CRITICAL_SECTION ConsoleLock; extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); -extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); +extern DWORD WINAPI ConsoleControlDispatcher(IN LPVOID lpThreadParameter); extern PHANDLER_ROUTINE InitialHandler[1]; extern PHANDLER_ROUTINE* CtrlHandlers; extern ULONG NrCtrlHandlers; extern ULONG NrAllocatedHandlers; extern BOOL FASTCALL NlsInit(VOID); extern VOID FASTCALL NlsUninit(VOID); -BOOLEAN InWindows = FALSE; #define WIN_OBJ_DIR L"\\Windows" #define SESSION_DIR L"\\Sessions" @@ -61,8 +54,9 @@ WINAPI BasepInitConsole(VOID) { - CSR_API_MESSAGE Request; NTSTATUS Status; + CONSOLE_API_MESSAGE ApiMessage; + PCSRSS_ALLOC_CONSOLE AllocConsoleRequest = &ApiMessage.Data.AllocConsoleRequest; BOOLEAN NotConsole = FALSE; PRTL_USER_PROCESS_PARAMETERS Parameters = NtCurrentPeb()->ProcessParameters; LPCWSTR ExeName; @@ -70,7 +64,14 @@ WCHAR SessionDir[256]; ULONG SessionId = NtCurrentPeb()->SessionId; BOOLEAN InServer; - + + // HACK + /* + CSR_CONNECTION_INFO CsrConnectionInfo; + ULONG ConnectionSize = sizeof(CsrConnectionInfo); + */ + // END HACK + WCHAR lpTest[MAX_PATH]; GetModuleFileNameW(NULL, lpTest, MAX_PATH); DPRINT("BasepInitConsole for : %S\n", lpTest); @@ -84,14 +85,14 @@ { DPRINT("Image is not a console application\n"); Parameters->ConsoleHandle = NULL; - Request.Data.AllocConsoleRequest.ConsoleNeeded = FALSE; + AllocConsoleRequest->ConsoleNeeded = FALSE; } else { /* Assume one is needed */ GetStartupInfo(&si); - Request.Data.AllocConsoleRequest.ConsoleNeeded = TRUE; - Request.Data.AllocConsoleRequest.ShowCmd = si.wShowWindow; + AllocConsoleRequest->ConsoleNeeded = TRUE; + AllocConsoleRequest->ShowCmd = si.wShowWindow; /* Handle the special flags given to us by BasepInitializeEnvironment */ if (Parameters->ConsoleHandle == HANDLE_DETACHED_PROCESS) @@ -99,7 +100,7 @@ /* No console to create */ DPRINT("No console to create\n"); Parameters->ConsoleHandle = NULL; - Request.Data.AllocConsoleRequest.ConsoleNeeded = FALSE; + AllocConsoleRequest->ConsoleNeeded = FALSE; } else if (Parameters->ConsoleHandle == HANDLE_CREATE_NEW_CONSOLE) { @@ -112,7 +113,7 @@ /* We'll get the real one soon */ DPRINT("Creating new invisible console\n"); Parameters->ConsoleHandle = NULL; - Request.Data.AllocConsoleRequest.ShowCmd = SW_HIDE; + AllocConsoleRequest->ShowCmd = SW_HIDE; } else { @@ -137,7 +138,7 @@ SetConsoleInputExeNameW(ExeName + 1); /* Now use the proper console handle */ - Request.Data.AllocConsoleRequest.Console = Parameters->ConsoleHandle; + AllocConsoleRequest->Console = Parameters->ConsoleHandle; /* Setup the right Object Directory path */ if (!SessionId) @@ -156,11 +157,11 @@ } /* Connect to the base server */ - DPRINT("Connecting to CSR...\n"); + DPRINT("Connecting to CSR in BasepInitConsole...\n"); Status = CsrClientConnectToServer(SessionDir, - 2, - NULL, - NULL, + CONSRV_SERVERDLL_INDEX, + /* &CsrConnectionInfo, */ NULL, // TODO: Give it a console connection info + /* &ConnectionSize, */ NULL, // TODO: Give it a console connection info &InServer); if (!NT_SUCCESS(Status)) { @@ -177,12 +178,12 @@ * console message to the Base Server. When we finally have a Console * Server, this code should be changed to send connection data instead. */ - Request.Data.AllocConsoleRequest.CtrlDispatcher = ConsoleControlDispatcher; - Status = CsrClientCallServer(&Request, + AllocConsoleRequest->CtrlDispatcher = ConsoleControlDispatcher; + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, - CSR_CREATE_API_NUMBER(CSR_CONSOLE, ALLOC_CONSOLE), - sizeof(CSR_API_MESSAGE)); - if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepAlloc), + sizeof(CSRSS_ALLOC_CONSOLE)); + if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) { DPRINT1("CSR Failed to give us a console\n"); /* We're lying here, so at least the process can load... */ @@ -193,20 +194,20 @@ if (NotConsole) return TRUE; /* We got the handles, let's set them */ - if ((Parameters->ConsoleHandle = Request.Data.AllocConsoleRequest.Console)) + if ((Parameters->ConsoleHandle = AllocConsoleRequest->Console)) { /* If we already had some, don't use the new ones */ if (!Parameters->StandardInput) { - Parameters->StandardInput = Request.Data.AllocConsoleRequest.InputHandle; + Parameters->StandardInput = AllocConsoleRequest->InputHandle; } if (!Parameters->StandardOutput) { - Parameters->StandardOutput = Request.Data.AllocConsoleRequest.OutputHandle; + Parameters->StandardOutput = AllocConsoleRequest->OutputHandle; } if (!Parameters->StandardError) { - Parameters->StandardError = Request.Data.AllocConsoleRequest.OutputHandle; + Parameters->StandardError = AllocConsoleRequest->OutputHandle; } } @@ -311,9 +312,9 @@ } /* Connect to the base server */ - DPRINT("Connecting to CSR...\n"); + DPRINT("Connecting to CSR in DllMain...\n"); Status = CsrClientConnectToServer(SessionDir, - InWindows ? 1 : 0, + BASESRV_SERVERDLL_INDEX, &Dummy, &DummySize, &BaseRunningInServerProcess); @@ -323,10 +324,11 @@ NtTerminateProcess(NtCurrentProcess(), Status); return FALSE; } + DPRINT("kernel32 DllMain - OK, connection succeeded\n"); /* Get the server data */ ASSERT(Peb->ReadOnlyStaticServerData); - BaseStaticServerData = Peb->ReadOnlyStaticServerData[CSR_CONSOLE]; + BaseStaticServerData = Peb->ReadOnlyStaticServerData[BASESRV_SERVERDLL_INDEX]; ASSERT(BaseStaticServerData); /* Check if we are running a CSR Server */

1 0

[hbelusca] 57666: [KERNEL32] This is the first of a series of commits aiming at making kernel32 using the new CSR messaging structures for communicating with Server Dlls.
by hbelusca＠svn.reactos.org 02 Nov '12

02 Nov '12

Author: hbelusca Date: Fri Nov 2 18:00:47 2012 New Revision: 57666 URL: http://svn.reactos.org/svn/reactos?rev=57666&view=rev Log: [KERNEL32] This is the first of a series of commits aiming at making kernel32 using the new CSR messaging structures for communicating with Server Dlls. Modified: branches/ros-csrss/dll/win32/kernel32/client/dosdev.c branches/ros-csrss/dll/win32/kernel32/client/proc.c branches/ros-csrss/dll/win32/kernel32/client/vdm.c branches/ros-csrss/dll/win32/kernel32/client/vista.c Modified: branches/ros-csrss/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/dosdev.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/dosdev.c [iso-8859-1] Fri Nov 2 18:00:47 2012 @@ -90,8 +90,9 @@ { ULONG ArgumentCount; ULONG BufferSize; + BASE_API_MESSAGE ApiMessage; + PBASE_DEFINE_DOS_DEVICE DefineDosDeviceRequest = &ApiMessage.Data.DefineDosDeviceRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - CSR_API_MESSAGE Request; NTSTATUS Status; UNICODE_STRING NtTargetPathU; UNICODE_STRING DeviceNameU; @@ -157,16 +158,16 @@ } else { - Request.Data.DefineDosDeviceRequest.dwFlags = dwFlags; + DefineDosDeviceRequest->dwFlags = dwFlags; CsrCaptureMessageBuffer(CaptureBuffer, (PVOID)DeviceUpcaseNameU.Buffer, DeviceUpcaseNameU.Length, - (PVOID*)&Request.Data.DefineDosDeviceRequest.DeviceName.Buffer); - - Request.Data.DefineDosDeviceRequest.DeviceName.Length = + (PVOID*)&DefineDosDeviceRequest->DeviceName.Buffer); + + DefineDosDeviceRequest->DeviceName.Length = DeviceUpcaseNameU.Length; - Request.Data.DefineDosDeviceRequest.DeviceName.MaximumLength = + DefineDosDeviceRequest->DeviceName.MaximumLength = DeviceUpcaseNameU.Length; if (NtTargetPathU.Buffer) @@ -174,21 +175,20 @@ CsrCaptureMessageBuffer(CaptureBuffer, (PVOID)NtTargetPathU.Buffer, NtTargetPathU.Length, - (PVOID*)&Request.Data.DefineDosDeviceRequest.TargetName.Buffer); - } - Request.Data.DefineDosDeviceRequest.TargetName.Length = + (PVOID*)&DefineDosDeviceRequest->TargetName.Buffer); + } + DefineDosDeviceRequest->TargetName.Length = NtTargetPathU.Length; - Request.Data.DefineDosDeviceRequest.TargetName.MaximumLength = + DefineDosDeviceRequest->TargetName.MaximumLength = NtTargetPathU.Length; - Status = CsrClientCallServer(&Request, + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, CaptureBuffer, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepDefineDosDevice), - sizeof(CSR_API_MESSAGE)); + sizeof(BASE_DEFINE_DOS_DEVICE)); CsrFreeCaptureBuffer(CaptureBuffer); - if (! NT_SUCCESS(Status) || - ! NT_SUCCESS(Status = Request.Status)) + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) { WARN("CsrClientCallServer() failed (Status %lx)\n", Status); Modified: branches/ros-csrss/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/proc.c [iso-8859-1] Fri Nov 2 18:00:47 2012 @@ -1,10 +1,9 @@ -/* $Id: proc.c 57086 2012-08-16 15:39:40Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/proc/proc.c * PURPOSE: Process functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * PROGRAMMERS: Ariadne (ariadne(a)xs4all.nl) * UPDATE HISTORY: * Created 01/11/98 */ @@ -13,7 +12,7 @@ #include <k32.h> -#define NDEBUG +// #define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ @@ -494,25 +493,26 @@ BasepNotifyCsrOfThread(IN HANDLE ThreadHandle, IN PCLIENT_ID ClientId) { - CSR_API_MESSAGE CsrRequest; - NTSTATUS Status; + NTSTATUS Status; + BASE_API_MESSAGE ApiMessage; + PBASE_CREATE_THREAD CreateThreadRequest = &ApiMessage.Data.CreateThreadRequest; DPRINT("BasepNotifyCsrOfThread: Thread: %lx, Handle %lx\n", ClientId->UniqueThread, ThreadHandle); /* Fill out the request */ - CsrRequest.Data.CreateThreadRequest.ClientId = *ClientId; - CsrRequest.Data.CreateThreadRequest.ThreadHandle = ThreadHandle; + CreateThreadRequest->ClientId = *ClientId; + CreateThreadRequest->ThreadHandle = ThreadHandle; /* Call CSR */ - Status = CsrClientCallServer(&CsrRequest, + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepCreateThread), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) - { - DPRINT1("Failed to tell csrss about new thread: %lx %lx\n", Status, CsrRequest.Status); - return CsrRequest.Status; + sizeof(BASE_CREATE_THREAD)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(ApiMessage.Status)) + { + DPRINT1("Failed to tell csrss about new thread: %lx %lx\n", Status, ApiMessage.Status); + return ApiMessage.Status; } /* Return Success */ @@ -531,13 +531,15 @@ BOOLEAN InheritHandles, DWORD dwCreationFlags) { + NTSTATUS Status; OBJECT_ATTRIBUTES LocalObjectAttributes; POBJECT_ATTRIBUTES ObjectAttributes; CONTEXT Context; INITIAL_TEB InitialTeb; - NTSTATUS Status; HANDLE hThread; - CSR_API_MESSAGE CsrRequest; + BASE_API_MESSAGE ApiMessage; + PBASE_CREATE_PROCESS CreateProcessRequest = &ApiMessage.Data.CreateProcessRequest; + DPRINT("BasepCreateFirstThread. hProcess: %lx\n", ProcessHandle); /* Create the Thread's Stack */ @@ -573,20 +575,21 @@ } /* Fill out the request to notify CSRSS */ - CsrRequest.Data.CreateProcessRequest.ClientId = *ClientId; - CsrRequest.Data.CreateProcessRequest.ProcessHandle = ProcessHandle; - CsrRequest.Data.CreateProcessRequest.ThreadHandle = hThread; - CsrRequest.Data.CreateProcessRequest.CreationFlags = dwCreationFlags; - CsrRequest.Data.CreateProcessRequest.bInheritHandles = InheritHandles; + CreateProcessRequest->ClientId = *ClientId; + CreateProcessRequest->ProcessHandle = ProcessHandle; + CreateProcessRequest->ThreadHandle = hThread; + CreateProcessRequest->CreationFlags = dwCreationFlags; + CreateProcessRequest->bInheritHandles = InheritHandles; /* Call CSR */ - Status = CsrClientCallServer(&CsrRequest, + DPRINT1("Calling CsrClientCallServer from BasepCreateFirstThread...\n"); + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepCreateProcess), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) - { - DPRINT1("Failed to tell csrss about new process: %lx %lx\n", Status, CsrRequest.Status); + sizeof(BASE_CREATE_PROCESS)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(ApiMessage.Status)) + { + DPRINT1("Failed to tell csrss about new process: %lx %lx\n", Status, ApiMessage.Status); return NULL; } @@ -1174,24 +1177,25 @@ GetProcessShutdownParameters(OUT LPDWORD lpdwLevel, OUT LPDWORD lpdwFlags) { - CSR_API_MESSAGE CsrRequest; - NTSTATUS Status; + NTSTATUS Status; + BASE_API_MESSAGE ApiMessage; + PBASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest = &ApiMessage.Data.GetShutdownParametersRequest; /* Ask CSRSS for shutdown information */ - Status = CsrClientCallServer(&CsrRequest, + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepGetProcessShutdownParam), - sizeof(CSR_API_MESSAGE)); - if (!(NT_SUCCESS(Status)) || !(NT_SUCCESS(CsrRequest.Status))) + sizeof(BASE_GET_PROCESS_SHUTDOWN_PARAMS)); + if (!(NT_SUCCESS(Status)) || !(NT_SUCCESS(ApiMessage.Status))) { /* Return the failure from CSRSS */ - BaseSetLastNTError(CsrRequest.Status); + BaseSetLastNTError(ApiMessage.Status); return FALSE; } /* Get the data out of the LCP reply */ - *lpdwLevel = CsrRequest.Data.GetShutdownParametersRequest.Level; - *lpdwFlags = CsrRequest.Data.GetShutdownParametersRequest.Flags; + *lpdwLevel = GetShutdownParametersRequest->Level; + *lpdwFlags = GetShutdownParametersRequest->Flags; return TRUE; } @@ -1203,20 +1207,21 @@ SetProcessShutdownParameters(IN DWORD dwLevel, IN DWORD dwFlags) { - CSR_API_MESSAGE CsrRequest; - NTSTATUS Status; + NTSTATUS Status; + BASE_API_MESSAGE ApiMessage; + PBASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest = &ApiMessage.Data.SetShutdownParametersRequest; /* Write the data into the CSRSS request and send it */ - CsrRequest.Data.SetShutdownParametersRequest.Level = dwLevel; - CsrRequest.Data.SetShutdownParametersRequest.Flags = dwFlags; - Status = CsrClientCallServer(&CsrRequest, + SetShutdownParametersRequest->Level = dwLevel; + SetShutdownParametersRequest->Flags = dwFlags; + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepSetProcessShutdownParam), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) + sizeof(BASE_SET_PROCESS_SHUTDOWN_PARAMS)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(ApiMessage.Status)) { /* Return the failure from CSRSS */ - BaseSetLastNTError(CsrRequest.Status); + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -1740,7 +1745,9 @@ WINAPI ExitProcess(IN UINT uExitCode) { - CSR_API_MESSAGE CsrRequest; + BASE_API_MESSAGE ApiMessage; + PBASE_EXIT_PROCESS ExitProcessRequest = &ApiMessage.Data.ExitProcessRequest; + ASSERT(!BaseRunningInServerProcess); _SEH2_TRY @@ -1755,11 +1762,11 @@ LdrShutdownProcess(); /* Notify Base Server of process termination */ - CsrRequest.Data.TerminateProcessRequest.uExitCode = uExitCode; - CsrClientCallServer(&CsrRequest, + ExitProcessRequest->uExitCode = uExitCode; + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepExitProcess), - sizeof(CSR_API_MESSAGE)); + sizeof(BASE_EXIT_PROCESS)); /* Now do it again */ NtTerminateProcess(NtCurrentProcess(), uExitCode); Modified: branches/ros-csrss/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/vdm.c [iso-8859-1] Fri Nov 2 18:00:47 2012 @@ -70,7 +70,7 @@ IN PCWCH CommandLine, IN PCWCH CurrentDirectory, IN PANSI_STRING AnsiEnvironment, - IN PCSR_API_MESSAGE Msg, + IN PCSR_API_MESSAGE ApiMessage, IN OUT PULONG iTask, IN DWORD CreationFlags, IN LPSTARTUPINFOW StartupInfo) @@ -87,8 +87,10 @@ IN ULONG IndexInfo, IN ULONG BinaryType) { +#if 0 // Unimplemented in BASESRV NTSTATUS Status; - CSR_API_MESSAGE Msg; + BASE_API_MESSAGE ApiMessage; + PBASE_UPDATE_VDM_ENTRY UpdateVdmEntry = &ApiMessage.Data.UpdateVdmEntry; /* Check what update is being sent */ switch (UpdateIndex) @@ -97,16 +99,16 @@ case VdmEntryUndo: /* Tell the server how far we had gotten along */ - Msg.Data.UpdateVdmEntry.iTask = (ULONG)*WaitHandle; - Msg.Data.UpdateVdmEntry.VDMCreationState = IndexInfo; + UpdateVdmEntry->iTask = (ULONG)*WaitHandle; + UpdateVdmEntry->VDMCreationState = IndexInfo; break; /* VDM is ready with a new process handle */ case VdmEntryUpdateProcess: /* Send it the process handle */ - Msg.Data.UpdateVdmEntry.VDMProcessHandle = *WaitHandle; - Msg.Data.UpdateVdmEntry.iTask = IndexInfo; + UpdateVdmEntry->VDMProcessHandle = *WaitHandle; + UpdateVdmEntry->iTask = IndexInfo; break; } @@ -114,32 +116,32 @@ if (BinaryType == BINARY_TYPE_WOW) { /* Magic value for 16-bit apps */ - Msg.Data.UpdateVdmEntry.ConsoleHandle = (HANDLE)-1; - } - else if (Msg.Data.UpdateVdmEntry.iTask) + UpdateVdmEntry->ConsoleHandle = (HANDLE)-1; + } + else if (UpdateVdmEntry->iTask) { /* No handle for true VDM */ - Msg.Data.UpdateVdmEntry.ConsoleHandle = 0; + UpdateVdmEntry->ConsoleHandle = 0; } else { /* Otherwise, send the regular consoel handle */ - Msg.Data.UpdateVdmEntry.ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + UpdateVdmEntry->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; } /* Finally write the index and binary type */ - Msg.Data.UpdateVdmEntry.EntryIndex = UpdateIndex; - Msg.Data.UpdateVdmEntry.BinaryType = BinaryType; + UpdateVdmEntry->EntryIndex = UpdateIndex; + UpdateVdmEntry->BinaryType = BinaryType; /* Send the message to CSRSS */ - Status = CsrClientCallServer(&Msg, + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepUpdateVDMEntry), - sizeof(Msg)); - if (!(NT_SUCCESS(Status)) || !(NT_SUCCESS(Msg.Status))) + sizeof(BASE_UPDATE_VDM_ENTRY)); + if (!(NT_SUCCESS(Status)) || !(NT_SUCCESS(ApiMessage.Status))) { /* Handle failure */ - BaseSetLastNTError(Msg.Status); + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -147,9 +149,9 @@ if (UpdateIndex == VdmEntryUpdateProcess) { /* Return it to the caller */ - *WaitHandle = Msg.Data.UpdateVdmEntry.WaitObjectForParent; - } - + *WaitHandle = UpdateVdmEntry->WaitObjectForParent; + } +#endif /* We made it */ return TRUE; } @@ -159,9 +161,11 @@ BaseCheckForVDM(IN HANDLE ProcessHandle, OUT LPDWORD ExitCode) { +#if 0 // Unimplemented in BASESRV NTSTATUS Status; EVENT_BASIC_INFORMATION EventBasicInfo; - CSR_API_MESSAGE Msg; + BASE_API_MESSAGE ApiMessage; + PBASE_GET_VDM_EXIT_CODE GetVdmExitCode = &ApiMessage.Data.GetVdmExitCode; /* It's VDM if the process is actually a wait handle (an event) */ Status = NtQueryEvent(ProcessHandle, @@ -172,18 +176,19 @@ if (!NT_SUCCESS(Status)) return FALSE; /* Setup the input parameters */ - Msg.Data.GetVdmExitCode.ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; - Msg.Data.GetVdmExitCode.hParent = ProcessHandle; + GetVdmExitCode->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GetVdmExitCode->hParent = ProcessHandle; /* Call CSRSS */ - Status = CsrClientCallServer(&Msg, + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, - CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepCheckVDM /* BasepGetVDMExitCode */), - sizeof(Msg)); + CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepGetVDMExitCode /* BasepCheckVDM */), + sizeof(BASE_GET_VDM_EXIT_CODE)); if (!NT_SUCCESS(Status)) return FALSE; /* Get the exit code from the reply */ - *ExitCode = Msg.Data.GetVdmExitCode.ExitCode; + *ExitCode = GetVdmExitCode->ExitCode; +#endif return TRUE; } Modified: branches/ros-csrss/dll/win32/kernel32/client/vista.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/vista.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/vista.c [iso-8859-1] Fri Nov 2 18:00:47 2012 @@ -318,8 +318,9 @@ WINAPI GetConsoleHistoryInfo(PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) { - CSR_API_MESSAGE Request; NTSTATUS Status; + CONSOLE_API_MESSAGE ApiMessage; + PCSRSS_GET_HISTORY_INFO GetHistoryInfo = &ApiMessage.Data.GetHistoryInfo; if (lpConsoleHistoryInfo->cbSize != sizeof(CONSOLE_HISTORY_INFO)) { @@ -327,19 +328,19 @@ return FALSE; } - Status = CsrClientCallServer(&Request, + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, - CSR_CREATE_API_NUMBER(CSR_CONSOLE, GET_HISTORY_INFO), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetHistory), + sizeof(CSRSS_GET_HISTORY_INFO)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) { BaseSetLastNTError(Status); return FALSE; } - lpConsoleHistoryInfo->HistoryBufferSize = Request.Data.GetHistoryInfo.HistoryBufferSize; - lpConsoleHistoryInfo->NumberOfHistoryBuffers = Request.Data.GetHistoryInfo.NumberOfHistoryBuffers; - lpConsoleHistoryInfo->dwFlags = Request.Data.GetHistoryInfo.dwFlags; + lpConsoleHistoryInfo->HistoryBufferSize = GetHistoryInfo->HistoryBufferSize; + lpConsoleHistoryInfo->NumberOfHistoryBuffers = GetHistoryInfo->NumberOfHistoryBuffers; + lpConsoleHistoryInfo->dwFlags = GetHistoryInfo->dwFlags; return TRUE; } @@ -354,8 +355,9 @@ WINAPI SetConsoleHistoryInfo(IN PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) { - CSR_API_MESSAGE Request; NTSTATUS Status; + CONSOLE_API_MESSAGE ApiMessage; + PCSRSS_SET_HISTORY_INFO SetHistoryInfo = &ApiMessage.Data.SetHistoryInfo; if (lpConsoleHistoryInfo->cbSize != sizeof(CONSOLE_HISTORY_INFO)) { @@ -363,15 +365,15 @@ return FALSE; } - Request.Data.SetHistoryInfo.HistoryBufferSize = lpConsoleHistoryInfo->HistoryBufferSize; - Request.Data.SetHistoryInfo.NumberOfHistoryBuffers = lpConsoleHistoryInfo->NumberOfHistoryBuffers; - Request.Data.SetHistoryInfo.dwFlags = lpConsoleHistoryInfo->dwFlags; - - Status = CsrClientCallServer(&Request, + SetHistoryInfo->HistoryBufferSize = lpConsoleHistoryInfo->HistoryBufferSize; + SetHistoryInfo->NumberOfHistoryBuffers = lpConsoleHistoryInfo->NumberOfHistoryBuffers; + SetHistoryInfo->dwFlags = lpConsoleHistoryInfo->dwFlags; + + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, - CSR_CREATE_API_NUMBER(CSR_CONSOLE, GET_HISTORY_INFO), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetHistory), + sizeof(CSRSS_SET_HISTORY_INFO)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) { BaseSetLastNTError(Status); return FALSE;

1 0

[hbelusca] 57665: [WIN32K] - Remove the now unneeded CSR messaging support. - CsrInit() goes away also and the usage of the CsrProcess is replaced by that of gpepCSRSS. [WINSRV] - Use a DLL instanc...
by hbelusca＠svn.reactos.org 02 Nov '12

02 Nov '12

Author: hbelusca Date: Fri Nov 2 13:50:31 2012 New Revision: 57665 URL: http://svn.reactos.org/svn/reactos?rev=57665&view=rev Log: [WIN32K] - Remove the now unneeded CSR messaging support. - CsrInit() goes away also and the usage of the CsrProcess is replaced by that of gpepCSRSS. [WINSRV] - Use a DLL instance for loading resources, instead of calling GetModuleHandle. [KERNEL32/NTDLL] - Remove unneeded variables. Removed: branches/ros-csrss/win32ss/user/ntuser/csr.c branches/ros-csrss/win32ss/user/ntuser/csr.h Modified: branches/ros-csrss/dll/ntdll/include/ntdllp.h branches/ros-csrss/dll/win32/kernel32/include/kernel32.h branches/ros-csrss/win32ss/CMakeLists.txt branches/ros-csrss/win32ss/gdi/ntgdi/gdikdbgext.c branches/ros-csrss/win32ss/user/ntuser/desktop.c branches/ros-csrss/win32ss/user/ntuser/hook.c branches/ros-csrss/win32ss/user/ntuser/menu.c branches/ros-csrss/win32ss/user/ntuser/ntuser.c branches/ros-csrss/win32ss/user/ntuser/ntuser.h branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/winsrv/init.c branches/ros-csrss/win32ss/user/winsrv/shutdown.c branches/ros-csrss/win32ss/user/winsrv/winsrv.h branches/ros-csrss/win32ss/win32kp.h Modified: branches/ros-csrss/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/include/ntd… ============================================================================== --- branches/ros-csrss/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/include/ntdllp.h [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -162,7 +162,5 @@ VOID NTAPI LdrpFinalizeAndDeallocateDataTableEntry(IN PLDR_DATA_TABLE_ENTRY Entry); - -extern HANDLE WindowsApiPort; /* EOF */ Modified: branches/ros-csrss/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/in… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -155,7 +155,6 @@ #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS 2 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE 3 - extern PBASE_STATIC_SERVER_DATA BaseStaticServerData; typedef @@ -164,8 +163,6 @@ HANDLE hProcess, DWORD dwMilliseconds); - -extern BOOLEAN InWindows; extern WaitForInputIdleType UserWaitForInputIdleRoutine; /* GLOBAL VARIABLES **********************************************************/ Modified: branches/ros-csrss/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/CMakeLists.tx… ============================================================================== --- branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -103,7 +103,6 @@ user/ntuser/caret.c user/ntuser/class.c user/ntuser/clipboard.c - user/ntuser/csr.c user/ntuser/defwnd.c user/ntuser/desktop.c user/ntuser/display.c Modified: branches/ros-csrss/win32ss/gdi/ntgdi/gdikdbgext.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/gdi… ============================================================================== --- branches/ros-csrss/win32ss/gdi/ntgdi/gdikdbgext.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/gdi/ntgdi/gdikdbgext.c [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -14,7 +14,6 @@ extern PENTRY gpentHmgr; extern PULONG gpaulRefCount; -extern PEPROCESS gpepCSRSS; extern ULONG gulFirstUnused; Removed: branches/ros-csrss/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/csr.c (removed) @@ -1,52 +1,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> -DBG_DEFAULT_CHANNEL(UserMisc); - -static HANDLE WindowsApiPort = NULL; -PEPROCESS CsrProcess = NULL; - -NTSTATUS FASTCALL -CsrInit(void) -{ - NTSTATUS Status; - UNICODE_STRING PortName; - ULONG ConnectInfoLength; - SECURITY_QUALITY_OF_SERVICE Qos; - - ERR("CsrInit\n"); - - RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort"); - ConnectInfoLength = 0; - Qos.Length = sizeof(Qos); - Qos.ImpersonationLevel = SecurityDelegation; - Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING; - Qos.EffectiveOnly = FALSE; - - CsrProcess = PsGetCurrentProcess(); - ERR("CsrInit - CsrProcess = 0x%p\n", CsrProcess); - - Status = ZwConnectPort(&WindowsApiPort, - &PortName, - &Qos, - NULL, - NULL, - NULL, - NULL, - &ConnectInfoLength); - if (!NT_SUCCESS(Status)) - { - ERR("CsrInit - Status = 0x%p\n", Status); - return Status; - } - - return STATUS_SUCCESS; -} - -/* EOF */ Removed: branches/ros-csrss/win32ss/user/ntuser/csr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/csr.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/csr.h (removed) @@ -1,16 +1,0 @@ -/* $Id$ - * - * 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); - -/* EOF */ Modified: branches/ros-csrss/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/d… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/desktop.c [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -2024,7 +2024,7 @@ // FIXME: IntSetThreadDesktop validates the desktop handle, it should happen // here too and set the NT error level. Q. Is it necessary to have the validation // in IntSetThreadDesktop? Is it needed there too? - if (hDesktop || (!hDesktop && CsrProcess == PsGetCurrentProcess())) + if (hDesktop || (!hDesktop && PsGetCurrentProcess() == gpepCSRSS)) ret = IntSetThreadDesktop(hDesktop, FALSE); UserLeave(); Modified: branches/ros-csrss/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/h… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/hook.c [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -94,7 +94,7 @@ ERR("IntHookModuleUnloaded: iHookID=%d\n", iHookID); - ppiCsr = PsGetProcessWin32Process(CsrProcess); + ppiCsr = PsGetProcessWin32Process(gpepCSRSS); ListEntry = pdesk->PtiList.Flink; while(ListEntry != &pdesk->PtiList) @@ -147,7 +147,7 @@ PPROCESSINFO ppiCsr; pti = PsGetCurrentThreadWin32Thread(); - ppiCsr = PsGetProcessWin32Process(CsrProcess); + ppiCsr = PsGetProcessWin32Process(gpepCSRSS); /* Fail if the api hook is already registered */ if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) Modified: branches/ros-csrss/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/menu.c [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -1522,14 +1522,13 @@ NTSTATUS Status; PEPROCESS CurrentProcess = PsGetCurrentProcess(); - if (CsrProcess != CurrentProcess) + if (gpepCSRSS != CurrentProcess) { /* - * CsrProcess does not have a Win32WindowStation - * - */ - - Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, + * gpepCSRSS does not have a Win32WindowStation + */ + + Status = IntValidateWindowStationHandle(CurrentProcess->Win32WindowStation, KernelMode, 0, &WinStaObject); Modified: branches/ros-csrss/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/n… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/ntuser.c [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -20,7 +20,7 @@ BOOL gbInitialized; HINSTANCE hModClient = NULL; BOOL ClientPfnInit = FALSE; -PEPROCESS gpepCSRSS; +PEPROCESS gpepCSRSS = NULL; /* PRIVATE FUNCTIONS *********************************************************/ @@ -133,8 +133,6 @@ NtUserUpdatePerUserSystemParameters(0, TRUE); - CsrInit(); - if (gpsi->hbrGray == NULL) { hPattern55AABitmap = GreCreateBitmap(8, 8, 1, 1, (LPBYTE)wPattern55AA); Modified: branches/ros-csrss/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/n… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/ntuser.h [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -15,6 +15,7 @@ extern PPROCESSINFO gppiList; extern PPROCESSINFO ppiScrnSaver; extern PPROCESSINFO gppiInputProvider; +extern PEPROCESS gpepCSRSS; INIT_FUNCTION NTSTATUS NTAPI InitUserImpl(VOID); VOID FASTCALL CleanupUserImpl(VOID); Modified: branches/ros-csrss/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/s… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/simplecall.c [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -334,7 +334,7 @@ BOOL Ret = TRUE; PPROCESSINFO ppi; PDWORD pdwLayout; - if ( PsGetCurrentProcess() == CsrProcess) + if ( PsGetCurrentProcess() == gpepCSRSS) { EngSetLastError(ERROR_INVALID_ACCESS); RETURN(FALSE); Modified: branches/ros-csrss/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -16,7 +16,7 @@ #define NDEBUG #include <debug.h> -HANDLE DllHandle = NULL; +HINSTANCE UserSrvDllInstance = NULL; // HANDLE WinSrvApiPort = NULL; /* Memory */ @@ -357,7 +357,7 @@ BOOL WINAPI -DllMain(IN HANDLE hDll, +DllMain(IN HINSTANCE hInstanceDll, IN DWORD dwReason, IN LPVOID lpReserved) { @@ -366,7 +366,7 @@ if (DLL_PROCESS_ATTACH == dwReason) { - DllHandle = hDll; + UserSrvDllInstance = hInstanceDll; /*** HACK from win32csr... ***/ Modified: branches/ros-csrss/win32ss/user/winsrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -244,7 +244,7 @@ SetThreadDesktop(NotifyContext->Desktop); SwitchDesktop(NotifyContext->Desktop); CallInitCommonControls(); - NotifyContext->Dlg = CreateDialogParam(GetModuleHandleW(L"win32csr"), + NotifyContext->Dlg = CreateDialogParam(UserSrvDllInstance, MAKEINTRESOURCE(IDD_END_NOW), NULL, EndNowDlgProc, (LPARAM) NotifyContext); if (NULL == NotifyContext->Dlg) Modified: branches/ros-csrss/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/w… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -36,6 +36,7 @@ #include "resource.h" +extern HINSTANCE UserSrvDllInstance; extern HANDLE UserSrvHeap; // extern HANDLE BaseSrvSharedHeap; // extern PBASE_STATIC_SERVER_DATA BaseStaticServerData; Modified: branches/ros-csrss/win32ss/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/win32kp.h?rev… ============================================================================== --- branches/ros-csrss/win32ss/win32kp.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/win32kp.h [iso-8859-1] Fri Nov 2 13:50:31 2012 @@ -100,7 +100,6 @@ #include "user/ntuser/vis.h" #include "user/ntuser/userfuncs.h" #include "user/ntuser/scroll.h" -#include "user/ntuser/csr.h" #include "user/ntuser/winpos.h" #include "user/ntuser/callback.h"

1 0

[hbelusca] 57664: [WIN32K/USER32/WINSRV] - Correct an enumeration identificator initialization. - Move the call of CSR for registering the logon application, from kernel-mode win32k to user-mode us...
by hbelusca＠svn.reactos.org 02 Nov '12

02 Nov '12

Author: hbelusca Date: Fri Nov 2 11:23:26 2012 New Revision: 57664 URL: http://svn.reactos.org/svn/reactos?rev=57664&view=rev Log: [WIN32K/USER32/WINSRV] - Correct an enumeration identificator initialization. - Move the call of CSR for registering the logon application, from kernel-mode win32k to user-mode user32 and therefore remove the unneeded co_CsrNotify function (plus some other unneeded defines). - Comment some non-working code (#if 0) in user32/misc/misc.c and winsrv/shutdown.c. Modified: branches/ros-csrss/include/reactos/subsys/win/winmsg.h branches/ros-csrss/win32ss/user/ntuser/csr.c branches/ros-csrss/win32ss/user/ntuser/csr.h branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/user32/include/user32p.h branches/ros-csrss/win32ss/user/user32/misc/dllmain.c branches/ros-csrss/win32ss/user/user32/misc/exit.c branches/ros-csrss/win32ss/user/user32/misc/misc.c branches/ros-csrss/win32ss/user/winsrv/init.c branches/ros-csrss/win32ss/user/winsrv/server.c branches/ros-csrss/win32ss/user/winsrv/shutdown.c Modified: branches/ros-csrss/include/reactos/subsys/win/winmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] Fri Nov 2 11:23:26 2012 @@ -19,7 +19,7 @@ typedef enum _USERSRV_API_NUMBER { - UserpExitWindowsEx = USERSRV_SERVERDLL_INDEX, + UserpExitWindowsEx = USERSRV_FIRST_API_NUMBER, // UserpEndTask, // UserpLogon, UserpRegisterServicesProcess, // Not present in Win7 @@ -45,12 +45,12 @@ typedef struct { - HANDLE ProcessId; + ULONG_PTR ProcessId; } CSRSS_REGISTER_SERVICES_PROCESS, *PCSRSS_REGISTER_SERVICES_PROCESS; typedef struct { - HANDLE ProcessId; + ULONG_PTR ProcessId; BOOL Register; } CSRSS_REGISTER_LOGON_PROCESS, *PCSRSS_REGISTER_LOGON_PROCESS; Modified: branches/ros-csrss/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] Fri Nov 2 11:23:26 2012 @@ -7,6 +7,7 @@ */ #include <win32k.h> +DBG_DEFAULT_CHANNEL(UserMisc); static HANDLE WindowsApiPort = NULL; PEPROCESS CsrProcess = NULL; @@ -19,12 +20,17 @@ ULONG ConnectInfoLength; SECURITY_QUALITY_OF_SERVICE Qos; + ERR("CsrInit\n"); + RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort"); ConnectInfoLength = 0; Qos.Length = sizeof(Qos); Qos.ImpersonationLevel = SecurityDelegation; Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING; Qos.EffectiveOnly = FALSE; + + CsrProcess = PsGetCurrentProcess(); + ERR("CsrInit - CsrProcess = 0x%p\n", CsrProcess); Status = ZwConnectPort(&WindowsApiPort, &PortName, @@ -36,61 +42,11 @@ &ConnectInfoLength); if (!NT_SUCCESS(Status)) { + ERR("CsrInit - Status = 0x%p\n", Status); return Status; } - - CsrProcess = PsGetCurrentProcess(); return STATUS_SUCCESS; } - -NTSTATUS FASTCALL -co_CsrNotify(IN OUT PCSR_API_MESSAGE ApiMessage, - IN ULONG DataLength) -{ - NTSTATUS Status; - PEPROCESS OldProcess; - - if (NULL == CsrProcess) - { - return STATUS_INVALID_PORT_HANDLE; - } - - /* Fill out the Port Message Header */ - ApiMessage->Header.u2.ZeroInit = 0; - ApiMessage->Header.u1.s1.TotalLength = - FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; - /* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data) */ - ApiMessage->Header.u1.s1.DataLength = - ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); - - /* Switch to the process in which the WindowsApiPort handle is valid */ - OldProcess = PsGetCurrentProcess(); - if (CsrProcess != OldProcess) - { - KeAttachProcess(&CsrProcess->Pcb); - } - - UserLeaveCo(); - - Status = ZwRequestWaitReplyPort(WindowsApiPort, - &ApiMessage->Header, - &ApiMessage->Header); - - UserEnterCo(); - - if (CsrProcess != OldProcess) - { - KeDetachProcess(); - } - - if (NT_SUCCESS(Status)) - { - Status = ApiMessage->Status; - } - - return Status; -} - /* EOF */ Modified: branches/ros-csrss/win32ss/user/ntuser/csr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/csr.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/csr.h [iso-8859-1] Fri Nov 2 11:23:26 2012 @@ -12,11 +12,5 @@ extern PEPROCESS CsrProcess; NTSTATUS FASTCALL CsrInit(void); -NTSTATUS FASTCALL co_CsrNotify(IN OUT PCSR_API_MESSAGE ApiMessage, - IN ULONG DataLength); -NTSTATUS FASTCALL CsrCloseHandle(HANDLE Handle); -NTSTATUS WINAPI CsrInsertObject(HANDLE ObjectHandle, - ACCESS_MASK DesiredAccess, - PHANDLE Handle); /* EOF */ Modified: branches/ros-csrss/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/s… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/simplecall.c [iso-8859-1] Fri Nov 2 11:23:26 2012 @@ -15,9 +15,8 @@ BOOL FASTCALL co_IntRegisterLogonProcess(HANDLE ProcessId, BOOL Register) { + NTSTATUS Status; PEPROCESS Process; - NTSTATUS Status; - USER_API_MESSAGE Request; Status = PsLookupProcessByProcessId(ProcessId, &Process); @@ -51,18 +50,6 @@ } ObDereferenceObject(Process); - - Request.ApiNumber = CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterLogonProcess); - Request.Data.RegisterLogonProcessRequest.ProcessId = ProcessId; - Request.Data.RegisterLogonProcessRequest.Register = Register; - - Status = co_CsrNotify((PCSR_API_MESSAGE)&Request, - sizeof(CSRSS_REGISTER_LOGON_PROCESS)); - if (!NT_SUCCESS(Status)) - { - ERR("Failed to register logon process with CSRSS\n"); - return FALSE; - } return TRUE; } Modified: branches/ros-csrss/win32ss/user/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/i… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/include/user32p.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/include/user32p.h [iso-8859-1] Fri Nov 2 11:23:26 2012 @@ -23,6 +23,7 @@ extern PPROCESSINFO g_ppi; extern ULONG_PTR g_ulSharedDelta; extern PSERVERINFO gpsi; +extern BOOLEAN gfLogonProcess; extern BOOLEAN gfServerProcess; extern PUSER_HANDLE_TABLE gHandleTable; extern PUSER_HANDLE_ENTRY gHandleEntries; Modified: branches/ros-csrss/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Fri Nov 2 11:23:26 2012 @@ -13,6 +13,7 @@ PUSER_HANDLE_ENTRY gHandleEntries = NULL; PSERVERINFO gpsi = NULL; ULONG_PTR g_ulSharedDelta; +BOOLEAN gfLogonProcess = FALSE; BOOLEAN gfServerProcess = FALSE; WCHAR szAppInit[KEY_LENGTH]; Modified: branches/ros-csrss/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/misc/exit.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/misc/exit.c [iso-8859-1] Fri Nov 2 11:23:26 2012 @@ -67,8 +67,8 @@ ExitWindowsEx(UINT uFlags, DWORD dwReserved) { + NTSTATUS Status; USER_API_MESSAGE ApiMessage; - NTSTATUS Status; ApiMessage.Data.ExitReactosRequest.Flags = uFlags; ApiMessage.Data.ExitReactosRequest.Reserved = dwReserved; @@ -93,10 +93,10 @@ BOOL WINAPI RegisterServicesProcess(DWORD ServicesProcessId) { + NTSTATUS Status; USER_API_MESSAGE ApiMessage; - NTSTATUS Status; - ApiMessage.Data.RegisterServicesProcessRequest.ProcessId = UlongToHandle(ServicesProcessId); + ApiMessage.Data.RegisterServicesProcessRequest.ProcessId = ServicesProcessId; Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, Modified: branches/ros-csrss/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/misc/misc.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/misc/misc.c [iso-8859-1] Fri Nov 2 11:23:26 2012 @@ -42,7 +42,29 @@ WINAPI RegisterLogonProcess(DWORD dwProcessId, BOOL bRegister) { - return NtUserxRegisterLogonProcess(dwProcessId, bRegister); + gfLogonProcess = NtUserxRegisterLogonProcess(dwProcessId, bRegister); + + if (gfLogonProcess) + { + NTSTATUS Status; + USER_API_MESSAGE ApiMessage; + + ApiMessage.Data.RegisterLogonProcessRequest.ProcessId = dwProcessId; + ApiMessage.Data.RegisterLogonProcessRequest.Register = bRegister; + + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterLogonProcess), + sizeof(CSRSS_REGISTER_LOGON_PROCESS)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + ERR("Failed to register logon process with CSRSS\n"); + // return FALSE; + } + } + + return gfLogonProcess; } /* @@ -52,6 +74,7 @@ WINAPI SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta) { +#if 0 /* Maybe we should call NtUserSetLogonNotifyWindow and let that one inform CSRSS??? */ CSR_API_MESSAGE Request; NTSTATUS Status; @@ -69,6 +92,8 @@ } return NtUserSetLogonNotifyWindow(Wnd); +#endif + return TRUE; } /* Modified: branches/ros-csrss/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] Fri Nov 2 11:23:26 2012 @@ -79,105 +79,6 @@ // NULL }; - -/* -PCSR_API_ROUTINE Win32CsrApiDefinitions[] = -{ - CsrGetHandle, - CsrGetHandle, - CsrCloseHandle, - CsrVerifyHandle, - CsrDuplicateHandle, - CsrGetInputWaitHandle, - CsrFillOutputChar, - CsrReadInputEvent, - CsrWriteConsoleOutputChar, - CsrWriteConsoleOutputAttrib, - CsrFillOutputAttrib, - CsrSetTextAttrib, - CsrWriteConsoleOutput, - CsrFlushInputBuffer, - CsrReadConsoleOutputChar, - CsrReadConsoleOutputAttrib, - CsrExitReactos, - CsrHardwareStateProperty, - CsrCreateDesktop, - CsrShowDesktop, - CsrHideDesktop, - CsrSetLogonNotifyWindow, - CsrRegisterLogonProcess, - CsrGenerateCtrlEvent, -}; - -static CSRSS_API_DEFINITION Win32CsrApiDefinitions[] = -{ - CSRSS_DEFINE_API(GET_INPUT_HANDLE, CsrGetHandle), - CSRSS_DEFINE_API(GET_OUTPUT_HANDLE, CsrGetHandle), - CSRSS_DEFINE_API(CLOSE_HANDLE, CsrCloseHandle), - CSRSS_DEFINE_API(VERIFY_HANDLE, CsrVerifyHandle), - CSRSS_DEFINE_API(DUPLICATE_HANDLE, CsrDuplicateHandle), - CSRSS_DEFINE_API(GET_INPUT_WAIT_HANDLE, CsrGetInputWaitHandle), - CSRSS_DEFINE_API(WRITE_CONSOLE, CsrWriteConsole), - CSRSS_DEFINE_API(READ_CONSOLE, CsrReadConsole), - CSRSS_DEFINE_API(ALLOC_CONSOLE, CsrAllocConsole), - CSRSS_DEFINE_API(FREE_CONSOLE, CsrFreeConsole), - CSRSS_DEFINE_API(SCREEN_BUFFER_INFO, CsrGetScreenBufferInfo), - CSRSS_DEFINE_API(SET_CURSOR, CsrSetCursor), - CSRSS_DEFINE_API(FILL_OUTPUT, CsrFillOutputChar), - CSRSS_DEFINE_API(READ_INPUT, CsrReadInputEvent), - CSRSS_DEFINE_API(WRITE_CONSOLE_OUTPUT_CHAR, CsrWriteConsoleOutputChar), - CSRSS_DEFINE_API(WRITE_CONSOLE_OUTPUT_ATTRIB, CsrWriteConsoleOutputAttrib), - CSRSS_DEFINE_API(FILL_OUTPUT_ATTRIB, CsrFillOutputAttrib), - CSRSS_DEFINE_API(GET_CURSOR_INFO, CsrGetCursorInfo), - CSRSS_DEFINE_API(SET_CURSOR_INFO, CsrSetCursorInfo), - CSRSS_DEFINE_API(SET_ATTRIB, CsrSetTextAttrib), - CSRSS_DEFINE_API(GET_CONSOLE_MODE, CsrGetConsoleMode), - CSRSS_DEFINE_API(SET_CONSOLE_MODE, CsrSetConsoleMode), - CSRSS_DEFINE_API(CREATE_SCREEN_BUFFER, CsrCreateScreenBuffer), - CSRSS_DEFINE_API(SET_SCREEN_BUFFER, CsrSetScreenBuffer), - CSRSS_DEFINE_API(SET_TITLE, CsrSetTitle), - CSRSS_DEFINE_API(GET_TITLE, CsrGetTitle), - CSRSS_DEFINE_API(WRITE_CONSOLE_OUTPUT, CsrWriteConsoleOutput), - CSRSS_DEFINE_API(FLUSH_INPUT_BUFFER, CsrFlushInputBuffer), - CSRSS_DEFINE_API(SCROLL_CONSOLE_SCREEN_BUFFER, CsrScrollConsoleScreenBuffer), - CSRSS_DEFINE_API(READ_CONSOLE_OUTPUT_CHAR, CsrReadConsoleOutputChar), - CSRSS_DEFINE_API(READ_CONSOLE_OUTPUT_ATTRIB, CsrReadConsoleOutputAttrib), - CSRSS_DEFINE_API(GET_NUM_INPUT_EVENTS, CsrGetNumberOfConsoleInputEvents), - CSRSS_DEFINE_API(EXIT_REACTOS, CsrExitReactos), - CSRSS_DEFINE_API(PEEK_CONSOLE_INPUT, CsrPeekConsoleInput), - CSRSS_DEFINE_API(READ_CONSOLE_OUTPUT, CsrReadConsoleOutput), - CSRSS_DEFINE_API(WRITE_CONSOLE_INPUT, CsrWriteConsoleInput), - CSRSS_DEFINE_API(SETGET_CONSOLE_HW_STATE, CsrHardwareStateProperty), - CSRSS_DEFINE_API(GET_CONSOLE_WINDOW, CsrGetConsoleWindow), - CSRSS_DEFINE_API(CREATE_DESKTOP, CsrCreateDesktop), - CSRSS_DEFINE_API(SHOW_DESKTOP, CsrShowDesktop), - CSRSS_DEFINE_API(HIDE_DESKTOP, CsrHideDesktop), - CSRSS_DEFINE_API(SET_CONSOLE_ICON, CsrSetConsoleIcon), - CSRSS_DEFINE_API(SET_LOGON_NOTIFY_WINDOW, CsrSetLogonNotifyWindow), - CSRSS_DEFINE_API(REGISTER_LOGON_PROCESS, CsrRegisterLogonProcess), - CSRSS_DEFINE_API(GET_CONSOLE_CP, CsrGetConsoleCodePage), - CSRSS_DEFINE_API(SET_CONSOLE_CP, CsrSetConsoleCodePage), - CSRSS_DEFINE_API(GET_CONSOLE_OUTPUT_CP, CsrGetConsoleOutputCodePage), - CSRSS_DEFINE_API(SET_CONSOLE_OUTPUT_CP, CsrSetConsoleOutputCodePage), - CSRSS_DEFINE_API(GET_PROCESS_LIST, CsrGetProcessList), - CSRSS_DEFINE_API(ADD_CONSOLE_ALIAS, CsrAddConsoleAlias), - CSRSS_DEFINE_API(GET_CONSOLE_ALIAS, CsrGetConsoleAlias), - CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES, CsrGetAllConsoleAliases), - CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES_LENGTH, CsrGetAllConsoleAliasesLength), - CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES, CsrGetConsoleAliasesExes), - CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES_LENGTH, CsrGetConsoleAliasesExesLength), - CSRSS_DEFINE_API(GENERATE_CTRL_EVENT, CsrGenerateCtrlEvent), - CSRSS_DEFINE_API(SET_SCREEN_BUFFER_SIZE, CsrSetScreenBufferSize), - CSRSS_DEFINE_API(GET_CONSOLE_SELECTION_INFO, CsrGetConsoleSelectionInfo), - CSRSS_DEFINE_API(GET_COMMAND_HISTORY_LENGTH, CsrGetCommandHistoryLength), - CSRSS_DEFINE_API(GET_COMMAND_HISTORY, CsrGetCommandHistory), - CSRSS_DEFINE_API(EXPUNGE_COMMAND_HISTORY, CsrExpungeCommandHistory), - CSRSS_DEFINE_API(SET_HISTORY_NUMBER_COMMANDS, CsrSetHistoryNumberCommands), - CSRSS_DEFINE_API(GET_HISTORY_INFO, CsrGetHistoryInfo), - CSRSS_DEFINE_API(SET_HISTORY_INFO, CsrSetHistoryInfo), - { 0, 0, NULL } -}; -*/ /* FUNCTIONS ******************************************************************/ @@ -356,9 +257,9 @@ NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK); } +/*** HACK from win32csr... ***/ static HHOOK hhk = NULL; -/*** HACK from win32csr... ***/ LRESULT CALLBACK KeyboardHookProc(int nCode, @@ -428,7 +329,7 @@ // LoadedServerDll->NewProcessCallback = Win32CsrDuplicateHandleTable; LoadedServerDll->HardErrorCallback = Win32CsrHardError; -/*** From win32csr... ***/ +/*** From win32csr... See r54125 ***/ /* Start the Raw Input Thread and the Desktop Thread */ for (i = 0; i < 2; ++i) { Modified: branches/ros-csrss/win32ss/user/winsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] Fri Nov 2 11:23:26 2012 @@ -18,7 +18,7 @@ /* GLOBALS *******************************************************************/ static BOOLEAN ServicesProcessIdValid = FALSE; -static ULONG_PTR ServicesProcessId; +static ULONG_PTR ServicesProcessId = 0; /* FUNCTIONS *****************************************************************/ @@ -34,7 +34,7 @@ } else { - ServicesProcessId = (ULONG_PTR)RegisterServicesProcessRequest->ProcessId; + ServicesProcessId = RegisterServicesProcessRequest->ProcessId; ServicesProcessIdValid = TRUE; return STATUS_SUCCESS; } Modified: branches/ros-csrss/win32ss/user/winsrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] Fri Nov 2 11:23:26 2012 @@ -16,7 +16,7 @@ static HWND LogonNotifyWindow = NULL; -static HANDLE LogonProcess = NULL; +static ULONG_PTR LogonProcessId = 0; /* FUNCTIONS *****************************************************************/ @@ -36,21 +36,21 @@ if (RegisterLogonProcessRequest->Register) { - if (0 != LogonProcess) - { + if (LogonProcessId != 0) return STATUS_LOGON_SESSION_EXISTS; - } - LogonProcess = RegisterLogonProcessRequest->ProcessId; + + LogonProcessId = RegisterLogonProcessRequest->ProcessId; } else { - if (ApiMessage->Header.ClientId.UniqueProcess != LogonProcess) + if (ApiMessage->Header.ClientId.UniqueProcess != (HANDLE)LogonProcessId) { DPRINT1("Current logon process 0x%x, can't deregister from process 0x%x\n", - LogonProcess, ApiMessage->Header.ClientId.UniqueProcess); + LogonProcessId, ApiMessage->Header.ClientId.UniqueProcess); return STATUS_NOT_LOGON_PROCESS; } - LogonProcess = 0; + + LogonProcessId = 0; } return STATUS_SUCCESS; @@ -67,7 +67,7 @@ DPRINT1("Can't get window creator\n"); return STATUS_INVALID_HANDLE; } - if (WindowCreator != (DWORD_PTR)LogonProcess) + if (WindowCreator != LogonProcessId) { DPRINT1("Trying to register window not created by winlogon as notify window\n"); return STATUS_ACCESS_DENIED; @@ -487,6 +487,7 @@ } /* TODO: Find another way to do it. */ +#if 0 VOID FASTCALL ConioConsoleCtrlEventTimeout(DWORD Event, PCSR_PROCESS ProcessData, DWORD Timeout) { @@ -509,6 +510,7 @@ CloseHandle(Thread); } } +#endif /************************************************/ static BOOL FASTCALL @@ -524,12 +526,15 @@ if (0 == (Flags & EWX_FORCE)) { + // TODO: Find in an other way whether or not the process has a console. +#if 0 if (NULL != ProcessData->Console) { ConioConsoleCtrlEventTimeout(CTRL_LOGOFF_EVENT, ProcessData, ShutdownSettings->WaitToKillAppTimeout); } else +#endif { Context.ProcessId = (DWORD_PTR) ProcessData->ClientId.UniqueProcess; Context.wParam = 0; @@ -612,7 +617,7 @@ /* Do not kill winlogon or csrss */ if ((DWORD_PTR) ProcessData->ClientId.UniqueProcess == Context->CsrssProcess || - ProcessData->ClientId.UniqueProcess == LogonProcess) + ProcessData->ClientId.UniqueProcess == LogonProcessId) { return STATUS_SUCCESS; } @@ -819,7 +824,7 @@ TOKEN_USER *UserInfo; SHUTDOWN_SETTINGS ShutdownSettings; - if (ProcessId != (DWORD_PTR) LogonProcess) + if (ProcessId != (DWORD_PTR) LogonProcessId) { DPRINT1("Internal ExitWindowsEx call not from winlogon\n"); return STATUS_ACCESS_DENIED;

1 0

[gadamopoulos] 57663: - Fix the double scrollbars in explorer
by gadamopoulos＠svn.reactos.org 01 Nov '12

01 Nov '12

Author: gadamopoulos Date: Thu Nov 1 17:28:52 2012 New Revision: 57663 URL: http://svn.reactos.org/svn/reactos?rev=57663&view=rev Log: - Fix the double scrollbars in explorer Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] Thu Nov 1 17:28:52 2012 @@ -1604,8 +1604,8 @@ #ifndef __REACTOS__ case WM_SETVISIBLE: #endif - if (ci->hwndChildMaximized) ci->mdiFlags &= ~MDIF_NEEDUPDATE; - else MDI_PostUpdate(client, ci, SB_BOTH+1); + /*if (ci->hwndChildMaximized) ci->mdiFlags &= ~MDIF_NEEDUPDATE; + else*/ MDI_PostUpdate(client, ci, SB_BOTH+1); break; case WM_SIZE: @@ -1843,7 +1843,6 @@ } HeapFree( GetProcessHeap(), 0, list ); } - MapWindowPoints( 0, hwnd, (POINT *)&childRect, 2 ); UnionRect( &childRect, &clientRect, &childRect ); /* set common info values */

1 0

[hbelusca] 57662: [KERNEL32/NTDLL] - Move the ReactOS-specific workaround described in http://jira.reactos.org/browse/CORE-6611 and http://jira.reactos.org/browse/CORE-4620 from kernel32 to ntdll f...
by hbelusca＠svn.reactos.org 01 Nov '12

01 Nov '12

Author: hbelusca Date: Thu Nov 1 12:52:34 2012 New Revision: 57662 URL: http://svn.reactos.org/svn/reactos?rev=57662&view=rev Log: [KERNEL32/NTDLL] - Move the ReactOS-specific workaround described in http://jira.reactos.org/browse/CORE-6611 and http://jira.reactos.org/browse/CORE-4620 from kernel32 to ntdll for using it by RtlGetVersion, in order to : * still having it available in user-mode only, * and having VerifyVersionInfo (and its Rtl counter-part) working properly. [RTL/NTOSKRNL] - Code formatting. - Use a defined-constant instead of a hard-coded value. Modified: trunk/reactos/dll/ntdll/rtl/version.c trunk/reactos/dll/win32/kernel32/client/version.c trunk/reactos/lib/rtl/version.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/rtl/misc.c Modified: trunk/reactos/dll/ntdll/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/version.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] Thu Nov 1 12:52:34 2012 @@ -8,13 +8,64 @@ * Created 01/11/98 */ -/* INCLUDES ****************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntdll.h> #define NDEBUG #include <debug.h> -/* FUNCTIONS ****************************************************************/ +/* FUNCTIONS ******************************************************************/ + +/* HACK: ReactOS specific changes, see bug-reports CORE-6611 and CORE-4620 (aka. #5003) */ +static VOID NTAPI +SetRosSpecificInfo(IN OUT PRTL_OSVERSIONINFOEXW VersionInformation) +{ + CHAR Buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(ULONG)]; + PKEY_VALUE_PARTIAL_INFORMATION kvpInfo = (PVOID)Buffer; + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG ReportAsWorkstation = 0; + HANDLE hKey; + ULONG Length; + NTSTATUS Status; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version"); + UNICODE_STRING ValName = RTL_CONSTANT_STRING(L"ReportAsWorkstation"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_OPENIF | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Don't change anything if the key doesn't exist */ + Status = NtOpenKey(&hKey, KEY_READ, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Get the value from the registry and make sure it's a 32-bit value */ + Status = NtQueryValueKey(hKey, + &ValName, + KeyValuePartialInformation, + kvpInfo, + sizeof(Buffer), + &Length); + if (NT_SUCCESS(Status) && + (kvpInfo->Type == REG_DWORD) && + (kvpInfo->DataLength == sizeof(ULONG))) + { + /* Is the value set? */ + ReportAsWorkstation = *(PULONG)kvpInfo->Data; + if ((VersionInformation->wProductType == VER_NT_SERVER) && + (ReportAsWorkstation != 0)) + { + /* It is, modify the product type to report a workstation */ + VersionInformation->wProductType = VER_NT_WORKSTATION; + DPRINT1("We modified the reported OS from NtProductServer to NtProductWinNt\n"); + } + } + + /* Close the handle */ + NtClose(hKey); + } +} /********************************************************************** * NAME EXPORTED @@ -40,12 +91,11 @@ * * @implemented */ - BOOLEAN NTAPI RtlGetNtProductType(PNT_PRODUCT_TYPE ProductType) { - *ProductType = SharedUserData->NtProductType; - return(TRUE); + *ProductType = SharedUserData->NtProductType; + return TRUE; } /********************************************************************** @@ -71,7 +121,6 @@ * * @implemented */ - VOID NTAPI RtlGetNtVersionNumbers(OUT LPDWORD pdwMajorVersion, OUT LPDWORD pdwMinorVersion, @@ -101,49 +150,56 @@ } /* -* @implemented -*/ + * @implemented + * @note User-mode version of RtlGetVersion in ntoskrnl/rtl/misc.c + */ NTSTATUS NTAPI -RtlGetVersion(RTL_OSVERSIONINFOW *Info) -{ - LONG i, MaxLength; - - if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || - Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) - { - PPEB Peb = NtCurrentPeb(); - - Info->dwMajorVersion = Peb->OSMajorVersion; - Info->dwMinorVersion = Peb->OSMinorVersion; - Info->dwBuildNumber = Peb->OSBuildNumber; - Info->dwPlatformId = Peb->OSPlatformId; - RtlZeroMemory(Info->szCSDVersion, sizeof(Info->szCSDVersion)); - if(((Peb->OSCSDVersion >> 8) & 0xFF) != 0) - { - MaxLength = (sizeof(Info->szCSDVersion) / sizeof(Info->szCSDVersion[0])) - 1; - i = _snwprintf(Info->szCSDVersion, - MaxLength, - L"Service Pack %d", - ((Peb->OSCSDVersion >> 8) & 0xFF)); - if (i < 0) +RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) +{ + LONG i, MaxLength; + + if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || + lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) + { + PPEB Peb = NtCurrentPeb(); + + lpVersionInformation->dwMajorVersion = Peb->OSMajorVersion; + lpVersionInformation->dwMinorVersion = Peb->OSMinorVersion; + lpVersionInformation->dwBuildNumber = Peb->OSBuildNumber; + lpVersionInformation->dwPlatformId = Peb->OSPlatformId; + RtlZeroMemory(lpVersionInformation->szCSDVersion, sizeof(lpVersionInformation->szCSDVersion)); + + if(((Peb->OSCSDVersion >> 8) & 0xFF) != 0) { - /* null-terminate if it was overflowed */ - Info->szCSDVersion[MaxLength] = L'\0'; + MaxLength = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0])) - 1; + i = _snwprintf(lpVersionInformation->szCSDVersion, + MaxLength, + L"Service Pack %d", + ((Peb->OSCSDVersion >> 8) & 0xFF)); + if (i < 0) + { + /* Null-terminate if it was overflowed */ + lpVersionInformation->szCSDVersion[MaxLength] = L'\0'; + } } - } - if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) - { - RTL_OSVERSIONINFOEXW *InfoEx = (RTL_OSVERSIONINFOEXW *)Info; - InfoEx->wServicePackMajor = (Peb->OSCSDVersion >> 8) & 0xFF; - InfoEx->wServicePackMinor = Peb->OSCSDVersion & 0xFF; - InfoEx->wSuiteMask = SharedUserData->SuiteMask & 0xFFFF; - InfoEx->wProductType = SharedUserData->NtProductType; - } - - return STATUS_SUCCESS; - } - - return STATUS_INVALID_PARAMETER; + + if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) + { + PRTL_OSVERSIONINFOEXW InfoEx = (PRTL_OSVERSIONINFOEXW)lpVersionInformation; + InfoEx->wServicePackMajor = (Peb->OSCSDVersion >> 8) & 0xFF; + InfoEx->wServicePackMinor = Peb->OSCSDVersion & 0xFF; + InfoEx->wSuiteMask = SharedUserData->SuiteMask & 0xFFFF; + InfoEx->wProductType = SharedUserData->NtProductType; + InfoEx->wReserved = 0; + + /* HACK: ReactOS specific changes, see bug-reports CORE-6611 and CORE-4620 (aka. #5003) */ + SetRosSpecificInfo(InfoEx); + } + + return STATUS_SUCCESS; + } + + return STATUS_INVALID_PARAMETER; } /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/client/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/version.c [iso-8859-1] Thu Nov 1 12:52:34 2012 @@ -13,57 +13,6 @@ #include <debug.h> /* FUNCTIONS ******************************************************************/ - -VOID -NTAPI -SetRosSpecificInfo(IN LPOSVERSIONINFOEXW VersionInformation) -{ - CHAR Buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(DWORD)]; - PKEY_VALUE_PARTIAL_INFORMATION kvpInfo = (PVOID)Buffer; - OBJECT_ATTRIBUTES ObjectAttributes; - DWORD ReportAsWorkstation = 0; - HANDLE hKey; - DWORD dwSize; - NTSTATUS Status; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version"); - UNICODE_STRING ValName = RTL_CONSTANT_STRING(L"ReportAsWorkstation"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_OPENIF | OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - /* Don't change anything if the key doesn't exist */ - Status = NtOpenKey(&hKey, KEY_READ, &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - /* Get the value from the registry and make sure it's a 32-bit value */ - Status = NtQueryValueKey(hKey, - &ValName, - KeyValuePartialInformation, - kvpInfo, - sizeof(Buffer), - &dwSize); - if ((NT_SUCCESS(Status)) && - (kvpInfo->Type == REG_DWORD) && - (kvpInfo->DataLength == sizeof(DWORD))) - { - /* Is the value set? */ - ReportAsWorkstation = *(PULONG)kvpInfo->Data; - if ((VersionInformation->wProductType == VER_NT_SERVER) && - (ReportAsWorkstation)) - { - /* It is, modify the product type to report a workstation */ - VersionInformation->wProductType = VER_NT_WORKSTATION; - DPRINT1("We modified the reported OS from NtProductServer to NtProductWinNt\n"); - } - } - - /* Close the handle */ - NtClose(hKey); - } -} /* * @implemented @@ -104,9 +53,6 @@ { lpVersionInformationEx = (PVOID)lpVersionInformation; lpVersionInformationEx->wReserved = 0; - - /* ReactOS specific changes */ - SetRosSpecificInfo(lpVersionInformationEx); } return TRUE; Modified: trunk/reactos/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/version.c?rev=5766… ============================================================================== --- trunk/reactos/lib/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/version.c [iso-8859-1] Thu Nov 1 12:52:34 2012 @@ -4,7 +4,7 @@ * PURPOSE: Runtime code * FILE: lib/rtl/version.c * PROGRAMERS: Filip Navara - * Hermes BELUSCA - MAITO + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *****************************************************************/ @@ -18,9 +18,7 @@ NTSTATUS NTAPI -RtlGetVersion( - OUT PRTL_OSVERSIONINFOW lpVersionInformation - ); +RtlGetVersion(OUT PRTL_OSVERSIONINFOW lpVersionInformation); /* FUNCTIONS ****************************************************************/ @@ -54,11 +52,9 @@ */ NTSTATUS NTAPI -RtlVerifyVersionInfo( - IN PRTL_OSVERSIONINFOEXW VersionInfo, - IN ULONG TypeMask, - IN ULONGLONG ConditionMask - ) +RtlVerifyVersionInfo(IN PRTL_OSVERSIONINFOEXW VersionInfo, + IN ULONG TypeMask, + IN ULONGLONG ConditionMask) { RTL_OSVERSIONINFOEXW ver; NTSTATUS status; Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu Nov 1 12:52:34 2012 @@ -678,7 +678,7 @@ Peb->OSMajorVersion = NtMajorVersion; Peb->OSMinorVersion = NtMinorVersion; Peb->OSBuildNumber = (USHORT)(NtBuildNumber & 0x3FFF); - Peb->OSPlatformId = 2; /* VER_PLATFORM_WIN32_NT */ + Peb->OSPlatformId = VER_PLATFORM_WIN32_NT; Peb->OSCSDVersion = (USHORT)CmNtCSDVersion; // Modified: trunk/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] Thu Nov 1 12:52:34 2012 @@ -29,9 +29,8 @@ NTAPI RtlGetNtGlobalFlags(VOID) { - return(NtGlobalFlag); + return NtGlobalFlag; } - /* * @implemented @@ -39,41 +38,46 @@ NTSTATUS NTAPI RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) { - LONG i; - ULONG MaxLength; - if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || - lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) - { - lpVersionInformation->dwMajorVersion = NtMajorVersion; - lpVersionInformation->dwMinorVersion = NtMinorVersion; - lpVersionInformation->dwBuildNumber = NtBuildNumber; - lpVersionInformation->dwPlatformId = VER_PLATFORM_WIN32_NT; - RtlZeroMemory(lpVersionInformation->szCSDVersion, sizeof(lpVersionInformation->szCSDVersion)); - if(((CmNtCSDVersion >> 8) & 0xFF) != 0) - { - MaxLength = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0])) - 1; - i = _snwprintf(lpVersionInformation->szCSDVersion, - MaxLength, - L"Service Pack %d", - ((CmNtCSDVersion >> 8) & 0xFF)); - if (i < 0) + LONG i; + ULONG MaxLength; + + if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || + lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) + { + lpVersionInformation->dwMajorVersion = NtMajorVersion; + lpVersionInformation->dwMinorVersion = NtMinorVersion; + lpVersionInformation->dwBuildNumber = NtBuildNumber; + lpVersionInformation->dwPlatformId = VER_PLATFORM_WIN32_NT; + RtlZeroMemory(lpVersionInformation->szCSDVersion, sizeof(lpVersionInformation->szCSDVersion)); + + if(((CmNtCSDVersion >> 8) & 0xFF) != 0) { - /* null-terminate if it was overflowed */ - lpVersionInformation->szCSDVersion[MaxLength] = L'\0'; + MaxLength = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0])) - 1; + i = _snwprintf(lpVersionInformation->szCSDVersion, + MaxLength, + L"Service Pack %d", + ((CmNtCSDVersion >> 8) & 0xFF)); + if (i < 0) + { + /* Null-terminate if it was overflowed */ + lpVersionInformation->szCSDVersion[MaxLength] = L'\0'; + } } - } - if (lpVersionInformation->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) - { - RTL_OSVERSIONINFOEXW *InfoEx = (RTL_OSVERSIONINFOEXW *)lpVersionInformation; - InfoEx->wServicePackMajor = (USHORT)(CmNtCSDVersion >> 8) & 0xFF; - InfoEx->wServicePackMinor = (USHORT)(CmNtCSDVersion & 0xFF); - InfoEx->wSuiteMask = (USHORT)(SharedUserData->SuiteMask & 0xFFFF); - InfoEx->wProductType = SharedUserData->NtProductType; - } - return STATUS_SUCCESS; - } + if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) + { + PRTL_OSVERSIONINFOEXW InfoEx = (PRTL_OSVERSIONINFOEXW)lpVersionInformation; + InfoEx->wServicePackMajor = (USHORT)(CmNtCSDVersion >> 8) & 0xFF; + InfoEx->wServicePackMinor = (USHORT)(CmNtCSDVersion & 0xFF); + InfoEx->wSuiteMask = (USHORT)(SharedUserData->SuiteMask & 0xFFFF); + InfoEx->wProductType = SharedUserData->NtProductType; + InfoEx->wReserved = 0; + } - return STATUS_INVALID_PARAMETER; + return STATUS_SUCCESS; + } + + return STATUS_INVALID_PARAMETER; } +/* EOF */

1 0

[hbelusca] 57661: [BOOTDATA] Fix report of OS version: we report us as Windows Server 2003 SP1, in a consistent way, i.e. our product type is ServerNT and not WinNT (workstation). However, for appl...
by hbelusca＠svn.reactos.org 31 Oct '12

31 Oct '12

Author: hbelusca Date: Wed Oct 31 23:36:52 2012 New Revision: 57661 URL: http://svn.reactos.org/svn/reactos?rev=57661&view=rev Log: [BOOTDATA] Fix report of OS version: we report us as Windows Server 2003 SP1, in a consistent way, i.e. our product type is ServerNT and not WinNT (workstation). However, for applications which would need to see us as a workstation OS, a workaround exists and can be activated manually by the user (by default it is not). See http://jira.reactos.org/browse/CORE-4620 for a description of the workaround. CORE-6611 #comment In r57661, our version is reported consistently. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Wed Oct 31 23:36:52 2012 @@ -1130,8 +1130,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Print\Monitors\Local Port","Driver",2,"localspl.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"WinNT" -HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"" +HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"ServerNT" +HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"Terminal Server" +; ReactOS specific - by default we report ourselves as Server for the user, +; but we can also report as Workstation if some application needs it. +HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkstation",0x00010001,0x00000000 ; Some installers check for SP1 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100 Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Oct 31 23:36:52 2012 @@ -1130,8 +1130,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Print\Monitors\Local Port","Driver",2,"localspl.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"WinNT" -HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"" +HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"ServerNT" +HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"Terminal Server" +; ReactOS specific - by default we report ourselves as Server for the user, +; but we can also report as Workstation if some application needs it. +HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkstation",0x00010001,0x00000000 ; Some installers check for SP1 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100

1 0

[hbelusca] 57660: Synchronize with trunk's revision r57659.
by hbelusca＠svn.reactos.org 31 Oct '12

31 Oct '12

Author: hbelusca Date: Wed Oct 31 19:39:53 2012 New Revision: 57660 URL: http://svn.reactos.org/svn/reactos?rev=57660&view=rev Log: Synchronize with trunk's revision r57659. Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/user/ntuser/desktop.c branches/ros-csrss/win32ss/user/ntuser/desktop.h branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/user32/include/ntwrapper.h Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 31 19:39:53 2012 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-57653 +/trunk/reactos:57561-57659 Modified: branches/ros-csrss/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/include/ntuse… ============================================================================== --- branches/ros-csrss/win32ss/include/ntuser.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/include/ntuser.h [iso-8859-1] Wed Oct 31 19:39:53 2012 @@ -3251,7 +3251,6 @@ #define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d #define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e -#define ONEPARAM_ROUTINE_GETCURSORPOSITION 0xfffe0048 // use ONEPARAM_ or TWOPARAM routine ? #define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 #define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0052 #define MSQ_STATE_CAPTURE 0x1 Modified: branches/ros-csrss/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/d… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed Oct 31 19:39:53 2012 @@ -26,8 +26,7 @@ /* GLOBALS *******************************************************************/ /* Currently active desktop */ -PDESKTOP InputDesktop = NULL; -HDESK InputDesktopHandle = NULL; +PDESKTOP gpdeskInputDesktop = NULL; HDC ScreenDeviceContext = NULL; PTHREADINFO gptiDesktopThread; HCURSOR gDesktopCursor = NULL; @@ -420,7 +419,7 @@ PDESKTOP FASTCALL IntGetActiveDesktop(VOID) { - return InputDesktop; + return gpdeskInputDesktop; } /* @@ -1464,40 +1463,31 @@ BOOL fInherit, ACCESS_MASK dwDesiredAccess) { - PDESKTOP pdesk; NTSTATUS Status; HDESK hdesk = NULL; + ULONG HandleAttributes = 0; UserEnterExclusive(); - TRACE("Enter NtUserOpenInputDesktop InputDesktopHandle 0x%p\n",InputDesktopHandle); - - /* Get a pointer to the desktop object */ - Status = IntValidateDesktopHandle(InputDesktopHandle, UserMode, 0, &pdesk); - if (!NT_SUCCESS(Status)) - { - ERR("Validation of input desktop handle (0x%p) failed\n", InputDesktopHandle); - goto Exit; - } + TRACE("Enter NtUserOpenInputDesktop gpdeskInputDesktop 0x%p\n",gpdeskInputDesktop); + + if(fInherit) HandleAttributes = OBJ_INHERIT; /* Create a new handle to the object */ Status = ObOpenObjectByPointer( - pdesk, - 0, + gpdeskInputDesktop, + HandleAttributes, NULL, dwDesiredAccess, ExDesktopObjectType, UserMode, (PHANDLE)&hdesk); - ObDereferenceObject(pdesk); - if (!NT_SUCCESS(Status)) { ERR("Failed to open input desktop object\n"); SetLastNtError(Status); - goto Exit; - } -Exit: + } + TRACE("NtUserOpenInputDesktop returning 0x%p\n",hdesk); UserLeave(); return hdesk; @@ -1654,9 +1644,8 @@ InputWindowStation->ActiveDesktop = pdesk; /* Set the global state. */ - InputDesktop = pdesk; - InputDesktopHandle = hdesk; - TRACE("SwitchDesktop InputDesktopHandle 0x%p\n",InputDesktopHandle); + gpdeskInputDesktop = pdesk; + TRACE("SwitchDesktop gpdeskInputDesktop 0x%p\n",gpdeskInputDesktop); ObDereferenceObject(pdesk); RETURN(TRUE); Modified: branches/ros-csrss/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/d… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/desktop.h [iso-8859-1] Wed Oct 31 19:39:53 2012 @@ -70,7 +70,6 @@ DESKTOP_WRITEOBJECTS extern PDESKTOP InputDesktop; -extern HDESK InputDesktopHandle; extern PCLS DesktopWindowClass; extern HDC ScreenDeviceContext; extern PTHREADINFO gptiDesktopThread; Modified: branches/ros-csrss/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/s… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/simplecall.c [iso-8859-1] Wed Oct 31 19:39:53 2012 @@ -260,25 +260,6 @@ RETURN(Result); } - case ONEPARAM_ROUTINE_GETCURSORPOSITION: - { - BOOL ret = TRUE; - - _SEH2_TRY - { - ProbeForWrite((POINT*)Param,sizeof(POINT),1); - RtlCopyMemory((POINT*)Param,&gpsi->ptCursor,sizeof(POINT)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - ret = FALSE; - } - _SEH2_END; - - RETURN (ret); - } - case ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING: { BOOL Enable; @@ -335,9 +316,10 @@ BOOL Ret = TRUE; PPOINTL pptl; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - if (pti->hdesk != InputDesktopHandle) RETURN(FALSE); + if (pti->rpdesk != IntGetActiveDesktop()) RETURN(FALSE); _SEH2_TRY { + ProbeForWrite((POINT*)Param,sizeof(POINT),1); pptl = (PPOINTL)Param; *pptl = gpsi->ptCursor; } Modified: branches/ros-csrss/win32ss/user/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/i… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] Wed Oct 31 19:39:53 2012 @@ -806,7 +806,7 @@ EXTINLINE BOOL NtUserxGetCursorPos(POINT* lpPoint) { - return (BOOL)NtUserCallOneParam((DWORD_PTR)lpPoint, ONEPARAM_ROUTINE_GETCURSORPOSITION); + return (BOOL)NtUserCallOneParam((DWORD_PTR)lpPoint, ONEPARAM_ROUTINE_GETCURSORPOS); } EXTINLINE BOOL NtUserxSetMenuBarHeight(HMENU menu, INT height)

1 0

[gadamopoulos] 57659: [win32k] - Remove InputDesktopHandle variable because it is a handle and that means that it can only be used in the context of winlogon - Fixes NtUserOpenInputDesktop which ne...
by gadamopoulos＠svn.reactos.org 31 Oct '12

31 Oct '12

Author: gadamopoulos Date: Wed Oct 31 16:19:48 2012 New Revision: 57659 URL: http://svn.reactos.org/svn/reactos?rev=57659&view=rev Log: [win32k] - Remove InputDesktopHandle variable because it is a handle and that means that it can only be used in the context of winlogon - Fixes NtUserOpenInputDesktop which never really worked Modified: trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/desktop.h 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] Wed Oct 31 16:19:48 2012 @@ -27,7 +27,6 @@ /* Currently active desktop */ PDESKTOP gpdeskInputDesktop = NULL; -HDESK InputDesktopHandle = NULL; HDC ScreenDeviceContext = NULL; PTHREADINFO gptiDesktopThread; HCURSOR gDesktopCursor = NULL; @@ -1464,40 +1463,31 @@ BOOL fInherit, ACCESS_MASK dwDesiredAccess) { - PDESKTOP pdesk; NTSTATUS Status; HDESK hdesk = NULL; + ULONG HandleAttributes = 0; UserEnterExclusive(); - TRACE("Enter NtUserOpenInputDesktop InputDesktopHandle 0x%p\n",InputDesktopHandle); - - /* Get a pointer to the desktop object */ - Status = IntValidateDesktopHandle(InputDesktopHandle, UserMode, 0, &pdesk); - if (!NT_SUCCESS(Status)) - { - ERR("Validation of input desktop handle (0x%p) failed\n", InputDesktopHandle); - goto Exit; - } + TRACE("Enter NtUserOpenInputDesktop gpdeskInputDesktop 0x%p\n",gpdeskInputDesktop); + + if(fInherit) HandleAttributes = OBJ_INHERIT; /* Create a new handle to the object */ Status = ObOpenObjectByPointer( - pdesk, - 0, + gpdeskInputDesktop, + HandleAttributes, NULL, dwDesiredAccess, ExDesktopObjectType, UserMode, (PHANDLE)&hdesk); - ObDereferenceObject(pdesk); - if (!NT_SUCCESS(Status)) { ERR("Failed to open input desktop object\n"); SetLastNtError(Status); - goto Exit; - } -Exit: + } + TRACE("NtUserOpenInputDesktop returning 0x%p\n",hdesk); UserLeave(); return hdesk; @@ -1655,8 +1645,7 @@ /* Set the global state. */ gpdeskInputDesktop = pdesk; - InputDesktopHandle = hdesk; - TRACE("SwitchDesktop InputDesktopHandle 0x%p\n",InputDesktopHandle); + TRACE("SwitchDesktop gpdeskInputDesktop 0x%p\n",gpdeskInputDesktop); ObDereferenceObject(pdesk); RETURN(TRUE); Modified: trunk/reactos/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] Wed Oct 31 16:19:48 2012 @@ -70,7 +70,6 @@ DESKTOP_WRITEOBJECTS extern PDESKTOP InputDesktop; -extern HDESK InputDesktopHandle; extern PCLS DesktopWindowClass; extern HDC ScreenDeviceContext; extern PTHREADINFO gptiDesktopThread;

1 0

[gadamopoulos] 57658: [user32_apitests] - Add some tests for OpenInputDesktop
by gadamopoulos＠svn.reactos.org 31 Oct '12

31 Oct '12

Author: gadamopoulos Date: Wed Oct 31 15:23:11 2012 New Revision: 57658 URL: http://svn.reactos.org/svn/reactos?rev=57658&view=rev Log: [user32_apitests] - Add some tests for OpenInputDesktop Modified: trunk/rostests/apitests/user32/desktop.c Modified: trunk/rostests/apitests/user32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/desktop.c… ============================================================================== --- trunk/rostests/apitests/user32/desktop.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/desktop.c [iso-8859-1] Wed Oct 31 15:23:11 2012 @@ -132,6 +132,33 @@ test_CreateProcessWithDesktop(8, argv0, "NonExistantWinsta\\NonExistantDesktop", 0); } +void Test_OpenInputDesktop() +{ + HDESK hDeskInput ,hDeskInput2; + HDESK hDeskInitial; + BOOL ret; + + hDeskInput = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); + ok(hDeskInput != NULL, "OpenInputDesktop failed\n"); + hDeskInitial = GetThreadDesktop( GetCurrentThreadId() ); + ok(hDeskInitial != NULL, "GetThreadDesktop failed\n"); + ok(hDeskInput != hDeskInitial, "OpenInputDesktop returned thread desktop\n"); + + hDeskInput2 = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); + ok(hDeskInput2 != NULL, "Second call to OpenInputDesktop failed\n"); + ok(hDeskInput2 != hDeskInput, "Second call to OpenInputDesktop returned same handle\n"); + + ok(CloseDesktop(hDeskInput2) != 0, "CloseDesktop failed\n"); + + ret = SetThreadDesktop(hDeskInput); + ok(ret == TRUE, "SetThreadDesktop for input desktop failed\n"); + + ret = SetThreadDesktop(hDeskInitial); + ok(ret == TRUE, "SetThreadDesktop for initial desktop failed\n"); + + ok(CloseDesktop(hDeskInput) != 0, "CloseDesktop failed\n"); +} + START_TEST(desktop) { char **test_argv; @@ -151,4 +178,5 @@ } Test_InitialDesktop(test_argv[0]); + Test_OpenInputDesktop(); }

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