Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 67951: [USETUP] - Fix indenttation fof comments. - Replace SectorsPerTrack by SectorAlignment in partition size and location calculations.
by ekohl＠svn.reactos.org 29 May '15

29 May '15

Author: ekohl Date: Fri May 29 14:06:01 2015 New Revision: 67951 URL: http://svn.reactos.org/svn/reactos?rev=67951&view=rev Log: [USETUP] - Fix indenttation fof comments. - Replace SectorsPerTrack by SectorAlignment in partition size and location calculations. Modified: trunk/reactos/base/setup/usetup/partlist.c 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] Fri May 29 14:06:01 2015 @@ -656,12 +656,13 @@ NewPartEntry->DiskEntry = DiskEntry; NewPartEntry->IsPartitioned = FALSE; - NewPartEntry->StartSector.QuadPart = (ULONGLONG)DiskEntry->SectorsPerTrack; + NewPartEntry->StartSector.QuadPart = (ULONGLONG)DiskEntry->SectorAlignment; NewPartEntry->SectorCount.QuadPart = Align(DiskEntry->SectorCount.QuadPart, DiskEntry->SectorAlignment) - - DiskEntry->SectorsPerTrack; -DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); -DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); -DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + NewPartEntry->StartSector.QuadPart; + + DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); NewPartEntry->FormatState = Unformatted; @@ -672,7 +673,7 @@ } /* Start partition at head 1, cylinder 0 */ - LastStartSector = DiskEntry->SectorsPerTrack; + LastStartSector = DiskEntry->SectorAlignment; LastSectorCount = 0ULL; LastUnusedSectorCount = 0ULL; @@ -704,9 +705,10 @@ NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; -DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); -DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); -DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + + DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); NewPartEntry->FormatState = Unformatted; @@ -743,6 +745,7 @@ NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; + DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); DPRINT("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); @@ -772,8 +775,8 @@ NewPartEntry->LogicalPartition = TRUE; NewPartEntry->IsPartitioned = FALSE; - NewPartEntry->StartSector.QuadPart = DiskEntry->ExtendedPartition->StartSector.QuadPart + (ULONGLONG)DiskEntry->SectorsPerTrack; - NewPartEntry->SectorCount.QuadPart = DiskEntry->ExtendedPartition->SectorCount.QuadPart - (ULONGLONG)DiskEntry->SectorsPerTrack; + NewPartEntry->StartSector.QuadPart = DiskEntry->ExtendedPartition->StartSector.QuadPart + (ULONGLONG)DiskEntry->SectorAlignment; + NewPartEntry->SectorCount.QuadPart = DiskEntry->ExtendedPartition->SectorCount.QuadPart - (ULONGLONG)DiskEntry->SectorAlignment; DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); @@ -788,7 +791,7 @@ } /* Start partition at head 1, cylinder 0 */ - LastStartSector = DiskEntry->ExtendedPartition->StartSector.QuadPart + (ULONGLONG)DiskEntry->SectorsPerTrack; + LastStartSector = DiskEntry->ExtendedPartition->StartSector.QuadPart + (ULONGLONG)DiskEntry->SectorAlignment; LastSectorCount = 0ULL; LastUnusedSectorCount = 0ULL; @@ -801,9 +804,9 @@ PartEntry->SectorCount.QuadPart != 0ULL) { LastUnusedSectorCount = - PartEntry->StartSector.QuadPart - (ULONGLONG)DiskEntry->SectorsPerTrack - (LastStartSector + LastSectorCount); - - if ((PartEntry->StartSector.QuadPart - (ULONGLONG)DiskEntry->SectorsPerTrack) > (LastStartSector + LastSectorCount) && + PartEntry->StartSector.QuadPart - (ULONGLONG)DiskEntry->SectorAlignment - (LastStartSector + LastSectorCount); + + if ((PartEntry->StartSector.QuadPart - (ULONGLONG)DiskEntry->SectorAlignment) > (LastStartSector + LastSectorCount) && LastUnusedSectorCount >= (ULONGLONG)DiskEntry->SectorAlignment) { DPRINT("Unpartitioned disk space %I64u sectors\n", LastUnusedSectorCount); @@ -821,6 +824,7 @@ NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; + DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); DPRINT("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); @@ -861,6 +865,7 @@ NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; + DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); DPRINT("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); @@ -2247,7 +2252,7 @@ ULONG Index = 0; ULONG PartitionNumber = 1; -DPRINT1("UpdateDiskLayout()\n"); + DPRINT1("UpdateDiskLayout()\n"); ListEntry = DiskEntry->PrimaryPartListHead.Flink; while (ListEntry != &DiskEntry->PrimaryPartListHead) @@ -2260,7 +2265,8 @@ if (!IsSamePrimaryLayoutEntry(PartitionInfo, DiskEntry, PartEntry)) { -DPRINT1("Updating partition entry %lu\n", Index); + DPRINT1("Updating partition entry %lu\n", Index); + PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; PartitionInfo->HiddenSectors = 0; @@ -2292,7 +2298,8 @@ if (!IsEmptyLayoutEntry(PartitionInfo)) { -DPRINT1("Wiping partition entry %lu\n", Index); + DPRINT1("Wiping partition entry %lu\n", Index); + PartitionInfo->StartingOffset.QuadPart = 0; PartitionInfo->PartitionLength.QuadPart = 0; PartitionInfo->HiddenSectors = 0; @@ -2375,12 +2382,13 @@ DiskEntry = List->CurrentDisk; PartEntry = List->CurrentPartition; -DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); + DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); if (AutoCreate == TRUE || Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) { -DPRINT1("Convert existing partition entry\n"); + DPRINT1("Convert existing partition entry\n"); + /* Convert current entry to 'new (unformatted)' */ PartEntry->IsPartitioned = TRUE; PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; @@ -2389,13 +2397,13 @@ PartEntry->New = TRUE; PartEntry->BootIndicator = FALSE; -DPRINT1("First Sector: %I64u\n", PartEntry->StartSector.QuadPart); -DPRINT1("Last Sector: %I64u\n", PartEntry->StartSector.QuadPart + PartEntry->SectorCount.QuadPart - 1); -DPRINT1("Total Sectors: %I64u\n", PartEntry->SectorCount.QuadPart); + DPRINT1("First Sector: %I64u\n", PartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", PartEntry->StartSector.QuadPart + PartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", PartEntry->SectorCount.QuadPart); } else { -DPRINT1("Add new partition entry\n"); + DPRINT1("Add new partition entry\n"); /* Insert and initialize a new partition entry */ NewPartEntry = RtlAllocateHeap(ProcessHeap, @@ -2416,9 +2424,9 @@ NewPartEntry->StartSector.QuadPart; NewPartEntry->PartitionType = PARTITION_ENTRY_UNUSED; -DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); -DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); -DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); NewPartEntry->New = TRUE; NewPartEntry->FormatState = Unformatted; @@ -2458,8 +2466,8 @@ NewPartEntry->LogicalPartition = TRUE; NewPartEntry->IsPartitioned = FALSE; - NewPartEntry->StartSector.QuadPart = DiskEntry->ExtendedPartition->StartSector.QuadPart + (ULONGLONG)DiskEntry->SectorsPerTrack; - NewPartEntry->SectorCount.QuadPart = DiskEntry->ExtendedPartition->SectorCount.QuadPart - (ULONGLONG)DiskEntry->SectorsPerTrack; + NewPartEntry->StartSector.QuadPart = DiskEntry->ExtendedPartition->StartSector.QuadPart + (ULONGLONG)DiskEntry->SectorAlignment; + NewPartEntry->SectorCount.QuadPart = DiskEntry->ExtendedPartition->SectorCount.QuadPart - (ULONGLONG)DiskEntry->SectorAlignment; DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); @@ -2494,11 +2502,12 @@ DiskEntry = List->CurrentDisk; PartEntry = List->CurrentPartition; -DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); + DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); if (Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) { -DPRINT1("Convert existing partition entry\n"); + DPRINT1("Convert existing partition entry\n"); + /* Convert current entry to 'new (unformatted)' */ PartEntry->IsPartitioned = TRUE; PartEntry->FormatState = Formatted; @@ -2519,13 +2528,13 @@ DiskEntry->ExtendedPartition = PartEntry; -DPRINT1("First Sector: %I64u\n", PartEntry->StartSector.QuadPart); -DPRINT1("Last Sector: %I64u\n", PartEntry->StartSector.QuadPart + PartEntry->SectorCount.QuadPart - 1); -DPRINT1("Total Sectors: %I64u\n", PartEntry->SectorCount.QuadPart); + DPRINT1("First Sector: %I64u\n", PartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", PartEntry->StartSector.QuadPart + PartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", PartEntry->SectorCount.QuadPart); } else { -DPRINT1("Add new partition entry\n"); + DPRINT1("Add new partition entry\n"); /* Insert and initialize a new partition entry */ NewPartEntry = RtlAllocateHeap(ProcessHeap, @@ -2565,9 +2574,9 @@ PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart; PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart - NewPartEntry->StartSector.QuadPart); -DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); -DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); -DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); } AddLogicalDiskSpace(DiskEntry);

