Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[gadamopoulos] 55727: [user32_apitest] - Test the initial desktop and window station of processes

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 19 23:46:06 2012 New Revision: 55727 URL: http://svn.reactos.org/svn/reactos?rev=55727&view=rev Log: [user32_apitest] - Test the initial desktop and window station of processes Added: trunk/rostests/apitests/user32/desktop.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c trunk/rostests/apitests/user32/user32_apitest.rbuild Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Sun Feb 19 23:46:06 2012 @@ -6,6 +6,7 @@ list(APPEND SOURCE helper.c DeferWindowPos.c + desktop.c GetIconInfo.c GetKeyState.c GetPeekMessage.c Added: 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 (added) +++ trunk/rostests/apitests/user32/desktop.c [iso-8859-1] Sun Feb 19 23:46:06 2012 @@ -1,0 +1,154 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for desktop objects + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include "helper.h" +#include <undocuser.h> + +#define STATUS_DLL_INIT_FAILED (0xC0000142) +#define DESKTOP_ALL_ACCESS 0x01ff + +struct test_info { + WCHAR* ExpectedWinsta; + WCHAR* ExpectedDesktp; +}; + +struct test_info TestResults[] = {{L"WinSta0",L"Default"}, + {L"WinSta0",L"Default"}, + {L"WinSta0",L"Default"}, + {NULL, NULL}, + {NULL, NULL}, + {NULL, NULL}, + {NULL, NULL}, + {L"WinSta0",L"Default"}, + {L"TestWinsta", L"TestDesktop"}}; + +void do_InitialDesktop_child(int i) +{ + HDESK hdesktop; + HWINSTA hwinsta; + WCHAR buffer[100]; + DWORD size; + BOOL ret; + + if(TestResults[i].ExpectedWinsta == NULL) + { + trace("Process should have failed to initialize\n"); + return; + } + + IsGUIThread(TRUE); + + hdesktop = GetThreadDesktop(GetCurrentThreadId()); + hwinsta = GetProcessWindowStation(); + + ret = GetUserObjectInformationW( hwinsta, UOI_NAME, buffer, sizeof(buffer), &size ); + ok(wcscmp(buffer, TestResults[i].ExpectedWinsta) == 0, "Wrong winsta %S insted of %S\n", buffer, TestResults[i].ExpectedWinsta); + + ret = GetUserObjectInformationW( hdesktop, UOI_NAME, buffer, sizeof(buffer), &size ); + ok(wcscmp(buffer, TestResults[i].ExpectedDesktp) == 0, "Wrong desktop %S insted of %S\n", buffer, TestResults[i].ExpectedDesktp); +} + +void test_CreateProcessWithDesktop(int i, char *argv0, char* Desktop, DWORD expectedExitCode) +{ + STARTUPINFOA startup; + char path[MAX_PATH]; + BOOL ret; + DWORD ExitCode; + PROCESS_INFORMATION pi; + + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + startup.lpDesktop = Desktop; + + sprintf( path, "%s desktop %u", argv0, i ); + ret = CreateProcessA( NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &pi ); + ok( ret, "%d: CreateProcess '%s' failed err %d.\n", i, path, (int)GetLastError() ); + WaitForSingleObject (pi.hProcess, INFINITE); + ret = GetExitCodeProcess(pi.hProcess, &ExitCode); + ok(ret > 0 , "%d: GetExitCodeProcess failed\n", i); + + /* the exit code varies from version to version */ + /* xp returns error 128 and 7 returns STATUS_DLL_INIT_FAILED */ + if(ExitCode == 128) ExitCode = STATUS_DLL_INIT_FAILED; + + ok(ExitCode == expectedExitCode, "%d: expected error 0x%x in child process got 0x%x\n", i, (int)expectedExitCode, (int)ExitCode); + + CloseHandle(pi.hProcess); +} + +HWINSTA CreateInheritableWinsta(WCHAR* name, ACCESS_MASK dwDesiredAccess, BOOL inheritable) +{ + SECURITY_ATTRIBUTES sa; + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = inheritable; + return CreateWindowStationW(name, 0, dwDesiredAccess, &sa ); +} + +HDESK CreateInheritableDesktop(WCHAR* name, ACCESS_MASK dwDesiredAccess, BOOL inheritable) +{ + SECURITY_ATTRIBUTES sa; + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = inheritable; + return CreateDesktopW(name, NULL, NULL, 0, dwDesiredAccess, &sa ); +} + +void Test_InitialDesktop(char *argv0) +{ + HWINSTA hwinsta = NULL, hwinstaInitial; + HDESK hdesktop = NULL, hdeskInitial; + BOOL ret; + + hwinstaInitial = GetProcessWindowStation(); + hdeskInitial = GetThreadDesktop(GetCurrentThreadId()); + + test_CreateProcessWithDesktop(0, argv0, NULL, 0); + test_CreateProcessWithDesktop(1, argv0, "Default", 0); + test_CreateProcessWithDesktop(2, argv0, "WinSta0\\Default", 0); + test_CreateProcessWithDesktop(3, argv0, "Winlogon", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(4, argv0, "WinSta0/Default", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(5, argv0, "NonExistantDesktop", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(6, argv0, "NonExistantWinsta\\NonExistantDesktop", STATUS_DLL_INIT_FAILED); + + hwinsta = CreateInheritableWinsta(L"TestWinsta", WINSTA_ALL_ACCESS, TRUE); + ok(hwinsta!=NULL, "CreateWindowStation failed\n"); + ret = SetProcessWindowStation(hwinsta); + ok(ret != 0, "SetProcessWindowStation failed\n"); + hdesktop = CreateInheritableDesktop(L"TestDesktop", DESKTOP_ALL_ACCESS, TRUE); + ok(hdesktop!=NULL, "CreateDesktop failed\n"); + + test_CreateProcessWithDesktop(7, argv0, NULL, 0); + test_CreateProcessWithDesktop(8, argv0, "TestWinsta\\TestDesktop", 0); + test_CreateProcessWithDesktop(8, argv0, "NonExistantWinsta\\NonExistantDesktop", 0); +} + +START_TEST(desktop) +{ + char **test_argv; + int argc = winetest_get_mainargs( &test_argv ); + + /* this program tests some cases that a child application fails to initialize */ + /* to test this behaviour properly we have to disable error messages */ + //SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); + + if (argc >= 3) + { + unsigned int arg; + /* Child process. */ + sscanf (test_argv[2], "%d", (unsigned int *) &arg); + do_InitialDesktop_child( arg ); + return; + } + + Test_InitialDesktop(test_argv[0]); +} Propchange: trunk/rostests/apitests/user32/desktop.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Sun Feb 19 23:46:06 2012 @@ -5,6 +5,7 @@ #define STANDALONE #include "wine/test.h" +extern void func_desktop(void); extern void func_InitializeLpkHooks(void); extern void func_RealGetWindowClass(void); extern void func_ScrollDC(void); @@ -30,6 +31,7 @@ { "GetIconInfo", func_GetIconInfo }, { "GetPeekMessage", func_GetPeekMessage }, { "DeferWindowPos", func_DeferWindowPos }, + { "desktop", func_desktop } , { "GetKeyState", func_GetKeyState }, { "SetCursorPos", func_SetCursorPos }, { "SetActiveWindow", func_SetActiveWindow }, Modified: trunk/rostests/apitests/user32/user32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap… ============================================================================== --- trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] Sun Feb 19 23:46:06 2012 @@ -11,6 +11,7 @@ <file>user32_apitest.rc</file> <file>helper.c</file> + <file>desktop.c</file> <file>GetKeyState.c</file> <file>InitializeLpkHooks.c</file> <file>RealGetWindowClass.c</file>

