Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[jimtabor] 24683: Part of the Win32k User32 Compatibility Project. - Create IntLoadKeyboardLayout - Code assimilated from win32k ntuser keyboard.c and Wine. - Process and load a new keyboard layout. - Creates the HKL for processing in NtUserLoadKeyboardLayoutEx. - Load and computes module offset so NtUserLoadKeyboardLayoutEx can process it (read it in), load (EngLoadImage) and set the table entry point. This data is saved in a new structure connected to a list of keyboard layouts that was create

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Oct 30 22:38:37 2006 New Revision: 24683 URL: http://svn.reactos.org/svn/reactos?rev=24683&view=rev Log: Part of the Win32k User32 Compatibility Project. - Create IntLoadKeyboardLayout - Code assimilated from win32k ntuser keyboard.c and Wine. - Process and load a new keyboard layout. - Creates the HKL for processing in NtUserLoadKeyboardLayoutEx. - Load and computes module offset so NtUserLoadKeyboardLayoutEx can process it (read it in), load (EngLoadImage) and set the table entry point. This data is saved in a new structure connected to a list of keyboard layouts that was created during win32k init. Modified: trunk/reactos/dll/win32/user32/windows/input.c Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Mon Oct 30 22:38:37 2006 @@ -32,8 +32,12 @@ #include <wine/debug.h> + +/* Directory to load key layouts from */ +#define SYSTEMROOT_DIR L"\\SystemRoot\\System32\\" + + /* GLOBALS *******************************************************************/ - typedef struct __TRACKINGLIST { TRACKMOUSEEVENT tme; @@ -44,6 +48,209 @@ static _TRACKINGLIST tracking_info; static UINT_PTR timer; static const INT iTimerInterval = 50; /* msec for timer interval */ + + +/* LOCALE FUNCTIONS **********************************************************/ + +/* + * Utility function to read a value from the registry more easily. + * + * IN PUNICODE_STRING KeyName -> Name of key to open + * IN PUNICODE_STRING ValueName -> Name of value to open + * OUT PUNICODE_STRING ReturnedValue -> String contained in registry + * + * Returns NTSTATUS + */ + +static +NTSTATUS FASTCALL +ReadRegistryValue( PUNICODE_STRING KeyName, + PUNICODE_STRING ValueName, + PUNICODE_STRING ReturnedValue ) +{ + NTSTATUS Status; + HANDLE KeyHandle; + OBJECT_ATTRIBUTES KeyAttributes; + PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; + ULONG Length = 0; + ULONG ResLength = 0; + UNICODE_STRING Temp; + + InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, + NULL, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); + if( !NT_SUCCESS(Status) ) + { + return Status; + } + + Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, + 0, + 0, + &ResLength); + + if( Status != STATUS_BUFFER_TOO_SMALL ) + { + NtClose(KeyHandle); + return Status; + } + + ResLength += sizeof( *KeyValuePartialInfo ); + KeyValuePartialInfo = LocalAlloc(LMEM_ZEROINIT, ResLength); + Length = ResLength; + + if( !KeyValuePartialInfo ) + { + NtClose(KeyHandle); + return STATUS_NO_MEMORY; + } + + Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, + (PVOID)KeyValuePartialInfo, + Length, + &ResLength); + + if( !NT_SUCCESS(Status) ) + { + NtClose(KeyHandle); + LocalFree(KeyValuePartialInfo); + return Status; + } + + Temp.Length = Temp.MaximumLength = KeyValuePartialInfo->DataLength; + Temp.Buffer = (PWCHAR)KeyValuePartialInfo->Data; + + /* At this point, KeyValuePartialInfo->Data contains the key data */ + RtlInitUnicodeString(ReturnedValue,L""); + RtlAppendUnicodeStringToString(ReturnedValue,&Temp); + + LocalFree(KeyValuePartialInfo); + NtClose(KeyHandle); + + return Status; +} + + +static +HKL FASTCALL +IntLoadKeyboardLayout( LPCWSTR pwszKLID, + UINT Flags) +{ + HANDLE Handle; + HINSTANCE KBModule = 0; + FARPROC pAddr = 0; + DWORD offTable = 0; + HKL hKL; + NTSTATUS Status; + WCHAR LocaleBuffer[16]; + UNICODE_STRING LayoutKeyName; + UNICODE_STRING LayoutValueName; + UNICODE_STRING DefaultLocale; + UNICODE_STRING LayoutFile; + UNICODE_STRING FullLayoutPath; + LCID LocaleId; + PWCHAR KeyboardLayoutWSTR; + ULONG_PTR layout; + LANGID langid; + + layout = (ULONG_PTR) wcstoul(pwszKLID, NULL, 16); + +// LocaleId = GetSystemDefaultLCID(); + + LocaleId = (LCID) layout; + + /* Create the HKL to be used by NtUserLoadKeyboardLayoutEx*/ + /* + * Microsoft Office expects this value to be something specific + * for Japanese and Korean Windows with an IME the value is 0xe001 + * We should probably check to see if an IME exists and if so then + * set this word properly. + */ + langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + layout |= 0xe001 << 16; /* FIXME */ + else + layout |= layout << 16; + + DPRINT("Input = %S\n", pwszKLID ); + + DPRINT("DefaultLocale = %lx\n", LocaleId); + + swprintf(LocaleBuffer, L"%08lx", LocaleId); + + DPRINT("DefaultLocale = %S\n", LocaleBuffer); + RtlInitUnicodeString(&DefaultLocale, LocaleBuffer); + + RtlInitUnicodeString(&LayoutKeyName, + L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet" + L"\\Control\\KeyboardLayouts\\"); + + RtlAppendUnicodeStringToString(&LayoutKeyName,&DefaultLocale); + + RtlInitUnicodeString(&LayoutValueName,L"Layout File"); + + Status = ReadRegistryValue(&LayoutKeyName,&LayoutValueName,&LayoutFile); + + RtlFreeUnicodeString(&LayoutKeyName); + + DPRINT("Read registry and got %wZ\n", &LayoutFile); + + RtlInitUnicodeString(&FullLayoutPath,SYSTEMROOT_DIR); + RtlAppendUnicodeStringToString(&FullLayoutPath,&LayoutFile); + + DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); + + RtlFreeUnicodeString(&LayoutFile); + + KeyboardLayoutWSTR = LocalAlloc(LMEM_ZEROINIT, + FullLayoutPath.Length + sizeof(WCHAR)); + + if( !KeyboardLayoutWSTR ) + { + DPRINT1("Couldn't allocate a string for the keyboard layout name.\n"); + RtlFreeUnicodeString(&FullLayoutPath); + return NULL; + } + memcpy(KeyboardLayoutWSTR,FullLayoutPath.Buffer, FullLayoutPath.Length); + + KeyboardLayoutWSTR[FullLayoutPath.Length / sizeof(WCHAR)] = 0; + + KBModule = LoadLibraryW(KeyboardLayoutWSTR); + + DPRINT( "Load Keyboard Layout: %S\n", KeyboardLayoutWSTR ); + + if( !KBModule ) + DPRINT1( "Load Keyboard Layout: No %wZ\n", &FullLayoutPath ); + + pAddr = GetProcAddress( KBModule, (LPCSTR) 1); + offTable = (DWORD) pAddr - (DWORD) KBModule; // Weeks to figure this out! + + DPRINT( "Load Keyboard Module Offset: %x\n", offTable ); + + FreeLibrary(KBModule); + + Handle = CreateFileW( KeyboardLayoutWSTR, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + 0, + NULL); + + hKL = NtUserLoadKeyboardLayoutEx( Handle, + offTable, + (HKL) layout, + &DefaultLocale, + (UINT) layout, + Flags); + + NtClose(Handle); + + LocalFree(KeyboardLayoutWSTR); + RtlFreeUnicodeString(&FullLayoutPath); + + return hKL; +} /* FUNCTIONS *****************************************************************/ @@ -315,19 +522,17 @@ ret = LoadKeyboardLayoutW(pwszKLIDW.Buffer, Flags); RtlFreeUnicodeString(&pwszKLIDW); return ret; - -} - - -/* - * @unimplemented +} + + +/* + * @implemented */ HKL STDCALL LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags) { - UNIMPLEMENTED; - return (HKL)0; + return IntLoadKeyboardLayout( pwszKLID, Flags); }

