Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[weiden] 20893: implemented LsarClose()

by weiden＠svn.reactos.org

implemented LsarClose() Modified: trunk/reactos/lib/lsasrv/lsarpc.c _____ Modified: trunk/reactos/lib/lsasrv/lsarpc.c --- trunk/reactos/lib/lsasrv/lsarpc.c 2006-01-15 13:44:14 UTC (rev 20892) +++ trunk/reactos/lib/lsasrv/lsarpc.c 2006-01-15 14:18:43 UTC (rev 20893) @@ -11,19 +11,85 @@ #define NDEBUG #include <debug.h> +#define POLICY_DELETE (RTL_HANDLE_VALID << 1) +typedef struct _LSAR_POLICY_HANDLE +{ + ULONG Flags; + LONG RefCount; + ACCESS_MASK AccessGranted; +} LSAR_POLICY_HANDLE, *PLSAR_POLICY_HANDLE; -/* GLOBALS *****************************************************************/ +static RTL_CRITICAL_SECTION PolicyHandleTableLock; +static RTL_HANDLE_TABLE PolicyHandleTable; -/* VARIABLES ***************************************************************/ +/* FUNCTIONS ***************************************************************/ +static NTSTATUS +ReferencePolicyHandle(IN LSA_HANDLE ObjectHandle, + IN ACCESS_MASK DesiredAccess, + OUT PLSAR_POLICY_HANDLE *Policy) +{ + PLSAR_POLICY_HANDLE ReferencedPolicy; + NTSTATUS Status = STATUS_SUCCESS; -/* FUNCTIONS ***************************************************************/ + RtlEnterCriticalSection(&PolicyHandleTableLock); + if (RtlIsValidIndexHandle(&PolicyHandleTable, + (ULONG)ObjectHandle, + (PRTL_HANDLE_TABLE_ENTRY*)&ReferencedPolicy) && + !(ReferencedPolicy->Flags & POLICY_DELETE)) + { + if (RtlAreAllAccessesGranted(ReferencedPolicy->AccessGranted, + DesiredAccess)) + { + ReferencedPolicy->RefCount++; + *Policy = ReferencedPolicy; + } + else + Status = STATUS_ACCESS_DENIED; + } + else + Status = STATUS_INVALID_HANDLE; + + RtlLeaveCriticalSection(&PolicyHandleTableLock); + + return Status; +} + +static VOID +DereferencePolicyHandle(IN OUT PLSAR_POLICY_HANDLE Policy, + IN BOOLEAN Delete) +{ + RtlEnterCriticalSection(&PolicyHandleTableLock); + + if (Delete) + { + Policy->Flags |= POLICY_DELETE; + Policy->RefCount--; + + ASSERT(Policy->RefCount != 0); + } + + if (--Policy->RefCount == 0) + { + ASSERT(Policy->Flags & POLICY_DELETE); + RtlFreeHandle(&PolicyHandleTable, + (PRTL_HANDLE_TABLE_ENTRY)Policy); + } + + RtlLeaveCriticalSection(&PolicyHandleTableLock); +} + VOID LsarStartRpcServer(VOID) { RPC_STATUS Status; + RtlInitializeCriticalSection(&PolicyHandleTableLock); + RtlInitializeHandleTable(0x1000, + sizeof(LSAR_POLICY_HANDLE), + &PolicyHandleTable); + DPRINT("LsarStartRpcServer() called"); Status = RpcServerUseProtseqEpW(L"ncacn_np", @@ -60,8 +126,22 @@ LsarClose(IN handle_t BindingHandle, IN unsigned long ObjectHandle) { + PLSAR_POLICY_HANDLE Policy = NULL; + NTSTATUS Status; + DPRINT1("LsarClose(0x%p) called!\n", ObjectHandle); - return STATUS_INVALID_HANDLE; + + Status = ReferencePolicyHandle((LSA_HANDLE)ObjectHandle, + 0, + &Policy); + if (NT_SUCCESS(Status)) + { + /* delete the handle */ + DereferencePolicyHandle(Policy, + TRUE); + } + + return Status; } /* EOF */

18 years, 9 months

[mf] 20892: Explorer: sort drives by path name; ignore hidden attribute of NTFS volumes

by mf＠svn.reactos.org

Explorer: sort drives by path name; ignore hidden attribute of NTFS volumes This resolves Bugzilla issue 1236 Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-15 13:25:50 UTC (rev 20891) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-15 13:44:14 UTC (rev 20892) @@ -170,12 +170,12 @@ // sort order for different directory/file types enum TYPE_ORDER { - TO_DIR = 0, - TO_DOT = 1, - TO_DOTDOT = 2, - TO_OTHER_DIR= 3, - TO_FILE = 4, - TO_VIRTUAL = 8 + TO_DIR, + TO_DOT, + TO_DOTDOT, + TO_OTHER_DIR, + TO_VIRTUAL_FOLDER, + TO_FILE }; // distinguish between ".", ".." and any other directory names @@ -198,21 +198,21 @@ const WIN32_FIND_DATA* fd1 = &entry1->_data; const WIN32_FIND_DATA* fd2 = &entry2->_data; - int order1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; - int order2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; + TYPE_ORDER order1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; + TYPE_ORDER order2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; // Handle "." and ".." as special case and move them at the very first beginning. if (order1==TO_DIR && order2==TO_DIR) { order1 = TypeOrderFromDirname(fd1->cFileName); order2 = TypeOrderFromDirname(fd2->cFileName); - } - // Move virtual folders after physical folders - if (!(entry1->_shell_attribs & SFGAO_FILESYSTEM)) - order1 |= TO_VIRTUAL; + // Move virtual folders after physical folders + if (!(entry1->_shell_attribs & SFGAO_FILESYSTEM)) + order1 = TO_VIRTUAL_FOLDER; - if (!(entry2->_shell_attribs & SFGAO_FILESYSTEM)) - order2 |= TO_VIRTUAL; + if (!(entry2->_shell_attribs & SFGAO_FILESYSTEM)) + order2 = TO_VIRTUAL_FOLDER; + } return order2==order1? 0: order1<order2? -1: 1; } _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp --- trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2006-01-15 13:25:50 UTC (rev 20891) +++ trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2006-01-15 13:44:14 UTC (rev 20892) @@ -72,8 +72,15 @@ pw32fdata->ftLastWriteTime = fad.ftLastWriteTime; if (!(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { + // copy file size pw32fdata->nFileSizeLow = fad.nFileSizeLow; pw32fdata->nFileSizeHigh = fad.nFileSizeHigh; + } else { + // ignore FILE_ATTRIBUTE_HIDDEN attribute of NTFS drives - this would hide those drives in ShellBrowser + if (pw32fdata->dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) { + if (path[1]==':' && path[2]=='\\' && !path[3]) // Is it a drive path? + pw32fdata->dwFileAttributes &= ~FILE_ATTRIBUTE_HIDDEN; + } } } @@ -355,6 +362,7 @@ ShellItemEnumerator enumerator(_folder, SHCONTF_FOLDERS|SHCONTF_NONFOLDERS|SHCONTF_INCLUDEHIDDEN|SHCONTF_SHAREAB LE|SHCONTF_STORAGE); TCHAR name[MAX_PATH]; + TCHAR path[MAX_PATH]; HRESULT hr_next = S_OK; do { @@ -423,6 +431,11 @@ if (bhfi_valid) memcpy(&entry->_bhfi, &bhfi, sizeof(BY_HANDLE_FILE_INFORMATION)); + // store path in entry->_data.cFileName in case fill_w32fdata_shell() didn't already fill it + if (!entry->_data.cFileName[0]) + if (SUCCEEDED(path_from_pidl(_folder, pidls[n], path, COUNTOF(path)))) + _tcscpy(entry->_data.cFileName, path); + if (SUCCEEDED(name_from_pidl(_folder, pidls[n], name, COUNTOF(name), SHGDN_INFOLDER|0x2000/*0x2000=SHGDN_INCLUDE_NONFILESYS*/))) { if (!entry->_data.cFileName[0]) _tcscpy(entry->_data.cFileName, name);

18 years, 9 months

[weiden] 20891: disable starting lsass.exe for now

