Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[arty] 13204: Removed uninitialized uSec and its use.
by arty＠svn.reactos.com 22 Jan '05

22 Jan '05

Removed uninitialized uSec and its use. Modified: trunk/reactos/lib/msafd/misc/dllmain.c _____ Modified: trunk/reactos/lib/msafd/misc/dllmain.c --- trunk/reactos/lib/msafd/misc/dllmain.c 2005-01-22 01:35:07 UTC (rev 13203) +++ trunk/reactos/lib/msafd/misc/dllmain.c 2005-01-22 02:06:56 UTC (rev 13204) @@ -566,7 +566,6 @@ NTSTATUS Status; ULONG HandleCount, OutCount = 0; ULONG PollBufferSize; - LARGE_INTEGER uSec; PVOID PollBuffer; ULONG i, j = 0, x; HANDLE SockEvent; @@ -599,7 +598,6 @@ } else { PollInfo->Timeout = RtlEnlargedIntegerMultiply ((timeout->tv_sec * 1000) + timeout->tv_usec, -10000); - PollInfo->Timeout.QuadPart += uSec.QuadPart; } /* Number of handles for AFD to Check */

1 0

[sedwards] 13203: started syncing setupapi.dll with Winehq. Once I get things in sync I will import to the vendor branch and do a proper merge.
by sedwards＠svn.reactos.com 22 Jan '05

22 Jan '05

started syncing setupapi.dll with Winehq. Once I get things in sync I will import to the vendor branch and do a proper merge. Modified: trunk/reactos/lib/setupapi/De.rc Modified: trunk/reactos/lib/setupapi/En.rc Modified: trunk/reactos/lib/setupapi/Es.rc Modified: trunk/reactos/lib/setupapi/Fr.rc Modified: trunk/reactos/lib/setupapi/It.rc Modified: trunk/reactos/lib/setupapi/Nl.rc Modified: trunk/reactos/lib/setupapi/Pt.rc Modified: trunk/reactos/lib/setupapi/Ru.rc Modified: trunk/reactos/lib/setupapi/devinst16.c Modified: trunk/reactos/lib/setupapi/setupapi.rc _____ Modified: trunk/reactos/lib/setupapi/De.rc --- trunk/reactos/lib/setupapi/De.rc 2005-01-22 01:30:05 UTC (rev 13202) +++ trunk/reactos/lib/setupapi/De.rc 2005-01-22 01:35:07 UTC (rev 13203) @@ -1,7 +1,7 @@ /* * German resources for SETUPAPI * - * Copyright 2004 Michael Wirth + * Copyright 2004 Henning Gerhardt * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,15 +18,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Kopiere Dateien..." -FONT 8, "MS Sans Serif" +CAPTION "Dateien kopieren..." +FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Quelltext:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Quelle:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Ziel:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP _____ Modified: trunk/reactos/lib/setupapi/En.rc --- trunk/reactos/lib/setupapi/En.rc 2005-01-22 01:30:05 UTC (rev 13202) +++ trunk/reactos/lib/setupapi/En.rc 2005-01-22 01:35:07 UTC (rev 13203) @@ -23,7 +23,7 @@ COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Copying Files..." -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP _____ Modified: trunk/reactos/lib/setupapi/Es.rc --- trunk/reactos/lib/setupapi/Es.rc 2005-01-22 01:30:05 UTC (rev 13202) +++ trunk/reactos/lib/setupapi/Es.rc 2005-01-22 01:35:07 UTC (rev 13203) @@ -23,7 +23,7 @@ COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Copiando archivos..." -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Origen:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP _____ Modified: trunk/reactos/lib/setupapi/Fr.rc --- trunk/reactos/lib/setupapi/Fr.rc 2005-01-22 01:30:05 UTC (rev 13202) +++ trunk/reactos/lib/setupapi/Fr.rc 2005-01-22 01:35:07 UTC (rev 13203) @@ -24,7 +24,7 @@ COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Copie de fichiers..." -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Annuler", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP _____ Modified: trunk/reactos/lib/setupapi/It.rc --- trunk/reactos/lib/setupapi/It.rc 2005-01-22 01:30:05 UTC (rev 13202) +++ trunk/reactos/lib/setupapi/It.rc 2005-01-22 01:35:07 UTC (rev 13203) @@ -2,7 +2,7 @@ * Italian resources for SETUPAPI * * Copyright 2001 Andreas Mohr - * Copyright 2003 Ivan Leo Murray-Smith + * Copyright 2003 Ivan Leo Puoti * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,7 +24,7 @@ COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Copia dei file in corso..." -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Anulla", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Origine:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP _____ Modified: trunk/reactos/lib/setupapi/Nl.rc --- trunk/reactos/lib/setupapi/Nl.rc 2005-01-22 01:30:05 UTC (rev 13202) +++ trunk/reactos/lib/setupapi/Nl.rc 2005-01-22 01:35:07 UTC (rev 13203) @@ -23,7 +23,7 @@ COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Bestanden worden gekopiÃ«erd..." -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Annuleren", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Bron:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP _____ Modified: trunk/reactos/lib/setupapi/Pt.rc --- trunk/reactos/lib/setupapi/Pt.rc 2005-01-22 01:30:05 UTC (rev 13202) +++ trunk/reactos/lib/setupapi/Pt.rc 2005-01-22 01:35:07 UTC (rev 13203) @@ -23,7 +23,7 @@ COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Copiando arquivos..." -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Origem:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP _____ Modified: trunk/reactos/lib/setupapi/Ru.rc --- trunk/reactos/lib/setupapi/Ru.rc 2005-01-22 01:30:05 UTC (rev 13202) +++ trunk/reactos/lib/setupapi/Ru.rc 2005-01-22 01:35:07 UTC (rev 13203) @@ -23,7 +23,7 @@ COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Êîïèðîâàíèå ôàéëîâ..." -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Îòìåíà", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Îòêóäà:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP _____ Modified: trunk/reactos/lib/setupapi/devinst16.c --- trunk/reactos/lib/setupapi/devinst16.c 2005-01-22 01:30:05 UTC (rev 13202) +++ trunk/reactos/lib/setupapi/devinst16.c 2005-01-22 01:35:07 UTC (rev 13203) @@ -68,7 +68,7 @@ /*********************************************************************** * DiCallClassInstaller (SETUPX.308) */ -RETERR16 WINAPI DiCallClassInstaller16(/*DI_FUNCTIONS*/WORD diFctn, LPDEVICE_INFO16 lpdi) +RETERR16 WINAPI DiCallClassInstaller16(DI_FUNCTION16 diFctn, LPDEVICE_INFO16 lpdi) { FIXME("(%x, %p): stub\n", diFctn, lpdi); return FALSE; _____ Modified: trunk/reactos/lib/setupapi/setupapi.rc --- trunk/reactos/lib/setupapi/setupapi.rc 2005-01-22 01:30:05 UTC (rev 13202) +++ trunk/reactos/lib/setupapi/setupapi.rc 2005-01-22 01:35:07 UTC (rev 13203) @@ -24,11 +24,13 @@ #include "winnls.h" #include "setupapi_private.h" +#include "Cs.rc" +#include "De.rc" #include "En.rc" -#include "De.rc" #include "Es.rc" #include "Fr.rc" #include "It.rc" +#include "Ja.rc" #include "Nl.rc" #include "Pt.rc" #include "Ru.rc"

1 0

[ion] 13202: Fix all remaning alignment errors. Ros is now moderately usable. Error in explorer remains making disk browsing impossible, but with other tools it still works
by ion＠svn.reactos.com 22 Jan '05

22 Jan '05

Fix all remaning alignment errors. Ros is now moderately usable. Error in explorer remains making disk browsing impossible, but with other tools it still works Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-22 01:00:12 UTC (rev 13201) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-22 01:30:05 UTC (rev 13202) @@ -40,33 +40,33 @@ ICI_SQ_SAME( sizeof(IO_COUNTERS), sizeof(ULONG), ICIF_QUERY ), /* ProcessIoCounters */ ICI_SQ_SAME( sizeof(VM_COUNTERS), sizeof(ULONG), ICIF_QUERY ), /* ProcessVmCounters */ ICI_SQ_SAME( sizeof(KERNEL_USER_TIMES), sizeof(ULONG), ICIF_QUERY ), /* ProcessTimes */ - ICI_SQ_SAME( sizeof(KPRIORITY), sizeof(ULONG), ICIF_SET ), /* ProcessBasePriority */ + ICI_SQ_SAME( sizeof(KPRIORITY), sizeof(USHORT), ICIF_SET ), /* ProcessBasePriority */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_SET ), /* ProcessRaisePriority */ ICI_SQ_SAME( sizeof(HANDLE), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessDebugPort */ ICI_SQ_SAME( sizeof(HANDLE), sizeof(ULONG), ICIF_SET ), /* ProcessExceptionPort */ - ICI_SQ_SAME( sizeof(PROCESS_ACCESS_TOKEN), sizeof(ULONG), ICIF_SET ), /* ProcessAccessToken */ - ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessLdtInformation */ - ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_SET ), /* ProcessLdtSize */ - ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessDefaultHardErrorMode */ - ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_SET ), /* ProcessIoPortHandlers */ + ICI_SQ_SAME( sizeof(PROCESS_ACCESS_TOKEN), sizeof(USHORT), ICIF_SET ), /* ProcessAccessToken */ + ICI_SQ_SAME( 0 /* FIXME */, sizeof(USHORT), ICIF_QUERY | ICIF_SET ), /* ProcessLdtInformation */ + ICI_SQ_SAME( 0 /* FIXME */, sizeof(USHORT), ICIF_SET ), /* ProcessLdtSize */ + ICI_SQ_SAME( sizeof(ULONG), sizeof(USHORT), ICIF_QUERY | ICIF_SET ), /* ProcessDefaultHardErrorMode */ + ICI_SQ_SAME( 0 /* FIXME */, sizeof(USHORT), ICIF_SET ), /* ProcessIoPortHandlers */ ICI_SQ_SAME( sizeof(POOLED_USAGE_AND_LIMITS), sizeof(ULONG), ICIF_QUERY ), /* ProcessPooledUsageAndLimits */ ICI_SQ_SAME( sizeof(PROCESS_WS_WATCH_INFORMATION), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessWorkingSetWatch */ - ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_SET ), /* ProcessUserModeIOPL */ - ICI_SQ_SAME( sizeof(BOOLEAN), sizeof(ULONG), ICIF_SET ), /* ProcessEnableAlignmentFaultFixup */ - ICI_SQ_SAME( sizeof(PROCESS_PRIORITY_CLASS), sizeof(ULONG), ICIF_SET ), /* ProcessPriorityClass */ + ICI_SQ_SAME( 0 /* FIXME */, sizeof(USHORT), ICIF_SET ), /* ProcessUserModeIOPL */ + ICI_SQ_SAME( sizeof(BOOLEAN), sizeof(USHORT), ICIF_SET ), /* ProcessEnableAlignmentFaultFixup */ + ICI_SQ_SAME( sizeof(PROCESS_PRIORITY_CLASS), sizeof(USHORT), ICIF_SET ), /* ProcessPriorityClass */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY ), /* ProcessWx86Information */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY ), /* ProcessHandleCount */ - ICI_SQ_SAME( sizeof(KAFFINITY), sizeof(ULONG), ICIF_SET ), /* ProcessAffinityMask */ + ICI_SQ_SAME( sizeof(KAFFINITY), sizeof(USHORT), ICIF_SET ), /* ProcessAffinityMask */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessPriorityBoost */ ICI_SQ(/*Q*/ sizeof(((PPROCESS_DEVICEMAP_INFORMATION)0x0)->Query), /* ProcessDeviceMap */ /*S*/ sizeof(((PPROCESS_DEVICEMAP_INFORMATION)0x0)->Set), - /*Q*/ sizeof(ULONG), - /*S*/ sizeof(ULONG), + /*Q*/ sizeof(USHORT), + /*S*/ sizeof(USHORT), ICIF_QUERY | ICIF_SET ), - ICI_SQ_SAME( sizeof(PROCESS_SESSION_INFORMATION), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessSessionInformation */ - ICI_SQ_SAME( sizeof(BOOLEAN), sizeof(ULONG), ICIF_SET ), /* ProcessForegroundInformation */ + ICI_SQ_SAME( sizeof(PROCESS_SESSION_INFORMATION), sizeof(USHORT), ICIF_QUERY | ICIF_SET ), /* ProcessSessionInformation */ + ICI_SQ_SAME( sizeof(BOOLEAN), sizeof(USHORT), ICIF_SET ), /* ProcessForegroundInformation */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY ), /* ProcessWow64Information */ ICI_SQ_SAME( sizeof(UNICODE_STRING), sizeof(ULONG), ICIF_QUERY | ICIF_SIZE_VARIABLE), /* ProcessImageFileName */ }; @@ -1696,7 +1696,6 @@ PreviousMode = ExGetPreviousMode(); - DPRINT1("NtSetInformationProcess() %d %x %x called\n", ProcessInformationClass, ProcessInformation, ProcessInformationLength); DefaultSetInfoBufferCheck(ProcessInformationClass, PsProcessInfoClass, ProcessInformation, @@ -1705,6 +1704,7 @@ &Status); if(!NT_SUCCESS(Status)) { + DPRINT1("NtSetInformationProcess() %d %x %x called\n", ProcessInformationClass, ProcessInformation, ProcessInformationLength); DPRINT1("NtSetInformationProcess() %x failed, Status: 0x%x\n", Status); return Status; }