18 years, 1 month

[ion] 24682: - In my fear of accidentally comitting NTLPC = 1, I forgot to make the initial NTLPC = 0 commit, so LPC was never getting compiled at all. This fixes it.

by ion＠svn.reactos.org

Author: ion Date: Mon Oct 30 22:20:08 2006 New Revision: 24682 URL: http://svn.reactos.org/svn/reactos?rev=24682&view=rev Log: - In my fear of accidentally comitting NTLPC = 1, I forgot to make the initial NTLPC = 0 commit, so LPC was never getting compiled at all. This fixes it. Modified: trunk/reactos/config.template.rbuild Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Mon Oct 30 22:20:08 2006 @@ -69,4 +69,12 @@ --> <property name="NSWPAT" value="0" /> + +<property name="NTLPC" value="0" /> + </rbuild>

18 years, 1 month

[ion] 24681: - Properly initialize the Port Message header in NTDLL's Csr Routines and Win32k's as well. - It is now possible to boot into GUI and use the Command Line/Console (heavy LPC user) in NTLPC mode. - NTLPC is still disabled in trunk however, because there are still bugs and missing functionality.

by ion＠svn.reactos.org

Author: ion Date: Mon Oct 30 22:12:17 2006 New Revision: 24681 URL: http://svn.reactos.org/svn/reactos?rev=24681&view=rev Log: - Properly initialize the Port Message header in NTDLL's Csr Routines and Win32k's as well. - It is now possible to boot into GUI and use the Command Line/Console (heavy LPC user) in NTLPC mode. - NTLPC is still disabled in trunk however, because there are still bugs and missing functionality. Modified: trunk/reactos/dll/ntdll/csr/connect.c trunk/reactos/subsystems/win32/win32k/ntuser/csr.c Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c (original) +++ trunk/reactos/dll/ntdll/csr/connect.c Mon Oct 30 22:12:17 2006 @@ -59,6 +59,7 @@ DPRINT("CsrClientCallServer\n"); /* Fill out the Port Message Header */ + ApiMessage->Header.u2.ZeroInit = 0; ApiMessage->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); ApiMessage->Header.u1.s1.TotalLength = RequestLength; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/csr.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/csr.c Mon Oct 30 22:12:17 2006 @@ -54,6 +54,7 @@ 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);

