Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[sir_richard] 46048: [CSRSS]: Differentiate between first-try and second-try shutdown. In the first try, the console server should defer to the user/win32k server to attempt shutdown for a non-console app. However, if we end up with a second try because this did not happen, then the console server takes matters in its own hands and calls the CTRL-C handler (with some exceptions, such as system/service apps, or apps not belonging to the LUID).

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Mar 10 04:35:18 2010 New Revision: 46048 URL: http://svn.reactos.org/svn/reactos?rev=46048&view=rev Log: [CSRSS]: Differentiate between first-try and second-try shutdown. In the first try, the console server should defer to the user/win32k server to attempt shutdown for a non-console app. However, if we end up with a second try because this did not happen, then the console server takes matters in its own hands and calls the CTRL-C handler (with some exceptions, such as system/service apps, or apps not belonging to the LUID). Modified: trunk/reactos/subsystems/win32/csrss/api/process.c Modified: trunk/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] Wed Mar 10 04:35:18 2010 @@ -696,7 +696,7 @@ PLUID CallerLuid = RealContext[0]; PCSRSS_PROCESS_DATA CsrProcess = NULL; NTSTATUS Status = STATUS_UNSUCCESSFUL; - BOOLEAN FirstTry = TRUE; + BOOLEAN FirstTry; ULONG Result = 0; ULONG Hash; @@ -729,6 +729,7 @@ while (TRUE) { /* Find the next process to shutdown */ + FirstTry = TRUE; if (!(CsrProcess = FindProcessForShutdown(CallerLuid))) { /* Done, quit */ @@ -741,7 +742,7 @@ /* Release the lock, make the callback, and acquire it back */ DPRINT1("Found process: %lx\n", CsrProcess->ProcessId); CsrReleaseProcessLock(); - Result = (ULONG)EnumProc(CsrProcess, Context); + Result = (ULONG)EnumProc(CsrProcess, (PVOID)((ULONG_PTR)Context | FirstTry)); CsrAcquireProcessLock(); /* Check the result */ @@ -754,7 +755,7 @@ else if (Result == CsrShutdownNonCsrProcess) { /* A non-CSR process, the callback didn't touch it */ - continue; + //continue; } else if (Result == CsrShutdownCancelled) {

14 years, 10 months