1 0

[ion] 13201: ReactOS now boots. More bug fixes needed
by ion＠svn.reactos.com 22 Jan '05

22 Jan '05

ReactOS now boots. More bug fixes needed Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/subsys/system/userinit/userinit.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-01-21 23:58:30 UTC (rev 13200) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-01-22 01:00:12 UTC (rev 13201) @@ -373,7 +373,8 @@ else if(ClassList[Class].RequiredSize##Mode > 0 && \ (BufferLen) != ClassList[Class].RequiredSize##Mode) \ { \ - if(!(ClassList[Class].Flags & ICIF_##Mode##_SIZE_VARIABLE) || \ + if((!(ClassList[Class].Flags & ICIF_##Mode##_SIZE_VARIABLE) && \ + (BufferLen) != ClassList[Class].RequiredSize##Mode) || \ ((ClassList[Class].Flags & ICIF_##Mode##_SIZE_VARIABLE) && \ (BufferLen) < ClassList[Class].RequiredSize##Mode)) \ { \ @@ -387,6 +388,7 @@ } \ } while(0) + #define GetInfoClassAlignment(Class, ClassList, AlignmentVar, Mode) \ do { \ if((Class) >= 0 && (Class) < sizeof(ClassList) / sizeof(ClassList[0])) \ _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-21 23:58:30 UTC (rev 13200) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-22 01:00:12 UTC (rev 13201) @@ -1695,7 +1695,8 @@ NTSTATUS Status = STATUS_SUCCESS; PreviousMode = ExGetPreviousMode(); - + + DPRINT1("NtSetInformationProcess() %d %x %x called\n", ProcessInformationClass, ProcessInformation, ProcessInformationLength); DefaultSetInfoBufferCheck(ProcessInformationClass, PsProcessInfoClass, ProcessInformation, @@ -1704,7 +1705,7 @@ &Status); if(!NT_SUCCESS(Status)) { - DPRINT1("NtSetInformationProcess() failed, Status: 0x%x\n", Status); + DPRINT1("NtSetInformationProcess() %x failed, Status: 0x%x\n", Status); return Status; } _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-01-21 23:58:30 UTC (rev 13200) +++ trunk/reactos/ntoskrnl/se/token.c 2005-01-22 01:00:12 UTC (rev 13201) @@ -1564,7 +1564,7 @@ NTSTATUS STDCALL NtCreateToken(OUT PHANDLE UnsafeTokenHandle, IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES UnsafeObjectAttributes, + IN POBJECT_ATTRIBUTES ObjectAttributes, IN TOKEN_TYPE TokenType, IN PLUID AuthenticationId, IN PLARGE_INTEGER ExpirationTime, @@ -1579,7 +1579,6 @@ HANDLE TokenHandle; PTOKEN AccessToken; NTSTATUS Status; - POBJECT_ATTRIBUTES ObjectAttributes; LUID TokenId; LUID ModifiedId; PVOID EndMem; _____ Modified: trunk/reactos/subsys/system/userinit/userinit.c --- trunk/reactos/subsys/system/userinit/userinit.c 2005-01-21 23:58:30 UTC (rev 13200) +++ trunk/reactos/subsys/system/userinit/userinit.c 2005-01-22 01:00:12 UTC (rev 13201) @@ -143,7 +143,6 @@ LPSTR lpszCmdLine, int nCmdShow) { - DPRINT1("Hello\n"); SetUserSettings(); StartShell(); return 0;

1 0

[weiden] 13200: remove double function head of NtCreateEvent()
by weiden＠svn.reactos.com 21 Jan '05

21 Jan '05

remove double function head of NtCreateEvent() Modified: trunk/reactos/ntoskrnl/ex/event.c _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-01-21 23:35:19 UTC (rev 13199) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-01-21 23:58:30 UTC (rev 13200) @@ -124,16 +124,6 @@ IN EVENT_TYPE EventType, IN BOOLEAN InitialState) { -/* - * @implemented - */ -NTSTATUS STDCALL -NtCreateEvent(OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN EVENT_TYPE EventType, - IN BOOLEAN InitialState) -{ KPROCESSOR_MODE PreviousMode; PKEVENT Event; HANDLE hEvent;

1 0

[ion] 13199: First patch to fix seriously broken ROS (thank Thomas). Work in progress, will be cleaned up at the end
by ion＠svn.reactos.com 21 Jan '05

21 Jan '05

First patch to fix seriously broken ROS (thank Thomas). Work in progress, will be cleaned up at the end Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ldr/loader.c Modified: trunk/reactos/ntoskrnl/ob/object.c Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/subsys/system/userinit/userinit.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/lib/rtl/registry.c --- trunk/reactos/lib/rtl/registry.c 2005-01-21 23:01:33 UTC (rev 13198) +++ trunk/reactos/lib/rtl/registry.c 2005-01-21 23:35:19 UTC (rev 13199) @@ -44,7 +44,7 @@ if (RelativeTo & RTL_REGISTRY_HANDLE) { - Status = NtDuplicateObject(NtCurrentProcess(), + Status = ZwDuplicateObject(NtCurrentProcess(), (HANDLE)Path, NtCurrentProcess(), KeyHandle, @@ -129,7 +129,7 @@ if (Create == TRUE) { - Status = NtCreateKey(KeyHandle, + Status = ZwCreateKey(KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes, 0, @@ -139,7 +139,7 @@ } else { - Status = NtOpenKey(KeyHandle, + Status = ZwOpenKey(KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); } @@ -165,7 +165,7 @@ if (!NT_SUCCESS(Status)) return(Status); - NtClose(KeyHandle); + ZwClose(KeyHandle); return(STATUS_SUCCESS); } @@ -188,7 +188,7 @@ if (!NT_SUCCESS(Status)) return(Status); - NtClose(KeyHandle); + ZwClose(KeyHandle); return(STATUS_SUCCESS); } @@ -216,10 +216,10 @@ RtlInitUnicodeString(&Name, ValueName); - Status = NtDeleteValueKey(KeyHandle, + Status = ZwDeleteValueKey(KeyHandle, &Name); - NtClose(KeyHandle); + ZwClose(KeyHandle); return(Status); } @@ -240,7 +240,7 @@ DPRINT ("RtlFormatCurrentUserKeyPath() called\n"); - Status = NtOpenThreadToken (NtCurrentThread (), + Status = ZwOpenThreadToken (NtCurrentThread (), TOKEN_READ, TRUE, &TokenHandle); @@ -248,30 +248,30 @@ { if (Status != STATUS_NO_TOKEN) { - DPRINT1 ("NtOpenThreadToken() failed (Status %lx)\n", Status); + DPRINT1 ("ZwOpenThreadToken() failed (Status %lx)\n", Status); return Status; } - Status = NtOpenProcessToken (NtCurrentProcess (), + Status = ZwOpenProcessToken (NtCurrentProcess (), TOKEN_READ, &TokenHandle); if (!NT_SUCCESS (Status)) { - DPRINT1 ("NtOpenProcessToken() failed (Status %lx)\n", Status); + DPRINT1 ("ZwOpenProcessToken() failed (Status %lx)\n", Status); return Status; } } SidBuffer = (PSID_AND_ATTRIBUTES)Buffer; - Status = NtQueryInformationToken (TokenHandle, + Status = ZwQueryInformationToken (TokenHandle, TokenUser, (PVOID)SidBuffer, 256, &Length); - NtClose (TokenHandle); + ZwClose (TokenHandle); if (!NT_SUCCESS(Status)) { - DPRINT1 ("NtQueryInformationToken() failed (Status %lx)\n", Status); + DPRINT1 ("ZwQueryInformationToken() failed (Status %lx)\n", Status); return Status; } @@ -329,7 +329,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(KeyHandle, + Status = ZwOpenKey(KeyHandle, DesiredAccess, &ObjectAttributes); RtlFreeUnicodeString(&KeyPath); @@ -346,7 +346,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(KeyHandle, + Status = ZwOpenKey(KeyHandle, DesiredAccess, &ObjectAttributes); @@ -403,7 +403,7 @@ if (((QueryEntry->Flags & (RTL_QUERY_REGISTRY_SUBKEY | RTL_QUERY_REGISTRY_TOPKEY)) != 0) && (BaseKeyHandle != CurrentKeyHandle)) { - NtClose(CurrentKeyHandle); + ZwClose(CurrentKeyHandle); CurrentKeyHandle = BaseKeyHandle; } @@ -418,7 +418,7 @@ OBJ_CASE_INSENSITIVE, BaseKeyHandle, NULL); - Status = NtOpenKey(&CurrentKeyHandle, + Status = ZwOpenKey(&CurrentKeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); if (!NT_SUCCESS(Status)) @@ -439,7 +439,7 @@ break; } - Status = NtQueryValueKey(CurrentKeyHandle, + Status = ZwQueryValueKey(CurrentKeyHandle, &KeyName, KeyValuePartialInformation, ValueInfo, @@ -601,7 +601,7 @@ break; } - Status = NtQueryValueKey(CurrentKeyHandle, + Status = ZwQueryValueKey(CurrentKeyHandle, &KeyName, KeyValuePartialInformation, ValueInfo, @@ -725,7 +725,7 @@ Index = 0; while (TRUE) { - Status = NtEnumerateValueKey(CurrentKeyHandle, + Status = ZwEnumerateValueKey(CurrentKeyHandle, Index, KeyValueFullInformation, FullValueInfo, @@ -848,9 +848,9 @@ } if (CurrentKeyHandle != BaseKeyHandle) - NtClose(CurrentKeyHandle); + ZwClose(CurrentKeyHandle); - NtClose(BaseKeyHandle); + ZwClose(BaseKeyHandle); return(Status); } @@ -881,14 +881,14 @@ RtlInitUnicodeString(&Name, ValueName); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &Name, 0, ValueType, ValueData, ValueLength); if (NT_SUCCESS(Status)) - NtClose(KeyHandle); + ZwClose(KeyHandle); return(Status); } @@ -908,7 +908,7 @@ if (ObjectAttributes != NULL) ObjectAttributes->Attributes &= ~(OBJ_PERMANENT | OBJ_EXCLUSIVE); - return(NtCreateKey(KeyHandle, + return(ZwCreateKey(KeyHandle, DesiredAccess, ObjectAttributes, 0, @@ -941,7 +941,7 @@ return(STATUS_NO_MEMORY); } - Status = NtEnumerateKey(KeyHandle, + Status = ZwEnumerateKey(KeyHandle, Index, KeyBasicInformation, KeyInfo, @@ -978,7 +978,7 @@ NTSTATUS STDCALL RtlpNtMakeTemporaryKey(IN HANDLE KeyHandle) { - return(NtDeleteKey(KeyHandle)); + return(ZwDeleteKey(KeyHandle)); } @@ -994,7 +994,7 @@ if (ObjectAttributes != NULL) ObjectAttributes->Attributes &= ~(OBJ_PERMANENT | OBJ_EXCLUSIVE); - return(NtOpenKey(KeyHandle, + return(ZwOpenKey(KeyHandle, DesiredAccess, ObjectAttributes)); } @@ -1027,7 +1027,7 @@ if (ValueInfo == NULL) return(STATUS_NO_MEMORY); - Status = NtQueryValueKey(KeyHandle, + Status = ZwQueryValueKey(KeyHandle, &ValueName, KeyValuePartialInformation, ValueInfo, @@ -1068,7 +1068,7 @@ RtlInitUnicodeString(&ValueName, NULL); - return(NtSetValueKey(KeyHandle, + return(ZwSetValueKey(KeyHandle, &ValueName, 0, Type, _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-01-21 23:01:33 UTC (rev 13198) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-01-21 23:35:19 UTC (rev 13199) @@ -124,58 +124,77 @@ IN EVENT_TYPE EventType, IN BOOLEAN InitialState) { +/* + * @implemented + */ +NTSTATUS STDCALL +NtCreateEvent(OUT PHANDLE EventHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN EVENT_TYPE EventType, + IN BOOLEAN InitialState) +{ + KPROCESSOR_MODE PreviousMode; PKEVENT Event; HANDLE hEvent; - NTSTATUS Status; - OBJECT_ATTRIBUTES SafeObjectAttributes; - - if (ObjectAttributes != NULL) + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode == UserMode) + { + _SEH_TRY { - Status = MmCopyFromCaller(&SafeObjectAttributes, ObjectAttributes, - sizeof(OBJECT_ATTRIBUTES)); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - ObjectAttributes = &SafeObjectAttributes; + ProbeForWrite(EventHandle, + sizeof(HANDLE), + sizeof(ULONG)); } - - Status = ObCreateObject(ExGetPreviousMode(), - ExEventObjectType, - ObjectAttributes, - ExGetPreviousMode(), - NULL, - sizeof(KEVENT), - 0, - 0, - (PVOID*)&Event); - if (!NT_SUCCESS(Status)) + _SEH_HANDLE { - return(Status); + Status = _SEH_GetExceptionCode(); } - KeInitializeEvent(Event, - EventType, - InitialState); - - Status = ObInsertObject ((PVOID)Event, - NULL, - DesiredAccess, - 0, - NULL, - &hEvent); - ObDereferenceObject(Event); - if (!NT_SUCCESS(Status)) + _SEH_END; + } + + Status = ObCreateObject(PreviousMode, + ExEventObjectType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(KEVENT), + 0, + 0, + (PVOID*)&Event); + if(NT_SUCCESS(Status)) + { + KeInitializeEvent(Event, + EventType, + InitialState); + + + Status = ObInsertObject((PVOID)Event, + NULL, + DesiredAccess, + 0, + NULL, + &hEvent); + ObDereferenceObject(Event); + + if(NT_SUCCESS(Status)) { - return Status; + _SEH_TRY + { + *EventHandle = hEvent; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } - - Status = MmCopyToCaller(EventHandle, &hEvent, sizeof(HANDLE)); - if (!NT_SUCCESS(Status)) - { - ZwClose(hEvent); - return(Status); - } - return(STATUS_SUCCESS); + } + + return Status; } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-21 23:01:33 UTC (rev 13198) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-21 23:35:19 UTC (rev 13199) @@ -70,7 +70,7 @@ movw %bx, %fs /* Save the previous exception list */ - pushl %fs:KPCR_EXCEPTION_LIST // + 0x2C + pushl %fs:KPCR_EXCEPTION_LIST // + 0x2C /* Set the exception handler chain terminator */ movl $0xffffffff, %fs:KPCR_EXCEPTION_LIST @@ -79,11 +79,11 @@ movl %fs:KPCR_CURRENT_THREAD, %esi /* Save the old previous mode */ - pushl %ss:KTHREAD_PREVIOUS_MODE(%esi) // + 0x30 + pushl %ss:KTHREAD_PREVIOUS_MODE(%esi) // + 0x30 /* Set the new previous mode based on the saved CS selector */ movl 0x24(%esp), %ebx - and $1, %ebx + andl $1, %ebx movb %bl, %ss:KTHREAD_PREVIOUS_MODE(%esi) /* Save other registers */ @@ -95,20 +95,14 @@ pushl %gs // + 0x48 sub $0x28, %esp // + 0x70 -#if 0 #ifdef DBG /* Trick gdb 6 into backtracing over the system call */ - /* FIXME: %ebp is *never* initialized */ pushl 4(%ebp) /* DebugEIP */ // + 0x74 pushl (%ebp) /* DebugEBP */ // + 0x78 #else pushl 0x60(%esp) /* DebugEIP */ // + 0x74 pushl %ebp /* DebugEBP */ // + 0x78 #endif -#else - pushl $0 /* DebugEIP */ // + 0x74 - pushl $0 /* DebugEBP */ // + 0x78 -#endif /* Load the segment registers */ sti @@ -320,7 +314,6 @@ InvalidCall: /* Invalid System Call */ - int $3 movl $STATUS_INVALID_SYSTEM_SERVICE, %eax movl %eax, KTRAP_FRAME_EAX(%ebp) jmp _KiServiceExit _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-01-21 23:01:33 UTC (rev 13198) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-01-21 23:35:19 UTC (rev 13199) @@ -307,7 +307,7 @@ NULL, NULL); CHECKPOINT; - Status = NtOpenFile(&FileHandle, + Status = ZwOpenFile(&FileHandle, FILE_ALL_ACCESS, &ObjectAttributes, &IoStatusBlock, @@ -322,7 +322,7 @@ CHECKPOINT; /* Get the size of the file */ - Status = NtQueryInformationFile(FileHandle, + Status = ZwQueryInformationFile(FileHandle, &IoStatusBlock, &FileStdInfo, sizeof(FileStdInfo), @@ -348,7 +348,7 @@ CHECKPOINT; /* Load driver into memory chunk */ - Status = NtReadFile(FileHandle, + Status = ZwReadFile(FileHandle, 0, 0, 0, &IoStatusBlock, ModuleLoadBase, @@ -363,7 +363,7 @@ } CHECKPOINT; - NtClose(FileHandle); + ZwClose(FileHandle); Status = LdrProcessModule(ModuleLoadBase, Filename, _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-01-21 23:01:33 UTC (rev 13198) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-01-21 23:35:19 UTC (rev 13199) @@ -601,7 +601,7 @@ ASSERT_IRQL(APC_LEVEL); - if(AccessMode == UserMode && ObjectAttributes != NULL) + if(ObjectAttributesAccessMode == UserMode && ObjectAttributes != NULL) { Status = STATUS_SUCCESS; _SEH_TRY _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-01-21 23:01:33 UTC (rev 13198) +++ trunk/reactos/ntoskrnl/se/token.c 2005-01-21 23:35:19 UTC (rev 13199) @@ -1579,7 +1579,6 @@ HANDLE TokenHandle; PTOKEN AccessToken; NTSTATUS Status; - OBJECT_ATTRIBUTES SafeObjectAttributes; POBJECT_ATTRIBUTES ObjectAttributes; LUID TokenId; LUID ModifiedId; @@ -1587,14 +1586,6 @@ ULONG uLength; ULONG i; - Status = MmCopyFromCaller(&SafeObjectAttributes, - UnsafeObjectAttributes, - sizeof(OBJECT_ATTRIBUTES)); - if (!NT_SUCCESS(Status)) - return(Status); - - ObjectAttributes = &SafeObjectAttributes; - Status = ZwAllocateLocallyUniqueId(&TokenId); if (!NT_SUCCESS(Status)) return(Status); _____ Modified: trunk/reactos/subsys/system/userinit/userinit.c --- trunk/reactos/subsys/system/userinit/userinit.c 2005-01-21 23:01:33 UTC (rev 13198) +++ trunk/reactos/subsys/system/userinit/userinit.c 2005-01-21 23:35:19 UTC (rev 13199) @@ -143,6 +143,7 @@ LPSTR lpszCmdLine, int nCmdShow) { + DPRINT1("Hello\n"); SetUserSettings(); StartShell(); return 0; _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-01-21 23:01:33 UTC (rev 13198) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-01-21 23:35:19 UTC (rev 13199) @@ -596,7 +596,7 @@ */ Status = ObCreateObject( - ExGetPreviousMode(), + KernelMode, ExDesktopObjectType, &ObjectAttributes, ExGetPreviousMode(), _____ Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-01-21 23:01:33 UTC (rev 13198) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-01-21 23:35:19 UTC (rev 13199) @@ -324,7 +324,7 @@ DPRINT("Creating window station (%wZ)\n", &WindowStationName); Status = ObCreateObject( - ExGetPreviousMode(), + KernelMode, ExWindowStationObjectType, &ObjectAttributes, ExGetPreviousMode(), @@ -336,7 +336,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("Failed creating window station (%wZ)\n", &WindowStationName); + DPRINT1("Failed creating window station (%wZ)\n", &WindowStationName); ExFreePool(WindowStationName.Buffer); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); return 0; _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-01-21 23:01:33 UTC (rev 13198) +++ trunk/reactos/tools/helper.mk 2005-01-21 23:35:19 UTC (rev 13199) @@ -618,8 +618,10 @@ # if needed, until their problems can be found # ifeq ($(OPTIMIZED), 1) - MK_CFLAGS += -O2 -Wno-strict-aliasing - MK_CPPFLAGS += -O2 -Wno-strict-aliasing + ifneq ($(TARGET_NAME), bootvid) + MK_CFLAGS += -O2 -Wno-strict-aliasing + MK_CPPFLAGS += -O2 -Wno-strict-aliasing + endif endif ifneq ($(TARGET_LIBS),)

1 0

[weiden] 13198: don't probe ObjectAttributes if NULL
by weiden＠svn.reactos.com 21 Jan '05

21 Jan '05

don't probe ObjectAttributes if NULL Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-01-21 22:25:54 UTC (rev 13197) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-01-21 23:01:33 UTC (rev 13198) @@ -601,7 +601,7 @@ ASSERT_IRQL(APC_LEVEL); - if(AccessMode == UserMode) + if(AccessMode == UserMode && ObjectAttributes != NULL) { Status = STATUS_SUCCESS; _SEH_TRY

1 0

[weiden] 13197: NtCreateJobObject() should create the handle instead of just returning a uninitialized variable
by weiden＠svn.reactos.com 21 Jan '05

21 Jan '05

NtCreateJobObject() should create the handle instead of just returning a uninitialized variable Modified: trunk/reactos/ntoskrnl/ps/job.c _____ Modified: trunk/reactos/ntoskrnl/ps/job.c --- trunk/reactos/ntoskrnl/ps/job.c 2005-01-21 21:37:32 UTC (rev 13196) +++ trunk/reactos/ntoskrnl/ps/job.c 2005-01-21 22:25:54 UTC (rev 13197) @@ -262,19 +262,28 @@ InsertTailList(&PsJobListHead, &Job->JobLinks); ExReleaseFastMutex(&PsJobListLock); - /* pass the handle back to the caller */ - _SEH_TRY + Status = ObInsertObject(Job, + NULL, + DesiredAccess, + 0, + NULL, + &hJob); + if(NT_SUCCESS(Status)) { - /* NOTE: if the caller passed invalid buffers to receive the handle it's his - own fault! the object will still be created and live... It's possible - to find the handle using ObFindHandleForObject()! */ - *JobHandle = hJob; + /* pass the handle back to the caller */ + _SEH_TRY + { + /* NOTE: if the caller passed invalid buffers to receive the handle it's his + own fault! the object will still be created and live... It's possible + to find the handle using ObFindHandleForObject()! */ + *JobHandle = hJob; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; } return Status;

1 0

[weiden] 13196: Simplify buffer checks for NtQueryInformation...() and NtSetInformation...() using universal macros and information class tables
by weiden＠svn.reactos.com 21 Jan '05

21 Jan '05

Simplify buffer checks for NtQueryInformation...() and NtSetInformation...() using universal macros and information class tables Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-01-21 21:34:49 UTC (rev 13195) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-01-21 21:37:32 UTC (rev 13196) @@ -339,5 +339,169 @@ IN KPROCESSOR_MODE AccessMode, IN BOOLEAN CaptureIfKernel); +/* object information classes */ +#define ICIF_QUERY 0x1 +#define ICIF_SET 0x2 +#define ICIF_QUERY_SIZE_VARIABLE 0x4 +#define ICIF_SET_SIZE_VARIABLE 0x8 +#define ICIF_SIZE_VARIABLE (ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE) + +typedef struct _INFORMATION_CLASS_INFO +{ + ULONG RequiredSizeQUERY; + ULONG RequiredSizeSET; + ULONG AlignmentSET; + ULONG AlignmentQUERY; + ULONG Flags; +} INFORMATION_CLASS_INFO, *PINFORMATION_CLASS_INFO; + +#define ICI_SQ_SAME(Size, Alignment, Flags) \ + { Size, Size, Alignment, Alignment, Flags } + +#define ICI_SQ(SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags) \ + { SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags } + +#define CheckInfoClass(Class, BufferLen, ClassList, StatusVar, Mode) \ + do { \ + if((Class) >= 0 && (Class) < sizeof(ClassList) / sizeof(ClassList[0])) \ + { \ + if(!(ClassList[Class].Flags & ICIF_##Mode)) \ + { \ + *(StatusVar) = STATUS_INVALID_INFO_CLASS; \ + } \ + else if(ClassList[Class].RequiredSize##Mode > 0 && \ + (BufferLen) != ClassList[Class].RequiredSize##Mode) \ + { \ + if(!(ClassList[Class].Flags & ICIF_##Mode##_SIZE_VARIABLE) || \ + ((ClassList[Class].Flags & ICIF_##Mode##_SIZE_VARIABLE) && \ + (BufferLen) < ClassList[Class].RequiredSize##Mode)) \ + { \ + *(StatusVar) = STATUS_INFO_LENGTH_MISMATCH; \ + } \ + } \ + } \ + else \ + { \ + *(StatusVar) = STATUS_INVALID_INFO_CLASS; \ + } \ + } while(0) + +#define GetInfoClassAlignment(Class, ClassList, AlignmentVar, Mode) \ + do { \ + if((Class) >= 0 && (Class) < sizeof(ClassList) / sizeof(ClassList[0])) \ + { \ + *(AlignmentVar) = ClassList[Class].Alignment##Mode; \ + } \ + else \ + { \ + *(AlignmentVar) = sizeof(ULONG); \ + } \ + } while(0) + +#define ProbeQueryInfoBuffer(Buffer, BufferLen, Alignment, RetLen, PrevMode, StatusVar) \ + do { \ + if(PrevMode == UserMode) \ + { \ + _SEH_TRY \ + { \ + ProbeForWrite(Buffer, \ + BufferLen, \ + Alignment); \ + if(RetLen != NULL) \ + { \ + ProbeForWrite(RetLen, \ + sizeof(ULONG), \ + 1); \ + } \ + } \ + _SEH_HANDLE \ + { \ + *(StatusVar) = _SEH_GetExceptionCode(); \ + } \ + _SEH_END; \ + \ + if(!NT_SUCCESS(*(StatusVar))) \ + { \ + DPRINT1("ProbeQueryInfoBuffer failed: 0x%x\n", *(StatusVar)); \ + return *(StatusVar); \ + } \ + } \ + } while(0) + +#define ProbeSetInfoBuffer(Buffer, BufferLen, Alignment, PrevMode, StatusVar) \ + do { \ + if(PrevMode == UserMode) \ + { \ + _SEH_TRY \ + { \ + ProbeForRead(Buffer, \ + BufferLen, \ + Alignment); \ + } \ + _SEH_HANDLE \ + { \ + *(StatusVar) = _SEH_GetExceptionCode(); \ + } \ + _SEH_END; \ + \ + if(!NT_SUCCESS(*(StatusVar))) \ + { \ + DPRINT1("ProbeAllInfoBuffer failed: 0x%x\n", *(StatusVar)); \ + return *(StatusVar); \ + } \ + } \ + } while(0) + +#define DefaultSetInfoBufferCheck(Class, ClassList, Buffer, BufferLen, PrevMode, StatusVar) \ + do { \ + ULONG _Alignment; \ + /* get the preferred alignment for the information class or return */ \ + /* default alignment in case the class doesn't exist */ \ + GetInfoClassAlignment(Class, \ + ClassList, \ + &_Alignment, \ + SET); \ + \ + /* probe the ENTIRE buffers and return on failure */ \ + ProbeSetInfoBuffer(Buffer, \ + BufferLen, \ + _Alignment, \ + PrevMode, \ + StatusVar); \ + \ + /* validate information class index and check buffer size */ \ + CheckInfoClass(Class, \ + BufferLen, \ + ClassList, \ + StatusVar, \ + SET); \ + } while(0) + +#define DefaultQueryInfoBufferCheck(Class, ClassList, Buffer, BufferLen, RetLen, PrevMode, StatusVar) \ + do { \ + ULONG _Alignment; \ + /* get the preferred alignment for the information class or return */ \ + /* alignment in case the class doesn't exist */ \ + GetInfoClassAlignment(Class, \ + ClassList, \ + &_Alignment, \ + QUERY); \ + \ + /* probe the ENTIRE buffers and return on failure */ \ + ProbeQueryInfoBuffer(Buffer, \ + BufferLen, \ + _Alignment, \ + RetLen, \ + PrevMode, \ + StatusVar); \ + \ + /* validate information class index and check buffer size */ \ + CheckInfoClass(Class, \ + BufferLen, \ + ClassList, \ + StatusVar, \ + QUERY); \ + } while(0) + #endif /* __INCLUDE_INTERNAL_OBJMGR_H */ _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-21 21:34:49 UTC (rev 13195) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-21 21:37:32 UTC (rev 13196) @@ -33,6 +33,44 @@ STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, PROCESS_ALL_ACCESS}; +static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = +{ + ICI_SQ_SAME( sizeof(PROCESS_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* ProcessBasicInformation */ + ICI_SQ_SAME( sizeof(QUOTA_LIMITS), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessQuotaLimits */ + ICI_SQ_SAME( sizeof(IO_COUNTERS), sizeof(ULONG), ICIF_QUERY ), /* ProcessIoCounters */ + ICI_SQ_SAME( sizeof(VM_COUNTERS), sizeof(ULONG), ICIF_QUERY ), /* ProcessVmCounters */ + ICI_SQ_SAME( sizeof(KERNEL_USER_TIMES), sizeof(ULONG), ICIF_QUERY ), /* ProcessTimes */ + ICI_SQ_SAME( sizeof(KPRIORITY), sizeof(ULONG), ICIF_SET ), /* ProcessBasePriority */ + ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_SET ), /* ProcessRaisePriority */ + ICI_SQ_SAME( sizeof(HANDLE), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessDebugPort */ + ICI_SQ_SAME( sizeof(HANDLE), sizeof(ULONG), ICIF_SET ), /* ProcessExceptionPort */ + ICI_SQ_SAME( sizeof(PROCESS_ACCESS_TOKEN), sizeof(ULONG), ICIF_SET ), /* ProcessAccessToken */ + ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessLdtInformation */ + ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_SET ), /* ProcessLdtSize */ + ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessDefaultHardErrorMode */ + ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_SET ), /* ProcessIoPortHandlers */ + ICI_SQ_SAME( sizeof(POOLED_USAGE_AND_LIMITS), sizeof(ULONG), ICIF_QUERY ), /* ProcessPooledUsageAndLimits */ + ICI_SQ_SAME( sizeof(PROCESS_WS_WATCH_INFORMATION), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessWorkingSetWatch */ + ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_SET ), /* ProcessUserModeIOPL */ + ICI_SQ_SAME( sizeof(BOOLEAN), sizeof(ULONG), ICIF_SET ), /* ProcessEnableAlignmentFaultFixup */ + ICI_SQ_SAME( sizeof(PROCESS_PRIORITY_CLASS), sizeof(ULONG), ICIF_SET ), /* ProcessPriorityClass */ + ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY ), /* ProcessWx86Information */ + ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY ), /* ProcessHandleCount */ + ICI_SQ_SAME( sizeof(KAFFINITY), sizeof(ULONG), ICIF_SET ), /* ProcessAffinityMask */ + ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessPriorityBoost */ + + ICI_SQ(/*Q*/ sizeof(((PPROCESS_DEVICEMAP_INFORMATION)0x0)->Query), /* ProcessDeviceMap */ + /*S*/ sizeof(((PPROCESS_DEVICEMAP_INFORMATION)0x0)->Set), + /*Q*/ sizeof(ULONG), + /*S*/ sizeof(ULONG), + ICIF_QUERY | ICIF_SET ), + + ICI_SQ_SAME( sizeof(PROCESS_SESSION_INFORMATION), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessSessionInformation */ + ICI_SQ_SAME( sizeof(BOOLEAN), sizeof(ULONG), ICIF_SET ), /* ProcessForegroundInformation */ + ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY ), /* ProcessWow64Information */ + ICI_SQ_SAME( sizeof(UNICODE_STRING), sizeof(ULONG), ICIF_QUERY | ICIF_SIZE_VARIABLE), /* ProcessImageFileName */ +}; + #define MAX_PROCESS_NOTIFY_ROUTINE_COUNT 8 #define MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT 8 @@ -1133,39 +1171,22 @@ OUT PULONG ReturnLength OPTIONAL) { PEPROCESS Process; - NTSTATUS Status; KPROCESSOR_MODE PreviousMode; - + NTSTATUS Status = STATUS_SUCCESS; + PreviousMode = ExGetPreviousMode(); - /* check for valid buffers */ - if(PreviousMode == UserMode) + DefaultQueryInfoBufferCheck(ProcessInformationClass, + PsProcessInfoClass, + ProcessInformation, + ProcessInformationLength, + ReturnLength, + PreviousMode, + &Status); + if(!NT_SUCCESS(Status)) { - _SEH_TRY - { - /* probe with 32bit alignment */ - ProbeForWrite(ProcessInformation, - ProcessInformationLength, - sizeof(ULONG)); - if(ReturnLength) - { - ProbeForWrite(ReturnLength, - sizeof(ULONG), - 1); - } - - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } + DPRINT1("NtQueryInformationProcess() failed, Status: 0x%x\n", Status); + return Status; } /* @@ -1669,46 +1690,37 @@ IN ULONG ProcessInformationLength) { PEPROCESS Process; - NTSTATUS Status; KPROCESSOR_MODE PreviousMode; ACCESS_MASK Access; + NTSTATUS Status = STATUS_SUCCESS; PreviousMode = ExGetPreviousMode(); - /* check for valid buffers */ - if(PreviousMode == UserMode) + DefaultSetInfoBufferCheck(ProcessInformationClass, + PsProcessInfoClass, + ProcessInformation, + ProcessInformationLength, + PreviousMode, + &Status); + if(!NT_SUCCESS(Status)) { - _SEH_TRY - { - /* probe with 32bit alignment */ - ProbeForRead(ProcessInformation, - ProcessInformationLength, - sizeof(ULONG)); - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } + DPRINT1("NtSetInformationProcess() failed, Status: 0x%x\n", Status); + return Status; } - Access = PROCESS_SET_INFORMATION; - switch(ProcessInformationClass) { case ProcessSessionInformation: - Access |= PROCESS_SET_SESSIONID; + Access = PROCESS_SET_INFORMATION | PROCESS_SET_SESSIONID; break; case ProcessExceptionPort: case ProcessDebugPort: - Access |= PROCESS_SET_PORT; + Access = PROCESS_SET_INFORMATION | PROCESS_SET_PORT; break; + + default: + Access = PROCESS_SET_INFORMATION; + break; } Status = ObReferenceObjectByHandle(ProcessHandle,

1 0

[weiden] 13195: the ProcessPriorityBoost class expects ULONG, not BOOL
by weiden＠svn.reactos.com 21 Jan '05

21 Jan '05

the ProcessPriorityBoost class expects ULONG, not BOOL Modified: trunk/reactos/lib/kernel32/process/proc.c _____ Modified: trunk/reactos/lib/kernel32/process/proc.c --- trunk/reactos/lib/kernel32/process/proc.c 2005-01-21 21:29:29 UTC (rev 13194) +++ trunk/reactos/lib/kernel32/process/proc.c 2005-01-21 21:34:49 UTC (rev 13195) @@ -881,12 +881,12 @@ PBOOL pDisablePriorityBoost) { NTSTATUS Status; - BOOL PriorityBoost; + ULONG PriorityBoost; Status = NtQueryInformationProcess(hProcess, ProcessPriorityBoost, &PriorityBoost, - sizeof(BOOL), + sizeof(ULONG), NULL); if (NT_SUCCESS(Status)) { @@ -908,12 +908,12 @@ BOOL bDisablePriorityBoost) { NTSTATUS Status; - BOOL PriorityBoost = (bDisablePriorityBoost ? TRUE : FALSE); /* prevent setting values other than 1 and 0 */ + ULONG PriorityBoost = (bDisablePriorityBoost ? TRUE : FALSE); /* prevent setting values other than 1 and 0 */ Status = NtSetInformationProcess(hProcess, ProcessPriorityBoost, &PriorityBoost, - sizeof(BOOL)); + sizeof(ULONG)); if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
71
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 January 2005