Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[dchapyshev] 72488: [RTL] - Implement IS_TEXT_UNICODE_DBCS_LEADBYTE flag * Fixes 4 new tests in advapi32_apitest

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Aug 28 16:08:25 2016 New Revision: 72488 URL: http://svn.reactos.org/svn/reactos?rev=72488&view=rev Log: [RTL] - Implement IS_TEXT_UNICODE_DBCS_LEADBYTE flag * Fixes 4 new tests in advapi32_apitest Modified: trunk/reactos/sdk/lib/rtl/unicode.c Modified: trunk/reactos/sdk/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/unicode.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] Sun Aug 28 16:08:25 2016 @@ -1307,11 +1307,6 @@ } } - if (lo_byte_diff < 127 && !hi_byte_diff) - { - out_flags |= IS_TEXT_UNICODE_ASCII16; - } - if (NlsMbCodePageTag) { for (i = 0; i < len; i++) @@ -1333,7 +1328,25 @@ weight = 2; else weight = 1; - } + + if (*pf && (*pf & IS_TEXT_UNICODE_DBCS_LEADBYTE)) + out_flags |= IS_TEXT_UNICODE_DBCS_LEADBYTE; + } + } + + if (lo_byte_diff < 127 && !hi_byte_diff) + { + out_flags |= IS_TEXT_UNICODE_ASCII16; + } + + if (hi_byte_diff && !lo_byte_diff) + { + out_flags |= IS_TEXT_UNICODE_REVERSE_ASCII16; + } + + if ((weight * lo_byte_diff) < hi_byte_diff) + { + out_flags |= IS_TEXT_UNICODE_REVERSE_STATISTICS; } /* apply some statistical analysis */ @@ -1377,16 +1390,6 @@ out_flags |= IS_TEXT_UNICODE_REVERSE_CONTROLS; break; } - } - - if (hi_byte_diff && !lo_byte_diff) - { - out_flags |= IS_TEXT_UNICODE_REVERSE_ASCII16; - } - - if ((weight * lo_byte_diff) < hi_byte_diff) - { - out_flags |= IS_TEXT_UNICODE_REVERSE_STATISTICS; } }

8 years, 1 month

[dchapyshev] 72487: [ADVAPI32_APITEST] - Add tests for IS_TEXT_UNICODE_DBCS_LEADBYTE flag [SDK] - Add missed IS_TEXT_UNICODE_DBCS_LEADBYTE definition

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Aug 28 15:59:29 2016 New Revision: 72487 URL: http://svn.reactos.org/svn/reactos?rev=72487&view=rev Log: [ADVAPI32_APITEST] - Add tests for IS_TEXT_UNICODE_DBCS_LEADBYTE flag [SDK] - Add missed IS_TEXT_UNICODE_DBCS_LEADBYTE definition Modified: trunk/reactos/sdk/include/xdk/winnt_old.h trunk/rostests/apitests/advapi32/IsTextUnicode.c Modified: trunk/reactos/sdk/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/winnt_old.… ============================================================================== --- trunk/reactos/sdk/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/winnt_old.h [iso-8859-1] Sun Aug 28 15:59:29 2016 @@ -915,6 +915,7 @@ #define IS_TEXT_UNICODE_REVERSE_SIGNATURE 128 #define IS_TEXT_UNICODE_ILLEGAL_CHARS 256 #define IS_TEXT_UNICODE_ODD_LENGTH 512 +#define IS_TEXT_UNICODE_DBCS_LEADBYTE 1024 #define IS_TEXT_UNICODE_NULL_BYTES 4096 #define IS_TEXT_UNICODE_UNICODE_MASK 15 #define IS_TEXT_UNICODE_REVERSE_MASK 240 Modified: trunk/rostests/apitests/advapi32/IsTextUnicode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/IsTextU… ============================================================================== --- trunk/rostests/apitests/advapi32/IsTextUnicode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/IsTextUnicode.c [iso-8859-1] Sun Aug 28 15:59:29 2016 @@ -8,7 +8,54 @@ #include <apitest.h> #define WIN32_NO_STATUS +#include <ndk/rtlfuncs.h> #include <winbase.h> +#include <winnls.h> +#include <wincon.h> +#include <stdio.h> + +PVOID LoadCodePageData(ULONG Code) +{ + char filename[MAX_PATH], sysdir[MAX_PATH]; + HANDLE hFile; + PVOID Data = NULL; + GetSystemDirectoryA(sysdir, MAX_PATH); + + if (Code != -1) + sprintf(filename, "%s\\c_%lu.nls", sysdir, Code); + else + sprintf(filename, "%s\\l_intl.nls", sysdir); + + hFile = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + DWORD dwRead; + DWORD dwFileSize = GetFileSize(hFile, NULL); + Data = malloc(dwFileSize); + ReadFile(hFile, Data, dwFileSize, &dwRead, NULL); + CloseHandle(hFile); + } + return Data; +} + +/* https://www.microsoft.com/resources/msdn/goglobal/default.mspx */ +void SetupLocale(ULONG AnsiCode, ULONG OemCode, ULONG Unicode) +{ + NLSTABLEINFO NlsTable; + PVOID AnsiCodePageData; + PVOID OemCodePageData; + PVOID UnicodeCaseTableData; + + AnsiCodePageData = LoadCodePageData(AnsiCode); + OemCodePageData = LoadCodePageData(OemCode); + UnicodeCaseTableData = LoadCodePageData(Unicode); + + RtlInitNlsTables(AnsiCodePageData, OemCodePageData, UnicodeCaseTableData, &NlsTable); + RtlResetRtlTranslations(&NlsTable); + /* Do NOT free the buffers here, they are directly used! + Yes, we leak the old buffers, but this is a test anyway... */ + +} START_TEST(IsTextUnicode) { @@ -89,7 +136,15 @@ NEW_TEST(L"UNICODE S" L"\x0A0D" L"tring 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_ILLEGAL_CHARS, IS_TEXT_UNICODE_ILLEGAL_CHARS, FALSE), /* Unicode 0xFFFF */ NEW_TEST(L"UNICODE S" L"\xFFFF" L"tring 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_ILLEGAL_CHARS, IS_TEXT_UNICODE_ILLEGAL_CHARS, FALSE), + + // 35 + NEW_TEST(L"UNICODE String 0", IS_TEXT_UNICODE_DBCS_LEADBYTE, 0, FALSE) }; + + const char japanese_with_lead[] = "ABC" "\x83\x40" "D"; + const char simplfied_chinese_with_lead[] = "ABC" "\xC5\xC5" "D"; + const char korean_with_lead[] = "ABC" "\xBF\xAD" "D"; + const char traditional_chinese_with_lead[] = "ABC" "\xB1\xC1" "D"; UINT i; BOOL Success; @@ -103,4 +158,32 @@ if (Result != INVALID_FLAG) ok(Result == Tests[i].ResultFlags, "IsTextUnicode(%u) Result returned 0x%x, expected 0x%x\n", i, Result, Tests[i].ResultFlags); } + + /* Japanese */ + SetupLocale(932, 932, -1); + + Result = IS_TEXT_UNICODE_DBCS_LEADBYTE; + ok(!IsTextUnicode(japanese_with_lead, sizeof(japanese_with_lead), &Result), "IsTextUnicode() returned TRUE, expected FALSE\n"); + ok(Result == IS_TEXT_UNICODE_DBCS_LEADBYTE, "Result returned 0x%x, expected 0x%x\n", Result, IS_TEXT_UNICODE_DBCS_LEADBYTE); + + /* Simplified Chinese */ + SetupLocale(936, 936, -1); + + Result = IS_TEXT_UNICODE_DBCS_LEADBYTE; + ok(!IsTextUnicode(simplfied_chinese_with_lead, sizeof(simplfied_chinese_with_lead), &Result), "IsTextUnicode() returned TRUE, expected FALSE\n"); + ok(Result == IS_TEXT_UNICODE_DBCS_LEADBYTE, "Result returned 0x%x, expected 0x%x\n", Result, IS_TEXT_UNICODE_DBCS_LEADBYTE); + + /* Korean */ + SetupLocale(949, 949, -1); + + Result = IS_TEXT_UNICODE_DBCS_LEADBYTE; + ok(!IsTextUnicode(korean_with_lead, sizeof(korean_with_lead), &Result), "IsTextUnicode() returned TRUE, expected FALSE\n"); + ok(Result == IS_TEXT_UNICODE_DBCS_LEADBYTE, "Result returned 0x%x, expected 0x%x\n", Result, IS_TEXT_UNICODE_DBCS_LEADBYTE); + + /* Traditional Chinese */ + SetupLocale(950, 950, -1); + + Result = IS_TEXT_UNICODE_DBCS_LEADBYTE; + ok(!IsTextUnicode(traditional_chinese_with_lead, sizeof(traditional_chinese_with_lead), &Result), "IsTextUnicode() returned TRUE, expected FALSE\n"); + ok(Result == IS_TEXT_UNICODE_DBCS_LEADBYTE, "Result returned 0x%x, expected 0x%x\n", Result, IS_TEXT_UNICODE_DBCS_LEADBYTE); }

8 years, 1 month

[dchapyshev] 72486: [RTL] - Implement IS_TEXT_UNICODE_ILLEGAL_CHARS and IS_TEXT_UNICODE_ASCII16 flags * It fixes 7 tests for the IsTextUnicode function in advapi32_apitest. All tests passed now

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Aug 28 11:05:01 2016 New Revision: 72486 URL: http://svn.reactos.org/svn/reactos?rev=72486&view=rev Log: [RTL] - Implement IS_TEXT_UNICODE_ILLEGAL_CHARS and IS_TEXT_UNICODE_ASCII16 flags * It fixes 7 tests for the IsTextUnicode function in advapi32_apitest. All tests passed now Modified: trunk/reactos/sdk/lib/rtl/unicode.c trunk/rostests/apitests/advapi32/IsTextUnicode.c Modified: trunk/reactos/sdk/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/unicode.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] Sun Aug 28 11:05:01 2016 @@ -1295,6 +1295,21 @@ last_lo_byte = lo_byte; last_hi_byte = hi_byte; + + switch (s[i]) + { + case 0xFFFE: /* Reverse BOM */ + case UNICODE_NULL: + case 0x0A0D: /* ASCII CRLF (packed into one word) */ + case 0xFFFF: /* Unicode 0xFFFF */ + out_flags |= IS_TEXT_UNICODE_ILLEGAL_CHARS; + break; + } + } + + if (lo_byte_diff < 127 && !hi_byte_diff) + { + out_flags |= IS_TEXT_UNICODE_ASCII16; } if (NlsMbCodePageTag) Modified: trunk/rostests/apitests/advapi32/IsTextUnicode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/IsTextU… ============================================================================== --- trunk/rostests/apitests/advapi32/IsTextUnicode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/IsTextUnicode.c [iso-8859-1] Sun Aug 28 11:05:01 2016 @@ -80,7 +80,7 @@ NEW_TEST(L"\xFFFE" L"UNICODE String 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_STATISTICS, 0, FALSE), NEW_TEST(L"\xFFFE" L"UNICODE String 5 ÐÑÐ¸Ð²ÐµÑ!", INVALID_FLAG, 0, FALSE), - // 28 + // 31 /* Reverse BOM */ NEW_TEST(L"UNICODE S" L"\xFFFE" L"tring 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_ILLEGAL_CHARS, IS_TEXT_UNICODE_ILLEGAL_CHARS, FALSE), /* UNICODE_NUL */

8 years, 1 month

[tfaber] 72485: [USBHUB] - Return the correct pointer when handling TargetDeviceRelation, and avoid unnecessarily allocating from NonPagedPool. Patch by Vardan Mikayelyan, merged from r72376.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 28 10:52:40 2016 New Revision: 72485 URL: http://svn.reactos.org/svn/reactos?rev=72485&view=rev Log: [USBHUB] - Return the correct pointer when handling TargetDeviceRelation, and avoid unnecessarily allocating from NonPagedPool. Patch by Vardan Mikayelyan, merged from r72376. Modified: trunk/reactos/ (props changed) trunk/reactos/drivers/usb/usbhub/ (props changed) trunk/reactos/drivers/usb/usbhub/pdo.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 28 10:52:40 2016 @@ -1,7 +1,7 @@ /branches/GSoC_2011/GSoC_Network:51548 /branches/GSoC_2011/GSoC_TcpIpDriver:51550 /branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 -/branches/GSoC_2016/USB:72366 +/branches/GSoC_2016/USB:72366,72376 /branches/GSoC_Network:51545-51546 /branches/cmake-bringup:50484,50693,50719,51544-52564 /branches/condrv_restructure:63104-65657 Propchange: trunk/reactos/drivers/usb/usbhub/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 28 10:52:40 2016 @@ -4,7 +4,7 @@ /branches/GSoC_2011/GSoC_TcpIpDriver/drivers/usb/usbhub_new:51550 /branches/GSoC_2011/TcpIpDriver/drivers/usb/usbhub:51551-53074,53076-53119 /branches/GSoC_2011/TcpIpDriver/drivers/usb/usbhub_new:51551-53074,53076-53119 -/branches/GSoC_2016/USB/drivers/usb/usbhub:72366 +/branches/GSoC_2016/USB/drivers/usb/usbhub:72366,72376 /branches/GSoC_Network/drivers/usb/usbhub:51545-51546 /branches/GSoC_Network/drivers/usb/usbhub_new:51545-51546 /branches/cmake-bringup/drivers/usb/usbhub:50484,50693,50719,51544-52564 Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sun Aug 28 10:52:40 2016 @@ -703,7 +703,7 @@ } /* allocate device relations */ - DeviceRelation = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS)); + DeviceRelation = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS)); if (!DeviceRelation) { /* no memory */ @@ -717,7 +717,7 @@ ObReferenceObject(DeviceRelation->Objects[0]); /* store result */ - Irp->IoStatus.Information = (ULONG_PTR)DeviceRelation; + Information = (ULONG_PTR)DeviceRelation; Status = STATUS_SUCCESS; break; }

8 years, 1 month

[dchapyshev] 72484: [ADVAPI32_APITEST] - Add tests for IS_TEXT_UNICODE_ILLEGAL_CHARS flag (not passed on ReactOS)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Aug 28 10:42:32 2016 New Revision: 72484 URL: http://svn.reactos.org/svn/reactos?rev=72484&view=rev Log: [ADVAPI32_APITEST] - Add tests for IS_TEXT_UNICODE_ILLEGAL_CHARS flag (not passed on ReactOS) Modified: trunk/rostests/apitests/advapi32/IsTextUnicode.c Modified: trunk/rostests/apitests/advapi32/IsTextUnicode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/IsTextU… ============================================================================== --- trunk/rostests/apitests/advapi32/IsTextUnicode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/IsTextUnicode.c [iso-8859-1] Sun Aug 28 10:42:32 2016 @@ -79,6 +79,16 @@ NEW_TEST(L"\xFFFE" L"UNICODE String 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_CONTROLS, TRUE), NEW_TEST(L"\xFFFE" L"UNICODE String 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_STATISTICS, 0, FALSE), NEW_TEST(L"\xFFFE" L"UNICODE String 5 ÐÑÐ¸Ð²ÐµÑ!", INVALID_FLAG, 0, FALSE), + + // 28 + /* Reverse BOM */ + NEW_TEST(L"UNICODE S" L"\xFFFE" L"tring 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_ILLEGAL_CHARS, IS_TEXT_UNICODE_ILLEGAL_CHARS, FALSE), + /* UNICODE_NUL */ + NEW_TEST(L"UNICODE S" L"\x0000" L"tring 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_ILLEGAL_CHARS, IS_TEXT_UNICODE_ILLEGAL_CHARS, FALSE), + /* ASCII CRLF (packed into one word) */ + NEW_TEST(L"UNICODE S" L"\x0A0D" L"tring 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_ILLEGAL_CHARS, IS_TEXT_UNICODE_ILLEGAL_CHARS, FALSE), + /* Unicode 0xFFFF */ + NEW_TEST(L"UNICODE S" L"\xFFFF" L"tring 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_ILLEGAL_CHARS, IS_TEXT_UNICODE_ILLEGAL_CHARS, FALSE), }; UINT i;

8 years, 1 month