12 years, 7 months

[gadamopoulos] 55726: [win32k] - remove assertions from the process callout checking that ppiCurrent->rpdeskStartup and ppiCurrent->hdeskStartup are valid. This can happen in case we fail to open t...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 19 23:29:28 2012 New Revision: 55726 URL: http://svn.reactos.org/svn/reactos?rev=55726&view=rev Log: [win32k] - remove assertions from the process callout checking that ppiCurrent->rpdeskStartup and ppiCurrent->hdeskStartup are valid. This can happen in case we fail to open the initial desktop or window station Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sun Feb 19 23:29:28 2012 @@ -187,10 +187,10 @@ } /* Close the startup desktop */ - ASSERT(ppiCurrent->rpdeskStartup); - ASSERT(ppiCurrent->hdeskStartup); - ObDereferenceObject(ppiCurrent->rpdeskStartup); - ZwClose(ppiCurrent->hdeskStartup); + if(ppiCurrent->rpdeskStartup) + ObDereferenceObject(ppiCurrent->rpdeskStartup); + if(ppiCurrent->hdeskStartup) + ZwClose(ppiCurrent->hdeskStartup); /* Close the current window station */ UserSetProcessWindowStation(NULL);

12 years, 7 months

[cgutman] 55725: [USBEHCI] - Try to fix reset bugs in my code and remove hacks - Don't clear extra bits when acknowledging a port connect status change [USBOHCI] - Code cleanup - No functional change

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Feb 19 22:22:45 2012 New Revision: 55725 URL: http://svn.reactos.org/svn/reactos?rev=55725&view=rev Log: [USBEHCI] - Try to fix reset bugs in my code and remove hacks - Don't clear extra bits when acknowledging a port connect status change [USBOHCI] - Code cleanup - No functional change Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sun Feb 19 22:22:45 2012 @@ -124,7 +124,6 @@ BOOLEAN m_DoorBellRingInProgress; // door bell ring in progress WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback ULONG m_SyncFramePhysAddr; // periodic frame list physical address - BOOLEAN m_ResetInProgress[16]; // set when a reset is in progress BUS_INTERFACE_STANDARD m_BusInterface; // pci bus interface // read register @@ -957,6 +956,7 @@ return STATUS_UNSUCCESSFUL; PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); + // // check slow speed line before reset // @@ -977,37 +977,10 @@ EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex), PortStatus); // - // Wait for reset to start - // - KeStallExecutionProcessor(100); - - // - // Clear reset - // - PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); - PortStatus &= ~EHCI_PRT_RESET; - EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex), PortStatus); - - do - { - // - // wait - // - KeStallExecutionProcessor(100); - - // - // Check that the port reset - // - PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); - if (!(PortStatus & EHCI_PRT_RESET)) - break; - } while (TRUE); - - // - // delay is 10 ms - // - Timeout.QuadPart = 10; - DPRINT1("Waiting %d milliseconds for port to recover after reset\n", Timeout.LowPart); + // delay is 20 ms for port reset as per USB 2.0 spec + // + Timeout.QuadPart = 20; + DPRINT1("Waiting %d milliseconds for port reset\n", Timeout.LowPart); // // convert to 100 ns units (absolute) @@ -1018,37 +991,6 @@ // perform the wait // KeDelayExecutionThread(KernelMode, FALSE, &Timeout); - - // - // check slow speed line after reset - // - PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); - if (PortStatus & EHCI_PRT_SLOWSPEEDLINE) - { - DPRINT1("Non HighSpeed device. Releasing Ownership\n"); - EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex), EHCI_PRT_RELEASEOWNERSHIP); - return STATUS_DEVICE_NOT_CONNECTED; - } - - // - // this will be enabled now since we're high-speed - // - do - { - // - // wait - // - KeStallExecutionProcessor(100); - - // - // Check that the port is enabled - // - PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); - if (PortStatus & EHCI_PRT_ENABLED) - break; - } while (TRUE); - - DPRINT1("Port is back up after reset\n"); return STATUS_SUCCESS; } @@ -1110,18 +1052,17 @@ Status |= USB_PORT_STATUS_OVER_CURRENT; // In a reset state? - if ((Value & EHCI_PRT_RESET) || m_ResetInProgress[PortId]) + if (Value & EHCI_PRT_RESET) { Status |= USB_PORT_STATUS_RESET; Change |= USB_PORT_STATUS_RESET; } - // - // FIXME: Is the Change here correct? - // + // This indicates a connect or disconnect if (Value & EHCI_PRT_CONNECTSTATUSCHANGE) Change |= USB_PORT_STATUS_CONNECT; + // This is set to indicate a critical port error if (Value & EHCI_PRT_ENABLEDSTATUSCHANGE) Change |= USB_PORT_STATUS_ENABLE; @@ -1137,36 +1078,42 @@ ULONG Status) { ULONG Value; + LARGE_INTEGER Timeout; DPRINT("CUSBHardwareDevice::ClearPortStatus PortId %x Feature %x\n", PortId, Status); if (PortId > m_Capabilities.HCSParams.PortCount) return STATUS_UNSUCCESSFUL; - // - // reset status change bits - // - Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); - Value |= EHCI_PRT_CONNECTSTATUSCHANGE | EHCI_PRT_ENABLEDSTATUSCHANGE; - EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); - if (Status == C_PORT_RESET) { // - // update port status - // - m_ResetInProgress[PortId] = FALSE; - } - - if (Status == C_PORT_CONNECTION && (Value & EHCI_PRT_CONNECTED)) - { - LARGE_INTEGER Timeout; - - // - // delay is 100 ms - // - Timeout.QuadPart = 100; - DPRINT1("Waiting %d milliseconds for port to stabilize after connection\n", Timeout.LowPart); + // Clear reset + // + Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); + Value &= ~EHCI_PRT_RESET; + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); + + do + { + // + // wait + // + KeStallExecutionProcessor(100); + + // + // Check that the port reset + // + Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); + if (!(Value & EHCI_PRT_RESET)) + break; + } while (TRUE); + + // + // delay is 10 ms + // + Timeout.QuadPart = 10; + DPRINT1("Waiting %d milliseconds for port to recover after reset\n", Timeout.LowPart); // // convert to 100 ns units (absolute) @@ -1177,6 +1124,64 @@ // perform the wait // KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + + // + // check slow speed line after reset + // + Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); + if (Value & EHCI_PRT_SLOWSPEEDLINE) + { + DPRINT1("Non HighSpeed device. Releasing Ownership\n"); + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), EHCI_PRT_RELEASEOWNERSHIP); + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // this will be enabled now since we're high-speed + // + do + { + // + // wait + // + KeStallExecutionProcessor(100); + + // + // Check that the port is enabled + // + Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); + if (Value & EHCI_PRT_ENABLED) + break; + } while (TRUE); + + DPRINT1("Port is back up after reset\n"); + } + else if (Status == C_PORT_CONNECTION) + { + // + // reset status change bits + // + Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); + + if (Value & EHCI_PRT_CONNECTED) + { + // + // delay is 100 ms + // + Timeout.QuadPart = 100; + DPRINT1("Waiting %d milliseconds for port to stabilize after connection\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + } } return STATUS_SUCCESS; @@ -1207,12 +1212,10 @@ if (Feature == PORT_RESET) { + // + // call the helper + // ResetPort(PortId); - - // - // update cached settings - // - m_ResetInProgress[PortId] = TRUE; // // is there a status change callback Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sun Feb 19 22:22:45 2012 @@ -1138,7 +1138,13 @@ // connected if (Value & OHCI_RH_PORTSTATUS_CCS) + { *PortStatus |= USB_PORT_STATUS_CONNECT; + + // low speed device + if (Value & OHCI_RH_PORTSTATUS_LSDA) + *PortStatus |= USB_PORT_STATUS_LOW_SPEED; + } // did a device connect? if (Value & OHCI_RH_PORTSTATUS_CSC) @@ -1170,10 +1176,6 @@ // port reset ended (change bit only set at completion) if (Value & OHCI_RH_PORTSTATUS_PRSC) *PortChange |= USB_PORT_STATUS_RESET; - - // low speed device - if (Value & OHCI_RH_PORTSTATUS_LSDA) - *PortStatus |= USB_PORT_STATUS_LOW_SPEED; return STATUS_SUCCESS; } @@ -1352,7 +1354,7 @@ // wait a bit // KeStallExecutionProcessor(100); - }while(TRUE); + } while(TRUE); if (m_SCECallBack != NULL) {

12 years, 7 months

[gadamopoulos] 55724: [ntoskrnl] - Fix a crash in KiSystemCall that was caused because PsConvertToGuiThread may have switched to a large kernel stack, but still returned with failure because win32k...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 19 22:05:25 2012 New Revision: 55724 URL: http://svn.reactos.org/svn/reactos?rev=55724&view=rev Log: [ntoskrnl] - Fix a crash in KiSystemCall that was caused because PsConvertToGuiThread may have switched to a large kernel stack, but still returned with failure because win32k did not succeed. To fix it reload the trap frame after the call before checking for success. Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sun Feb 19 22:05:25 2012 @@ -1556,17 +1556,18 @@ /* Convert us to a GUI thread -- must wrap in ASM to get new EBP */ Result = KiConvertToGuiThread(); + + /* Reload trap frame and descriptor table pointer from new stack */ + TrapFrame = *(volatile PVOID*)&Thread->TrapFrame; + DescriptorTable = (PVOID)(*(volatile ULONG_PTR*)&Thread->ServiceTable + Offset); + if (!NT_SUCCESS(Result)) { /* Set the last error and fail */ //SetLastWin32Error(RtlNtStatusToDosError(Result)); goto ExitCall; } - - /* Reload trap frame and descriptor table pointer from new stack */ - TrapFrame = *(volatile PVOID*)&Thread->TrapFrame; - DescriptorTable = (PVOID)(*(volatile ULONG_PTR*)&Thread->ServiceTable + Offset); - + /* Validate the system call number again */ if (Id >= DescriptorTable->Limit) {

12 years, 7 months

[ion] 55723: sigh.

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 20:23:56 2012 New Revision: 55723 URL: http://svn.reactos.org/svn/reactos?rev=55723&view=rev Log: sigh. Modified: trunk/reactos/subsystems/win32/csrss/csrss.c Modified: trunk/reactos/subsystems/win32/csrss/csrss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.c [iso-8859-1] Sun Feb 19 20:23:56 2012 @@ -41,7 +41,7 @@ { KPRIORITY BasePriority = (8 + 1) + 4; NTSTATUS Status; - //ULONG Response; + ULONG Response; UNREFERENCED_PARAMETER(envp); UNREFERENCED_PARAMETER(DebugFlag);

12 years, 7 months