[sir_richard] 46047: [KERNEL32]: As indicated by the comment, kernel32 should always connect to the console server, even for non-console apps (the latter will just basically ignore the request). This is needed to (at minimum) setup the Ctrl-C handler, as otherwise, only "true console" apps will have a handler, even though internally, all apps have such a handler. This is what CSRSS needs to call internally for shutting down non-GUI apps, for example. (The default CTRL-C handler will just call Ex

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Mar 10 04:32:17 2010 New Revision: 46047 URL: http://svn.reactos.org/svn/reactos?rev=46047&view=rev Log: [KERNEL32]: As indicated by the comment, kernel32 should always connect to the console server, even for non-console apps (the latter will just basically ignore the request). This is needed to (at minimum) setup the Ctrl-C handler, as otherwise, only "true console" apps will have a handler, even though internally, all apps have such a handler. This is what CSRSS needs to call internally for shutting down non-GUI apps, for example. (The default CTRL-C handler will just call ExitProcess). Modified: trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/dll/win32/kernel32/misc/dllmain.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Wed Mar 10 04:32:17 2010 @@ -39,6 +39,7 @@ WINAPI DefaultConsoleCtrlHandler(DWORD Event) { + DPRINT1("Default handler called: %lx\n", Event); switch(Event) { case CTRL_C_EVENT: @@ -75,7 +76,8 @@ DWORD nCode = CodeAndFlag & MAXLONG; UINT i; EXCEPTION_RECORD erException; - + + DPRINT1("Console Dispatcher Active: %lx %lx\n", CodeAndFlag, nCode); SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST); switch(nCode) @@ -152,6 +154,7 @@ (CodeAndFlag & MINLONG) && ((nCode == CTRL_LOGOFF_EVENT) || (nCode == CTRL_SHUTDOWN_EVENT))) { + DPRINT1("Skipping system/service apps\n"); break; } @@ -172,7 +175,6 @@ } RtlLeaveCriticalSection(&ConsoleLock); - ExitThread(nExitCode); } Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Wed Mar 10 04:32:17 2010 @@ -128,6 +128,7 @@ CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; + BOOLEAN NotConsole = FALSE; PRTL_USER_PROCESS_PARAMETERS Parameters = NtCurrentPeb()->ProcessParameters; WCHAR lpTest[MAX_PATH]; @@ -143,39 +144,41 @@ { DPRINT("Image is not a console application\n"); Parameters->ConsoleHandle = NULL; - return TRUE; - } - - /* Assume one is needed */ - Request.Data.AllocConsoleRequest.ConsoleNeeded = TRUE; - - /* Handle the special flags given to us by BasepInitializeEnvironment */ - if (Parameters->ConsoleHandle == HANDLE_DETACHED_PROCESS) - { - /* No console to create */ - DPRINT("No console to create\n"); - Parameters->ConsoleHandle = NULL; Request.Data.AllocConsoleRequest.ConsoleNeeded = FALSE; } - else if (Parameters->ConsoleHandle == HANDLE_CREATE_NEW_CONSOLE) - { - /* We'll get the real one soon */ - DPRINT("Creating new console\n"); - Parameters->ConsoleHandle = NULL; - } - else if (Parameters->ConsoleHandle == HANDLE_CREATE_NO_WINDOW) - { - /* We'll get the real one soon */ - DPRINT1("NOT SUPPORTED: HANDLE_CREATE_NO_WINDOW\n"); - Parameters->ConsoleHandle = NULL; - } else { - if (Parameters->ConsoleHandle == INVALID_HANDLE_VALUE) - { - Parameters->ConsoleHandle = 0; - } - DPRINT("Using existing console: %x\n", Parameters->ConsoleHandle); + /* Assume one is needed */ + Request.Data.AllocConsoleRequest.ConsoleNeeded = TRUE; + + /* Handle the special flags given to us by BasepInitializeEnvironment */ + if (Parameters->ConsoleHandle == HANDLE_DETACHED_PROCESS) + { + /* No console to create */ + DPRINT("No console to create\n"); + Parameters->ConsoleHandle = NULL; + Request.Data.AllocConsoleRequest.ConsoleNeeded = FALSE; + } + else if (Parameters->ConsoleHandle == HANDLE_CREATE_NEW_CONSOLE) + { + /* We'll get the real one soon */ + DPRINT("Creating new console\n"); + Parameters->ConsoleHandle = NULL; + } + else if (Parameters->ConsoleHandle == HANDLE_CREATE_NO_WINDOW) + { + /* We'll get the real one soon */ + DPRINT1("NOT SUPPORTED: HANDLE_CREATE_NO_WINDOW\n"); + Parameters->ConsoleHandle = NULL; + } + else + { + if (Parameters->ConsoleHandle == INVALID_HANDLE_VALUE) + { + Parameters->ConsoleHandle = 0; + } + DPRINT("Using existing console: %x\n", Parameters->ConsoleHandle); + } } /* Initialize Console Ctrl Handler */ @@ -185,7 +188,7 @@ NrCtrlHandlers = 1; CtrlHandlers = InitialHandler; CtrlHandlers[0] = DefaultConsoleCtrlHandler; - + /* Now use the proper console handle */ Request.Data.AllocConsoleRequest.Console = Parameters->ConsoleHandle; @@ -194,9 +197,6 @@ * but we don't have one yet, so we will instead simply send a create * console message to the Base Server. When we finally have a Console * Server, this code should be changed to send connection data instead. - * - * Also note that this connection should be made for any console app, even - * in the case above where -we- return. */ CsrRequest = MAKE_CSR_API(ALLOC_CONSOLE, CSR_CONSOLE); Request.Data.AllocConsoleRequest.CtrlDispatcher = ConsoleControlDispatcher; @@ -210,6 +210,8 @@ /* We're lying here, so at least the process can load... */ return TRUE; } + + if (NotConsole) return TRUE; /* We got the handles, let's set them */ if ((Parameters->ConsoleHandle = Request.Data.AllocConsoleRequest.Console))

14 years, 10 months

[tkreuzer] 46046: merge r46045

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 10 01:56:07 2010 New Revision: 46046 URL: http://svn.reactos.org/svn/reactos?rev=46046&view=rev Log: merge r46045 Modified: trunk/reactos/include/reactos/asm.h Modified: trunk/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/asm.h?rev=… ============================================================================== --- trunk/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/asm.h [iso-8859-1] Wed Mar 10 01:56:07 2010 @@ -6,7 +6,7 @@ * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ -#ifdef _MSC_VER +#ifdef _USE_ML /* Allow ".name" identifiers */ OPTION DOTNAME

14 years, 10 months

[tkreuzer] 46045: [ASM] Don't check for _MSC_VER to decide if the assembly source is going to be compiled with ML or AS, instead check for _USE_ML Fixes compiling .S files with AS, when using MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 10 01:31:06 2010 New Revision: 46045 URL: http://svn.reactos.org/svn/reactos?rev=46045&view=rev Log: [ASM] Don't check for _MSC_VER to decide if the assembly source is going to be compiled with ML or AS, instead check for _USE_ML Fixes compiling .S files with AS, when using MSVC Modified: branches/header-work/include/reactos/asm.h Modified: branches/header-work/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/asm… ============================================================================== --- branches/header-work/include/reactos/asm.h [iso-8859-1] (original) +++ branches/header-work/include/reactos/asm.h [iso-8859-1] Wed Mar 10 01:31:06 2010 @@ -6,7 +6,7 @@ * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ -#ifdef _MSC_VER +#ifdef _USE_ML /* Allow ".name" identifiers */ OPTION DOTNAME

14 years, 10 months

[hpoussin] 46044: Link SCSI miniport drivers only to scsiport

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Mar 9 23:36:52 2010 New Revision: 46044 URL: http://svn.reactos.org/svn/reactos?rev=46044&view=rev Log: Link SCSI miniport drivers only to scsiport Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild trunk/reactos/drivers/storage/port/buslogic/BusLogic958.c trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild [iso-8859-1] Tue Mar 9 23:36:52 2010 @@ -3,8 +3,6 @@ <module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="atapi">.</include> - <library>ntoskrnl</library> - <library>hal</library> <library>scsiport</library> <file>atapi.c</file> <file>atapi.rc</file> Modified: trunk/reactos/drivers/storage/port/buslogic/BusLogic958.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslo… ============================================================================== --- trunk/reactos/drivers/storage/port/buslogic/BusLogic958.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/port/buslogic/BusLogic958.c [iso-8859-1] Tue Mar 9 23:36:52 2010 @@ -79,6 +79,40 @@ #include "BusLogic958.h" +int strcmp(const char* s1, const char* s2) +{ + while(*s1 == *s2) + { + if(*s1 == 0) return 0; + + s1 ++; + s2 ++; + } + + return *s1 - *s2; +} + +char * strcat(char * s, const char * append) +{ + char * save = s; + + for(; *s; ++s); + + while((*s++ = *append++)); + + return save; +} + +char * strcpy(char * to, const char * from) +{ + char *save = to; + + for (; (*to = *from); ++from, ++to); + + return save; +} + + ULONG NTAPI DriverEntry(IN PVOID DriverObject, Modified: trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslo… ============================================================================== --- trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild [iso-8859-1] Tue Mar 9 23:36:52 2010 @@ -3,8 +3,6 @@ <module name="buslogic" type="kernelmodedriver" installbase="system32/drivers" installname="buslogic.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="buslogic">.</include> - <library>ntoskrnl</library> - <library>hal</library> <library>scsiport</library> <file>BusLogic958.c</file> <file>BusLogic958.rc</file>

14 years, 10 months

[jimtabor] 46043: - [User32] sync spy to wine 1.1.40

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Mar 9 22:14:52 2010 New Revision: 46043 URL: http://svn.reactos.org/svn/reactos?rev=46043&view=rev Log: - [User32] sync spy to wine 1.1.40 Modified: trunk/reactos/dll/win32/user32/windows/spy.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/s… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] Tue Mar 9 22:14:52 2010 @@ -32,6 +32,24 @@ #define SPY_INDENT_UNIT 4 /* 4 spaces */ #define DEBUG_SPY 0 + +static const char * const ClassLongOffsetNames[] = +{ + "GCLP_MENUNAME", /* -8 */ + "GCLP_HBRBACKGROUND", /* -10 */ + "GCLP_HCURSOR", /* -12 */ + "GCLP_HICON", /* -14 */ + "GCLP_HMODULE", /* -16 */ + "GCL_CBWNDEXTRA", /* -18 */ + "GCL_CBCLSEXTRA", /* -20 */ + "?", + "GCLP_WNDPROC", /* -24 */ + "GCL_STYLE", /* -26 */ + "?", + "?", + "GCW_ATOM", /* -32 */ + "GCLP_HICONSM", /* -34 */ +}; static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = { @@ -208,7 +226,9 @@ "EM_GETLIMITTEXT", /* 0x00d5 */ "EM_POSFROMCHAR", /* 0x00d6 */ "EM_CHARFROMPOS", /* 0x00d7 */ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "EM_SETIMESTATUS", /* 0x00d8 */ + "EM_GETIMESTATUS", /* 0x00d9 */ + NULL, NULL, NULL, NULL, NULL, NULL, /* 0x00E0 - Win32 Scrollbars */ "SBM_SETPOS", /* 0x00e0 */ @@ -232,7 +252,9 @@ "BM_CLICK", /* 0x00f5 */ "BM_GETIMAGE", /* 0x00f6 */ "BM_SETIMAGE", /* 0x00f7 */ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, + "WM_INPUT_DEVICE_CHANGE", /* 0x00fe */ + "WM_INPUT", /* 0x00ff */ "WM_KEYDOWN", /* 0x0100 */ "WM_KEYUP", /* 0x0101 */ @@ -243,10 +265,10 @@ "WM_SYSCHAR", /* 0x0106 */ "WM_SYSDEADCHAR", /* 0x0107 */ "WM_KEYLAST", /* 0x0108 */ - NULL, - "WM_CONVERTREQUEST", - "WM_CONVERTRESULT", - "WM_INTERIM", + "WM_UNICHAR", /* 0x0109 */ + "WM_CONVERTREQUEST", /* 0x010a */ + "WM_CONVERTRESULT", /* 0x010b */ + "WM_INTERIM", /* 0x010c */ "WM_IME_STARTCOMPOSITION", /* 0x010d */ "WM_IME_ENDCOMPOSITION", /* 0x010e */ "WM_IME_COMPOSITION", /* 0x010f */ @@ -399,7 +421,9 @@ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0x01E0 */ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, + "MN_GETHMENU", /* 0x01E1 */ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0x01F0 */ @@ -420,7 +444,8 @@ "WM_XBUTTONDOWN", /* 0x020B */ "WM_XBUTTONUP", /* 0x020C */ "WM_XBUTTONDBLCLK", /* 0x020D */ - NULL, NULL, + "WM_MOUSEHWHEEL", /* 0x020E */ + NULL, "WM_PARENTNOTIFY", /* 0x0210 */ "WM_ENTERMENULOOP", /* 0x0211 */ @@ -561,22 +586,39 @@ "WM_HOTKEY", /* 0x0312 */ "WM_POPUPSYSTEMMENU", /* 0x0313 */ NULL, NULL, NULL, - "WM_PRINT", - "WM_PRINTCLIENT", + "WM_PRINT", /* 0x0317 */ + "WM_PRINTCLIENT", /* 0x0318 */ + "WM_APPCOMMAND", /* 0x0319 */ + "WM_THEMECHANGED", /* 0x031A */ + NULL, NULL, + "WM_CLIPBOARDUPDATE", /* 0x031D */ + "WM_DWMCOMPOSITIONCHANGED", /* 0x031E */ + "WM_DWMNCRENDERINGCHANGED", /* 0x031F */ + + "WM_DWMCOLORIZATIONCOLORCHANGED", /* 0x0320 */ + "WM_DWMWINDOWMAXIMIZEDCHANGE", /* 0x0321 */ + NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "WM_GETTITLEBARINFOEX", /* 0x033F */ /* 0x0340 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - - "WM_QUERYAFXWNDPROC", /* 0x0360 */ + /* 0x0350 */ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "WM_HANDHELDFIRST", /* 0x0358 */ + "WM_HANDHELDFIRST+1", /* 0x0359 */ + "WM_HANDHELDFIRST+2", /* 0x035A */ + "WM_HANDHELDFIRST+3", /* 0x035B */ + "WM_HANDHELDFIRST+4", /* 0x035C */ + "WM_HANDHELDFIRST+5", /* 0x035D */ + "WM_HANDHELDFIRST+6", /* 0x035E */ + "WM_HANDHELDLAST", /* 0x035F */ + + "WM_QUERYAFXWNDPROC", /* 0x0360 WM_AFXFIRST */ "WM_SIZEPARENT", /* 0x0361 */ "WM_SETMESSAGESTRING", /* 0x0362 */ "WM_IDLEUPDATECMDUI", /* 0x0363 */ @@ -603,7 +645,8 @@ "WM_OCC_LOADFROMSTREAM_EX", /* 0x037A */ "WM_OCC_LOADFROMSTORAGE_EX", /* 0x037B */ - NULL,NULL,NULL,NULL, + NULL,NULL,NULL, + "WM_AFXLAST", /* 0x037F */ "WM_PENWINFIRST", /* 0x0380 */ "WM_RCRESULT", /* 0x0381 */ @@ -678,7 +721,7 @@ }; -#define SPY_MAX_LVMMSGNUM 140 +#define SPY_MAX_LVMMSGNUM 182 static const char * const LVMMessageTypeNames[SPY_MAX_LVMMSGNUM + 1] = { "LVM_GETBKCOLOR", /* 1000 */ @@ -822,6 +865,49 @@ NULL, "LVM_SETBKIMAGEW", "LVM_GETBKIMAGEW" /* 0x108B */ + "LVM_SETSELECTEDCOLUMN", + "LVM_SETTILEWIDTH", + "LVM_SETVIEW", + "LVM_GETVIEW", + NULL, + "LVM_INSERTGROUP", + NULL, + "LVM_SETGROUPINFO", + NULL, + "LVM_GETGROUPINFO", + "LVM_REMOVEGROUP", + "LVM_MOVEGROUP", + NULL, + NULL, + "LVM_MOVEITEMTOGROUP", + "LVM_SETGROUPMETRICS", + "LVM_GETGROUPMETRICS", + "LVM_ENABLEGROUPVIEW", + "LVM_SORTGROUPS", + "LVM_INSERTGROUPSORTED", + "LVM_REMOVEALLGROUPS", + "LVM_HASGROUP", + "LVM_SETTILEVIEWINFO", + "LVM_GETTILEVIEWINFO", + "LVM_SETTILEINFO", + "LVM_GETTILEINFO", + "LVM_SETINSERTMARK", + "LVM_GETINSERTMARK", + "LVM_INSERTMARKHITTEST", + "LVM_GETINSERTMARKRECT", + "LVM_SETINSERTMARKCOLOR", + "LVM_GETINSERTMARKCOLOR", + NULL, + "LVM_SETINFOTIP", + "LVM_GETSELECTEDCOLUMN", + "LVM_ISGROUPVIEWENABLED", + "LVM_GETOUTLINECOLOR", + "LVM_SETOUTLINECOLOR", + NULL, + "LVM_CANCELEDITLABEL", + "LVM_MAPINDEXTOID", + "LVM_MAPIDTOINDEX", + "LVM_ISITEMVISIBLE" }; @@ -1026,7 +1112,7 @@ "CCM_SETNOTIFYWINDOW" }; -#define SPY_MAX_WINEMSGNUM 6 +#define SPY_MAX_WINEMSGNUM 9 static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = { "WM_WINE_DESTROYWINDOW", @@ -1035,6 +1121,9 @@ "WM_WINE_SETPARENT", "WM_WINE_SETWINDOWLONG", "WM_WINE_ENABLEWINDOW" + "WM_WINE_SETACTIVEWINDOW", + "WM_WINE_KEYBOARD_LL_HOOK", + "WM_WINE_MOUSE_LL_HOOK", }; /* Virtual key names */ @@ -1069,10 +1158,10 @@ NULL, /* 0x19 */ NULL, /* 0x1A */ "VK_ESCAPE", /* 0x1B */ - NULL, /* 0x1C */ - NULL, /* 0x1D */ - NULL, /* 0x1E */ - NULL, /* 0x1F */ + "VK_CONVERT", /* 0x1C */ + "VK_NONCONVERT", /* 0x1D */ + "VK_ACCEPT", /* 0x1E */ + "VK_MODECHANGE", /* 0x1F */ "VK_SPACE", /* 0x20 */ "VK_PRIOR", /* 0x21 */ "VK_NEXT", /* 0x22 */ @@ -1136,7 +1225,7 @@ "VK_RWIN", /* 0x5C */ "VK_APPS", /* 0x5D */ NULL, /* 0x5E */ - NULL, /* 0x5F */ + "VK_SLEEP", /* 0x5F */ "VK_NUMPAD0", /* 0x60 */ "VK_NUMPAD1", /* 0x61 */ "VK_NUMPAD2", /* 0x62 */ @@ -1187,11 +1276,11 @@ NULL, /* 0x8F */ "VK_NUMLOCK", /* 0x90 */ "VK_SCROLL", /* 0x91 */ - NULL, /* 0x92 */ - NULL, /* 0x93 */ - NULL, /* 0x94 */ - NULL, /* 0x95 */ - NULL, /* 0x96 */ + "VK_OEM_NEC_EQUAL", /* 0x92 aka. VK_OEM_FJ_JISHO */ + "VK_OEM_FJ_MASSHOU", /* 0x93 */ + "VK_OEM_FJ_TOUROKU", /* 0x94 */ + "VK_OEM_FJ_LOYA", /* 0x95 */ + "VK_OEM_FJ_ROYA", /* 0x96 */ NULL, /* 0x97 */ NULL, /* 0x98 */ NULL, /* 0x99 */ @@ -1207,24 +1296,24 @@ "VK_RCONTROL", /* 0xA3 */ "VK_LMENU", /* 0xA4 */ "VK_RMENU", /* 0xA5 */ - NULL, /* 0xA6 */ - NULL, /* 0xA7 */ - NULL, /* 0xA8 */ - NULL, /* 0xA9 */ - NULL, /* 0xAA */ - NULL, /* 0xAB */ - NULL, /* 0xAC */ - NULL, /* 0xAD */ - NULL, /* 0xAE */ - NULL, /* 0xAF */ - NULL, /* 0xB0 */ - NULL, /* 0xB1 */ - NULL, /* 0xB2 */ - NULL, /* 0xB3 */ - NULL, /* 0xB4 */ - NULL, /* 0xB5 */ - NULL, /* 0xB6 */ - NULL, /* 0xB7 */ + "VK_BROWSER_BACK", /* 0xA6 */ + "VK_BROWSER_FORWARD", /* 0xA7 */ + "VK_BROWSER_REFRESH", /* 0xA8 */ + "VK_BROWSER_STOP", /* 0xA9 */ + "VK_BROWSER_SEARCH", /* 0xAA */ + "VK_BROWSER_FAVORITES", /* 0xAB */ + "VK_BROWSER_HOME", /* 0xAC */ + "VK_VOLUME_MUTE", /* 0xAD */ + "VK_VOLUME_DOWN", /* 0xAE */ + "VK_VOLUME_UP", /* 0xAF */ + "VK_MEDIA_NEXT_TRACK", /* 0xB0 */ + "VK_MEDIA_PREV_TRACK", /* 0xB1 */ + "VK_MEDIA_STOP", /* 0xB2 */ + "VK_MEDIA_PLAY_PAUSE", /* 0xB3 */ + "VK_LAUNCH_MAIL", /* 0xB4 */ + "VK_LAUNCH_MEDIA_SELECT", /* 0xB5 */ + "VK_LAUNCH_APP1", /* 0xB6 */ + "VK_LAUNCH_APP2", /* 0xB7 */ NULL, /* 0xB8 */ NULL, /* 0xB9 */ "VK_OEM_1", /* 0xBA */ @@ -1272,7 +1361,7 @@ "VK_ICO_00", /* 0xE4 */ "VK_PROCESSKEY", /* 0xE5 */ NULL, /* 0xE6 */ - NULL, /* 0xE7 */ + "VK_PACKET", /* 0xE7 */ NULL, /* 0xE8 */ NULL, /* 0xE9 */ NULL, /* 0xEA */ @@ -1459,6 +1548,7 @@ USM(TB_SETLISTGAP ,0), USM(TB_GETIMAGELISTCOUNT ,0), USM(TB_GETIDEALSIZE ,0), + USM(TB_UNKWN464 ,0), {0,0,0} }; static const USER_MSG tooltips_array[] = { @@ -1999,6 +2089,23 @@ } /*********************************************************************** + * SPY_GetClassLongOffsetName + * + * Gets the name of a class long offset. + */ +const char *SPY_GetClassLongOffsetName( INT offset ) +{ + INT index; + if (offset < 0 && offset % 2 == 0 && ((index = -(offset + 8) / 2) < + sizeof(ClassLongOffsetNames) / sizeof(*ClassLongOffsetNames))) + { + return ClassLongOffsetNames[index]; + } + + return "?"; +} + +/*********************************************************************** * SPY_GetClassName * * Sets the value of "wnd_class" member of the instance structure. @@ -2349,6 +2456,23 @@ TRACE("itemData=0x%08lx\n", lpmis->itemData); } break; + case WM_NCCREATE: + case WM_CREATE: + { + BOOL unicode; + CREATESTRUCTA *cs; + + if (!enter) break; + + unicode = IsWindowUnicode(sp_e->msg_hwnd); + cs = (CREATESTRUCTA *)sp_e->lParam; + TRACE("%s %s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", + unicode ? debugstr_w((LPCWSTR)cs->lpszName) : debugstr_a(cs->lpszName), + unicode ? debugstr_w((LPCWSTR)cs->lpszClass) : debugstr_a(cs->lpszClass), + cs->dwExStyle, cs->style, cs->x, cs->y, cs->cx, cs->cy, + cs->hwndParent, cs->hMenu, cs->hInstance, cs->lpCreateParams); + break; + } case WM_SIZE: if (!enter) break; TRACE("cx=%d cy=%d\n", LOWORD(sp_e->lParam), HIWORD(sp_e->lParam)); @@ -2445,20 +2569,12 @@ /* each SPY_SENDMESSAGE must be complemented by call to SPY_ExitMessage */ switch(iFlag) { -#ifndef __REACTOS__ - case SPY_DISPATCHMESSAGE16: - TRACE("%*s(%04x) %-16s message [%04x] %s dispatched wp=%04lx lp=%08lx\n", - indent, "", HWND_16(hWnd), - debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, wParam, lParam); - break; -#endif case SPY_DISPATCHMESSAGE: TRACE("%*s(%p) %-16s message [%04x] %s dispatched wp=%08lx lp=%08lx\n", indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, wParam, lParam); break; -// case SPY_SENDMESSAGE16: case SPY_SENDMESSAGE: { char taskName[20]; @@ -2466,28 +2582,13 @@ if (tid == GetCurrentThreadId()) strcpy( taskName, "self" ); else sprintf( taskName, "tid %04lx", GetCurrentThreadId() ); -#ifndef __REACTOS__ - if (iFlag == SPY_SENDMESSAGE16) - TRACE("%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04lx lp=%08lx\n", - indent, "", HWND_16(hWnd), debugstr_w(sp_e.wnd_name), msg, - sp_e.msg_name, taskName, wParam, lParam ); - else -#endif - { TRACE("%*s(%p) %-16s message [%04x] %s sent from %s wp=%08lx lp=%08lx\n", + + TRACE("%*s(%p) %-16s message [%04x] %s sent from %s wp=%08lx lp=%08lx\n", indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, taskName, wParam, lParam ); SPY_DumpStructure(&sp_e, TRUE); - } } break; - -#ifndef __REACTOS__ - case SPY_DEFWNDPROC16: - if( SPY_ExcludeDWP ) return; - TRACE("%*s(%04x) DefWindowProc16: %s [%04x] wp=%04lx lp=%08lx\n", - indent, "", HWND_16(hWnd), sp_e.msg_name, msg, wParam, lParam ); - break; -#endif case SPY_DEFWNDPROC: if( SPY_ExcludeDWP ) return; @@ -2508,6 +2609,7 @@ { SPY_INSTANCE sp_e; int indent; + DWORD save_error = GetLastError(); if (!TRACE_ON(message) || SPY_EXCLUDE(msg) || (SPY_ExcludeDWP && (/*iFlag == SPY_RESULT_DEFWND16 || */iFlag == SPY_RESULT_DEFWND)) ) @@ -2528,25 +2630,10 @@ switch(iFlag) { -#ifndef __REACTOS__ - case SPY_RESULT_DEFWND16: - TRACE(" %*s(%04x) DefWindowProc16: %s [%04x] returned %08lx\n", - indent, "", HWND_16(hWnd), sp_e.msg_name, msg, lReturn ); - break; -#endif - case SPY_RESULT_DEFWND: TRACE(" %*s(%p) DefWindowProc32: %s [%04x] returned %08lx\n", indent, "", hWnd, sp_e.msg_name, msg, lReturn ); break; - -#ifndef __REACTOS__ - case SPY_RESULT_OK16: - TRACE(" %*s(%04x) %-16s message [%04x] %s returned %08lx\n", - indent, "", HWND_16(hWnd), debugstr_w(sp_e.wnd_name), msg, - sp_e.msg_name, lReturn ); - break; -#endif case SPY_RESULT_OK: TRACE(" %*s(%p) %-16s message [%04x] %s returned %08lx\n", @@ -2554,20 +2641,8 @@ sp_e.msg_name, lReturn ); SPY_DumpStructure(&sp_e, FALSE); break; - -#ifndef __REACTOS__ - case SPY_RESULT_INVALIDHWND16: - WARN(" %*s(%04x) %-16s message [%04x] %s HAS INVALID HWND\n", - indent, "", HWND_16(hWnd), debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name ); - break; -#endif - - case SPY_RESULT_INVALIDHWND: - WARN(" %*s(%p) %-16s message [%04x] %s HAS INVALID HWND\n", - indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg, - sp_e.msg_name ); - break; } + SetLastError( save_error ); } @@ -2576,7 +2651,8 @@ */ int SPY_Init(void) { - int i, j; + int i; + UINT j; char buffer[1024]; const SPY_NOTIFY *p; const USER_MSG *q; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Mar 9 22:14:52 2010 @@ -254,6 +254,7 @@ reactos/dll/win32/user32/windows/menu.c # Forked reactos/dll/win32/user32/windows/messagebox.c # Forked reactos/dll/win32/user32/windows/rect.c # Forked (uitools.c) + reactos/dll/win32/user32/windows/spy.c # Synced to Wine-1_1_40 reactos/dll/win32/user32/windows/text.c # Forked (lstr.c) reactos/dll/win32/user32/windows/winpos.c # Forked

14 years, 10 months

[sir_richard] 46042: [KERNEL32/CSRSS]: Register new Win32 threads with CSRSS. Add a bunch of lookup, creation, allocation, hashing and CSR thread management routines from the unused CSRSRV in trunk. [CSRSS]: Bang in the new thread support in a bunch of places, including creating static server threads. It's very hacked and handle duplication doesn't work 100% reliably, but it gets the job done. [CSRSS]: Add CsrGetProcessLuid, CsrImpersonateClient, CsrRevertToSelf, CsrShutdownProcesses, CsrFindPro

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Mar 9 21:23:22 2010 New Revision: 46042 URL: http://svn.reactos.org/svn/reactos?rev=46042&view=rev Log: [KERNEL32/CSRSS]: Register new Win32 threads with CSRSS. Add a bunch of lookup, creation, allocation, hashing and CSR thread management routines from the unused CSRSRV in trunk. [CSRSS]: Bang in the new thread support in a bunch of places, including creating static server threads. It's very hacked and handle duplication doesn't work 100% reliably, but it gets the job done. [CSRSS]: Add CsrGetProcessLuid, CsrImpersonateClient, CsrRevertToSelf, CsrShutdownProcesses, CsrFindProcessForShutdown required for user-mode shutdown. Right now we are able to reliably enumerate user apps (in the user LUID) and then service/system apps (in the LOCAL SYSTEM LUID). Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c trunk/reactos/dll/win32/kernel32/thread/thread.c trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/api/process.c 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/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Tue Mar 9 21:23:22 2010 @@ -110,7 +110,38 @@ return CsrRequest.Status; } - /* REturn Success */ + /* Return Success */ + return STATUS_SUCCESS; +} + +NTSTATUS +WINAPI +BasepNotifyCsrOfThread(IN HANDLE ThreadHandle, + IN PCLIENT_ID ClientId) +{ + ULONG Request = CREATE_THREAD; + CSR_API_MESSAGE CsrRequest; + NTSTATUS Status; + + DPRINT("BasepNotifyCsrOfThread: Thread: %lx, Handle %lx\n", + ClientId->UniqueThread, ThreadHandle); + + /* Fill out the request */ + CsrRequest.Data.CreateThreadRequest.ClientId = *ClientId; + CsrRequest.Data.CreateThreadRequest.ThreadHandle = ThreadHandle; + + /* Call CSR */ + Status = CsrClientCallServer(&CsrRequest, + NULL, + MAKE_CSR_API(Request, CSR_NATIVE), + sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) + { + DPRINT1("Failed to tell csrss about new thread\n"); + return CsrRequest.Status; + } + + /* Return Success */ return STATUS_SUCCESS; } @@ -164,7 +195,13 @@ { return NULL; } - + + Status = BasepNotifyCsrOfThread(hThread, ClientId); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + } + /* Success */ return hThread; } @@ -1375,6 +1412,18 @@ &RemoteParameters->StandardError); } + /* Notify CSRSS */ + Status = BasepNotifyCsrOfCreation(dwCreationFlags, + (HANDLE)ProcessBasicInfo.UniqueProcessId, + bInheritHandles); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSR Notification Failed"); + SetLastErrorByStatus(Status); + goto Cleanup; + } + /* Create the first thread */ DPRINT("Creating thread for process (EntryPoint = 0x%p)\n", SectionImageInfo.TransferAddress); @@ -1387,18 +1436,6 @@ { DPRINT1("Could not create Initial Thread\n"); /* FIXME - set last error code */ - goto Cleanup; - } - - /* Notify CSRSS */ - Status = BasepNotifyCsrOfCreation(dwCreationFlags, - (HANDLE)ProcessBasicInfo.UniqueProcessId, - bInheritHandles); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR Notification Failed"); - SetLastErrorByStatus(Status); goto Cleanup; } Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Tue Mar 9 21:23:22 2010 @@ -18,6 +18,11 @@ /* FIXME: NDK */ #define HIGH_PRIORITY 31 #define SXS_SUPPORT_FIXME + +NTSTATUS +WINAPI +BasepNotifyCsrOfThread(IN HANDLE ThreadHandle, + IN PCLIENT_ID ClientId); /* FUNCTIONS *****************************************************************/ static @@ -219,8 +224,13 @@ DPRINT1("RtlAllocateActivationContextStack failed %x\n", Status); } - /* FIXME: Notify CSR */ - + /* Notify CSR */ + Status = BasepNotifyCsrOfThread(hThread, &ClientId); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + } + /* Success */ if(lpThreadId) *lpThreadId = (DWORD)ClientId.UniqueThread; Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Tue Mar 9 21:23:22 2010 @@ -37,6 +37,12 @@ ULONG Flags; BOOL bInheritHandles; } CSRSS_CREATE_PROCESS, *PCSRSS_CREATE_PROCESS; + +typedef struct +{ + CLIENT_ID ClientId; + HANDLE ThreadHandle; +} CSRSS_CREATE_THREAD, *PCSRSS_CREATE_THREAD; typedef struct { @@ -544,6 +550,7 @@ #define GET_CONSOLE_ALIASES_EXES (0x3C) #define GET_CONSOLE_ALIASES_EXES_LENGTH (0x3D) #define GENERATE_CTRL_EVENT (0x3E) +#define CREATE_THREAD (0x3F) /* Keep in sync with definition below. */ #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS)) @@ -557,6 +564,7 @@ union { CSRSS_CREATE_PROCESS CreateProcessRequest; + CSRSS_CREATE_THREAD CreateThreadRequest; CSRSS_CONNECT_PROCESS ConnectRequest; CSRSS_WRITE_CONSOLE WriteConsoleRequest; CSRSS_READ_CONSOLE ReadConsoleRequest; Modified: trunk/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] Tue Mar 9 21:23:22 2010 @@ -24,11 +24,241 @@ /* FUNCTIONS *****************************************************************/ +#define CsrHeap RtlGetProcessHeap() + +#define CsrHashThread(t) \ + (HandleToUlong(t)&(256 - 1)) + +LIST_ENTRY CsrThreadHashTable[256]; +PCSRSS_PROCESS_DATA CsrRootProcess; + +PCSR_THREAD +NTAPI +CsrAllocateThread(IN PCSRSS_PROCESS_DATA CsrProcess) +{ + PCSR_THREAD CsrThread; + + /* Allocate the structure */ + CsrThread = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, sizeof(CSR_THREAD)); + if (!CsrThread) return(NULL); + + /* Reference the Thread and Process */ + CsrThread->ReferenceCount++; + // CsrProcess->ReferenceCount++; + + /* Set the Parent Process */ + CsrThread->Process = CsrProcess; + + /* Return Thread */ + return CsrThread; +} + +PCSR_THREAD +NTAPI +CsrLocateThreadByClientId(OUT PCSRSS_PROCESS_DATA *Process OPTIONAL, + IN PCLIENT_ID ClientId) +{ + ULONG i; + PLIST_ENTRY ListHead, NextEntry; + PCSR_THREAD FoundThread; + + /* Hash the Thread */ + i = CsrHashThread(ClientId->UniqueThread); + + /* Set the list pointers */ + ListHead = &CsrThreadHashTable[i]; + NextEntry = ListHead->Flink; + + /* Star the loop */ + while (NextEntry != ListHead) + { + /* Get the thread */ + FoundThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, HashLinks); + + /* Compare the CID */ + if (FoundThread->ClientId.UniqueThread == ClientId->UniqueThread) + { + /* Match found, return the process */ + *Process = FoundThread->Process; + + /* Return thread too */ +// DPRINT1("Found: %p %p\n", FoundThread, FoundThread->Process); + return FoundThread; + } + + /* Next */ + NextEntry = NextEntry->Flink; + } + + /* Nothing found */ + return NULL; +} + +PCSR_THREAD +NTAPI +CsrLocateThreadInProcess(IN PCSRSS_PROCESS_DATA CsrProcess OPTIONAL, + IN PCLIENT_ID Cid) +{ + PLIST_ENTRY ListHead, NextEntry; + PCSR_THREAD FoundThread = NULL; + + /* Use the Root Process if none was specified */ + if (!CsrProcess) CsrProcess = CsrRootProcess; + + /* Save the List pointers */ +// DPRINT1("Searching in: %p %d\n", CsrProcess, CsrProcess->ThreadCount); + ListHead = &CsrProcess->ThreadList; + NextEntry = ListHead->Flink; + + /* Start the Loop */ + while (NextEntry != ListHead) + { + /* Get Thread Entry */ + FoundThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); + + /* Check for TID Match */ + if (FoundThread->ClientId.UniqueThread == Cid->UniqueThread) break; + + /* Next entry */ + NextEntry = NextEntry->Flink; + } + + /* Return what we found */ +// DPRINT1("Found: %p\n", FoundThread); + return FoundThread; +} + +VOID +NTAPI +CsrInsertThread(IN PCSRSS_PROCESS_DATA Process, + IN PCSR_THREAD Thread) +{ + ULONG i; + + /* Insert it into the Regular List */ + InsertTailList(&Process->ThreadList, &Thread->Link); + + /* Increase Thread Count */ + Process->ThreadCount++; + + /* Hash the Thread */ + i = CsrHashThread(Thread->ClientId.UniqueThread); +// DPRINT1("TID %lx HASH: %lx\n", Thread->ClientId.UniqueThread, i); + + /* Insert it there too */ + InsertHeadList(&CsrThreadHashTable[i], &Thread->HashLinks); +} + + +#define CsrAcquireProcessLock() LOCK +#define CsrReleaseProcessLock() UNLOCK + +NTSTATUS +NTAPI +CsrCreateThreadData(IN PCSRSS_PROCESS_DATA CsrProcess, + IN HANDLE hThread, + IN PCLIENT_ID ClientId) +{ + NTSTATUS Status; + PCSR_THREAD CsrThread; + //PCSRSS_PROCESS_DATA CurrentProcess; + PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; + CLIENT_ID CurrentCid; + KERNEL_USER_TIMES KernelTimes; + +// DPRINT1("CSRSRV: %s called\n", __FUNCTION__); + + /* Get the current thread and CID */ + CurrentCid = CurrentThread->ClientId; +// DPRINT1("CALLER PID/TID: %lx/%lx\n", CurrentCid.UniqueProcess, CurrentCid.UniqueThread); + + /* Acquire the Process Lock */ + CsrAcquireProcessLock(); +#if 0 + /* Get the current Process and make sure the Thread is valid with this CID */ + CurrentThread = CsrLocateThreadByClientId(&CurrentProcess, + &CurrentCid); + + /* Something is wrong if we get an empty thread back */ + if (!CurrentThread) + { + DPRINT1("CSRSRV:%s: invalid thread!\n", __FUNCTION__); + CsrReleaseProcessLock(); + return STATUS_THREAD_IS_TERMINATING; + } +#endif + /* Get the Thread Create Time */ + Status = NtQueryInformationThread(hThread, + ThreadTimes, + (PVOID)&KernelTimes, + sizeof(KernelTimes), + NULL); + + /* Allocate a CSR Thread Structure */ + if (!(CsrThread = CsrAllocateThread(CsrProcess))) + { + DPRINT1("CSRSRV:%s: out of memory!\n", __FUNCTION__); + CsrReleaseProcessLock(); + return STATUS_NO_MEMORY; + } + + /* Save the data we have */ + CsrThread->CreateTime = KernelTimes.CreateTime; + CsrThread->ClientId = *ClientId; + CsrThread->ThreadHandle = hThread; + CsrThread->Flags = 0; + + /* Insert the Thread into the Process */ + CsrInsertThread(CsrProcess, CsrThread); + + /* Release the lock and return */ + CsrReleaseProcessLock(); + return STATUS_SUCCESS; +} + +PCSR_THREAD +NTAPI +CsrAddStaticServerThread(IN HANDLE hThread, + IN PCLIENT_ID ClientId, + IN ULONG ThreadFlags) +{ + PCSR_THREAD CsrThread; + + /* Get the Lock */ + CsrAcquireProcessLock(); + + /* Allocate the Server Thread */ + if ((CsrThread = CsrAllocateThread(CsrRootProcess))) + { + /* Setup the Object */ +// DPRINT1("New CSR thread created: %lx PID/TID: %lx/%lx\n", CsrThread, ClientId->UniqueProcess, ClientId->UniqueThread); + CsrThread->ThreadHandle = hThread; + CsrThread->ClientId = *ClientId; + CsrThread->Flags = ThreadFlags; + + /* Insert it into the Thread List */ + InsertTailList(&CsrRootProcess->ThreadList, &CsrThread->Link); + + /* Increment the thread count */ + CsrRootProcess->ThreadCount++; + } + + /* Release the Process Lock and return */ + CsrReleaseProcessLock(); + return CsrThread; +} + VOID WINAPI CsrInitProcessData(VOID) { + ULONG i; RtlZeroMemory (ProcessData, sizeof ProcessData); NrProcess = sizeof ProcessData / sizeof ProcessData[0]; RtlInitializeCriticalSection( &ProcessDataLock ); + + CsrRootProcess = CsrCreateProcessData(NtCurrentTeb()->ClientId.UniqueProcess); + + /* Initialize the Thread Hash List */ + for (i = 0; i < 256; i++) InitializeListHead(&CsrThreadHashTable[i]); } PCSRSS_PROCESS_DATA WINAPI CsrGetProcessData(HANDLE ProcessId) @@ -89,8 +319,7 @@ /* using OpenProcess is not optimal due to HANDLE vs. DWORD PIDs... */ Status = NtOpenProcess(&pProcessData->Process, - PROCESS_DUP_HANDLE | PROCESS_VM_OPERATION | - PROCESS_VM_WRITE | PROCESS_CREATE_THREAD | SYNCHRONIZE, + PROCESS_ALL_ACCESS, &ObjectAttributes, &ClientId); if (!NT_SUCCESS(Status)) @@ -122,6 +351,9 @@ pProcessData->ShutdownLevel = 0x280; pProcessData->ShutdownFlags = 0; } + + pProcessData->ThreadCount = 0; + InitializeListHead(&pProcessData->ThreadList); return pProcessData; } @@ -186,33 +418,406 @@ return STATUS_INVALID_PARAMETER; } -NTSTATUS WINAPI -CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context) -{ - UINT Hash; - PCSRSS_PROCESS_DATA pProcessData; - NTSTATUS Status = STATUS_SUCCESS; - - LOCK; - - for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) - { - pProcessData = ProcessData[Hash]; - while (NULL != pProcessData) - { - Status = EnumProc(pProcessData, Context); - if (STATUS_SUCCESS != Status) +VOID +NTAPI +CsrSetToNormalPriority(VOID) +{ + KPRIORITY BasePriority = (8 + 1) + 4; + + /* Set the Priority */ + NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + &BasePriority, + sizeof(KPRIORITY)); +} + +VOID +NTAPI +CsrSetToShutdownPriority(VOID) +{ + KPRIORITY SetBasePriority = (8 + 1) + 6; + BOOLEAN Old; + + /* Get the shutdown privilege */ + if (NT_SUCCESS(RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, + TRUE, + FALSE, + &Old))) + { + /* Set the Priority */ + NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + &SetBasePriority, + sizeof(KPRIORITY)); + } +} + +NTSTATUS +NTAPI +CsrGetProcessLuid(HANDLE hProcess OPTIONAL, + PLUID Luid) +{ + HANDLE hToken = NULL; + NTSTATUS Status; + ULONG Length; + PTOKEN_STATISTICS TokenStats; + + /* Check if we have a handle to a CSR Process */ + if (!hProcess) + { + /* We don't, so try opening the Thread's Token */ + Status = NtOpenThreadToken(NtCurrentThread(), + TOKEN_QUERY, + FALSE, + &hToken); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* If we got some other failure, then return and quit */ + if (Status != STATUS_NO_TOKEN) return Status; + + /* We don't have a Thread Token, use a Process Token */ + hProcess = NtCurrentProcess(); + hToken = NULL; + } + } + + /* Check if we have a token by now */ + if (!hToken) + { + /* No token yet, so open the Process Token */ + Status = NtOpenProcessToken(hProcess, + TOKEN_QUERY, + &hToken); + if (!NT_SUCCESS(Status)) + { + /* Still no token, return the error */ + return Status; + } + } + + /* Now get the size we'll need for the Token Information */ + Status = NtQueryInformationToken(hToken, + TokenStatistics, + NULL, + 0, + &Length); + + /* Allocate memory for the Token Info */ + if (!(TokenStats = RtlAllocateHeap(CsrHeap, 0, Length))) + { + /* Fail and close the token */ + NtClose(hToken); + return STATUS_NO_MEMORY; + } + + /* Now query the information */ + Status = NtQueryInformationToken(hToken, + TokenStatistics, + TokenStats, + Length, + &Length); + + /* Close the handle */ + NtClose(hToken); + + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* Return the LUID */ + *Luid = TokenStats->AuthenticationId; + } + + /* Free the query information */ + RtlFreeHeap(CsrHeap, 0, TokenStats); + + /* Return the Status */ + return Status; +} + +SECURITY_QUALITY_OF_SERVICE CsrSecurityQos = +{ + sizeof(SECURITY_QUALITY_OF_SERVICE), + SecurityImpersonation, + SECURITY_STATIC_TRACKING, + FALSE +}; + +BOOLEAN +NTAPI +CsrImpersonateClient(IN PCSR_THREAD CsrThread) +{ + NTSTATUS Status; + PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; + + /* Use the current thread if none given */ + if (!CsrThread) CsrThread = CurrentThread; + + /* Still no thread, something is wrong */ + if (!CsrThread) + { + /* Failure */ + return FALSE; + } + + /* Make the call */ + Status = NtImpersonateThread(NtCurrentThread(), + CsrThread->ThreadHandle, + &CsrSecurityQos); + + if (!NT_SUCCESS(Status)) + { + /* Failure */ + return FALSE; + } + + /* Increase the impersonation count for the current thread */ + if (CurrentThread) ++CurrentThread->ImpersonationCount; + + /* Return Success */ + return TRUE; +} + +BOOLEAN +NTAPI +CsrRevertToSelf(VOID) +{ + NTSTATUS Status; + PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; + HANDLE ImpersonationToken = NULL; + + /* Check if we have a Current Thread */ + if (CurrentThread) + { + /* Make sure impersonation is on */ + if (!CurrentThread->ImpersonationCount) + { + return FALSE; + } + else if (--CurrentThread->ImpersonationCount > 0) + { + /* Success; impersonation count decreased but still not zero */ + return TRUE; + } + } + + /* Impersonation has been totally removed, revert to ourselves */ + Status = NtSetInformationThread(NtCurrentThread(), + ThreadImpersonationToken, + &ImpersonationToken, + sizeof(HANDLE)); + + /* Return TRUE or FALSE */ + return NT_SUCCESS(Status); +} + +PCSRSS_PROCESS_DATA +NTAPI +FindProcessForShutdown(IN PLUID CallerLuid) +{ + ULONG Hash; + PCSRSS_PROCESS_DATA CsrProcess, ReturnCsrProcess = NULL; + NTSTATUS Status; + ULONG Level = 0; + LUID ProcessLuid; + LUID SystemLuid = SYSTEM_LUID; + BOOLEAN IsSystemLuid = FALSE, IsOurLuid = FALSE; + + for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) + { + /* Get this process hash bucket */ + CsrProcess = ProcessData[Hash]; + while (CsrProcess) + { + /* Skip this process if it's already been processed*/ + if (CsrProcess->Flags & CsrProcessSkipShutdown) goto Next; + + /* Get the LUID of this Process */ + Status = CsrGetProcessLuid(CsrProcess->Process, &ProcessLuid); + + /* Check if we didn't get access to the LUID */ + if (Status == STATUS_ACCESS_DENIED) { - UNLOCK; - return Status; + /* FIXME:Check if we have any threads */ } - pProcessData = pProcessData->next; - } - } - - UNLOCK; - - return Status; + + if (!NT_SUCCESS(Status)) + { + /* We didn't have access, so skip it */ + CsrProcess->Flags |= CsrProcessSkipShutdown; + goto Next; + } + + /* Check if this is the System LUID */ + if ((IsSystemLuid = RtlEqualLuid(&ProcessLuid, &SystemLuid))) + { + /* Mark this process */ + CsrProcess->ShutdownFlags |= CsrShutdownSystem; + } + else if (!(IsOurLuid = RtlEqualLuid(&ProcessLuid, CallerLuid))) + { + /* Our LUID doesn't match with the caller's */ + CsrProcess->ShutdownFlags |= CsrShutdownOther; + } + + /* Check if we're past the previous level */ + if (CsrProcess->ShutdownLevel > Level) + { + /* Update the level */ + Level = CsrProcess->ShutdownLevel; + + /* Set the final process */ + ReturnCsrProcess = CsrProcess; + } +Next: + /* Next process */ + CsrProcess = CsrProcess->next; + } + } + + /* Check if we found a process */ + if (ReturnCsrProcess) + { + /* Skip this one next time */ + ReturnCsrProcess->Flags |= CsrProcessSkipShutdown; + } + + return ReturnCsrProcess; +} + +/* This is really "CsrShutdownProcess", mostly */ +NTSTATUS +WINAPI +CsrEnumProcesses(IN CSRSS_ENUM_PROCESS_PROC EnumProc, + IN PVOID Context) +{ + PVOID* RealContext = (PVOID*)Context; + PLUID CallerLuid = RealContext[0]; + PCSRSS_PROCESS_DATA CsrProcess = NULL; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + BOOLEAN FirstTry = TRUE; + ULONG Result = 0; + ULONG Hash; + + /* Acquire process lock */ + CsrAcquireProcessLock(); + + /* Start the loop */ + for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) + { + /* Get the Process */ + CsrProcess = ProcessData[Hash]; + while (CsrProcess) + { + /* Remove the skip flag, set shutdown flags to 0*/ + CsrProcess->Flags &= ~CsrProcessSkipShutdown; + CsrProcess->ShutdownFlags = 0; + + /* Move to the next */ + CsrProcess = CsrProcess->next; + } + } + + /* Set shudown Priority */ + CsrSetToShutdownPriority(); + + /* Loop all processes */ + DPRINT1("Enumerating for LUID: %lx %lx\n", CallerLuid->HighPart, CallerLuid->LowPart); + + /* Start looping */ + while (TRUE) + { + /* Find the next process to shutdown */ + if (!(CsrProcess = FindProcessForShutdown(CallerLuid))) + { + /* Done, quit */ + CsrReleaseProcessLock(); + Status = STATUS_SUCCESS; + goto Quickie; + } + +LoopAgain: + /* Release the lock, make the callback, and acquire it back */ + DPRINT1("Found process: %lx\n", CsrProcess->ProcessId); + CsrReleaseProcessLock(); + Result = (ULONG)EnumProc(CsrProcess, Context); + CsrAcquireProcessLock(); + + /* Check the result */ + DPRINT1("Result: %d\n", Result); + if (Result == CsrShutdownCsrProcess) + { + /* The callback unlocked the process */ + break; + } + else if (Result == CsrShutdownNonCsrProcess) + { + /* A non-CSR process, the callback didn't touch it */ + continue; + } + else if (Result == CsrShutdownCancelled) + { + /* Shutdown was cancelled, unlock and exit */ + CsrReleaseProcessLock(); + Status = STATUS_CANCELLED; + goto Quickie; + } + + /* No matches during the first try, so loop again */ + if (FirstTry && Result == CsrShutdownNonCsrProcess) + { + FirstTry = FALSE; + goto LoopAgain; + } + } + +Quickie: + /* Return to normal priority */ + CsrSetToNormalPriority(); + return Status; +} + +NTSTATUS +NTAPI +CsrLockProcessByClientId(IN HANDLE Pid, + OUT PCSRSS_PROCESS_DATA *CsrProcess OPTIONAL) +{ + ULONG Hash; + PCSRSS_PROCESS_DATA CurrentProcess = NULL; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + + /* Acquire the lock */ + CsrAcquireProcessLock(); + + /* Start the loop */ + for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) + { + /* Get the Process */ + CurrentProcess = ProcessData[Hash]; + while (CurrentProcess) + { + /* Check for PID match */ + if (CurrentProcess->ProcessId == Pid) + { + /* Get out of here with success */ +// DPRINT1("Found %p for PID %lx\n", CurrentProcess, Pid); + Status = STATUS_SUCCESS; + goto Found; + } + + /* Move to the next */ + CurrentProcess = CurrentProcess->next; + } + } + + /* Nothing found, release the lock */ +Found: + if (!CurrentProcess) CsrReleaseProcessLock(); + + /* Return the status and process */ + if (CsrProcess) *CsrProcess = CurrentProcess; + return Status; } /********************************************************************** @@ -253,6 +858,76 @@ } return(STATUS_SUCCESS); +} + +CSR_API(CsrCreateThread) +{ + PCSR_THREAD CurrentThread; + HANDLE ThreadHandle; + NTSTATUS Status; + PCSRSS_PROCESS_DATA CsrProcess; + + Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); + Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); + + CurrentThread = NtCurrentTeb()->CsrClientThread; + CsrProcess = CurrentThread->Process; +// DPRINT1("Current thread: %p %p\n", CurrentThread, CsrProcess); +// DPRINT1("Request CID: %lx %lx %lx\n", +// CsrProcess->ProcessId, +// NtCurrentTeb()->ClientId.UniqueProcess, + // Request->Data.CreateThreadRequest.ClientId.UniqueProcess); + + if (CsrProcess->ProcessId != Request->Data.CreateThreadRequest.ClientId.UniqueProcess) + { + if (Request->Data.CreateThreadRequest.ClientId.UniqueProcess == NtCurrentTeb()->ClientId.UniqueProcess) + { + return STATUS_SUCCESS; + } + + Status = CsrLockProcessByClientId(Request->Data.CreateThreadRequest.ClientId.UniqueProcess, + &CsrProcess); + // DPRINT1("Found matching process: %p\n", CsrProcess); + if (!NT_SUCCESS(Status)) return Status; + } + +// DPRINT1("PIDs: %lx %lx\n", CurrentThread->Process->ProcessId, CsrProcess->ProcessId); +// DPRINT1("Thread handle is: %lx Process Handle is: %lx %lx\n", + // Request->Data.CreateThreadRequest.ThreadHandle, + // CurrentThread->Process->Process, + // CsrProcess->Process); + Status = NtDuplicateObject(CsrProcess->Process, + Request->Data.CreateThreadRequest.ThreadHandle, + NtCurrentProcess(), + &ThreadHandle, + 0, + 0, + DUPLICATE_SAME_ACCESS); + //DPRINT1("Duplicate status: %lx\n", Status); + if (!NT_SUCCESS(Status)) + { + Status = NtDuplicateObject(CurrentThread->Process->Process, + Request->Data.CreateThreadRequest.ThreadHandle, + NtCurrentProcess(), + &ThreadHandle, + 0, + 0, + DUPLICATE_SAME_ACCESS); + // DPRINT1("Duplicate status: %lx\n", Status); + } + + Status = STATUS_SUCCESS; // hack + if (NT_SUCCESS(Status)) + { + Status = CsrCreateThreadData(CsrProcess, + ThreadHandle, + &Request->Data.CreateThreadRequest.ClientId); + // DPRINT1("Create status: %lx\n", Status); + } + + if (CsrProcess != CurrentThread->Process) CsrReleaseProcessLock(); + + return Status; } CSR_API(CsrTerminateProcess) 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c [iso-8859-1] Tue Mar 9 21:23:22 2010 @@ -126,6 +126,7 @@ HANDLE ServerPort = NULL, ServerThread = NULL; PCSRSS_PROCESS_DATA ProcessData = NULL; REMOTE_PORT_VIEW LpcRead; + CLIENT_ID ClientId; LpcRead.Length = sizeof(LpcRead); ServerPort = NULL; @@ -169,25 +170,76 @@ Status = RtlCreateUserThread(NtCurrentProcess(), NULL, - FALSE, + TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)ClientConnectionThread, ServerPort, & ServerThread, - NULL); + &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__); return Status; +} + +PCSR_THREAD +NTAPI +CsrConnectToUser(VOID) +{ + PTEB Teb = NtCurrentTeb(); + PCSR_THREAD CsrThread; +#if 0 + NTSTATUS Status; + ANSI_STRING DllName; + UNICODE_STRING TempName; + HANDLE hUser32; + STRING StartupName; + + /* Check if we didn't already find it */ + if (!CsrClientThreadSetup) + { + /* Get the DLL Handle for user32.dll */ + RtlInitAnsiString(&DllName, "user32"); + RtlAnsiStringToUnicodeString(&TempName, &DllName, TRUE); + Status = LdrGetDllHandle(NULL, + NULL, + &TempName, + &hUser32); + RtlFreeUnicodeString(&TempName); + + /* If we got teh handle, get the Client Thread Startup Entrypoint */ + if (NT_SUCCESS(Status)) + { + RtlInitAnsiString(&StartupName,"ClientThreadSetup"); + Status = LdrGetProcedureAddress(hUser32, + &StartupName, + 0, + (PVOID)&CsrClientThreadSetup); + } + } + + /* Connect to user32 */ + CsrClientThreadSetup(); +#endif + /* Save pointer to this thread in TEB */ + CsrThread = CsrLocateThreadInProcess(NULL, &Teb->ClientId); + if (CsrThread) Teb->CsrClientThread = CsrThread; + + /* Return it */ + return CsrThread; } VOID @@ -199,10 +251,20 @@ PCSR_API_MESSAGE Request = (PCSR_API_MESSAGE)RawRequest; PCSR_API_MESSAGE Reply; PCSRSS_PROCESS_DATA ProcessData; + PCSR_THREAD ServerThread; DPRINT("CSR: %s called\n", __FUNCTION__); + + /* Connect to user32 */ + while (!CsrConnectToUser()) + { + /* Keep trying until we get a response */ + NtCurrentTeb()->Win32ClientInfo[0] = 0; + //NtDelayExecution(FALSE, &TimeOut); + } /* Reply must be NULL at the first call to NtReplyWaitReceivePort */ + ServerThread = NtCurrentTeb()->CsrClientThread; Reply = NULL; /* Loop and reply/wait for a new message */ @@ -271,7 +333,7 @@ } if (ProcessData->Terminated) { - DPRINT1("Message %d: process %p already terminated\n", + DPRINT1("Message %d: process %d already terminated\n", Request->Type, Request->Header.ClientId.UniqueProcess); continue; } @@ -284,8 +346,17 @@ } else { + PCSR_THREAD Thread; + PCSRSS_PROCESS_DATA Process = NULL; + + //DPRINT1("locate thread %lx/%lx\n", Request->Header.ClientId.UniqueProcess, Request->Header.ClientId.UniqueThread); + Thread = CsrLocateThreadByClientId(&Process, &Request->Header.ClientId); + //DPRINT1("Thread found: %p %p\n", Thread, Process); + /* Call the Handler */ + if (Thread) NtCurrentTeb()->CsrClientThread = Thread; CsrApiCallHandler(ProcessData, Request); + if (Thread) NtCurrentTeb()->CsrClientThread = ServerThread; } /* Send back the reply */ 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] Tue Mar 9 21:23:22 2010 @@ -12,6 +12,29 @@ #include <ndk/ntndk.h> #include <csrss/csrss.h> + +typedef enum _SHUTDOWN_RESULT +{ + CsrShutdownCsrProcess = 1, + CsrShutdownNonCsrProcess, + CsrShutdownCancelled +} SHUTDOWN_RESULT, *PSHUTDOWN_RESULT; + +typedef enum _CSR_SHUTDOWN_FLAGS +{ + CsrShutdownSystem = 4, + CsrShutdownOther = 8 +} CSR_SHUTDOWN_FLAGS, *PCSR_SHUTDOWN_FLAGS; + +typedef enum _CSR_PROCESS_FLAGS +{ + CsrProcessTerminating = 0x1, + CsrProcessSkipShutdown = 0x2, + CsrProcessCreateNewGroup = 0x100, + CsrProcessTerminated = 0x200, + CsrProcessLastThreadTerminated = 0x400, + CsrProcessIsConsoleApp = 0x800 +} CSR_PROCESS_FLAGS, *PCSR_PROCESS_FLAGS; typedef struct Object_tt { @@ -59,7 +82,24 @@ LIST_ENTRY ProcessEntry; PCONTROLDISPATCHER CtrlDispatcher; BOOL Terminated; + ULONG Flags; + ULONG ThreadCount; + LIST_ENTRY ThreadList; } CSRSS_PROCESS_DATA, *PCSRSS_PROCESS_DATA; + +typedef struct _CSR_THREAD +{ + LARGE_INTEGER CreateTime; + LIST_ENTRY Link; + LIST_ENTRY HashLinks; + CLIENT_ID ClientId; + PCSRSS_PROCESS_DATA Process; + //struct _CSR_WAIT_BLOCK *WaitBlock; + HANDLE ThreadHandle; + ULONG Flags; + ULONG ReferenceCount; + ULONG ImpersonationCount; +} CSR_THREAD, *PCSR_THREAD; typedef VOID (WINAPI *CSR_CLEANUP_OBJECT_PROC)(Object_t *Object); @@ -100,6 +140,7 @@ CSR_API(CsrConnectProcess); CSR_API(CsrCreateProcess); CSR_API(CsrTerminateProcess); +CSR_API(CsrCreateThread); /* print.c */ VOID WINAPI DisplayString(LPCWSTR lpwString); @@ -129,7 +170,10 @@ PCSRSS_PROCESS_DATA 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 PCSRSS_PROCESS_DATA CsrProcess OPTIONAL, IN PCLIENT_ID Cid); +PCSR_THREAD NTAPI CsrLocateThreadByClientId(OUT PCSRSS_PROCESS_DATA *Process OPTIONAL, IN PCLIENT_ID ClientId); + /* api/handle.c */ NTSTATUS FASTCALL CsrRegisterObjectDefinitions(PCSRSS_OBJECT_DEFINITION NewDefinitions); NTSTATUS WINAPI CsrInsertObject( PCSRSS_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object, DWORD Access, BOOL Inheritable ); 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/init.c [iso-8859-1] Tue Mar 9 21:23:22 2010 @@ -283,6 +283,7 @@ CSRSS_API_DEFINITION NativeDefinitions[] = { CSRSS_DEFINE_API(CREATE_PROCESS, CsrCreateProcess), + CSRSS_DEFINE_API(CREATE_THREAD, CsrCreateThread), CSRSS_DEFINE_API(TERMINATE_PROCESS, CsrTerminateProcess), CSRSS_DEFINE_API(CONNECT_PROCESS, CsrConnectProcess), CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS, CsrRegisterServicesProcess), @@ -305,6 +306,8 @@ NTSTATUS Status = STATUS_SUCCESS; OBJECT_ATTRIBUTES PortAttributes; UNICODE_STRING PortName; + HANDLE ServerThread; + CLIENT_ID ClientId; DPRINT("CSR: %s called\n", __FUNCTION__); @@ -327,14 +330,22 @@ } Status = RtlCreateUserThread(NtCurrentProcess(), NULL, - FALSE, + TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE) ListenThread, *Port, - NULL, - NULL); + &ServerThread, + &ClientId); + + if (ListenThread == (PVOID)ClientConnectionThread) + { + CsrAddStaticServerThread(ServerThread, &ClientId, 0); + } + + NtResumeThread(ServerThread, NULL); + NtClose(ServerThread); return Status; }

14 years, 10 months

[sir_richard] 46041: [KERNEL32]: Bug fix CTRL-C handler registration/deregistration/notification, needed for correct console shutdown behavior.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Mar 9 21:13:19 2010 New Revision: 46041 URL: http://svn.reactos.org/svn/reactos?rev=46041&view=rev Log: [KERNEL32]: Bug fix CTRL-C handler registration/deregistration/notification, needed for correct console shutdown behavior. Modified: trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/dll/win32/kernel32/misc/dllmain.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Tue Mar 9 21:13:19 2010 @@ -19,16 +19,17 @@ #define NDEBUG #include <debug.h> -extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); -extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); extern RTL_CRITICAL_SECTION ConsoleLock; extern BOOL ConsoleInitialized; extern BOOL WINAPI IsDebuggerPresent(VOID); /* GLOBALS *******************************************************************/ -static PHANDLER_ROUTINE* CtrlHandlers = NULL; -static ULONG NrCtrlHandlers = 0; +PHANDLER_ROUTINE InitialHandler[1]; +PHANDLER_ROUTINE* CtrlHandlers; +ULONG NrCtrlHandlers; +ULONG NrAllocatedHandlers; + #define INPUTEXENAME_BUFLEN 256 static WCHAR InputExeName[INPUTEXENAME_BUFLEN] = L""; @@ -49,7 +50,7 @@ break; case CTRL_SHUTDOWN_EVENT: - DPRINT("Ctrl Shutdown Event\n"); + DPRINT1("Ctrl Shutdown Event\n"); break; case CTRL_CLOSE_EVENT: @@ -57,14 +58,13 @@ break; case CTRL_LOGOFF_EVENT: - DPRINT("Ctrl Logoff Event\n"); + DPRINT1("Ctrl Logoff Event\n"); break; } - ExitProcess(0); + ExitProcess(CONTROL_C_EXIT); return TRUE; } - __declspec(noreturn) VOID @@ -74,7 +74,8 @@ DWORD nExitCode = 0; DWORD nCode = CodeAndFlag & MAXLONG; UINT i; - + EXCEPTION_RECORD erException; + SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST); switch(nCode) @@ -82,51 +83,77 @@ case CTRL_C_EVENT: case CTRL_BREAK_EVENT: { - if(IsDebuggerPresent()) + if (IsDebuggerPresent()) { - EXCEPTION_RECORD erException; - erException.ExceptionCode = - (nCode == CTRL_C_EVENT ? DBG_CONTROL_C : DBG_CONTROL_BREAK); + erException.ExceptionCode = (nCode == CTRL_C_EVENT ? + DBG_CONTROL_C : DBG_CONTROL_BREAK); erException.ExceptionFlags = 0; erException.ExceptionRecord = NULL; - erException.ExceptionAddress = &DefaultConsoleCtrlHandler; + erException.ExceptionAddress = DefaultConsoleCtrlHandler; erException.NumberParameters = 0; - RtlRaiseException(&erException); + + _SEH2_TRY + { + RtlRaiseException(&erException); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + RtlEnterCriticalSection(&ConsoleLock); + + if ((nCode != CTRL_C_EVENT) || + (NtCurrentPeb()->ProcessParameters->ConsoleFlags != 1)) + { + for (i = NrCtrlHandlers; i > 0; i--) + { + if (CtrlHandlers[i - 1](nCode)) break; + } + } + + RtlLeaveCriticalSection(&ConsoleLock); + } + _SEH2_END; + + ExitThread(0); } - - if (!ConsoleInitialized) ExitThread(0); - RtlEnterCriticalSection(&ConsoleLock); - - if (!(nCode == CTRL_C_EVENT && - NtCurrentPeb()->ProcessParameters->ConsoleFlags & 1)) - { - for(i = NrCtrlHandlers; i > 0; -- i) - if(CtrlHandlers[i - 1](nCode)) break; - } - RtlLeaveCriticalSection(&ConsoleLock); - ExitThread(0); + + break; } case CTRL_CLOSE_EVENT: case CTRL_LOGOFF_EVENT: case CTRL_SHUTDOWN_EVENT: break; - - default: ExitThread(0); - } - - if (!ConsoleInitialized) ExitThread(0); + + case 3: + + ExitThread(0); + break; + + case 4: + + ExitProcess(CONTROL_C_EXIT); + break; + + default: + + ASSERT(FALSE); + break; + } + + ASSERT(ConsoleInitialized); + RtlEnterCriticalSection(&ConsoleLock); - - if (!(nCode == CTRL_C_EVENT && - NtCurrentPeb()->ProcessParameters->ConsoleFlags & 1)) - { - i = NrCtrlHandlers; - while (i > 0) + nExitCode = 0; + if ((nCode != CTRL_C_EVENT) || (NtCurrentPeb()->ProcessParameters->ConsoleFlags != 1)) + { + for (i = NrCtrlHandlers; i > 0; i--) { - if (i == 1 && (CodeAndFlag & MINLONG) && - (nCode == CTRL_LOGOFF_EVENT || nCode == CTRL_SHUTDOWN_EVENT)) + if ((i == 1) && + (CodeAndFlag & MINLONG) && + ((nCode == CTRL_LOGOFF_EVENT) || (nCode == CTRL_SHUTDOWN_EVENT))) + { break; + } if (CtrlHandlers[i - 1](nCode)) { @@ -135,14 +162,17 @@ case CTRL_CLOSE_EVENT: case CTRL_LOGOFF_EVENT: case CTRL_SHUTDOWN_EVENT: + case 3: nExitCode = CodeAndFlag; + break; } break; } - --i; } } + RtlLeaveCriticalSection(&ConsoleLock); + ExitThread(nExitCode); } @@ -3235,74 +3265,70 @@ BOOL AddConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine) { + PHANDLER_ROUTINE* NewCtrlHandlers = NULL; + if (HandlerRoutine == NULL) { NtCurrentPeb()->ProcessParameters->ConsoleFlags = TRUE; - return(TRUE); - } - else - { - NrCtrlHandlers++; - if (CtrlHandlers == NULL) + return TRUE; + } + + if (NrCtrlHandlers == NrAllocatedHandlers) + { + NewCtrlHandlers = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (NrCtrlHandlers + 4) * sizeof(PHANDLER_ROUTINE)); + if (NewCtrlHandlers == NULL) { - CtrlHandlers = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - NrCtrlHandlers * sizeof(PHANDLER_ROUTINE)); - } - else - { - CtrlHandlers = RtlReAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - (PVOID)CtrlHandlers, - NrCtrlHandlers * sizeof(PHANDLER_ROUTINE)); - } - - if (CtrlHandlers == NULL) - { - NrCtrlHandlers = 0; SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - - CtrlHandlers[NrCtrlHandlers - 1] = HandlerRoutine; + + memmove(NewCtrlHandlers, CtrlHandlers, sizeof(PHANDLER_ROUTINE) * NrCtrlHandlers); + + if (NrAllocatedHandlers > 1) RtlFreeHeap(RtlGetProcessHeap(), 0, CtrlHandlers); + + CtrlHandlers = NewCtrlHandlers; + NrAllocatedHandlers += 4; + } + + ASSERT(NrCtrlHandlers < NrAllocatedHandlers); + + CtrlHandlers[NrCtrlHandlers++] = HandlerRoutine; + return TRUE; +} + + +static +BOOL +RemoveConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine) +{ + ULONG i; + + if (HandlerRoutine == NULL) + { + NtCurrentPeb()->ProcessParameters->ConsoleFlags = FALSE; return TRUE; } -} - - -static -BOOL -RemoveConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine) -{ - ULONG i; - - if (HandlerRoutine == NULL) - { - NtCurrentPeb()->ProcessParameters->ConsoleFlags = FALSE; - return(TRUE); - } - else - { - for (i = 0; i < NrCtrlHandlers; i++) + + for (i = 0; i < NrCtrlHandlers; i++) + { + if (CtrlHandlers[i] == HandlerRoutine) { - if ( ((void*)(CtrlHandlers[i])) == (void*)HandlerRoutine) + if (i < (NrCtrlHandlers - 1)) { - NrCtrlHandlers--; - memmove(CtrlHandlers + i, - CtrlHandlers + i + 1, - (NrCtrlHandlers - i) * sizeof(PHANDLER_ROUTINE)); - - CtrlHandlers = RtlReAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - (PVOID)CtrlHandlers, - NrCtrlHandlers * sizeof(PHANDLER_ROUTINE)); - return(TRUE); + memmove(&CtrlHandlers[i], + &CtrlHandlers[i+1], + (NrCtrlHandlers - i + 1) * sizeof(PHANDLER_ROUTINE)); } + + NrCtrlHandlers--; + return TRUE; } } SetLastError(ERROR_INVALID_PARAMETER); - return(FALSE); + return FALSE; } Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Tue Mar 9 21:13:19 2010 @@ -41,7 +41,10 @@ extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); - +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; @@ -178,7 +181,10 @@ /* Initialize Console Ctrl Handler */ ConsoleInitialized = TRUE; RtlInitializeCriticalSection(&ConsoleLock); - SetConsoleCtrlHandler(DefaultConsoleCtrlHandler, TRUE); + NrAllocatedHandlers = 1; + NrCtrlHandlers = 1; + CtrlHandlers = InitialHandler; + CtrlHandlers[0] = DefaultConsoleCtrlHandler; /* Now use the proper console handle */ Request.Data.AllocConsoleRequest.Console = Parameters->ConsoleHandle;

14 years, 10 months

[sir_richard] 46040: [CSRSS]: Fix yet another bug in the unused csrss code.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Mar 9 19:22:25 2010 New Revision: 46040 URL: http://svn.reactos.org/svn/reactos?rev=46040&view=rev Log: [CSRSS]: Fix yet another bug in the unused csrss code. Modified: trunk/reactos/subsystems/csr/csrsrv/thread.c Modified: trunk/reactos/subsystems/csr/csrsrv/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/thre… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/thread.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/thread.c [iso-8859-1] Tue Mar 9 19:22:25 2010 @@ -157,7 +157,7 @@ NextEntry = ListHead->Flink; /* Start the Loop */ - while (NextEntry != NextEntry) + while (NextEntry != ListHead) { /* Get Thread Entry */ FoundThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link);

14 years, 10 months

[akhaldi] 46039: [NTIFS] - Group related definitions - Add missing *_INCREMENT, SYSTEM_PAGE_PRIORITY_BITS, SYSTEM_PAGE_PRIORITY_LEVELS and INVALID_PROCESSOR_INDEX definitions - KAPC_STATE : ApcListHead[2] -> ApcListHead[MaximumMode] - KQUEUE : make CurrentCount volatile - Add several missing Ke* functions declarations

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 9 19:03:40 2010 New Revision: 46039 URL: http://svn.reactos.org/svn/reactos?rev=46039&view=rev Log: [NTIFS] - Group related definitions - Add missing *_INCREMENT, SYSTEM_PAGE_PRIORITY_BITS, SYSTEM_PAGE_PRIORITY_LEVELS and INVALID_PROCESSOR_INDEX definitions - KAPC_STATE : ApcListHead[2] -> ApcListHead[MaximumMode] - KQUEUE : make CurrentCount volatile - Add several missing Ke* functions declarations Modified: branches/header-work/include/ddk/ntifs.h Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Tue Mar 9 19:03:40 2010 @@ -740,6 +740,20 @@ MandatoryLevelCount } MANDATORY_LEVEL, *PMANDATORY_LEVEL; +#if (NTDDI_VERSION >= NTDDI_NT4) + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQueryObject( + IN HANDLE Handle OPTIONAL, + IN OBJECT_INFORMATION_CLASS ObjectInformationClass, + OUT PVOID ObjectInformation OPTIONAL, + IN ULONG ObjectInformationLength, + OUT PULONG ReturnLength OPTIONAL); + +#endif + #if (NTDDI_VERSION >= NTDDI_WIN2K) NTSYSCALLAPI @@ -968,6 +982,50 @@ IN PLARGE_INTEGER ByteOffset, IN PLARGE_INTEGER Length, IN ULONG Key); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtSetSecurityObject( + IN HANDLE Handle, + IN SECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR SecurityDescriptor); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQuerySecurityObject( + IN HANDLE Handle, + IN SECURITY_INFORMATION SecurityInformation, + OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN ULONG Length, + OUT PULONG LengthNeeded); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtClose( + IN HANDLE Handle); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtAllocateVirtualMemory( + IN HANDLE ProcessHandle, + IN OUT PVOID *BaseAddress, + IN ULONG_PTR ZeroBits, + IN OUT PSIZE_T RegionSize, + IN ULONG AllocationType, + IN ULONG Protect); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtFreeVirtualMemory( + IN HANDLE ProcessHandle, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T RegionSize, + IN ULONG FreeType); #endif @@ -1197,6 +1255,18 @@ IN THREADINFOCLASS ThreadInformationClass, IN PVOID ThreadInformation, IN ULONG ThreadInformationLength); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtCreateSection( + OUT PHANDLE SectionHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN PLARGE_INTEGER MaximumSize OPTIONAL, + IN ULONG SectionPageProtection, + IN ULONG AllocationAttributes, + IN HANDLE FileHandle OPTIONAL); #endif @@ -4655,6 +4725,220 @@ ULONG Reserved [22]; } PUBLIC_OBJECT_TYPE_INFORMATION, *PPUBLIC_OBJECT_TYPE_INFORMATION; +typedef struct _SECURITY_CLIENT_CONTEXT { + SECURITY_QUALITY_OF_SERVICE SecurityQos; + PACCESS_TOKEN ClientToken; + BOOLEAN DirectlyAccessClientToken; + BOOLEAN DirectAccessEffectiveOnly; + BOOLEAN ServerIsRemote; + TOKEN_CONTROL ClientTokenControl; +} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; + +#define EVENT_INCREMENT 1 +#define IO_NO_INCREMENT 0 +#define IO_CD_ROM_INCREMENT 1 +#define IO_DISK_INCREMENT 1 +#define IO_MAILSLOT_INCREMENT 2 +#define IO_NAMED_PIPE_INCREMENT 2 +#define IO_NETWORK_INCREMENT 2 +#define SEMAPHORE_INCREMENT 1 + +#define SYSTEM_PAGE_PRIORITY_BITS 3 +#define SYSTEM_PAGE_PRIORITY_LEVELS (1 << SYSTEM_PAGE_PRIORITY_BITS) + +typedef struct _KAPC_STATE { + LIST_ENTRY ApcListHead[MaximumMode]; + PKPROCESS Process; + BOOLEAN KernelApcInProgress; + BOOLEAN KernelApcPending; + BOOLEAN UserApcPending; +} KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; + +#define KAPC_STATE_ACTUAL_LENGTH (FIELD_OFFSET(KAPC_STATE, UserApcPending) + sizeof(BOOLEAN)) + +typedef struct _KQUEUE { + DISPATCHER_HEADER Header; + LIST_ENTRY EntryListHead; + volatile ULONG CurrentCount; + ULONG MaximumCount; + LIST_ENTRY ThreadListHead; +} KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; + +#if (NTDDI_VERSION >= NTDDI_WIN2K) + +NTKERNELAPI +VOID +NTAPI +KeInitializeMutant( + OUT PRKMUTANT Mutant, + IN BOOLEAN InitialOwner); + +NTKERNELAPI +LONG +NTAPI +KeReadStateMutant( + IN PRKMUTANT Mutant); + +NTKERNELAPI +LONG +NTAPI +KeReleaseMutant( + IN OUT PRKMUTANT Mutant, + IN KPRIORITY Increment, + IN BOOLEAN Abandoned, + IN BOOLEAN Wait); + +NTKERNELAPI +VOID +NTAPI +KeInitializeQueue( + OUT PRKQUEUE Queue, + IN ULONG Count); + +NTKERNELAPI +LONG +NTAPI +KeReadStateQueue( + IN PRKQUEUE Queue); + +NTKERNELAPI +LONG +NTAPI +KeInsertQueue( + IN OUT PRKQUEUE Queue, + IN OUT PLIST_ENTRY Entry); + +NTKERNELAPI +LONG +NTAPI +KeInsertHeadQueue( + IN OUT PRKQUEUE Queue, + IN OUT PLIST_ENTRY Entry); + +NTKERNELAPI +PLIST_ENTRY +NTAPI +KeRemoveQueue( + IN OUT PRKQUEUE Queue, + IN KPROCESSOR_MODE WaitMode, + IN PLARGE_INTEGER Timeout OPTIONAL); + +NTKERNELAPI +VOID +NTAPI +KeAttachProcess( + IN OUT PKPROCESS Process); + +NTKERNELAPI +VOID +NTAPI +KeDetachProcess( + VOID); + +NTKERNELAPI +PLIST_ENTRY +NTAPI +KeRundownQueue( + IN OUT PRKQUEUE Queue); + +NTKERNELAPI +VOID +NTAPI +KeStackAttachProcess( + IN OUT PKPROCESS Process, + OUT PKAPC_STATE ApcState); + +NTKERNELAPI +VOID +NTAPI +KeUnstackDetachProcess( + IN PKAPC_STATE ApcState); + +NTKERNELAPI +UCHAR +NTAPI +KeSetIdealProcessorThread( + IN OUT PKTHREAD Thread, + IN UCHAR Processor); + +NTKERNELAPI +BOOLEAN +NTAPI +KeSetKernelStackSwapEnable( + IN BOOLEAN Enable); + +#if defined(_X86_) +NTHALAPI +KIRQL +FASTCALL +KeAcquireSpinLockRaiseToSynch( + IN OUT PKSPIN_LOCK SpinLock); +#else +NTKERNELAPI +KIRQL +KeAcquireSpinLockRaiseToSynch( + IN OUT PKSPIN_LOCK SpinLock); +#endif + +#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ + +#if (NTDDI_VERSION >= NTDDI_WINXP) + +NTHALAPI +KIRQL +FASTCALL +KeAcquireQueuedSpinLock( + IN OUT KSPIN_LOCK_QUEUE_NUMBER Number); + +NTHALAPI +VOID +FASTCALL +KeReleaseQueuedSpinLock( + IN OUT KSPIN_LOCK_QUEUE_NUMBER Number, + IN KIRQL OldIrql); + +NTHALAPI +LOGICAL +FASTCALL +KeTryToAcquireQueuedSpinLock( + IN KSPIN_LOCK_QUEUE_NUMBER Number, + OUT PKIRQL OldIrql); + +#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ + +#if (NTDDI_VERSION >= NTDDI_VISTA) + +NTKERNELAPI +VOID +KeQueryOwnerMutant( + IN PKMUTANT Mutant, + OUT PCLIENT_ID ClientId); + +NTKERNELAPI +ULONG +KeRemoveQueueEx ( + IN OUT PKQUEUE Queue, + IN KPROCESSOR_MODE WaitMode, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL, + OUT PLIST_ENTRY *EntryArray, + IN ULONG Count); + +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ + +#define INVALID_PROCESSOR_INDEX 0xffffffff + +NTSTATUS +NTAPI +KeGetProcessorNumberFromIndex( + IN ULONG ProcIndex, + OUT PPROCESSOR_NUMBER ProcNumber); + +ULONG +NTAPI +KeGetProcessorIndexFromNumber( + IN PPROCESSOR_NUMBER ProcNumber); + #pragma pack(push,4) #ifndef VER_PRODUCTBUILD @@ -4891,15 +5175,6 @@ ULONG SecurityDescriptorSize; LARGE_INTEGER CreationTime; } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; - -typedef struct _KAPC_STATE { - LIST_ENTRY ApcListHead[2]; - PKPROCESS Process; - BOOLEAN KernelApcInProgress; - BOOLEAN KernelApcPending; - BOOLEAN UserApcPending; -} KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; -#define KAPC_STATE_ACTUAL_LENGTH (FIELD_OFFSET(KAPC_STATE, UserApcPending) + sizeof(BOOLEAN)) typedef struct _BITMAP_RANGE { LIST_ENTRY Links; @@ -5202,14 +5477,6 @@ ULONGLONG StartVcn; MAPPING_PAIR Pair[1]; } GET_RETRIEVAL_DESCRIPTOR, *PGET_RETRIEVAL_DESCRIPTOR; - -typedef struct _KQUEUE { - DISPATCHER_HEADER Header; - LIST_ENTRY EntryListHead; - ULONG CurrentCount; - ULONG MaximumCount; - LIST_ENTRY ThreadListHead; -} KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; #define ASSERT_QUEUE(Q) ASSERT(((Q)->Header.Type & KOBJECT_TYPE_MASK) == QueueObject); @@ -5593,15 +5860,6 @@ extern PSE_EXPORTS SeExports; -typedef struct _SECURITY_CLIENT_CONTEXT { - SECURITY_QUALITY_OF_SERVICE SecurityQos; - PACCESS_TOKEN ClientToken; - BOOLEAN DirectlyAccessClientToken; - BOOLEAN DirectAccessEffectiveOnly; - BOOLEAN ServerIsRemote; - TOKEN_CONTROL ClientTokenControl; -} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; - typedef struct _TUNNEL { FAST_MUTEX Mutex; PRTL_SPLAY_LINKS Cache; @@ -7349,14 +7607,6 @@ ); NTKERNELAPI -UCHAR -NTAPI -KeSetIdealProcessorThread( - IN OUT PKTHREAD Thread, - IN UCHAR Processor -); - -NTKERNELAPI NTSTATUS NTAPI IoAttachDeviceToDeviceStackSafe( @@ -7685,16 +7935,14 @@ IN BOOLEAN AllowRawMount ); -#if !defined (_M_AMD64) - -NTHALAPI +NTKERNELAPI KIRQL FASTCALL KeAcquireQueuedSpinLock ( IN KSPIN_LOCK_QUEUE_NUMBER Number ); -NTHALAPI +NTKERNELAPI VOID FASTCALL KeReleaseQueuedSpinLock ( @@ -7702,162 +7950,11 @@ IN KIRQL OldIrql ); -NTHALAPI -KIRQL -FASTCALL -KeAcquireSpinLockRaiseToSynch( - IN OUT PKSPIN_LOCK SpinLock -); - -NTHALAPI -LOGICAL -FASTCALL -KeTryToAcquireQueuedSpinLock( - KSPIN_LOCK_QUEUE_NUMBER Number, - PKIRQL OldIrql); - -#else - -NTKERNELAPI -KIRQL -FASTCALL -KeAcquireQueuedSpinLock ( - IN KSPIN_LOCK_QUEUE_NUMBER Number -); - -NTKERNELAPI -VOID -FASTCALL -KeReleaseQueuedSpinLock ( - IN KSPIN_LOCK_QUEUE_NUMBER Number, - IN KIRQL OldIrql -); - -NTKERNELAPI -KIRQL -KeAcquireSpinLockRaiseToSynch( - IN OUT PKSPIN_LOCK SpinLock -); - NTKERNELAPI LOGICAL KeTryToAcquireQueuedSpinLock( KSPIN_LOCK_QUEUE_NUMBER Number, PKIRQL OldIrql); - -#endif - -NTKERNELAPI -VOID -NTAPI -KeAttachProcess ( - IN PKPROCESS Process -); - -NTKERNELAPI -VOID -NTAPI -KeDetachProcess ( - VOID -); - -NTKERNELAPI -VOID -NTAPI -KeInitializeQueue ( - IN PRKQUEUE Queue, - IN ULONG Count OPTIONAL -); - -NTKERNELAPI -LONG -NTAPI -KeInsertHeadQueue ( - IN PRKQUEUE Queue, - IN PLIST_ENTRY Entry -); - -NTKERNELAPI -LONG -NTAPI -KeInsertQueue ( - IN PRKQUEUE Queue, - IN PLIST_ENTRY Entry -); - -NTKERNELAPI -LONG -NTAPI -KeReadStateQueue ( - IN PRKQUEUE Queue -); - -NTKERNELAPI -PLIST_ENTRY -NTAPI -KeRemoveQueue ( - IN PRKQUEUE Queue, - IN KPROCESSOR_MODE WaitMode, - IN PLARGE_INTEGER Timeout OPTIONAL -); - -NTKERNELAPI -PLIST_ENTRY -NTAPI -KeRundownQueue ( - IN PRKQUEUE Queue -); - -NTKERNELAPI -VOID -NTAPI -KeInitializeMutant ( - IN PRKMUTANT Mutant, - IN BOOLEAN InitialOwner -); - -NTKERNELAPI -LONG -NTAPI -KeReadStateMutant ( - IN PRKMUTANT Mutant -); - -NTKERNELAPI -LONG -NTAPI -KeReleaseMutant ( - IN PRKMUTANT Mutant, - IN KPRIORITY Increment, - IN BOOLEAN Abandoned, - IN BOOLEAN Wait -); - -#if (VER_PRODUCTBUILD >= 2195) - -NTKERNELAPI -VOID -NTAPI -KeStackAttachProcess ( - IN PKPROCESS Process, - OUT PKAPC_STATE ApcState -); - -NTKERNELAPI -VOID -NTAPI -KeUnstackDetachProcess ( - IN PKAPC_STATE ApcState -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTKERNELAPI -BOOLEAN -NTAPI -KeSetKernelStackSwapEnable( - IN BOOLEAN Enable -); NTKERNELAPI BOOLEAN

14 years, 10 months

← Newer
1
...
56
57
58
59
60
61
62
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2010