18 years, 1 month

[ion] 24680: - Use Emanuelle's design for SMSS's LPC Code in CSRSS as well so that it can be portable between ROS LPC and NT LPC.

by ion＠svn.reactos.org

Author: ion Date: Mon Oct 30 21:45:22 2006 New Revision: 24680 URL: http://svn.reactos.org/svn/reactos?rev=24680&view=rev Log: - Use Emanuelle's design for SMSS's LPC Code in CSRSS as well so that it can be portable between ROS LPC and NT LPC. Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/init.c Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c Mon Oct 30 21:45:22 2006 @@ -118,7 +118,81 @@ CallHardError(); } -static +NTSTATUS STDCALL +CsrpHandleConnectionRequest (PPORT_MESSAGE Request, + IN HANDLE hApiListenPort) +{ + NTSTATUS Status; + HANDLE ServerPort = (HANDLE) 0; + PCSRSS_PROCESS_DATA ProcessData = NULL; + REMOTE_PORT_VIEW LpcRead; + LpcRead.Length = sizeof(LpcRead); + ServerPort = NULL; + + DPRINT1("CSR: %s: Handling: %p\n", __FUNCTION__, Request); + + Status = NtAcceptConnectPort(&ServerPort, +#ifdef NTLPC + NULL, + Request, +#else + hApiListenPort, + NULL, +#endif + TRUE, + 0, + & LpcRead); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSR: NtAcceptConnectPort() failed\n"); + return Status; + } + + ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess); + if (ProcessData == NULL) + { + DPRINT1("Unable to allocate or find data for process 0x%x\n", + Request->ClientId.UniqueProcess); + Status = STATUS_UNSUCCESSFUL; + return Status; + } + + ProcessData->CsrSectionViewBase = LpcRead.ViewBase; + ProcessData->CsrSectionViewSize = LpcRead.ViewSize; + + Status = NtCompleteConnectPort(ServerPort); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSR: NtCompleteConnectPort() failed\n"); + return Status; + } + +#if !defined(NTLPC) /* ReactOS LPC */ + HANDLE ServerThread = (HANDLE) 0; + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + FALSE, + 0, + 0, + 0, + (PTHREAD_START_ROUTINE)ClientConnectionThread, + ServerPort, + & ServerThread, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSR: Unable to create server thread\n"); + return Status; + } + + NtClose(ServerThread); +#endif + + Status = STATUS_SUCCESS; + DPRINT1("CSR: %s done\n", __FUNCTION__); + return Status; +} + VOID STDCALL ClientConnectionThread(HANDLE ServerPort) @@ -155,6 +229,13 @@ break; } + if (Request->Header.u2.s2.Type == LPC_CONNECTION_REQUEST) + { + CsrpHandleConnectionRequest((PPORT_MESSAGE)Request, ServerPort); + Reply = NULL; + continue; + } + DPRINT("CSR: Got CSR API: %x [Message Origin: %x]\n", Request->Type, Request->Header.ClientId.UniqueProcess); @@ -205,93 +286,38 @@ * "\Windows\ApiPort". */ DWORD STDCALL -ServerApiPortThread (PVOID PortHandle) -{ - NTSTATUS Status = STATUS_SUCCESS; - BYTE RawRequest[sizeof(PORT_MESSAGE) + sizeof(CSR_CONNECTION_INFO)]; - PPORT_MESSAGE Request = (PPORT_MESSAGE)RawRequest; - HANDLE hApiListenPort = * (PHANDLE) PortHandle; - HANDLE ServerPort = (HANDLE) 0; - HANDLE ServerThread = (HANDLE) 0; - PCSRSS_PROCESS_DATA ProcessData = NULL; - - CsrInitProcessData(); - - DPRINT1("CSR: %s called", __FUNCTION__); - - for (;;) - { - REMOTE_PORT_VIEW LpcRead; - LpcRead.Length = sizeof(LpcRead); - ServerPort = NULL; - - Status = NtListenPort (hApiListenPort, Request); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR: NtListenPort() failed, status=%x\n", Status); - break; - } - Status = NtAcceptConnectPort(& ServerPort, -#ifdef NTLPC - NULL, - Request, -#else - hApiListenPort, - NULL, -#endif - TRUE, - 0, - & LpcRead); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR: NtAcceptConnectPort() failed\n"); - break; - } - - ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess); - if (ProcessData == NULL) - { - DPRINT1("Unable to allocate or find data for process 0x%x\n", - Request->ClientId.UniqueProcess); - Status = STATUS_UNSUCCESSFUL; - break; - } - - - ProcessData->CsrSectionViewBase = LpcRead.ViewBase; - ProcessData->CsrSectionViewSize = LpcRead.ViewSize; - - Status = NtCompleteConnectPort(ServerPort); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR: NtCompleteConnectPort() failed\n"); - break; - } - - Status = RtlCreateUserThread(NtCurrentProcess(), - NULL, - FALSE, - 0, - 0, - 0, - (PTHREAD_START_ROUTINE)ClientConnectionThread, - ServerPort, - & ServerThread, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR: Unable to create server thread\n"); - break; - } - NtClose(ServerThread); - } - if (ServerPort) - { - NtClose(ServerPort); - } - NtClose(PortHandle); - NtTerminateThread(NtCurrentThread(), Status); - return 0; +ServerApiPortThread (HANDLE hApiListenPort) +{ + NTSTATUS Status = STATUS_SUCCESS; + BYTE RawRequest[sizeof(PORT_MESSAGE) + sizeof(CSR_CONNECTION_INFO)]; + PPORT_MESSAGE Request = (PPORT_MESSAGE)RawRequest; + + DPRINT1("CSR: %s called", __FUNCTION__); + + for (;;) + { + REMOTE_PORT_VIEW LpcRead; + LpcRead.Length = sizeof(LpcRead); + + Status = NtListenPort (hApiListenPort, Request); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSR: NtListenPort() failed, status=%x\n", Status); + break; + } + + Status = CsrpHandleConnectionRequest(Request, hApiListenPort); + if(!NT_SUCCESS(Status)) + { + DPRINT1("CSR: %s: SmpHandleConnectionRequest failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + break; + } + } + + NtClose(hApiListenPort); + NtTerminateThread(NtCurrentThread(), Status); + return 0; } /********************************************************************** @@ -304,9 +330,8 @@ * connection request (from the SM). */ DWORD STDCALL -ServerSbApiPortThread (PVOID PortHandle) -{ - HANDLE hSbApiPortListen = * (PHANDLE) PortHandle; +ServerSbApiPortThread (HANDLE hSbApiPortListen) +{ HANDLE hConnectedPort = (HANDLE) 0; PORT_MESSAGE Request; PVOID Context = NULL; Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h Mon Oct 30 21:45:22 2006 @@ -104,6 +104,9 @@ DWORD STDCALL ServerApiPortThread (PVOID PortHandle); DWORD STDCALL ServerSbApiPortThread (PVOID PortHandle); DWORD STDCALL Console_Api( PVOID unused ); +VOID +NTAPI +ClientConnectionThread(HANDLE ServerPort); extern HANDLE CsrssApiHeap; Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c (original) +++ trunk/reactos/subsystems/win32/csrss/init.c Mon Oct 30 21:45:22 2006 @@ -331,7 +331,7 @@ 0, 0, (PTHREAD_START_ROUTINE) ListenThread, - Port, + *Port, NULL, NULL); return Status; @@ -528,9 +528,14 @@ { DPRINT("CSR: %s called\n", __FUNCTION__); + CsrInitProcessData(); return CsrpCreateListenPort (L"\\Windows\\ApiPort", & hApiPort, +#ifdef NTLPC + (PTHREAD_START_ROUTINE)ClientConnectionThread); +#else ServerApiPortThread); +#endif } /**********************************************************************

18 years, 1 month

[ion] 24679: - Fix incorrect parameter shuffle in NtAcceptConnectPort. CSRSS now initializes properly and kernel32 gets loaded, but fails when connecting.

by ion＠svn.reactos.org

Author: ion Date: Mon Oct 30 20:04:49 2006 New Revision: 24679 URL: http://svn.reactos.org/svn/reactos?rev=24679&view=rev Log: - Fix incorrect parameter shuffle in NtAcceptConnectPort. CSRSS now initializes properly and kernel32 gets loaded, but fails when connecting. Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/complet… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c Mon Oct 30 20:04:49 2006 @@ -42,8 +42,8 @@ IN PVOID PortContext OPTIONAL, IN PPORT_MESSAGE ReplyMessage, IN BOOLEAN AcceptConnection, - IN PPORT_VIEW ClientView, - IN PREMOTE_PORT_VIEW ServerView) + IN PPORT_VIEW ServerView, + IN PREMOTE_PORT_VIEW ClientView) { PLPCP_PORT_OBJECT ConnectionPort, ServerPort, ClientPort; PVOID ClientSectionToMap = NULL; @@ -66,14 +66,14 @@ ServerView); /* Validate the size of the server view */ - if ((ServerView) && (ServerView->Length != sizeof(REMOTE_PORT_VIEW))) + if ((ServerView) && (ServerView->Length != sizeof(PORT_VIEW))) { /* Invalid size */ return STATUS_INVALID_PARAMETER; } /* Validate the size of the client view */ - if ((ClientView) && (ClientView->Length != sizeof(PORT_VIEW))) + if ((ClientView) && (ClientView->Length != sizeof(REMOTE_PORT_VIEW))) { /* Invalid size */ return STATUS_INVALID_PARAMETER;

