Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 17707: Fix win32k build errors so HEAD can build again, although most are caused by poor programming and will crash if called with unexpected parameters that aren't being properly handled.
by ion＠svn.reactos.com 06 Sep '05

06 Sep '05

Fix win32k build errors so HEAD can build again, although most are caused by poor programming and will crash if called with unexpected parameters that aren't being properly handled. Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/eng/xlate.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-09-06 22:11:37 UTC (rev 17706) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-09-06 23:05:13 UTC (rev 17707) @@ -514,7 +514,7 @@ int zoomX; int zoomY; int count; - int saveX; + int saveX = 0; int saveY; BOOLEAN DesIsBiggerY=FALSE; _____ Modified: trunk/reactos/subsys/win32k/eng/xlate.c --- trunk/reactos/subsys/win32k/eng/xlate.c 2005-09-06 22:11:37 UTC (rev 17706) +++ trunk/reactos/subsys/win32k/eng/xlate.c 2005-09-06 23:05:13 UTC (rev 17707) @@ -528,7 +528,10 @@ else if (PalOutType == XO_DESTPALETTE) hPalette = XlateGDI->DestPal; else + { UNIMPLEMENTED; + return 0; + } PalGDI = PALETTE_LockPalette(hPalette); if(PalGDI != NULL) _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-09-06 22:11:37 UTC (rev 17706) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-09-06 23:05:13 UTC (rev 17707) @@ -1024,7 +1024,7 @@ { VK_UP, VK_NUMPAD8 }, { VK_PRIOR, VK_NUMPAD9 }, { 0,0 } }; - PVSC_VK VscVkTable; + PVSC_VK VscVkTable = NULL; if( !KeyboardLayout || !Msg || (Msg->message != WM_KEYDOWN && Msg->message != WM_SYSKEYDOWN && _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-09-06 22:11:37 UTC (rev 17706) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-09-06 23:05:13 UTC (rev 17707) @@ -1656,7 +1656,7 @@ ROSMENUITEMINFO mii; HWND referenceHwnd; LPPOINT lpPoints; - LPRECT lpRect; + LPRECT lpRect = NULL; POINT FromOffset; LONG XMove, YMove; ULONG i; _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-09-06 22:11:37 UTC (rev 17706) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-09-06 23:05:13 UTC (rev 17707) @@ -1441,7 +1441,7 @@ INT FASTCALL IntGdiGetDeviceCaps(PDC dc, INT Index) { - INT ret; + INT ret = 0; POINT pt; /* Retrieve capability */

1 0

[gdalsnes] 17706: remake refcounting
by gdalsnes＠svn.reactos.com 06 Sep '05

06 Sep '05

remake refcounting naming changes convert internal function to page ptr and not handle Modified: trunk/reactos/subsys/win32k/include/userfuncs.h Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c _____ Modified: trunk/reactos/subsys/win32k/include/userfuncs.h --- trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-06 19:47:06 UTC (rev 17705) +++ trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-06 22:11:37 UTC (rev 17706) @@ -2,11 +2,14 @@ #define _WIN32K_USERFUNCS_H //currently unused -#define ASSERT_REFS(obj) +#define ASSERT_REFS(obj) ASSERT(ObmGetReferenceCount(obj) >= 2) #define UserReferenceWindowObjectCo(o) IntReferenceWindowObject(o) #define UserDereferenceWindowObjectCo(o) IntReleaseWindowObject(o) +#define UserReferenceAccelObjectCo(o) IntReferenceWindowObject(o) +#define UserDereferenceAccelObjectCo(o) IntReleaseWindowObject(o) + extern PUSER_HANDLE_TABLE gHandleTable; _____ Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c --- trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-06 19:47:06 UTC (rev 17705) +++ trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-06 22:11:37 UTC (rev 17706) @@ -68,15 +68,38 @@ return(STATUS_SUCCESS); } + +static +PACCELERATOR_TABLE FASTCALL UserGetAccelObjectNoRef(HACCEL hAccel) +{ + PACCELERATOR_TABLE Accel=NULL; + NTSTATUS Status = ObmReferenceObjectByHandle(gHandleTable, + hAccel, + otAcceleratorTable, + (PVOID*)&Accel); + + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); + return NULL; + } + + ObmDereferenceObject(Accel); + return Accel; +} + + + + int STDCALL NtUserCopyAcceleratorTable( - HACCEL Table, + HACCEL hAccel, LPACCEL Entries, int EntriesCount) { PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE AcceleratorTable; + PACCELERATOR_TABLE Accel; NTSTATUS Status; int Ret; DECLARE_RETURN(int); @@ -88,31 +111,25 @@ UserMode, 0, &WindowStation); + if (!NT_SUCCESS(Status)) { SetLastNtError(STATUS_ACCESS_DENIED); RETURN(0); } - Status = ObmReferenceObjectByHandle(gHandleTable, - Table, - otAcceleratorTable, - (PVOID*)&AcceleratorTable); - - if (!NT_SUCCESS(Status)) + if (!(Accel = UserGetAccelObjectNoRef(hAccel))) { - SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); ObDereferenceObject(WindowStation); RETURN(0); } if(Entries) { - Ret = min(EntriesCount, AcceleratorTable->Count); - Status = MmCopyToCaller(Entries, AcceleratorTable->Table, Ret * sizeof(ACCEL)); + Ret = min(EntriesCount, Accel->Count); + Status = MmCopyToCaller(Entries, Accel->Table, Ret * sizeof(ACCEL)); if (!NT_SUCCESS(Status)) { - ObmDereferenceObject(AcceleratorTable); ObDereferenceObject(WindowStation); SetLastNtError(Status); RETURN(0); @@ -120,10 +137,9 @@ } else { - Ret = AcceleratorTable->Count; + Ret = Accel->Count; } - ObmDereferenceObject(AcceleratorTable); ObDereferenceObject(WindowStation); RETURN(Ret); @@ -141,9 +157,9 @@ SIZE_T EntriesCount) { PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE AcceleratorTable; + PACCELERATOR_TABLE Accel; NTSTATUS Status; - HACCEL Handle; + HACCEL hAccel; DECLARE_RETURN(HACCEL); DPRINT("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d)\n", @@ -154,47 +170,45 @@ UserMode, 0, &WindowStation); + if (!NT_SUCCESS(Status)) { SetLastNtError(STATUS_ACCESS_DENIED); - DPRINT1("E1\n"); RETURN( FALSE ); } - AcceleratorTable = ObmCreateObject( + Accel = ObmCreateObject( gHandleTable, - (PHANDLE)&Handle, + (PHANDLE)&hAccel, otAcceleratorTable, sizeof(ACCELERATOR_TABLE)); - if (AcceleratorTable == NULL) + + if (Accel == NULL) { ObDereferenceObject(WindowStation); SetLastNtError(STATUS_NO_MEMORY); - DPRINT1("E2\n"); RETURN( (HACCEL) 0 ); } - AcceleratorTable->Count = EntriesCount; - if (AcceleratorTable->Count > 0) + Accel->Count = EntriesCount; + if (Accel->Count > 0) { - AcceleratorTable->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount * sizeof(ACCEL), TAG_ACCEL); - if (AcceleratorTable->Table == NULL) + Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount * sizeof(ACCEL), TAG_ACCEL); + if (Accel->Table == NULL) { - ObmCloseHandle(gHandleTable, Handle); + ObmCloseHandle(gHandleTable, hAccel); ObDereferenceObject(WindowStation); SetLastNtError(Status); - DPRINT1("E3\n"); RETURN( (HACCEL) 0); } - Status = MmCopyFromCaller(AcceleratorTable->Table, Entries, EntriesCount * sizeof(ACCEL)); + Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount * sizeof(ACCEL)); if (!NT_SUCCESS(Status)) { - ExFreePool(AcceleratorTable->Table); - ObmCloseHandle(gHandleTable, Handle); + ExFreePool(Accel->Table); + ObmCloseHandle(gHandleTable, hAccel); ObDereferenceObject(WindowStation); SetLastNtError(Status); - DPRINT1("E4\n"); RETURN((HACCEL) 0); } } @@ -203,7 +217,7 @@ /* FIXME: Save HandleTable in a list somewhere so we can clean it up again */ - RETURN((HACCEL) Handle); + RETURN(hAccel); CLEANUP: DPRINT("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d) = %x\n", @@ -212,13 +226,15 @@ END_CLEANUP; } + + BOOLEAN STDCALL NtUserDestroyAcceleratorTable( - HACCEL Table) + HACCEL hAccel) { PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE AcceleratorTable; + PACCELERATOR_TABLE Accel; NTSTATUS Status; DECLARE_RETURN(BOOLEAN); @@ -227,13 +243,14 @@ FIXME: Destroy only tables created using CreateAcceleratorTable. */ - DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", Table); + DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", hAccel); UserEnterExclusive(); Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), UserMode, 0, &WindowStation); + if (!NT_SUCCESS(Status)) { SetLastNtError(STATUS_ACCESS_DENIED); @@ -241,40 +258,33 @@ RETURN( FALSE); } - Status = ObmReferenceObjectByHandle(gHandleTable, - Table, - otAcceleratorTable, - (PVOID*)&AcceleratorTable); - if (!NT_SUCCESS(Status)) + if (!(Accel = UserGetAccelObjectNoRef(hAccel))) { - SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); ObDereferenceObject(WindowStation); - DPRINT1("E2\n"); RETURN( FALSE); } - ObmCloseHandle(gHandleTable, Table); + ObmCloseHandle(gHandleTable, hAccel); - if (AcceleratorTable->Table != NULL) + if (Accel->Table != NULL) { - ExFreePool(AcceleratorTable->Table); + ExFreePool(Accel->Table); } ObDereferenceObject(WindowStation); - DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", - Table); - RETURN( TRUE); CLEANUP: - DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", Table,_ret_); + DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", hAccel,_ret_); UserLeave(); END_CLEANUP; } -static BOOLEAN -co_IntTranslateAccelerator(HWND hWnd, +static +BOOLEAN FASTCALL +co_IntTranslateAccelerator( + PWINDOW_OBJECT Window, UINT message, WPARAM wParam, LPARAM lParam, @@ -284,9 +294,11 @@ { UINT mesg = 0; - DPRINT("IntTranslateAccelerator(hWnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x)\n", - hWnd, message, wParam, lParam, fVirt, key, cmd); + ASSERT_REFS(Window); + DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x)\n", + Window->hSelf, message, wParam, lParam, fVirt, key, cmd); + if (wParam != key) { DPRINT("T0\n"); @@ -335,8 +347,8 @@ } } - DPRINT("IntTranslateAccelerator(hWnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = FALSE\n", - hWnd, message, wParam, lParam, fVirt, key, cmd); + DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = FALSE\n", + Window->hSelf, message, wParam, lParam, fVirt, key, cmd); return FALSE; @@ -345,7 +357,7 @@ mesg = 1; else if (IntGetCaptureWindow()) mesg = 2; - else if (!IntIsWindowVisible(hWnd)) /* FIXME: WINE IsWindowEnabled == IntIsWindowVisible? */ + else if (!IntIsWindowVisible(Window->hSelf)) /* FIXME: WINE IsWindowEnabled == IntIsWindowVisible? */ mesg = 3; else { @@ -423,12 +435,12 @@ if (mesg == WM_COMMAND) { DPRINT(", sending WM_COMMAND, wParam=%0x\n", 0x10000 | cmd); - co_IntSendMessage(hWnd, mesg, 0x10000 | cmd, 0L); + co_IntSendMessage(Window->hSelf, mesg, 0x10000 | cmd, 0L); } else if (mesg == WM_SYSCOMMAND) { DPRINT(", sending WM_SYSCOMMAND, wParam=%0x\n", cmd); - co_IntSendMessage(hWnd, mesg, cmd, 0x00010000L); + co_IntSendMessage(Window->hSelf, mesg, cmd, 0x00010000L); } else { @@ -449,7 +461,7 @@ } DPRINT("IntTranslateAccelerator(hWnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = TRUE\n", - hWnd, message, wParam, lParam, fVirt, key, cmd); + Window->hSelf, message, wParam, lParam, fVirt, key, cmd); return TRUE; } @@ -458,34 +470,26 @@ STDCALL NtUserTranslateAccelerator( HWND hWnd, - HACCEL Table, + HACCEL hAccel, LPMSG Message) { - PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE AcceleratorTable; + PWINSTATION_OBJECT WindowStation = NULL; + PWINDOW_OBJECT Window = NULL; + PACCELERATOR_TABLE Accel = NULL; NTSTATUS Status; ULONG i; DECLARE_RETURN(int); DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p)\n", - hWnd, Table, Message); + hWnd, hAccel, Message); UserEnterShared(); - if (hWnd == NULL) - RETURN( 0); - if (Message == NULL) { SetLastNtError(STATUS_INVALID_PARAMETER); RETURN( 0); } - if (Table == NULL) - { - SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); - RETURN( 0); - } - if ((Message->message != WM_KEYDOWN) && (Message->message != WM_SYSKEYDOWN) && (Message->message != WM_SYSCHAR) && @@ -498,49 +502,57 @@ UserMode, 0, &WindowStation); + if (!NT_SUCCESS(Status)) { SetLastNtError(STATUS_ACCESS_DENIED); RETURN( 0); } - Status = ObmReferenceObjectByHandle(gHandleTable, - Table, - otAcceleratorTable, - (PVOID*)&AcceleratorTable); - if (!NT_SUCCESS(Status)) + if (!(Accel = UserGetAccelObjectNoRef(hAccel))) { - SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); - ObDereferenceObject(WindowStation); RETURN( 0); } + UserReferenceAccelObjectCo(Accel); + + if (!(Window = UserGetWindowObjectNoRef(hWnd))) + { + RETURN( 0); + } + + UserReferenceWindowObjectCo(Window); + + /* FIXME: Associate AcceleratorTable with the current thread */ - for (i = 0; i < AcceleratorTable->Count; i++) + for (i = 0; i < Accel->Count; i++) { - if (co_IntTranslateAccelerator(hWnd, Message->message, Message->wParam, Message->lParam, - AcceleratorTable->Table[i].fVirt, AcceleratorTable->Table[i].key, - AcceleratorTable->Table[i].cmd)) + if (co_IntTranslateAccelerator(Window, Message->message, Message->wParam, Message->lParam, + Accel->Table[i].fVirt, Accel->Table[i].key, + Accel->Table[i].cmd)) { - ObDereferenceObject(WindowStation); DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", - hWnd, Table, Message, 1); + hWnd, hAccel, Message, 1); RETURN( 1); } - if (((AcceleratorTable->Table[i].fVirt & 0x80) > 0)) + if (((Accel->Table[i].fVirt & 0x80) > 0)) { break; } } - ObDereferenceObject(WindowStation); - RETURN( 0); CLEANUP: + + if (Window) UserReferenceWindowObjectCo(Window); + if (Accel) UserReferenceAccelObjectCo(Accel); + + if (WindowStation) ObDereferenceObject(WindowStation); + DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", - hWnd, Table, Message, 0); + hWnd, hAccel, Message, 0); UserLeave(); END_CLEANUP; }