[ion] 55722: [CSRSRV]: Some misc cleanup of dead code. No functional change.

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 20:16:36 2012 New Revision: 55722 URL: http://svn.reactos.org/svn/reactos?rev=55722&view=rev Log: [CSRSRV]: Some misc cleanup of dead code. No functional change. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrss.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sun Feb 19 20:16:36 2012 @@ -839,34 +839,7 @@ Request->ClientId.UniqueProcess, Request->ClientId.UniqueThread); } -#if 0 - if (!NT_SUCCESS(Status)) return Status; - - Status = RtlCreateUserThread(NtCurrentProcess(), - NULL, - TRUE, - 0, - 0, - 0, - (PTHREAD_START_ROUTINE)ClientConnectionThread, - NULL, - & ServerThread, - &ClientId); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR: Unable to create server thread\n"); - return Status; - } - - CsrAddStaticServerThread(ServerThread, &ClientId, 0); - - NtResumeThread(ServerThread, NULL); - - NtClose(ServerThread); - - Status = STATUS_SUCCESS; - DPRINT("CSR: %s done\n", __FUNCTION__); -#endif + return Status; } @@ -1055,7 +1028,7 @@ DPRINT1("CSRSRV: FATAL ERROR. CsrThread is Idle while holding %lu critical sections\n", Teb->CountOfOwnedCriticalSections); DPRINT1("CSRSRV: Last Receive Message %lx ReplyMessage %lx\n", - &Request, Reply); + Request, Reply); DbgBreakPoint(); } Modified: trunk/reactos/subsystems/win32/csrss/csrss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.c [iso-8859-1] Sun Feb 19 20:16:36 2012 @@ -60,14 +60,12 @@ { /* Raise a hard error */ DPRINT1("CSRSS: Could not raise IOPL: %x\n", Status); - #if 0 Status = NtRaiseHardError(STATUS_IO_PRIVILEGE_FAILED, 0, 0, NULL, OptionOk, &Response); - #endif } /* Initialize CSR through CSRSRV */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sun Feb 19 20:16:36 2012 @@ -326,12 +326,7 @@ NTSTATUS WINAPI -#if 1 Win32CsrInitialization(IN PCSR_SERVER_DLL ServerDll) -#else -Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions, - PCSRPLUGIN_SERVER_PROCS ServerProcs) -#endif { HANDLE ServerThread; CLIENT_ID ClientId; @@ -347,19 +342,12 @@ CsrInitConsoleSupport(); /* HACK */ -#if 1 ServerDll->DispatchTable = (PVOID)Win32CsrApiDefinitions; ServerDll->HighestApiSupported = 0xDEADBABE; ServerDll->HardErrorCallback = Win32CsrHardError; ServerDll->NewProcessCallback = Win32CsrDuplicateHandleTable; ServerDll->DisconnectCallback = Win32CsrReleaseConsole; -#else - *ApiDefinitions = Win32CsrApiDefinitions; - ServerProcs->HardErrorProc = Win32CsrHardError; - ServerProcs->ProcessInheritProc = Win32CsrDuplicateHandleTable; - ServerProcs->ProcessDeletedProc = Win32CsrReleaseConsole; -#endif RtlInitializeCriticalSection(&Win32CsrDefineDosDeviceCritSec); InitializeListHead(&DosDeviceHistory);

12 years, 7 months

[ion] 55721: [CSRSRV]: Heh, fix a bug, which I think caused the crash in CSRSS during other process' crashes.

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 20:13:07 2012 New Revision: 55721 URL: http://svn.reactos.org/svn/reactos?rev=55721&view=rev Log: [CSRSRV]: Heh, fix a bug, which I think caused the crash in CSRSS during other process' crashes. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sun Feb 19 20:13:07 2012 @@ -1251,11 +1251,11 @@ CsrDestroyProcess(&Request->Header.ClientId, STATUS_ABANDONED); /* Return a Debug Message */ - DebugMessage = (PDBGKM_MSG)&Request; + DebugMessage = (PDBGKM_MSG)Request; DebugMessage->ReturnedStatus = DBG_CONTINUE; Reply = Request; ReplyPort = CsrApiPort; - + /* Remove our extra reference */ CsrDereferenceThread(CsrThread); }

12 years, 7 months

[ion] 55720: [CSRSRV/KERNEL32]: Close the last big architectural known issue: we were not notifying CSRSRV of server threads within server-to-server situations. Port and fix CsrCreateRemoteThread f...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 20:09:49 2012 New Revision: 55720 URL: http://svn.reactos.org/svn/reactos?rev=55720&view=rev Log: [CSRSRV/KERNEL32]: Close the last big architectural known issue: we were not notifying CSRSRV of server threads within server-to-server situations. Port and fix CsrCreateRemoteThread from CSRSRV2, and call it from Kernel32 now when running inside the server itself. Also fix BaseProcessStart not to exit the whole process during an exception. At this point, other issues are unknown regressions. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/client/thread.c trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Feb 19 20:09:49 2012 @@ -459,8 +459,6 @@ WINAPI BaseProcessStartup(PPROCESS_START_ROUTINE lpStartAddress) { - UINT uExitCode = 0; - DPRINT("BaseProcessStartup(..) - setting up exception frame.\n"); _SEH2_TRY @@ -472,17 +470,23 @@ sizeof(PPROCESS_START_ROUTINE)); /* Call the Start Routine */ - uExitCode = (lpStartAddress)(); + ExitThread(lpStartAddress()); } _SEH2_EXCEPT(BaseExceptionFilter(_SEH2_GetExceptionInformation())) { - /* Get the SEH Error */ - uExitCode = _SEH2_GetExceptionCode(); + /* Get the Exit code from the SEH Handler */ + if (!BaseRunningInServerProcess) + { + /* Kill the whole process, usually */ + ExitProcess(_SEH2_GetExceptionCode()); + } + else + { + /* If running inside CSRSS, kill just this thread */ + ExitThread(_SEH2_GetExceptionCode()); + } } _SEH2_END; - - /* Exit the Process with our error */ - ExitProcess(uExitCode); } NTSTATUS Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Sun Feb 19 20:09:49 2012 @@ -18,6 +18,8 @@ /* FIXME: NDK */ #define HIGH_PRIORITY 31 #define SXS_SUPPORT_FIXME + +typedef NTSTATUS (NTAPI *PCSR_CREATE_REMOTE_THREAD)(IN HANDLE ThreadHandle, IN PCLIENT_ID ClientId); NTSTATUS WINAPI @@ -239,7 +241,29 @@ } /* Notify CSR */ - Status = BasepNotifyCsrOfThread(hThread, &ClientId); + if (!BaseRunningInServerProcess) + { + Status = BasepNotifyCsrOfThread(hThread, &ClientId); + } + else + { + DPRINT("Server thread in Server. Handle: %lx\n", hProcess); + if (hProcess != NtCurrentProcess()) + { + PCSR_CREATE_REMOTE_THREAD CsrCreateRemoteThread; + + /* Get the direct CSRSRV export */ + CsrCreateRemoteThread = (PCSR_CREATE_REMOTE_THREAD) + GetProcAddress(GetModuleHandleA("csrsrv"), + "CsrCreateRemoteThread"); + if (CsrCreateRemoteThread) + { + /* Call it instead of going through LPC */ + Status = CsrCreateRemoteThread(hThread, &ClientId); + } + } + } + if (!NT_SUCCESS(Status)) { ASSERT(FALSE); Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec [iso-8859-1] Sun Feb 19 20:09:49 2012 @@ -2,7 +2,7 @@ @ stdcall CsrCallServerFromServer(ptr ptr) ;@ stdcall CsrConnectToUser() ;@ stdcall CsrCreateProcess(ptr ptr ptr ptr long ptr) -;@ stdcall CsrCreateRemoteThread(ptr ptr) +@ stdcall CsrCreateRemoteThread(ptr ptr) @ stdcall CsrCreateThread(ptr ptr ptr) ;@ stdcall CsrCreateWait(ptr ptr ptr ptr ptr ptr) ;@ stdcall CsrDebugProcess(ptr) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] Sun Feb 19 20:09:49 2012 @@ -281,6 +281,107 @@ CsrThread->Flags |= CsrThreadInTermination; } +/*++ + * @name CsrCreateRemoteThread + * @implemented NT4 + * + * The CsrCreateRemoteThread routine creates a CSR Thread object for + * an NT Thread which is not part of the current NT Process. + * + * @param hThread + * Handle to an existing NT Thread to which to associate this + * CSR Thread. + * + * @param ClientId + * Pointer to the Client ID structure of the NT Thread to associate + * with this CSR Thread. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * othwerwise. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrCreateRemoteThread(IN HANDLE hThread, + IN PCLIENT_ID ClientId) +{ + NTSTATUS Status; + HANDLE ThreadHandle; + PCSR_THREAD CsrThread; + PCSR_PROCESS CsrProcess; + KERNEL_USER_TIMES KernelTimes; + DPRINT("CSRSRV: %s called\n", __FUNCTION__); + + /* Get the Thread Create Time */ + Status = NtQueryInformationThread(hThread, + ThreadTimes, + &KernelTimes, + sizeof(KernelTimes), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to query thread times: %lx\n", Status); + return Status; + } + + /* Lock the Owner Process */ + Status = CsrLockProcessByClientId(&ClientId->UniqueProcess, &CsrProcess); + if (!NT_SUCCESS(Status)) + { + DPRINT1("No known process for %lx\n", ClientId->UniqueProcess); + return Status; + } + + /* Make sure the thread didn't terminate */ + if (KernelTimes.ExitTime.QuadPart) + { + /* Unlock the process and return */ + CsrUnlockProcess(CsrProcess); + DPRINT1("Dead thread: %I64x\n", KernelTimes.ExitTime.QuadPart); + return STATUS_THREAD_IS_TERMINATING; + } + + /* Allocate a CSR Thread Structure */ + CsrThread = CsrAllocateThread(CsrProcess); + if (!CsrThread) + { + DPRINT1("CSRSRV:%s: out of memory!\n", __FUNCTION__); + CsrUnlockProcess(CsrProcess); + return STATUS_NO_MEMORY; + } + + /* Duplicate the Thread Handle */ + Status = NtDuplicateObject(NtCurrentProcess(), + hThread, + NtCurrentProcess(), + &ThreadHandle, + 0, + 0, + DUPLICATE_SAME_ACCESS); + /* Allow failure */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("Thread duplication failed: %lx\n", Status); + ThreadHandle = hThread; + } + + /* Save the data we have */ + CsrThread->CreateTime = KernelTimes.CreateTime; + CsrThread->ClientId = *ClientId; + CsrThread->ThreadHandle = ThreadHandle; + ProtectHandle(ThreadHandle); + CsrThread->Flags = 0; + + /* Insert the Thread into the Process */ + CsrInsertThread(CsrProcess, CsrThread); + + /* Release the lock and return */ + CsrUnlockProcess(CsrProcess); + return STATUS_SUCCESS; +} + VOID NTAPI CsrThreadRefcountZero(IN PCSR_THREAD CsrThread)

12 years, 7 months

