Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 68681: [BROWSEUI] addendum to 68672
by cwittich＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: cwittich Date: Tue Aug 11 09:17:07 2015 New Revision: 68681 URL: http://svn.reactos.org/svn/reactos?rev=68681&view=rev Log: [BROWSEUI] addendum to 68672 Modified: trunk/reactos/dll/win32/browseui/addressband.cpp Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Tue Aug 11 09:17:07 2015 @@ -95,7 +95,7 @@ if (pdbi->dwMask & DBIM_TITLE) { if (!LoadStringW(_AtlBaseModule.GetResourceInstance(), IDS_ADDRESSBANDLABEL, pdbi->wszTitle, _countof(pdbi->wszTitle))) - return E_FAIL; + return HRESULT_FROM_WIN32(GetLastError()); } if (pdbi->dwMask & DBIM_MODEFLAGS)

1 0

[cwittich] 68680: [MSAFD] addendum to 68673
by cwittich＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: cwittich Date: Tue Aug 11 09:05:45 2015 New Revision: 68680 URL: http://svn.reactos.org/svn/reactos?rev=68680&view=rev Log: [MSAFD] addendum to 68673 Modified: trunk/reactos/dll/win32/msafd/misc/helpers.c Modified: trunk/reactos/dll/win32/msafd/misc/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/helpe… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] Tue Aug 11 09:05:45 2015 @@ -40,8 +40,8 @@ PLIST_ENTRY Helpers; INT Status; - TRACE("AddressFamily %p, SocketType %p, Protocol %p, Group %u, Flags %lx, HelperDllContext %p, HeplperDllData %p, Events %p\n", - AddressFamily, SocketType, Protocol, Group, Flags, HelperDllContext, HelperDllData, Events); + TRACE("AddressFamily %p, SocketType %p, Protocol %p, Group %u, Flags %lx, TransportName %p, HelperDllContext %p, HelperDllData %p, Events %p\n", + AddressFamily, SocketType, Protocol, Group, Flags, TransportName, HelperDllContext, HelperDllData, Events); /* Check in our Current Loaded Helpers */ for (Helpers = SockHelpersListHead.Flink;

1 0

[tfaber] 68679: [CMAKE] - Remove hackfix for VLC player, relocating wsock32.dll works fine now. Reverts r61898. CORE-8384 #resolve
by tfaber＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: tfaber Date: Tue Aug 11 09:02:25 2015 New Revision: 68679 URL: http://svn.reactos.org/svn/reactos?rev=68679&view=rev Log: [CMAKE] - Remove hackfix for VLC player, relocating wsock32.dll works fine now. Reverts r61898. CORE-8384 #resolve Modified: trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Tue Aug 11 09:02:25 2015 @@ -283,7 +283,7 @@ set(baseaddress_ws2_32_new 0x70790000) set(baseaddress_wshirda 0x70760000) set(baseaddress_wshtcpip 0x70730000) -set(baseaddress_wsock32 0x78700000) # FIXME: hackfix for VLC player +set(baseaddress_wsock32 0x70700000) set(baseaddress_wtsapi32 0x706d0000) set(baseaddress_wuapi 0x70690000) set(baseaddress_xinput1_1 0x70660000)

1 0

[tfaber] 68678: [NTOS:MM] - Ignore IMAGE_SCN_TYPE_NOLOAD when loading image sections, as shown by ntdll_apitest:NtMapViewOfSection. This avoids errors when trying to relocate .rossym sections (sinc...
by tfaber＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: tfaber Date: Tue Aug 11 08:47:14 2015 New Revision: 68678 URL: http://svn.reactos.org/svn/reactos?rev=68678&view=rev Log: [NTOS:MM] - Ignore IMAGE_SCN_TYPE_NOLOAD when loading image sections, as shown by ntdll_apitest:NtMapViewOfSection. This avoids errors when trying to relocate .rossym sections (since they were not loaded but Ldr tried to change their protection) CORE-8384 Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Aug 11 08:47:14 2015 @@ -4216,13 +4216,10 @@ * and calculate the image base address */ for (i = 0; i < NrSegments; i++) { - if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + if (Segment == &SectionSegments[i]) { - if (Segment == &SectionSegments[i]) - { - ImageBaseAddress = (char*)BaseAddress - (ULONG_PTR)SectionSegments[i].Image.VirtualAddress; - break; - } + ImageBaseAddress = (char*)BaseAddress - (ULONG_PTR)SectionSegments[i].Image.VirtualAddress; + break; } } if (i >= NrSegments) @@ -4232,18 +4229,15 @@ for (i = 0; i < NrSegments; i++) { - if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + PVOID SBaseAddress = (PVOID) + ((char*)ImageBaseAddress + (ULONG_PTR)SectionSegments[i].Image.VirtualAddress); + + Status = MmUnmapViewOfSegment(AddressSpace, SBaseAddress); + if (!NT_SUCCESS(Status)) { - PVOID SBaseAddress = (PVOID) - ((char*)ImageBaseAddress + (ULONG_PTR)SectionSegments[i].Image.VirtualAddress); - - Status = MmUnmapViewOfSegment(AddressSpace, SBaseAddress); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmUnmapViewOfSegment failed for %p (Process %p) with %lx\n", - SBaseAddress, Process, Status); - NT_ASSERT(NT_SUCCESS(Status)); - } + DPRINT1("MmUnmapViewOfSegment failed for %p (Process %p) with %lx\n", + SBaseAddress, Process, Status); + NT_ASSERT(NT_SUCCESS(Status)); } } } @@ -4520,13 +4514,10 @@ ImageSize = 0; for (i = 0; i < NrSegments; i++) { - if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD)) - { - ULONG_PTR MaxExtent; - MaxExtent = (ULONG_PTR)(SectionSegments[i].Image.VirtualAddress + - SectionSegments[i].Length.QuadPart); - ImageSize = max(ImageSize, MaxExtent); - } + ULONG_PTR MaxExtent; + MaxExtent = (ULONG_PTR)(SectionSegments[i].Image.VirtualAddress + + SectionSegments[i].Length.QuadPart); + ImageSize = max(ImageSize, MaxExtent); } ImageSectionObject->ImageInformation.ImageFileSize = (ULONG)ImageSize; @@ -4570,25 +4561,22 @@ for (i = 0; i < NrSegments; i++) { - if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + PVOID SBaseAddress = (PVOID) + ((char*)ImageBase + (ULONG_PTR)SectionSegments[i].Image.VirtualAddress); + MmLockSectionSegment(&SectionSegments[i]); + Status = MmMapViewOfSegment(AddressSpace, + Section, + &SectionSegments[i], + &SBaseAddress, + SectionSegments[i].Length.LowPart, + SectionSegments[i].Protection, + 0, + 0); + MmUnlockSectionSegment(&SectionSegments[i]); + if (!NT_SUCCESS(Status)) { - PVOID SBaseAddress = (PVOID) - ((char*)ImageBase + (ULONG_PTR)SectionSegments[i].Image.VirtualAddress); - MmLockSectionSegment(&SectionSegments[i]); - Status = MmMapViewOfSegment(AddressSpace, - Section, - &SectionSegments[i], - &SBaseAddress, - SectionSegments[i].Length.LowPart, - SectionSegments[i].Protection, - 0, - 0); - MmUnlockSectionSegment(&SectionSegments[i]); - if (!NT_SUCCESS(Status)) - { - MmUnlockAddressSpace(AddressSpace); - return(Status); - } + MmUnlockAddressSpace(AddressSpace); + return(Status); } }

1 0

[tfaber] 68677: [NTOS:MM] - When paging in data for an image section, first flush outstanding cached data since paging reads are noncached. Fixes failure to create section in ntdll_apitest:NtMapVie...
by tfaber＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: tfaber Date: Tue Aug 11 08:21:36 2015 New Revision: 68677 URL: http://svn.reactos.org/svn/reactos?rev=68677&view=rev Log: [NTOS:MM] - When paging in data for an image section, first flush outstanding cached data since paging reads are noncached. Fixes failure to create section in ntdll_apitest:NtMapViewOfSection/Test_NoLoadSection - Gracefully handle out-of-pool situation CORE-8384 Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Aug 11 08:21:36 2015 @@ -3236,6 +3236,12 @@ BufferSize = Length + OffsetAdjustment; BufferSize = PAGE_ROUND_UP(BufferSize); + /* Flush data since we're about to perform a non-cached read */ + CcFlushCache(FileObject->SectionObjectPointer, + &FileOffset, + BufferSize, + &Iosb); + /* * It's ok to use paged pool, because this is a temporary buffer only used in * the loading of executables. The assumption is that MmCreateSection is @@ -3247,7 +3253,7 @@ 'rXmM'); if (!Buffer) { - KeBugCheck(MEMORY_MANAGEMENT); + return STATUS_INSUFFICIENT_RESOURCES; } UsedSize = 0;

1 0

[tfaber] 68676: [NTDLL_APITEST] - Add tests for mapping and relocating an image with an IMAGE_SCN_TYPE_NOLOAD section CORE-8384
by tfaber＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: tfaber Date: Tue Aug 11 07:21:33 2015 New Revision: 68676 URL: http://svn.reactos.org/svn/reactos?rev=68676&view=rev Log: [NTDLL_APITEST] - Add tests for mapping and relocating an image with an IMAGE_SCN_TYPE_NOLOAD section CORE-8384 Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtMapViewO… ============================================================================== --- trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] Tue Aug 11 07:21:33 2015 @@ -3,6 +3,7 @@ * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory * PURPOSE: Test for NtMapViewOfSection * PROGRAMMERS: Timo Kreuzer + * Thomas Faber */ #include <apitest.h> @@ -1073,7 +1074,281 @@ ok(((ULONG_PTR)BaseAddress1 - (ULONG_PTR)BaseAddress2) == 0x10000, "Invalid addresses: BaseAddress1=%p, BaseAddress2=%p\n", BaseAddress1, BaseAddress2); #endif - +} + +#define BYTES4(x) x, x, x, x +#define BYTES8(x) BYTES4(x), BYTES4(x) +#define BYTES16(x) BYTES8(x), BYTES8(x) +#define BYTES32(x) BYTES16(x), BYTES16(x) +#define BYTES64(x) BYTES32(x), BYTES32(x) +#define BYTES128(x) BYTES64(x), BYTES64(x) +#define BYTES256(x) BYTES128(x), BYTES128(x) +#define BYTES512(x) BYTES256(x), BYTES256(x) +#define BYTES1024(x) BYTES512(x), BYTES512(x) + +static struct _MY_IMAGE_FILE +{ + IMAGE_DOS_HEADER doshdr; + WORD stub[32]; + IMAGE_NT_HEADERS32 nthdrs; + IMAGE_SECTION_HEADER text_header; + IMAGE_SECTION_HEADER rossym_header; + IMAGE_SECTION_HEADER rsrc_header; + BYTE pad[16]; + BYTE text_data[0x400]; + BYTE rossym_data[0x400]; + BYTE rsrc_data[0x400]; +} ImageFile = +{ + /* IMAGE_DOS_HEADER */ + { + IMAGE_DOS_SIGNATURE, 144, 3, 0, 4, 0, 0xFFFF, 0, 0xB8, 0, 0, 0, 0x40, + 0, { 0 }, 0, 0, { 0 }, 0x80 + }, + /* binary to print "This program cannot be run in DOS mode." */ + { + 0x1F0E, 0x0EBA, 0xB400, 0xCD09, 0xB821, 0x4C01, 0x21CD, 0x6854, 0x7369, + 0x7020, 0x6F72, 0x7267, 0x6D61, 0x6320, 0x6E61, 0x6F6E, 0x2074, 0x6562, + 0x7220, 0x6E75, 0x6920, 0x206E, 0x4F44, 0x2053, 0x6F6D, 0x6564, 0x0D2E, + 0x0A0D, 0x0024, 0x0000, 0x0000, 0x0000 + }, + /* IMAGE_NT_HEADERS32 */ + { + IMAGE_NT_SIGNATURE, /* Signature */ + /* IMAGE_FILE_HEADER */ + { + IMAGE_FILE_MACHINE_I386, /* Machine */ + 3, /* NumberOfSections */ + 0x47EFDF09, /* TimeDateStamp */ + 0, /* PointerToSymbolTable */ + 0, /* NumberOfSymbols */ + 0xE0, /* SizeOfOptionalHeader */ + IMAGE_FILE_32BIT_MACHINE | IMAGE_FILE_LOCAL_SYMS_STRIPPED | + IMAGE_FILE_LINE_NUMS_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE | + IMAGE_FILE_DLL, /* Characteristics */ + }, + /* IMAGE_OPTIONAL_HEADER32 */ + { + IMAGE_NT_OPTIONAL_HDR32_MAGIC, /* Magic */ + 8, /* MajorLinkerVersion */ + 0, /* MinorLinkerVersion */ + 0x400, /* SizeOfCode */ + 0x000, /* SizeOfInitializedData */ + 0, /* SizeOfUninitializedData */ + 0x2000, /* AddressOfEntryPoint */ + 0x2000, /* BaseOfCode */ + 0x0000, /* BaseOfData */ + 0x400000, /* ImageBase */ + 0x2000, /* SectionAlignment */ + 0x200, /* FileAlignment */ + 4, /* MajorOperatingSystemVersion */ + 0, /* MinorOperatingSystemVersion */ + 0, /* MajorImageVersion */ + 0, /* MinorImageVersion */ + 4, /* MajorSubsystemVersion */ + 0, /* MinorSubsystemVersion */ + 0, /* Win32VersionValue */ + 0x8000, /* SizeOfImage */ + 0x200, /* SizeOfHeaders */ + 0x0, /* CheckSum */ + IMAGE_SUBSYSTEM_WINDOWS_CUI, /* Subsystem */ + IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE | + IMAGE_DLLCHARACTERISTICS_NO_SEH | + IMAGE_DLLCHARACTERISTICS_NX_COMPAT, /* DllCharacteristics */ + 0x100000, /* SizeOfStackReserve */ + 0x1000, /* SizeOfStackCommit */ + 0x100000, /* SizeOfHeapReserve */ + 0x1000, /* SizeOfHeapCommit */ + 0, /* LoaderFlags */ + 0x10, /* NumberOfRvaAndSizes */ + /* IMAGE_DATA_DIRECTORY */ + { + { 0 }, /* Export Table */ + { 0 }, /* Import Table */ + { 0 }, /* Resource Table */ + { 0 }, /* Exception Table */ + { 0 }, /* Certificate Table */ + { 0 }, /* Base Relocation Table */ + { 0 }, /* Debug */ + { 0 }, /* Copyright */ + { 0 }, /* Global Ptr */ + { 0 }, /* TLS Table */ + { 0 }, /* Load Config Table */ + { 0 }, /* Bound Import */ + { 0 }, /* IAT */ + { 0 }, /* Delay Import Descriptor */ + { 0 }, /* CLI Header */ + { 0 } /* Reserved */ + } + } + }, + /* IMAGE_SECTION_HEADER */ + { + ".text", /* Name */ + { 0x394 }, /* Misc.VirtualSize */ + 0x2000, /* VirtualAddress */ + 0x400, /* SizeOfRawData */ + 0x200, /* PointerToRawData */ + 0, /* PointerToRelocations */ + 0, /* PointerToLinenumbers */ + 0, /* NumberOfRelocations */ + 0, /* NumberOfLinenumbers */ + IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE | + IMAGE_SCN_CNT_CODE, /* Characteristics */ + }, + /* IMAGE_SECTION_HEADER */ + { + ".rossym", /* Name */ + { 0x100 }, /* Misc.VirtualSize */ + 0x4000, /* VirtualAddress */ + 0x400, /* SizeOfRawData */ + 0x600, /* PointerToRawData */ + 0, /* PointerToRelocations */ + 0, /* PointerToLinenumbers */ + 0, /* NumberOfRelocations */ + 0, /* NumberOfLinenumbers */ + IMAGE_SCN_MEM_READ | IMAGE_SCN_TYPE_NOLOAD, /* Characteristics */ + }, + /* IMAGE_SECTION_HEADER */ + { + ".rsrc", /* Name */ + { 0x100 }, /* Misc.VirtualSize */ + 0x6000, /* VirtualAddress */ + 0x400, /* SizeOfRawData */ + 0xA00, /* PointerToRawData */ + 0, /* PointerToRelocations */ + 0, /* PointerToLinenumbers */ + 0, /* NumberOfRelocations */ + 0, /* NumberOfLinenumbers */ + IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, /* Characteristics */ + }, + /* fill */ + { 0 }, + /* text */ + { 0xc3, 0 }, + /* rossym */ + { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, + BYTES8(0xaa), + BYTES16(0xbb), + BYTES32(0xcc), + BYTES64(0xdd), + BYTES64(0xee), + BYTES64(0xff), + }, + /* rsrc */ + { 0 }, +}; + +C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, text_data) == 0x200); +C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, rossym_data) == 0x600); +C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, rsrc_data) == 0xa00); + +static +void +Test_NoLoadSection(BOOL Relocate) +{ + NTSTATUS Status; + WCHAR TempPath[MAX_PATH]; + WCHAR FileName[MAX_PATH]; + HANDLE Handle; + HANDLE SectionHandle; + LARGE_INTEGER SectionOffset; + PVOID BaseAddress; + SIZE_T ViewSize; + ULONG Written; + ULONG Length; + BOOL Success; + + Length = GetTempPathW(MAX_PATH, TempPath); + ok(Length != 0, "GetTempPathW failed with %lu\n", GetLastError()); + Length = GetTempFileNameW(TempPath, L"nta", 0, FileName); + ok(Length != 0, "GetTempFileNameW failed with %lu\n", GetLastError()); + Handle = CreateFileW(FileName, + FILE_ALL_ACCESS, + 0, + NULL, + CREATE_ALWAYS, + 0, + NULL); + if (Handle == INVALID_HANDLE_VALUE) + { + skip("Failed to create temp file %ls, error %lu\n", FileName, GetLastError()); + return; + } + if (Relocate) + { + ok((ULONG_PTR)GetModuleHandle(NULL) <= 0x80000000, "Module at %p\n", GetModuleHandle(NULL)); + ImageFile.nthdrs.OptionalHeader.ImageBase = (ULONG)(ULONG_PTR)GetModuleHandle(NULL); + } + else + { + ImageFile.nthdrs.OptionalHeader.ImageBase = 0xe400000; + } + + Success = WriteFile(Handle, + &ImageFile, + sizeof(ImageFile), + &Written, + NULL); + ok(Success == TRUE, "WriteFile failed with %lu\n", GetLastError()); + ok(Written == sizeof(ImageFile), "WriteFile wrote %lu bytes\n", Written); + + Status = NtCreateSection(&SectionHandle, + SECTION_ALL_ACCESS, + NULL, + NULL, + PAGE_EXECUTE_READWRITE, + SEC_IMAGE, + Handle); + ok_ntstatus(Status, STATUS_SUCCESS); + + if (NT_SUCCESS(Status)) + { + /* Map the section with */ + BaseAddress = NULL; + SectionOffset.QuadPart = 0; + ViewSize = 0; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + if (Relocate) + ok_ntstatus(Status, STATUS_IMAGE_NOT_AT_BASE); + else + ok_ntstatus(Status, STATUS_SUCCESS); + if (NT_SUCCESS(Status)) + { + PUCHAR Bytes = BaseAddress; +#define TEST_BYTE(n, v) StartSeh() ok_hex(Bytes[n], v); EndSeh(STATUS_SUCCESS); + TEST_BYTE(0x2000, 0xc3); + TEST_BYTE(0x2001, 0x00); + TEST_BYTE(0x4000, 0x01); + TEST_BYTE(0x4001, 0x23); + TEST_BYTE(0x4007, 0xef); + TEST_BYTE(0x4008, 0xaa); + TEST_BYTE(0x4010, 0xbb); + TEST_BYTE(0x4020, 0xcc); + TEST_BYTE(0x4040, 0xdd); + TEST_BYTE(0x4080, 0xee); + TEST_BYTE(0x40c0, 0xff); + TEST_BYTE(0x40ff, 0xff); + TEST_BYTE(0x4100, 0x00); + TEST_BYTE(0x41ff, 0x00); + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + ok_ntstatus(Status, STATUS_SUCCESS); + } + Status = NtClose(SectionHandle); + ok_ntstatus(Status, STATUS_SUCCESS); + } + + CloseHandle(Handle); + DeleteFileW(FileName); } START_TEST(NtMapViewOfSection) @@ -1081,4 +1356,6 @@ Test_PageFileSection(); Test_ImageSection(); Test_BasedSection(); + Test_NoLoadSection(FALSE); + Test_NoLoadSection(TRUE); }

1 0

[tfaber] 68675: [NTDLL_APITEST] - Properly clean up after tests
by tfaber＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: tfaber Date: Tue Aug 11 07:13:51 2015 New Revision: 68675 URL: http://svn.reactos.org/svn/reactos?rev=68675&view=rev Log: [NTDLL_APITEST] - Properly clean up after tests Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtMapViewO… ============================================================================== --- trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] Tue Aug 11 07:13:51 2015 @@ -257,8 +257,13 @@ ok_ntstatus(Status, STATUS_SUCCESS); /* Close the mapping */ - NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); - NtClose(SectionHandle); + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + ok_ntstatus(Status, STATUS_SUCCESS); + BaseAddress = (PVOID)0x30000000; + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtClose(SectionHandle); + ok_ntstatus(Status, STATUS_SUCCESS); /* Create a page file backed section, but only reserved */ MaximumSize.QuadPart = 0x20000; @@ -395,9 +400,12 @@ ok(*(PULONG)BaseAddress2 == 2, "Value in memory was wrong\n"); /* Close the mapping */ - NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); - NtUnmapViewOfSection(NtCurrentProcess(), (PUCHAR)BaseAddress2 - PAGE_SIZE); - NtClose(SectionHandle); + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtUnmapViewOfSection(NtCurrentProcess(), (PUCHAR)BaseAddress2 - PAGE_SIZE); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtClose(SectionHandle); + ok_ntstatus(Status, STATUS_SUCCESS); /* Try to create a 512 GB page file backed section with committed pages */ MaximumSize.QuadPart = 0x8000000000; @@ -633,6 +641,10 @@ Status = NtAllocateVirtualMemory(NtCurrentProcess(), &BaseAddress2, 0, &ViewSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtClose(SectionHandle); + ok_ntstatus(Status, STATUS_SUCCESS); } void @@ -778,7 +790,7 @@ 0, // AllocationType PAGE_READONLY); #ifdef _M_IX86 - ok_ntstatus(Status, STATUS_IMAGE_NOT_AT_BASE); + ok_ntstatus(Status, STATUS_SUCCESS); #else ok_ntstatus(Status, STATUS_IMAGE_MACHINE_TYPE_MISMATCH); #endif @@ -864,7 +876,7 @@ 0, PAGE_READONLY); #ifdef _M_IX86 - ok_ntstatus(Status, STATUS_IMAGE_NOT_AT_BASE); + ok_ntstatus(Status, STATUS_SUCCESS); #else ok_ntstatus(Status, STATUS_IMAGE_MACHINE_TYPE_MISMATCH); #endif @@ -1056,13 +1068,11 @@ ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); #else ok_ntstatus(Status, STATUS_SUCCESS); -#endif - - ok_ntstatus(Status, STATUS_SUCCESS); ok((ULONG_PTR)BaseAddress2 < (ULONG_PTR)BaseAddress1, "Invalid addresses: BaseAddress1=%p, BaseAddress2=%p\n", BaseAddress1, BaseAddress2); ok(((ULONG_PTR)BaseAddress1 - (ULONG_PTR)BaseAddress2) == 0x10000, "Invalid addresses: BaseAddress1=%p, BaseAddress2=%p\n", BaseAddress1, BaseAddress2); +#endif }

1 0

[tfaber] 68674: [NTDLL_APITEST] - Look for test.dll in the right place
by tfaber＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: tfaber Date: Tue Aug 11 06:45:45 2015 New Revision: 68674 URL: http://svn.reactos.org/svn/reactos?rev=68674&view=rev Log: [NTDLL_APITEST] - Look for test.dll in the right place Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtMapViewO… ============================================================================== --- trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] Tue Aug 11 06:45:45 2015 @@ -1,23 +1,14 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for NtMapViewOfSection + * PROGRAMMERS: Timo Kreuzer + */ #include <apitest.h> - +#include <strsafe.h> #define WIN32_NO_STATUS #include <ndk/ntndk.h> - -NTSYSAPI -NTSTATUS -NTAPI -NtMapViewOfSection( - HANDLE SectionHandle, - HANDLE ProcessHandle, - PVOID *BaseAddress, - ULONG_PTR ZeroBits, - SIZE_T CommitSize, - PLARGE_INTEGER SectionOffset, - PSIZE_T ViewSize, - SECTION_INHERIT InheritDisposition, - ULONG AllocationType, - ULONG Protect); void Test_PageFileSection(void) @@ -651,11 +642,15 @@ NTSTATUS Status; OBJECT_ATTRIBUTES FileObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; + WCHAR TestDllPath[MAX_PATH]; HANDLE FileHandle, DataSectionHandle, ImageSectionHandle; PVOID DataBase, ImageBase; SIZE_T ViewSize; - if (!RtlDosPathNameToNtPathName_U(L"testdata\\test.dll", + GetModuleFileNameW(NULL, TestDllPath, RTL_NUMBER_OF(TestDllPath)); + wcsrchr(TestDllPath, L'\\')[1] = UNICODE_NULL; + StringCbCatW(TestDllPath, sizeof(TestDllPath), L"testdata\\test.dll"); + if (!RtlDosPathNameToNtPathName_U(TestDllPath, &FileName, NULL, NULL)) @@ -1077,4 +1072,3 @@ Test_ImageSection(); Test_BasedSection(); } -

1 0

[cwittich] 68673: [MSAFD] don't trace an uninitialized UNICODE_STRING
by cwittich＠svn.reactos.org 10 Aug '15

10 Aug '15

Author: cwittich Date: Mon Aug 10 17:54:57 2015 New Revision: 68673 URL: http://svn.reactos.org/svn/reactos?rev=68673&view=rev Log: [MSAFD] don't trace an uninitialized UNICODE_STRING Modified: trunk/reactos/dll/win32/msafd/misc/helpers.c Modified: trunk/reactos/dll/win32/msafd/misc/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/helpe… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] Mon Aug 10 17:54:57 2015 @@ -40,8 +40,8 @@ PLIST_ENTRY Helpers; INT Status; - TRACE("AddressFamily %p, SocketType %p, Protocol %p, Group %u, Flags %lx, TransportName %wZ, HelperDllContext %p, HeplperDllData %p, Events %p\n", - AddressFamily, SocketType, Protocol, Group, Flags, TransportName, HelperDllContext, HelperDllData, Events); + TRACE("AddressFamily %p, SocketType %p, Protocol %p, Group %u, Flags %lx, HelperDllContext %p, HeplperDllData %p, Events %p\n", + AddressFamily, SocketType, Protocol, Group, Flags, HelperDllContext, HelperDllData, Events); /* Check in our Current Loaded Helpers */ for (Helpers = SockHelpersListHead.Flink;

1 0

[dreimer] 68672: [BROWSEUI] Address is untranslatable by Adam Stachowicz CORE-9977 #resolve #comment Committed (with a Unicode fix), thx ^^
by dreimer＠svn.reactos.org 10 Aug '15

10 Aug '15

Author: dreimer Date: Mon Aug 10 16:52:40 2015 New Revision: 68672 URL: http://svn.reactos.org/svn/reactos?rev=68672&view=rev Log: [BROWSEUI] Address is untranslatable by Adam Stachowicz CORE-9977 #resolve #comment Committed (with a Unicode fix), thx ^^ Modified: trunk/reactos/dll/win32/browseui/addressband.cpp Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Mon Aug 10 16:52:40 2015 @@ -93,7 +93,11 @@ pdbi->ptActual.y = 22; } if (pdbi->dwMask & DBIM_TITLE) - wcscpy(pdbi->wszTitle, L"Address"); + { + if (!LoadStringW(_AtlBaseModule.GetResourceInstance(), IDS_ADDRESSBANDLABEL, pdbi->wszTitle, _countof(pdbi->wszTitle))) + return E_FAIL; + } + if (pdbi->dwMask & DBIM_MODEFLAGS) pdbi->dwModeFlags = DBIMF_UNDELETEABLE; if (pdbi->dwMask & DBIM_BKCOLOR)

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