by weiden＠svn.reactos.org

disable starting lsass.exe for now Modified: trunk/reactos/bootdata/hivesft.inf _____ Modified: trunk/reactos/bootdata/hivesft.inf --- trunk/reactos/bootdata/hivesft.inf 2006-01-15 13:19:57 UTC (rev 20890) +++ trunk/reactos/bootdata/hivesft.inf 2006-01-15 13:25:50 UTC (rev 20891) @@ -737,7 +737,7 @@ ;HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cm d.exe" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.ex e" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 +HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000000 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartGUI",0x00010001,0x00000000 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32 \userinit.exe"

18 years, 9 months

[weiden] 20890: - use RPC for communication with lsass

by weiden＠svn.reactos.org

- use RPC for communication with lsass - start lsass.exe on startup Modified: trunk/reactos/bootdata/hivesft.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/include/idl/idl.xml Added: trunk/reactos/include/idl/lsa.idl Modified: trunk/reactos/lib/advapi32/advapi32.h Modified: trunk/reactos/lib/advapi32/advapi32.xml Modified: trunk/reactos/lib/advapi32/sec/lsa.c Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/lib/advapi32/service/sctrl.c Deleted: trunk/reactos/lib/lsasrv/lsaport.c Added: trunk/reactos/lib/lsasrv/lsarpc.c Modified: trunk/reactos/lib/lsasrv/lsasrv.c Modified: trunk/reactos/lib/lsasrv/lsasrv.xml Modified: trunk/reactos/subsys/system/winlogon/winlogon.c _____ Modified: trunk/reactos/bootdata/hivesft.inf --- trunk/reactos/bootdata/hivesft.inf 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/bootdata/hivesft.inf 2006-01-15 13:19:57 UTC (rev 20890) @@ -737,6 +737,7 @@ ;HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cm d.exe" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.ex e" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 +HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartGUI",0x00010001,0x00000000 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32 \userinit.exe" _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/bootdata/packages/reactos.dff 2006-01-15 13:19:57 UTC (rev 20890) @@ -193,6 +193,7 @@ subsys\system\explorer\notifyhook\notifyhook.dll 1 subsys\system\format\format.exe 1 subsys\system\ibrowser\ibrowser.exe 1 +subsys\system\lsass\lsass.exe 1 subsys\system\msconfig\msconfig.exe 1 subsys\system\msiexec\msiexec.exe 1 subsys\system\notepad\notepad.exe 1 _____ Modified: trunk/reactos/include/idl/idl.xml --- trunk/reactos/include/idl/idl.xml 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/include/idl/idl.xml 2006-01-15 13:19:57 UTC (rev 20890) @@ -35,4 +35,16 @@ <define name="_X86_" /> <file switches="--oldnames">eventlogrpc.idl</file> </module> +<module name="lsa_server" type="rpcserver"> + <include base="ReactOS">.</include> + <include base="ReactOS">w32api/include</include> + <define name="_X86_" /> + <file switches="--oldnames">lsa.idl</file> +</module> +<module name="lsa_client" type="rpcclient"> + <include base="ReactOS">.</include> + <include base="ReactOS">w32api/include</include> + <define name="_X86_" /> + <file switches="--oldnames">lsa.idl</file> +</module> </group> _____ Added: trunk/reactos/include/idl/lsa.idl --- trunk/reactos/include/idl/lsa.idl 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/include/idl/lsa.idl 2006-01-15 13:19:57 UTC (rev 20890) @@ -0,0 +1,42 @@ +/* + * Local Security Authority interface definition + */ + +#define BYTE unsigned char +#define DWORD unsigned int +#define BOOL unsigned long +#define LPBYTE unsigned char* +#define LPDWORD unsigned long* +#define LSA_HANDLE unsigned long +#define NTSTATUS unsigned int + +[ + uuid(12345778-1234-abcd-ef00-0123456789ab), + version(0.0), + pointer_default(unique), + explicit_handle +] +interface lsarpc +{ +/* + cpp_quote("#if 0") + typedef [handle, unique] wchar_t *LPWSTR; + typedef [handle, unique] char *LPSTR; + cpp_quote("#endif") + typedef [context_handle] void *LSA_HANDLE; + typedef LSA_HANDLE *PLSA_HANDLE; + typedef unsigned int NTSTATUS; +*/ + + cpp_quote("#if 0") + typedef struct _LSA_UNICODE_STRING { + unsigned short Length; + unsigned short MaximumLength; + [size_is(MaximumLength)] wchar_t *Buffer; + } LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; + cpp_quote("#endif") + + /* Function 0 */ + NTSTATUS LsarClose(handle_t BindingHandle, + [in] LSA_HANDLE ObjectHandle); +} Property changes on: trunk/reactos/include/idl/lsa.idl ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/advapi32/advapi32.h --- trunk/reactos/lib/advapi32/advapi32.h 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/advapi32/advapi32.h 2006-01-15 13:19:57 UTC (rev 20890) @@ -24,6 +24,10 @@ /* this has to go after the NDK when being used with the NDK */ #include <ntsecapi.h> +#include <services/services.h> +#include "svcctl_c.h" +#include "lsa_c.h" + #ifndef HAS_FN_PROGRESSW #define FN_PROGRESSW FN_PROGRESS #endif _____ Modified: trunk/reactos/lib/advapi32/advapi32.xml --- trunk/reactos/lib/advapi32/advapi32.xml 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/advapi32/advapi32.xml 2006-01-15 13:19:57 UTC (rev 20890) @@ -2,11 +2,13 @@ <importlibrary definition="advapi32.def" /> <include base="advapi32">.</include> <include base="scm_client">.</include> + <include base="lsa_client">.</include> <define name="__USE_W32API" /> <define name="WINVER">0x600</define> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <library>scm_client</library> + <library>lsa_client</library> <library>ntdll</library> <library>kernel32</library> <library>rpcrt4</library> _____ Modified: trunk/reactos/lib/advapi32/sec/lsa.c --- trunk/reactos/lib/advapi32/sec/lsa.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/advapi32/sec/lsa.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -16,24 +16,80 @@ #define NDEBUG #include <debug.h> +static handle_t LSABindingHandle = NULL; -#ifndef SID_REVISION /* FIXME - Winnt.h */ -#define SID_REVISION (1) /* Current revision */ -#endif +static VOID +LSAHandleUnbind(handle_t *Handle) +{ + RPC_STATUS status; + if (*Handle == NULL) + return; + status = RpcBindingFree(Handle); + if (status) + { + DPRINT1("RpcBindingFree returned 0x%x\n", status); + } +} + +static VOID +LSAHandleBind(VOID) +{ + LPWSTR pszStringBinding; + RPC_STATUS status; + handle_t Handle; + + if (LSABindingHandle != NULL) + return; + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + NULL, + L"\\pipe\\lsarpc", + NULL, + &pszStringBinding); + if (status) + { + DPRINT1("RpcStringBindingCompose returned 0x%x\n", status); + return; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &Handle); + if (status) + { + DPRINT1("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { + DPRINT1("RpcStringFree returned 0x%x\n", status); + } + + if (InterlockedCompareExchangePointer(&LSABindingHandle, + (PVOID)Handle, + NULL) != NULL) + { + LSAHandleUnbind(&Handle); + } +} + + /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL LsaClose(LSA_HANDLE ObjectHandle) { - static int count = 0; - if (count++ < 20) - { - DPRINT1("(%p):LsaClose stub\n",ObjectHandle); - } - return 0xc0000000; + DPRINT("LsaClose(0x%p) called\n", ObjectHandle); + + LSAHandleBind(); + + return LsarClose(LSABindingHandle, + (unsigned long)ObjectHandle); } /* @@ -187,7 +243,7 @@ PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, PLSA_TRANSLATED_NAME *Names) { - return STATUS_NOT_IMPLEMENTED; + return STATUS_NONE_MAPPED; } /*********************************************************************** ******* _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/advapi32/service/scm.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -13,7 +13,6 @@ /* INCLUDES ******************************************************************/ #include <advapi32.h> -#include "svcctl_c.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/advapi32/service/sctrl.c --- trunk/reactos/lib/advapi32/service/sctrl.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/advapi32/service/sctrl.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -13,7 +13,6 @@ /* INCLUDES ******************************************************************/ #include <advapi32.h> -#include <services/services.h> #define NDEBUG #include <debug.h> _____ Deleted: trunk/reactos/lib/lsasrv/lsaport.c --- trunk/reactos/lib/lsasrv/lsaport.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/lsasrv/lsaport.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -1,179 +0,0 @@ -/* - */ - -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - -//#define NDEBUG -#include <debug.h> - - -HANDLE PortThreadHandle = NULL; -HANDLE ConnectPortHandle = NULL; -HANDLE MessagePortHandle = NULL; - - -static NTSTATUS -InitializeLsaPort(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING PortName; - PORT_MESSAGE Request; - NTSTATUS Status; - - ConnectPortHandle = NULL; - MessagePortHandle = NULL; - - RtlInitUnicodeString(&PortName, - L"\\SeLsaCommandPort"); - - InitializeObjectAttributes(&ObjectAttributes, - &PortName, - 0, - NULL, - NULL); - - Status = NtCreatePort(&ConnectPortHandle, - &ObjectAttributes, - 0, - 0x100, - 0x2000); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreatePort() failed (Status %lx)\n", Status); - goto ByeBye; - } - - Status = NtListenPort(ConnectPortHandle, - &Request); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtListenPort() failed (Status %lx)\n", Status); - goto ByeBye; - } - - Status = NtAcceptConnectPort(&MessagePortHandle, - ConnectPortHandle, - NULL, - TRUE, - NULL, - NULL); - if (!NT_SUCCESS (Status)) - { - DPRINT1("NtAcceptConnectPort() failed (Status %lx)\n", Status); - goto ByeBye; - } - - Status = NtCompleteConnectPort (MessagePortHandle); - if (!NT_SUCCESS (Status)) - { - DPRINT1("NtCompleteConnectPort() failed (Status %lx)\n", Status); - goto ByeBye; - } - -ByeBye: - if (!NT_SUCCESS (Status)) - { - if (ConnectPortHandle != NULL) - NtClose (ConnectPortHandle); - - if (MessagePortHandle != NULL) - NtClose (MessagePortHandle); - } - - return Status; -} - - -static NTSTATUS -ProcessPortMessage(VOID) -{ - PORT_MESSAGE Request; -// LPC_MAX_MESSAGE Reply; - NTSTATUS Status; - - - DPRINT1("ProcessPortMessage() called\n"); - - Status = STATUS_SUCCESS; - - for (;;) - { - Status = NtReplyWaitReceivePort(MessagePortHandle, - 0, - NULL, - &Request); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtReplyWaitReceivePort() failed (Status %lx)\n", Status); - break; - } - - DPRINT("Received message\n"); - - if (Request.u2.s2.Type == LPC_PORT_CLOSED) - { - DPRINT("Port closed\n"); - -// return STATUS_UNSUCCESSFUL; - } - if (Request.u2.s2.Type == LPC_REQUEST) - { - DPRINT("Received request\n"); - - } - else if (Request.u2.s2.Type == LPC_DATAGRAM) - { - DPRINT("Received datagram\n"); - -// Message = (PIO_ERROR_LOG_MESSAGE)&Request.Data; - - } - } - - return Status; -} - - -static NTSTATUS STDCALL -PortThreadRoutine(PVOID Param) -{ - NTSTATUS Status = STATUS_SUCCESS; - - Status = InitializeLsaPort(); - if (!NT_SUCCESS(Status)) - return Status; - - while (NT_SUCCESS(Status)) - { - Status = ProcessPortMessage(); - } - - if (ConnectPortHandle != NULL) - NtClose (ConnectPortHandle); - - if (MessagePortHandle != NULL) - NtClose (MessagePortHandle); - - return Status; -} - - -BOOLEAN -StartLsaPortThread(VOID) -{ - DWORD ThreadId; - - PortThreadHandle = CreateThread(NULL, - 0x1000, - (LPTHREAD_START_ROUTINE)PortThreadRoutine, - NULL, - 0, - &ThreadId); - - return (PortThreadHandle != NULL); -} - -/* EOF */ _____ Added: trunk/reactos/lib/lsasrv/lsarpc.c --- trunk/reactos/lib/lsasrv/lsarpc.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/lsasrv/lsarpc.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -0,0 +1,67 @@ +/* INCLUDES ****************************************************************/ + +#define WIN32_NO_STATUS +#include <windows.h> +#include <ntsecapi.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +#include "lsa_s.h" + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS *****************************************************************/ + +/* VARIABLES ***************************************************************/ + + +/* FUNCTIONS ***************************************************************/ + +VOID +LsarStartRpcServer(VOID) +{ + RPC_STATUS Status; + + DPRINT("LsarStartRpcServer() called"); + + Status = RpcServerUseProtseqEpW(L"ncacn_np", + 10, + L"\\pipe\\lsarpc", + NULL); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return; + } + + Status = RpcServerRegisterIf(lsarpc_ServerIfHandle, + NULL, + NULL); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return; + } + + Status = RpcServerListen(1, 20, TRUE); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerListen() failed (Status %lx)\n", Status); + return; + } + + DPRINT("LsarStartRpcServer() done"); +} + +/* Function 0 */ +unsigned int +LsarClose(IN handle_t BindingHandle, + IN unsigned long ObjectHandle) +{ + DPRINT1("LsarClose(0x%p) called!\n", ObjectHandle); + return STATUS_INVALID_HANDLE; +} + +/* EOF */ Property changes on: trunk/reactos/lib/lsasrv/lsarpc.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/lsasrv/lsasrv.c --- trunk/reactos/lib/lsasrv/lsasrv.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/lsasrv/lsasrv.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -3,22 +3,42 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <lsass/lsasrv.h> - #define NDEBUG #include <debug.h> -VOID StartLsaPortThread(VOID); +VOID LsarStartRpcServer(VOID); NTSTATUS STDCALL LsapInitLsa(VOID) { - DPRINT1("LsapInitLsa() called\n"); + HANDLE hEvent; - StartLsaPortThread(); + DPRINT1("LsapInitLsa() called\n"); - return STATUS_SUCCESS; + LsarStartRpcServer(); + + hEvent = OpenEventW(EVENT_MODIFY_STATE, + FALSE, + L"\\SECURITY_SERVICES_STARTED"); + if (hEvent != NULL) + { + SetEvent(hEvent); + CloseHandle(hEvent); + } + return STATUS_SUCCESS; } +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) +{ + return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + RtlFreeHeap(RtlGetProcessHeap(), 0, ptr); +} + + /* EOF */ _____ Modified: trunk/reactos/lib/lsasrv/lsasrv.xml --- trunk/reactos/lib/lsasrv/lsasrv.xml 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/lib/lsasrv/lsasrv.xml 2006-01-15 13:19:57 UTC (rev 20890) @@ -1,14 +1,19 @@ <module name="lsasrv" type="win32dll" baseaddress="${BASEADDRESS_LSASRV}" entrypoint="0" installbase="system32" installname="lsasrv.dll"> <importlibrary definition="lsasrv.def" /> <include base="lsasrv">.</include> + <include base="lsa_server">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> <define name="__USE_W32API" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x0600</define> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostdlib</linkerflag> + <library>lsa_server</library> <library>ntdll</library> <library>kernel32</library> - <file>lsaport.c</file> + <library>rpcrt4</library> + <file>lsarpc.c</file> <file>lsasrv.c</file> <file>lsasrv.rc</file> </module> _____ Modified: trunk/reactos/subsys/system/winlogon/winlogon.c --- trunk/reactos/subsys/system/winlogon/winlogon.c 2006-01-15 12:30:17 UTC (rev 20889) +++ trunk/reactos/subsys/system/winlogon/winlogon.c 2006-01-15 13:19:57 UTC (rev 20890) @@ -16,7 +16,7 @@ #include <debug.h> #define SUPPORT_CONSOLESTART 1 -#define START_LSASS 0 +#define START_LSASS 1 /* GLOBALS ******************************************************************/ @@ -161,11 +161,12 @@ BOOLEAN Result; STARTUPINFO StartupInfo; PROCESS_INFORMATION ProcessInformation; + WCHAR ServiceString[] = L"lsass.exe"; LsassInitEvent = CreateEvent(NULL, TRUE, FALSE, - L"\\LsassInitDone"); + L"\\SECURITY_SERVICES_STARTED"); if (LsassInitEvent == NULL) { @@ -183,10 +184,10 @@ StartupInfo.cbReserved2 = 0; StartupInfo.lpReserved2 = 0; - Result = CreateProcess(L"lsass.exe", + Result = CreateProcess(NULL, + ServiceString, NULL, NULL, - NULL, FALSE, DETACHED_PROCESS, NULL, @@ -199,7 +200,6 @@ return(FALSE); } - DPRINT("WL: Waiting for lsass\n"); WaitForSingleObject(LsassInitEvent, INFINITE); CloseHandle(LsassInitEvent);

18 years, 9 months

[mf] 20889: change explorer sort order so that virtual folders are moved after physical folders

by mf＠svn.reactos.org

change explorer sort order so that virtual folders are moved after physical folders Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-15 10:17:35 UTC (rev 20888) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-15 12:30:17 UTC (rev 20889) @@ -59,6 +59,7 @@ _bhfi_valid = false; _level = 0; _icon_id = ICID_UNKNOWN; + _shell_attribs = 0; _display_name = _data.cFileName; _type_name = NULL; _content = NULL; @@ -167,19 +168,53 @@ } + // sort order for different directory/file types +enum TYPE_ORDER { + TO_DIR = 0, + TO_DOT = 1, + TO_DOTDOT = 2, + TO_OTHER_DIR= 3, + TO_FILE = 4, + TO_VIRTUAL = 8 +}; + + // distinguish between ".", ".." and any other directory names +static TYPE_ORDER TypeOrderFromDirname(LPCTSTR name) +{ + if (name[0] == '.') { + if (name[1] == '\0') + return TO_DOT; // "." + + if (name[1]=='.' && name[2]=='\0') + return TO_DOTDOT; // ".." + } + + return TO_OTHER_DIR; // any other directory +} + // directories first... -static int compareType(const WIN32_FIND_DATA* fd1, const WIN32_FIND_DATA* fd2) +static int compareType(const Entry* entry1, const Entry* entry2) { - int order1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; - int order2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; + const WIN32_FIND_DATA* fd1 = &entry1->_data; + const WIN32_FIND_DATA* fd2 = &entry2->_data; - /* Handle "." and ".." as special case and move them at the very first beginning. */ - if (order1 && order2) { - order1 = fd1->cFileName[0]!='.'? 1: fd1->cFileName[1]=='.'? 2: fd1->cFileName[1]=='\0'? 3: 1; - order2 = fd2->cFileName[0]!='.'? 1: fd2->cFileName[1]=='.'? 2: fd2->cFileName[1]=='\0'? 3: 1; + int order1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; + int order2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; + + // Handle "." and ".." as special case and move them at the very first beginning. + if (order1==TO_DIR && order2==TO_DIR) { + order1 = TypeOrderFromDirname(fd1->cFileName); + order2 = TypeOrderFromDirname(fd2->cFileName); } - return order2==order1? 0: order2<order1? -1: 1; + // Move virtual folders after physical folders + if (!(entry1->_shell_attribs & SFGAO_FILESYSTEM)) + order1 |= TO_VIRTUAL; + + if (!(entry2->_shell_attribs & SFGAO_FILESYSTEM)) + order2 |= TO_VIRTUAL; + + return order2==order1? 0: order1<order2? -1: 1; } @@ -190,28 +225,28 @@ static int compareName(const void* arg1, const void* arg2) { - const WIN32_FIND_DATA* fd1 = &(*(Entry**)arg1)->_data; - const WIN32_FIND_DATA* fd2 = &(*(Entry**)arg2)->_data; + const Entry* entry1 = *(const Entry**)arg1; + const Entry* entry2 = *(const Entry**)arg2; - int cmp = compareType(fd1, fd2); + int cmp = compareType(entry1, entry2); if (cmp) return cmp; - return lstrcmpi(fd1->cFileName, fd2->cFileName); + return lstrcmpi(entry1->_data.cFileName, entry2->_data.cFileName); } static int compareExt(const void* arg1, const void* arg2) { - const WIN32_FIND_DATA* fd1 = &(*(Entry**)arg1)->_data; - const WIN32_FIND_DATA* fd2 = &(*(Entry**)arg2)->_data; + const Entry* entry1 = *(const Entry**)arg1; + const Entry* entry2 = *(const Entry**)arg2; const TCHAR *name1, *name2, *ext1, *ext2; - int cmp = compareType(fd1, fd2); + int cmp = compareType(entry1, entry2); if (cmp) return cmp; - name1 = fd1->cFileName; - name2 = fd2->cFileName; + name1 = entry1->_data.cFileName; + name2 = entry2->_data.cFileName; ext1 = _tcsrchr(name1, TEXT('.')); ext2 = _tcsrchr(name2, TEXT('.')); @@ -235,35 +270,35 @@ static int compareSize(const void* arg1, const void* arg2) { - WIN32_FIND_DATA* fd1 = &(*(Entry**)arg1)->_data; - WIN32_FIND_DATA* fd2 = &(*(Entry**)arg2)->_data; + const Entry* entry1 = *(const Entry**)arg1; + const Entry* entry2 = *(const Entry**)arg2; - int cmp = compareType(fd1, fd2); + int cmp = compareType(entry1, entry2); if (cmp) return cmp; - cmp = fd2->nFileSizeHigh - fd1->nFileSizeHigh; + cmp = entry2->_data.nFileSizeHigh - entry1->_data.nFileSizeHigh; if (cmp < 0) return -1; else if (cmp > 0) return 1; - cmp = fd2->nFileSizeLow - fd1->nFileSizeLow; + cmp = entry2->_data.nFileSizeLow - entry1->_data.nFileSizeLow; return cmp<0? -1: cmp>0? 1: 0; } static int compareDate(const void* arg1, const void* arg2) { - WIN32_FIND_DATA* fd1 = &(*(Entry**)arg1)->_data; - WIN32_FIND_DATA* fd2 = &(*(Entry**)arg2)->_data; + const Entry* entry1 = *(const Entry**)arg1; + const Entry* entry2 = *(const Entry**)arg2; - int cmp = compareType(fd1, fd2); + int cmp = compareType(entry1, entry2); if (cmp) return cmp; - return CompareFileTime(&fd2->ftLastWriteTime, &fd1->ftLastWriteTime); + return CompareFileTime(&entry2->_data.ftLastWriteTime, &entry1->_data.ftLastWriteTime); }

18 years, 9 months

[hbirr] 20888: Fix the smp build.

by hbirr＠svn.reactos.org

Fix the smp build. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-15 09:23:55 UTC (rev 20887) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-15 10:17:35 UTC (rev 20888) @@ -139,7 +139,7 @@ mov dword ptr [ebx+KPCR_NPX_THREAD], 0 test byte ptr [edi+KTHREAD_NPX_STATE], NPX_STATE_DIRTY jz 3f - cmp dword ptr _FxsrSupport, 0 + cmp dword ptr _KeI386FxsrPresent, 0 je 1f fxsave [eax-SIZEOF_FX_SAVE_AREA] jmp 2f

18 years, 9 months

[ion] 20887: - Update KeContextToTrapFrame to support separate ContextFlags parameters in the scenario where we want to convert more then the Context's flag specify

by ion＠svn.reactos.org

- Update KeContextToTrapFrame to support separate ContextFlags parameters in the scenario where we want to convert more then the Context's flag specify - Rename some of the internal FPU flags to external names and make them global. - Improve context creation of new threads to initialize the virgin NPX state for new threads, to clear DR debug registers, to properly convert the context to a trap frame, to set the right segment registers, to set the debugging mark in the trap frame, and to properly set the initial eflags. - Add stubs for upcoming support for extended/floating point registers in KeContextToTrapFrame and KeTrapFrameToContext. Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/ntoskrnl/ke/exception.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c Modified: trunk/reactos/ntoskrnl/ps/debug.c _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2006-01-15 09:14:04 UTC (rev 20886) +++ trunk/reactos/include/ndk/asm.h 2006-01-15 09:23:55 UTC (rev 20887) @@ -110,6 +110,7 @@ #define KPCR_TEB 0x18 #define KPCR_SELF 0x1C #define KPCR_PRCB 0x20 +#define KPCR_IRQL 0x24 #define KPCR_KD_VERSION_BLOCK 0x34 #define KPCR_GDT 0x3C #define KPCR_TSS 0x40 @@ -121,6 +122,7 @@ #define KPCR_NPX_THREAD 0x2F4 #define KPCR_DR6 0x428 #define KPCR_DR7 0x42C +#define KPCR_SYSTEM_CALLS 0x6B8 // // KGDTENTRY Offsets @@ -143,6 +145,12 @@ #define NPX_FRAME_LENGTH 0x210 // +// NPX States +// +#define NPX_STATE_NOT_LOADED 0xA +#define NPX_STATE_LOADED 0x0 + +// // Trap Frame Offsets // #define KTRAP_FRAME_DEBUGEBP 0x0 _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2006-01-15 09:14:04 UTC (rev 20886) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2006-01-15 09:23:55 UTC (rev 20887) @@ -41,6 +41,9 @@ extern PVOID KeRaiseUserExceptionDispatcher; extern LARGE_INTEGER SystemBootTime; extern ULONG_PTR KERNEL_BASE; +extern ULONG KeI386NpxPresent; +extern ULONG KeI386XMMIPresent; +extern ULONG KeI386FxsrPresent; /* MACROS ************************************************************************ */ @@ -475,12 +478,13 @@ NTAPI KeGetStackTopThread(struct _ETHREAD* Thread); -BOOLEAN +VOID STDCALL KeContextToTrapFrame( PCONTEXT Context, PKEXCEPTION_FRAME ExeptionFrame, PKTRAP_FRAME TrapFrame, + ULONG ContextFlags, KPROCESSOR_MODE PreviousMode ); _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2006-01-15 09:14:04 UTC (rev 20886) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2006-01-15 09:23:55 UTC (rev 20887) @@ -1720,7 +1720,7 @@ KdpGdbEnterDebuggerException(NULL, &Context, TrapFrame); - KeContextToTrapFrame(&Context, NULL, TrapFrame, KernelMode); + KeContextToTrapFrame(&Context, NULL, TrapFrame, Context.ContextFlags, KernelMode); KeLowerIrql(OldIrql); _____ Modified: trunk/reactos/ntoskrnl/ke/exception.c --- trunk/reactos/ntoskrnl/ke/exception.c 2006-01-15 09:14:04 UTC (rev 20886) +++ trunk/reactos/ntoskrnl/ke/exception.c 2006-01-15 09:23:55 UTC (rev 20887) @@ -28,7 +28,11 @@ Context = &LocalContext; /* Convert the context into Exception/Trap Frames */ - KeContextToTrapFrame(&LocalContext, ExceptionFrame, TrapFrame, UserMode); + KeContextToTrapFrame(&LocalContext, + ExceptionFrame, + TrapFrame, + LocalContext.ContextFlags, + UserMode); } NTSTATUS @@ -62,7 +66,11 @@ else { /* Convert the context into Exception/Trap Frames */ - KeContextToTrapFrame(Context, ExceptionFrame, TrapFrame, KernelMode); + KeContextToTrapFrame(Context, + ExceptionFrame, + TrapFrame, + Context->ContextFlags, + KernelMode); } } _SEH_HANDLE @@ -142,7 +150,11 @@ if (NT_SUCCESS(Status)) { /* Convert the context record */ - KeContextToTrapFrame(Context, ExceptionFrame, TrapFrame, PreviousMode); + KeContextToTrapFrame(Context, + ExceptionFrame, + TrapFrame, + Context->ContextFlags, + PreviousMode); /* Dispatch the exception */ KiDispatchException(ExceptionRecord, _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2006-01-15 09:14:04 UTC (rev 20886) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2006-01-15 09:23:55 UTC (rev 20887) @@ -1,10 +1,11 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel * FILE: ntoskrnl/ke/i386/exp.c - * PURPOSE: Handling exceptions - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * PURPOSE: Exception Support Code + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * Gregor Anich + * David Welch (welch(a)cwcom.net) * Skywing (skywing(a)valhallalegends.com) */ @@ -22,7 +23,6 @@ /* * FIXMES: - * - Put back VEH. * - Clean up file. * - Sanitize some context fields. * - Add PSEH handler when an exception occurs in an exception (KiCopyExceptionRecord). @@ -689,17 +689,20 @@ } } -BOOLEAN +VOID NTAPI KeContextToTrapFrame(IN PCONTEXT Context, IN OUT PKEXCEPTION_FRAME ExceptionFrame, IN OUT PKTRAP_FRAME TrapFrame, + IN ULONG ContextFlags, IN KPROCESSOR_MODE PreviousMode) { + PFX_SAVE_AREA FxSaveArea; + //ULONG i; Future Use BOOLEAN V86Switch = FALSE; /* Start with the basic Registers */ - if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) + if ((ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) { /* Check if we went through a V86 switch */ if ((Context->EFlags & X86_EFLAGS_VM) != @@ -746,7 +749,7 @@ } /* Process the Integer Registers */ - if ((Context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) + if ((ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) { TrapFrame->Eax = Context->Eax; TrapFrame->Ebx = Context->Ebx; @@ -757,7 +760,7 @@ } /* Process the Context Segments */ - if ((Context->ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS) + if ((ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS) { /* Check if we were in V86 Mode */ if (TrapFrame->EFlags & X86_EFLAGS_VM) @@ -770,7 +773,7 @@ } else if (!(TrapFrame->SegCs & MODE_MASK)) { - /* For user mode, write the values directly */ + /* For kernel mode, write the standard values */ TrapFrame->SegDs = KGDT_R3_DATA | RPL_MASK; TrapFrame->SegEs = KGDT_R3_DATA | RPL_MASK; TrapFrame->SegFs = Context->SegFs; @@ -778,7 +781,7 @@ } else { - /* For kernel-mode, return the values */ + /* For user mode, return the values directlry */ TrapFrame->SegDs = Context->SegDs; TrapFrame->SegEs = Context->SegEs; TrapFrame->SegFs = Context->SegFs; @@ -797,8 +800,42 @@ } } + /* Handle the extended registers */ + if (((ContextFlags & CONTEXT_EXTENDED_REGISTERS) == + CONTEXT_EXTENDED_REGISTERS) && + ((TrapFrame->SegCs & MODE_MASK) == UserMode)) + { + /* Get the FX Area */ + FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); + + /* Check if NPX is present */ + if (KeI386NpxPresent) + { + /* Future use */ + } + } + + /* Handle the floating point state */ + if (((ContextFlags & CONTEXT_FLOATING_POINT) == + CONTEXT_FLOATING_POINT) && + ((TrapFrame->SegCs & MODE_MASK) == UserMode)) + { + /* Get the FX Area */ + FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); + + /* Check if NPX is present */ + if (KeI386NpxPresent) + { + /* Future use */ + } + else + { + /* Future use */ + } + } + /* Handle the Debug Registers */ - if ((Context->ContextFlags & CONTEXT_DEBUG_REGISTERS) == CONTEXT_DEBUG_REGISTERS) + if ((ContextFlags & CONTEXT_DEBUG_REGISTERS) == CONTEXT_DEBUG_REGISTERS) { /* FIXME: All these should be sanitized */ TrapFrame->Dr0 = Context->Dr0; @@ -812,12 +849,13 @@ if (PreviousMode != KernelMode) { /* Set the Debug Flag */ - KeGetCurrentThread()->DispatcherHeader.DebugActive = (Context->Dr7 & DR7_ACTIVE); + KeGetCurrentThread()->DispatcherHeader.DebugActive = + (Context->Dr7 & DR7_ACTIVE); } } /* Handle FPU and Extended Registers */ - return KiContextToFxSaveArea((PFX_SAVE_AREA)(TrapFrame + 1), Context); + KiContextToFxSaveArea((PFX_SAVE_AREA)(TrapFrame + 1), Context); } VOID @@ -898,15 +936,52 @@ Context->Edi = TrapFrame->Edi; } - if ((Context->ContextFlags & CONTEXT_DEBUG_REGISTERS) == CONTEXT_DEBUG_REGISTERS) + /* Handle extended registers */ + if (((Context->ContextFlags & CONTEXT_EXTENDED_REGISTERS) == + CONTEXT_EXTENDED_REGISTERS) && + ((TrapFrame->SegCs & MODE_MASK) == UserMode)) { - /* - * FIXME: Implement this case - */ - Context->ContextFlags &= (~CONTEXT_DEBUG_REGISTERS) | CONTEXT_i386; + /* Get the FX Save Area */ + FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); + + /* Make sure NPX is present */ + if (KeI386NpxPresent) + { + /* Future use */ + } + + /* Old code */ + FxSaveArea = KiGetFpuState(KeGetCurrentThread()); + if (FxSaveArea != NULL) + { + memcpy(Context->ExtendedRegisters, &FxSaveArea->U.FxArea, + min(sizeof (Context->ExtendedRegisters), sizeof (FxSaveArea->U.FxArea)) ); + } + else + { + Context->ContextFlags &= (~CONTEXT_EXTENDED_REGISTERS) | CONTEXT_i386; + } } - if ((Context->ContextFlags & CONTEXT_FLOATING_POINT) == CONTEXT_FLOATING_POINT) + + /* Handle Floating Point */ + if (((Context->ContextFlags & CONTEXT_FLOATING_POINT) == + CONTEXT_FLOATING_POINT) && + ((TrapFrame->SegCs & MODE_MASK) == UserMode)) { + /* Get the FX Save Area */ + FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); + + /* Make sure we have an NPX */ + if (KeI386NpxPresent) + { + /* Future use */ + } + else + { + /* Future Use */ + } + + /* Old code */ FxSaveArea = KiGetFpuState(KeGetCurrentThread()); if (FxSaveArea != NULL) { @@ -917,18 +992,30 @@ Context->ContextFlags &= (~CONTEXT_FLOATING_POINT) | CONTEXT_i386; } } - if ((Context->ContextFlags & CONTEXT_EXTENDED_REGISTERS) == CONTEXT_EXTENDED_REGISTERS) + + /* Handle debug registers */ + if ((Context->ContextFlags & CONTEXT_DEBUG_REGISTERS) == + CONTEXT_DEBUG_REGISTERS) { - if (FxSaveArea == NULL) - FxSaveArea = KiGetFpuState(KeGetCurrentThread()); - if (FxSaveArea != NULL) + /* Copy the debug registers */ + Context->Dr0 = TrapFrame->Dr0; + Context->Dr1 = TrapFrame->Dr1; + Context->Dr2 = TrapFrame->Dr2; + Context->Dr3 = TrapFrame->Dr3; + Context->Dr6 = TrapFrame->Dr6; + + /* For user-mode, only set DR7 if a debugger is active */ + if (((TrapFrame->SegCs & MODE_MASK) || + (TrapFrame->EFlags & EFLAGS_V86_MASK)) && + (KeGetCurrentThread()->DispatcherHeader.DebugActive)) { - memcpy(Context->ExtendedRegisters, &FxSaveArea->U.FxArea, - min(sizeof (Context->ExtendedRegisters), sizeof (FxSaveArea->U.FxArea)) ); + /* Copy it over */ + Context->Dr7 = TrapFrame->Dr7; } else { - Context->ContextFlags &= (~CONTEXT_EXTENDED_REGISTERS) | CONTEXT_i386; + /* Clear it */ + Context->Dr7 = 0; } } } @@ -1187,11 +1274,9 @@ /* Check if User Mode */ if (PreviousMode == UserMode) { - extern ULONG FxsrSupport; /* Add the FPU Flag */ Context.ContextFlags |= CONTEXT_FLOATING_POINT; - if (FxsrSupport) - Context.ContextFlags |= CONTEXT_EXTENDED_REGISTERS; + if (KeI386FxsrPresent) Context.ContextFlags |= CONTEXT_EXTENDED_REGISTERS; } /* Get a Context */ @@ -1321,27 +1406,42 @@ Handled: /* Convert the context back into Trap/Exception Frames */ - KeContextToTrapFrame(&Context, NULL, TrapFrame, PreviousMode); + KeContextToTrapFrame(&Context, + NULL, + TrapFrame, + Context.ContextFlags, + PreviousMode); return; } /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +NTAPI KeRaiseUserException(IN NTSTATUS ExceptionCode) { ULONG OldEip; PKTHREAD Thread = KeGetCurrentThread(); - _SEH_TRY { + /* Make sure we can access the TEB */ + _SEH_TRY + { Thread->Teb->ExceptionCode = ExceptionCode; - } _SEH_HANDLE { + } + _SEH_HANDLE + { return(ExceptionCode); - } _SEH_END; + } + _SEH_END; - OldEip = Thread->TrapFrame->Eip; - Thread->TrapFrame->Eip = (ULONG_PTR)KeRaiseUserExceptionDispatcher; - return((NTSTATUS)OldEip); + /* Get the old EIP */ + OldEip = Thread->TrapFrame->Eip; + + /* Change it to the user-mode dispatcher */ + Thread->TrapFrame->Eip = (ULONG_PTR)KeRaiseUserExceptionDispatcher; + + /* Return the old EIP */ + return((NTSTATUS)OldEip); } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c --- trunk/reactos/ntoskrnl/ke/i386/fpu.c 2006-01-15 09:14:04 UTC (rev 20886) +++ trunk/reactos/ntoskrnl/ke/i386/fpu.c 2006-01-15 09:23:55 UTC (rev 20887) @@ -1,11 +1,10 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/i386/fpu.c * PURPOSE: Handles the FPU - * * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * Gregor Anich */ /* INCLUDES *****************************************************************/ @@ -39,10 +38,12 @@ /* GLOBALS *******************************************************************/ -ULONG HardwareMathSupport = 0; -static ULONG MxcsrFeatureMask = 0, XmmSupport = 0; -ULONG FxsrSupport = 0; /* used by Ki386ContextSwitch for SMP */ +extern ULONG KeI386NpxPresent; +extern ULONG KeI386XMMIPresent; +extern ULONG KeI386FxsrPresent; +static ULONG MxcsrFeatureMask = 0; + /* FUNCTIONS *****************************************************************/ STATIC USHORT @@ -122,7 +123,7 @@ FxSave->ErrorSelector = FnSave->ErrorSelector & 0x0000ffff; FxSave->DataOffset = FnSave->DataOffset; FxSave->DataSelector = FnSave->DataSelector & 0x0000ffff; - if (XmmSupport) + if (KeI386XMMIPresent) FxSave->MXCsr = 0x00001f80 & MxcsrFeatureMask; else FxSave->MXCsr = 0; @@ -160,7 +161,7 @@ STATIC VOID KiFloatingSaveAreaToFxSaveArea(PFX_SAVE_AREA FxSaveArea, FLOATING_SAVE_AREA *FloatingSaveArea) { - if (FxsrSupport) + if (KeI386FxsrPresent) { KiFnsaveToFxsaveFormat(&FxSaveArea->U.FxArea, (PFNSAVE_FORMAT)FloatingSaveArea); } @@ -176,7 +177,7 @@ VOID KiFxSaveAreaToFloatingSaveArea(FLOATING_SAVE_AREA *FloatingSaveArea, CONST PFX_SAVE_AREA FxSaveArea) { - if (FxsrSupport) + if (KeI386FxsrPresent) { KiFxsaveToFnsaveFormat((PFNSAVE_FORMAT)FloatingSaveArea, &FxSaveArea->U.FxArea); } @@ -203,7 +204,7 @@ /* Now merge the FX_SAVE_AREA from the context with the destination area */ if ((Context->ContextFlags & CONTEXT_EXTENDED_REGISTERS) == CONTEXT_EXTENDED_REGISTERS) { - if (FxsrSupport) + if (KeI386FxsrPresent) { PFXSAVE_FORMAT src = (PFXSAVE_FORMAT)Context->ExtendedRegisters; PFXSAVE_FORMAT dst = &FxSaveArea->U.FxArea; @@ -245,9 +246,9 @@ Ke386SaveFlags(Flags); Ke386DisableInterrupts(); - HardwareMathSupport = 0; - FxsrSupport = 0; - XmmSupport = 0; + KeI386NpxPresent = 0; + KeI386FxsrPresent = 0; + KeI386XMMIPresent = 0; cr0 = Ke386GetCr0(); cr0 |= X86_CR0_NE | X86_CR0_MP; @@ -284,7 +285,7 @@ #error Unknown compiler for inline assembler #endif - HardwareMathSupport = 1; + KeI386NpxPresent = 1; /* check for and enable MMX/SSE support if possible */ if ((Prcb->FeatureBits & X86_FEATURE_FXSR) != 0) @@ -293,7 +294,7 @@ PFX_SAVE_AREA FxSaveArea; /* enable FXSR */ - FxsrSupport = 1; + KeI386FxsrPresent = 1; /* we need a 16 byte aligned FX_SAVE_AREA */ FxSaveArea = (PFX_SAVE_AREA)(((ULONG_PTR)DummyArea + 0xf) & (~0x0f)); @@ -313,7 +314,7 @@ Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSXMMEXCPT); /* enable SSE */ - XmmSupport = 1; + KeI386XMMIPresent = 1; } Ke386SetCr0(Ke386GetCr0() | X86_CR0_TS); @@ -338,7 +339,7 @@ Cr0 = Ke386GetCr0(); asm volatile("clts"); - if (FxsrSupport) + if (KeI386FxsrPresent) asm volatile("fxsave %0" : : "m"(FxSaveArea->U.FxArea)); else { @@ -399,7 +400,7 @@ KeGetCurrentPrcb()->NpxThread = NULL; FxSaveArea = (PFX_SAVE_AREA)((ULONG_PTR)NpxThread->InitialStack - sizeof (FX_SAVE_AREA)); /* the fnsave might raise a delayed #MF exception */ - if (FxsrSupport) + if (KeI386FxsrPresent) { asm volatile("fxsave %0" : : "m"(FxSaveArea->U.FxArea)); } @@ -417,7 +418,7 @@ FxSaveArea = (PFX_SAVE_AREA)((ULONG_PTR)CurrentThread->InitialStack - sizeof (FX_SAVE_AREA)); if (CurrentThread->NpxState & NPX_STATE_VALID) { - if (FxsrSupport) + if (KeI386FxsrPresent) { FxSaveArea->U.FxArea.MXCsr &= MxcsrFeatureMask; asm volatile("fxrstor %0" : : "m"(FxSaveArea->U.FxArea)); @@ -430,11 +431,11 @@ else /* NpxState & NPX_STATE_INVALID */ { DPRINT("Setting up clean FPU state\n"); - if (FxsrSupport) + if (KeI386FxsrPresent) { memset(&FxSaveArea->U.FxArea, 0, sizeof(FxSaveArea->U.FxArea)); FxSaveArea->U.FxArea.ControlWord = 0x037f; - if (XmmSupport) + if (KeI386XMMIPresent) { FxSaveArea->U.FxArea.MXCsr = 0x00001f80 & MxcsrFeatureMask; } @@ -550,7 +551,7 @@ ASSERT_IRQL(DISPATCH_LEVEL); /* check if we are doing software emulation */ - if (!HardwareMathSupport) + if (!KeI386NpxPresent) { return STATUS_ILLEGAL_FLOAT_CONTEXT; } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2006-01-15 09:14:04 UTC (rev 20886) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2006-01-15 09:23:55 UTC (rev 20887) @@ -26,6 +26,9 @@ BOOLEAN Ke386Pae = FALSE; BOOLEAN Ke386GlobalPagesEnabled = FALSE; ULONG KiFastSystemCallDisable = 1; +ULONG KeI386NpxPresent = 0; +ULONG KeI386XMMIPresent = 0; +ULONG KeI386FxsrPresent = 0; extern PVOID Ki386InitialStackArray[MAXIMUM_PROCESSORS]; extern ULONG IdleProcessorMask; _____ Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c --- trunk/reactos/ntoskrnl/ke/i386/thread.c 2006-01-15 09:14:04 UTC (rev 20886) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c 2006-01-15 09:23:55 UTC (rev 20887) @@ -3,8 +3,7 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/i386/thread.c * PURPOSE: i386 Thread Context Creation - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES ****************************************************************/ @@ -13,13 +12,15 @@ #define NDEBUG #include <internal/debug.h> -typedef struct _KSHARED_CTXSWITCH_FRAME { +typedef struct _KSHARED_CTXSWITCH_FRAME +{ ULONG Esp0; PVOID ExceptionList; PVOID RetEip; } KSHARED_CTXSWITCH_FRAME, *PKSHARED_CTXSWITCH_FRAME; -typedef struct _KSTART_FRAME { +typedef struct _KSTART_FRAME +{ PKSYSTEM_ROUTINE SystemRoutine; PKSTART_ROUTINE StartRoutine; PVOID StartContext; @@ -65,39 +66,113 @@ PKSYSTEM_ROUTINE SystemRoutine, PKSTART_ROUTINE StartRoutine, PVOID StartContext, - PCONTEXT Context) + PCONTEXT ContextPointer) { PFX_SAVE_AREA FxSaveArea; + PFXSAVE_FORMAT FxSaveFormat; PKSTART_FRAME StartFrame; PKSHARED_CTXSWITCH_FRAME CtxSwitchFrame; - PKTRAP_FRAME TrapFrame = NULL; + PKTRAP_FRAME TrapFrame; + CONTEXT LocalContext; + PCONTEXT Context = NULL; + ULONG ContextFlags; /* Check if this is a With-Context Thread */ DPRINT("Ke386InitThreadContext\n"); - if (Context) + if (ContextPointer) { /* Set up the Initial Frame */ PKUINIT_FRAME InitFrame; - InitFrame = (PKUINIT_FRAME)((ULONG_PTR)Thread->InitialStack - sizeof(KUINIT_FRAME)); - DPRINT("Setting up a user-mode thread with the Frame at: %x\n", InitFrame); + InitFrame = (PKUINIT_FRAME)((ULONG_PTR)Thread->InitialStack - + sizeof(KUINIT_FRAME)); + DPRINT("Setting up a user-mode thread. InitFrame at: %p\n", InitFrame); - /* Setup the Trap Frame */ - TrapFrame = &InitFrame->TrapFrame; + /* Copy over the context we got */ + RtlMoveMemory(&LocalContext, ContextPointer, sizeof(CONTEXT)); + Context = &LocalContext; + ContextFlags = CONTEXT_CONTROL; - /* Set up a trap frame from the context. */ - if (KeContextToTrapFrame(Context, NULL, TrapFrame, UserMode)) + /* Setup the Fx Area */ + FxSaveArea = &InitFrame->FxSaveArea; + + /* Check if we support FXsr */ + if (KeI386FxsrPresent) { - Thread->NpxState = NPX_STATE_VALID; + /* Get the FX Save Format Area */ + FxSaveFormat = (PFXSAVE_FORMAT)Context->ExtendedRegisters; + + /* Set an initial state */ + FxSaveFormat->ControlWord = 0x27F; + FxSaveFormat->StatusWord = 0; + FxSaveFormat->TagWord = 0; + FxSaveFormat->ErrorOffset = 0; + FxSaveFormat->ErrorSelector = 0; + FxSaveFormat->DataOffset =0; + FxSaveFormat->DataSelector = 0; + FxSaveFormat->MXCsr = 0x1F80; } else { - Thread->NpxState = NPX_STATE_INVALID; + /* Setup the regular save area */ + Context->FloatSave.ControlWord = 0x27F; + Context->FloatSave.StatusWord = 0; + Context->FloatSave.TagWord = -1; + Context->FloatSave.ErrorOffset = 0; + Context->FloatSave.ErrorSelector = 0; + Context->FloatSave.DataOffset =0; + Context->FloatSave.DataSelector = 0; } - /* Enable Interrupts and disable some unsupported flags right now */ - TrapFrame->EFlags = Context->EFlags | X86_EFLAGS_IF; - TrapFrame->EFlags &= ~(X86_EFLAGS_VM | X86_EFLAGS_NT | X86_EFLAGS_IOPL); + /* Check if the CPU has NPX */ + if (KeI386NpxPresent) + { + /* Set an intial NPX State */ + Context->FloatSave.Cr0NpxState = 0; + FxSaveArea->Cr0NpxState = 0; + FxSaveArea->NpxSavedCpu = 0; + /* Now set the context flags depending on XMM support */ + ContextFlags |= (KeI386XMMIPresent) ? CONTEXT_EXTENDED_REGISTERS : + CONTEXT_FLOATING_POINT; + + /* Set the Thread's NPX State */ + Thread->NpxState = NPX_STATE_NOT_LOADED; + Thread->DispatcherHeader.NpxIrql = PASSIVE_LEVEL; + } + else + { + /* We'll use emulation */ + FxSaveArea->Cr0NpxState = CR0_EM; + Thread->NpxState = NPX_STATE_NOT_LOADED &~ CR0_MP; + } + + /* Disable any debug regiseters */ + Context->Dr0 = 0; + Context->Dr1 = 0; + Context->Dr2 = 0; + Context->Dr3 = 0; + Context->Dr6 = 0; + Context->Dr7 = 0; + Context->ContextFlags &= ~CONTEXT_DEBUG_REGISTERS; + + /* Setup the Trap Frame */ + TrapFrame = &InitFrame->TrapFrame; + + /* Set up a trap frame from the context. */ + KeContextToTrapFrame(Context, + NULL, + TrapFrame, + Context->ContextFlags | ContextFlags, + UserMode); + + /* Set SS, DS, ES's RPL Mask properly */ + TrapFrame->HardwareSegSs |= RPL_MASK; + TrapFrame->SegDs |= RPL_MASK; + TrapFrame->SegEs |= RPL_MASK; + + /* Set the debug mark */ + TrapFrame->DbgArgMark = 0xBADB0D00; + /* Set the previous mode as user */ TrapFrame->PreviousPreviousMode = UserMode; @@ -116,20 +191,33 @@ } else { - /* No context Thread, meaning System Thread */ - - /* Set up the Initial Frame */ + /* Set up the Initial Frame for the system thread */ PKKINIT_FRAME InitFrame; - InitFrame = (PKKINIT_FRAME)((ULONG_PTR)Thread->InitialStack - sizeof(KKINIT_FRAME)); - DPRINT("Setting up a kernel thread with the Frame at: %x\n", InitFrame); + InitFrame = (PKKINIT_FRAME)((ULONG_PTR)Thread->InitialStack - + sizeof(KKINIT_FRAME)); + DPRINT("Setting up a kernel thread. InitFrame at: %p\n", InitFrame); /* Setup the Fx Area */ FxSaveArea = &InitFrame->FxSaveArea; - RtlZeroMemory(FxSaveArea, sizeof(FX_SAVE_AREA)); - Thread->NpxState = NPX_STATE_INVALID; + /* Check if we have Fxsr support */ + if (KeI386FxsrPresent) + { + /* Set the stub FX area */ + FxSaveArea->U.FxArea.ControlWord = 0x27F; + FxSaveArea->U.FxArea.MXCsr = 0x1F80; + } + else + { + /* Set the stub FN area */ + FxSaveArea->U.FnArea.ControlWord = 0x27F; + FxSaveArea->U.FnArea.TagWord = -1; + } + /* No NPX State */ + Thread->NpxState = NPX_STATE_NOT_LOADED; + /* Setup the Stack for KiThreadStartup and Context Switching */ StartFrame = &InitFrame->StartFrame; CtxSwitchFrame = &InitFrame->CtxSwitchFrame; _____ Modified: trunk/reactos/ntoskrnl/ps/debug.c --- trunk/reactos/ntoskrnl/ps/debug.c 2006-01-15 09:14:04 UTC (rev 20886) +++ trunk/reactos/ntoskrnl/ps/debug.c 2006-01-15 09:23:55 UTC (rev 20887) @@ -68,7 +68,7 @@ KeTrapFrameToContext(TrapFrame, NULL, Context); } else { /* Set the Context */ - KeContextToTrapFrame(Context, NULL, TrapFrame, Mode); + KeContextToTrapFrame(Context, NULL, TrapFrame, Context->ContextFlags, Mode); } GetSetContext->Status = STATUS_SUCCESS; } @@ -249,7 +249,7 @@ * I don't know if trying to set your own context makes much * sense but we can handle it more efficently. */ - KeContextToTrapFrame(ThreadContext, NULL, Thread->Tcb.TrapFrame, PreviousMode); + KeContextToTrapFrame(ThreadContext, NULL, Thread->Tcb.TrapFrame, ThreadContext->ContextFlags, PreviousMode); } else {

18 years, 9 months

[hbirr] 20886: Fixed the initialisation of the feature bits.

by hbirr＠svn.reactos.org

Fixed the initialisation of the feature bits. Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2006-01-15 08:53:01 UTC (rev 20885) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2006-01-15 09:14:04 UTC (rev 20886) @@ -519,20 +519,20 @@ SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = FALSE; SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = FALSE; SharedUserData->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = - (Pcr->PrcbData.FeatureBits & X86_FEATURE_CX8); + (Pcr->PrcbData.FeatureBits & X86_FEATURE_CX8) ? TRUE : FALSE; SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = - (Pcr->PrcbData.FeatureBits & X86_FEATURE_MMX); + (Pcr->PrcbData.FeatureBits & X86_FEATURE_MMX) ? TRUE : FALSE; SharedUserData->ProcessorFeatures[PF_PPC_MOVEMEM_64BIT_OK] = FALSE; SharedUserData->ProcessorFeatures[PF_ALPHA_BYTE_INSTRUCTIONS] = FALSE; SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = - (Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE); + (Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE) ? TRUE : FALSE; SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = - (Ke386CpuidExFlags & X86_EXT_FEATURE_3DNOW); + (Ke386CpuidExFlags & X86_EXT_FEATURE_3DNOW) ? TRUE : FALSE; SharedUserData->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = - (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC); + (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC) ? TRUE : FALSE; SharedUserData->ProcessorFeatures[PF_PAE_ENABLED] = Ke386Pae; SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = - (Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE2); + (Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE2) ? TRUE : FALSE; /* Does the CPU Support Fast System Call? */ if (Pcr->PrcbData.FeatureBits & X86_FEATURE_SYSCALL) {

18 years, 9 months

[hbirr] 20885: Lower the irql on exit in KeInsertQueueDpc.

by hbirr＠svn.reactos.org

Lower the irql on exit in KeInsertQueueDpc. Modified: trunk/reactos/ntoskrnl/ke/dpc.c _____ Modified: trunk/reactos/ntoskrnl/ke/dpc.c --- trunk/reactos/ntoskrnl/ke/dpc.c 2006-01-15 08:51:20 UTC (rev 20884) +++ trunk/reactos/ntoskrnl/ke/dpc.c 2006-01-15 08:53:01 UTC (rev 20885) @@ -179,8 +179,8 @@ /* Check if this is a Thread DPC, which we don't support (yet) */ if (Dpc->Type == ThreadedDpcObject) { + KeLowerIrql(OldIrql); return FALSE; - KeLowerIrql(OldIrql); } #ifdef CONFIG_SMP

18 years, 9 months

[hbirr] 20884: Fix the check for an empty list.

by hbirr＠svn.reactos.org

Fix the check for an empty list. Modified: trunk/reactos/ntoskrnl/ke/apc.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2006-01-15 08:49:26 UTC (rev 20883) +++ trunk/reactos/ntoskrnl/ke/apc.c 2006-01-15 08:51:20 UTC (rev 20884) @@ -287,6 +287,8 @@ PKAPC QueuedApc; NTSTATUS Status; + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + /* Acquire the lock (only needed on MP) */ KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); @@ -790,7 +792,7 @@ ApcListEntry = Thread->ApcState.ApcListHead[UserMode].Flink; /* Is it empty now? */ - if (!ApcListEntry) + if (ApcListEntry == &Thread->ApcState.ApcListHead[UserMode]) { /* Release the lock and return */ KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql);

18 years, 9 months

← Newer
1
...
17
18
19
20
21
22
23
...
59
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 January 2006