[jgardou] 72483: [NTOS/MM] - NtQuerySection : Add initial support for ARM3 sections

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Aug 28 09:38:54 2016 New Revision: 72483 URL: http://svn.reactos.org/svn/reactos?rev=72483&view=rev Log: [NTOS/MM] - NtQuerySection : Add initial support for ARM3 sections Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Aug 28 09:38:54 2016 @@ -4299,7 +4299,7 @@ _In_ SIZE_T SectionInformationLength, _Out_opt_ PSIZE_T ResultLength) { - PROS_SECTION_OBJECT Section; + PSECTION Section; KPROCESSOR_MODE PreviousMode; NTSTATUS Status; PAGED_CODE(); @@ -4357,68 +4357,126 @@ return Status; } - switch (SectionInformationClass) - { - case SectionBasicInformation: - { - PSECTION_BASIC_INFORMATION Sbi = (PSECTION_BASIC_INFORMATION)SectionInformation; - - _SEH2_TRY + if (MiIsRosSectionObject(Section)) + { + PROS_SECTION_OBJECT RosSection = (PROS_SECTION_OBJECT)Section; + + switch (SectionInformationClass) + { + case SectionBasicInformation: { - Sbi->Attributes = Section->AllocationAttributes; - if (Section->AllocationAttributes & SEC_IMAGE) + PSECTION_BASIC_INFORMATION Sbi = (PSECTION_BASIC_INFORMATION)SectionInformation; + + _SEH2_TRY { - Sbi->BaseAddress = 0; - Sbi->Size.QuadPart = 0; + Sbi->Attributes = RosSection->AllocationAttributes; + if (RosSection->AllocationAttributes & SEC_IMAGE) + { + Sbi->BaseAddress = 0; + Sbi->Size.QuadPart = 0; + } + else + { + Sbi->BaseAddress = (PVOID)RosSection->Segment->Image.VirtualAddress; + Sbi->Size.QuadPart = RosSection->Segment->Length.QuadPart; + } + + if (ResultLength != NULL) + { + *ResultLength = sizeof(SECTION_BASIC_INFORMATION); + } + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + break; + } + + case SectionImageInformation: + { + PSECTION_IMAGE_INFORMATION Sii = (PSECTION_IMAGE_INFORMATION)SectionInformation; + + _SEH2_TRY + { + if (RosSection->AllocationAttributes & SEC_IMAGE) + { + PMM_IMAGE_SECTION_OBJECT ImageSectionObject; + ImageSectionObject = RosSection->ImageSection; + + *Sii = ImageSectionObject->ImageInformation; + } + + if (ResultLength != NULL) + { + *ResultLength = sizeof(SECTION_IMAGE_INFORMATION); + } + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + break; + } + } + } + else + { + switch(SectionInformationClass) + { + case SectionBasicInformation: + { + SECTION_BASIC_INFORMATION Sbi; + + Sbi.Size = Section->SizeOfSection; + Sbi.BaseAddress = (PVOID)Section->Address.StartingVpn; + + Sbi.Attributes = 0; + if (Section->u.Flags.Image) + Sbi.Attributes |= SEC_IMAGE; + if (Section->u.Flags.Commit) + Sbi.Attributes |= SEC_COMMIT; + if (Section->u.Flags.Reserve) + Sbi.Attributes |= SEC_RESERVE; + if (Section->u.Flags.File) + Sbi.Attributes |= SEC_FILE; + if (Section->u.Flags.Image) + Sbi.Attributes |= SEC_IMAGE; + + /* FIXME : Complete/test the list of flags passed back from NtCreateSection */ + + _SEH2_TRY + { + *((SECTION_BASIC_INFORMATION*)SectionInformation) = Sbi; + if (ResultLength) + *ResultLength = sizeof(Sbi); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + break; + } + case SectionImageInformation: + { + if (!Section->u.Flags.Image) + { + Status = STATUS_SECTION_NOT_IMAGE; } else { - Sbi->BaseAddress = (PVOID)Section->Segment->Image.VirtualAddress; - Sbi->Size.QuadPart = Section->Segment->Length.QuadPart; + /* Currently not supported */ + ASSERT(FALSE); } - - if (ResultLength != NULL) - { - *ResultLength = sizeof(SECTION_BASIC_INFORMATION); - } - Status = STATUS_SUCCESS; + break; } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - break; - } - - case SectionImageInformation: - { - PSECTION_IMAGE_INFORMATION Sii = (PSECTION_IMAGE_INFORMATION)SectionInformation; - - _SEH2_TRY - { - if (Section->AllocationAttributes & SEC_IMAGE) - { - PMM_IMAGE_SECTION_OBJECT ImageSectionObject; - ImageSectionObject = Section->ImageSection; - - *Sii = ImageSectionObject->ImageInformation; - } - - if (ResultLength != NULL) - { - *ResultLength = sizeof(SECTION_IMAGE_INFORMATION); - } - Status = STATUS_SUCCESS; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - break; } }