18 years, 1 month

[ion] 24678: - Add support for mapping the client section in NtAcceptConnectPort.

by ion＠svn.reactos.org

Author: ion Date: Mon Oct 30 19:54:45 2006 New Revision: 24678 URL: http://svn.reactos.org/svn/reactos?rev=24678&view=rev Log: - Add support for mapping the client section in NtAcceptConnectPort. Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/complet… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c Mon Oct 30 19:54:45 2006 @@ -51,10 +51,11 @@ KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status; ULONG ConnectionInfoLength; - PLPCP_MESSAGE Msg; - PLPCP_CONNECTION_MESSAGE ConnectMsg; + PLPCP_MESSAGE Message; + PLPCP_CONNECTION_MESSAGE ConnectMessage; PEPROCESS ClientProcess; PETHREAD ClientThread; + LARGE_INTEGER SectionOffset; PAGED_CODE(); LPCTRACE(LPC_COMPLETE_DEBUG, "Context: %p. Message: %p. Accept: %lx. Views: %p/%p\n", @@ -100,11 +101,11 @@ } /* Now get the message and connection message */ - Msg = ClientThread->LpcReplyMessage; - ConnectMsg = (PLPCP_CONNECTION_MESSAGE)(Msg + 1); + Message = ClientThread->LpcReplyMessage; + ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1); /* Get the client and connection port as well */ - ClientPort = ConnectMsg->ClientPort; + ClientPort = ConnectMessage->ClientPort; ConnectionPort = ClientPort->ConnectionPort; /* Make sure that the reply is being sent to the proper server process */ @@ -122,7 +123,7 @@ ClientThread->LpcReplyMessageId = 0; /* Clear the client port for now as well, then release the lock */ - ConnectMsg->ClientPort = NULL; + ConnectMessage->ClientPort = NULL; KeReleaseGuardedMutex(&LpcpLock); /* Get the connection information length */ @@ -134,18 +135,18 @@ } /* Set the sizes of our reply message */ - Msg->Request.u1.s1.DataLength = sizeof(LPCP_CONNECTION_MESSAGE) + + Message->Request.u1.s1.DataLength = sizeof(LPCP_CONNECTION_MESSAGE) + ConnectionInfoLength; - Msg->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + - Msg->Request.u1.s1.DataLength; + Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + + Message->Request.u1.s1.DataLength; /* Setup the reply message */ - Msg->Request.u2.s2.Type = LPC_REPLY; - Msg->Request.u2.s2.DataInfoOffset = 0; - Msg->Request.ClientId = ReplyMessage->ClientId; - Msg->Request.MessageId = ReplyMessage->MessageId; - Msg->Request.ClientViewSize = 0; - RtlMoveMemory(ConnectMsg + 1, ReplyMessage + 1, ConnectionInfoLength); + Message->Request.u2.s2.Type = LPC_REPLY; + Message->Request.u2.s2.DataInfoOffset = 0; + Message->Request.ClientId = ReplyMessage->ClientId; + Message->Request.MessageId = ReplyMessage->MessageId; + Message->Request.ClientViewSize = 0; + RtlMoveMemory(ConnectMessage + 1, ReplyMessage + 1, ConnectionInfoLength); /* At this point, if the caller refused the connection, go to cleanup */ if (!AcceptConnection) goto Cleanup; @@ -180,19 +181,46 @@ /* Also set the creator CID */ ServerPort->Creator = PsGetCurrentThread()->Cid; - ClientPort->Creator = Msg->Request.ClientId; + ClientPort->Creator = Message->Request.ClientId; /* Get the section associated and then clear it, while inside the lock */ KeAcquireGuardedMutex(&LpcpLock); - ClientSectionToMap = ConnectMsg->SectionToMap; - ConnectMsg->SectionToMap = NULL; + ClientSectionToMap = ConnectMessage->SectionToMap; + ConnectMessage->SectionToMap = NULL; KeReleaseGuardedMutex(&LpcpLock); /* Now check if there's a client section */ if (ClientSectionToMap) { - /* FIXME: TODO */ - ASSERT(FALSE); + /* Setup the offset */ + SectionOffset.QuadPart = ConnectMessage->ClientView.SectionOffset; + + /* Map the section */ + Status = MmMapViewOfSection(ClientSectionToMap, + PsGetCurrentProcess(), + &ServerPort->ClientSectionBase, + 0, + 0, + &SectionOffset, + &ConnectMessage->ClientView.ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + + /* Update the offset and check for mapping status */ + ConnectMessage->ClientView.SectionOffset = SectionOffset.LowPart; + if (NT_SUCCESS(Status)) + { + /* Set the view base */ + ConnectMessage->ClientView.ViewRemoteBase = ServerPort-> + ClientSectionBase; + } + else + { + /* Otherwise, quit */ + ObDereferenceObject(ServerPort); + goto Cleanup; + } } /* Check if there's a server section */ @@ -223,8 +251,8 @@ if (ClientView) { /* Fill it out */ - ClientView->ViewBase = ConnectMsg->ClientView.ViewRemoteBase; - ClientView->ViewSize = ConnectMsg->ClientView.ViewSize; + ClientView->ViewBase = ConnectMessage->ClientView.ViewRemoteBase; + ClientView->ViewSize = ConnectMessage->ClientView.ViewSize; } /* Return the handle to user mode */ @@ -232,8 +260,8 @@ LPCTRACE(LPC_COMPLETE_DEBUG, "Handle: %lx. Messages: %p/%p. Ports: %p/%p/%p\n", Handle, - Msg, - ConnectMsg, + Message, + ConnectMessage, ServerPort, ClientPort, ConnectionPort); @@ -244,7 +272,7 @@ /* Set this message as the LPC Reply message while holding the lock */ KeAcquireGuardedMutex(&LpcpLock); - ClientThread->LpcReplyMessage = Msg; + ClientThread->LpcReplyMessage = Message; KeReleaseGuardedMutex(&LpcpLock); /* Clear the thread pointer so it doesn't get cleaned later */

18 years, 1 month

[ion] 24677: - Fix parameter checks in NtAcceptConnectPort. - Make CSRSS properly fill out the ServerView structure's length so that it can be validated by the kernel.

by ion＠svn.reactos.org

Author: ion Date: Mon Oct 30 19:50:20 2006 New Revision: 24677 URL: http://svn.reactos.org/svn/reactos?rev=24677&view=rev Log: - Fix parameter checks in NtAcceptConnectPort. - Make CSRSS properly fill out the ServerView structure's length so that it can be validated by the kernel. Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c trunk/reactos/subsystems/win32/csrss/api/wapi.c Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/complet… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/complete.c Mon Oct 30 19:50:20 2006 @@ -65,14 +65,14 @@ ServerView); /* Validate the size of the server view */ - if ((ServerView) && (ServerView->Length != sizeof(PORT_VIEW))) + if ((ServerView) && (ServerView->Length != sizeof(REMOTE_PORT_VIEW))) { /* Invalid size */ return STATUS_INVALID_PARAMETER; } /* Validate the size of the client view */ - if ((ClientView) && (ClientView->Length != sizeof(REMOTE_PORT_VIEW))) + if ((ClientView) && (ClientView->Length != sizeof(PORT_VIEW))) { /* Invalid size */ return STATUS_INVALID_PARAMETER; Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c Mon Oct 30 19:50:20 2006 @@ -222,6 +222,7 @@ for (;;) { REMOTE_PORT_VIEW LpcRead; + LpcRead.Length = sizeof(LpcRead); ServerPort = NULL; Status = NtListenPort (hApiListenPort, Request);

18 years, 1 month

[ion] 24676: - Add support for secure LPC. However, we always return success atm because SeQueryInformationToken is not implemented. (Someone needs to refactor NtQueryInformationToken).

by ion＠svn.reactos.org

Author: ion Date: Mon Oct 30 19:45:54 2006 New Revision: 24676 URL: http://svn.reactos.org/svn/reactos?rev=24676&view=rev Log: - Add support for secure LPC. However, we always return success atm because SeQueryInformationToken is not implemented. (Someone needs to refactor NtQueryInformationToken). Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/connect… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c Mon Oct 30 19:45:54 2006 @@ -89,6 +89,8 @@ PETHREAD Thread = PsGetCurrentThread(); ULONG PortMessageLength; LARGE_INTEGER SectionOffset; + PTOKEN Token; + PTOKEN_USER TokenUserInfo; PAGED_CODE(); LPCTRACE(LPC_CONNECT_DEBUG, "Name: %wZ. Qos: %p. Views: %p/%p. Sid: %p\n", @@ -141,9 +143,45 @@ /* Check if we have a SID */ if (ServerSid) { - /* FIXME: TODO */ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + /* Make sure that we have a server */ + if (Port->ServerProcess) + { + /* Get its token and query user information */ + Token = PsReferencePrimaryToken(Port->ServerProcess); + //Status = SeQueryInformationToken(Token, TokenUser, (PVOID*)&TokenUserInfo); + // FIXME: Need SeQueryInformationToken + Status = STATUS_SUCCESS; + TokenUserInfo = ExAllocatePool(PagedPool, sizeof(TOKEN_USER)); + TokenUserInfo->User.Sid = ServerSid; + PsDereferencePrimaryToken(Token); + + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* Compare the SIDs */ + if (!RtlEqualSid(ServerSid, TokenUserInfo->User.Sid)) + { + /* Fail */ + Status = STATUS_SERVER_SID_MISMATCH; + } + + /* Free token information */ + ExFreePool(TokenUserInfo); + } + } + else + { + /* Invalid SID */ + Status = STATUS_SERVER_SID_MISMATCH; + } + + /* Check if SID failed */ + if (!NT_SUCCESS(Status)) + { + /* Quit */ + ObDereferenceObject(Port); + return Status; + } } /* Create the client port */

18 years, 1 month

[ion] 24675: - Add support for Client/RemoteView in NtSecureConnectPort. Still lacking support for SID (needed for Csr)

by ion＠svn.reactos.org

Author: ion Date: Mon Oct 30 19:39:19 2006 New Revision: 24675 URL: http://svn.reactos.org/svn/reactos?rev=24675&view=rev Log: - Add support for Client/RemoteView in NtSecureConnectPort. Still lacking support for SID (needed for Csr) Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/connect… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/connect.c Mon Oct 30 19:39:19 2006 @@ -88,13 +88,15 @@ PLPCP_CONNECTION_MESSAGE ConnectMessage; PETHREAD Thread = PsGetCurrentThread(); ULONG PortMessageLength; + LARGE_INTEGER SectionOffset; PAGED_CODE(); LPCTRACE(LPC_CONNECT_DEBUG, - "Name: %wZ. Qos: %p. Views: %p/%p\n", + "Name: %wZ. Qos: %p. Views: %p/%p. Sid: %p\n", PortName, Qos, ClientView, - ServerView); + ServerView, + ServerSid); /* Validate client view */ if ((ClientView) && (ClientView->Length != sizeof(PORT_VIEW))) @@ -203,9 +205,50 @@ /* Check if we have a client view */ if (ClientView) { - /* FIXME: TODO */ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + /* Get the section handle */ + Status = ObReferenceObjectByHandle(ClientView->SectionHandle, + SECTION_MAP_READ | + SECTION_MAP_WRITE, + MmSectionObjectType, + PreviousMode, + (PVOID*)&SectionToMap, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ObDereferenceObject(Port); + return Status; + } + + /* Set the section offset */ + SectionOffset.QuadPart = ClientView->SectionOffset; + + /* Map it */ + Status = MmMapViewOfSection(SectionToMap, + PsGetCurrentProcess(), + &Port->ClientSectionBase, + 0, + 0, + &SectionOffset, + &ClientView->ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + + /* Update the offset */ + ClientView->SectionOffset = SectionOffset.LowPart; + + /* Check for failure */ + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ObDereferenceObject(SectionToMap); + ObDereferenceObject(Port); + return Status; + } + + /* Update the base */ + ClientView->ViewBase = Port->ClientSectionBase; } else { @@ -247,9 +290,14 @@ /* Check if we have a client view */ if (ClientView) { - /* FIXME: TODO */ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + /* Set the view size */ + Message->Request.ClientViewSize = ClientView->ViewSize; + + /* Copy the client view and clear the server view */ + RtlMoveMemory(&ConnectMessage->ClientView, + ClientView, + sizeof(PORT_VIEW)); + RtlZeroMemory(&ConnectMessage->ServerView, sizeof(REMOTE_PORT_VIEW)); } else {

18 years, 1 month

[ion] 24674: - Add correct calls to NtAcceptConnectPort if NTLPC is used. Now we freeze because CSRSS uses client/server views so I have to implement that.

by ion＠svn.reactos.org

Author: ion Date: Mon Oct 30 19:21:21 2006 New Revision: 24674 URL: http://svn.reactos.org/svn/reactos?rev=24674&view=rev Log: - Add correct calls to NtAcceptConnectPort if NTLPC is used. Now we freeze because CSRSS uses client/server views so I have to implement that. Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrss.rbuild Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c Mon Oct 30 19:21:21 2006 @@ -217,7 +217,7 @@ CsrInitProcessData(); - DPRINT("CSR: %s called", __FUNCTION__); + DPRINT1("CSR: %s called", __FUNCTION__); for (;;) { @@ -231,8 +231,13 @@ break; } Status = NtAcceptConnectPort(& ServerPort, +#ifdef NTLPC + NULL, + Request, +#else hApiListenPort, - NULL, + NULL, +#endif TRUE, 0, & LpcRead); @@ -307,7 +312,7 @@ NTSTATUS Status = STATUS_SUCCESS; PPORT_MESSAGE Reply = NULL; - DPRINT("CSR: %s called\n", __FUNCTION__); + DPRINT1("CSR: %s called\n", __FUNCTION__); RtlZeroMemory(&Request, sizeof(PORT_MESSAGE)); Status = NtListenPort (hSbApiPortListen, & Request); @@ -318,8 +323,13 @@ } else { DPRINT("-- 1\n"); Status = NtAcceptConnectPort (& hConnectedPort, - hSbApiPortListen, - NULL, +#ifdef NTLPC + NULL, + &Request, +#else + hSbApiPortListen, + NULL, +#endif TRUE, NULL, NULL); Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.rbuild (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.rbuild Mon Oct 30 19:21:21 2006 @@ -6,6 +6,9 @@ <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0501</define> + <if property="NTLPC" value="1"> + <define name="NTLPC" /> + </if> <library>nt</library> <library>intrlck</library> <library>ntdll</library>

18 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2006