Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 72492: [NTOS:EX] - Remove duplicate checks
by dchapyshev＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: dchapyshev Date: Sun Aug 28 19:28:41 2016 New Revision: 72492 URL: http://svn.reactos.org/svn/reactos?rev=72492&view=rev Log: [NTOS:EX] - Remove duplicate checks Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Aug 28 19:28:41 2016 @@ -1192,8 +1192,6 @@ { NumberOfHandles += ObGetProcessHandleCount(Process); Process = PsGetNextProcess(Process); - - if ((Process == SystemProcess) || (Process == NULL)) break; } while ((Process != SystemProcess) && (Process != NULL)); @@ -1263,8 +1261,6 @@ KeLeaveCriticalRegion(); Process = PsGetNextProcess(Process); - - if ((Process == SystemProcess) || (Process == NULL)) break; } while ((Process != SystemProcess) && (Process != NULL));

1 0

[dchapyshev] 72491: [NTOS] - Use ExpLookupHandleTableEntry function for enumerate handles of process - Filling handle information - Setting ReqSize value before check of the size * Fixes 2 tests nt...
by dchapyshev＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: dchapyshev Date: Sun Aug 28 19:18:28 2016 New Revision: 72491 URL: http://svn.reactos.org/svn/reactos?rev=72491&view=rev Log: [NTOS] - Use ExpLookupHandleTableEntry function for enumerate handles of process - Filling handle information - Setting ReqSize value before check of the size * Fixes 2 tests ntdll_winetest info Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Aug 28 19:18:28 2016 @@ -1167,11 +1167,13 @@ /* Class 16 - Handle Information */ QSI_DEF(SystemHandleInformation) { - PEPROCESS pr, syspr; - ULONG curSize, i = 0; - ULONG hCount = 0; - - PSYSTEM_HANDLE_INFORMATION Shi = + PEPROCESS Process; + PEPROCESS SystemProcess; + ULONG CurrentSize; + ULONG NumberOfHandles = 0; + ULONG Index; + + PSYSTEM_HANDLE_INFORMATION HandleInformation = (PSYSTEM_HANDLE_INFORMATION) Buffer; DPRINT("NtQuerySystemInformation - SystemHandleInformation\n"); @@ -1182,68 +1184,92 @@ return STATUS_INFO_LENGTH_MISMATCH; } - DPRINT("SystemHandleInformation 1\n"); - /* First Calc Size from Count. */ - syspr = PsGetNextProcess(NULL); - pr = syspr; + SystemProcess = PsGetNextProcess(NULL); + Process = SystemProcess; do { - hCount = hCount + ObGetProcessHandleCount(pr); - pr = PsGetNextProcess(pr); - - if ((pr == syspr) || (pr == NULL)) break; - } - while ((pr != syspr) && (pr != NULL)); - - if(pr != NULL) - { - ObDereferenceObject(pr); - } - - DPRINT("SystemHandleInformation 2\n"); - - curSize = sizeof(SYSTEM_HANDLE_INFORMATION) + - ((sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) * hCount) - - (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO))); - - Shi->NumberOfHandles = hCount; - - if (curSize > Size) - { - *ReqSize = curSize; - return (STATUS_INFO_LENGTH_MISMATCH); - } - - DPRINT("SystemHandleInformation 3\n"); + NumberOfHandles += ObGetProcessHandleCount(Process); + Process = PsGetNextProcess(Process); + + if ((Process == SystemProcess) || (Process == NULL)) break; + } + while ((Process != SystemProcess) && (Process != NULL)); + + if (Process != NULL) ObDereferenceObject(Process); + + CurrentSize = sizeof(SYSTEM_HANDLE_INFORMATION) + + ((sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) * NumberOfHandles) - + (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO))); + + HandleInformation->NumberOfHandles = NumberOfHandles; + + *ReqSize = CurrentSize; + + if (CurrentSize > Size) return STATUS_INFO_LENGTH_MISMATCH; /* Now get Handles from all processes. */ - syspr = PsGetNextProcess(NULL); - pr = syspr; + SystemProcess = PsGetNextProcess(NULL); + Process = SystemProcess; + + Index = 0; do { - int Count = 0, HandleCount; - - HandleCount = ObGetProcessHandleCount(pr); - - for (Count = 0; HandleCount > 0 ; HandleCount--) - { - Shi->Handles[i].UniqueProcessId = (USHORT)(ULONG_PTR)pr->UniqueProcessId; - Count++; - i++; - } - - pr = PsGetNextProcess(pr); - - if ((pr == syspr) || (pr == NULL)) break; - } - while ((pr != syspr) && (pr != NULL)); - - if(pr != NULL) ObDereferenceObject(pr); - - DPRINT("SystemHandleInformation 4\n"); + PHANDLE_TABLE_ENTRY HandleTableEntry; + EXHANDLE Handle; + + /* Enter a critical region */ + KeEnterCriticalRegion(); + + /* Set the initial value and loop the entries */ + Handle.Value = 0; + while ((HandleTableEntry = ExpLookupHandleTableEntry(Process->ObjectTable, Handle))) + { + /* Validate the entry */ + if ((HandleTableEntry) && + (HandleTableEntry->Object) && + (HandleTableEntry->NextFreeTableEntry != -2)) + { + /* Lock the entry */ + if (ExpLockHandleTableEntry(Process->ObjectTable, HandleTableEntry)) + { + POBJECT_HEADER ObjectHeader; + + ObjectHeader = (POBJECT_HEADER)(((ULONG_PTR) HandleTableEntry->Object) & ~OBJ_HANDLE_ATTRIBUTES); + + /* Filling handle information */ + HandleInformation->Handles[Index].UniqueProcessId = (USHORT)(ULONG_PTR) Process->UniqueProcessId; + HandleInformation->Handles[Index].CreatorBackTraceIndex = 0; + HandleInformation->Handles[Index].ObjectTypeIndex = (UCHAR) ObjectHeader->Type->Index; + HandleInformation->Handles[Index].HandleAttributes = HandleTableEntry->ObAttributes & OBJ_HANDLE_ATTRIBUTES; + HandleInformation->Handles[Index].HandleValue = (USHORT)(ULONG_PTR) Handle.GenericHandleOverlay; + HandleInformation->Handles[Index].Object = &ObjectHeader->Body; + HandleInformation->Handles[Index].GrantedAccess = HandleTableEntry->GrantedAccess; + + /* Unlock it */ + ExUnlockHandleTableEntry(Process->ObjectTable, HandleTableEntry); + + ++Index; + } + } + + /* Go to the next entry */ + Handle.Value += sizeof(HANDLE); + } + + /* Leave the critical region and return callback result */ + KeLeaveCriticalRegion(); + + Process = PsGetNextProcess(Process); + + if ((Process == SystemProcess) || (Process == NULL)) break; + } + while ((Process != SystemProcess) && (Process != NULL)); + + if (Process != NULL) ObDereferenceObject(Process); + return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Sun Aug 28 19:18:28 2016 @@ -466,6 +466,20 @@ IN PVOID Context ); +PHANDLE_TABLE_ENTRY +NTAPI +ExpLookupHandleTableEntry( + IN PHANDLE_TABLE HandleTable, + IN EXHANDLE Handle +); + +BOOLEAN +NTAPI +ExpLockHandleTableEntry( + IN PHANDLE_TABLE HandleTable, + IN PHANDLE_TABLE_ENTRY HandleTableEntry +); + /* PSEH EXCEPTION HANDLING **************************************************/ LONG