[ion] 55719: [NTOSKRNL]: The ExitTime in ETHREAD is unionized and only valid if the thread actually exited, so don't always return the raw value -- return 0 if the thread is still alive. Fixes code...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 20:08:11 2012 New Revision: 55719 URL: http://svn.reactos.org/svn/reactos?rev=55719&view=rev Log: [NTOSKRNL]: The ExitTime in ETHREAD is unionized and only valid if the thread actually exited, so don't always return the raw value -- return 0 if the thread is still alive. Fixes code which uses ExitTime != 0 to tell if a thread is still alive or not -- everyone always thought all ReactOS threads are always dead. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sun Feb 19 20:08:11 2012 @@ -2279,12 +2279,19 @@ _SEH2_TRY { /* Copy time information from ETHREAD/KTHREAD */ - ThreadTime->KernelTime.QuadPart = Thread->Tcb.KernelTime * - 100000LL; - ThreadTime->UserTime.QuadPart = Thread->Tcb.UserTime * - 100000LL; + ThreadTime->KernelTime.QuadPart = Thread->Tcb.KernelTime * KeMaximumIncrement; + ThreadTime->UserTime.QuadPart = Thread->Tcb.UserTime * KeMaximumIncrement; ThreadTime->CreateTime = Thread->CreateTime; - ThreadTime->ExitTime = Thread->ExitTime; + + /* Exit time is in a union and only valid on actual exit! */ + if (KeReadStateThread(&Thread->Tcb)) + { + ThreadTime->ExitTime = Thread->ExitTime; + } + else + { + ThreadTime->ExitTime.QuadPart = 0; + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

12 years, 7 months

[ion] 55718: [CSRSRV]: Sometimes too much of a hybrid is no longer a good thing. Rewrite the CSRSRV API loop to match (almost -- except the actual API conversion which is different in ReactOS) the ...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 19:40:28 2012 New Revision: 55718 URL: http://svn.reactos.org/svn/reactos?rev=55718&view=rev Log: [CSRSRV]: Sometimes too much of a hybrid is no longer a good thing. Rewrite the CSRSRV API loop to match (almost -- except the actual API conversion which is different in ReactOS) the CSRSRV2 loop, with the correct handling of datagrams, errors, exceptions, death messages, etc... [CSRSRV]: Add special handling for certain messages (similar to how "Reply" is used in CSRSRV2) so that we don't keep replying to the wrong thead. For example, during an ExitProcess, special handling is needed at the end of the loop. [CSRSRV]: Remove the last few remaining legacy process management function and use the correct CsrLock/Unlock APIs instead. No longer leak references for every process like crazy. Fully manage proc/thread/session reference counts now. At this point it looks like there might just be one issue left before this thing works right (minus potential regressions due to missed hacks). Modified: trunk/reactos/subsystems/csr/csrsrv/api.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrss/include/api.h Modified: trunk/reactos/subsystems/csr/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/api.… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/api.c [iso-8859-1] Sun Feb 19 19:40:28 2012 @@ -446,7 +446,7 @@ continue; } - /* It's some other kind of request. Get the lock for the lookup*/ + /* It's some other kind of request. Get the lock for the lookup */ CsrAcquireProcessLock(); /* Now do the lookup to get the CSR_THREAD */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Sun Feb 19 19:40:28 2012 @@ -18,66 +18,6 @@ /* GLOBALS *******************************************************************/ /* FUNCTIONS *****************************************************************/ - -PCSR_PROCESS WINAPI CsrGetProcessData(HANDLE ProcessId) -{ - PCSR_PROCESS CsrProcess; - NTSTATUS Status; - - Status = CsrLockProcessByClientId(ProcessId, &CsrProcess); - if (!NT_SUCCESS(Status)) return NULL; - - UNLOCK; - return CsrProcess; -} - -NTSTATUS WINAPI CsrFreeProcessData(HANDLE Pid) -{ - PCSR_PROCESS pProcessData; - HANDLE Process; - PLIST_ENTRY NextEntry; - PCSR_THREAD Thread; - - pProcessData = CsrGetProcessData(Pid); - if (!pProcessData) return STATUS_INVALID_PARAMETER; - - LOCK; - - Process = pProcessData->ProcessHandle; - - /* Dereference all process threads */ - NextEntry = pProcessData->ThreadList.Flink; - while (NextEntry != &pProcessData->ThreadList) - { - Thread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); - NextEntry = NextEntry->Flink; - - ASSERT(ProcessStructureListLocked()); - CsrThreadRefcountZero(Thread); - LOCK; - } - - if (pProcessData->ClientViewBase) - { - NtUnmapViewOfSection(NtCurrentProcess(), (PVOID)pProcessData->ClientViewBase); - } - - if (pProcessData->ClientPort) - { - NtClose(pProcessData->ClientPort); - } - - CsrRemoveProcess(pProcessData); - - CsrDeallocateProcess(pProcessData); - - if (Process) - { - NtClose(Process); - } - - return STATUS_SUCCESS; -} /********************************************************************** * CSRSS API @@ -202,8 +142,14 @@ /* Get the current CSR thread */ CurrentThread = NtCurrentTeb()->CsrClientThread; - if (!CurrentThread) return STATUS_SUCCESS; // server-to-server - + if (!CurrentThread) + { + DPRINT1("Server Thread TID: [%lx.%lx]\n", + Request->Data.CreateThreadRequest.ClientId.UniqueProcess, + Request->Data.CreateThreadRequest.ClientId.UniqueThread); + return STATUS_SUCCESS; // server-to-server + } + /* Get the CSR Process for this request */ CsrProcess = CurrentThread->Process; if (CsrProcess->ClientId.UniqueProcess != @@ -215,7 +161,7 @@ /* Accept this without any further work */ return STATUS_SUCCESS; } - + /* Get the real CSR Process for the remote thread's process */ Status = CsrLockProcessByClientId(Request->Data.CreateThreadRequest.ClientId.UniqueProcess, &CsrProcess); @@ -247,7 +193,10 @@ { PCSR_THREAD CsrThread = NtCurrentTeb()->CsrClientThread; ASSERT(CsrThread != NULL); - + + /* Set magic flag so we don't reply this message back */ + Request->Type = 0xBABE; + /* Remove the CSR_THREADs and CSR_PROCESS */ return CsrDestroyProcess(&CsrThread->ClientId, (NTSTATUS)Request->Data.TerminateProcessRequest.uExitCode); Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sun Feb 19 19:40:28 2012 @@ -208,16 +208,16 @@ return STATUS_SUCCESS; #else // Hacky reactos code PCSR_PROCESS ProcessData; - + /* Get the Process Data */ - ProcessData = CsrGetProcessData(ReceiveMsg->Header.ClientId.UniqueProcess); + CsrLockProcessByClientId(&ReceiveMsg->Header.ClientId.UniqueProcess, &ProcessData); if (!ProcessData) { DPRINT1("Message: Unable to find data for process 0x%x\n", ReceiveMsg->Header.ClientId.UniqueProcess); return STATUS_NOT_SUPPORTED; } - + /* Validation complete, start SEH */ _SEH2_TRY { @@ -230,6 +230,9 @@ ReplyMsg->Status = STATUS_ACCESS_VIOLATION; } _SEH2_END; + + /* Release the process reference */ + CsrUnlockProcess(ProcessData); /* Return success */ return STATUS_SUCCESS; @@ -759,15 +762,12 @@ /* Save the process ID */ RtlZeroMemory(ConnectInfo, sizeof(CSR_CONNECTION_INFO)); - ProcessData = CsrGetProcessData(Request->ClientId.UniqueProcess); + CsrLockProcessByClientId(Request->ClientId.UniqueProcess, &ProcessData); if (!ProcessData) { DPRINT1("CSRSRV: Unknown process: %lx. Will be rejecting connection\n", Request->ClientId.UniqueProcess); } - - /* Acquire the Process Lock */ - CsrAcquireProcessLock(); if ((ProcessData) && (ProcessData != CsrRootProcess)) { @@ -788,8 +788,8 @@ AllowConnection = TRUE; } - /* Release the lock */ - CsrReleaseProcessLock(); + /* Release the process */ + if (ProcessData) CsrUnlockProcess(ProcessData); /* Setup the Port View Structure */ RemotePortView.Length = sizeof(REMOTE_PORT_VIEW); @@ -1004,12 +1004,13 @@ BYTE RawRequest[LPC_MAX_DATA_LENGTH]; PCSR_API_MESSAGE Request = (PCSR_API_MESSAGE)RawRequest; PCSR_API_MESSAGE Reply; - PCSR_PROCESS ProcessData; - PCSR_THREAD ServerThread; + PCSR_PROCESS CsrProcess; + PCSR_THREAD ServerThread, CsrThread; ULONG MessageType; HANDLE ReplyPort; PDBGKM_MSG DebugMessage; - + PHARDERROR_MSG HardErrorMsg; + PCLIENT_DIED_MSG ClientDiedMsg; DPRINT("CSR: %s called\n", __FUNCTION__); /* Setup LPC loop port and message */ @@ -1099,145 +1100,240 @@ /* Get the Message Type */ MessageType = Request->Header.u2.s2.Type; - - /* If the connection was closed, handle that */ - if (MessageType == LPC_PORT_CLOSED) - { - DPRINT("Port died, oh well\n"); - CsrFreeProcessData( Request->Header.ClientId.UniqueProcess ); - Reply = NULL; - ReplyPort = CsrApiPort; - continue; - } - + + /* Handle connection requests */ if (MessageType == LPC_CONNECTION_REQUEST) { + /* Handle the Connection Request */ DPRINT("Accepting new connection\n"); CsrpHandleConnectionRequest((PPORT_MESSAGE)Request); Reply = NULL; ReplyPort = CsrApiPort; continue; } - - if (MessageType == LPC_CLIENT_DIED) - { - DPRINT("Client died, oh well\n"); - Reply = NULL; - ReplyPort = CsrApiPort; + + /* It's some other kind of request. Get the lock for the lookup */ + CsrAcquireProcessLock(); + + /* Now do the lookup to get the CSR_THREAD */ + CsrThread = CsrLocateThreadByClientId(&CsrProcess, + &Request->Header.ClientId); + + /* Did we find a thread? */ + if (!CsrThread) + { + /* This wasn't a CSR Thread, release lock */ + CsrReleaseProcessLock(); + + /* If this was an exception, handle it */ + if (MessageType == LPC_EXCEPTION) + { + DPRINT1("Exception from unknown thread, just continue\n"); + Reply = Request; + ReplyPort = CsrApiPort; + Reply->Status = DBG_CONTINUE; + } + else if (MessageType == LPC_PORT_CLOSED || + MessageType == LPC_CLIENT_DIED) + { + /* The Client or Port are gone, loop again */ + DPRINT1("Death from unknown thread, just continue\n"); + Reply = NULL; + ReplyPort = CsrApiPort; + } + else if (MessageType == LPC_ERROR_EVENT) + { + /* If it's a hard error, handle this too */ + DPRINT1("Hard error from unknown thread, call handlers\n"); +HandleHardError: + HardErrorMsg = (PHARDERROR_MSG)Request; + + /* Default it to unhandled */ + HardErrorMsg->Response = ResponseNotHandled; + + /* Check if there are free api threads */ + CsrpCheckRequestThreads(); + if (CsrpStaticThreadCount) + { + CsrHandleHardError(CsrThread, (PHARDERROR_MSG)Request); + } + + /* If the response was 0xFFFFFFFF, we'll ignore it */ + if (HardErrorMsg->Response == 0xFFFFFFFF) + { + Reply = NULL; + ReplyPort = CsrApiPort; + } + else + { + if (CsrThread) CsrDereferenceThread(CsrThread); + Reply = Request; + ReplyPort = CsrApiPort; + } + } + else if (MessageType == LPC_REQUEST) + { + /* This is an API Message coming from a non-CSR Thread */ + DPRINT1("No thread found for request %lx and clientID %lx.%lx\n", + Request->Type & 0xFFFF, + Request->Header.ClientId.UniqueProcess, + Request->Header.ClientId.UniqueThread); + Reply = Request; + ReplyPort = CsrApiPort; + Reply->Status = STATUS_ILLEGAL_FUNCTION; + } + else if (MessageType == LPC_DATAGRAM) + { + DPRINT1("Kernel datagram: not yet supported\n"); + Reply = NULL; + ReplyPort = CsrApiPort; + } + else + { + /* Some other ignored message type */ + Reply = NULL; + ReplyPort = CsrApiPort; + } + + /* Keep going */ continue; } - + + /* We have a valid thread, was this an LPC Request? */ + if (MessageType != LPC_REQUEST) + { + /* It's not an API, check if the client died */ + if (MessageType == LPC_CLIENT_DIED) + { + /* Get the information and check if it matches our thread */ + ClientDiedMsg = (PCLIENT_DIED_MSG)Request; + if (ClientDiedMsg->CreateTime.QuadPart == CsrThread->CreateTime.QuadPart) + { + /* Reference the thread */ + CsrLockedReferenceThread(CsrThread); + + /* Destroy the thread in the API Message */ + CsrDestroyThread(&Request->Header.ClientId); + + /* Check if the thread was actually ourselves */ + if (CsrProcess->ThreadCount == 1) + { + /* Kill the process manually here */ + DPRINT1("Last thread\n"); + CsrDestroyProcess(&CsrThread->ClientId, 0); + } + + /* Remove our extra reference */ + CsrLockedDereferenceThread(CsrThread); + } + + /* Release the lock and keep looping */ + CsrReleaseProcessLock(); + Reply = NULL; + ReplyPort = CsrApiPort; + continue; + } + + /* Reference the thread and release the lock */ + CsrLockedReferenceThread(CsrThread); + CsrReleaseProcessLock(); + + /* If this was an exception, handle it */ + if (MessageType == LPC_EXCEPTION) + { + /* Kill the process */ + DPRINT1("Exception in %lx.%lx. Killing...\n", + Request->Header.ClientId.UniqueProcess, + Request->Header.ClientId.UniqueThread); + NtTerminateProcess(CsrProcess->ProcessHandle, STATUS_ABANDONED); + + /* Destroy it from CSR */ + CsrDestroyProcess(&Request->Header.ClientId, STATUS_ABANDONED); + + /* Return a Debug Message */ + DebugMessage = (PDBGKM_MSG)&Request; + DebugMessage->ReturnedStatus = DBG_CONTINUE; + Reply = Request; + ReplyPort = CsrApiPort; + + /* Remove our extra reference */ + CsrDereferenceThread(CsrThread); + } + else if (MessageType == LPC_ERROR_EVENT) + { + DPRINT1("Hard error from known CSR thread... handling\n"); + goto HandleHardError; + } + else + { + /* Something else */ + DPRINT1("Unhandled message type: %lx\n", MessageType); + CsrDereferenceThread(CsrThread); + Reply = NULL; + } + + /* Keep looping */ + continue; + } + + /* We got an API Request */ + CsrLockedReferenceThread(CsrThread); + CsrReleaseProcessLock(); + + /* Assume success */ + Reply = Request; + Request->Status = STATUS_SUCCESS; + + /* Now we reply to a particular client */ + ReplyPort = CsrThread->Process->ClientPort; + DPRINT("CSR: Got CSR API: %x [Message Origin: %x]\n", Request->Type, Request->Header.ClientId.UniqueThread); - /* Get the Process Data */ - ProcessData = CsrGetProcessData(Request->Header.ClientId.UniqueProcess); - if (ProcessData == NULL) - { - DPRINT1("Message %d: Unable to find data for process 0x%x\n", - MessageType, - Request->Header.ClientId.UniqueProcess); + /* Validation complete, start SEH */ + _SEH2_TRY + { + /* Make sure we have enough threads */ + CsrpCheckRequestThreads(); + + /* Set the client thread pointer */ + NtCurrentTeb()->CsrClientThread = CsrThread; + + /* Call the Handler */ + CsrApiCallHandler(CsrThread->Process, Request); + + /* Increase the static thread count */ + _InterlockedIncrement(&CsrpStaticThreadCount); + + /* Restore the server thread */ + NtCurrentTeb()->CsrClientThread = ServerThread; + + /* Check if this is a dead client now */ + if (Request->Type == 0xBABE) + { + /* Reply to the death message */ + NtReplyPort(ReplyPort, &Reply->Header); + + /* Reply back to the API port now */ + ReplyPort = CsrApiPort; + Reply = NULL; + + /* Drop the reference */ + CsrDereferenceThread(CsrThread); + } + else + { + /* Drop the reference */ + CsrDereferenceThread(CsrThread); + } + } + _SEH2_EXCEPT(CsrUnhandledExceptionFilter(_SEH2_GetExceptionInformation())) + { Reply = NULL; ReplyPort = CsrApiPort; - continue; - } - if (ProcessData->Flags & CsrProcessTerminated) - { - DPRINT1("Message %d: process %d already terminated\n", - Request->Type, Request->Header.ClientId.UniqueProcess); - Reply = NULL; - ReplyPort = CsrApiPort; - continue; - } - - /* If this was an exception, handle it */ - if (MessageType == LPC_EXCEPTION) - { - /* Kill the process */ - DPRINT1("Exception in %lx.%lx. Killing...\n", - Request->Header.ClientId.UniqueProcess, - Request->Header.ClientId.UniqueThread); - NtTerminateProcess(ProcessData->ProcessHandle, STATUS_ABANDONED); - - /* Destroy it from CSR */ - CsrDestroyProcess(&Request->Header.ClientId, STATUS_ABANDONED); - - /* Return a Debug Message */ - DebugMessage = (PDBGKM_MSG)&Request; - DebugMessage->ReturnedStatus = DBG_CONTINUE; - Reply = Request; - ReplyPort = CsrApiPort; - continue; - } - - /* Check if we got a hard error */ - if (MessageType == LPC_ERROR_EVENT) - { - /* Call the Handler */ - PCSR_THREAD Thread; - Thread = CsrLocateThreadByClientId(NULL, &Request->Header.ClientId); - CsrHandleHardError(Thread, (PHARDERROR_MSG)Request); - ReplyPort = CsrApiPort; - } - else - { - PCSR_THREAD Thread; - PCSR_PROCESS Process = NULL; - - /* Validation complete, start SEH */ - _SEH2_TRY - { - /* Make sure we have enough threads */ - CsrpCheckRequestThreads(); - - //DPRINT1("locate thread %lx/%lx\n", Request->Header.ClientId.UniqueProcess, Request->Header.ClientId.UniqueThread); - Thread = CsrLocateThreadByClientId(&Process, &Request->Header.ClientId); - if (!Thread) - { - DPRINT1("No thread found for request %lx and clientID %lx.%lx\n", - Request->Type & 0xFFFF, - Request->Header.ClientId.UniqueProcess, - Request->Header.ClientId.UniqueThread); - } - //DPRINT1("Thread found: %p %p\n", Thread, Process); - if (Thread) CsrLockedReferenceThread(Thread); - - if (Thread) NtCurrentTeb()->CsrClientThread = Thread; - - /* Now we reply to a particular client */ - if (Thread) - { - ReplyPort = Thread->Process->ClientPort; - ASSERT(Thread->Process == ProcessData); - } - else - { - ReplyPort = ProcessData->ClientPort; - } - - /* Call the Handler */ - CsrApiCallHandler(ProcessData, Request); - - /* Increase the static thread count */ - _InterlockedIncrement(&CsrpStaticThreadCount); - - if (Thread) - { - NtCurrentTeb()->CsrClientThread = ServerThread; - CsrDereferenceThread(Thread); - } - } - _SEH2_EXCEPT(CsrUnhandledExceptionFilter(_SEH2_GetExceptionInformation())) - { - Reply = NULL; - ReplyPort = CsrApiPort; - } - _SEH2_END; - } - - /* Send back the reply */ - Reply = Request; + } + _SEH2_END; } /* Close the port and exit the thread */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] Sun Feb 19 19:40:28 2012 @@ -413,7 +413,7 @@ if (CsrProcess->NtSession) { /* Dereference the Session */ - //CsrDereferenceNtSession(CsrProcess->NtSession, 0); + CsrDereferenceNtSession(CsrProcess->NtSession, 0); } /* Close the Client Port if there is one */ @@ -453,7 +453,7 @@ { /* Call the generic cleanup code */ DPRINT1("Should kill process: %p\n", CsrProcess); - //CsrProcessRefcountZero(CsrProcess); + CsrProcessRefcountZero(CsrProcess); CsrAcquireProcessLock(); } } 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Sun Feb 19 19:40:28 2012 @@ -360,9 +360,7 @@ typedef NTSTATUS (WINAPI *CSRSS_ENUM_PROCESS_PROC)(PCSR_PROCESS ProcessData, PVOID Context); NTSTATUS WINAPI CsrInitializeProcessStructure(VOID); -PCSR_PROCESS WINAPI CsrGetProcessData(HANDLE ProcessId); -PCSR_PROCESS WINAPI CsrCreateProcessData(HANDLE ProcessId); -NTSTATUS WINAPI CsrFreeProcessData( HANDLE Pid ); + NTSTATUS WINAPI CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context); PCSR_THREAD NTAPI CsrAddStaticServerThread(IN HANDLE hThread, IN PCLIENT_ID ClientId, IN ULONG ThreadFlags); PCSR_THREAD NTAPI CsrLocateThreadInProcess(IN PCSR_PROCESS CsrProcess OPTIONAL, IN PCLIENT_ID Cid); @@ -447,6 +445,11 @@ VOID NTAPI +CsrDereferenceNtSession(IN PCSR_NT_SESSION Session, +IN NTSTATUS ExitStatus); + +VOID +NTAPI CsrLockedDereferenceProcess(PCSR_PROCESS CsrProcess); VOID

12 years, 7 months

← Newer
1
...
19
20
21
22
23
24
25
...
58
Older →

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 February 2012