1 0

[ekohl] 67950: [USETUP] Update prototypes.
by ekohl＠svn.reactos.org 29 May '15

29 May '15

Author: ekohl Date: Fri May 29 11:44:34 2015 New Revision: 67950 URL: http://svn.reactos.org/svn/reactos?rev=67950&view=rev Log: [USETUP] Update prototypes. Modified: trunk/reactos/base/setup/usetup/partlist.h 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] Fri May 29 11:44:34 2015 @@ -222,18 +222,18 @@ VOID CreatePrimaryPartition( PPARTLIST List, - ULONGLONG PartitionSize, + ULONGLONG SectorCount, BOOLEAN AutoCreate); VOID CreateExtendedPartition( PPARTLIST List, - ULONGLONG PartitionSize); + ULONGLONG SectorCount); VOID CreateLogicalPartition( PPARTLIST List, - ULONGLONG PartitionSize); + ULONGLONG SectorCount); VOID DeleteCurrentPartition(

1 0

[akhaldi] 67949: [WIN32K] Update FTVectorToPOINTFX to reduce diff to Wine.
by akhaldi＠svn.reactos.org 29 May '15

29 May '15

Author: akhaldi Date: Fri May 29 11:21:31 2015 New Revision: 67949 URL: http://svn.reactos.org/svn/reactos?rev=67949&view=rev Log: [WIN32K] Update FTVectorToPOINTFX to reduce diff to Wine. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri May 29 11:21:31 2015 @@ -1508,9 +1508,7 @@ } -static -void -FTVectorToPOINTFX(FT_Vector *vec, POINTFX *pt) +static void FTVectorToPOINTFX(FT_Vector *vec, POINTFX *pt) { pt->x.value = vec->x >> 6; pt->x.fract = (vec->x & 0x3f) << 10; @@ -1518,7 +1516,6 @@ pt->y.value = vec->y >> 6; pt->y.fract = (vec->y & 0x3f) << 10; pt->y.fract |= ((pt->y.fract >> 6) | (pt->y.fract >> 12)); - return; } /*

1 0

[akhaldi] 67948: [WIN32K] Apply Wine commit 147765a by Sam Edwards: Prevent possible buffer overflows in get_glyph_outline.
by akhaldi＠svn.reactos.org 29 May '15

29 May '15

Author: akhaldi Date: Fri May 29 11:03:17 2015 New Revision: 67948 URL: http://svn.reactos.org/svn/reactos?rev=67948&view=rev Log: [WIN32K] Apply Wine commit 147765a by Sam Edwards: Prevent possible buffer overflows in get_glyph_outline. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri May 29 11:03:17 2015 @@ -2062,8 +2062,8 @@ case ft_glyph_format_bitmap: { BYTE *src = ft_face->glyph->bitmap.buffer, *dst = pvBuf; - INT w = (ft_face->glyph->bitmap.width + 7) >> 3; - INT h = ft_face->glyph->bitmap.rows; + INT w = min( pitch, (ft_face->glyph->bitmap.width + 7) >> 3 ); + INT h = min( height, ft_face->glyph->bitmap.rows ); while (h--) { RtlCopyMemory(dst, src, w); @@ -2120,7 +2120,7 @@ case ft_glyph_format_bitmap: { BYTE *src = ft_face->glyph->bitmap.buffer, *dst = pvBuf; - INT h = ft_face->glyph->bitmap.rows; + INT h = min( height, ft_face->glyph->bitmap.rows ); INT x; while (h--) {

1 0

[akhaldi] 67947: [WIN32K] Add some missing range checks in ftGdiGetGlyphOutline. Fixes some gdi32:font tests. Thanks to Benedikt Freisen for the inspection. CORE-9746
by akhaldi＠svn.reactos.org 29 May '15

29 May '15

Author: akhaldi Date: Fri May 29 10:50:38 2015 New Revision: 67947 URL: http://svn.reactos.org/svn/reactos?rev=67947&view=rev Log: [WIN32K] Add some missing range checks in ftGdiGetGlyphOutline. Fixes some gdi32:font tests. Thanks to Benedikt Freisen for the inspection. CORE-9746 Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri May 29 10:50:38 2015 @@ -2053,6 +2053,9 @@ needed = pitch * height; if (!pvBuf || !cjBuf) break; + if (!needed) return GDI_ERROR; /* empty glyph */ + if (needed > cjBuf) + return GDI_ERROR; switch (ft_face->glyph->format) { @@ -2108,6 +2111,9 @@ needed = pitch * height; if (!pvBuf || !cjBuf) break; + if (!needed) return GDI_ERROR; /* empty glyph */ + if (needed > cjBuf) + return GDI_ERROR; switch (ft_face->glyph->format) {

1 0

[akhaldi] 67946: [TCPIP] The driver does both v4 and v6. CORE-9744
by akhaldi＠svn.reactos.org 29 May '15

29 May '15

Author: akhaldi Date: Fri May 29 08:56:05 2015 New Revision: 67946 URL: http://svn.reactos.org/svn/reactos?rev=67946&view=rev Log: [TCPIP] The driver does both v4 and v6. CORE-9744 Modified: trunk/reactos/drivers/network/tcpip/tcpip.rc Modified: trunk/reactos/drivers/network/tcpip/tcpip.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip.rc [iso-8859-1] Fri May 29 08:56:05 2015 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "TCP/IPv4 protocol driver" +#define REACTOS_STR_FILE_DESCRIPTION "TCP/IP protocol driver" #define REACTOS_STR_INTERNAL_NAME "tcpip" #define REACTOS_STR_ORIGINAL_FILENAME "tcpip.sys" #include <reactos/version.rc>

1 0

[akhaldi] 67945: [NTDLL_WINETEST] Sync with Wine Staging 1.7.43.
by akhaldi＠svn.reactos.org 29 May '15

29 May '15

Author: akhaldi Date: Fri May 29 08:46:58 2015 New Revision: 67945 URL: http://svn.reactos.org/svn/reactos?rev=67945&view=rev Log: [NTDLL_WINETEST] Sync with Wine Staging 1.7.43. Modified: trunk/rostests/winetests/ntdll/change.c trunk/rostests/winetests/ntdll/file.c trunk/rostests/winetests/ntdll/om.c trunk/rostests/winetests/ntdll/pipe.c trunk/rostests/winetests/ntdll/port.c trunk/rostests/winetests/ntdll/reg.c trunk/rostests/winetests/ntdll/rtl.c Modified: trunk/rostests/winetests/ntdll/change.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/change.c?… ============================================================================== --- trunk/rostests/winetests/ntdll/change.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/change.c [iso-8859-1] Fri May 29 08:46:58 2015 @@ -99,19 +99,19 @@ r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0); ok(r==STATUS_PENDING, "should return status pending\n"); - r = WaitForSingleObject( hEvent, 0 ); + r = WaitForSingleObject( hEvent, 100 ); ok( r == STATUS_TIMEOUT, "should timeout\n" ); - r = WaitForSingleObject( hdir, 0 ); + r = WaitForSingleObject( hdir, 100 ); ok( r == STATUS_TIMEOUT, "should timeout\n" ); r = CreateDirectoryW( subdir, NULL ); ok( r == TRUE, "failed to create directory\n"); - r = WaitForSingleObject( hdir, 0 ); + r = WaitForSingleObject( hdir, 100 ); ok( r == STATUS_TIMEOUT, "should timeout\n" ); - r = WaitForSingleObject( hEvent, 0 ); + r = WaitForSingleObject( hEvent, 100 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); ok( U(iosb).Status == STATUS_SUCCESS, "information wrong\n"); @@ -299,7 +299,7 @@ CloseHandle(hdir); ok(U(iosb).Status == STATUS_SUCCESS, "status wrong\n"); - todo_wine ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong\n"); + ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong %x\n",U(iosb2).Status); ok(iosb.Information == 0, "info wrong\n"); ok(iosb2.Information == 0, "info wrong\n"); Modified: trunk/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/file.c [iso-8859-1] Fri May 29 08:46:58 2015 @@ -111,6 +111,16 @@ return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; } +static const char* debugstr_longlong(ULONGLONG ll) +{ + static char str[17]; + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(str, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); + else + sprintf(str, "%lx", (unsigned long)ll); + return str; +} + #define PIPENAME "\\\\.\\pipe\\ntdll_tests_file.c" #define TEST_BUF_LEN 3 @@ -685,7 +695,7 @@ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); - todo_wine ok( !apc_count, "apc was called\n" ); + ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -711,7 +721,7 @@ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); - todo_wine ok( !apc_count, "apc was called\n" ); + ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); CloseHandle( handle ); @@ -737,7 +747,7 @@ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); - todo_wine ok( !apc_count, "apc was called\n" ); + ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -763,7 +773,7 @@ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); - todo_wine ok( !apc_count, "apc was called\n" ); + ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 2, "apc was not called\n" ); @@ -1232,6 +1242,62 @@ CloseHandle( hPipeClt ); } +static void test_file_full_size_information(void) +{ + IO_STATUS_BLOCK io; + FILE_FS_FULL_SIZE_INFORMATION ffsi; + FILE_FS_SIZE_INFORMATION fsi; + HANDLE h; + NTSTATUS res; + + if(!(h = create_temp_file(0))) return ; + + memset(&ffsi,0,sizeof(ffsi)); + memset(&fsi,0,sizeof(fsi)); + + /* Assume No Quota Settings configured on Wine Testbot */ + res = pNtQueryVolumeInformationFile(h, &io, &ffsi, sizeof ffsi, FileFsFullSizeInformation); + ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); + res = pNtQueryVolumeInformationFile(h, &io, &fsi, sizeof fsi, FileFsSizeInformation); + ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); + + /* Test for FileFsSizeInformation */ + ok(fsi.TotalAllocationUnits.QuadPart > 0, + "[fsi] TotalAllocationUnits expected positive, got 0x%s\n", + debugstr_longlong(fsi.TotalAllocationUnits.QuadPart)); + ok(fsi.AvailableAllocationUnits.QuadPart > 0, + "[fsi] AvailableAllocationUnits expected positive, got 0x%s\n", + debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart)); + + /* Assume file system is NTFS */ + ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %d\n",fsi.BytesPerSector); + ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %d\n",fsi.SectorsPerAllocationUnit); + + ok(ffsi.TotalAllocationUnits.QuadPart > 0, + "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n", + debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + ok(ffsi.CallerAvailableAllocationUnits.QuadPart > 0, + "[ffsi] CallerAvailableAllocationUnits expected positive, got negative value 0x%s\n", + debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + ok(ffsi.ActualAvailableAllocationUnits.QuadPart > 0, + "[ffsi] ActualAvailableAllocationUnits expected positive, got negative value 0x%s\n", + debugstr_longlong(ffsi.ActualAvailableAllocationUnits.QuadPart)); + ok(ffsi.TotalAllocationUnits.QuadPart == fsi.TotalAllocationUnits.QuadPart, + "[ffsi] TotalAllocationUnits error fsi:0x%s, ffsi:0x%s\n", + debugstr_longlong(fsi.TotalAllocationUnits.QuadPart), + debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + ok(ffsi.CallerAvailableAllocationUnits.QuadPart == fsi.AvailableAllocationUnits.QuadPart, + "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n", + debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart), + debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + + /* Assume file system is NTFS */ + ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %d\n",ffsi.BytesPerSector); + ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %d\n",ffsi.SectorsPerAllocationUnit); + + CloseHandle( h ); +} + static void test_file_basic_information(void) { IO_STATUS_BLOCK io; @@ -1382,11 +1448,12 @@ { char tmp_path[MAX_PATH], buffer[MAX_PATH + 16]; DWORD dirpos; - HANDLE handle, handle2; + HANDLE handle, handle2, mapping; NTSTATUS res; IO_STATUS_BLOCK io; FILE_DISPOSITION_INFORMATION fdi; BOOL fileDeleted; + void *ptr; GetTempPathA( MAX_PATH, tmp_path ); @@ -1550,6 +1617,72 @@ todo_wine ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); RemoveDirectoryA( buffer ); + + /* cannot set disposition on file with file mapping opened */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + mapping = CreateFileMappingA( handle, NULL, PAGE_READWRITE, 0, 64 * 1024, "DelFileTest" ); + ok( mapping != NULL, "failed to create file mapping\n"); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + CloseHandle( mapping ); + DeleteFileA( buffer ); + + /* can set disposition on file with file mapping closed */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + mapping = CreateFileMappingA( handle, NULL, PAGE_READWRITE, 0, 64 * 1024, "DelFileTest" ); + ok( mapping != NULL, "failed to create file mapping\n"); + CloseHandle( mapping ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( fileDeleted, "File should have been deleted\n" ); + DeleteFileA( buffer ); + + /* cannot set disposition on file which is mapped to memory */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + mapping = CreateFileMappingA( handle, NULL, PAGE_READWRITE, 0, 64 * 1024, "DelFileTest" ); + ok( mapping != NULL, "failed to create file mapping\n"); + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4096 ); + ok( ptr != NULL, "MapViewOfFile failed\n"); + CloseHandle( mapping ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + UnmapViewOfFile( ptr ); + DeleteFileA( buffer ); + + /* can set disposition on file which is mapped to memory and unmapped again */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + mapping = CreateFileMappingA( handle, NULL, PAGE_READWRITE, 0, 64 * 1024, "DelFileTest" ); + ok( mapping != NULL, "failed to create file mapping\n"); + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4096 ); + ok( ptr != NULL, "MapViewOfFile failed\n"); + CloseHandle( mapping ); + UnmapViewOfFile( ptr ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( fileDeleted, "File should have been deleted\n" ); + DeleteFileA( buffer ); } static void test_iocompletion(void) @@ -2496,7 +2629,6 @@ ret = ReadFile(hfile, buf, 0, &bytes, &ovl); /* ReadFile return value depends on Windows version and testing it is not practical */ if (!ret) -todo_wine ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ret = GetLastError(); ok(bytes == 0, "bytes %u\n", bytes); @@ -2527,7 +2659,6 @@ ret = ReadFile(hfile, NULL, 0, &bytes, &ovl); /* ReadFile return value depends on Windows version and testing it is not practical */ if (!ret) -todo_wine ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ret = GetLastError(); ok(bytes == 0, "bytes %u\n", bytes); @@ -2676,6 +2807,8 @@ { ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); } else ok(bytes == 4, "bytes %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); @@ -2707,6 +2840,8 @@ { ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); } else ok(bytes == 14, "bytes %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); @@ -2951,6 +3086,7 @@ test_file_all_information(); test_file_both_information(); test_file_name_information(); + test_file_full_size_information(); test_file_all_name_information(); test_file_disposition_information(); test_query_volume_information_file(); Modified: trunk/rostests/winetests/ntdll/om.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/om.c?rev=… ============================================================================== --- trunk/rostests/winetests/ntdll/om.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/om.c [iso-8859-1] Fri May 29 08:46:58 2015 @@ -688,8 +688,8 @@ len = 0; status = pNtQueryObject( handle, ObjectTypeInformation, buffer, 0, &len ); - todo_wine ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); - todo_wine ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(type_event) + sizeof(WCHAR), "unexpected len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(type_event) + sizeof(WCHAR), "unexpected len %u\n", len ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(UNICODE_STRING), &len ); @@ -698,8 +698,8 @@ len = 0; status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(OBJECT_TYPE_INFORMATION), &len ); - todo_wine ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); - todo_wine ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(type_event) + sizeof(WCHAR), "unexpected len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(type_event) + sizeof(WCHAR), "unexpected len %u\n", len ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); @@ -720,17 +720,17 @@ len = 0; memset( buffer, 0, sizeof(buffer) ); status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); - todo_wine ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; - todo_wine ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); - todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_event, sizeof(type_file) ), + ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_event, sizeof(type_event) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); len -= sizeof(WCHAR); status = pNtQueryObject( handle, ObjectTypeInformation, buffer, len, &len ); - todo_wine ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); - todo_wine ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(type_event) + sizeof(WCHAR), "unexpected len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(type_event) + sizeof(WCHAR), "unexpected len %u\n", len ); pNtClose( handle ); @@ -775,12 +775,12 @@ len = 0; memset( buffer, 0, sizeof(buffer) ); status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); - todo_wine ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); - todo_wine ok( len >= expected_len, "unexpected len %u\n", len ); - todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), + ok( len >= expected_len, "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); pNtClose( handle ); @@ -1030,6 +1030,101 @@ status = pNtReleaseKeyedEvent( event, (void *)8, 0, &timeout ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtReleaseKeyedEvent %x\n", status ); NtClose( event ); +} + +static void test_null_device(void) +{ + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK iosb; + UNICODE_STRING str; + NTSTATUS status; + DWORD num_bytes; + OVERLAPPED ov; + char buf[64]; + HANDLE null; + BOOL ret; + + memset(buf, 0xAA, sizeof(buf)); + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + + pRtlCreateUnicodeStringFromAsciiz(&str, "\\Device\\Null"); + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + status = pNtOpenSymbolicLinkObject(&null, SYMBOLIC_LINK_QUERY, &attr); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, + "expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status); + + status = pNtOpenFile(&null, GENERIC_READ | GENERIC_WRITE, &attr, &iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN); + ok(status == STATUS_SUCCESS, + "expected STATUS_SUCCESS, got %08x\n", status); + + SetLastError(0xdeadbeef); + ret = WriteFile(null, buf, sizeof(buf), &num_bytes, NULL); + todo_wine + ok(!ret, "WriteFile unexpectedly succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadFile(null, buf, sizeof(buf), &num_bytes, NULL); + todo_wine + ok(!ret, "ReadFile unexpectedly succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WriteFile(null, buf, sizeof(buf), &num_bytes, &ov); + if (ret || GetLastError() != ERROR_IO_PENDING) + { + ok(ret, "WriteFile failed with error %u\n", GetLastError()); + } + else + { + num_bytes = 0xdeadbeef; + ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); + ok(ret, "GetOverlappedResult failed with error %u\n", GetLastError()); + } + ok(num_bytes == sizeof(buf), "expected num_bytes = %u, got %u\n", + (DWORD)sizeof(buf), num_bytes); + + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(null, buf, sizeof(buf), &num_bytes, &ov); + if (ret || GetLastError() != ERROR_IO_PENDING) + { + ok(!ret, "ReadFile unexpectedly succeeded\n"); + } + else + { + num_bytes = 0xdeadbeef; + ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); + ok(!ret, "GetOverlappedResult unexpectedly succeeded\n"); + } + ok(GetLastError() == ERROR_HANDLE_EOF, + "expected ERROR_HANDLE_EOF, got %u\n", GetLastError()); + + pNtClose(null); + + null = CreateFileA("\\\\.\\Null", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "expected ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + null = CreateFileA("\\\\.\\Device\\Null", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND, + "expected ERROR_PATH_NOT_FOUND, got %u\n", GetLastError()); + + pRtlFreeUnicodeString(&str); + CloseHandle(ov.hEvent); } START_TEST(om) @@ -1081,4 +1176,5 @@ test_type_mismatch(); test_event(); test_keyed_events(); -} + test_null_device(); +} Modified: trunk/rostests/winetests/ntdll/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/pipe.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/pipe.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/pipe.c [iso-8859-1] Fri May 29 08:46:58 2015 @@ -469,12 +469,10 @@ ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); res = pNtCancelIoFile(hPipe, &cancel_sb); - todo_wine ok(!res, "NtCancelIoFile returned %x\n", res); - - todo_wine { - ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status); - ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); - } + ok(!res, "NtCancelIoFile returned %x\n", res); + + ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status); + ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); ok(!ioapc_called, "IOAPC ran too early\n"); Modified: trunk/rostests/winetests/ntdll/port.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/port.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/port.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/port.c [iso-8859-1] Fri May 29 08:46:58 2015 @@ -115,7 +115,7 @@ static HMODULE hntdll = 0; static NTSTATUS (WINAPI *pNtCompleteConnectPort)(HANDLE); static NTSTATUS (WINAPI *pNtAcceptConnectPort)(PHANDLE,ULONG,PLPC_MESSAGE,ULONG, - ULONG,PLPC_SECTION_READ); + PLPC_SECTION_WRITE,PLPC_SECTION_READ); static NTSTATUS (WINAPI *pNtReplyPort)(HANDLE,PLPC_MESSAGE); static NTSTATUS (WINAPI *pNtReplyWaitReceivePort)(PHANDLE,PULONG,PLPC_MESSAGE, PLPC_MESSAGE); @@ -182,7 +182,7 @@ ok(!*LpcMessage->msg.Data, "Expected empty string!\n"); } - status = pNtAcceptConnectPort(pAcceptPortHandle, 0, &LpcMessage->msg, 1, 0, NULL); + status = pNtAcceptConnectPort(pAcceptPortHandle, 0, &LpcMessage->msg, 1, NULL, NULL); ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); status = pNtCompleteConnectPort(*pAcceptPortHandle); Modified: trunk/rostests/winetests/ntdll/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/reg.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/reg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/reg.c [iso-8859-1] Fri May 29 08:46:58 2015 @@ -709,7 +709,7 @@ type = 0xdead; len = 0xbeef; status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); - ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue unexpected suceeded\n"); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue unexpected succeeded\n"); ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); @@ -1509,8 +1509,8 @@ test_RtlpNtQueryValueKey(); test_NtFlushKey(); test_NtQueryKey(); + test_NtQueryLicenseKey(); test_NtQueryValueKey(); - test_NtQueryLicenseKey(); test_long_value_name(); test_NtDeleteKey(); test_symlinks(); Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Fri May 29 08:46:58 2015 @@ -64,6 +64,7 @@ /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; static PVOID (WINAPI *pWinSqmStartSession)(PVOID unknown1, DWORD unknown2, DWORD unknown3); +static BOOL (WINAPI *pWinSqmIsOptedIn)(void); static NTSTATUS (WINAPI *pWinSqmEndSession)(PVOID unknown1); static SIZE_T (WINAPI *pRtlCompareMemory)(LPCVOID,LPCVOID,SIZE_T); static SIZE_T (WINAPI *pRtlCompareMemoryUlong)(PULONG, SIZE_T, ULONG); @@ -125,6 +126,7 @@ ok(hntdll != 0, "LoadLibrary failed\n"); if (hntdll) { pWinSqmStartSession = (void *)GetProcAddress(hntdll, "WinSqmStartSession"); + pWinSqmIsOptedIn = (void *)GetProcAddress(hntdll, "WinSqmIsOptedIn"); pWinSqmEndSession = (void *)GetProcAddress(hntdll, "WinSqmEndSession"); pRtlCompareMemory = (void *)GetProcAddress(hntdll, "RtlCompareMemory"); pRtlCompareMemoryUlong = (void *)GetProcAddress(hntdll, "RtlCompareMemoryUlong"); @@ -211,6 +213,8 @@ args = 3 - call_stdcall_func3( pWinSqmStartSession, NULL, 0, 0 ) / 4; ok(args == 3, "WinSqmStartSession expected to take %d arguments instead of 3\n", args); + args = 3 - call_stdcall_func3( pWinSqmIsOptedIn, NULL, 0, 0 ) / 4; + ok(args == 0, "WinSqmIsOptedIn expected to take %d arguments instead of 0\n", args); args = 3 - call_stdcall_func3( pWinSqmEndSession, NULL, 0, 0 ) / 4; ok(args == 1, "WinSqmEndSession expected to take %d arguments instead of 1\n", args);

1 0

[akhaldi] 67944: [WINE/INCLUDE] Update winioctl.h.
by akhaldi＠svn.reactos.org 29 May '15

29 May '15

Author: akhaldi Date: Fri May 29 08:46:19 2015 New Revision: 67944 URL: http://svn.reactos.org/svn/reactos?rev=67944&view=rev Log: [WINE/INCLUDE] Update winioctl.h. Modified: trunk/reactos/include/reactos/wine/winioctl.h Modified: trunk/reactos/include/reactos/wine/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winio… ============================================================================== --- trunk/reactos/include/reactos/wine/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winioctl.h [iso-8859-1] Fri May 29 08:46:19 2015 @@ -439,6 +439,20 @@ WCHAR FileSystemName[1]; } FILE_FS_ATTRIBUTE_INFORMATION, *PFILE_FS_ATTRIBUTE_INFORMATION; +/*FileFsControlInformation = 6 */ +/* + unknown + */ + +/*FileFsFullSizeInformation = 7 */ +typedef struct _FILE_FS_FULL_SIZE_INFORMATION { + LARGE_INTEGER TotalAllocationUnits; + LARGE_INTEGER CallerAvailableAllocationUnits; + LARGE_INTEGER ActualAvailableAllocationUnits; + ULONG SectorsPerAllocationUnit; + ULONG BytesPerSector; +} FILE_FS_FULL_SIZE_INFORMATION, *PFILE_FS_FULL_SIZE_INFORMATION; + typedef struct _FILE_PIPE_WAIT_FOR_BUFFER { LARGE_INTEGER Timeout; ULONG NameLength;

1 0

[hbelusca] 67943: [PSDK]: Remove commented-out Get/SetStdHandle API prototypes from wincon.h (they must be in winbase.h), and add a new console API prototype in wincon.h
by hbelusca＠svn.reactos.org 28 May '15

28 May '15

Author: hbelusca Date: Thu May 28 23:47:55 2015 New Revision: 67943 URL: http://svn.reactos.org/svn/reactos?rev=67943&view=rev Log: [PSDK]: Remove commented-out Get/SetStdHandle API prototypes from wincon.h (they must be in winbase.h), and add a new console API prototype in wincon.h Modified: trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wincon.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Thu May 28 23:47:55 2015 @@ -2190,7 +2190,7 @@ PUCHAR WINAPI GetSidSubAuthorityCount(PSID); VOID WINAPI GetStartupInfoA(_Out_ LPSTARTUPINFOA); VOID WINAPI GetStartupInfoW(LPSTARTUPINFOW); -HANDLE WINAPI GetStdHandle(DWORD); +HANDLE WINAPI GetStdHandle(_In_ DWORD); UINT WINAPI GetSystemDirectoryA(LPSTR,UINT); UINT WINAPI GetSystemDirectoryW(LPWSTR,UINT); VOID WINAPI GetSystemInfo(LPSYSTEM_INFO); @@ -2927,7 +2927,7 @@ BOOL WINAPI SetSecurityDescriptorOwner(PSECURITY_DESCRIPTOR,PSID,BOOL); DWORD WINAPI SetSecurityDescriptorRMControl(PSECURITY_DESCRIPTOR,PUCHAR); BOOL WINAPI SetSecurityDescriptorSacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL); -BOOL WINAPI SetStdHandle(DWORD,HANDLE); +BOOL WINAPI SetStdHandle(_In_ DWORD, _In_ HANDLE); #define SetSwapAreaSize(w) (w) BOOL WINAPI SetSystemPowerState(_In_ BOOL, _In_ BOOL); BOOL WINAPI SetSystemTime(const SYSTEMTIME*); Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Thu May 28 23:47:55 2015 @@ -624,8 +624,8 @@ BOOL WINAPI SetConsolePalette(_In_ HANDLE, _In_ HPALETTE, _In_ UINT); /* Undocumented */ BOOL WINAPI CloseConsoleHandle(_In_ HANDLE); -// HANDLE WINAPI GetStdHandle(_In_ DWORD); -// BOOL WINAPI SetStdHandle(_In_ DWORD, _In_ HANDLE); +/* Undocumented */ +HANDLE WINAPI GetConsoleInputWaitHandle(VOID); /* Undocumented */ BOOL WINAPI VerifyConsoleIoHandle(_In_ HANDLE); /* Undocumented */

1 0

[aandrejevic] 67942: [NTVDM] Implement panning by moving the addressing coordinates up instead of moving the display coordinates down.
by aandrejevic＠svn.reactos.org 28 May '15

28 May '15

Author: aandrejevic Date: Thu May 28 15:45:40 2015 New Revision: 67942 URL: http://svn.reactos.org/svn/reactos?rev=67942&view=rev Log: [NTVDM] Implement panning by moving the addressing coordinates up instead of moving the display coordinates down. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] Thu May 28 15:45:40 2015 @@ -1063,6 +1063,7 @@ BYTE PresetRowScan = VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] & 0x1F; DWORD Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]) + + PresetRowScan * ScanlineSize + ((VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3); /* @@ -1077,7 +1078,7 @@ /* Graphics mode */ PBYTE GraphicsBuffer = (PBYTE)ConsoleFramebuffer; DWORD InterlaceHighBit = VGA_INTERLACE_HIGH_BIT; - SHORT X, Y; + SHORT X; /* * Synchronize access to the graphics framebuffer @@ -1100,15 +1101,21 @@ Address |= InterlaceHighBit; } - /* Apply the preset row scan */ - Y = i - PresetRowScan; - if (Y < 0) Y += CurrResolution.Y; - /* Loop through the pixels */ for (j = 0; j < CurrResolution.X; j++) { BYTE PixelData = 0; + /* Apply horizontal pixel panning */ + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) + { + X = j + ((VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F) >> 1); + } + else + { + X = j + (VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F); + } + /* Check the shifting mode */ if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_SHIFT256) { @@ -1118,20 +1125,20 @@ if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) { /* One byte per pixel */ - PixelData = VgaMemory[(j % VGA_NUM_BANKS) * VGA_BANK_SIZE - + LOWORD((Address + (j / VGA_NUM_BANKS)) + PixelData = VgaMemory[(X % VGA_NUM_BANKS) * VGA_BANK_SIZE + + LOWORD((Address + (X / VGA_NUM_BANKS)) * AddressSize)]; } else { /* 4-bits per pixel */ - PixelData = VgaMemory[(j % VGA_NUM_BANKS) * VGA_BANK_SIZE - + LOWORD((Address + (j / (VGA_NUM_BANKS * 2))) + PixelData = VgaMemory[(X % VGA_NUM_BANKS) * VGA_BANK_SIZE + + LOWORD((Address + (X / (VGA_NUM_BANKS * 2))) * AddressSize)]; /* Check if we should use the highest 4 bits or lowest 4 */ - if (((j / VGA_NUM_BANKS) % 2) == 0) + if (((X / VGA_NUM_BANKS) % 2) == 0) { /* Highest 4 */ PixelData >>= 4; @@ -1157,14 +1164,14 @@ * 2 bits shifted from plane 0 and 2 for the first 4 pixels, * then 2 bits shifted from plane 1 and 3 for the next 4 */ - DWORD BankNumber = (j / 4) % 2; - DWORD Offset = Address + (j / 8); + DWORD BankNumber = (X / 4) % 2; + DWORD Offset = Address + (X / 8); BYTE LowPlaneData = VgaMemory[BankNumber * VGA_BANK_SIZE + LOWORD(Offset * AddressSize)]; BYTE HighPlaneData = VgaMemory[(BankNumber + 2) * VGA_BANK_SIZE + LOWORD(Offset * AddressSize)]; /* Extract the two bits from each plane */ - LowPlaneData = (LowPlaneData >> (6 - ((j % 4) * 2))) & 0x03; - HighPlaneData = (HighPlaneData >> (6 - ((j % 4) * 2))) & 0x03; + LowPlaneData = (LowPlaneData >> (6 - ((X % 4) * 2))) & 0x03; + HighPlaneData = (HighPlaneData >> (6 - ((X % 4) * 2))) & 0x03; /* Combine them into the pixel */ PixelData = LowPlaneData | (HighPlaneData << 2); @@ -1183,11 +1190,11 @@ { /* The data is on plane k, 4 pixels per byte */ BYTE PlaneData = VgaMemory[k * VGA_BANK_SIZE - + LOWORD((Address + (j / VGA_NUM_BANKS)) + + LOWORD((Address + (X / VGA_NUM_BANKS)) * AddressSize)]; /* The mask of the first bit in the pair */ - BYTE BitMask = 1 << (((3 - (j % VGA_NUM_BANKS)) * 2) + 1); + BYTE BitMask = 1 << (((3 - (X % VGA_NUM_BANKS)) * 2) + 1); /* Bits 0, 1, 2 and 3 come from the first bit of the pair */ if (PlaneData & BitMask) PixelData |= 1 << k; @@ -1203,11 +1210,11 @@ for (k = 0; k < VGA_NUM_BANKS; k++) { BYTE PlaneData = VgaMemory[k * VGA_BANK_SIZE - + LOWORD((Address + (j / (VGA_NUM_BANKS * 2))) + + LOWORD((Address + (X / (VGA_NUM_BANKS * 2))) * AddressSize)]; /* If the bit on that plane is set, set it */ - if (PlaneData & (1 << (7 - (j % 8)))) PixelData |= 1 << k; + if (PlaneData & (1 << (7 - (X % 8)))) PixelData |= 1 << k; } } } @@ -1223,71 +1230,58 @@ : 0); } - /* Apply horizontal pixel panning */ - if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) - { - X = j - ((VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F) >> 1); - } - else - { - X = j - (VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F); - } - - /* Wrap around */ - if (X < 0) X += CurrResolution.X; - /* Take into account DoubleVision mode when checking for pixel updates */ if (DoubleWidth && DoubleHeight) { /* Now check if the resulting pixel data has changed */ - if (GraphicsBuffer[(Y * 2 * CurrResolution.X * 2) + (X * 2)] != PixelData) + if (GraphicsBuffer[(i * 2 * CurrResolution.X * 2) + (j * 2)] != PixelData) { /* Yes, write the new value */ - GraphicsBuffer[(Y * 2 * CurrResolution.X * 2) + (X * 2)] = PixelData; - GraphicsBuffer[(Y * 2 * CurrResolution.X * 2) + (X * 2 + 1)] = PixelData; - GraphicsBuffer[((Y * 2 + 1) * CurrResolution.X * 2) + (X * 2)] = PixelData; - GraphicsBuffer[((Y * 2 + 1) * CurrResolution.X * 2) + (X * 2 + 1)] = PixelData; + GraphicsBuffer[(i * 2 * CurrResolution.X * 2) + (j * 2)] = PixelData; + GraphicsBuffer[(i * 2 * CurrResolution.X * 2) + (j * 2 + 1)] = PixelData; + GraphicsBuffer[((i * 2 + 1) * CurrResolution.X * 2) + (j * 2)] = PixelData; + GraphicsBuffer[((i * 2 + 1) * CurrResolution.X * 2) + (j * 2 + 1)] = PixelData; /* Mark the specified pixel as changed */ - VgaMarkForUpdate(Y, X); + VgaMarkForUpdate(i, j); } } else if (DoubleWidth && !DoubleHeight) { /* Now check if the resulting pixel data has changed */ - if (GraphicsBuffer[(Y * CurrResolution.X * 2) + (X * 2)] != PixelData) + if (GraphicsBuffer[(i * CurrResolution.X * 2) + (j * 2)] != PixelData) { /* Yes, write the new value */ - GraphicsBuffer[(Y * CurrResolution.X * 2) + (X * 2)] = PixelData; - GraphicsBuffer[(Y * CurrResolution.X * 2) + (X * 2 + 1)] = PixelData; + GraphicsBuffer[(i * CurrResolution.X * 2) + (j * 2)] = PixelData; + GraphicsBuffer[(i * CurrResolution.X * 2) + (j * 2 + 1)] = PixelData; /* Mark the specified pixel as changed */ - VgaMarkForUpdate(Y, X); + VgaMarkForUpdate(i, j); } } else if (!DoubleWidth && DoubleHeight) { /* Now check if the resulting pixel data has changed */ - if (GraphicsBuffer[(Y * 2 * CurrResolution.X) + X] != PixelData) + if (GraphicsBuffer[(i * 2 * CurrResolution.X) + j] != PixelData) { /* Yes, write the new value */ - GraphicsBuffer[(Y * 2 * CurrResolution.X) + X] = PixelData; - GraphicsBuffer[((Y * 2 + 1) * CurrResolution.X) + X] = PixelData; + GraphicsBuffer[(i * 2 * CurrResolution.X) + j] = PixelData; + GraphicsBuffer[((i * 2 + 1) * CurrResolution.X) + j] = PixelData; /* Mark the specified pixel as changed */ - VgaMarkForUpdate(Y, X); + VgaMarkForUpdate(i, j); } } else // if (!DoubleWidth && !DoubleHeight) { /* Now check if the resulting pixel data has changed */ - if (GraphicsBuffer[Y * CurrResolution.X + X] != PixelData) + if (GraphicsBuffer[i * CurrResolution.X + j] != PixelData) { /* Yes, write the new value */ - GraphicsBuffer[Y * CurrResolution.X + X] = PixelData; + GraphicsBuffer[i * CurrResolution.X + j] = PixelData; /* Mark the specified pixel as changed */ - VgaMarkForUpdate(Y, X); + VgaMarkForUpdate(i, j); } } }

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