1 0

[tfaber] 72490: [NTOS:MM] - Add MmSysPteIndex, MmSysPteTables and MmSysPteListBySizeCount to make WinDbg's !sysptes extension happy
by tfaber＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: tfaber Date: Sun Aug 28 18:03:41 2016 New Revision: 72490 URL: http://svn.reactos.org/svn/reactos?rev=72490&view=rev Log: [NTOS:MM] - Add MmSysPteIndex, MmSysPteTables and MmSysPteListBySizeCount to make WinDbg's !sysptes extension happy Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Sun Aug 28 18:03:41 2016 @@ -25,6 +25,15 @@ ULONG MmTotalFreeSystemPtes[MaximumPtePoolTypes]; ULONG MmTotalSystemPtes; ULONG MiNumberOfExtraSystemPdes; +const ULONG MmSysPteIndex[5] = { 1, 2, 4, 8, 16 }; +const UCHAR MmSysPteTables[] = { 0, // 1 + 0, // 1 + 1, // 2 + 2, 2, // 4 + 3, 3, 3, 3, // 8 + 4, 4, 4, 4, 4, 4, 4, 4 // 16 + }; +LONG MmSysPteListBySizeCount[5]; /* PRIVATE FUNCTIONS **********************************************************/

1 0

[aandrejevic] 72489: [NTVDM:SVGA] Fix the refresh rate calculation, again.
by aandrejevic＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: aandrejevic Date: Sun Aug 28 16:17:14 2016 New Revision: 72489 URL: http://svn.reactos.org/svn/reactos?rev=72489&view=rev Log: [NTVDM:SVGA] Fix the refresh rate calculation, again. 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 16:17:14 2016 @@ -1118,6 +1118,22 @@ VerticalRetraceEnd = VerticalRetraceStart + (VgaCrtcRegisters[VGA_CRTC_END_VERT_RETRACE_REG] & 0x0F); + if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) + { + BYTE MaximumScanLine = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); + + if (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & VGA_CRTC_MAXSCANLINE_DOUBLE) + { + VerticalRetraceStart <<= 1; + VerticalRetraceEnd <<= 1; + } + else + { + VerticalRetraceStart *= MaximumScanLine; + VerticalRetraceEnd *= MaximumScanLine; + } + } + /* Calculate the horizontal blanking duration in cycles */ HblankStart = VgaCrtcRegisters[VGA_CRTC_START_HORZ_BLANKING_REG] & 0x1F; HblankEnd = VgaCrtcRegisters[VGA_CRTC_END_HORZ_BLANKING_REG] & 0x1F; @@ -1644,15 +1660,18 @@ 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; + if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) + { + if (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & VGA_CRTC_MAXSCANLINE_DOUBLE) + { + VerticalRetraceStart <<= 1; + VerticalTotal <<= 1; + } + else + { + VerticalRetraceStart *= MaximumScanLine; + VerticalTotal *= MaximumScanLine; + } } /* Set the cycle */

1 0

[dchapyshev] 72488: [RTL] - Implement IS_TEXT_UNICODE_DBCS_LEADBYTE flag * Fixes 4 new tests in advapi32_apitest
by dchapyshev＠svn.reactos.org 28 Aug '16

28 Aug '16

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; } }

1 0

[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 28 Aug '16

28 Aug '16

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); }

1 0

[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 28 Aug '16

28 Aug '16

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 */

1 0

[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 28 Aug '16

28 Aug '16

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; }

1 0

[dchapyshev] 72484: [ADVAPI32_APITEST] - Add tests for IS_TEXT_UNICODE_ILLEGAL_CHARS flag (not passed on ReactOS)
by dchapyshev＠svn.reactos.org 28 Aug '16

28 Aug '16

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;

1 0

[jgardou] 72483: [NTOS/MM] - NtQuerySection : Add initial support for ARM3 sections
by jgardou＠svn.reactos.org 28 Aug '16

28 Aug '16

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; } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs