Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[ekohl] 70287: [USETUP] Center the current list item before drawing the list. #CORE-10659 #resolve
by ekohl＠svn.reactos.org 07 Dec '15

07 Dec '15

Author: ekohl Date: Mon Dec 7 16:10:09 2015 New Revision: 70287 URL: http://svn.reactos.org/svn/reactos?rev=70287&view=rev Log: [USETUP] Center the current list item before drawing the list. #CORE-10659 #resolve Modified: trunk/reactos/base/setup/usetup/genlist.c Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Mon Dec 7 16:10:09 2015 @@ -341,6 +341,51 @@ } +static +VOID +CenterCurrentListItem( + PGENERIC_LIST List) +{ + PLIST_ENTRY Entry; + ULONG MaxVisibleItems, ItemCount, i; + + if ((List->Top == 0 && List->Bottom == 0) || + IsListEmpty(&List->ListHead) || + List->CurrentEntry == NULL) + return; + + MaxVisibleItems = (ULONG)(List->Bottom - List->Top - 1); + + ItemCount = 0; + Entry = List->ListHead.Flink; + while (Entry != &List->ListHead) + { + ItemCount++; + Entry = Entry->Flink; + } + + if (ItemCount > MaxVisibleItems) + { + Entry = &List->CurrentEntry->Entry; + for (i = 0; i < MaxVisibleItems / 2; i++) + { + if (Entry->Blink != &List->ListHead) + Entry = Entry->Blink; + } + + List->FirstShown = Entry; + + for (i = 0; i < MaxVisibleItems; i++) + { + if (Entry->Flink != &List->ListHead) + Entry = Entry->Flink; + } + + List->LastShown = Entry; + } +} + + VOID DrawGenericList( PGENERIC_LIST List, @@ -359,6 +404,8 @@ if (IsListEmpty(&List->ListHead)) return; + + CenterCurrentListItem(List); DrawListEntries(List); DrawScrollBarGenericList(List);

1 0

[pschweitzer] 70286: [IPHLPAPI] Display the IP address used for tests This highlights an issue with returned IP in ReactOS
by pschweitzer＠svn.reactos.org 07 Dec '15

07 Dec '15

Author: pschweitzer Date: Mon Dec 7 11:21:20 2015 New Revision: 70286 URL: http://svn.reactos.org/svn/reactos?rev=70286&view=rev Log: [IPHLPAPI] Display the IP address used for tests This highlights an issue with returned IP in ReactOS Modified: trunk/rostests/apitests/iphlpapi/SendARP.c Modified: trunk/rostests/apitests/iphlpapi/SendARP.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/iphlpapi/SendARP… ============================================================================== --- trunk/rostests/apitests/iphlpapi/SendARP.c [iso-8859-1] (original) +++ trunk/rostests/apitests/iphlpapi/SendARP.c [iso-8859-1] Mon Dec 7 11:21:20 2015 @@ -82,6 +82,8 @@ SockAddr = (PSOCKADDR_IN)Current->FirstUnicastAddress->Address.lpSockaddr; IpAddr = SockAddr->sin_addr.S_un.S_addr; + + trace("IP address found: %lu.%lu.%lu.%lu\n", IpAddr & 0xFF, (IpAddr >> 8) & 0xFF, (IpAddr >> 16) & 0xFF, (IpAddr >> 24) & 0xFF); Size = 4; Err = SendARP(IpAddr, 0, Hw, &Size);

1 0

[pschweitzer] 70285: [TCPIP] In case of localhost arping, fail if local interface isn't remote interface
by pschweitzer＠svn.reactos.org 07 Dec '15

07 Dec '15

Author: pschweitzer Date: Mon Dec 7 10:56:58 2015 New Revision: 70285 URL: http://svn.reactos.org/svn/reactos?rev=70285&view=rev Log: [TCPIP] In case of localhost arping, fail if local interface isn't remote interface Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Mon Dec 7 10:56:58 2015 @@ -1690,6 +1690,11 @@ if (Interface) { PVOID OutputBuffer; + if (!AddrIsUnspecified(&Local) && IPs[0] != IPs[1]) { + Status = STATUS_UNSUCCESSFUL; + goto Exit; + } + if (Interface->AddressLength > IrpSp->Parameters.DeviceIoControl.OutputBufferLength) { Status = STATUS_INVALID_BUFFER_SIZE; goto Exit;

1 0

[tfaber] 70284: [NDIS] - Avoid using an out-of-scope local variable in NdisReadNetworkAddress. Patch by Víctor Martínez. CORE-10650 #resolve
by tfaber＠svn.reactos.org 07 Dec '15

07 Dec '15

Author: tfaber Date: Mon Dec 7 08:48:57 2015 New Revision: 70284 URL: http://svn.reactos.org/svn/reactos?rev=70284&view=rev Log: [NDIS] - Avoid using an out-of-scope local variable in NdisReadNetworkAddress. Patch by Víctor Martínez. CORE-10650 #resolve Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Mon Dec 7 08:48:57 2015 @@ -761,6 +761,7 @@ NDIS_STRING Keyword; UINT *IntArray = 0; UINT i,j = 0; + WCHAR Buff[11]; NDIS_STRING str; NdisInitUnicodeString(&Keyword, L"NetworkAddress"); @@ -774,8 +775,6 @@ if (ParameterValue->ParameterType == NdisParameterInteger) { - WCHAR Buff[11]; - NDIS_DbgPrint(MAX_TRACE, ("Read integer data %lx\n", ParameterValue->ParameterData.IntegerData));

1 0

[ekohl] 70283: [USETUP] Little Improvements: * Duplicate code removement regarding the simple list pages (and now everyone has pageup/down + selection via char) * Duplicate code removement regardin...
by ekohl＠svn.reactos.org 06 Dec '15

06 Dec '15

Author: ekohl Date: Sun Dec 6 20:14:29 2015 New Revision: 70283 URL: http://svn.reactos.org/svn/reactos?rev=70283&view=rev Log: [USETUP] Little Improvements: * Duplicate code removement regarding the simple list pages (and now everyone has pageup/down + selection via char) * Duplicate code removement regarding the partition type string * Document the pages Patch my Michael Fritscher #CORE-10012 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Dec 6 20:14:29 2015 @@ -612,6 +612,14 @@ } +/* + * Displays the LanguagePage. + * + * Next pages: IntroPage, QuitPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER LanguagePage(PINPUT_RECORD Ir) { @@ -737,6 +745,22 @@ /* * Start page + * + * Next pages: + * LanguagePage (at once, default) + * InstallIntroPage (at once, if unattended) + * QuitPage + * + * SIDEEFFECTS + * Init Sdi + * Init SourcePath + * Init SourceRootPath + * Init SourceRootDir + * Init SetupInf + * Init RequiredPartitionDiskSpace + * Init IsUnattendedSetup + * If unattended, init *List and sets the Codepage + * * RETURNS * Number of the next page. */ @@ -911,9 +935,16 @@ /* - * First setup page + * Displays the IntroPage. + * + * Next pages: + * InstallIntroPage (default) + * RepairIntroPage + * LicensePage + * QuitPage + * * RETURNS - * Next page number. + * Number of the next page. */ static PAGE_NUMBER IntroPage(PINPUT_RECORD Ir) @@ -951,9 +982,13 @@ /* - * License Page + * Displays the License page. + * + * Next page: + * IntroPage (default) + * * RETURNS - * Back to main setup page. + * Number of the next page. */ static PAGE_NUMBER LicensePage(PINPUT_RECORD Ir) @@ -974,6 +1009,18 @@ } +/* + * Displays the RepairIntroPage. + * + * Next pages: + * RebootPage (default) + * InstallIntroPage + * RecoveryPage + * IntroPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER RepairIntroPage(PINPUT_RECORD Ir) { @@ -1006,7 +1053,18 @@ return REPAIR_INTRO_PAGE; } - +/* + * Displays the InstallIntroPage. + * + * Next pages: + * DeviceSettingsPage (At once if repair or update is selected) + * SelectPartitionPage (At once if unattended setup) + * DeviceSettingsPage (default) + * QuitPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER InstallIntroPage(PINPUT_RECORD Ir) { @@ -1083,6 +1141,27 @@ #endif +/* + * Displays the DeviceSettingsPage. + * + * Next pages: + * SelectPartitionPage (At once if repair or update is selected) + * ComputerSettingsPage + * DisplaySettingsPage + * KeyboardSettingsPage + * LayoutsettingsPage + * SelectPartitionPage + * QuitPage + * + * SIDEEFFECTS + * Init ComputerList + * Init DisplayList + * Init KeyboardList + * Init LayoutList + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER DeviceSettingsPage(PINPUT_RECORD Ir) { @@ -1208,6 +1287,80 @@ } +/* + * Handles generic selection lists. + * + * PARAMS + * GenericList: The list to handle. + * nextPage: The page it needs to jump to after this page. + * Ir: The PINPUT_RECORD + */ +static PAGE_NUMBER +HandleGenericList(PGENERIC_LIST GenericList, + PAGE_NUMBER nextPage, + PINPUT_RECORD Ir) +{ + while (TRUE) + { + CONSOLE_ConInKey(Ir); + + if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ + { + ScrollDownGenericList(GenericList); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ + { + ScrollUpGenericList(GenericList); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_NEXT)) /* PAGE DOWN */ + { + ScrollPageDownGenericList(GenericList); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_PRIOR)) /* PAGE UP */ + { + ScrollPageUpGenericList(GenericList); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ + { + if (ConfirmQuit(Ir) == TRUE) + return QUIT_PAGE; + + continue; + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ + { + RestoreGenericListState(GenericList); + return nextPage; + } + else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ + { + return nextPage; + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar > 0x60) && (Ir->Event.KeyEvent.uChar.AsciiChar < 0x7b)) + { + /* a-z */ + GenericListKeyPress(GenericList, Ir->Event.KeyEvent.uChar.AsciiChar); + } + } +} + + +/* + * Displays the ComputerSettingsPage. + * + * Next pages: + * DeviceSettingsPage + * QuitPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER ComputerSettingsPage(PINPUT_RECORD Ir) { @@ -1221,44 +1374,20 @@ SaveGenericListState(ComputerList); - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ - { - ScrollDownGenericList(ComputerList); - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ - { - ScrollUpGenericList(ComputerList); - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ - { - if (ConfirmQuit(Ir) == TRUE) - return QUIT_PAGE; - - break; - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ - { - RestoreGenericListState(ComputerList); - return DEVICE_SETTINGS_PAGE; - } - else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return DEVICE_SETTINGS_PAGE; - } - } - - return COMPUTER_SETTINGS_PAGE; + return HandleGenericList(ComputerList, DEVICE_SETTINGS_PAGE, Ir); } - - + + +/* + * Displays the DisplaySettingsPage. + * + * Next pages: + * DeviceSettingsPage + * QuitPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER DisplaySettingsPage(PINPUT_RECORD Ir) { @@ -1272,46 +1401,20 @@ SaveGenericListState(DisplayList); - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ - { - ScrollDownGenericList(DisplayList); - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ - { - ScrollUpGenericList(DisplayList); - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ - { - if (ConfirmQuit(Ir) == TRUE) - { - return QUIT_PAGE; - } - - break; - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ - { - RestoreGenericListState(DisplayList); - return DEVICE_SETTINGS_PAGE; - } - else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return DEVICE_SETTINGS_PAGE; - } - } - - return DISPLAY_SETTINGS_PAGE; + return HandleGenericList(DisplayList, DEVICE_SETTINGS_PAGE, Ir); } +/* + * Displays the KeyboardSettingsPage. + * + * Next pages: + * DeviceSettingsPage + * QuitPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER KeyboardSettingsPage(PINPUT_RECORD Ir) { @@ -1325,44 +1428,20 @@ SaveGenericListState(KeyboardList); - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ - { - ScrollDownGenericList(KeyboardList); - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ - { - ScrollUpGenericList(KeyboardList); - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ - { - if (ConfirmQuit(Ir) == TRUE) - return QUIT_PAGE; - - break; - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ - { - RestoreGenericListState(KeyboardList); - return DEVICE_SETTINGS_PAGE; - } - else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return DEVICE_SETTINGS_PAGE; - } - } - - return KEYBOARD_SETTINGS_PAGE; + return HandleGenericList(KeyboardList, DEVICE_SETTINGS_PAGE, Ir); } +/* + * Displays the LayoutSettingsPage. + * + * Next pages: + * DeviceSettingsPage + * QuitPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER LayoutSettingsPage(PINPUT_RECORD Ir) { @@ -1376,56 +1455,7 @@ SaveGenericListState(LayoutList); - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ - { - ScrollDownGenericList(LayoutList); - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ - { - ScrollUpGenericList(LayoutList); - } - if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_NEXT)) /* PAGE DOWN */ - { - ScrollPageDownGenericList(LayoutList); - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_PRIOR)) /* PAGE UP */ - { - ScrollPageUpGenericList(LayoutList); - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ - { - if (ConfirmQuit(Ir) == TRUE) - return QUIT_PAGE; - - break; - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ - { - RestoreGenericListState(LayoutList); - return DEVICE_SETTINGS_PAGE; - } - else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return DEVICE_SETTINGS_PAGE; - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar > 0x60) && (Ir->Event.KeyEvent.uChar.AsciiChar < 0x7b)) - { - /* a-z */ - GenericListKeyPress(LayoutList , Ir->Event.KeyEvent.uChar.AsciiChar); - } - } - - return LAYOUT_SETTINGS_PAGE; + return HandleGenericList(LayoutList, DEVICE_SETTINGS_PAGE, Ir); } @@ -1450,6 +1480,26 @@ } +/* + * Displays the SelectPartitionPage. + * + * Next pages: + * SelectFileSystemPage (At once if unattended) + * SelectFileSystemPage (Default if free space is selected) + * CreatePrimaryPartitionPage + * CreateExtendedPartitionPage + * CreateLogicalPartitionPage + * ConfirmDeleteSystemPartitionPage (if the selected partition is the system partition, aka with the boot flag set) + * DeletePartitionPage + * QuitPage + * + * SIDEEFFECTS + * Init DestinationDriveLetter (only if unattended or not free space is selected) + * Set InstallShortcut (only if not unattended + free space is selected) + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER SelectPartitionPage(PINPUT_RECORD Ir) { @@ -1801,6 +1851,17 @@ } +/* + * Displays the CreatePrimaryPartitionPage. + * + * Next pages: + * SelectPartitionPage + * SelectFileSystemPage (default) + * QuitPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER CreatePrimaryPartitionPage(PINPUT_RECORD Ir) { @@ -1948,6 +2009,16 @@ } +/* + * Displays the CreateExtendedPartitionPage. + * + * Next pages: + * SelectPartitionPage (default) + * QuitPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER CreateExtendedPartitionPage(PINPUT_RECORD Ir) { @@ -2094,6 +2165,16 @@ } +/* + * Displays the CreateLogicalPartitionPage. + * + * Next pages: + * SelectFileSystemPage (default) + * QuitPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER CreateLogicalPartitionPage(PINPUT_RECORD Ir) { @@ -2241,6 +2322,16 @@ } +/* + * Displays the ConfirmDeleteSystemPartitionPage. + * + * Next pages: + * DeletePartitionPage (default) + * SelectPartitionPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER ConfirmDeleteSystemPartitionPage(PINPUT_RECORD Ir) { @@ -2274,6 +2365,16 @@ } +/* + * Displays the DeletePartitionPage. + * + * Next pages: + * SelectPartitionPage (default) + * QuitPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER DeletePartitionPage(PINPUT_RECORD Ir) { @@ -2282,7 +2383,7 @@ ULONGLONG DiskSize; ULONGLONG PartSize; PCHAR Unit; - PCHAR PartType; + CHAR PartType[32]; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -2297,39 +2398,9 @@ MUIDisplayPage(DELETE_PARTITION_PAGE); - /* Determine partition type */ - PartType = NULL; - if (PartEntry->New == TRUE) - { - PartType = MUIGetString(STRING_UNFORMATTED); - } - else if (PartEntry->IsPartitioned == TRUE) - { - if ((PartEntry->PartitionType == PARTITION_FAT_12) || - (PartEntry->PartitionType == PARTITION_FAT_16) || - (PartEntry->PartitionType == PARTITION_HUGE) || - (PartEntry->PartitionType == PARTITION_XINT13)) - { - PartType = "FAT"; - } - else if ((PartEntry->PartitionType == PARTITION_FAT32) || - (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) - { - PartType = "FAT32"; - } - else if (PartEntry->PartitionType == PARTITION_EXT2) - { - PartType = "EXT2"; - } - else if (PartEntry->PartitionType == PARTITION_IFS) - { - PartType = "NTFS"; /* FIXME: Not quite correct! */ - } - else if (IsContainerPartition(PartEntry->PartitionType)) - { - PartType = MUIGetString(STRING_EXTENDED_PARTITION); - } - } + GetPartTypeStringFromPartitionTypeA(PartEntry->PartitionType, + PartType, + 30); PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; #if 0 @@ -2443,6 +2514,24 @@ } +/* + * Displays the SelectFileSystemPage. + * + * Next pages: + * CheckFileSystemPage (At once if RepairUpdate is selected) + * CheckFileSystemPage (At once if Unattended and not UnattendFormatPartition) + * FormatPartitionPage (At once if Unattended and UnattendFormatPartition) + * SelectPartitionPage (If the user aborts) + * FormatPartitionPage (Default) + * QuitPage + * + * SIDEEFFECTS + * Sets PartEntry->DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType (via UpdatePartitionType) + * Calls CheckActiveBootPartition() + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER SelectFileSystemPage(PINPUT_RECORD Ir) { @@ -2452,7 +2541,7 @@ ULONGLONG PartSize; PCHAR DiskUnit; PCHAR PartUnit; - PCHAR PartType; + CHAR PartTypeString[32]; DPRINT("SelectFileSystemPage()\n"); @@ -2576,34 +2665,9 @@ } /* adjust partition type */ - if ((PartEntry->PartitionType == PARTITION_FAT_12) || - (PartEntry->PartitionType == PARTITION_FAT_16) || - (PartEntry->PartitionType == PARTITION_HUGE) || - (PartEntry->PartitionType == PARTITION_XINT13)) - { - PartType = "FAT"; - } - else if ((PartEntry->PartitionType == PARTITION_FAT32) || - (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) - { - PartType = "FAT32"; - } - else if (PartEntry->PartitionType == PARTITION_EXT2) - { - PartType = "EXT2"; - } - else if (PartEntry->PartitionType == PARTITION_IFS) - { - PartType = "NTFS"; /* FIXME: Not quite correct! */ - } - else if (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED) - { - PartType = MUIGetString(STRING_FORMATUNUSED); - } - else - { - PartType = MUIGetString(STRING_FORMATUNKNOWN); - } + GetPartTypeStringFromPartitionTypeA(PartEntry->PartitionType, + PartTypeString, + 30); if (PartEntry->AutoCreate == TRUE) { @@ -2657,7 +2721,7 @@ { CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART)); - if (PartType == NULL) + if (PartTypeString == NULL) { CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDINFOUNK4), @@ -2673,7 +2737,7 @@ "%c%c %s %I64u %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', - PartType, + PartTypeString, PartSize, PartUnit); } @@ -2769,6 +2833,21 @@ } +/* + * Displays the FormatPartitionPage. + * + * Next pages: + * InstallDirectoryPage (At once if IsUnattendedSetup or InstallShortcut) + * SelectPartitionPage (At once) + * QuitPage + * + * SIDEEFFECTS + * Sets PartitionList->CurrentPartition->FormatState + * Sets DestinationRootPath + * + * RETURNS + * Number of the next page. + */ static ULONG FormatPartitionPage(PINPUT_RECORD Ir) { @@ -2961,6 +3040,19 @@ } +/* + * Displays the CheckFileSystemPage. + * + * Next pages: + * InstallDirectoryPage (At once) + * QuitPage + * + * SIDEEFFECTS + * Inits or reloads FileSystemList + * + * RETURNS + * Number of the next page. + */ static ULONG CheckFileSystemPage(PINPUT_RECORD Ir) { @@ -2968,7 +3060,7 @@ UNICODE_STRING PartitionRootPath; WCHAR PathBuffer[MAX_PATH]; CHAR Buffer[MAX_PATH]; - LPWSTR FileSystemName = NULL; + WCHAR PartTypeString[32]; PDISKENTRY DiskEntry; PPARTENTRY PartEntry; NTSTATUS Status; @@ -3001,29 +3093,13 @@ CurrentFileSystem = PartEntry->FileSystem; if (CurrentFileSystem == NULL || CurrentFileSystem->FileSystemName == NULL) { - if ((PartEntry->PartitionType == PARTITION_FAT_12) || - (PartEntry->PartitionType == PARTITION_FAT_16) || - (PartEntry->PartitionType == PARTITION_HUGE) || - (PartEntry->PartitionType == PARTITION_XINT13) || - (PartEntry->PartitionType == PARTITION_FAT32) || - (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) - { - FileSystemName = L"FAT"; - } - else if (PartEntry->PartitionType == PARTITION_EXT2) - { - FileSystemName = L"EXT2"; - } - else if (PartEntry->PartitionType == PARTITION_IFS) - { - FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ - } - - DPRINT("FileSystemName: %S\n", FileSystemName); - - if (FileSystemName != NULL) + GetPartTypeStringFromPartitionTypeW(PartEntry->PartitionType, PartTypeString, 30); + + DPRINT("PartTypeString: %S\n", PartTypeString); + + if (PartTypeString != NULL) CurrentFileSystem = GetFileSystemByName(FileSystemList, - FileSystemName); + PartTypeString); } /* HACK: Do not try to check a partition with an unknown filesytem */ @@ -3087,6 +3163,20 @@ } +/* + * Displays the InstallDirectoryPage1. + * + * Next pages: + * PrepareCopyPage (At once) + * + * SIDEEFFECTS + * Inits DestinationRootPath + * Inits DestinationPath + * Inits DestinationArcPath + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER InstallDirectoryPage1(PWCHAR InstallDir, PDISKENTRY DiskEntry, @@ -3135,6 +3225,16 @@ } +/* + * Displays the InstallDirectoryPage. + * + * Next pages: + * PrepareCopyPage (As the direct result of InstallDirectoryPage1) + * QuitPage + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER InstallDirectoryPage(PINPUT_RECORD Ir) { @@ -3574,6 +3674,20 @@ } +/* + * Displays the PrepareCopyPage. + * + * Next pages: + * FileCopyPage(At once) + * QuitPage + * + * SIDEEFFECTS + * Inits SetupFileQueue + * Calls PrepareCopyPageInfFile + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER PrepareCopyPage(PINPUT_RECORD Ir) { @@ -3739,6 +3853,19 @@ } +/* + * Displays the FileCopyPage. + * + * Next pages: + * RegistryPage(At once) + * + * SIDEEFFECTS + * Calls SetupCommitFileQueueW + * Calls SetupCloseFileQueue + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER FileCopyPage(PINPUT_RECORD Ir) @@ -3816,6 +3943,24 @@ } +/* + * Displays the RegistryPage. + * + * Next pages: + * SuccessPage (if RepairUpdate) + * BootLoaderPage (default) + * QuitPage + * + * SIDEEFFECTS + * Calls SetInstallPathValue + * Calls NtInitializeRegistry + * Calls ImportRegistryFile + * Calls SetDefaultPagefile + * Calls SetMountedDeviceValues + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER RegistryPage(PINPUT_RECORD Ir) { @@ -3961,6 +4106,27 @@ } +/* + * Displays the BootLoaderPage. + * + * Next pages: + * SuccessPage (if RepairUpdate) + * BootLoaderHarddiskMbrPage + * BootLoaderHarddiskVbrPage + * BootLoaderFloppyPage + * SuccessPage + * QuitPage + * + * SIDEEFFECTS + * Calls SetInstallPathValue + * Calls NtInitializeRegistry + * Calls ImportRegistryFile + * Calls SetDefaultPagefile + * Calls SetMountedDeviceValues + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER BootLoaderPage(PINPUT_RECORD Ir) { @@ -4115,6 +4281,19 @@ } +/* + * Displays the BootLoaderFloppyPage. + * + * Next pages: + * SuccessPage (At once) + * QuitPage + * + * SIDEEFFECTS + * Calls InstallFatBootcodeToFloppy() + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER BootLoaderFloppyPage(PINPUT_RECORD Ir) { @@ -4159,6 +4338,19 @@ } +/* + * Displays the BootLoaderHarddiskVbrPage. + * + * Next pages: + * SuccessPage (At once) + * QuitPage + * + * SIDEEFFECTS + * Calls InstallVBRToPartition() + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) { @@ -4181,6 +4373,20 @@ } +/* + * Displays the BootLoaderHarddiskMbrPage. + * + * Next pages: + * SuccessPage (At once) + * QuitPage + * + * SIDEEFFECTS + * Calls InstallVBRToPartition() + * CallsInstallMbrBootCodeToDisk() + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) { @@ -4227,6 +4433,18 @@ } +/* + * Displays the QuitPage. + * + * Next pages: + * FlushPage (At once) + * + * SIDEEFFECTS + * Destroy the Lists + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER QuitPage(PINPUT_RECORD Ir) { @@ -4294,6 +4512,18 @@ } +/* + * Displays the SuccessPage. + * + * Next pages: + * FlushPage (At once) + * + * SIDEEFFECTS + * Destroy the Lists + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER SuccessPage(PINPUT_RECORD Ir) { @@ -4316,6 +4546,15 @@ } +/* + * Displays the FlushPage. + * + * Next pages: + * RebootPage (At once) + * + * RETURNS + * Number of the next page. + */ static PAGE_NUMBER FlushPage(PINPUT_RECORD Ir) { @@ -4327,6 +4566,10 @@ DWORD WINAPI PnpEventThread(IN LPVOID lpParameter); + +/* + * The start routine and page management + */ VOID RunUSetup(VOID) { Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Dec 6 20:14:29 2015 @@ -1448,6 +1448,66 @@ } +VOID +GetPartTypeStringFromPartitionTypeW( + UCHAR partitionType, + PWCHAR strPartType, + DWORD cchPartType) +{ + CHAR partTypeString[32]; + + GetPartTypeStringFromPartitionTypeA(partitionType, + partTypeString, + 30); + + mbstowcs(strPartType, + partTypeString, + (30 < cchPartType) ? 30 : cchPartType); +} + + +VOID +GetPartTypeStringFromPartitionTypeA( + UCHAR partitionType, + PCHAR strPartType, + DWORD cchPartType) +{ + /* Determine partition type */ + if ((partitionType == PARTITION_FAT_12) || + (partitionType == PARTITION_FAT_16) || + (partitionType == PARTITION_HUGE) || + (partitionType == PARTITION_XINT13)) + { + StringCchCopy(strPartType, cchPartType, "FAT"); + } + else if ((partitionType == PARTITION_FAT32) || + (partitionType == PARTITION_FAT32_XINT13)) + { + StringCchCopy(strPartType, cchPartType, "FAT32"); + } + else if (partitionType == PARTITION_EXT2) + { + StringCchCopy(strPartType, cchPartType, "EXT2"); + } + else if (partitionType == PARTITION_IFS) + { + StringCchCopy(strPartType, cchPartType, "NTFS"); /* FIXME: Not quite correct! */ + } + else if (IsContainerPartition(partitionType)) + { + StringCchCopy(strPartType, cchPartType, MUIGetString(STRING_EXTENDED_PARTITION)); + } + else if (partitionType == PARTITION_ENTRY_UNUSED) + { + StringCchCopy(strPartType, cchPartType, MUIGetString(STRING_FORMATUNUSED)); + } + else + { + StringCchCopy(strPartType, cchPartType, MUIGetString(STRING_FORMATUNKNOWN)); + } +} + + static VOID PrintPartitionData( @@ -1463,7 +1523,9 @@ LARGE_INTEGER PartSize; PCHAR Unit; UCHAR Attribute; + CHAR PartTypeString[32]; PCHAR PartType; + PartType = PartTypeString; Width = List->Right - List->Left - 1; Height = List->Bottom - List->Top - 2; @@ -1503,38 +1565,17 @@ else { /* Determine partition type */ - PartType = NULL; + PartTypeString[0] = '\0'; if (PartEntry->New == TRUE) { PartType = MUIGetString(STRING_UNFORMATTED); } else if (PartEntry->IsPartitioned == TRUE) { - if ((PartEntry->PartitionType == PARTITION_FAT_12) || - (PartEntry->PartitionType == PARTITION_FAT_16) || - (PartEntry->PartitionType == PARTITION_HUGE) || - (PartEntry->PartitionType == PARTITION_XINT13)) - { - PartType = "FAT"; - } - else if ((PartEntry->PartitionType == PARTITION_FAT32) || - (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) - { - PartType = "FAT32"; - } - else if (PartEntry->PartitionType == PARTITION_EXT2) - { - PartType = "EXT2"; - } - else if (PartEntry->PartitionType == PARTITION_IFS) - { - PartType = "NTFS"; /* FIXME: Not quite correct! */ - } - else if ((PartEntry->PartitionType == PARTITION_EXTENDED) || - (PartEntry->PartitionType == PARTITION_XINT13_EXTENDED)) - { - PartType = MUIGetString(STRING_EXTENDED_PARTITION); - } + GetPartTypeStringFromPartitionTypeA(PartEntry->PartitionType, + PartTypeString, + 30); + PartType = PartTypeString; } PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; @@ -1557,7 +1598,7 @@ Unit = MUIGetString(STRING_KB); } - if (PartType == NULL) + if (strcmp(PartType, MUIGetString(STRING_FORMATUNKNOWN)) == 0) { sprintf(LineBuffer, MUIGetString(STRING_HDDINFOUNK5), Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sun Dec 6 20:14:29 2015 @@ -293,4 +293,16 @@ OUT PDISKENTRY *pDiskEntry, OUT PPARTENTRY *pPartEntry); +VOID +GetPartTypeStringFromPartitionTypeA( + UCHAR partitionType, + PSTR strPartType, + DWORD cchPartType); + +VOID +GetPartTypeStringFromPartitionTypeW( + UCHAR partitionType, + PWSTR strPartType, + DWORD cchPartType); + /* EOF */ Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Dec 6 20:14:29 2015 @@ -38,6 +38,8 @@ #include <winreg.h> #include <winuser.h> #include <wincon.h> + +#include <strsafe.h> #define NTOS_MODE_USER #include <ndk/cmfuncs.h>

1 0

[akhaldi] 70282: [IPHLPAPI] Include iphlpapi_private.h in icmp.c. CORE-10498
by akhaldi＠svn.reactos.org 06 Dec '15

06 Dec '15

Author: akhaldi Date: Sun Dec 6 10:55:46 2015 New Revision: 70282 URL: http://svn.reactos.org/svn/reactos?rev=70282&view=rev Log: [IPHLPAPI] Include iphlpapi_private.h in icmp.c. CORE-10498 Modified: trunk/reactos/dll/win32/iphlpapi/icmp.c Modified: trunk/reactos/dll/win32/iphlpapi/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/icmp.c?… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/icmp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/icmp.c [iso-8859-1] Sun Dec 6 10:55:46 2015 @@ -32,46 +32,7 @@ * - Using the winsock functions has not been tested. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_NETDB_H -# include <netdb.h> -#endif -#ifdef HAVE_NETINET_IN_SYSTM_H -# include <netinet/in_systm.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif - -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -#include <stdarg.h> -//#include <string.h> -//#include <errno.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <ipexport.h> -//#include <ws2tcpip.h> -//#include "icmpapi.h" -#include <wine/debug.h> +#include "iphlpapi_private.h" /* Set up endianness macros for the ip and ip_icmp BSD headers */ #ifndef BIG_ENDIAN

1 0

[hbelusca] 70281: [CONSRV]: Fix the code corresponding to ReadConsoleA/W API, now autocompletion from within windows' cmd.exe running on ReactOS works correctly. I add also some ASSERTs to be sure ...
by hbelusca＠svn.reactos.org 05 Dec '15

05 Dec '15

Author: hbelusca Date: Sat Dec 5 23:41:59 2015 New Revision: 70281 URL: http://svn.reactos.org/svn/reactos?rev=70281&view=rev Log: [CONSRV]: Fix the code corresponding to ReadConsoleA/W API, now autocompletion from within windows' cmd.exe running on ReactOS works correctly. I add also some ASSERTs to be sure of certain invariants (I might simplify part of the code related to that later on). Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] Sat Dec 5 23:41:59 2015 @@ -314,14 +314,13 @@ PLIST_ENTRY CurrentEntry; ConsoleInput *Input; - ULONG i; + ULONG i = 0; /* Validity checks */ // ASSERT(Console == InputBuffer->Header.Console); ASSERT((Buffer != NULL) || (Buffer == NULL && NumCharsToRead == 0)); /* We haven't read anything (yet) */ - i = ReadControl->nInitialChars; if (InputBuffer->Mode & ENABLE_LINE_INPUT) { @@ -329,8 +328,9 @@ if (Console->LineBuffer == NULL) { - /* Starting a new line */ + /* Start a new line */ Console->LineMaxSize = max(256, NumCharsToRead); + ASSERT(ReadControl->nInitialChars <= Console->LineMaxSize); Console->LineBuffer = ConsoleAllocHeap(0, Console->LineMaxSize * sizeof(WCHAR)); if (Console->LineBuffer == NULL) return STATUS_NO_MEMORY; @@ -341,8 +341,9 @@ Console->LineWakeupMask = ReadControl->dwCtrlWakeupMask; /* - * Pre-filling the buffer is only allowed in the Unicode API, - * so we don't need to worry about ANSI <-> Unicode conversion. + * Pre-fill the buffer with the nInitialChars from the user buffer. + * Since pre-filling is only allowed in Unicode, we don't need to + * worry about ANSI <-> Unicode conversion. */ memcpy(Console->LineBuffer, Buffer, Console->LineSize * sizeof(WCHAR)); if (Console->LineSize == Console->LineMaxSize) @@ -377,6 +378,11 @@ /* Check if we have a complete line to read from */ if (Console->LineComplete) { + // NOTE: I want to check whether we always set LinePos to zero + // when LineComplete is set to TRUE. + // Basically, we are going to use LinePos as 'i'. + ASSERT(Console->LinePos == 0); + while (i < NumCharsToRead && Console->LinePos != Console->LineSize) { WCHAR Char = Console->LineBuffer[Console->LinePos++];

1 0

[tkreuzer] 70280: [NDK] Add more tests for structure offsets (not built by default)
by tkreuzer＠svn.reactos.org 05 Dec '15

05 Dec '15

Author: tkreuzer Date: Sat Dec 5 23:17:24 2015 New Revision: 70280 URL: http://svn.reactos.org/svn/reactos?rev=70280&view=rev Log: [NDK] Add more tests for structure offsets (not built by default) Added: trunk/reactos/include/ndk/tests/win10_x64.c (with props) trunk/reactos/include/ndk/tests/win10_x86.c (with props) trunk/reactos/include/ndk/tests/win81_x64.c (with props) trunk/reactos/include/ndk/tests/win81_x86.c (with props) trunk/reactos/include/ndk/tests/win8_x64.c (with props) trunk/reactos/include/ndk/tests/win8_x86.c (with props) Modified: trunk/reactos/include/ndk/tests/CMakeLists.txt Modified: trunk/reactos/include/ndk/tests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/CMakeLis… ============================================================================== --- trunk/reactos/include/ndk/tests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/ndk/tests/CMakeLists.txt [iso-8859-1] Sat Dec 5 23:17:24 2015 @@ -3,10 +3,16 @@ add_library(ndk_tests win2003_x64.c winvista_x64.c - win7_x64.c) + win7_x64.c + win8_x64.c + win81_x64.c + win10_x64.c) else() add_library(ndk_tests win2003_x86.c winvista_x86.c - win7_x86.c) + win7_x86.c + win8_x86.c + win81_x86.c + win10_x86.c) endif() Added: trunk/reactos/include/ndk/tests/win10_x64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/win10_x6… ============================================================================== --- trunk/reactos/include/ndk/tests/win10_x64.c (added) +++ trunk/reactos/include/ndk/tests/win10_x64.c [iso-8859-1] Sat Dec 5 23:17:24 2015 @@ -0,0 +1,119 @@ +/* Version definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WIN10 +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WIN10 + +#include <ntifs.h> +#include <ndk/ntndk.h> + +#define C_ASSERT_FIELD(Type, Offset, MemberType, MemberName) C_ASSERT(FIELD_OFFSET(Type, MemberName) == Offset); + +/* KTHREAD */ +C_ASSERT_FIELD(KTHREAD, 0x000, DISPATCHER_HEADER, Header) +C_ASSERT_FIELD(KTHREAD, 0x018, PVOID, SListFaultAddress) +C_ASSERT_FIELD(KTHREAD, 0x020, UINT64, QuantumTarget) +C_ASSERT_FIELD(KTHREAD, 0x028, PVOID, InitialStack) +C_ASSERT_FIELD(KTHREAD, 0x030, PVOID, StackLimit) +C_ASSERT_FIELD(KTHREAD, 0x038, PVOID, StackBase) +C_ASSERT_FIELD(KTHREAD, 0x040, UINT64, ThreadLock) +C_ASSERT_FIELD(KTHREAD, 0x048, UINT64, CycleTime) +C_ASSERT_FIELD(KTHREAD, 0x050, ULONG32, CurrentRunTime) +C_ASSERT_FIELD(KTHREAD, 0x054, ULONG32, ExpectedRunTime) +C_ASSERT_FIELD(KTHREAD, 0x058, PVOID, KernelStack) +C_ASSERT_FIELD(KTHREAD, 0x060, XSAVE_FORMAT*, StateSaveArea) +C_ASSERT_FIELD(KTHREAD, 0x068, KSCHEDULING_GROUP*, SchedulingGroup) +C_ASSERT_FIELD(KTHREAD, 0x070, KWAIT_STATUS_REGISTER, WaitRegister) +C_ASSERT_FIELD(KTHREAD, 0x071, UINT8, Running) +C_ASSERT_FIELD(KTHREAD, 0x072, UINT8[2], Alerted) +C_ASSERT_FIELD(KTHREAD, 0x074, LONG32, MiscFlags) +C_ASSERT_FIELD(KTHREAD, 0x078, LONG32, ThreadFlags) +C_ASSERT_FIELD(KTHREAD, 0x07C, UINT8, Tag) +C_ASSERT_FIELD(KTHREAD, 0x07D, UINT8, SystemHeteroCpuPolicy) +C_ASSERT_FIELD(KTHREAD, 0x080, ULONG32, SystemCallNumber) +C_ASSERT_FIELD(KTHREAD, 0x088, PVOID, FirstArgument) +C_ASSERT_FIELD(KTHREAD, 0x090, KTRAP_FRAME*, TrapFrame) +C_ASSERT_FIELD(KTHREAD, 0x098, KAPC_STATE, ApcState) +C_ASSERT_FIELD(KTHREAD, 0x0C3, CHAR, Priority) +C_ASSERT_FIELD(KTHREAD, 0x0C4, ULONG32, UserIdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x0C8, INT64, WaitStatus) +C_ASSERT_FIELD(KTHREAD, 0x0D0, KWAIT_BLOCK*, WaitBlockList) +C_ASSERT_FIELD(KTHREAD, 0x0D8, LIST_ENTRY, WaitListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0D8, SINGLE_LIST_ENTRY, SwapListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0E8, DISPATCHER_HEADER*, Queue) +C_ASSERT_FIELD(KTHREAD, 0x0F0, PVOID, Teb) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UINT64, RelativeTimerBias) +C_ASSERT_FIELD(KTHREAD, 0x100, KTIMER, Timer) +C_ASSERT_FIELD(KTHREAD, 0x140, KWAIT_BLOCK[4], WaitBlock) +C_ASSERT_FIELD(KTHREAD, 0x154, ULONG32, ContextSwitches) +C_ASSERT_FIELD(KTHREAD, 0x184, UINT8, State) +C_ASSERT_FIELD(KTHREAD, 0x185, CHAR, Spare13) +C_ASSERT_FIELD(KTHREAD, 0x186, UINT8, WaitIrql) +C_ASSERT_FIELD(KTHREAD, 0x187, CHAR, WaitMode) +C_ASSERT_FIELD(KTHREAD, 0x1B4, ULONG32, WaitTime) +C_ASSERT_FIELD(KTHREAD, 0x1E4, INT16, KernelApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1E6, INT16, SpecialApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1E4, ULONG32, CombinedApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x168, KTHREAD_COUNTERS*, ThreadCounters) +C_ASSERT_FIELD(KTHREAD, 0x198, XSTATE_SAVE*, XStateSave) +C_ASSERT_FIELD(KTHREAD, 0x1C8, PVOID, Win32Thread) +C_ASSERT_FIELD(KTHREAD, 0x1F0, UMS_CONTROL_BLOCK*, Ucb) +C_ASSERT_FIELD(KTHREAD, 0x1F8, KUMS_CONTEXT_HEADER*, Uch) +C_ASSERT_FIELD(KTHREAD, 0x200, PVOID, TebMappedLowVa) +C_ASSERT_FIELD(KTHREAD, 0x208, LIST_ENTRY, QueueListEntry) +C_ASSERT_FIELD(KTHREAD, 0x218, ULONG32, NextProcessor) +C_ASSERT_FIELD(KTHREAD, 0x21C, LONG32, QueuePriority) +C_ASSERT_FIELD(KTHREAD, 0x220, KPROCESS*, Process) +C_ASSERT_FIELD(KTHREAD, 0x228, GROUP_AFFINITY, UserAffinity) +C_ASSERT_FIELD(KTHREAD, 0x232, CHAR, PreviousMode) +C_ASSERT_FIELD(KTHREAD, 0x233, CHAR, BasePriority) +C_ASSERT_FIELD(KTHREAD, 0x234, CHAR, PriorityDecrement) +C_ASSERT_FIELD(KTHREAD, 0x235, UINT8, Preempted) +C_ASSERT_FIELD(KTHREAD, 0x236, UINT8, AdjustReason) +C_ASSERT_FIELD(KTHREAD, 0x237, CHAR, AdjustIncrement) +C_ASSERT_FIELD(KTHREAD, 0x238, UINT64, AffinityVersion) +C_ASSERT_FIELD(KTHREAD, 0x240, GROUP_AFFINITY, Affinity) +C_ASSERT_FIELD(KTHREAD, 0x24A, UINT8, ApcStateIndex) +C_ASSERT_FIELD(KTHREAD, 0x24B, UINT8, WaitBlockCount) +C_ASSERT_FIELD(KTHREAD, 0x24C, ULONG32, IdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x250, UINT64, NpxState) +C_ASSERT_FIELD(KTHREAD, 0x258, KAPC_STATE, SavedApcState) +C_ASSERT_FIELD(KTHREAD, 0x283, UINT8, WaitReason) +C_ASSERT_FIELD(KTHREAD, 0x284, CHAR, SuspendCount) +C_ASSERT_FIELD(KTHREAD, 0x285, CHAR, Saturation) +C_ASSERT_FIELD(KTHREAD, 0x286, UINT16, SListFaultCount) +C_ASSERT_FIELD(KTHREAD, 0x288, KAPC, SchedulerApc) +C_ASSERT_FIELD(KTHREAD, 0x289, UINT8, ResourceIndex) +C_ASSERT_FIELD(KTHREAD, 0x28B, UINT8, QuantumReset) +C_ASSERT_FIELD(KTHREAD, 0x28C, ULONG32, KernelTime) +C_ASSERT_FIELD(KTHREAD, 0x2C8, KPRCB*, WaitPrcb) +C_ASSERT_FIELD(KTHREAD, 0x2D0, PVOID, LegoData) +C_ASSERT_FIELD(KTHREAD, 0x2DB, UINT8, CallbackNestingLevel) +C_ASSERT_FIELD(KTHREAD, 0x2DC, ULONG32, UserTime) +C_ASSERT_FIELD(KTHREAD, 0x2E0, KEVENT, SuspendEvent) +C_ASSERT_FIELD(KTHREAD, 0x2F8, LIST_ENTRY, ThreadListEntry) +C_ASSERT_FIELD(KTHREAD, 0x308, LIST_ENTRY, MutantListHead) +C_ASSERT_FIELD(KTHREAD, 0x318, UINT8, AbEntrySummary) +C_ASSERT_FIELD(KTHREAD, 0x319, UINT8, AbWaitEntryCount) +C_ASSERT_FIELD(KTHREAD, 0x31A, UINT16, Spare20) +C_ASSERT_FIELD(KTHREAD, 0x31C, ULONG32, SecureThreadCookie) +C_ASSERT_FIELD(KTHREAD, 0x320, KLOCK_ENTRY[6], LockEntries) +C_ASSERT_FIELD(KTHREAD, 0x560, SINGLE_LIST_ENTRY, PropagateBoostsEntry) +C_ASSERT_FIELD(KTHREAD, 0x568, SINGLE_LIST_ENTRY, IoSelfBoostsEntry) +C_ASSERT_FIELD(KTHREAD, 0x570, UINT8[16], PriorityFloorCounts) +C_ASSERT_FIELD(KTHREAD, 0x580, ULONG32, PriorityFloorSummary) +C_ASSERT_FIELD(KTHREAD, 0x584, LONG32, AbCompletedIoBoostCount) +C_ASSERT_FIELD(KTHREAD, 0x588, INT16, KeReferenceCount) +C_ASSERT_FIELD(KTHREAD, 0x58A, UINT8, AbOrphanedEntrySummary) +C_ASSERT_FIELD(KTHREAD, 0x58B, UINT8, AbOwnedEntryCount) +C_ASSERT_FIELD(KTHREAD, 0x58C, ULONG32, ForegroundLossTime) +C_ASSERT_FIELD(KTHREAD, 0x590, LIST_ENTRY, GlobalForegroundListEntry) +C_ASSERT_FIELD(KTHREAD, 0x590, SINGLE_LIST_ENTRY, ForegroundDpcStackListEntry) +C_ASSERT_FIELD(KTHREAD, 0x598, UINT64, InGlobalForegroundList) +C_ASSERT_FIELD(KTHREAD, 0x5A0, INT64, ReadOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x5A8, INT64, WriteOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x5B0, INT64, OtherOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x5B8, INT64, ReadTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x5C0, INT64, WriteTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x5C8, INT64, OtherTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x5D0, KSCB*, QueuedScb) Propchange: trunk/reactos/include/ndk/tests/win10_x64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ndk/tests/win10_x86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/win10_x8… ============================================================================== --- trunk/reactos/include/ndk/tests/win10_x86.c (added) +++ trunk/reactos/include/ndk/tests/win10_x86.c [iso-8859-1] Sat Dec 5 23:17:24 2015 @@ -0,0 +1,111 @@ +/* Version definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WIN10 +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WIN10 + +#include <ntifs.h> +#include <ndk/ntndk.h> + +#define C_ASSERT_FIELD(Type, Offset, MemberType, MemberName) C_ASSERT(FIELD_OFFSET(Type, MemberName) == Offset); + +/* KTHREAD */ +C_ASSERT_FIELD(KTHREAD, 0x000, DISPATCHER_HEADER, Header) +C_ASSERT_FIELD(KTHREAD, 0x010, PVOID, SListFaultAddress) +C_ASSERT_FIELD(KTHREAD, 0x018, UINT64, QuantumTarget) +C_ASSERT_FIELD(KTHREAD, 0x020, PVOID, InitialStack) +C_ASSERT_FIELD(KTHREAD, 0x024, PVOID, StackLimit) +C_ASSERT_FIELD(KTHREAD, 0x028, PVOID, StackBase) +C_ASSERT_FIELD(KTHREAD, 0x02C, ULONG32, ThreadLock) +C_ASSERT_FIELD(KTHREAD, 0x030, UINT64, CycleTime) +C_ASSERT_FIELD(KTHREAD, 0x038, ULONG32, HighCycleTime) +C_ASSERT_FIELD(KTHREAD, 0x03C, PVOID, ServiceTable) +C_ASSERT_FIELD(KTHREAD, 0x040, ULONG32, CurrentRunTime) +C_ASSERT_FIELD(KTHREAD, 0x044, ULONG32, ExpectedRunTime) +C_ASSERT_FIELD(KTHREAD, 0x048, PVOID, KernelStack) +C_ASSERT_FIELD(KTHREAD, 0x04C, XSAVE_FORMAT*, StateSaveArea) +C_ASSERT_FIELD(KTHREAD, 0x050, KSCHEDULING_GROUP*, SchedulingGroup) +C_ASSERT_FIELD(KTHREAD, 0x054, KWAIT_STATUS_REGISTER, WaitRegister) +C_ASSERT_FIELD(KTHREAD, 0x055, UINT8, Running) +C_ASSERT_FIELD(KTHREAD, 0x056, UINT8[2], Alerted) +C_ASSERT_FIELD(KTHREAD, 0x058, LONG32, MiscFlags) +C_ASSERT_FIELD(KTHREAD, 0x05C, LONG32, ThreadFlags) +C_ASSERT_FIELD(KTHREAD, 0x060, UINT8, Tag) +C_ASSERT_FIELD(KTHREAD, 0x061, UINT8, SystemHeteroCpuPolicy) +C_ASSERT_FIELD(KTHREAD, 0x063, UINT8, Spare0) +C_ASSERT_FIELD(KTHREAD, 0x064, ULONG32, SystemCallNumber) +C_ASSERT_FIELD(KTHREAD, 0x068, PVOID, FirstArgument) +C_ASSERT_FIELD(KTHREAD, 0x06C, KTRAP_FRAME*, TrapFrame) +C_ASSERT_FIELD(KTHREAD, 0x070, KAPC_STATE, ApcState) +C_ASSERT_FIELD(KTHREAD, 0x088, ULONG32, UserIdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x08C, ULONG32, ContextSwitches) +C_ASSERT_FIELD(KTHREAD, 0x090, UINT8, State) +C_ASSERT_FIELD(KTHREAD, 0x091, CHAR, Spare12) +C_ASSERT_FIELD(KTHREAD, 0x092, UINT8, WaitIrql) +C_ASSERT_FIELD(KTHREAD, 0x093, CHAR, WaitMode) +C_ASSERT_FIELD(KTHREAD, 0x094, LONG32, WaitStatus) +C_ASSERT_FIELD(KTHREAD, 0x098, KWAIT_BLOCK*, WaitBlockList) +C_ASSERT_FIELD(KTHREAD, 0x09C, LIST_ENTRY, WaitListEntry) +C_ASSERT_FIELD(KTHREAD, 0x09C, SINGLE_LIST_ENTRY, SwapListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0A4, DISPATCHER_HEADER*, Queue) +C_ASSERT_FIELD(KTHREAD, 0x0A8, PVOID, Teb) +C_ASSERT_FIELD(KTHREAD, 0x0B0, UINT64, RelativeTimerBias) +C_ASSERT_FIELD(KTHREAD, 0x0B8, KTIMER, Timer) +C_ASSERT_FIELD(KTHREAD, 0x0E0, KWAIT_BLOCK[4], WaitBlock) +C_ASSERT_FIELD(KTHREAD, 0x0F4, KTHREAD_COUNTERS*, ThreadCounters) +C_ASSERT_FIELD(KTHREAD, 0x10C, XSTATE_SAVE*, XStateSave) +C_ASSERT_FIELD(KTHREAD, 0x124, PVOID, Win32Thread) +C_ASSERT_FIELD(KTHREAD, 0x138, ULONG32, WaitTime) +C_ASSERT_FIELD(KTHREAD, 0x13C, INT16, KernelApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x13E, INT16, SpecialApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x13C, ULONG32, CombinedApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x140, LIST_ENTRY, QueueListEntry) +C_ASSERT_FIELD(KTHREAD, 0x148, ULONG32, NextProcessor) +C_ASSERT_FIELD(KTHREAD, 0x14C, LONG32, QueuePriority) +C_ASSERT_FIELD(KTHREAD, 0x150, KPROCESS*, Process) +C_ASSERT_FIELD(KTHREAD, 0x154, GROUP_AFFINITY, UserAffinity) +C_ASSERT_FIELD(KTHREAD, 0x15A, CHAR, PreviousMode) +C_ASSERT_FIELD(KTHREAD, 0x15B, CHAR, BasePriority) +C_ASSERT_FIELD(KTHREAD, 0x15C, CHAR, PriorityDecrement) +C_ASSERT_FIELD(KTHREAD, 0x15D, UINT8, Preempted) +C_ASSERT_FIELD(KTHREAD, 0x15E, UINT8, AdjustReason) +C_ASSERT_FIELD(KTHREAD, 0x15F, CHAR, AdjustIncrement) +C_ASSERT_FIELD(KTHREAD, 0x160, ULONG32, AffinityVersion) +C_ASSERT_FIELD(KTHREAD, 0x164, GROUP_AFFINITY, Affinity) +C_ASSERT_FIELD(KTHREAD, 0x16A, UINT8, ApcStateIndex) +C_ASSERT_FIELD(KTHREAD, 0x16B, UINT8, WaitBlockCount) +C_ASSERT_FIELD(KTHREAD, 0x16C, ULONG32, IdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x174, KAPC_STATE, SavedApcState) +C_ASSERT_FIELD(KTHREAD, 0x18B, UINT8, WaitReason) +C_ASSERT_FIELD(KTHREAD, 0x18C, CHAR, SuspendCount) +C_ASSERT_FIELD(KTHREAD, 0x18D, CHAR, Saturation) +C_ASSERT_FIELD(KTHREAD, 0x18E, UINT16, SListFaultCount) +C_ASSERT_FIELD(KTHREAD, 0x190, KAPC, SchedulerApc) +C_ASSERT_FIELD(KTHREAD, 0x191, UINT8, ResourceIndex) +C_ASSERT_FIELD(KTHREAD, 0x193, UINT8, QuantumReset) +C_ASSERT_FIELD(KTHREAD, 0x194, ULONG32, KernelTime) +C_ASSERT_FIELD(KTHREAD, 0x1B4, KPRCB*, WaitPrcb) +C_ASSERT_FIELD(KTHREAD, 0x1B8, PVOID, LegoData) +C_ASSERT_FIELD(KTHREAD, 0x1BF, UINT8, CallbackNestingLevel) +C_ASSERT_FIELD(KTHREAD, 0x1C0, ULONG32, UserTime) +C_ASSERT_FIELD(KTHREAD, 0x1C4, KEVENT, SuspendEvent) +C_ASSERT_FIELD(KTHREAD, 0x1D4, LIST_ENTRY, ThreadListEntry) +C_ASSERT_FIELD(KTHREAD, 0x1DC, LIST_ENTRY, MutantListHead) +C_ASSERT_FIELD(KTHREAD, 0x1E4, UINT8, AbEntrySummary) +C_ASSERT_FIELD(KTHREAD, 0x1E5, UINT8, AbWaitEntryCount) +C_ASSERT_FIELD(KTHREAD, 0x1E6, UINT16, Spare20) +C_ASSERT_FIELD(KTHREAD, 0x1E8, KLOCK_ENTRY[6], LockEntries) +C_ASSERT_FIELD(KTHREAD, 0x308, SINGLE_LIST_ENTRY, PropagateBoostsEntry) +C_ASSERT_FIELD(KTHREAD, 0x30C, SINGLE_LIST_ENTRY, IoSelfBoostsEntry) +C_ASSERT_FIELD(KTHREAD, 0x310, UINT8[16], PriorityFloorCounts) +C_ASSERT_FIELD(KTHREAD, 0x320, ULONG32, PriorityFloorSummary) +C_ASSERT_FIELD(KTHREAD, 0x324, LONG32, AbCompletedIoBoostCount) +C_ASSERT_FIELD(KTHREAD, 0x328, INT16, KeReferenceCount) +C_ASSERT_FIELD(KTHREAD, 0x32A, UINT8, AbOrphanedEntrySummary) +C_ASSERT_FIELD(KTHREAD, 0x32B, UINT8, AbOwnedEntryCount) +C_ASSERT_FIELD(KTHREAD, 0x32C, ULONG32, ForegroundLossTime) +C_ASSERT_FIELD(KTHREAD, 0x330, LIST_ENTRY, GlobalForegroundListEntry) +C_ASSERT_FIELD(KTHREAD, 0x330, SINGLE_LIST_ENTRY, ForegroundDpcStackListEntry) +C_ASSERT_FIELD(KTHREAD, 0x334, ULONG32, InGlobalForegroundList) +C_ASSERT_FIELD(KTHREAD, 0x338, KSCB*, QueuedScb) +C_ASSERT_FIELD(KTHREAD, 0x340, UINT64, NpxState) Propchange: trunk/reactos/include/ndk/tests/win10_x86.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ndk/tests/win81_x64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/win81_x6… ============================================================================== --- trunk/reactos/include/ndk/tests/win81_x64.c (added) +++ trunk/reactos/include/ndk/tests/win81_x64.c [iso-8859-1] Sat Dec 5 23:17:24 2015 @@ -0,0 +1,114 @@ +/* Version definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WINBLUE +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WINBLUE + +#include <ntifs.h> +#include <ndk/ntndk.h> + +#define C_ASSERT_FIELD(Type, Offset, MemberType, MemberName) C_ASSERT(FIELD_OFFSET(Type, MemberName) == Offset); + +/* KTHREAD */ +C_ASSERT_FIELD(KTHREAD, 0x000, DISPATCHER_HEADER, Header) +C_ASSERT_FIELD(KTHREAD, 0x018, PVOID, SListFaultAddress) +C_ASSERT_FIELD(KTHREAD, 0x020, UINT64, QuantumTarget) +C_ASSERT_FIELD(KTHREAD, 0x028, PVOID, InitialStack) +C_ASSERT_FIELD(KTHREAD, 0x030, PVOID, StackLimit) +C_ASSERT_FIELD(KTHREAD, 0x038, PVOID, StackBase) +C_ASSERT_FIELD(KTHREAD, 0x040, UINT64, ThreadLock) +C_ASSERT_FIELD(KTHREAD, 0x048, UINT64, CycleTime) +C_ASSERT_FIELD(KTHREAD, 0x050, ULONG32, CurrentRunTime) +C_ASSERT_FIELD(KTHREAD, 0x054, ULONG32, ExpectedRunTime) +C_ASSERT_FIELD(KTHREAD, 0x058, PVOID, KernelStack) +C_ASSERT_FIELD(KTHREAD, 0x060, XSAVE_FORMAT*, StateSaveArea) +C_ASSERT_FIELD(KTHREAD, 0x068, KSCHEDULING_GROUP*, SchedulingGroup) +C_ASSERT_FIELD(KTHREAD, 0x070, KWAIT_STATUS_REGISTER, WaitRegister) +C_ASSERT_FIELD(KTHREAD, 0x071, UINT8, Running) +C_ASSERT_FIELD(KTHREAD, 0x072, UINT8[2], Alerted) +C_ASSERT_FIELD(KTHREAD, 0x074, LONG32, MiscFlags) +C_ASSERT_FIELD(KTHREAD, 0x078, LONG32, ThreadFlags) +C_ASSERT_FIELD(KTHREAD, 0x07C, ULONG32, Spare0) +C_ASSERT_FIELD(KTHREAD, 0x080, ULONG32, SystemCallNumber) +C_ASSERT_FIELD(KTHREAD, 0x084, ULONG32, Spare1) +C_ASSERT_FIELD(KTHREAD, 0x088, PVOID, FirstArgument) +C_ASSERT_FIELD(KTHREAD, 0x090, KTRAP_FRAME*, TrapFrame) +C_ASSERT_FIELD(KTHREAD, 0x098, KAPC_STATE, ApcState) +C_ASSERT_FIELD(KTHREAD, 0x0C3, CHAR, Priority) +C_ASSERT_FIELD(KTHREAD, 0x0C4, ULONG32, UserIdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x0C8, INT64, WaitStatus) +C_ASSERT_FIELD(KTHREAD, 0x0D0, KWAIT_BLOCK*, WaitBlockList) +C_ASSERT_FIELD(KTHREAD, 0x0D8, LIST_ENTRY, WaitListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0D8, SINGLE_LIST_ENTRY, SwapListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0E8, DISPATCHER_HEADER*, Queue) +C_ASSERT_FIELD(KTHREAD, 0x0F0, PVOID, Teb) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UINT64, RelativeTimerBias) +C_ASSERT_FIELD(KTHREAD, 0x100, KTIMER, Timer) +C_ASSERT_FIELD(KTHREAD, 0x140, KWAIT_BLOCK[4], WaitBlock) +C_ASSERT_FIELD(KTHREAD, 0x154, ULONG32, ContextSwitches) +C_ASSERT_FIELD(KTHREAD, 0x184, UINT8, State) +C_ASSERT_FIELD(KTHREAD, 0x185, CHAR, NpxState) +C_ASSERT_FIELD(KTHREAD, 0x186, UINT8, WaitIrql) +C_ASSERT_FIELD(KTHREAD, 0x187, CHAR, WaitMode) +C_ASSERT_FIELD(KTHREAD, 0x1B4, ULONG32, WaitTime) +C_ASSERT_FIELD(KTHREAD, 0x1E4, INT16, KernelApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1E6, INT16, SpecialApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1E4, ULONG32, CombinedApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x168, KTHREAD_COUNTERS*, ThreadCounters) +C_ASSERT_FIELD(KTHREAD, 0x198, XSTATE_SAVE*, XStateSave) +C_ASSERT_FIELD(KTHREAD, 0x1C8, PVOID, Win32Thread) +C_ASSERT_FIELD(KTHREAD, 0x1F0, UMS_CONTROL_BLOCK*, Ucb) +C_ASSERT_FIELD(KTHREAD, 0x1F8, KUMS_CONTEXT_HEADER*, Uch) +C_ASSERT_FIELD(KTHREAD, 0x200, PVOID, TebMappedLowVa) +C_ASSERT_FIELD(KTHREAD, 0x208, LIST_ENTRY, QueueListEntry) +C_ASSERT_FIELD(KTHREAD, 0x218, ULONG32, NextProcessor) +C_ASSERT_FIELD(KTHREAD, 0x21C, LONG32, QueuePriority) +C_ASSERT_FIELD(KTHREAD, 0x220, KPROCESS*, Process) +C_ASSERT_FIELD(KTHREAD, 0x228, GROUP_AFFINITY, UserAffinity) +C_ASSERT_FIELD(KTHREAD, 0x232, CHAR, PreviousMode) +C_ASSERT_FIELD(KTHREAD, 0x233, CHAR, BasePriority) +C_ASSERT_FIELD(KTHREAD, 0x234, CHAR, PriorityDecrement) +C_ASSERT_FIELD(KTHREAD, 0x235, UINT8, Preempted) +C_ASSERT_FIELD(KTHREAD, 0x236, UINT8, AdjustReason) +C_ASSERT_FIELD(KTHREAD, 0x237, CHAR, AdjustIncrement) +C_ASSERT_FIELD(KTHREAD, 0x238, GROUP_AFFINITY, Affinity) +C_ASSERT_FIELD(KTHREAD, 0x242, UINT8, ApcStateIndex) +C_ASSERT_FIELD(KTHREAD, 0x243, UINT8, WaitBlockCount) +C_ASSERT_FIELD(KTHREAD, 0x244, ULONG32, IdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x248, KAPC_STATE*[2], ApcStatePointer) +C_ASSERT_FIELD(KTHREAD, 0x258, KAPC_STATE, SavedApcState) +C_ASSERT_FIELD(KTHREAD, 0x283, UINT8, WaitReason) +C_ASSERT_FIELD(KTHREAD, 0x284, CHAR, SuspendCount) +C_ASSERT_FIELD(KTHREAD, 0x285, CHAR, Saturation) +C_ASSERT_FIELD(KTHREAD, 0x286, UINT16, SListFaultCount) +C_ASSERT_FIELD(KTHREAD, 0x288, KAPC, SchedulerApc) +C_ASSERT_FIELD(KTHREAD, 0x289, UINT8, ResourceIndex) +C_ASSERT_FIELD(KTHREAD, 0x28B, UINT8, QuantumReset) +C_ASSERT_FIELD(KTHREAD, 0x28C, ULONG32, KernelTime) +C_ASSERT_FIELD(KTHREAD, 0x2C8, KPRCB*, WaitPrcb) +C_ASSERT_FIELD(KTHREAD, 0x2D0, PVOID, LegoData) +C_ASSERT_FIELD(KTHREAD, 0x2DB, UINT8, CallbackNestingLevel) +C_ASSERT_FIELD(KTHREAD, 0x2DC, ULONG32, UserTime) +C_ASSERT_FIELD(KTHREAD, 0x2E0, KEVENT, SuspendEvent) +C_ASSERT_FIELD(KTHREAD, 0x2F8, LIST_ENTRY, ThreadListEntry) +C_ASSERT_FIELD(KTHREAD, 0x308, LIST_ENTRY, MutantListHead) +C_ASSERT_FIELD(KTHREAD, 0x318, SINGLE_LIST_ENTRY, LockEntriesFreeList) +C_ASSERT_FIELD(KTHREAD, 0x320, KLOCK_ENTRY[6], LockEntries) +C_ASSERT_FIELD(KTHREAD, 0x560, SINGLE_LIST_ENTRY, PropagateBoostsEntry) +C_ASSERT_FIELD(KTHREAD, 0x568, SINGLE_LIST_ENTRY, IoSelfBoostsEntry) +C_ASSERT_FIELD(KTHREAD, 0x570, UINT8[16], PriorityFloorCounts) +C_ASSERT_FIELD(KTHREAD, 0x580, ULONG32, PriorityFloorSummary) +C_ASSERT_FIELD(KTHREAD, 0x584, LONG32, AbCompletedIoBoostCount) +C_ASSERT_FIELD(KTHREAD, 0x588, INT16, AbReferenceCount) +C_ASSERT_FIELD(KTHREAD, 0x58A, UINT8, AbFreeEntryCount) +C_ASSERT_FIELD(KTHREAD, 0x58B, UINT8, AbWaitEntryCount) +C_ASSERT_FIELD(KTHREAD, 0x58C, ULONG32, ForegroundLossTime) +C_ASSERT_FIELD(KTHREAD, 0x590, LIST_ENTRY, GlobalForegroundListEntry) +C_ASSERT_FIELD(KTHREAD, 0x590, SINGLE_LIST_ENTRY, ForegroundDpcStackListEntry) +C_ASSERT_FIELD(KTHREAD, 0x598, UINT64, InGlobalForegroundList) +C_ASSERT_FIELD(KTHREAD, 0x5A0, INT64, ReadOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x5A8, INT64, WriteOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x5B0, INT64, OtherOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x5B8, INT64, ReadTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x5C0, INT64, WriteTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x5C8, INT64, OtherTransferCount) Propchange: trunk/reactos/include/ndk/tests/win81_x64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ndk/tests/win81_x86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/win81_x8… ============================================================================== --- trunk/reactos/include/ndk/tests/win81_x86.c (added) +++ trunk/reactos/include/ndk/tests/win81_x86.c [iso-8859-1] Sat Dec 5 23:17:24 2015 @@ -0,0 +1,107 @@ +/* Version definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WINBLUE +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WINBLUE + +#include <ntifs.h> +#include <ndk/ntndk.h> + +#define C_ASSERT_FIELD(Type, Offset, MemberType, MemberName) C_ASSERT(FIELD_OFFSET(Type, MemberName) == Offset); + +/* KTHREAD */ +C_ASSERT_FIELD(KTHREAD, 0x000, DISPATCHER_HEADER, Header) + +C_ASSERT_FIELD(KTHREAD, 0x010, PVOID, SListFaultAddress) +C_ASSERT_FIELD(KTHREAD, 0x018, UINT64, QuantumTarget) +C_ASSERT_FIELD(KTHREAD, 0x020, PVOID, InitialStack) +C_ASSERT_FIELD(KTHREAD, 0x024, PVOID, StackLimit) +C_ASSERT_FIELD(KTHREAD, 0x028, PVOID, StackBase) +C_ASSERT_FIELD(KTHREAD, 0x02C, ULONG32, ThreadLock) +C_ASSERT_FIELD(KTHREAD, 0x030, UINT64, CycleTime) +C_ASSERT_FIELD(KTHREAD, 0x038, ULONG32, HighCycleTime) +C_ASSERT_FIELD(KTHREAD, 0x03C, PVOID, ServiceTable) +C_ASSERT_FIELD(KTHREAD, 0x040, ULONG32, CurrentRunTime) +C_ASSERT_FIELD(KTHREAD, 0x044, ULONG32, ExpectedRunTime) +C_ASSERT_FIELD(KTHREAD, 0x048, PVOID, KernelStack) +C_ASSERT_FIELD(KTHREAD, 0x04C, XSAVE_FORMAT*, StateSaveArea) +C_ASSERT_FIELD(KTHREAD, 0x050, KSCHEDULING_GROUP*, SchedulingGroup) +C_ASSERT_FIELD(KTHREAD, 0x054, KWAIT_STATUS_REGISTER, WaitRegister) +C_ASSERT_FIELD(KTHREAD, 0x055, UINT8, Running) +C_ASSERT_FIELD(KTHREAD, 0x056, UINT8[2], Alerted) +C_ASSERT_FIELD(KTHREAD, 0x058, LONG32, MiscFlags) +C_ASSERT_FIELD(KTHREAD, 0x05C, LONG32, ThreadFlags) +C_ASSERT_FIELD(KTHREAD, 0x060, ULONG32, Spare0) +C_ASSERT_FIELD(KTHREAD, 0x064, ULONG32, SystemCallNumber) +C_ASSERT_FIELD(KTHREAD, 0x068, PVOID, FirstArgument) +C_ASSERT_FIELD(KTHREAD, 0x06C, KTRAP_FRAME*, TrapFrame) +C_ASSERT_FIELD(KTHREAD, 0x070, KAPC_STATE, ApcState) +C_ASSERT_FIELD(KTHREAD, 0x087, CHAR, Priority) +C_ASSERT_FIELD(KTHREAD, 0x088, ULONG32, UserIdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x08C, ULONG32, ContextSwitches) +C_ASSERT_FIELD(KTHREAD, 0x090, UINT8, State) +C_ASSERT_FIELD(KTHREAD, 0x091, CHAR, NpxState) +C_ASSERT_FIELD(KTHREAD, 0x092, UINT8, WaitIrql) +C_ASSERT_FIELD(KTHREAD, 0x093, CHAR, WaitMode) +C_ASSERT_FIELD(KTHREAD, 0x094, LONG32, WaitStatus) +C_ASSERT_FIELD(KTHREAD, 0x098, KWAIT_BLOCK*, WaitBlockList) +C_ASSERT_FIELD(KTHREAD, 0x09C, LIST_ENTRY, WaitListEntry) +C_ASSERT_FIELD(KTHREAD, 0x09C, SINGLE_LIST_ENTRY, SwapListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0A4, DISPATCHER_HEADER*, Queue) +C_ASSERT_FIELD(KTHREAD, 0x0A8, PVOID, Teb) +C_ASSERT_FIELD(KTHREAD, 0x0B0, UINT64, RelativeTimerBias) +C_ASSERT_FIELD(KTHREAD, 0x0B8, KTIMER, Timer) +C_ASSERT_FIELD(KTHREAD, 0x0E0, KWAIT_BLOCK[4], WaitBlock) +C_ASSERT_FIELD(KTHREAD, 0x0F4, KTHREAD_COUNTERS*, ThreadCounters) +C_ASSERT_FIELD(KTHREAD, 0x10C, XSTATE_SAVE*, XStateSave) +C_ASSERT_FIELD(KTHREAD, 0x124, PVOID, Win32Thread) +C_ASSERT_FIELD(KTHREAD, 0x138, ULONG32, WaitTime) +C_ASSERT_FIELD(KTHREAD, 0x13C, INT16, KernelApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x13E, INT16, SpecialApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x13C, ULONG32, CombinedApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x140, LIST_ENTRY, QueueListEntry) +C_ASSERT_FIELD(KTHREAD, 0x148, ULONG32, NextProcessor) +C_ASSERT_FIELD(KTHREAD, 0x14C, LONG32, QueuePriority) +C_ASSERT_FIELD(KTHREAD, 0x150, KPROCESS*, Process) +C_ASSERT_FIELD(KTHREAD, 0x154, GROUP_AFFINITY, UserAffinity) +C_ASSERT_FIELD(KTHREAD, 0x15A, CHAR, PreviousMode) +C_ASSERT_FIELD(KTHREAD, 0x15B, CHAR, BasePriority) +C_ASSERT_FIELD(KTHREAD, 0x15C, CHAR, PriorityDecrement) +C_ASSERT_FIELD(KTHREAD, 0x15D, UINT8, Preempted) +C_ASSERT_FIELD(KTHREAD, 0x15E, UINT8, AdjustReason) +C_ASSERT_FIELD(KTHREAD, 0x15F, CHAR, AdjustIncrement) +C_ASSERT_FIELD(KTHREAD, 0x160, GROUP_AFFINITY, Affinity) +C_ASSERT_FIELD(KTHREAD, 0x166, UINT8, ApcStateIndex) +C_ASSERT_FIELD(KTHREAD, 0x167, UINT8, WaitBlockCount) +C_ASSERT_FIELD(KTHREAD, 0x168, ULONG32, IdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x16C, KAPC_STATE*[2], ApcStatePointer) +C_ASSERT_FIELD(KTHREAD, 0x174, KAPC_STATE, SavedApcState) +C_ASSERT_FIELD(KTHREAD, 0x18B, UINT8, WaitReason) +C_ASSERT_FIELD(KTHREAD, 0x18C, CHAR, SuspendCount) +C_ASSERT_FIELD(KTHREAD, 0x18D, CHAR, Saturation) +C_ASSERT_FIELD(KTHREAD, 0x18E, UINT16, SListFaultCount) +C_ASSERT_FIELD(KTHREAD, 0x190, KAPC, SchedulerApc) +C_ASSERT_FIELD(KTHREAD, 0x191, UINT8, ResourceIndex) +C_ASSERT_FIELD(KTHREAD, 0x193, UINT8, QuantumReset) +C_ASSERT_FIELD(KTHREAD, 0x194, ULONG32, KernelTime) +C_ASSERT_FIELD(KTHREAD, 0x1B4, KPRCB*, WaitPrcb) +C_ASSERT_FIELD(KTHREAD, 0x1B8, PVOID, LegoData) +C_ASSERT_FIELD(KTHREAD, 0x1BF, UINT8, CallbackNestingLevel) +C_ASSERT_FIELD(KTHREAD, 0x1C0, ULONG32, UserTime) +C_ASSERT_FIELD(KTHREAD, 0x1C4, KEVENT, SuspendEvent) +C_ASSERT_FIELD(KTHREAD, 0x1D4, LIST_ENTRY, ThreadListEntry) +C_ASSERT_FIELD(KTHREAD, 0x1DC, LIST_ENTRY, MutantListHead) +C_ASSERT_FIELD(KTHREAD, 0x1E4, SINGLE_LIST_ENTRY, LockEntriesFreeList) +C_ASSERT_FIELD(KTHREAD, 0x1E8, KLOCK_ENTRY[6], LockEntries) +C_ASSERT_FIELD(KTHREAD, 0x308, SINGLE_LIST_ENTRY, PropagateBoostsEntry) +C_ASSERT_FIELD(KTHREAD, 0x30C, SINGLE_LIST_ENTRY, IoSelfBoostsEntry) +C_ASSERT_FIELD(KTHREAD, 0x310, UINT8[16], PriorityFloorCounts) +C_ASSERT_FIELD(KTHREAD, 0x320, ULONG32, PriorityFloorSummary) +C_ASSERT_FIELD(KTHREAD, 0x324, LONG32, AbCompletedIoBoostCount) +C_ASSERT_FIELD(KTHREAD, 0x328, INT16, AbReferenceCount) +C_ASSERT_FIELD(KTHREAD, 0x32A, UINT8, AbFreeEntryCount) +C_ASSERT_FIELD(KTHREAD, 0x32B, UINT8, AbWaitEntryCount) +C_ASSERT_FIELD(KTHREAD, 0x32C, ULONG32, ForegroundLossTime) +C_ASSERT_FIELD(KTHREAD, 0x330, LIST_ENTRY, GlobalForegroundListEntry) +C_ASSERT_FIELD(KTHREAD, 0x330, SINGLE_LIST_ENTRY, ForegroundDpcStackListEntry) +C_ASSERT_FIELD(KTHREAD, 0x334, ULONG32, InGlobalForegroundList) Propchange: trunk/reactos/include/ndk/tests/win81_x86.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ndk/tests/win8_x64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/win8_x64… ============================================================================== --- trunk/reactos/include/ndk/tests/win8_x64.c (added) +++ trunk/reactos/include/ndk/tests/win8_x64.c [iso-8859-1] Sat Dec 5 23:17:24 2015 @@ -0,0 +1,100 @@ +/* Version definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WIN8 +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WIN8 + +#include <ntifs.h> +#include <ndk/ntndk.h> + +#define C_ASSERT_FIELD(Type, Offset, MemberType, MemberName) C_ASSERT(FIELD_OFFSET(Type, MemberName) == Offset); + +/* KTHREAD */ +C_ASSERT_FIELD(KTHREAD, 0x000, DISPATCHER_HEADER, Header) +C_ASSERT_FIELD(KTHREAD, 0x018, PVOID, SListFaultAddress) +C_ASSERT_FIELD(KTHREAD, 0x020, UINT64, QuantumTarget) +C_ASSERT_FIELD(KTHREAD, 0x028, PVOID, InitialStack) +C_ASSERT_FIELD(KTHREAD, 0x030, PVOID, StackLimit) +C_ASSERT_FIELD(KTHREAD, 0x038, PVOID, StackBase) +C_ASSERT_FIELD(KTHREAD, 0x040, UINT64, ThreadLock) +C_ASSERT_FIELD(KTHREAD, 0x048, UINT64, CycleTime) +C_ASSERT_FIELD(KTHREAD, 0x050, ULONG, CurrentRunTime) +C_ASSERT_FIELD(KTHREAD, 0x054, ULONG, ExpectedRunTime) +C_ASSERT_FIELD(KTHREAD, 0x058, PVOID, KernelStack) +C_ASSERT_FIELD(KTHREAD, 0x060, XSAVE_FORMAT*, StateSaveArea) +C_ASSERT_FIELD(KTHREAD, 0x068, KSCHEDULING_GROUP*, SchedulingGroup) +C_ASSERT_FIELD(KTHREAD, 0x070, KWAIT_STATUS_REGISTER, WaitRegister) +C_ASSERT_FIELD(KTHREAD, 0x071, UINT8, Running) +C_ASSERT_FIELD(KTHREAD, 0x072, UINT8[2], Alerted) +C_ASSERT_FIELD(KTHREAD, 0x074, LONG32, MiscFlags) +C_ASSERT_FIELD(KTHREAD, 0x078, LONG32, ThreadFlags) +C_ASSERT_FIELD(KTHREAD, 0x07C, ULONG, Spare0) +C_ASSERT_FIELD(KTHREAD, 0x080, ULONG, SystemCallNumber) +C_ASSERT_FIELD(KTHREAD, 0x084, ULONG, Spare1) +C_ASSERT_FIELD(KTHREAD, 0x088, PVOID, FirstArgument) +C_ASSERT_FIELD(KTHREAD, 0x090, KTRAP_FRAME*, TrapFrame) +C_ASSERT_FIELD(KTHREAD, 0x098, KAPC_STATE, ApcState) +C_ASSERT_FIELD(KTHREAD, 0x0C3, CHAR, Priority) +C_ASSERT_FIELD(KTHREAD, 0x0C4, ULONG, UserIdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x0C8, INT64, WaitStatus) +C_ASSERT_FIELD(KTHREAD, 0x0D0, KWAIT_BLOCK*, WaitBlockList) +C_ASSERT_FIELD(KTHREAD, 0x0D8, LIST_ENTRY, WaitListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0D8, SINGLE_LIST_ENTRY, SwapListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0E8, KQUEUE*, Queue) +C_ASSERT_FIELD(KTHREAD, 0x0F0, PVOID, Teb) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UINT64, RelativeTimerBias) +C_ASSERT_FIELD(KTHREAD, 0x100, KTIMER, Timer) +C_ASSERT_FIELD(KTHREAD, 0x140, KWAIT_BLOCK[4], WaitBlock) +C_ASSERT_FIELD(KTHREAD, 0x154, ULONG, ContextSwitches) +C_ASSERT_FIELD(KTHREAD, 0x184, UINT8, State) +C_ASSERT_FIELD(KTHREAD, 0x185, CHAR, NpxState) +C_ASSERT_FIELD(KTHREAD, 0x186, UINT8, WaitIrql) +C_ASSERT_FIELD(KTHREAD, 0x187, CHAR, WaitMode) +C_ASSERT_FIELD(KTHREAD, 0x1B4, ULONG, WaitTime) +C_ASSERT_FIELD(KTHREAD, 0x1E4, INT16, KernelApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1E6, INT16, SpecialApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1E4, ULONG, CombinedApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x168, KTHREAD_COUNTERS*, ThreadCounters) +C_ASSERT_FIELD(KTHREAD, 0x198, XSTATE_SAVE*, XStateSave) +C_ASSERT_FIELD(KTHREAD, 0x1C8, PVOID, Win32Thread) +C_ASSERT_FIELD(KTHREAD, 0x1F0, UMS_CONTROL_BLOCK*, Ucb) +C_ASSERT_FIELD(KTHREAD, 0x1F8, KUMS_CONTEXT_HEADER*, Uch) +C_ASSERT_FIELD(KTHREAD, 0x200, PVOID, TebMappedLowVa) +C_ASSERT_FIELD(KTHREAD, 0x208, LIST_ENTRY, QueueListEntry) +C_ASSERT_FIELD(KTHREAD, 0x218, ULONG, NextProcessor) +C_ASSERT_FIELD(KTHREAD, 0x21C, ULONG, DeferredProcessor) +C_ASSERT_FIELD(KTHREAD, 0x220, KPROCESS*, Process) +C_ASSERT_FIELD(KTHREAD, 0x228, GROUP_AFFINITY, UserAffinity) +C_ASSERT_FIELD(KTHREAD, 0x232, CHAR, PreviousMode) +C_ASSERT_FIELD(KTHREAD, 0x233, CHAR, BasePriority) +C_ASSERT_FIELD(KTHREAD, 0x234, CHAR, PriorityDecrement) +C_ASSERT_FIELD(KTHREAD, 0x235, UINT8, Preempted) +C_ASSERT_FIELD(KTHREAD, 0x236, UINT8, AdjustReason) +C_ASSERT_FIELD(KTHREAD, 0x237, CHAR, AdjustIncrement) +C_ASSERT_FIELD(KTHREAD, 0x238, GROUP_AFFINITY, Affinity) +C_ASSERT_FIELD(KTHREAD, 0x242, UINT8, ApcStateIndex) +C_ASSERT_FIELD(KTHREAD, 0x243, UINT8, WaitBlockCount) +C_ASSERT_FIELD(KTHREAD, 0x244, ULONG, IdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x248, KAPC_STATE*[2], ApcStatePointer) +C_ASSERT_FIELD(KTHREAD, 0x258, KAPC_STATE, SavedApcState) +C_ASSERT_FIELD(KTHREAD, 0x283, UINT8, WaitReason) +C_ASSERT_FIELD(KTHREAD, 0x284, CHAR, SuspendCount) +C_ASSERT_FIELD(KTHREAD, 0x285, CHAR, Saturation) +C_ASSERT_FIELD(KTHREAD, 0x286, UINT16, SListFaultCount) +C_ASSERT_FIELD(KTHREAD, 0x288, KAPC, SchedulerApc) +C_ASSERT_FIELD(KTHREAD, 0x289, UINT8, ResourceIndex) +C_ASSERT_FIELD(KTHREAD, 0x28B, UINT8, QuantumReset) +C_ASSERT_FIELD(KTHREAD, 0x28C, ULONG, KernelTime) +C_ASSERT_FIELD(KTHREAD, 0x2C8, KPRCB*, WaitPrcb) +C_ASSERT_FIELD(KTHREAD, 0x2D0, PVOID, LegoData) +C_ASSERT_FIELD(KTHREAD, 0x2DB, UINT8, CallbackNestingLevel) +C_ASSERT_FIELD(KTHREAD, 0x2DC, ULONG, UserTime) +C_ASSERT_FIELD(KTHREAD, 0x2E0, KEVENT, SuspendEvent) +C_ASSERT_FIELD(KTHREAD, 0x2F8, LIST_ENTRY, ThreadListEntry) +C_ASSERT_FIELD(KTHREAD, 0x308, LIST_ENTRY, MutantListHead) +C_ASSERT_FIELD(KTHREAD, 0x318, INT64, ReadOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x320, INT64, WriteOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x328, INT64, OtherOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x330, INT64, ReadTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x338, INT64, WriteTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x340, INT64, OtherTransferCount) Propchange: trunk/reactos/include/ndk/tests/win8_x64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ndk/tests/win8_x86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/win8_x86… ============================================================================== --- trunk/reactos/include/ndk/tests/win8_x86.c (added) +++ trunk/reactos/include/ndk/tests/win8_x86.c [iso-8859-1] Sat Dec 5 23:17:24 2015 @@ -0,0 +1,91 @@ +/* Version definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WIN8 +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WIN8 + +#include <ntifs.h> +#include <ndk/ntndk.h> + +#define C_ASSERT_FIELD(Type, Offset, MemberType, MemberName) C_ASSERT(FIELD_OFFSET(Type, MemberName) == Offset); + +/* KTHREAD */ +C_ASSERT_FIELD(KTHREAD, 0x000, DISPATCHER_HEADER, Header) +C_ASSERT_FIELD(KTHREAD, 0x010, UINT64, SListFaultAddress) +C_ASSERT_FIELD(KTHREAD, 0x018, UINT64, QuantumTarget) +C_ASSERT_FIELD(KTHREAD, 0x020, PVOID, InitialStack) +C_ASSERT_FIELD(KTHREAD, 0x024, PVOID, StackLimit) +C_ASSERT_FIELD(KTHREAD, 0x028, PVOID, StackBase) +C_ASSERT_FIELD(KTHREAD, 0x02C, PVOID, ThreadLock) +C_ASSERT_FIELD(KTHREAD, 0x030, UINT64, CycleTime) +C_ASSERT_FIELD(KTHREAD, 0x038, ULONG, HighCycleTime) +C_ASSERT_FIELD(KTHREAD, 0x03C, PVOID, ServiceTable) +C_ASSERT_FIELD(KTHREAD, 0x040, ULONG, CurrentRunTime) +C_ASSERT_FIELD(KTHREAD, 0x044, ULONG, ExpectedRunTime) +C_ASSERT_FIELD(KTHREAD, 0x048, PVOID, KernelStack) +C_ASSERT_FIELD(KTHREAD, 0x04C, PXSAVE_FORMAT, StateSaveArea) +C_ASSERT_FIELD(KTHREAD, 0x050, PKSCHEDULING_GROUP, SchedulingGroup) +C_ASSERT_FIELD(KTHREAD, 0x054, KWAIT_STATUS_REGISTER, WaitRegister) +C_ASSERT_FIELD(KTHREAD, 0x055, UCHAR, Running) +C_ASSERT_FIELD(KTHREAD, 0x056, UCHAR[2], Alerted) +C_ASSERT_FIELD(KTHREAD, 0x058, LONG, MiscFlags) +C_ASSERT_FIELD(KTHREAD, 0x05C, LONG, ThreadFlags) +C_ASSERT_FIELD(KTHREAD, 0x060, ULONG, Spare0) +C_ASSERT_FIELD(KTHREAD, 0x064, ULONG, SystemCallNumber) +C_ASSERT_FIELD(KTHREAD, 0x068, PVOID, FirstArgument) +C_ASSERT_FIELD(KTHREAD, 0x06C, PKTRAP_FRAME, TrapFrame) +C_ASSERT_FIELD(KTHREAD, 0x070, KAPC_STATE, ApcState) +C_ASSERT_FIELD(KTHREAD, 0x087, CHAR, Priority) +C_ASSERT_FIELD(KTHREAD, 0x088, ULONG, UserIdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x08C, ULONG, ContextSwitches) +C_ASSERT_FIELD(KTHREAD, 0x090, UCHAR, State) +C_ASSERT_FIELD(KTHREAD, 0x091, CHAR, NpxState) +C_ASSERT_FIELD(KTHREAD, 0x092, UCHAR, WaitIrql) +C_ASSERT_FIELD(KTHREAD, 0x093, CHAR, WaitMode) +C_ASSERT_FIELD(KTHREAD, 0x094, LONG, WaitStatus) +C_ASSERT_FIELD(KTHREAD, 0x098, PKWAIT_BLOCK, WaitBlockList) +C_ASSERT_FIELD(KTHREAD, 0x09C, LIST_ENTRY, WaitListEntry) +C_ASSERT_FIELD(KTHREAD, 0x09C, SINGLE_LIST_ENTRY, SwapListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0A4, PKQUEUE, Queue) +C_ASSERT_FIELD(KTHREAD, 0x0A8, PVOID, Teb) +C_ASSERT_FIELD(KTHREAD, 0x0B0, UINT64, RelativeTimerBias) +C_ASSERT_FIELD(KTHREAD, 0x0B8, KTIMER, Timer) +C_ASSERT_FIELD(KTHREAD, 0x0E0, KWAIT_BLOCK[4], WaitBlock) +C_ASSERT_FIELD(KTHREAD, 0x0F4, PKTHREAD_COUNTERS, ThreadCounters) +C_ASSERT_FIELD(KTHREAD, 0x10C, PXSTATE_SAVE, XStateSave) +C_ASSERT_FIELD(KTHREAD, 0x124, PVOID, Win32Thread) +C_ASSERT_FIELD(KTHREAD, 0x138, ULONG, WaitTime) +C_ASSERT_FIELD(KTHREAD, 0x13C, SHORT, KernelApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x13E, SHORT, SpecialApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x13C, ULONG, CombinedApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x140, LIST_ENTRY, QueueListEntry) +C_ASSERT_FIELD(KTHREAD, 0x148, ULONG, NextProcessor) +C_ASSERT_FIELD(KTHREAD, 0x14C, ULONG, DeferredProcessor) +C_ASSERT_FIELD(KTHREAD, 0x150, PKPROCESS, Process) +C_ASSERT_FIELD(KTHREAD, 0x154, GROUP_AFFINITY, UserAffinity) +C_ASSERT_FIELD(KTHREAD, 0x15A, CHAR, PreviousMode) +C_ASSERT_FIELD(KTHREAD, 0x15B, CHAR, BasePriority) +C_ASSERT_FIELD(KTHREAD, 0x15C, CHAR, PriorityDecrement) +C_ASSERT_FIELD(KTHREAD, 0x15D, UCHAR, Preempted) +C_ASSERT_FIELD(KTHREAD, 0x15E, UCHAR, AdjustReason) +C_ASSERT_FIELD(KTHREAD, 0x15F, CHAR, AdjustIncrement) +C_ASSERT_FIELD(KTHREAD, 0x160, GROUP_AFFINITY, Affinity) +C_ASSERT_FIELD(KTHREAD, 0x166, UCHAR, ApcStateIndex) +C_ASSERT_FIELD(KTHREAD, 0x167, UCHAR, WaitBlockCount) +C_ASSERT_FIELD(KTHREAD, 0x168, ULONG, IdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x174, KAPC_STATE, SavedApcState) +C_ASSERT_FIELD(KTHREAD, 0x18B, UCHAR, WaitReason) +C_ASSERT_FIELD(KTHREAD, 0x18C, CHAR, SuspendCount) +C_ASSERT_FIELD(KTHREAD, 0x18D, CHAR, Saturation) +C_ASSERT_FIELD(KTHREAD, 0x18E, USHORT, SListFaultCount) +C_ASSERT_FIELD(KTHREAD, 0x190, KAPC, SchedulerApc) +C_ASSERT_FIELD(KTHREAD, 0x191, UCHAR, ResourceIndex) +C_ASSERT_FIELD(KTHREAD, 0x193, UCHAR, QuantumReset) +C_ASSERT_FIELD(KTHREAD, 0x194, ULONG, KernelTime) +C_ASSERT_FIELD(KTHREAD, 0x1B4, PKPRCB, WaitPrcb) +C_ASSERT_FIELD(KTHREAD, 0x1B8, PVOID, LegoData) +C_ASSERT_FIELD(KTHREAD, 0x1BF, UCHAR, CallbackNestingLevel) +C_ASSERT_FIELD(KTHREAD, 0x1C0, ULONG32, UserTime) +C_ASSERT_FIELD(KTHREAD, 0x1C4, KEVENT, SuspendEvent) +C_ASSERT_FIELD(KTHREAD, 0x1D4, LIST_ENTRY, ThreadListEntry) +C_ASSERT_FIELD(KTHREAD, 0x1DC, LIST_ENTRY, MutantListHead) Propchange: trunk/reactos/include/ndk/tests/win8_x86.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 70279: [NDK] Fix a typo
by tkreuzer＠svn.reactos.org 05 Dec '15

05 Dec '15

Author: tkreuzer Date: Sat Dec 5 23:14:11 2015 New Revision: 70279 URL: http://svn.reactos.org/svn/reactos?rev=70279&view=rev Log: [NDK] Fix a typo Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sat Dec 5 23:14:11 2015 @@ -1437,7 +1437,7 @@ UMSCTX_VOLATILE_CONTEXT_BIT, UMSCTX_TERMINATED_BIT, UMSCTX_DEBUG_ACTIVE_BIT, - UMSCTX_RUNNING_ON_SELF_THREAD_BIT + UMSCTX_RUNNING_ON_SELF_THREAD_BIT, UMSCTX_DENY_RUNNING_ON_SELF_THREAD_BIT } RTL_UMSCTX_FLAGS, *PRTL_UMSCTX_FLAGS;

1 0

[ekohl] 70278: [INTL] GetLocalInfo needs the number of WCHARs and not the size of the buffer. CORE-10651 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 05 Dec '15

05 Dec '15

Author: ekohl Date: Sat Dec 5 19:34:40 2015 New Revision: 70278 URL: http://svn.reactos.org/svn/reactos?rev=70278&view=rev Log: [INTL] GetLocalInfo needs the number of WCHARs and not the size of the buffer. CORE-10651 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/cpl/intl/generalp.c Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Sat Dec 5 19:34:40 2015 @@ -581,67 +581,67 @@ GetLocaleInfo(lcid, LOCALE_SDECIMAL | LOCALE_NOUSEROVERRIDE, pGlobalData->szNumDecimalSep, - MAX_NUMDECIMALSEP * sizeof(WCHAR)); + MAX_NUMDECIMALSEP); GetLocaleInfo(lcid, LOCALE_STHOUSAND | LOCALE_NOUSEROVERRIDE, pGlobalData->szNumThousandSep, - MAX_NUMTHOUSANDSEP * sizeof(WCHAR)); + MAX_NUMTHOUSANDSEP); GetLocaleInfo(lcid, LOCALE_SNEGATIVESIGN | LOCALE_NOUSEROVERRIDE, pGlobalData->szNumNegativeSign, - MAX_NUMNEGATIVESIGN * sizeof(WCHAR)); + MAX_NUMNEGATIVESIGN); GetLocaleInfo(lcid, LOCALE_SPOSITIVESIGN | LOCALE_NOUSEROVERRIDE, pGlobalData->szNumPositiveSign, - MAX_NUMPOSITIVESIGN * sizeof(WCHAR)); + MAX_NUMPOSITIVESIGN); GetLocaleInfo(lcid, LOCALE_SLIST | LOCALE_NOUSEROVERRIDE, pGlobalData->szNumListSep, - MAX_NUMLISTSEP * sizeof(WCHAR)); + MAX_NUMLISTSEP); GetLocaleInfo(lcid, LOCALE_SNATIVEDIGITS | LOCALE_NOUSEROVERRIDE, pGlobalData->szNumNativeDigits, - MAX_NUMNATIVEDIGITS * sizeof(WCHAR)); + MAX_NUMNATIVEDIGITS); GetLocaleInfo(lcid, LOCALE_INEGNUMBER | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nNumNegFormat = _wtoi(szBuffer); GetLocaleInfo(lcid, LOCALE_IDIGITS | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nNumDigits = _wtoi(szBuffer); GetLocaleInfo(lcid, LOCALE_ILZERO | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nNumLeadingZero = _wtoi(szBuffer); GetLocaleInfo(lcid, LOCALE_IMEASURE | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nNumMeasure = _wtoi(szBuffer); GetLocaleInfo(lcid, LOCALE_IDIGITSUBSTITUTION | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nNumShape = _wtoi(szBuffer); GetLocaleInfo(lcid, LOCALE_SGROUPING | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nNumGrouping = 0; if (szBuffer[0] == L'3') { @@ -656,22 +656,22 @@ GetLocaleInfo(lcid, LOCALE_SCURRENCY | LOCALE_NOUSEROVERRIDE, pGlobalData->szCurrSymbol, - MAX_CURRSYMBOL * sizeof(WCHAR)); + MAX_CURRSYMBOL); GetLocaleInfo(lcid, LOCALE_SMONDECIMALSEP | LOCALE_NOUSEROVERRIDE, pGlobalData->szCurrDecimalSep, - MAX_CURRDECIMALSEP * sizeof(WCHAR)); + MAX_CURRDECIMALSEP); GetLocaleInfo(lcid, LOCALE_SMONTHOUSANDSEP | LOCALE_NOUSEROVERRIDE, pGlobalData->szCurrThousandSep, - MAX_CURRTHOUSANDSEP * sizeof(WCHAR)); + MAX_CURRTHOUSANDSEP); GetLocaleInfo(lcid, LOCALE_SMONGROUPING | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nCurrGrouping = 0; if (szBuffer[0] == L'3') { @@ -685,115 +685,115 @@ GetLocaleInfo(lcid, LOCALE_ICURRENCY | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nCurrPosFormat = _wtoi(szBuffer); GetLocaleInfo(lcid, LOCALE_INEGCURR | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nCurrNegFormat = _wtoi(szBuffer); GetLocaleInfo(lcid, LOCALE_ICURRDIGITS | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nCurrDigits = _wtoi(szBuffer); /* Time */ GetLocaleInfo(lcid, LOCALE_STIMEFORMAT | LOCALE_NOUSEROVERRIDE, pGlobalData->szTimeFormat, - MAX_TIMEFORMAT * sizeof(WCHAR)); + MAX_TIMEFORMAT); GetLocaleInfo(lcid, LOCALE_STIME | LOCALE_NOUSEROVERRIDE, pGlobalData->szTimeSep, - MAX_TIMESEPARATOR * sizeof(WCHAR)); + MAX_TIMESEPARATOR); GetLocaleInfo(lcid, LOCALE_S1159 | LOCALE_NOUSEROVERRIDE, pGlobalData->szTimeAM, - MAX_TIMEAMSYMBOL * sizeof(WCHAR)); + MAX_TIMEAMSYMBOL); GetLocaleInfo(lcid, LOCALE_S2359 | LOCALE_NOUSEROVERRIDE, pGlobalData->szTimePM, - MAX_TIMEPMSYMBOL * sizeof(WCHAR)); + MAX_TIMEPMSYMBOL); GetLocaleInfo(lcid, LOCALE_ITIME | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nTime = _wtoi(szBuffer); GetLocaleInfo(lcid, LOCALE_ITIMEMARKPOSN | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nTimePrefix = _wtoi(szBuffer); GetLocaleInfo(lcid, LOCALE_ITLZERO | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nTimeLeadingZero = _wtoi(szBuffer); /* Date */ GetLocaleInfo(lcid, LOCALE_SLONGDATE | LOCALE_NOUSEROVERRIDE, pGlobalData->szLongDateFormat, - MAX_LONGDATEFORMAT * sizeof(WCHAR)); + MAX_LONGDATEFORMAT); GetLocaleInfo(lcid, LOCALE_SSHORTDATE | LOCALE_NOUSEROVERRIDE, pGlobalData->szShortDateFormat, - MAX_SHORTDATEFORMAT * sizeof(WCHAR)); + MAX_SHORTDATEFORMAT); GetLocaleInfo(lcid, LOCALE_SDATE | LOCALE_NOUSEROVERRIDE, pGlobalData->szDateSep, - MAX_DATESEPARATOR * sizeof(WCHAR)); + MAX_DATESEPARATOR); GetLocaleInfo(lcid, LOCALE_IFIRSTDAYOFWEEK | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nFirstDayOfWeek = _wtoi(szBuffer); GetLocaleInfo(lcid, LOCALE_IFIRSTWEEKOFYEAR | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nFirstWeekOfYear = _wtoi(szBuffer); GetLocaleInfo(lcid, LOCALE_IDATE | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nDate = _wtoi(szBuffer); GetLocaleInfo(lcid, LOCALE_ICALENDARTYPE | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nCalendarType = _wtoi(szBuffer); /* Misc */ GetLocaleInfo(lcid, LOCALE_SCOUNTRY | LOCALE_NOUSEROVERRIDE, pGlobalData->szMiscCountry, - MAX_MISCCOUNTRY * sizeof(WCHAR)); + MAX_MISCCOUNTRY); GetLocaleInfo(lcid, LOCALE_SLANGUAGE | LOCALE_NOUSEROVERRIDE, pGlobalData->szMiscLanguage, - MAX_MISCLANGUAGE * sizeof(WCHAR)); + MAX_MISCLANGUAGE); GetLocaleInfo(lcid, LOCALE_ICOUNTRY | LOCALE_NOUSEROVERRIDE, szBuffer, - 16 * sizeof(WCHAR)); + sizeof(szBuffer) / sizeof(WCHAR)); pGlobalData->nMiscCountry = _wtoi(szBuffer); }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
26
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 December 2015