8 years, 1 month

[tfaber] 72482: [NTOS:MM] - Improve a debug print

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 28 08:17:03 2016 New Revision: 72482 URL: http://svn.reactos.org/svn/reactos?rev=72482&view=rev Log: [NTOS:MM] - Improve a debug print Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sun Aug 28 08:17:03 2016 @@ -765,7 +765,7 @@ /* There should not be anything valid here */ if (Pte != 0) { - DPRINT1("Bad PTE %lx\n", Pte); + DPRINT1("Bad PTE %lx at %p for %p + %lu\n", Pte, Pt, Address, i); KeBugCheck(MEMORY_MANAGEMENT); }

8 years, 1 month

[aandrejevic] 72481: [NTVDM:BIOS] Properly implement INT 15h, AH = 86h.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Aug 28 02:00:10 2016 New Revision: 72481 URL: http://svn.reactos.org/svn/reactos?rev=72481&view=rev Log: [NTVDM:BIOS] Properly implement INT 15h, AH = 86h. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun Aug 28 02:00:10 2016 @@ -327,14 +327,31 @@ * See Ralf Brown: http://www.ctyme.com/intr/rb-1525.htm * for more information. */ - LARGE_INTEGER TimeOut; - TimeOut.QuadPart = MAKELONG(getDX(), getCX()) * -10LL; - - // HACK: For now, use the NT API (time in hundreds of nanoseconds). - NtDelayExecution(FALSE, &TimeOut); - - /* Clear CF */ - Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + + static ULONG CompletionTime = 0; + + /* Check if we're already looping */ + if (getCF()) + { + if (GetTickCount() >= CompletionTime) + { + /* Stop looping */ + setCF(0); + + /* Clear the CF on the stack too */ + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + } + } + else + { + /* Set the CF on the stack */ + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + + /* Set the completion time and start looping */ + CompletionTime = GetTickCount() + (MAKELONG(getDX(), getCX()) / 1000); + setCF(1); + } + break; }

8 years, 1 month

[aandrejevic] 72480: [NTVDM:SVGA] Fix the refresh rate calculation.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Aug 28 01:53:52 2016 New Revision: 72480 URL: http://svn.reactos.org/svn/reactos?rev=72480&view=rev Log: [NTVDM:SVGA] Fix the refresh rate calculation. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sun Aug 28 01:53:52 2016 @@ -1628,10 +1628,14 @@ ULONG ElapsedCycles = CurrentCycleCount - HorizontalRetraceCycle; ULONG Dots = (VgaSeqRegisters[VGA_SEQ_CLOCK_REG] & 1) ? 9 : 8; ULONG HorizTotalDots = ((ULONG)VgaCrtcRegisters[VGA_CRTC_HORZ_TOTAL_REG] + 5) * Dots; - ULONG HSyncsPerSecond = VgaGetClockFrequency() / HorizTotalDots; - ULONG HSyncs = (ElapsedCycles * HSyncsPerSecond + (CurrentIps >> 1)) / CurrentIps; - + BYTE MaximumScanLine = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); + ULONG HSyncsPerSecond, HSyncs; UNREFERENCED_PARAMETER(ElapsedTime); + + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) HorizTotalDots >>= 1; + + HSyncsPerSecond = VgaGetClockFrequency() / HorizTotalDots; + HSyncs = (ElapsedCycles * HSyncsPerSecond + (CurrentIps >> 1)) / CurrentIps; if (HSyncs == 0) HSyncs = 1; VerticalTotal |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VT8) << 8; @@ -1639,6 +1643,17 @@ VerticalRetraceStart |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VRS8) << 6; VerticalRetraceStart |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VRS9) << 2; + + if (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & VGA_CRTC_MAXSCANLINE_DOUBLE) + { + VerticalRetraceStart <<= 1; + VerticalTotal <<= 1; + } + else + { + VerticalRetraceStart *= MaximumScanLine; + VerticalTotal *= MaximumScanLine; + } /* Set the cycle */ HorizontalRetraceCycle = CurrentCycleCount;

8 years, 1 month

[aandrejevic] 72479: [NTVDM:SVGA] Fix read mode 1.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Aug 27 23:40:44 2016 New Revision: 72479 URL: http://svn.reactos.org/svn/reactos?rev=72479&view=rev Log: [NTVDM:SVGA] Fix read mode 1. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sat Aug 27 23:40:44 2016 @@ -1814,33 +1814,33 @@ } else { - const ULONG BitExpandTable[] = - { - 0x00000000, 0x000000FF, 0x0000FF00, 0x0000FFFF, - 0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x00FFFFFF, - 0xFF000000, 0xFF0000FF, 0xFF00FF00, 0xFF00FFFF, - 0xFFFF0000, 0xFFFF00FF, 0xFFFFFF00, 0xFFFFFFFF + const ULONG BitExpandInvertTable[] = + { + 0xFFFFFFFF, 0xFFFFFF00, 0xFFFF00FF, 0xFFFF0000, + 0xFF00FFFF, 0xFF00FF00, 0xFF0000FF, 0xFF000000, + 0x00FFFFFF, 0x00FFFF00, 0x00FF00FF, 0x00FF0000, + 0x0000FFFF, 0x0000FF00, 0x000000FF, 0x00000000 }; - ULONG ColorCompareBytes = BitExpandTable[VgaGcRegisters[VGA_GC_COLOR_COMPARE_REG] & 0x0F]; - ULONG ColorIgnoreBytes = BitExpandTable[VgaGcRegisters[VGA_GC_COLOR_IGNORE_REG] & 0x0F]; + ULONG ColorCompareBytes = BitExpandInvertTable[VgaGcRegisters[VGA_GC_COLOR_COMPARE_REG] & 0x0F]; + ULONG ColorIgnoreBytes = BitExpandInvertTable[VgaGcRegisters[VGA_GC_COLOR_IGNORE_REG] & 0x0F]; /* * These values can also be computed in the following way, but using the table seems to be faster: * * ColorCompareBytes = VgaGcRegisters[VGA_GC_COLOR_COMPARE_REG] * 0x000204081; * ColorCompareBytes &= 0x01010101; - * ColorCompareBytes = (ColorCompareBytes << 8) - ColorCompareBytes; + * ColorCompareBytes = ~((ColorCompareBytes << 8) - ColorCompareBytes); * * ColorIgnoreBytes = VgaGcRegisters[VGA_GC_COLOR_IGNORE_REG] * 0x000204081; * ColorIgnoreBytes &= 0x01010101; - * ColorIgnoreBytes = (ColorIgnoreBytes << 8) - ColorIgnoreBytes; + * ColorIgnoreBytes = ~((ColorIgnoreBytes << 8) - ColorIgnoreBytes); */ /* Loop through each byte */ for (i = 0; i < Size; i++) { - ULONG PlaneData; + ULONG PlaneData = 0; /* This should always return a plane 0 address */ VideoAddress = VgaTranslateAddress(Address + i); @@ -1849,13 +1849,13 @@ PlaneData = *(PULONG)&VgaMemory[VideoAddress * VGA_NUM_BANKS]; /* Reverse the bytes for which the color compare register is zero */ - PlaneData ^= ~ColorCompareBytes; + PlaneData ^= ColorCompareBytes; /* Apply the color ignore register */ PlaneData |= ColorIgnoreBytes; /* Store the value in the buffer */ - BufPtr[i] = (PlaneData | (PlaneData >> 8) | (PlaneData >> 16) | (PlaneData >> 24)) & 0xFF; + BufPtr[i] = (PlaneData & (PlaneData >> 8) & (PlaneData >> 16) & (PlaneData >> 24)) & 0xFF; } }

8 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2016