1 0

[ion] 17705: - Fix size functions to return the correct results in all cases.
by ion＠svn.reactos.com 06 Sep '05

06 Sep '05

- Fix size functions to return the correct results in all cases. Modified: trunk/reactos/lib/rtl/nls.c Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/lib/rtl/nls.c --- trunk/reactos/lib/rtl/nls.c 2005-09-06 19:38:51 UTC (rev 17704) +++ trunk/reactos/lib/rtl/nls.c 2005-09-06 19:47:06 UTC (rev 17705) @@ -278,35 +278,50 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlMultiByteToUnicodeSize(PULONG UnicodeSize, PCSTR MbString, ULONG MbSize) { - ULONG Length; + ULONG Length = 0; - if (NlsMbCodePageTag == FALSE) - { - /* single-byte code page */ - *UnicodeSize = MbSize * sizeof (WCHAR); - } - else - { - /* multi-byte code page */ - for (Length = 0; MbSize; MbSize--, MbString++, Length++) - { - if (NlsLeadByteInfo[(UCHAR)*MbString] != 0) - { - if (!--MbSize) - break; /* partial char, ignore it */ - MbString++; - } - } + if (!NlsMbCodePageTag) + { + /* single-byte code page */ + *UnicodeSize = MbSize * sizeof (WCHAR); + } + else + { + /* multi-byte code page */ + while (MbSize--) + { + if (NlsLeadByteInfo[*(PUCHAR)MbString++]) + { + if (!MbSize) + { + /* partial char, ignore it */ + Length++; + break; + } + } + else + { + /* Move on */ + MbSize--; + MbString++; + } - *UnicodeSize = Length * sizeof(WCHAR); - } + /* Increase returned size */ + Length++; + } - return STATUS_SUCCESS; + /* Return final size */ + *UnicodeSize = Length * sizeof(WCHAR); + } + + /* Success */ + return STATUS_SUCCESS; } @@ -472,47 +487,45 @@ return STATUS_SUCCESS; } - /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlUnicodeToMultiByteSize(PULONG MbSize, PWCHAR UnicodeString, ULONG UnicodeSize) { - ULONG UnicodeLength; - ULONG MbLength; + ULONG UnicodeLength = UnicodeSize / sizeof(WCHAR); + ULONG MbLength = 0; - if (NlsMbCodePageTag == FALSE) - { - /* single-byte code page */ - *MbSize = UnicodeSize / sizeof (WCHAR); - } - else - { - /* multi-byte code page */ - UnicodeLength = UnicodeSize / sizeof(WCHAR); - MbLength = 0; - while (UnicodeLength > 0) - { - if (NlsLeadByteInfo[(USHORT)*UnicodeString] & 0xff00) - MbLength++; + if (!NlsMbCodePageTag) + { + /* single-byte code page */ + *MbSize = UnicodeLength; + } + else + { + /* multi-byte code page */ + while (UnicodeLength--) + { + if (HIBYTE(NlsUnicodeToAnsiTable[*UnicodeString++])) + { + MbLength += sizeof(WCHAR); + } + else + { + MbLength++; + } + } + + *MbSize = MbLength; + } - MbLength++; - UnicodeLength--; - UnicodeString++; - } - - *MbSize = MbLength; - } - - return(STATUS_SUCCESS); + /* Success */ + return STATUS_SUCCESS; } - - - /* * @unimplemented */ _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-09-06 19:38:51 UTC (rev 17704) +++ trunk/reactos/lib/rtl/unicode.c 2005-09-06 19:47:06 UTC (rev 17705) @@ -68,13 +68,15 @@ STDCALL RtlxAnsiStringToUnicodeSize(IN PCANSI_STRING AnsiString) { - ULONG Size; + ULONG Size; - RtlMultiByteToUnicodeSize(&Size, - AnsiString->Buffer, - AnsiString->Length); + /* Convert from Mb String to Unicode Size */ + RtlMultiByteToUnicodeSize(&Size, + AnsiString->Buffer, + AnsiString->Length); - return(Size); + /* Return the size plus the null-char */ + return(Size + sizeof(WCHAR)); } @@ -883,16 +885,17 @@ */ ULONG STDCALL -RtlxUnicodeStringToOemSize( - IN PCUNICODE_STRING UnicodeString) +RtlxUnicodeStringToOemSize(IN PCUNICODE_STRING UnicodeString) { - ULONG Size; + ULONG Size; - RtlUnicodeToMultiByteSize (&Size, + /* Convert the Unicode String to Mb Size */ + RtlUnicodeToMultiByteSize(&Size, UnicodeString->Buffer, UnicodeString->Length); - return Size+1; //NB: incl. nullterm + /* Return the size + the null char */ + return (Size + sizeof(CHAR)); } /* @@ -1798,14 +1801,15 @@ STDCALL RtlxOemStringToUnicodeSize(IN PCOEM_STRING OemString) { - ULONG Size; + ULONG Size; - //this function returns size including nullterm - RtlMultiByteToUnicodeSize(&Size, - OemString->Buffer, - OemString->Length); + /* Convert the Mb String to Unicode Size */ + RtlMultiByteToUnicodeSize(&Size, + OemString->Buffer, + OemString->Length); - return(Size); + /* Return the size + null-char */ + return (Size + sizeof(WCHAR)); } @@ -1859,17 +1863,17 @@ */ ULONG STDCALL -RtlxUnicodeStringToAnsiSize( - IN PCUNICODE_STRING UnicodeString) +RtlxUnicodeStringToAnsiSize(IN PCUNICODE_STRING UnicodeString) { - ULONG Size; + ULONG Size; - //this function return size without nullterm! - RtlUnicodeToMultiByteSize (&Size, + /* Convert the Unicode String to Mb Size */ + RtlUnicodeToMultiByteSize(&Size, UnicodeString->Buffer, UnicodeString->Length); - return Size + sizeof(CHAR); //NB: incl. nullterm + /* Return the size + null-char */ + return (Size + sizeof(CHAR)); }

1 0

[ion] 17704: - Use Rtl macros instead of manually handling the cases.
by ion＠svn.reactos.com 06 Sep '05

06 Sep '05

- Use Rtl macros instead of manually handling the cases. Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-09-06 19:37:38 UTC (rev 17703) +++ trunk/reactos/lib/rtl/unicode.c 2005-09-06 19:38:51 UTC (rev 17704) @@ -913,13 +913,7 @@ NTSTATUS Status = STATUS_SUCCESS; ULONG Length; /* including nullterm */ - if (NlsMbCodePageTag == TRUE) - { - Length = RtlUnicodeStringToAnsiSize((PUNICODE_STRING)UniSource); - } - else - Length = (UniSource->Length / sizeof(WCHAR)) + sizeof(CHAR); - + Length = RtlUnicodeStringToAnsiSize(UniSource); AnsiDest->Length = Length - sizeof(CHAR); if (AllocateDestinationString) @@ -974,11 +968,7 @@ NTSTATUS Status; ULONG Length; /* including nullterm */ - if (NlsMbOemCodePageTag == TRUE) - Length = RtlOemStringToUnicodeSize((POEM_STRING)OemSource); - else - Length = (OemSource->Length * sizeof(WCHAR)) + sizeof(WCHAR); - + Length = RtlOemStringToUnicodeSize(OemSource); if (Length > 0xffff) return STATUS_INVALID_PARAMETER_2; @@ -1035,11 +1025,7 @@ NTSTATUS Status = STATUS_SUCCESS; ULONG Length; //including nullterm - if (NlsMbOemCodePageTag == TRUE) - Length = RtlUnicodeStringToAnsiSize ((PUNICODE_STRING)UniSource); - else - Length = (UniSource->Length / sizeof(WCHAR)) + sizeof(CHAR); - + Length = RtlUnicodeStringToAnsiSize(UniSource); if (Length > 0x0000FFFF) return STATUS_INVALID_PARAMETER_2; @@ -1158,11 +1144,7 @@ NTSTATUS Status; ULONG Length; /* excluding nullterm */ - if (NlsMbCodePageTag == TRUE) - Length = RtlOemStringToUnicodeSize((POEM_STRING)OemSource) - sizeof(WCHAR); - else - Length = OemSource->Length * sizeof(WCHAR); - + Length = RtlOemStringToCountedUnicodeSize(OemSource); if (Length > 65535) return STATUS_INVALID_PARAMETER_2; @@ -1498,11 +1480,7 @@ NTSTATUS Status; ULONG Length; //excluding nullterm - if (NlsMbOemCodePageTag == TRUE) - Length = RtlUnicodeStringToAnsiSize(UniSource) - sizeof(CHAR); - else - Length = (UniSource->Length / sizeof(WCHAR)); - + Length = RtlUnicodeStringToCountedOemSize(UniSource); if (Length > 0x0000FFFF) return STATUS_INVALID_PARAMETER_2; @@ -1648,11 +1626,7 @@ NTSTATUS Status; ULONG Length; /* including nullterm */ - if (NlsMbCodePageTag == TRUE) - Length = RtlUnicodeStringToAnsiSize(UniSource); - else - Length = (UniSource->Length / sizeof(WCHAR)) + sizeof(CHAR); - + Length = RtlUnicodeStringToAnsiSize(UniSource); if (Length > 0x0000FFFF) return STATUS_INVALID_PARAMETER_2; @@ -1713,11 +1687,7 @@ NTSTATUS Status; ULONG Length; /* excluding nullterm */ - if (NlsMbCodePageTag == TRUE) - Length = RtlUnicodeStringToAnsiSize((PUNICODE_STRING)UniSource) - sizeof(CHAR); - else - Length = UniSource->Length / sizeof(WCHAR); - + Length = RtlUnicodeStringToCountedOemSize(UniSource); if (Length > 0x0000FFFF) return(STATUS_INVALID_PARAMETER_2); @@ -1775,11 +1745,7 @@ NTSTATUS Status; ULONG Length; /* including nullterm */ - if (NlsMbOemCodePageTag == TRUE) - Length = RtlUnicodeStringToAnsiSize((PUNICODE_STRING)UniSource); - else - Length = (UniSource->Length / sizeof(WCHAR)) + sizeof(CHAR); - + Length = RtlUnicodeStringToAnsiSize(UniSource); if (Length > 0x0000FFFF) return STATUS_INVALID_PARAMETER_2; @@ -2148,11 +2114,7 @@ NTSTATUS Status; ULONG Length; //including nullterm - if (NlsMbCodePageTag == TRUE) - Length = RtlAnsiStringToUnicodeSize(AnsiSource); - else - Length = (AnsiSource->Length * sizeof(WCHAR)) + sizeof(WCHAR); - + Length = RtlAnsiStringToUnicodeSize(AnsiSource); if (Length > 0xffff) return STATUS_INVALID_PARAMETER_2;

1 0

[ion] 17703: - Fix the sad sad definition of sizeof(ANSI_NULL) which returned 4...
by ion＠svn.reactos.com 06 Sep '05

06 Sep '05

- Fix the sad sad definition of sizeof(ANSI_NULL) which returned 4... Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-09-06 19:21:42 UTC (rev 17702) +++ trunk/reactos/w32api/include/winnt.h 2005-09-06 19:37:38 UTC (rev 17703) @@ -156,8 +156,8 @@ #define Int64ShraMod32(a,b) ((LONGLONG)(a)>>(b)) #define Int64ShrlMod32(a,b) ((DWORDLONG)(a)>>(b)) #endif -#define ANSI_NULL '\0' -#define UNICODE_NULL L'\0' +#define ANSI_NULL ((CHAR)0) +#define UNICODE_NULL ((WCHAR)0) typedef BYTE BOOLEAN,*PBOOLEAN; #endif typedef BYTE FCHAR;

1 0

[gvg] 17702: Fix release build
by gvg＠svn.reactos.com 06 Sep '05

06 Sep '05

Fix release build Modified: trunk/reactos/tools/winebuild/spec32.c _____ Modified: trunk/reactos/tools/winebuild/spec32.c --- trunk/reactos/tools/winebuild/spec32.c 2005-09-06 18:07:46 UTC (rev 17701) +++ trunk/reactos/tools/winebuild/spec32.c 2005-09-06 19:21:42 UTC (rev 17702) @@ -318,6 +318,7 @@ { int i; +#if 0 for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; @@ -329,6 +330,7 @@ fprintf( outfile, "#endif\n\n" ); break; } +#endif for (i = 0; i < spec->nb_entry_points; i++) {

1 0

[gvg] 17701: Shut up some debug messages
by gvg＠svn.reactos.com 06 Sep '05

06 Sep '05

Shut up some debug messages Modified: trunk/reactos/ntoskrnl/ob/wait.c Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/ob/wait.c --- trunk/reactos/ntoskrnl/ob/wait.c 2005-09-06 17:33:56 UTC (rev 17700) +++ trunk/reactos/ntoskrnl/ob/wait.c 2005-09-06 18:07:46 UTC (rev 17701) @@ -243,7 +243,7 @@ if (LockInUse) KeLeaveCriticalRegion(); /* Return status */ - DPRINT1("Returning: %x\n", Status); + DPRINT("Returning: %x\n", Status); return Status; } _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-09-06 17:33:56 UTC (rev 17700) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-09-06 18:07:46 UTC (rev 17701) @@ -776,7 +776,7 @@ DPRINT("Received PnP Event\n"); if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) { - DPRINT1("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); + DPRINT("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); } else {

1 0

[ion] 17700: - Use DDK macros to speed up size calculations on single-byte codepages.
by ion＠svn.reactos.com 06 Sep '05

06 Sep '05

- Use DDK macros to speed up size calculations on single-byte codepages. Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-09-06 15:57:42 UTC (rev 17699) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-09-06 17:33:56 UTC (rev 17700) @@ -764,13 +764,19 @@ /* * Unicode->Ansi String Functions */ -/* FIXME: Use macro */ -#undef RtlUnicodeStringToAnsiSize NTSYSAPI ULONG NTAPI -RtlUnicodeStringToAnsiSize(IN PUNICODE_STRING UnicodeString); +RtlxUnicodeStringToAnsiSize(IN PCUNICODE_STRING UnicodeString); +#ifdef NTOS_MODE_USER +#define RtlUnicodeStringToAnsiSize(STRING) ( \ + NLS_MB_CODE_PAGE_TAG ? \ + RtlxUnicodeStringToAnsiSize(STRING) : \ + ((STRING)->Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR) \ +) +#endif + NTSYSAPI NTSTATUS NTAPI @@ -821,13 +827,22 @@ ULONG UnicodeSize ); -/* FIXME: Use macro */ -#undef RtlUnicodeStringToOemSize NTSYSAPI ULONG NTAPI -RtlUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString); +RtlxUnicodeStringToOemSize(IN PCUNICODE_STRING UnicodeString); +#ifdef NTOS_MODE_USER +#define RtlUnicodeStringToOemSize(STRING) ( \ + NLS_MB_OEM_CODE_PAGE_TAG ? \ + RtlxUnicodeStringToOemSize(STRING) : \ + ((STRING)->Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR) \ +) +#define RtlUnicodeStringToCountedOemSize(STRING) ( \ + (ULONG)(RtlUnicodeStringToOemSize(STRING) - sizeof(UNICODE_NULL)) \ +) +#endif + NTSYSAPI NTSTATUS NTAPI @@ -873,16 +888,25 @@ ULONG UnicodeSize ); -/* - * OEM to Unicode Functions - */ -/* FIXME: Use macro */ -#undef RtlOemStringToUnicodeSize NTSYSAPI ULONG NTAPI -RtlOemStringToUnicodeSize(POEM_STRING AnsiString); +RtlxOemStringToUnicodeSize(IN PCOEM_STRING OemString); +/* + * OEM to Unicode Functions + */ +#ifdef NTOS_MODE_USER +#define RtlOemStringToUnicodeSize(STRING) ( \ + NLS_MB_OEM_CODE_PAGE_TAG ? \ + RtlxOemStringToUnicodeSize(STRING) : \ + ((STRING)->Length + sizeof(ANSI_NULL)) * sizeof(WCHAR) \ +) +#define RtlOemStringToCountedUnicodeSize(STRING) ( \ + (ULONG)(RtlOemStringToUnicodeSize(STRING) - sizeof(UNICODE_NULL)) \ +) +#endif + NTSYSAPI NTSTATUS NTAPI @@ -915,14 +939,13 @@ BOOLEAN AllocateDestinationString ); -/* FIXME: Use macro */ -#undef RtlAnsiStringToUnicodeSize -NTSYSAPI -ULONG -NTAPI -RtlAnsiStringToUnicodeSize( - PANSI_STRING AnsiString -); +#ifdef NTOS_MODE_USER +#define RtlAnsiStringToUnicodeSize(STRING) ( \ + NLS_MB_CODE_PAGE_TAG ? \ + RtlxAnsiStringToUnicodeSize(STRING) : \ + ((STRING)->Length + sizeof(ANSI_NULL)) * sizeof(WCHAR) \ +) +#endif NTSYSAPI BOOLEAN _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-09-06 15:57:42 UTC (rev 17699) +++ trunk/reactos/lib/rtl/unicode.c 2005-09-06 17:33:56 UTC (rev 17700) @@ -66,7 +66,7 @@ */ ULONG STDCALL -RtlxAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString) +RtlxAnsiStringToUnicodeSize(IN PCANSI_STRING AnsiString) { ULONG Size; @@ -884,7 +884,7 @@ ULONG STDCALL RtlxUnicodeStringToOemSize( - IN PUNICODE_STRING UnicodeString) + IN PCUNICODE_STRING UnicodeString) { ULONG Size; @@ -1830,7 +1830,7 @@ */ ULONG STDCALL -RtlxOemStringToUnicodeSize(IN POEM_STRING OemString) +RtlxOemStringToUnicodeSize(IN PCOEM_STRING OemString) { ULONG Size; @@ -1894,7 +1894,7 @@ ULONG STDCALL RtlxUnicodeStringToAnsiSize( - IN PUNICODE_STRING UnicodeString) + IN PCUNICODE_STRING UnicodeString) { ULONG Size; @@ -2256,49 +2256,8 @@ DestinationString->Length = SourceString->Length; } - /* * @implemented - */ -ULONG STDCALL -RtlAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString) -{ - return RtlxAnsiStringToUnicodeSize(AnsiString); -} - - -/* - * @implemented - */ -ULONG STDCALL -RtlOemStringToUnicodeSize(IN POEM_STRING OemString) -{ - return RtlxOemStringToUnicodeSize(OemString); -} - - - -/* - * @implemented - */ -ULONG STDCALL -RtlUnicodeStringToAnsiSize(IN PUNICODE_STRING UnicodeString) -{ - return RtlxUnicodeStringToAnsiSize(UnicodeString); -} - - -/* - * @implemented - */ -ULONG STDCALL -RtlUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString) -{ - return RtlxUnicodeStringToOemSize(UnicodeString); -} - -/* - * @implemented * * NOTES * See RtlpDuplicateUnicodeString _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-09-06 15:57:42 UTC (rev 17699) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-09-06 17:33:56 UTC (rev 17700) @@ -5099,9 +5099,15 @@ NTOSAPI ULONG DDKAPI -RtlAnsiStringToUnicodeSize( - IN PANSI_STRING AnsiString); +RtlxAnsiStringToUnicodeSize( + IN PCANSI_STRING AnsiString); +#define RtlAnsiStringToUnicodeSize(STRING) ( \ + NLS_MB_CODE_PAGE_TAG ? \ + RtlxAnsiStringToUnicodeSize(STRING) : \ + ((STRING)->Length + sizeof(ANSI_NULL)) * sizeof(WCHAR) \ +) + NTOSAPI NTSTATUS DDKAPI @@ -5720,11 +5726,11 @@ RtlUlonglongByteSwap( IN ULONGLONG Source); -NTOSAPI -ULONG -DDKAPI -RtlUnicodeStringToAnsiSize( - IN PUNICODE_STRING UnicodeString); +#define RtlUnicodeStringToAnsiSize(STRING) ( \ + NLS_MB_CODE_PAGE_TAG ? \ + RtlxUnicodeStringToAnsiSize(STRING) : \ + ((STRING)->Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR) \ +) NTOSAPI NTSTATUS

1 0

[ion] 17699: - Remove deprecated zwtypes.h and spread out the types in the NT subsystems where they should go.
by ion＠svn.reactos.com 06 Sep '05

06 Sep '05

- Remove deprecated zwtypes.h and spread out the types in the NT subsystems where they should go. Modified: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/lpctypes.h Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ndk/pstypes.h Deleted: trunk/reactos/include/ndk/zwtypes.h _____ Modified: trunk/reactos/include/ndk/cmtypes.h --- trunk/reactos/include/ndk/cmtypes.h 2005-09-06 14:19:03 UTC (rev 17698) +++ trunk/reactos/include/ndk/cmtypes.h 2005-09-06 15:57:42 UTC (rev 17699) @@ -11,11 +11,24 @@ #define _CMTYPES_H /* DEPENDENCIES **************************************************************/ +#include <cfg.h> +#include "iotypes.h" /* EXPORTED DATA *************************************************************/ /* CONSTANTS *****************************************************************/ +#define MAX_BUS_NAME 24 +/* PLUGPLAY_CONTROL_RELATED_DEVICE_DATA.Relation values */ +#define PNP_GET_PARENT_DEVICE 1 +#define PNP_GET_CHILD_DEVICE 2 +#define PNP_GET_SIBLING_DEVICE 3 + +/* PLUGPLAY_CONTROL_STATUS_DATA.Operation values */ +#define PNP_GET_DEVICE_STATUS 0 +#define PNP_SET_DEVICE_STATUS 1 +#define PNP_CLEAR_DEVICE_STATUS 2 + /* ENUMERATIONS **************************************************************/ #ifdef NTOS_MODE_USER @@ -44,9 +57,46 @@ KeyUserFlagsInformation, MaxKeySetInfoClass } KEY_SET_INFORMATION_CLASS; +#endif +typedef enum _PLUGPLAY_CONTROL_CLASS +{ + PlugPlayControlUserResponse = 0x07, + PlugPlayControlProperty = 0x0A, + PlugPlayControlGetRelatedDevice = 0x0C, + PlugPlayControlDeviceStatus = 0x0E, + PlugPlayControlGetDeviceDepth +} PLUGPLAY_CONTROL_CLASS; + +typedef enum _PLUGPLAY_BUS_CLASS +{ + SystemBus, + PlugPlayVirtualBus, + MaxPlugPlayBusClass +} PLUGPLAY_BUS_CLASS, *PPLUGPLAY_BUS_CLASS; + +typedef enum _PLUGPLAY_VIRTUAL_BUS_TYPE +{ + Root, + MaxPlugPlayVirtualBusType +} PLUGPLAY_VIRTUAL_BUS_TYPE, *PPLUGPLAY_VIRTUAL_BUS_TYPE; + +typedef enum _PLUGPLAY_EVENT_CATEGORY +{ + HardwareProfileChangeEvent, + TargetDeviceChangeEvent, + DeviceClassChangeEvent, + CustomDeviceEvent, + DeviceInstallEvent, + DeviceArrivalEvent, + PowerEvent, + VetoEvent, + BlockedDriverEvent, + MaxPlugEventCategory +} PLUGPLAY_EVENT_CATEGORY; /* TYPES *********************************************************************/ +#ifdef NTOS_MODE_USER typedef struct _KEY_WRITE_TIME_INFORMATION { LARGE_INTEGER LastWriteTime; @@ -125,5 +175,105 @@ } KEY_BASIC_INFORMATION, *PKEY_BASIC_INFORMATION; #endif + +typedef struct _PLUGPLAY_EVENT_BLOCK +{ + GUID EventGuid; + PLUGPLAY_EVENT_CATEGORY EventCategory; + PULONG Result; + ULONG Flags; + ULONG TotalSize; + PVOID DeviceObject; + union + { + struct + { + GUID ClassGuid; + WCHAR SymbolicLinkName[ANYSIZE_ARRAY]; + } DeviceClass; + struct + { + WCHAR DeviceIds[ANYSIZE_ARRAY]; + } TargetDevice; + struct + { + WCHAR DeviceId[ANYSIZE_ARRAY]; + } InstallDevice; + struct + { + PVOID NotificationStructure; + WCHAR DeviceIds[ANYSIZE_ARRAY]; + } CustomNotification; + struct + { + PVOID Notification; + } ProfileNotification; + struct + { + ULONG NotificationCode; + ULONG NotificationData; + } PowerNotification; + struct + { + PNP_VETO_TYPE VetoType; + WCHAR DeviceIdVetoNameBuffer[ANYSIZE_ARRAY]; + } VetoNotification; + struct + { + GUID BlockedDriverGuid; + } BlockedDriverNotification; + }; +} PLUGPLAY_EVENT_BLOCK, *PPLUGPLAY_EVENT_BLOCK; + +/* Class 0x0A */ +typedef struct _PLUGPLAY_CONTROL_PROPERTY_DATA +{ + UNICODE_STRING DeviceInstance; + ULONG Property; + PVOID Buffer; + ULONG BufferSize; +} PLUGPLAY_CONTROL_PROPERTY_DATA, *PPLUGPLAY_CONTROL_PROPERTY_DATA; + +/* Class 0x0C */ +typedef struct _PLUGPLAY_CONTROL_RELATED_DEVICE_DATA +{ + UNICODE_STRING TargetDeviceInstance; + ULONG Relation; /* 1: Parent 2: Child 3: Sibling */ + UNICODE_STRING RelatedDeviceInstance; +} PLUGPLAY_CONTROL_RELATED_DEVICE_DATA, *PPLUGPLAY_CONTROL_RELATED_DEVICE_DATA; + +/* Class 0x0E */ +typedef struct _PLUGPLAY_CONTOL_STATUS_DATA +{ + UNICODE_STRING DeviceInstance; + ULONG Operation; /* 0: Get 1: Set 2: Clear */ + ULONG DeviceStatus; /* DN_ see cfg.h */ + ULONG DeviceProblem; /* CM_PROB_ see cfg.h */ +} PLUGPLAY_CONTROL_STATUS_DATA, *PPLUGPLAY_CONTROL_STATUS_DATA; + +/* Class 0x0F */ +typedef struct _PLUGPLAY_CONTOL_DEPTH_DATA +{ + UNICODE_STRING DeviceInstance; + ULONG Depth; +} PLUGPLAY_CONTROL_DEPTH_DATA, *PPLUGPLAY_CONTROL_DEPTH_DATA; + +typedef struct _PLUGPLAY_BUS_TYPE +{ + PLUGPLAY_BUS_CLASS BusClass; + union + { + INTERFACE_TYPE SystemBusType; + PLUGPLAY_VIRTUAL_BUS_TYPE PlugPlayVirtualBusType; + }; +} PLUGPLAY_BUS_TYPE, *PPLUGPLAY_BUS_TYPE; + +typedef struct _PLUGPLAY_BUS_INSTANCE +{ + PLUGPLAY_BUS_TYPE BusType; + ULONG BusNumber; + WCHAR BusName[MAX_BUS_NAME]; +} PLUGPLAY_BUS_INSTANCE, *PPLUGPLAY_BUS_INSTANCE; + #endif _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-09-06 14:19:03 UTC (rev 17698) +++ trunk/reactos/include/ndk/extypes.h 2005-09-06 15:57:42 UTC (rev 17699) @@ -11,6 +11,15 @@ #define _EXTYPES_H /* DEPENDENCIES **************************************************************/ +#include <cfg.h> +/* FIXME: this needs be implemented in the w32api ddk */ +#ifdef _MSC_VER +#include <ntimage.h> +#endif +#include "cmtypes.h" +#include "ketypes.h" +#include "pstypes.h" +#include "potypes.h" /* EXPORTED DATA *************************************************************/ #ifndef NTOS_MODE_USER @@ -32,6 +41,10 @@ #define CALLBACK_EXECUTE (STANDARD_RIGHTS_EXECUTE|SYNCHRONIZE|0x0001) #define CALLBACK_WRITE (STANDARD_RIGHTS_WRITE|SYNCHRONIZE|0x0001) #define CALLBACK_READ (STANDARD_RIGHTS_READ|SYNCHRONIZE|0x0001) +#define EVENT_READ_ACCESS 1 +#define EVENT_WRITE_ACCESS 2 +#define PORT_ALL_ACCESS 0x1 +#define EVENT_PAIR_ALL_ACCESS 0x1F0000L #ifdef NTOS_MODE_USER #define EVENT_QUERY_STATE 0x0001 #define SEMAPHORE_QUERY_STATE 0x0001 @@ -40,9 +53,127 @@ #define MAXIMUM_HARDERROR_PARAMETERS 4 /* ENUMERATIONS **************************************************************/ +typedef enum _SHUTDOWN_ACTION +{ + ShutdownNoReboot, + ShutdownReboot, + ShutdownPowerOff +} SHUTDOWN_ACTION; +typedef enum _HARDERROR_RESPONSE_OPTION +{ + OptionAbortRetryIgnore, + OptionOk, + OptionOkCancel, + OptionRetryCancel, + OptionYesNo, + OptionYesNoCancel, + OptionShutdownSystem +} HARDERROR_RESPONSE_OPTION, *PHARDERROR_RESPONSE_OPTION; + +typedef enum _HARDERROR_RESPONSE +{ + ResponseReturnToCaller, + ResponseNotHandled, + ResponseAbort, + ResponseCancel, + ResponseIgnore, + ResponseNo, + ResponseOk, + ResponseRetry, + ResponseYes +} HARDERROR_RESPONSE, *PHARDERROR_RESPONSE; + +typedef enum _SYSTEM_INFORMATION_CLASS +{ + SystemBasicInformation, + SystemProcessorInformation, + SystemPerformanceInformation, + SystemTimeOfDayInformation, + SystemPathInformation, /* OBSOLETE: USE KUSER_SHARED_DATA */ + SystemProcessInformation, + SystemCallCountInformation, + SystemDeviceInformation, + SystemProcessorPerformanceInformation, + SystemFlagsInformation, + SystemCallTimeInformation, + SystemModuleInformation, + SystemLocksInformation, + SystemStackTraceInformation, + SystemPagedPoolInformation, + SystemNonPagedPoolInformation, + SystemHandleInformation, + SystemObjectInformation, + SystemPageFileInformation, + SystemVdmInstemulInformation, + SystemVdmBopInformation, + SystemFileCacheInformation, + SystemPoolTagInformation, + SystemInterruptInformation, + SystemDpcBehaviorInformation, + SystemFullMemoryInformation, + SystemLoadGdiDriverInformation, + SystemUnloadGdiDriverInformation, + SystemTimeAdjustmentInformation, + SystemSummaryMemoryInformation, + SystemNextEventIdInformation, + SystemEventIdsInformation, + SystemCrashDumpInformation, + SystemExceptionInformation, + SystemCrashDumpStateInformation, + SystemKernelDebuggerInformation, + SystemContextSwitchInformation, + SystemRegistryQuotaInformation, + SystemExtendServiceTableInformation, + SystemPrioritySeperation, + SystemPlugPlayBusInformation, + SystemDockInformation, + _SystemPowerInformation, /* FIXME */ + SystemProcessorSpeedInformation, + SystemCurrentTimeZoneInformation, + SystemLookasideInformation, + SystemTimeSlipNotification, + SystemSessionCreate, + SystemSessionDetach, + SystemSessionInformation, + SystemRangeStartInformation, + SystemVerifierInformation, + SystemAddVerifier, + SystemSessionProcessesInformation, + SystemInformationClassMax +} SYSTEM_INFORMATION_CLASS; + +typedef enum _MUTANT_INFORMATION_CLASS +{ + MutantBasicInformation +} MUTANT_INFORMATION_CLASS; + +typedef enum _ATOM_INFORMATION_CLASS +{ + AtomBasicInformation, + AtomTableInformation, +} ATOM_INFORMATION_CLASS; + +typedef enum _TIMER_INFORMATION_CLASS +{ + TimerBasicInformation +} TIMER_INFORMATION_CLASS; + +typedef enum _SEMAPHORE_INFORMATION_CLASS +{ + SemaphoreBasicInformation +} SEMAPHORE_INFORMATION_CLASS; + +typedef enum _EVENT_INFORMATION_CLASS +{ + EventBasicInformation +} EVENT_INFORMATION_CLASS; + /* TYPES *********************************************************************/ +typedef USHORT LANGID, *PLANGID; +typedef USHORT RTL_ATOM, *PRTL_ATOM; + #ifndef NTOS_MODE_USER typedef struct _EX_QUEUE_WORKER_INFO { @@ -123,5 +254,703 @@ } HANDLE_TABLE, *PHANDLE_TABLE; #endif + +typedef struct _MUTANT_BASIC_INFORMATION +{ + LONG CurrentCount; + BOOLEAN OwnedByCaller; + BOOLEAN AbandonedState; +} MUTANT_BASIC_INFORMATION, *PMUTANT_BASIC_INFORMATION; + +typedef struct _ATOM_BASIC_INFORMATION +{ + USHORT UsageCount; + USHORT Flags; + USHORT NameLength; + WCHAR Name[1]; +} ATOM_BASIC_INFORMATION, *PATOM_BASIC_INFORMATION; + +typedef struct _ATOM_TABLE_INFORMATION +{ + ULONG NumberOfAtoms; + USHORT Atoms[1]; +} ATOM_TABLE_INFORMATION, *PATOM_TABLE_INFORMATION; + +typedef struct _TIMER_BASIC_INFORMATION +{ + LARGE_INTEGER TimeRemaining; + BOOLEAN SignalState; +} TIMER_BASIC_INFORMATION, *PTIMER_BASIC_INFORMATION; + +typedef struct _SEMAPHORE_BASIC_INFORMATION +{ + LONG CurrentCount; + LONG MaximumCount; +} SEMAPHORE_BASIC_INFORMATION, *PSEMAPHORE_BASIC_INFORMATION; + +typedef struct _EVENT_BASIC_INFORMATION +{ + EVENT_TYPE EventType; + LONG EventState; +} EVENT_BASIC_INFORMATION, *PEVENT_BASIC_INFORMATION; + +/* Class 0 */ +typedef struct _SYSTEM_BASIC_INFORMATION +{ + ULONG Reserved; + ULONG TimerResolution; + ULONG PageSize; + ULONG NumberOfPhysicalPages; + ULONG LowestPhysicalPageNumber; + ULONG HighestPhysicalPageNumber; + ULONG AllocationGranularity; + ULONG MinimumUserModeAddress; + ULONG MaximumUserModeAddress; + KAFFINITY ActiveProcessorsAffinityMask; + CCHAR NumberOfProcessors; +} SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION; + +/* Class 1 */ +typedef struct _SYSTEM_PROCESSOR_INFORMATION +{ + USHORT ProcessorArchitecture; + USHORT ProcessorLevel; + USHORT ProcessorRevision; + USHORT Reserved; + ULONG ProcessorFeatureBits; +} SYSTEM_PROCESSOR_INFORMATION, *PSYSTEM_PROCESSOR_INFORMATION; + +/* Class 2 */ +typedef struct _SYSTEM_PERFORMANCE_INFORMATION +{ + LARGE_INTEGER IdleProcessTime; + LARGE_INTEGER IoReadTransferCount; + LARGE_INTEGER IoWriteTransferCount; + LARGE_INTEGER IoOtherTransferCount; + ULONG IoReadOperationCount; + ULONG IoWriteOperationCount; + ULONG IoOtherOperationCount; + ULONG AvailablePages; + ULONG CommittedPages; + ULONG CommitLimit; + ULONG PeakCommitment; + ULONG PageFaultCount; + ULONG CopyOnWriteCount; + ULONG TransitionCount; + ULONG CacheTransitionCount; + ULONG DemandZeroCount; + ULONG PageReadCount; + ULONG PageReadIoCount; + ULONG CacheReadCount; + ULONG CacheIoCount; + ULONG DirtyPagesWriteCount; + ULONG DirtyWriteIoCount; + ULONG MappedPagesWriteCount; + ULONG MappedWriteIoCount; + ULONG PagedPoolPages; + ULONG NonPagedPoolPages; + ULONG PagedPoolAllocs; + ULONG PagedPoolFrees; + ULONG NonPagedPoolAllocs; + ULONG NonPagedPoolFrees; + ULONG FreeSystemPtes; + ULONG ResidentSystemCodePage; + ULONG TotalSystemDriverPages; + ULONG TotalSystemCodePages; + ULONG NonPagedPoolLookasideHits; + ULONG PagedPoolLookasideHits; + ULONG Spare3Count; + ULONG ResidentSystemCachePage; + ULONG ResidentPagedPoolPage; + ULONG ResidentSystemDriverPage; + ULONG CcFastReadNoWait; + ULONG CcFastReadWait; + ULONG CcFastReadResourceMiss; + ULONG CcFastReadNotPossible; + ULONG CcFastMdlReadNoWait; + ULONG CcFastMdlReadWait; + ULONG CcFastMdlReadResourceMiss; + ULONG CcFastMdlReadNotPossible; + ULONG CcMapDataNoWait; + ULONG CcMapDataWait; + ULONG CcMapDataNoWaitMiss; + ULONG CcMapDataWaitMiss; + ULONG CcPinMappedDataCount; + ULONG CcPinReadNoWait; + ULONG CcPinReadWait; + ULONG CcPinReadNoWaitMiss; + ULONG CcPinReadWaitMiss; + ULONG CcCopyReadNoWait; + ULONG CcCopyReadWait; + ULONG CcCopyReadNoWaitMiss; + ULONG CcCopyReadWaitMiss; + ULONG CcMdlReadNoWait; + ULONG CcMdlReadWait; + ULONG CcMdlReadNoWaitMiss; + ULONG CcMdlReadWaitMiss; + ULONG CcReadAheadIos; + ULONG CcLazyWriteIos; + ULONG CcLazyWritePages; + ULONG CcDataFlushes; + ULONG CcDataPages; + ULONG ContextSwitches; + ULONG FirstLevelTbFills; + ULONG SecondLevelTbFills; + ULONG SystemCalls; +} SYSTEM_PERFORMANCE_INFORMATION, *PSYSTEM_PERFORMANCE_INFORMATION; + +/* Class 3 */ +typedef struct _SYSTEM_TIMEOFDAY_INFORMATION +{ + LARGE_INTEGER BootTime; + LARGE_INTEGER CurrentTime; + LARGE_INTEGER TimeZoneBias; + ULONG TimeZoneId; + ULONG Reserved; +} SYSTEM_TIMEOFDAY_INFORMATION, *PSYSTEM_TIMEOFDAY_INFORMATION; + +/* Class 4 */ +/* This class is obsoleted, please use KUSER_SHARED_DATA instead */ + +/* Class 5 */ +typedef struct _SYSTEM_THREAD_INFORMATION +{ + LARGE_INTEGER KernelTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER CreateTime; + ULONG WaitTime; + PVOID StartAddress; + CLIENT_ID ClientId; + KPRIORITY Priority; + LONG BasePriority; + ULONG ContextSwitches; + ULONG ThreadState; + ULONG WaitReason; +} SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION; + +typedef struct _SYSTEM_PROCESS_INFORMATION +{ + ULONG NextEntryOffset; + ULONG NumberOfThreads; + LARGE_INTEGER SpareLi1; + LARGE_INTEGER SpareLi2; + LARGE_INTEGER SpareLi3; + LARGE_INTEGER CreateTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER KernelTime; + UNICODE_STRING ImageName; + KPRIORITY BasePriority; + HANDLE UniqueProcessId; + HANDLE InheritedFromUniqueProcessId; + ULONG HandleCount; + ULONG SessionId; + ULONG PageDirectoryFrame; + + /* + * This part corresponds to VM_COUNTERS_EX. + * NOTE: *NOT* THE SAME AS VM_COUNTERS! + */ + ULONG PeakVirtualSize; + ULONG VirtualSize; + ULONG PageFaultCount; + ULONG PeakWorkingSetSize; + ULONG WorkingSetSize; + ULONG QuotaPeakPagedPoolUsage; + ULONG QuotaPagedPoolUsage; + ULONG QuotaPeakNonPagedPoolUsage; + ULONG QuotaNonPagedPoolUsage; + ULONG PagefileUsage; + ULONG PeakPagefileUsage; + ULONG PrivateUsage; + + /* This part corresponds to IO_COUNTERS */ + LARGE_INTEGER ReadOperationCount; + LARGE_INTEGER WriteOperationCount; + LARGE_INTEGER OtherOperationCount; + LARGE_INTEGER ReadTransferCount; + LARGE_INTEGER WriteTransferCount; + LARGE_INTEGER OtherTransferCount; + + /* Finally, the array of Threads */ + SYSTEM_THREAD_INFORMATION TH[1]; +} SYSTEM_PROCESS_INFORMATION, *PSYSTEM_PROCESS_INFORMATION; + +/* Class 6 */ +typedef struct _SYSTEM_CALL_COUNT_INFORMATION +{ + ULONG Length; + ULONG NumberOfTables; +} SYSTEM_CALL_COUNT_INFORMATION, *PSYSTEM_CALL_COUNT_INFORMATION; + +/* Class 7 */ +typedef struct _SYSTEM_DEVICE_INFORMATION +{ + ULONG NumberOfDisks; + ULONG NumberOfFloppies; + ULONG NumberOfCdRoms; + ULONG NumberOfTapes; + ULONG NumberOfSerialPorts; + ULONG NumberOfParallelPorts; +} SYSTEM_DEVICE_INFORMATION, *PSYSTEM_DEVICE_INFORMATION; + +/* Class 8 */ +typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION +{ + LARGE_INTEGER IdleTime; + LARGE_INTEGER KernelTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER DpcTime; + LARGE_INTEGER InterruptTime; + ULONG InterruptCount; +} SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION, *PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION; + +/* Class 9 */ +typedef struct _SYSTEM_FLAGS_INFORMATION +{ + ULONG Flags; +} SYSTEM_FLAGS_INFORMATION, *PSYSTEM_FLAGS_INFORMATION; + +/* Class 10 */ +typedef struct _SYSTEM_CALL_TIME_INFORMATION +{ + ULONG Length; + ULONG TotalCalls; + LARGE_INTEGER TimeOfCalls[1]; +} SYSTEM_CALL_TIME_INFORMATION, *PSYSTEM_CALL_TIME_INFORMATION; + +/* Class 11 */ +typedef struct _SYSTEM_MODULE_INFORMATION_ENTRY +{ + ULONG Unknown1; + ULONG Unknown2; + PVOID Base; + ULONG Size; + ULONG Flags; + USHORT Index; + USHORT NameLength; + USHORT LoadCount; + USHORT PathLength; + CHAR ImageName[256]; +} SYSTEM_MODULE_INFORMATION_ENTRY, *PSYSTEM_MODULE_INFORMATION_ENTRY; +typedef struct _SYSTEM_MODULE_INFORMATION +{ + ULONG Count; + SYSTEM_MODULE_INFORMATION_ENTRY Module[1]; +} SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; + +/* Class 12 */ +typedef struct _SYSTEM_RESOURCE_LOCK_ENTRY +{ + ULONG ResourceAddress; + ULONG Always1; + ULONG Unknown; + ULONG ActiveCount; + ULONG ContentionCount; + ULONG Unused[2]; + ULONG NumberOfSharedWaiters; + ULONG NumberOfExclusiveWaiters; +} SYSTEM_RESOURCE_LOCK_ENTRY, *PSYSTEM_RESOURCE_LOCK_ENTRY; + +typedef struct _SYSTEM_RESOURCE_LOCK_INFO +{ + ULONG Count; + SYSTEM_RESOURCE_LOCK_ENTRY Lock[1]; +} SYSTEM_RESOURCE_LOCK_INFO, *PSYSTEM_RESOURCE_LOCK_INFO; + +/* Class 13 */ +typedef struct _SYSTEM_BACKTRACE_INFORMATION_ENTRY +{ + ULONG Dummy; + /* FIXME */ +} SYSTEM_BACKTRACE_INFORMATION_ENTRY, *PSYSTEM_BACKTRACE_INFORMATION_ENTRY; + +typedef struct _SYSTEM_BACKTRACE_INFORMATION +{ + /* FIXME */ + ULONG Unknown[4]; + ULONG Count; + SYSTEM_BACKTRACE_INFORMATION_ENTRY Trace[1]; +} SYSTEM_BACKTRACE_INFORMATION, *PSYSTEM_BACKTRACE_INFORMATION; + +/* Class 14 - 15 */ +typedef struct _SYSTEM_POOL_ENTRY +{ + BOOLEAN Allocated; + BOOLEAN Spare0; + USHORT AllocatorBackTraceIndex; + ULONG Size; + union + { + UCHAR Tag[4]; + ULONG TagUlong; + PVOID ProcessChargedQuota; + }; +} SYSTEM_POOL_ENTRY, *PSYSTEM_POOL_ENTRY; + +typedef struct _SYSTEM_POOL_INFORMATION +{ + ULONG TotalSize; + PVOID FirstEntry; + USHORT EntryOverhead; + BOOLEAN PoolTagPresent; + BOOLEAN Spare0; + ULONG NumberOfEntries; + SYSTEM_POOL_ENTRY Entries[1]; +} SYSTEM_POOL_INFORMATION, *PSYSTEM_POOL_INFORMATION; + +/* Class 16 */ +typedef struct _SYSTEM_HANDLE_TABLE_ENTRY_INFO +{ + USHORT UniqueProcessId; + USHORT CreatorBackTraceIndex; + UCHAR ObjectTypeIndex; + UCHAR HandleAttributes; + USHORT HandleValue; + PVOID Object; + ULONG GrantedAccess; +} SYSTEM_HANDLE_TABLE_ENTRY_INFO, *PSYSTEM_HANDLE_TABLE_ENTRY_INFO; + +typedef struct _SYSTEM_HANDLE_INFORMATION +{ + ULONG NumberOfHandles; + SYSTEM_HANDLE_TABLE_ENTRY_INFO Handles[1]; +} SYSTEM_HANDLE_INFORMATION, *PSYSTEM_HANDLE_INFORMATION; + +/* Class 17 */ +typedef struct _SYSTEM_OBJECTTYPE_INFORMATION +{ + ULONG NextEntryOffset; + ULONG NumberOfObjects; + ULONG NumberOfHandles; + ULONG TypeIndex; + ULONG InvalidAttributes; + GENERIC_MAPPING GenericMapping; + ULONG ValidAccessMask; + ULONG PoolType; + BOOLEAN SecurityRequired; + BOOLEAN WaitableObject; + UNICODE_STRING TypeName; +} SYSTEM_OBJECTTYPE_INFORMATION, *PSYSTEM_OBJECTTYPE_INFORMATION; + +typedef struct _SYSTEM_OBJECT_INFORMATION +{ + ULONG NextEntryOffset; + PVOID Object; + HANDLE CreatorUniqueProcess; + USHORT CreatorBackTraceIndex; + USHORT Flags; + LONG PointerCount; + LONG HandleCount; + ULONG PagedPoolCharge; + ULONG NonPagedPoolCharge; + HANDLE ExclusiveProcessId; + PVOID SecurityDescriptor; + OBJECT_NAME_INFORMATION NameInfo; +} SYSTEM_OBJECT_INFORMATION, *PSYSTEM_OBJECT_INFORMATION; + +/* Class 18 */ +typedef struct _SYSTEM_PAGEFILE_INFORMATION +{ + ULONG NextEntryOffset; + ULONG TotalSize; + ULONG TotalInUse; + ULONG PeakUsage; + UNICODE_STRING PageFileName; +} SYSTEM_PAGEFILE_INFORMATION, *PSYSTEM_PAGEFILE_INFORMATION; + +/* Class 19 */ +typedef struct _SYSTEM_VDM_INSTEMUL_INFO +{ + ULONG SegmentNotPresent; + ULONG VdmOpcode0F; + ULONG OpcodeESPrefix; + ULONG OpcodeCSPrefix; + ULONG OpcodeSSPrefix; + ULONG OpcodeDSPrefix; + ULONG OpcodeFSPrefix; + ULONG OpcodeGSPrefix; + ULONG OpcodeOPER32Prefix; + ULONG OpcodeADDR32Prefix; + ULONG OpcodeINSB; + ULONG OpcodeINSW; + ULONG OpcodeOUTSB; + ULONG OpcodeOUTSW; + ULONG OpcodePUSHF; + ULONG OpcodePOPF; + ULONG OpcodeINTnn; + ULONG OpcodeINTO; + ULONG OpcodeIRET; + ULONG OpcodeINBimm; + ULONG OpcodeINWimm; + ULONG OpcodeOUTBimm; + ULONG OpcodeOUTWimm ; + ULONG OpcodeINB; + ULONG OpcodeINW; + ULONG OpcodeOUTB; + ULONG OpcodeOUTW; + ULONG OpcodeLOCKPrefix; + ULONG OpcodeREPNEPrefix; + ULONG OpcodeREPPrefix; + ULONG OpcodeHLT; + ULONG OpcodeCLI; + ULONG OpcodeSTI; + ULONG BopCount; +} SYSTEM_VDM_INSTEMUL_INFO, *PSYSTEM_VDM_INSTEMUL_INFO; + +/* Class 20 */ +typedef struct _SYSTEM_VDM_BOP_INFO +{ + /* FIXME */ + PVOID Dummy; +} SYSTEM_VDM_BOP_INFO, *PSYSTEM_VDM_BOP_INFO; + +/* Class 21 */ +typedef struct _SYSTEM_CACHE_INFORMATION +{ + ULONG CurrentSize; + ULONG PeakSize; + ULONG PageFaultCount; + ULONG MinimumWorkingSet; + ULONG MaximumWorkingSet; + ULONG CurrentSizeIncludingTransitionInPages; + ULONG PeakSizeIncludingTransitionInPages; + ULONG Unused[2]; +} SYSTEM_CACHE_INFORMATION, *PSYSTEM_CACHE_INFORMATION; + +/* Class 22 */ +typedef struct _SYSTEM_POOLTAG +{ + union + { + UCHAR Tag[4]; + ULONG TagUlong; + }; + ULONG PagedAllocs; + ULONG PagedFrees; + ULONG PagedUsed; + ULONG NonPagedAllocs; + ULONG NonPagedFrees; + ULONG NonPagedUsed; +} SYSTEM_POOLTAG, *PSYSTEM_POOLTAG; +typedef struct _SYSTEM_POOLTAG_INFORMATION +{ + ULONG Count; + SYSTEM_POOLTAG TagInfo[1]; +} SYSTEM_POOLTAG_INFORMATION, *PSYSTEM_POOLTAG_INFORMATION; + +/* Class 23 */ +typedef struct _SYSTEM_INTERRUPT_INFORMATION +{ + ULONG ContextSwitches; + ULONG DpcCount; + ULONG DpcRate; + ULONG TimeIncrement; + ULONG DpcBypassCount; + ULONG ApcBypassCount; +} SYSTEM_INTERRUPT_INFORMATION, *PSYSTEM_INTERRUPT_INFORMATION; + +/* Class 24 */ +typedef struct _SYSTEM_DPC_BEHAVIOR_INFORMATION +{ + ULONG Spare; + ULONG DpcQueueDepth; + ULONG MinimumDpcRate; + ULONG AdjustDpcThreshold; + ULONG IdealDpcRate; +} SYSTEM_DPC_BEHAVIOR_INFORMATION, *PSYSTEM_DPC_BEHAVIOR_INFORMATION; + +/* Class 25 */ +typedef struct _SYSTEM_MEMORY_INFO +{ + PUCHAR StringOffset; + USHORT ValidCount; + USHORT TransitionCount; + USHORT ModifiedCount; + USHORT PageTableCount; +} SYSTEM_MEMORY_INFO, *PSYSTEM_MEMORY_INFO; +typedef struct _SYSTEM_MEMORY_INFORMATION +{ + ULONG InfoSize; + ULONG StringStart; + SYSTEM_MEMORY_INFO Memory[1]; +} SYSTEM_MEMORY_INFORMATION, *PSYSTEM_MEMORY_INFORMATION; + +/* Class 26 */ +typedef struct _SYSTEM_GDI_DRIVER_INFORMATION +{ + UNICODE_STRING DriverName; + PVOID ImageAddress; + PVOID SectionPointer; + PVOID EntryPoint; + PIMAGE_EXPORT_DIRECTORY ExportSectionPointer; +} SYSTEM_GDI_DRIVER_INFORMATION, *PSYSTEM_GDI_DRIVER_INFORMATION; + +/* Class 27 */ +/* Not an actuall class, simply a PVOID to the ImageAddress */ + +/* Class 28 */ +typedef struct _SYSTEM_QUERY_TIME_ADJUST_INFORMATION +{ + ULONG TimeAdjustment; + ULONG TimeIncrement; + BOOLEAN Enable; +} SYSTEM_QUERY_TIME_ADJUST_INFORMATION, *PSYSTEM_QUERY_TIME_ADJUST_INFORMATION; + +typedef struct _SYSTEM_SET_TIME_ADJUST_INFORMATION +{ + ULONG TimeAdjustment; + BOOLEAN Enable; +} SYSTEM_SET_TIME_ADJUST_INFORMATION, *PSYSTEM_SET_TIME_ADJUST_INFORMATION; + +/* Class 29 - Same as 25 */ + +/* Class 30 - 31 */ +/* FIXME */ + +/* Class 32 */ +typedef struct _SYSTEM_CRASH_DUMP_INFORMATION +{ + HANDLE CrashDumpSection; +} SYSTEM_CRASH_DUMP_INFORMATION, *PSYSTEM_CRASH_DUMP_INFORMATION; + +/* Class 33 */ +typedef struct _SYSTEM_EXCEPTION_INFORMATION +{ + ULONG AlignmentFixupCount; + ULONG ExceptionDispatchCount; + ULONG FloatingEmulationCount; + ULONG ByteWordEmulationCount; +} SYSTEM_EXCEPTION_INFORMATION, *PSYSTEM_EXCEPTION_INFORMATION; + +/* Class 34 */ +typedef struct _SYSTEM_CRASH_STATE_INFORMATION +{ + ULONG ValidCrashDump; +} SYSTEM_CRASH_STATE_INFORMATION, *PSYSTEM_CRASH_STATE_INFORMATION; + +/* Class 35 */ +typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION +{ + BOOLEAN KernelDebuggerEnabled; + BOOLEAN KernelDebuggerNotPresent; +} SYSTEM_KERNEL_DEBUGGER_INFORMATION, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION; + +/* Class 36 */ +typedef struct _SYSTEM_CONTEXT_SWITCH_INFORMATION +{ + ULONG ContextSwitches; + ULONG FindAny; + ULONG FindLast; + ULONG FindIdeal; + ULONG IdleAny; + ULONG IdleCurrent; + ULONG IdleLast; + ULONG IdleIdeal; + ULONG PreemptAny; + ULONG PreemptCurrent; + ULONG PreemptLast; + ULONG SwitchToIdle; +} SYSTEM_CONTEXT_SWITCH_INFORMATION, *PSYSTEM_CONTEXT_SWITCH_INFORMATION; + +/* Class 37 */ +typedef struct _SYSTEM_REGISTRY_QUOTA_INFORMATION +{ + ULONG RegistryQuotaAllowed; + ULONG RegistryQuotaUsed; + ULONG PagedPoolSize; +} SYSTEM_REGISTRY_QUOTA_INFORMATION, *PSYSTEM_REGISTRY_QUOTA_INFORMATION; + +/* Class 38 */ +/* Not a structure, simply send the UNICODE_STRING */ + +/* Class 39 */ +/* Not a structure, simply send a ULONG containing the new separation */ + +/* Class 40 */ +typedef struct _SYSTEM_PLUGPLAY_BUS_INFORMATION +{ + ULONG BusCount; + PLUGPLAY_BUS_INSTANCE BusInstance[1]; +} SYSTEM_PLUGPLAY_BUS_INFORMATION, *PSYSTEM_PLUGPLAY_BUS_INFORMATION; + +/* Class 41 */ +typedef struct _SYSTEM_DOCK_INFORMATION +{ + SYSTEM_DOCK_STATE DockState; + INTERFACE_TYPE DeviceBusType; + ULONG DeviceBusNumber; + ULONG SlotNumber; +} SYSTEM_DOCK_INFORMATION, *PSYSTEM_DOCK_INFORMATION; + +/* Class 42 */ +/* FIXME: Conflict with WINNT.H */ +typedef struct __SYSTEM_POWER_INFORMATION +{ + BOOLEAN SystemSuspendSupported; + BOOLEAN SystemHibernateSupported; + BOOLEAN ResumeTimerSupportsSuspend; + BOOLEAN ResumeTimerSupportsHibernate; + BOOLEAN LidSupported; + BOOLEAN TurboSettingSupported; + BOOLEAN TurboMode; + BOOLEAN SystemAcOrDc; + BOOLEAN PowerDownDisabled; + LARGE_INTEGER SpindownDrives; +} _SYSTEM_POWER_INFORMATION, *P_SYSTEM_POWER_INFORMATION; + +/* Class 43 */ +typedef struct _SYSTEM_LEGACY_DRIVER_INFORMATION +{ + PNP_VETO_TYPE VetoType; + UNICODE_STRING VetoDriver; + /* Buffer Follows */ +} SYSTEM_LEGACY_DRIVER_INFORMATION, *PSYSTEM_LEGACY_DRIVER_INFORMATION; + +/* Class 44 */ +typedef struct _TIME_ZONE_INFORMATION RTL_TIME_ZONE_INFORMATION; + [truncated at 1000 lines; 1515 more skipped]

1 0

[gdalsnes] 17698: window parent handle -> pointer adaptions
by gdalsnes＠svn.reactos.com 06 Sep '05

06 Sep '05

window parent handle -> pointer adaptions Modified: trunk/reactos/subsys/win32k/include/userfuncs.h Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/vis.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c _____ Modified: trunk/reactos/subsys/win32k/include/userfuncs.h --- trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-06 14:09:22 UTC (rev 17697) +++ trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-06 14:19:03 UTC (rev 17698) @@ -1,7 +1,12 @@ #ifndef _WIN32K_USERFUNCS_H #define _WIN32K_USERFUNCS_H +//currently unused +#define ASSERT_REFS(obj) +#define UserReferenceWindowObjectCo(o) IntReferenceWindowObject(o) +#define UserDereferenceWindowObjectCo(o) IntReleaseWindowObject(o) + extern PUSER_HANDLE_TABLE gHandleTable; _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-06 14:09:22 UTC (rev 17697) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-06 14:19:03 UTC (rev 17698) @@ -405,20 +405,18 @@ BOOL FASTCALL IntIsWindowDrawable(PWINDOW_OBJECT Window) { - PWINDOW_OBJECT Old, Wnd = Window; + PWINDOW_OBJECT Wnd = Window; - IntReferenceWindowObject(Wnd); do { if (!(Wnd->Style & WS_VISIBLE) || ((Wnd->Style & WS_MINIMIZE) && (Wnd != Window))) { - IntReleaseWindowObject(Wnd); return FALSE; } - Old = Wnd; - Wnd = IntGetParentObject(Wnd); - IntReleaseWindowObject(Old); + + Wnd = Wnd->Parent; + } while(Wnd); return TRUE; _____ Modified: trunk/reactos/subsys/win32k/ntuser/vis.c --- trunk/reactos/subsys/win32k/ntuser/vis.c 2005-09-06 14:09:22 UTC (rev 17697) +++ trunk/reactos/subsys/win32k/ntuser/vis.c 2005-09-06 14:19:03 UTC (rev 17698) @@ -77,7 +77,7 @@ */ PreviousWindow = Window; - CurrentWindow = IntGetParentObject(Window); + CurrentWindow = Window->Parent; while (CurrentWindow) { if (!(CurrentWindow->Style & WS_VISIBLE)) @@ -113,8 +113,7 @@ } PreviousWindow = CurrentWindow; - CurrentWindow = IntGetParentObject(CurrentWindow); - IntReleaseWindowObject(PreviousWindow); + CurrentWindow = CurrentWindow->Parent; } if (ClipChildren) @@ -159,19 +158,23 @@ HRGN Temp; PWINDOW_OBJECT Parent; + ASSERT_REFS(Window); + Temp = NtGdiCreateRectRgn(0, 0, 0, 0); NtGdiCombineRgn(Temp, NewlyExposed, NULL, RGN_COPY); - Parent = IntGetParentObject(Window); + Parent = Window->Parent; if(Parent) { NtGdiOffsetRgn(Temp, Window->WindowRect.left - Parent->ClientRect.left, Window->WindowRect.top - Parent->ClientRect.top); - co_UserRedrawWindow(Parent, NULL, Temp, + + UserReferenceWindowObjectCo(Parent); + co_UserRedrawWindow(Parent, NULL, Temp, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); - IntReleaseWindowObject(Parent); + UserDereferenceWindowObjectCo(Parent); } NtGdiDeleteObject(Temp); } _____ Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2005-09-06 14:09:22 UTC (rev 17697) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2005-09-06 14:19:03 UTC (rev 17698) @@ -278,7 +278,7 @@ { PWINDOW_OBJECT Parent; - Parent = IntGetParentObject(Window); + Parent = Window->Parent; if(!Parent) { hRgnVisible = NULL; @@ -430,7 +430,7 @@ Flags = (Flags & ~DCX_CLIPCHILDREN) | DCX_CACHE; } - Parent = (Window ? IntGetParentObject(Window) : NULL); + Parent = (Window ? Window->Parent : NULL); if (NULL == Window || !(Window->Style & WS_CHILD) || NULL == Parent) { @@ -450,9 +450,6 @@ } } - if(Parent) - IntReleaseWindowObject(Parent); - DcxFlags = Flags & DCX_CACHECOMPAREMASK; if (Flags & DCX_CACHE)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs