Ros-diffs May 2012

ros-diffs@reactos.org

12 participants
227 discussions

[tkreuzer] 56491: [NTOSKRNL] - Fix amd64 build - Fix some MSVC/amd64 warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri May 4 11:32:07 2012 New Revision: 56491 URL: http://svn.reactos.org/svn/reactos?rev=56491&view=rev Log: [NTOSKRNL] - Fix amd64 build - Fix some MSVC/amd64 warnings Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Fri May 4 11:32:07 2012 @@ -869,7 +869,7 @@ MmLockSectionSegment(Segment); Segment->RawLength.QuadPart = NewSize->QuadPart; Segment->Length.QuadPart = MAX(Segment->Length.QuadPart, - PAGE_ROUND_UP(Segment->RawLength.LowPart)); + (LONG64)PAGE_ROUND_UP(Segment->RawLength.QuadPart)); MmUnlockSectionSegment(Segment); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Fri May 4 11:32:07 2012 @@ -1738,12 +1738,16 @@ /* Was the PDE invalid */ if (PointerPde->u.Long == 0) { +#if (_MI_PAGING_LEVELS == 2) /* Find the system double-mapped PDE that describes this mapping */ SystemMapPde = &MmSystemPagePtes[((ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)) / sizeof(MMPTE)]; /* Make it valid */ ASSERT(SystemMapPde->u.Hard.Valid == 1); MI_WRITE_VALID_PDE(PointerPde, *SystemMapPde); +#else + ASSERT(FALSE); +#endif } /* Dereference the PDE and the PTE */ @@ -1791,7 +1795,8 @@ IN PVOID Base, OUT PCONTROL_AREA *ControlArea) { - ULONG Hash, Size, Count = 0, Entry; + ULONG Hash, Size, Count = 0; + ULONG_PTR Entry; PAGED_CODE(); /* Compute the hash for this entry and loop trying to find it */ @@ -1846,7 +1851,7 @@ /* Clear the bits for this mapping */ RtlClearBits(Session->SystemSpaceBitMap, - ((ULONG_PTR)MappedBase - (ULONG_PTR)Session->SystemSpaceViewStart) >> 16, + (ULONG)(((ULONG_PTR)MappedBase - (ULONG_PTR)Session->SystemSpaceViewStart) >> 16), Size); /* Convert the size from a bit size into the actual size */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Fri May 4 11:32:07 2012 @@ -3579,7 +3579,7 @@ // PointerPte = MI_GET_PROTOTYPE_PTE_FOR_VPN(FoundVad, StartingAddress >> PAGE_SHIFT); LastPte = MI_GET_PROTOTYPE_PTE_FOR_VPN(FoundVad, EndingAddress >> PAGE_SHIFT); - QuotaCharge = LastPte - PointerPte + 1; + QuotaCharge = (ULONG)(LastPte - PointerPte + 1); KeAcquireGuardedMutexUnsafe(&MmSectionCommitMutex); // Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=564… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Fri May 4 11:32:07 2012 @@ -125,7 +125,7 @@ Type = MemoryArea->Type; if (Type == MEMORY_AREA_SECTION_VIEW) { - ULONG Entry; + ULONG_PTR Entry; Offset = MemoryArea->Data.SectionData.ViewOffset.QuadPart + ((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress); @@ -134,8 +134,8 @@ /* * Get or create a pageop */ - Entry = MmGetPageEntrySectionSegment - (MemoryArea->Data.SectionData.Segment, (PLARGE_INTEGER)&Offset); + Entry = MmGetPageEntrySectionSegment(MemoryArea->Data.SectionData.Segment, + (PLARGE_INTEGER)&Offset); if (Entry && IS_SWAP_FROM_SSE(Entry) && SWAPENTRY_FROM_SSE(Entry) == MM_WAIT_ENTRY) { MmUnlockSectionSegment(MemoryArea->Data.SectionData.Segment); @@ -430,7 +430,7 @@ where n is between 0 and 255. When such an rmap exists, it specifies a segment rmap in which the process part is a pointer to a slice of a section page table, and the low 8 bits of the address represent a page index in the -page table slice. Together, this information is used by +page table slice. Together, this information is used by MmGetSectionAssociation to determine which page entry points to this page in the segment page table. 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] Fri May 4 11:32:07 2012 @@ -1163,7 +1163,7 @@ NTSTATUS NTAPI MiReadPage(PMEMORY_AREA MemoryArea, - ULONG SegOffset, + ULONG_PTR SegOffset, PPFN_NUMBER Page) /* * FUNCTION: Read a page for a section backed memory area. @@ -1685,7 +1685,7 @@ */ MmLockSectionSegment(Segment); Entry = MmGetPageEntrySectionSegment(Segment, &Offset); - + /* * Wait for any other operations to complete */ @@ -2418,7 +2418,7 @@ + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Entry = MmGetPageEntrySectionSegment(Segment, &Offset); /* - * An MM_WAIT_ENTRY is ok in this case... It'll just count as + * An MM_WAIT_ENTRY is ok in this case... It'll just count as * IS_SWAP_FROM_SSE and we'll do the right thing. */ Page = MmGetPfnForProcess(Process, Address);

12 years, 7 months

[tfaber] 56490: [KERNEL32] - Fix SetCurrentDirectoryA to return success when setting the current directory again See issue #6874 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri May 4 10:32:49 2012 New Revision: 56490 URL: http://svn.reactos.org/svn/reactos?rev=56490&view=rev Log: [KERNEL32] - Fix SetCurrentDirectoryA to return success when setting the current directory again See issue #6874 for more details. Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Fri May 4 10:32:49 2012 @@ -1372,7 +1372,7 @@ /* Create the string that describes the output buffer from the caller */ CallerBuffer.Length = 0; CallerBuffer.Buffer = lpBuffer; - + /* How much space does the caller have? */ if (nBufferLength <= UNICODE_STRING_MAX_CHARS) { @@ -1407,7 +1407,7 @@ Status); DbgPrint(" Path = %wZ\n", &PathString); } - + /* Check if the failure was due to a small buffer */ if (Status == STATUS_BUFFER_TOO_SMALL) { @@ -1425,7 +1425,7 @@ { /* It worked! Write the file part now */ if (lpFilePart) *lpFilePart = &lpBuffer[FilePartSize]; - + /* Convert the final result length */ Result = CallerBuffer.Length / sizeof(WCHAR); } @@ -2205,7 +2205,7 @@ DirName = Basep8BitStringToStaticUnicodeString(lpPathName); if (!DirName) return FALSE; - if (CheckForSameCurdir(DirName)) return FALSE; + if (CheckForSameCurdir(DirName)) return TRUE; Status = RtlSetCurrentDirectory_U(DirName); if (NT_SUCCESS(Status)) return TRUE;

12 years, 7 months

[tfaber] 56489: [KERNEL32_APITEST] - Add some tests for GetCurrentDirectory and SetCurrentDirectory

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri May 4 10:28:54 2012 New Revision: 56489 URL: http://svn.reactos.org/svn/reactos?rev=56489&view=rev Log: [KERNEL32_APITEST] - Add some tests for GetCurrentDirectory and SetCurrentDirectory Added: trunk/rostests/apitests/kernel32/GetCurrentDirectory.c (with props) trunk/rostests/apitests/kernel32/SetCurrentDirectory.c (with props) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Fri May 4 10:28:54 2012 @@ -2,7 +2,9 @@ add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE + GetCurrentDirectory.c GetDriveType.c + SetCurrentDirectory.c testlist.c) add_executable(kernel32_apitest ${SOURCE}) Added: trunk/rostests/apitests/kernel32/GetCurrentDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetCurr… ============================================================================== --- trunk/rostests/apitests/kernel32/GetCurrentDirectory.c (added) +++ trunk/rostests/apitests/kernel32/GetCurrentDirectory.c [iso-8859-1] Fri May 4 10:28:54 2012 @@ -1,0 +1,218 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for GetCurrentDirectory + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <ndk/rtltypes.h> + +static +BOOLEAN +CheckBuffer( + const VOID *Buffer, + SIZE_T Size, + UCHAR Value) +{ + const UCHAR *Array = Buffer; + SIZE_T i; + + for (i = 0; i < Size; i++) + if (Array[i] != Value) + { + trace("Expected %x, found %x at offset %lu\n", Value, Array[i], (ULONG)i); + return FALSE; + } + return TRUE; +} + +static +BOOLEAN +CheckStringBufferA( + const VOID *Buffer, + SIZE_T Size, + PCSTR Expected, + UCHAR Fill) +{ + const CHAR *Chars = Buffer; + const UCHAR *UChars = Buffer; + SIZE_T Length = strlen(Expected); + SIZE_T i; + + if (Size < Length) + { + ok(0, "Size = %lu, Length = %lu\n", (ULONG)Size, (ULONG)Length); + return FALSE; + } + + for (i = 0; i < Length; i++) + if (Chars[i] != Expected[i]) + { + trace("Expected %x, found %x at offset %lu\n", Expected[i], Chars[i], (ULONG)i); + return FALSE; + } + + ok(Chars[i] == 0, "Expected null terminator, found %x at offset %lu\n", Chars[i], (ULONG)i); + i++; + + for (; i < Size; i++) + if (UChars[i] != Fill) + { + trace("Expected %x, found %x at offset %lu\n", Fill, UChars[i], (ULONG)i); + return FALSE; + } + return TRUE; +} + +static +BOOLEAN +CheckStringBufferW( + const VOID *Buffer, + SIZE_T Size, + PCWSTR Expected, + UCHAR Fill) +{ + const WCHAR *Chars = Buffer; + const UCHAR *UChars = Buffer; + SIZE_T Length = wcslen(Expected); + SIZE_T i; + + if (Size < Length) + { + ok(0, "Size = %lu, Length = %lu\n", (ULONG)Size, (ULONG)Length); + return FALSE; + } + + for (i = 0; i < Length; i++) + if (Chars[i] != Expected[i]) + { + trace("Expected %x, found %x at offset %lu\n", Expected[i], Chars[i], (ULONG)i); + return FALSE; + } + + ok(Chars[i] == 0, "Expected null terminator, found %x at offset %lu\n", Chars[i], (ULONG)i); + i++; + + i *= sizeof(WCHAR); + + for (; i < Size; i++) + if (UChars[i] != Fill) + { + trace("Expected %x, found %x at offset %lu\n", Fill, UChars[i], (ULONG)i); + return FALSE; + } + return TRUE; +} + +static +VOID +TestGetCurrentDirectoryA(VOID) +{ + CHAR Buffer[MAX_PATH]; + DWORD Length; + BOOL Ret; + BOOLEAN Okay; + + Ret = SetCurrentDirectoryA("C:\\"); + ok(Ret == TRUE, "SetCurrentDirectory failed with %lu\n", GetLastError()); + + Length = GetCurrentDirectoryA(0, NULL); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryA(sizeof(Buffer), Buffer); + ok(Length == sizeof("C:\\") - 1, "Length = %lu\n", Length); + Okay = CheckStringBufferA(Buffer, sizeof(Buffer), "C:\\", 0x55); + ok(Okay, "CheckStringBufferA failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryA(0, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryA(1, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryA(2, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryA(3, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryA(4, Buffer); + ok(Length == sizeof("C:\\") - 1, "Length = %lu\n", Length); + Okay = CheckStringBufferA(Buffer, sizeof(Buffer), "C:\\", 0x55); + ok(Okay, "CheckStringBufferA failed\n"); +} + +static +VOID +TestGetCurrentDirectoryW(VOID) +{ + WCHAR Buffer[MAX_PATH]; + DWORD Length; + BOOL Ret; + BOOLEAN Okay; + + Ret = SetCurrentDirectoryW(L"C:\\"); + ok(Ret == TRUE, "SetCurrentDirectory failed with %lu\n", GetLastError()); + + Length = GetCurrentDirectoryW(0, NULL); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryW(sizeof(Buffer) / sizeof(WCHAR), Buffer); + ok(Length == sizeof("C:\\") - 1, "Length = %lu\n", Length); + Okay = CheckStringBufferW(Buffer, sizeof(Buffer), L"C:\\", 0x55); + ok(Okay, "CheckStringBufferW failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryW(0, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryW(1, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryW(2, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryW(3, Buffer); + ok(Length == sizeof("C:\\"), "Length = %lu\n", Length); + Okay = CheckBuffer(Buffer, sizeof(Buffer), 0x55); + ok(Okay, "CheckBuffer failed\n"); + + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Length = GetCurrentDirectoryW(4, Buffer); + ok(Length == sizeof("C:\\") - 1, "Length = %lu\n", Length); + Okay = CheckStringBufferW(Buffer, sizeof(Buffer), L"C:\\", 0x55); + ok(Okay, "CheckStringBufferW failed\n"); +} + +START_TEST(GetCurrentDirectory) +{ + TestGetCurrentDirectoryA(); + TestGetCurrentDirectoryW(); +} Propchange: trunk/rostests/apitests/kernel32/GetCurrentDirectory.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/kernel32/SetCurrentDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetCurr… ============================================================================== --- trunk/rostests/apitests/kernel32/SetCurrentDirectory.c (added) +++ trunk/rostests/apitests/kernel32/SetCurrentDirectory.c [iso-8859-1] Fri May 4 10:28:54 2012 @@ -1,0 +1,109 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for SetCurrentDirectory + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <ndk/rtltypes.h> + +static +VOID +SetUnrelatedDirectory(VOID) +{ + WCHAR Buffer[MAX_PATH]; + BOOL Ret; + + GetWindowsDirectoryW(Buffer, sizeof(Buffer) / sizeof(WCHAR)); + Ret = SetCurrentDirectoryW(Buffer); + ok(Ret == TRUE, "SetCurrentDirectoryW failed\n"); +} + +static +VOID +TestSetCurrentDirectoryA(VOID) +{ + BOOL Ret; + CHAR Buffer[MAX_PATH]; + DWORD Length; + + SetUnrelatedDirectory(); + + Ret = SetCurrentDirectoryA("C:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryA failed\n"); + Length = GetCurrentDirectoryA(sizeof(Buffer), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!strcmp(Buffer, "C:\\"), "Current directory is %s\n", Buffer); + + /* Same directory - succeeds */ + Ret = SetCurrentDirectoryA("C:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryA failed\n"); + Length = GetCurrentDirectoryA(sizeof(Buffer), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!strcmp(Buffer, "C:\\"), "Current directory is %s\n", Buffer); + + /* Same directory, lowercase - succeeds and does not change case */ + Ret = SetCurrentDirectoryA("c:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryA failed\n"); + Length = GetCurrentDirectoryA(sizeof(Buffer), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!strcmp(Buffer, "C:\\"), "Current directory is %s\n", Buffer); + + SetUnrelatedDirectory(); + + /* Now this one does change case */ + Ret = SetCurrentDirectoryA("c:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryA failed\n"); + Length = GetCurrentDirectoryA(sizeof(Buffer), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!strcmp(Buffer, "c:\\"), "Current directory is %s\n", Buffer); +} + +static +VOID +TestSetCurrentDirectoryW(VOID) +{ + BOOL Ret; + WCHAR Buffer[MAX_PATH]; + DWORD Length; + + SetUnrelatedDirectory(); + + Ret = SetCurrentDirectoryW(L"C:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryW failed\n"); + Length = GetCurrentDirectoryW(sizeof(Buffer) / sizeof(WCHAR), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!wcscmp(Buffer, L"C:\\"), "Current directory is %ls\n", Buffer); + + /* Same directory - succeeds */ + Ret = SetCurrentDirectoryW(L"C:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryW failed\n"); + Length = GetCurrentDirectoryW(sizeof(Buffer) / sizeof(WCHAR), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!wcscmp(Buffer, L"C:\\"), "Current directory is %ls\n", Buffer); + + /* Same directory, lowercase - succeeds and does not change case */ + Ret = SetCurrentDirectoryW(L"c:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryW failed\n"); + Length = GetCurrentDirectoryW(sizeof(Buffer) / sizeof(WCHAR), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!wcscmp(Buffer, L"C:\\"), "Current directory is %ls\n", Buffer); + + SetUnrelatedDirectory(); + + /* Now this one does change case */ + Ret = SetCurrentDirectoryW(L"c:\\"); + ok(Ret == TRUE, "SetCurrentDirectoryW failed\n"); + Length = GetCurrentDirectoryW(sizeof(Buffer) / sizeof(WCHAR), Buffer); + ok(Length == 3, "Length = %lu\n", Length); + ok(!wcscmp(Buffer, L"c:\\"), "Current directory is %ls\n", Buffer); +} + +START_TEST(SetCurrentDirectory) +{ + TestSetCurrentDirectoryA(); + TestSetCurrentDirectoryW(); +} Propchange: trunk/rostests/apitests/kernel32/SetCurrentDirectory.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Fri May 4 10:28:54 2012 @@ -5,11 +5,15 @@ #define STANDALONE #include "wine/test.h" +extern void func_GetCurrentDirectory(void); extern void func_GetDriveType(void); +extern void func_SetCurrentDirectory(void); const struct test winetest_testlist[] = { - { "GetDriveType", func_GetDriveType }, + { "GetCurrentDirectory", func_GetCurrentDirectory }, + { "GetDriveType", func_GetDriveType }, + { "SetCurrentDirectory", func_SetCurrentDirectory }, { 0, 0 } };

12 years, 7 months

[arty] 56488: [NTOSKRNL] Account for wait entries delaying a view attribute change and interacting with the machinery in CoW copying code, specifically making CoW insert and revoke a wait while cop...

by arty＠svn.reactos.org

Author: arty Date: Thu May 3 21:05:06 2012 New Revision: 56488 URL: http://svn.reactos.org/svn/reactos?rev=56488&view=rev Log: [NTOSKRNL] Account for wait entries delaying a view attribute change and interacting with the machinery in CoW copying code, specifically making CoW insert and revoke a wait while copying the page, and make the CoW copy function take both pages as arguments rather than relying on the address space. Also alter the MM_WAIT_ENTRY value a bit to take into account an assert that it must have bit 0x800 set. Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] Thu May 3 21:05:06 2012 @@ -4,7 +4,7 @@ /* TYPES *********************************************************************/ -#define MM_WAIT_ENTRY 0x7ffff800 +#define MM_WAIT_ENTRY 0x7ffffc00 #define PFN_FROM_SSE(E) ((PFN_NUMBER)((E) >> PAGE_SHIFT)) #define IS_SWAP_FROM_SSE(E) ((E) & 0x00000001) #define MM_IS_WAIT_PTE(E) \ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu May 3 21:05:06 2012 @@ -955,8 +955,8 @@ NTSTATUS NTAPI MiCopyFromUserPage( - PFN_NUMBER Page, - PVOID SourceAddress + PFN_NUMBER NewPage, + PFN_NUMBER OldPage ); NTSTATUS 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] Thu May 3 21:05:06 2012 @@ -558,6 +558,7 @@ if ((Pte & PA_PRESENT) || !(Pte & 0x800)) { + DPRINT1("Pte %x (want not 1 and 0x800)\n", Pte); KeBugCheck(MEMORY_MANAGEMENT); } 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] Thu May 3 21:05:06 2012 @@ -959,22 +959,24 @@ NTSTATUS NTAPI -MiCopyFromUserPage(PFN_NUMBER DestPage, PVOID SourceAddress) +MiCopyFromUserPage(PFN_NUMBER DestPage, PFN_NUMBER SrcPage) { PEPROCESS Process; - KIRQL Irql; - PVOID TempAddress; - - ASSERT((ULONG_PTR)SourceAddress % PAGE_SIZE == 0); + KIRQL Irql, Irql2; + PVOID DestAddress, SrcAddress; + Process = PsGetCurrentProcess(); - TempAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); - if (TempAddress == NULL) + DestAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); + SrcAddress = MiMapPageInHyperSpace(Process, SrcPage, &Irql2); + if (DestAddress == NULL || SrcAddress == NULL) { return(STATUS_NO_MEMORY); } - ASSERT((ULONG_PTR)TempAddress % PAGE_SIZE == 0); - RtlCopyMemory(TempAddress, SourceAddress, PAGE_SIZE); - MiUnmapPageInHyperSpace(Process, TempAddress, Irql); + ASSERT((ULONG_PTR)DestAddress % PAGE_SIZE == 0); + ASSERT((ULONG_PTR)SrcAddress % PAGE_SIZE == 0); + RtlCopyMemory(DestAddress, SrcAddress, PAGE_SIZE); + MiUnmapPageInHyperSpace(Process, SrcAddress, Irql2); + MiUnmapPageInHyperSpace(Process, DestAddress, Irql); return(STATUS_SUCCESS); } @@ -1620,6 +1622,7 @@ PMM_REGION Region; ULONG_PTR Entry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + SWAPENTRY SwapEntry; DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address); @@ -1699,6 +1702,10 @@ return(STATUS_MM_RESTART_OPERATION); } + MmDeleteRmap(OldPage, Process, PAddress); + MmDeleteVirtualMapping(Process, PAddress, FALSE, NULL, NULL); + MmCreatePageFileMapping(Process, PAddress, MM_WAIT_ENTRY); + /* * Release locks now we have the pageop */ @@ -1720,17 +1727,14 @@ /* * Copy the old page */ - MiCopyFromUserPage(NewPage, PAddress); + MiCopyFromUserPage(NewPage, OldPage); MmLockAddressSpace(AddressSpace); - /* - * Delete the old entry. - */ - MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); /* * Set the PTE to point to the new page */ + MmDeletePageFileMapping(Process, PAddress, &SwapEntry); Status = MmCreateVirtualMapping(Process, PAddress, Region->Protect, @@ -1751,7 +1755,7 @@ /* * Unshare the old page. */ - MmDeleteRmap(OldPage, Process, PAddress); + DPRINT("Swapping page (Old %x New %x)\n", OldPage, NewPage); MmInsertRmap(NewPage, Process, PAddress); MmLockSectionSegment(Segment); MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, FALSE, FALSE, NULL); @@ -2388,8 +2392,17 @@ { for (i = 0; i < PAGE_ROUND_UP(RegionSize) / PAGE_SIZE; i++) { + SWAPENTRY SwapEntry; PVOID Address = (char*)BaseAddress + (i * PAGE_SIZE); ULONG Protect = NewProtect; + + /* Wait for a wait entry to disappear */ + do { + MmGetPageFileMapping(Process, Address, &SwapEntry); + if (SwapEntry != MM_WAIT_ENTRY) + break; + MiWaitForPageEvent(Process, Address); + } while (TRUE); /* * If we doing COW for this segment then check if the page is @@ -2404,6 +2417,10 @@ Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Entry = MmGetPageEntrySectionSegment(Segment, &Offset); + /* + * An MM_WAIT_ENTRY is ok in this case... It'll just count as + * IS_SWAP_FROM_SSE and we'll do the right thing. + */ Page = MmGetPfnForProcess(Process, Address); Protect = PAGE_READONLY;

12 years, 7 months

[jimtabor] 56487: [Win32k] - Add a define for non window pointers. Help out Timo.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu May 3 20:58:53 2012 New Revision: 56487 URL: http://svn.reactos.org/svn/reactos?rev=56487&view=rev Log: [Win32k] - Add a define for non window pointers. Help out Timo. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Thu May 3 20:58:53 2012 @@ -638,6 +638,8 @@ /* Entry in the list of thread windows. */ LIST_ENTRY ThreadListEntry; } WND, *PWND; + +#define PWND_BOTTOM ((PWND)1) typedef struct _SBWND { Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu May 3 20:58:53 2012 @@ -1727,8 +1727,8 @@ 3: handle to the window whose messages are to be retrieved. */ if ( ( !Window || // 1 - ( Window == (PWND)HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window != (PWND)HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window == PWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window != PWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { @@ -1790,8 +1790,8 @@ 3: handle to the window whose messages are to be retrieved. */ if ( ( !Window || // 1 - ( Window == (PWND)HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window != (PWND)HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window == PWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window != PWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) {

12 years, 7 months

[tkreuzer] 56486: - Move NtGdiSetBrushOrg from brush.c to dcobjs.c, since it doesn't really deal with brushes, but with the dc and is related to the brush seletcted into the dc. Cleanup, simplify a...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 3 18:55:38 2012 New Revision: 56486 URL: http://svn.reactos.org/svn/reactos?rev=56486&view=rev Log: - Move NtGdiSetBrushOrg from brush.c to dcobjs.c, since it doesn't really deal with brushes, but with the dc and is related to the brush seletcted into the dc. Cleanup, simplify and fix the function. - rename IntptlBrushOrigin to DC_vSetBrushOrigin and also move it to dcobjs.c Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c trunk/reactos/win32ss/gdi/ntgdi/coord.c trunk/reactos/win32ss/gdi/ntgdi/coord.h trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Thu May 3 18:55:38 2012 @@ -484,60 +484,5 @@ return IntGdiCreateSolidBrush(Color); } -/** - * \name NtGdiSetBrushOrg - * - * \brief Sets the brush origin that GDI assigns to - * the next brush an application selects into the specified device context. - * - * @implemented - */ -BOOL -APIENTRY -NtGdiSetBrushOrg(HDC hDC, INT XOrg, INT YOrg, LPPOINT Point) -{ - PDC dc; - PDC_ATTR pdcattr; - - dc = DC_LockDc(hDC); - if (dc == NULL) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - pdcattr = dc->pdcattr; - - if (Point != NULL) - { - NTSTATUS Status = STATUS_SUCCESS; - POINT SafePoint; - SafePoint.x = pdcattr->ptlBrushOrigin.x; - SafePoint.y = pdcattr->ptlBrushOrigin.y; - _SEH2_TRY - { - ProbeForWrite(Point, sizeof(POINT), 1); - *Point = SafePoint; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - } - - pdcattr->ptlBrushOrigin.x = XOrg; - pdcattr->ptlBrushOrigin.y = YOrg; - IntptlBrushOrigin(dc, XOrg, YOrg ); - DC_UnlockDc(dc); - - return TRUE; -} /* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] Thu May 3 18:55:38 2012 @@ -1205,17 +1205,6 @@ return TRUE; } -PPOINTL -FASTCALL -IntptlBrushOrigin(PDC pdc, LONG x, LONG y ) -{ - pdc->dclevel.ptlBrushOrigin.x = x; - pdc->dclevel.ptlBrushOrigin.y = y; - pdc->ptlFillOrigin.x = pdc->dclevel.ptlBrushOrigin.x + pdc->ptlDCOrig.x; - pdc->ptlFillOrigin.y = pdc->dclevel.ptlBrushOrigin.y + pdc->ptlDCOrig.y; - return &pdc->dclevel.ptlBrushOrigin; -} - static VOID FASTCALL DC_vGetAspectRatioFilter(PDC pDC, LPSIZE AspectRatio) Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] Thu May 3 18:55:38 2012 @@ -159,4 +159,4 @@ VOID FASTCALL IntMirrorWindowOrg(PDC); void FASTCALL IntFixIsotropicMapping(PDC); LONG FASTCALL IntCalcFillOrigin(PDC); -PPOINTL FASTCALL IntptlBrushOrigin(PDC pdc,LONG,LONG); + Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Thu May 3 18:55:38 2012 @@ -189,6 +189,9 @@ BOOL FASTCALL IntSetDefaultRegion(PDC); BOOL NTAPI GreSetDCOwner(HDC hdc, ULONG ulOwner); +VOID +NTAPI +DC_vSetBrushOrigin(PDC pdc, LONG x, LONG y); FORCEINLINE PDC Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Thu May 3 18:55:38 2012 @@ -136,6 +136,71 @@ /* Clear flag */ pdcattr->ulDirty_ &= ~DIRTY_BACKGROUND; +} + +VOID +NTAPI +DC_vSetBrushOrigin(PDC pdc, LONG x, LONG y) +{ + /* Set the brush origin */ + pdc->dclevel.ptlBrushOrigin.x = x; + pdc->dclevel.ptlBrushOrigin.y = y; + + /* Set the fill origin */ + pdc->ptlFillOrigin.x = x + pdc->ptlDCOrig.x; + pdc->ptlFillOrigin.y = y + pdc->ptlDCOrig.y; +} + +/** + * \name NtGdiSetBrushOrg + * + * \brief Sets the brush origin that GDI uses when drawing with pattern + * brushes. The brush origin is relative to the DC origin. + * + * @implemented + */ +BOOL +APIENTRY +NtGdiSetBrushOrg( + _In_ HDC hdc, + _In_ INT x, + _In_ INT y, + _Out_opt_ LPPOINT pptOut) +{ + PDC pdc; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (pdc == NULL) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + /* Check if the old origin was requested */ + if (pptOut != NULL) + { + /* Enter SEH for buffer transfer */ + _SEH2_TRY + { + /* Probe and copy the old origin */ + ProbeForWrite(pptOut, sizeof(POINT), 1); + *pptOut = pdc->pdcattr->ptlBrushOrigin; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DC_UnlockDc(pdc); + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + } + + /* Call the internal function */ + DC_vSetBrushOrigin(pdc, x, y); + + /* Unlock the DC and return success */ + DC_UnlockDc(pdc); + return TRUE; } HPALETTE Modified: trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdibatch… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c [iso-8859-1] Thu May 3 18:55:38 2012 @@ -109,7 +109,7 @@ if (!dc) break; pgSBO = (PGDIBSSETBRHORG) pHdr; pdcattr->ptlBrushOrigin = pgSBO->ptlBrushOrigin; - IntptlBrushOrigin(dc, pgSBO->ptlBrushOrigin.x, pgSBO->ptlBrushOrigin.y); + DC_vSetBrushOrigin(dc, pgSBO->ptlBrushOrigin.x, pgSBO->ptlBrushOrigin.y); break; } case GdiBCExtSelClipRgn:

12 years, 7 months

[tkreuzer] 56485: [GDI32_APITEST] Add tests for SetBrushOrgEx

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 3 18:54:19 2012 New Revision: 56485 URL: http://svn.reactos.org/svn/reactos?rev=56485&view=rev Log: [GDI32_APITEST] Add tests for SetBrushOrgEx Added: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c (with props) Added: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetBrushOr… ============================================================================== --- trunk/rostests/apitests/gdi32/SetBrushOrgEx.c (added) +++ trunk/rostests/apitests/gdi32/SetBrushOrgEx.c [iso-8859-1] Thu May 3 18:54:19 2012 @@ -1,0 +1,76 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for SetBrushOrgEx + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +void Test_Set(ULONG ulLine, HDC hdc, INT x, INT y, LPPOINT ppt, BOOL bExp, DWORD dwErrExp) +{ + BOOL bResult; + + SetLastError(0); + + _SEH2_TRY + { + bResult = SetBrushOrgEx(hdc, x, y, ppt); + } + _SEH2_EXCEPT(1) + { + bResult = -1; + } + _SEH2_END; + + ok(bResult == bExp, "line %ld: Wrong result, expected %ld, got %ld\n", + ulLine, bExp, bResult); + ok(GetLastError() == dwErrExp,"line %ld: Wrong error, expected %lx, got %lx\n", + ulLine, dwErrExp, GetLastError()); +} + +#define TEST_SET(hdc, x, y, ppt, bExp, dwErrExp) \ + Test_Set(__LINE__, hdc, x, y, ppt, bExp, dwErrExp) + +void Test_SetBrushOrgEx() +{ + HDC hdc; + POINT ptOldOrg; + + hdc = CreateCompatibleDC(0); + ok(hdc != 0, "could not ceate DC\n"); + + TEST_SET(0, 0, 0, NULL, 0, ERROR_INVALID_HANDLE); + TEST_SET(0, 0, 0, (LPPOINT)-1, 0, ERROR_INVALID_HANDLE); + TEST_SET(0, 0, 0, &ptOldOrg, 0, ERROR_INVALID_HANDLE); + TEST_SET(hdc, 1, 2, &ptOldOrg, 1, 0); + ok_long(ptOldOrg.x, 0); + ok_long(ptOldOrg.y, 0); + SetBrushOrgEx(hdc, 0, 0, &ptOldOrg); + ok_long(ptOldOrg.x, 1); + ok_long(ptOldOrg.y, 2); + + ptOldOrg.x = 0; ptOldOrg.y = 0; + TEST_SET(hdc, 1, 2, (LPPOINT)-1, -1, 0); + SetBrushOrgEx(hdc, 0, 0, &ptOldOrg); + ok_long(ptOldOrg.x, 0); + ok_long(ptOldOrg.y, 0); + + + TEST_SET(hdc, -10000, -20000000, &ptOldOrg, 1, 0); + ok_long(ptOldOrg.x, 0); + ok_long(ptOldOrg.y, 0); + SetBrushOrgEx(hdc, 0, 0, &ptOldOrg); + ok_long(ptOldOrg.x, -10000); + ok_long(ptOldOrg.y, -20000000); + + +} + +START_TEST(SetBrushOrgEx) +{ + Test_SetBrushOrgEx(); +} + Propchange: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 7 months

[cgutman] 56484: [TCPIP] - Update the cached link and IP information when a link status change occurs

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu May 3 18:38:59 2012 New Revision: 56484 URL: http://svn.reactos.org/svn/reactos?rev=56484&view=rev Log: [TCPIP] - Update the cached link and IP information when a link status change occurs Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Thu May 3 18:38:59 2012 @@ -734,6 +734,10 @@ Context->Adapter->CompletingReset = FALSE; + /* Update the IP and link status information cached in TCP */ + TCPUpdateInterfaceIPInformation(Interface); + TCPUpdateInterfaceLinkStatus(Interface); + /* We're done here if the adapter isn't connected */ if (Context->State != LAN_STATE_STARTED) {

12 years, 7 months

[tkreuzer] 56483: [WIN32K] Remove debug break point. Thanks to r3ddr4g0n for noticing.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 3 15:19:47 2012 New Revision: 56483 URL: http://svn.reactos.org/svn/reactos?rev=56483&view=rev Log: [WIN32K] Remove debug break point. Thanks to r3ddr4g0n for noticing. Modified: trunk/reactos/win32ss/gdi/eng/surface.c Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Thu May 3 15:19:47 2012 @@ -374,8 +374,6 @@ PSURFACE psurf; HSURF hsurf; -__debugbreak(); - /* Allocate a surface */ psurf = SURFACE_AllocSurface(STYPE_DEVICE, sizl.cx,

12 years, 7 months

[tkreuzer] 56482: [WIN32K] Only set the surface's bitmap bits when iType == STYPE_BITMAP. Fixes booting with vbox drivers installed.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 3 14:39:53 2012 New Revision: 56482 URL: http://svn.reactos.org/svn/reactos?rev=56482&view=rev Log: [WIN32K] Only set the surface's bitmap bits when iType == STYPE_BITMAP. Fixes booting with vbox drivers installed. Modified: trunk/reactos/win32ss/gdi/eng/surface.c Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Thu May 3 14:39:53 2012 @@ -257,25 +257,26 @@ RtlZeroMemory(pso->pvBits, cjBits); } } + + /* Set pvScan0 and lDelta */ + if (fjBitmap & BMF_TOPDOWN) + { + /* Topdown is the normal way */ + pso->pvScan0 = pso->pvBits; + pso->lDelta = cjWidth; + } + else + { + /* Inversed bitmap (bottom up) */ + pso->pvScan0 = ((PCHAR)pso->pvBits + pso->cjBits - cjWidth); + pso->lDelta = -(LONG)cjWidth; + } } else { /* There are no bitmap bits */ - pso->pvBits = NULL; - } - - /* Set pvScan0 and lDelta */ - if (fjBitmap & BMF_TOPDOWN) - { - /* Topdown is the normal way */ - pso->pvScan0 = pso->pvBits; - pso->lDelta = cjWidth; - } - else - { - /* Inversed bitmap (bottom up) */ - pso->pvScan0 = ((PCHAR)pso->pvBits + pso->cjBits - cjWidth); - pso->lDelta = -(LONG)cjWidth; + pso->pvScan0 = pso->pvBits = NULL; + pso->lDelta = 0; } /* Assign a default palette and increment its reference count */ @@ -373,6 +374,8 @@ PSURFACE psurf; HSURF hsurf; +__debugbreak(); + /* Allocate a surface */ psurf = SURFACE_AllocSurface(STYPE_DEVICE, sizl.cx,

12 years, 7 months

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 May 2012