Ros-diffs May 2016

ros-diffs@reactos.org

18 participants
260 discussions

[mjansen] 71290: [APPHELP] Addendum to r71226, fix some failing testcases of SdbGetFileAttributes + make it more robust. CORE-10367 - Work around a ROS bug (CORE-11206) by doing some better bounds ...

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun May 8 20:43:59 2016 New Revision: 71290 URL: http://svn.reactos.org/svn/reactos?rev=71290&view=rev Log: [APPHELP] Addendum to r71226, fix some failing testcases of SdbGetFileAttributes + make it more robust. CORE-10367 - Work around a ROS bug (CORE-11206) by doing some better bounds checking. - Silence a VAD warning by checking for NULL instead of blindly passing mem to NtUnmapViewOfSection - Rewrite module type lookup code to use an enum and to return the found header. Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Sun May 8 20:43:59 2016 @@ -284,7 +284,9 @@ void WINAPI SdbpCloseMemMappedFile(PMEMMAPPED mapping) { - NtUnmapViewOfSection(NtCurrentProcess(), mapping->view); + /* Prevent a VAD warning */ + if (mapping->view) + NtUnmapViewOfSection(NtCurrentProcess(), mapping->view); NtClose(mapping->section); NtClose(mapping->file); RtlZeroMemory(mapping, sizeof(*mapping)); Modified: trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbf… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c [iso-8859-1] Sun May 8 20:43:59 2016 @@ -27,6 +27,14 @@ #include "wine/unicode.h" #define NUM_ATTRIBUTES 28 +enum APPHELP_MODULETYPE +{ + MODTYPE_UNKNOWN = 0, + MODTYPE_DOS = 1, + MODTYPE_NE = 2, + MODTYPE_PE = 3, +}; + static void WINAPI SdbpSetDWORDAttr(PATTRINFO attr, TAG tag, DWORD value) { @@ -176,25 +184,33 @@ return checks; } -static DWORD WINAPI SdbpGetModuleType(PMEMMAPPED mapping) +static DWORD WINAPI SdbpGetModuleType(PMEMMAPPED mapping, PIMAGE_NT_HEADERS* nt_headers) { PIMAGE_DOS_HEADER dos = (PIMAGE_DOS_HEADER)mapping->view; PIMAGE_OS2_HEADER os2; + *nt_headers = NULL; + if (mapping->size < 2 || dos->e_magic != IMAGE_DOS_SIGNATURE) - return 0; + return MODTYPE_UNKNOWN; if (mapping->size < sizeof(IMAGE_DOS_HEADER) || mapping->size < (dos->e_lfanew+2)) - return 1; + return MODTYPE_DOS; os2 = (PIMAGE_OS2_HEADER)((PBYTE)dos + dos->e_lfanew); if (os2->ne_magic == IMAGE_OS2_SIGNATURE || os2->ne_magic == IMAGE_OS2_SIGNATURE_LE) - return 2; + { + *nt_headers = (PIMAGE_NT_HEADERS)os2; + return MODTYPE_NE; + } if (mapping->size >= (dos->e_lfanew + 4) && ((PIMAGE_NT_HEADERS)os2)->Signature == IMAGE_NT_SIGNATURE) - return 3; - - return 1; + { + *nt_headers = (PIMAGE_NT_HEADERS)os2; + return MODTYPE_PE; + } + + return MODTYPE_DOS; } /** @@ -246,8 +262,9 @@ PIMAGE_NT_HEADERS headers; MEMMAPPED mapped; + PBYTE mapping_end; PVOID file_info = 0; - DWORD headersum, checksum, module_type; + DWORD module_type; WCHAR translation[128] = {0}; PATTRINFO attr_info; @@ -261,6 +278,7 @@ SHIM_ERR("Error retrieving FILEINFO structure\n"); return FALSE; } + mapping_end = mapped.view + mapped.size; attr_info = (PATTRINFO)SdbAlloc(NUM_ATTRIBUTES * sizeof(ATTRINFO)); @@ -269,15 +287,14 @@ SdbpSetDWORDAttr(&attr_info[1], TAG_CHECKSUM, SdbpCalculateFileChecksum(&mapped)); else SdbpSetAttrFail(&attr_info[1]); - module_type = SdbpGetModuleType(&mapped); - - if (module_type) + module_type = SdbpGetModuleType(&mapped, &headers); + + if (module_type != MODTYPE_UNKNOWN) SdbpSetDWORDAttr(&attr_info[16], TAG_MODULE_TYPE, module_type); else SdbpSetAttrFail(&attr_info[16]); /* TAG_MODULE_TYPE */ - headers = CheckSumMappedFile(mapped.view, mapped.size, &headersum, &checksum); - if (headers) + if (headers && module_type == MODTYPE_PE && ((PBYTE)(headers+1) <= mapping_end)) { DWORD info_size; SIZE_T export_dir_size; @@ -318,7 +335,7 @@ SdbpSetDWORDAttr(&attr_info[24], TAG_UPTO_LINK_DATE, headers->FileHeader.TimeDateStamp); export_dir = (PIMAGE_EXPORT_DIRECTORY)ImageDirectoryEntryToData(mapped.view, FALSE, IMAGE_DIRECTORY_ENTRY_EXPORT, &export_dir_size); - if (export_dir) + if (export_dir && ((PBYTE)(export_dir+1) <= mapping_end)) { PIMAGE_SECTION_HEADER section = NULL; PBYTE export_name = ImageRvaToVa(headers, mapped.view, export_dir->Name, &section); @@ -345,18 +362,17 @@ if (n != 16 && n != 26) SdbpSetAttrFail(&attr_info[n]); } - if (module_type == 2) - { - PIMAGE_DOS_HEADER dos = (PIMAGE_DOS_HEADER)mapped.view; - PBYTE end = mapped.view + mapped.size, ptr; - PIMAGE_OS2_HEADER os2 = (PIMAGE_OS2_HEADER)((PBYTE)dos + dos->e_lfanew); - if ((PBYTE)(os2 + 1) <= end) + if (module_type == MODTYPE_NE) + { + PBYTE ptr; + PIMAGE_OS2_HEADER os2 = (PIMAGE_OS2_HEADER)headers; + if ((PBYTE)(os2 + 1) <= mapping_end) { - ptr = (PBYTE)dos + os2->ne_nrestab; - if (ptr <= end && (ptr + 1 + *ptr) <= end) + ptr = mapped.view + os2->ne_nrestab; + if (ptr <= mapping_end && (ptr + 1 + *ptr) <= mapping_end) SdbpSetStringAttrFromPascalString(&attr_info[19], TAG_16BIT_DESCRIPTION, ptr); ptr = (PBYTE)os2 + os2->ne_restab; - if (ptr <= end && (ptr + 1 + *ptr) <= end) + if (ptr <= mapping_end && (ptr + 1 + *ptr) <= mapping_end) SdbpSetStringAttrFromPascalString(&attr_info[20], TAG_16BIT_MODULE_NAME, ptr); } }

8 years, 7 months

[mjansen] 71289: [NTDLL_APITEST] Show that NtMapViewOfSection does not properly NULL out the remainder of the mapped memory. CORE-11206

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun May 8 17:01:15 2016 New Revision: 71289 URL: http://svn.reactos.org/svn/reactos?rev=71289&view=rev Log: [NTDLL_APITEST] Show that NtMapViewOfSection does not properly NULL out the remainder of the mapped memory. CORE-11206 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] Sun May 8 17:01:15 2016 @@ -1398,6 +1398,101 @@ DeleteFileW(FileName); } +// CORE-11206 +static void +Test_Truncate(VOID) +{ + WCHAR TempPath[MAX_PATH]; + WCHAR FileName[MAX_PATH]; + NTSTATUS Status; + SIZE_T ViewSize = 0; + HANDLE Handle; + HANDLE SectionHandle; + + ULONG Length; + BOOL Success; + DWORD Written, Error; + VOID* BaseAddress; + + 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); + + Success = WriteFile(Handle, "TESTDATA", 8, &Written, NULL); + ok(Success == TRUE, "WriteFile failed with %lu\n", GetLastError()); + ok(Written == 8, "WriteFile wrote %lu bytes\n", Written); + + Written = SetFilePointer(Handle, 6, NULL, FILE_BEGIN); + ok(Written == 6, "SetFilePointer returned %lu bytes\n", Written); + Success = SetEndOfFile(Handle); + ok(Success == TRUE, "SetEndOfFile failed with %lu\n", GetLastError()); + + Status = NtCreateSection(&SectionHandle, + STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, + 0, 0, PAGE_READONLY, SEC_COMMIT, Handle); + ok_ntstatus(Status, STATUS_SUCCESS); + BaseAddress = NULL; + ViewSize = 0; + Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &BaseAddress, 0, + 0, 0, &ViewSize, ViewShare, 0, PAGE_READONLY); + ok_ntstatus(Status, STATUS_SUCCESS); + + if (BaseAddress) + { + // First we test data that was truncated even before the file mapping was opened + Length = strlen((char*)BaseAddress); + ok(Length == 6, "Old data was not properly erased! (Length=%lu)\n", Length); + } + + // Now we truncate the file on disk some more + Written = SetFilePointer(Handle, 4, NULL, FILE_BEGIN); + ok(Written == 4, "SetFilePointer returned %lu bytes\n", Written); + Success = SetEndOfFile(Handle); + Error = GetLastError(); + ok(Success == FALSE, "SetEndOfFile succeeded\n"); + ok(Error == ERROR_USER_MAPPED_FILE, "SetEndOfFile did not set error to ERROR_USER_MAPPED_FILE (%lu)\n", Error); + + if (BaseAddress) + { + Length = strlen((char*)BaseAddress); + ok(Length == 6, "Length should not have changed! (Length=%lu)\n", Length); + } + + // Unmap and set the end shorter. + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + ok_ntstatus(Status, STATUS_SUCCESS); + Success = CloseHandle(SectionHandle); + ok(Success == TRUE, "CloseHandle failed with %lu\n", GetLastError()); + + Written = SetFilePointer(Handle, 4, NULL, FILE_BEGIN); + ok(Written == 4, "SetFilePointer returned %lu bytes\n", Written); + Success = SetEndOfFile(Handle); + ok(Success == TRUE, "SetEndOfFile failed with %lu\n", GetLastError()); + + Status = NtCreateSection(&SectionHandle, + STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, + 0, 0, PAGE_READONLY, SEC_COMMIT, Handle); + ok_ntstatus(Status, STATUS_SUCCESS); + BaseAddress = NULL; + ViewSize = 0; + Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &BaseAddress, 0, + 0, 0, &ViewSize, ViewShare, 0, PAGE_READONLY); + ok_ntstatus(Status, STATUS_SUCCESS); + + // CLEANUP + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + ok_ntstatus(Status, STATUS_SUCCESS); + Success = CloseHandle(SectionHandle); + ok(Success == TRUE, "CloseHandle failed with %lu\n", GetLastError()); + Success = CloseHandle(Handle); + ok(Success == TRUE, "CloseHandle failed with %lu\n", GetLastError()); + + Success = DeleteFileW(FileName); + ok(Success == TRUE, "DeleteFileW failed with %lu\n", GetLastError()); +} + START_TEST(NtMapViewOfSection) { Test_PageFileSection(); @@ -1406,4 +1501,5 @@ Test_NoLoadSection(FALSE); Test_NoLoadSection(TRUE); Test_EmptyFile(); + Test_Truncate(); }

8 years, 7 months

[spetreolle] 71288: Add the AHK tests as an optional module. ONLINE-567

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun May 8 15:01:46 2016 New Revision: 71288 URL: http://svn.reactos.org/svn/reactos?rev=71288&view=rev Log: Add the AHK tests as an optional module. ONLINE-567 Modified: trunk/reactos/modules/CMakeLists.txt Modified: trunk/reactos/modules/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/modules/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/modules/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/modules/CMakeLists.txt [iso-8859-1] Sun May 8 15:01:46 2016 @@ -10,6 +10,11 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/wallpapers/) add_subdirectory(wallpapers) endif() + +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/AHK_Tests/) + add_subdirectory(AHK_Tests) +endif() + ## Extra files for Boot/Live/Hybrid CD. You need to put them under [boot|live|hybrid]cd_extras ## in the same layout as you want them to be in the CD.

8 years, 7 months

[hbelusca] 71287: [KSFILTER]: We may need to check the result of KspScanBus call here. To see whether we need to do that, add an assert. If hit then we know KspScanBus can fail and some proper fail...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 8 14:53:14 2016 New Revision: 71287 URL: http://svn.reactos.org/svn/reactos?rev=71287&view=rev Log: [KSFILTER]: We may need to check the result of KspScanBus call here. To see whether we need to do that, add an assert. If hit then we know KspScanBus can fail and some proper failure code will be needed. Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sun May 8 14:53:14 2016 @@ -1124,7 +1124,9 @@ } /* now scan the bus */ - KspScanBus(Context->BusDeviceExtension); + Status = KspScanBus(Context->BusDeviceExtension); + // FIXME: We may need to check for success here, and properly fail... + ASSERT(NT_SUCCESS(Status)); /* acquire device entry lock */ KeAcquireSpinLock(&Context->BusDeviceExtension->Lock, &OldLevel);

8 years, 7 months

[hbelusca] 71286: [KSFILTER]: Return from KsCreateBusEnumObject() when scanning the bus fails. By Victor Martinez Calvo. CID 1322294 CORE-11201 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 8 14:35:50 2016 New Revision: 71286 URL: http://svn.reactos.org/svn/reactos?rev=71286&view=rev Log: [KSFILTER]: Return from KsCreateBusEnumObject() when scanning the bus fails. By Victor Martinez Calvo. CID 1322294 CORE-11201 #resolve Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sun May 8 14:35:50 2016 @@ -1692,6 +1692,8 @@ /* free device extension */ FreeItem(BusDeviceExtension->ServicePath.Buffer); FreeItem(BusDeviceExtension); + + return Status; } /* acquire device entry lock */

8 years, 7 months

[hbelusca] 71285: [BOOTLIB]: Fix EtfspGetDirentNameLength loops. By Victor Martinez Calvo. CID 1341138 CORE-11178 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 8 14:28:06 2016 New Revision: 71285 URL: http://svn.reactos.org/svn/reactos?rev=71285&view=rev Log: [BOOTLIB]: Fix EtfspGetDirentNameLength loops. By Victor Martinez Calvo. CID 1341138 CORE-11178 #resolve Modified: trunk/reactos/boot/environ/lib/io/etfs.c Modified: trunk/reactos/boot/environ/lib/io/etfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/etfs.c… ============================================================================== --- trunk/reactos/boot/environ/lib/io/etfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/etfs.c [iso-8859-1] Sun May 8 14:28:06 2016 @@ -129,7 +129,7 @@ PUCHAR Pos; RealLength = Length = DirEntry->FileIdLen; - for (Pos = &DirEntry->FileIdLen + Length; Length; --Pos) + for (Pos = DirEntry->FileId + Length - 1; Length; --Pos) { --Length; @@ -141,7 +141,7 @@ } Length = RealLength; - for (Pos = &DirEntry->FileIdLen + Length; Length; --Pos) + for (Pos = DirEntry->FileId + Length - 1; Length; --Pos) { --Length;

8 years, 7 months

[hbelusca] 71284: [USETUP]: Fix typo in SectorCount.QuadPart calculation (and add ULONGLONG casts). By Victor Martinez Calvo. CORE-11205 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 8 13:50:38 2016 New Revision: 71284 URL: http://svn.reactos.org/svn/reactos?rev=71284&view=rev Log: [USETUP]: Fix typo in SectorCount.QuadPart calculation (and add ULONGLONG casts). By Victor Martinez Calvo. CORE-11205 #resolve Modified: trunk/reactos/base/setup/usetup/cmdcons.c Modified: trunk/reactos/base/setup/usetup/cmdcons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cmdcons.… ============================================================================== --- trunk/reactos/base/setup/usetup/cmdcons.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/cmdcons.c [iso-8859-1] Sun May 8 13:50:38 2016 @@ -428,8 +428,8 @@ DPRINT1("Sector: %I64u\n", Sector.QuadPart); SectorCount.QuadPart = DiskGeometry.Cylinders.QuadPart * - DiskGeometry.TracksPerCylinder, - DiskGeometry.SectorsPerTrack; + (ULONGLONG)DiskGeometry.TracksPerCylinder * + (ULONGLONG)DiskGeometry.SectorsPerTrack; if (Sector.QuadPart >= SectorCount.QuadPart) { CONSOLE_ConOutPrintf("Invalid sector number! Valid range: [0 - %I64u]\n", SectorCount.QuadPart - 1);

8 years, 7 months

[hbelusca] 71283: [TELNET]: Move around the resource files, in order to add the ability to localize telnet. By Robert Naumann. CORE-10717 #resolve #comment Thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 8 13:46:16 2016 New Revision: 71283 URL: http://svn.reactos.org/svn/reactos?rev=71283&view=rev Log: [TELNET]: Move around the resource files, in order to add the ability to localize telnet. By Robert Naumann. CORE-10717 #resolve #comment Thanks! Added: trunk/reactos/base/applications/network/telnet/lang/ trunk/reactos/base/applications/network/telnet/lang/en-US.rc - copied, changed from r71282, trunk/reactos/base/applications/network/telnet/resource/tnmsg.rc trunk/reactos/base/applications/network/telnet/resource.h - copied unchanged from r71282, trunk/reactos/base/applications/network/telnet/resource/tnmsg.h Removed: trunk/reactos/base/applications/network/telnet/Makefile.mingw trunk/reactos/base/applications/network/telnet/resource/ Modified: trunk/reactos/base/applications/network/telnet/telnet.rc Removed: trunk/reactos/base/applications/network/telnet/Makefile.mingw URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/Makefile.mingw [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/Makefile.mingw (removed) @@ -1,142 +0,0 @@ -# -# Makefile for Console Telnet -# Last modified 4/15/2000 by Paul Brannan -# - -SRCDIR=./src -OBJDIR=src -RESDIR=resource - -SRC=$(wildcard $(SRCDIR)/*.cpp) -RESOURCES=$(wildcard $(RESDIR)/*.rc) -OBJ1=$(SRC:.c=.o) -OBJ=$(OBJ1:.cpp=.o) $(RESOURCES:.rc=.o) - -INCLUDES=-I$(RESDIR) - -OUT=telnet.exe - -# Modify these for your system if necessary -# Note: DJGPP+RDXNTDJ configuration is untested. - -# --CYGWIN-- -#CC=gcc -#CCC=g++ -#LDFLAGS=-lwsock32 -lmsvcrt -#CFLAGS=-O2 -Wall -mwindows -mno-cygwin -D__CYGWIN__ -#CCFLAGS=$(CFLAGS) -#RES= -#RC=windres -#RCFLAGS=-O coff - -# --MINGW32(+EGCS)-- -CC=gcc -CCC=g++ -LDFLAGS=-lkernel32 -luser32 -lgdi32 -lshell32 -lwsock32 -CFLAGS=-O2 -Wall -CCFLAGS=$(CFLAGS) -RES= -RC=windres -RCFLAGS= - -# --DJGPP+RSXNTDJ-- -#CC=gcc -Zwin32 -Zmt -Zcrtdll -#CCC=$(CC) -#LDFLAGS= -#CFLAGS= -g -#CCFLAGS=$(CFLAGS) -#RES=rsrc -#RC=grc -#RCFLAGS=-r - - -# You should not have to modify anything below this line - -all: dep $(OUT) - -.SUFFIXES: .c .cpp .rc - -.c.o: - $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@ - -.cpp.o: - $(CCC) $(INCLUDES) $(CCFLAGS) -c $< -o $@ - -.rc.o: - $(RC) -i $< $(RCFLAGS) -o $@ - -$(OUT): $(OBJ) - $(CCC) $(OBJ) $(LDFLAGS) $(LIBS) -o $(OUT) - strip $(OUT) - -depend: dep - -dep: - start /min makedepend -- $(CFLAGS) -- $(INCLUDES) $(SRC) - -clean: - del $(OBJDIR)\*.o - del $(OUT) - -# DO NOT DELETE - -./src/ansiprsr.o: ./src/ansiprsr.h ./src/tnconfig.h ./src/tnerror.h -./src/ansiprsr.o: ./src/tnmsg.h ./src/tparser.h ./src/tconsole.h -./src/ansiprsr.o: ./src/keytrans.h ./src/tkeydef.h ./src/tkeymap.h -./src/ansiprsr.o: ./src/stl_bids.h ./src/tscroll.h ./src/tmouse.h -./src/ansiprsr.o: ./src/tnclip.h ./src/tnetwork.h ./src/tcharmap.h -./src/keytrans.o: ./src/keytrans.h ./src/tkeydef.h ./src/tkeymap.h -./src/keytrans.o: ./src/stl_bids.h ./src/tnerror.h ./src/tnmsg.h -./src/tcharmap.o: ./src/tcharmap.h ./src/tnconfig.h ./src/tnerror.h -./src/tcharmap.o: ./src/tnmsg.h -./src/tconsole.o: ./src/tconsole.h ./src/tnconfig.h ./src/tnerror.h -./src/tconsole.o: ./src/tnmsg.h -./src/tkeydef.o: ./src/tkeydef.h -./src/tkeymap.o: ./src/tkeymap.h ./src/stl_bids.h ./src/tkeydef.h -./src/tmapldr.o: ./src/tmapldr.h ./src/keytrans.h ./src/tkeydef.h -./src/tmapldr.o: ./src/tkeymap.h ./src/stl_bids.h ./src/tcharmap.h -./src/tmapldr.o: ./src/tnerror.h ./src/tnmsg.h ./src/tnconfig.h -./src/tmouse.o: ./src/tmouse.h ./src/tnclip.h ./src/tnetwork.h -./src/tmouse.o: ./src/tconsole.h ./src/tnconfig.h ./src/tnerror.h -./src/tmouse.o: ./src/tnmsg.h -./src/tnclass.o: ./src/tnclass.h ./src/tnconfig.h ./src/tnerror.h -./src/tnclass.o: ./src/tnmsg.h ./src/ttelhndl.h ./src/tparser.h -./src/tnclass.o: ./src/tconsole.h ./src/keytrans.h ./src/tkeydef.h -./src/tnclass.o: ./src/tkeymap.h ./src/stl_bids.h ./src/tscroll.h -./src/tnclass.o: ./src/tmouse.h ./src/tnclip.h ./src/tnetwork.h -./src/tnclass.o: ./src/tcharmap.h ./src/tncon.h ./src/tparams.h -./src/tnclass.o: ./src/ansiprsr.h ./src/tmapldr.h ./src/tnmisc.h -./src/tnclip.o: ./src/tnclip.h ./src/tnetwork.h -./src/tncon.o: ./src/tncon.h ./src/tparams.h ./src/ttelhndl.h ./src/tparser.h -./src/tncon.o: ./src/tconsole.h ./src/tnconfig.h ./src/tnerror.h -./src/tncon.o: ./src/tnmsg.h ./src/keytrans.h ./src/tkeydef.h ./src/tkeymap.h -./src/tncon.o: ./src/stl_bids.h ./src/tscroll.h ./src/tmouse.h ./src/tnclip.h -./src/tncon.o: ./src/tnetwork.h ./src/tcharmap.h -./src/tnconfig.o: ./src/tnconfig.h ./src/tnerror.h ./src/tnmsg.h -./src/tnerror.o: ./src/tnerror.h ./src/tnmsg.h ./src/ttelhndl.h -./src/tnerror.o: ./src/tparser.h ./src/tconsole.h ./src/tnconfig.h -./src/tnerror.o: ./src/keytrans.h ./src/tkeydef.h ./src/tkeymap.h -./src/tnerror.o: ./src/stl_bids.h ./src/tscroll.h ./src/tmouse.h -./src/tnerror.o: ./src/tnclip.h ./src/tnetwork.h ./src/tcharmap.h -./src/tnetwork.o: ./src/tnetwork.h -./src/tnmain.o: ./src/tnmain.h ./src/tncon.h ./src/tparams.h ./src/ttelhndl.h -./src/tnmain.o: ./src/tparser.h ./src/tconsole.h ./src/tnconfig.h -./src/tnmain.o: ./src/tnerror.h ./src/tnmsg.h ./src/keytrans.h -./src/tnmain.o: ./src/tkeydef.h ./src/tkeymap.h ./src/stl_bids.h -./src/tnmain.o: ./src/tscroll.h ./src/tmouse.h ./src/tnclip.h -./src/tnmain.o: ./src/tnetwork.h ./src/tcharmap.h ./src/tnclass.h -./src/tnmain.o: ./src/ansiprsr.h ./src/tmapldr.h ./src/tnmisc.h -./src/tnmisc.o: ./src/tnmisc.h -./src/tscript.o: ./src/tscript.h ./src/tnetwork.h -./src/tscroll.o: ./src/tscroll.h ./src/tconsole.h ./src/tnconfig.h -./src/tscroll.o: ./src/tnerror.h ./src/tnmsg.h ./src/tmouse.h ./src/tnclip.h -./src/tscroll.o: ./src/tnetwork.h ./src/tncon.h ./src/tparams.h -./src/tscroll.o: ./src/ttelhndl.h ./src/tparser.h ./src/keytrans.h -./src/tscroll.o: ./src/tkeydef.h ./src/tkeymap.h ./src/stl_bids.h -./src/tscroll.o: ./src/tcharmap.h -./src/ttelhndl.o: ./src/ttelhndl.h ./src/tparser.h ./src/tconsole.h -./src/ttelhndl.o: ./src/tnconfig.h ./src/tnerror.h ./src/tnmsg.h -./src/ttelhndl.o: ./src/keytrans.h ./src/tkeydef.h ./src/tkeymap.h -./src/ttelhndl.o: ./src/stl_bids.h ./src/tscroll.h ./src/tmouse.h -./src/ttelhndl.o: ./src/tnclip.h ./src/tnetwork.h ./src/tcharmap.h -./src/ttelhndl.o: ./src/telnet.h ./src/tparams.h Copied: trunk/reactos/base/applications/network/telnet/lang/en-US.rc (from r71282, trunk/reactos/base/applications/network/telnet/resource/tnmsg.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/resource/tnmsg.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/lang/en-US.rc [iso-8859-1] Sun May 8 13:46:16 2016 @@ -1,6 +1,4 @@ -#include "tnmsg.h" - -LANGUAGE 0, 0 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN Modified: trunk/reactos/base/applications/network/telnet/telnet.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/telnet.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/telnet.rc [iso-8859-1] Sun May 8 13:46:16 2016 @@ -1,5 +1,5 @@ - #include <windef.h> +#include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -12,3 +12,7 @@ /* UTF-8 */ #pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif

8 years, 7 months

[hbelusca] 71282: [TELNET]: Correctly show the icon. By Henry Tang Ih and Robert Naumann. CORE-10717

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 8 13:37:18 2016 New Revision: 71282 URL: http://svn.reactos.org/svn/reactos?rev=71282&view=rev Log: [TELNET]: Correctly show the icon. By Henry Tang Ih and Robert Naumann. CORE-10717 Modified: trunk/reactos/base/applications/network/telnet/resource/tnmsg.rc trunk/reactos/base/applications/network/telnet/telnet.rc Modified: trunk/reactos/base/applications/network/telnet/resource/tnmsg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/resource/tnmsg.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/resource/tnmsg.rc [iso-8859-1] Sun May 8 13:37:18 2016 @@ -96,9 +96,3 @@ MSG_KEYBADMAP "Bad keymap number - try 'keys display'\n" MSG_KEYMAPSWITCHED "keymap switched.\n" END - -#if defined(__MINGW32__) || defined(__CYGWIN__) -TelnetIcon ICON "telnet.ico" -#else -TelnetIcon ICON "../telnet.ico" -#endif Modified: trunk/reactos/base/applications/network/telnet/telnet.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/telnet.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/telnet.rc [iso-8859-1] Sun May 8 13:37:18 2016 @@ -1,4 +1,14 @@ + +#include <windef.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define REACTOS_STR_FILE_DESCRIPTION "Console Telnet for Win32" #define REACTOS_STR_INTERNAL_NAME "telnet" #define REACTOS_STR_ORIGINAL_FILENAME "telnet.exe" #include <reactos/version.rc> + +IDI_APPICON ICON "telnet.ico" + +/* UTF-8 */ +#pragma code_page(65001)

8 years, 7 months

[tfaber] 71281: [0.4.1] - Merge the heap user value fix from r71279/r71278 CORE-11196

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 8 08:12:09 2016 New Revision: 71281 URL: http://svn.reactos.org/svn/reactos?rev=71281&view=rev Log: [0.4.1] - Merge the heap user value fix from r71279/r71278 CORE-11196 Modified: branches/ros-branch-0_4_1/reactos/ (props changed) branches/ros-branch-0_4_1/reactos/sdk/lib/rtl/heap.c branches/ros-branch-0_4_1/rostests/ (props changed) branches/ros-branch-0_4_1/rostests/apitests/ntdll/RtlReAllocateHeap.c Propchange: branches/ros-branch-0_4_1/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 8 08:12:09 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:71217,71231-71232,71245,71252,71262 +/trunk/reactos:71217,71231-71232,71245,71252,71262,71279 Modified: branches/ros-branch-0_4_1/reactos/sdk/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/sdk/li… ============================================================================== --- branches/ros-branch-0_4_1/reactos/sdk/lib/rtl/heap.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/sdk/lib/rtl/heap.c [iso-8859-1] Sun May 8 08:12:09 2016 @@ -2359,7 +2359,7 @@ } /* Process extra stuff */ - if (RememberFlags & HEAP_ENTRY_EXTRA_PRESENT) + if (EntryFlags & HEAP_ENTRY_EXTRA_PRESENT) { /* Calculate pointers */ OldExtra = (PHEAP_ENTRY_EXTRA)(InUseEntry + InUseEntry->Size - 1); Propchange: branches/ros-branch-0_4_1/rostests/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 8 08:12:09 2016 @@ -1,3 +1,3 @@ /branches/GSoC_2011/KMTestSuite:51165-53670 /branches/ros-amd64-bringup/rostests:44459,44462,44537 -/trunk/rostests:71232,71236 +/trunk/rostests:71232,71236,71278 Modified: branches/ros-branch-0_4_1/rostests/apitests/ntdll/RtlReAllocateHeap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/rostests/apite… ============================================================================== --- branches/ros-branch-0_4_1/rostests/apitests/ntdll/RtlReAllocateHeap.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/rostests/apitests/ntdll/RtlReAllocateHeap.c [iso-8859-1] Sun May 8 08:12:09 2016 @@ -69,6 +69,10 @@ SIZE_T OldSize = 0; SIZE_T Size; BOOLEAN Continue = TRUE; + BOOLEAN Success; + PVOID UserValue; + ULONG UserFlags; + PVOID Buffer2; OldSize = 0x100; Buffer = RtlReAllocateHeap(RtlGetProcessHeap(), @@ -100,4 +104,88 @@ Continue = ReAllocBuffer(&Buffer, Size, &OldSize, "shrinking"); } RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + + /* Now make sure user flags/values get preserved */ + OldSize = 0x100; + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY | HEAP_SETTABLE_USER_VALUE | HEAP_SETTABLE_USER_FLAG2, + OldSize); + if (!Buffer) + { + skip("RtlAllocateHeap failed for size %lu\n", OldSize); + return; + } + + UserValue = InvalidPointer; + UserFlags = 0x55555555; + Success = RtlGetUserInfoHeap(RtlGetProcessHeap(), + 0, + Buffer, + &UserValue, + &UserFlags); + ok(Success == TRUE, "RtlGetUserInfoHeap returned %u\n", Success); + ok(UserValue == NULL, "UserValue = %p\n", UserValue); + ok(UserFlags == HEAP_SETTABLE_USER_FLAG2, "UserFlags = %lx\n", UserFlags); + + Success = RtlSetUserFlagsHeap(RtlGetProcessHeap(), + 0, + Buffer, + HEAP_SETTABLE_USER_FLAG1 | HEAP_SETTABLE_USER_FLAG2, + HEAP_SETTABLE_USER_FLAG3); + ok(Success == TRUE, "RtlSetUserFlagsHeap returned %u\n", Success); + + Success = RtlSetUserValueHeap(RtlGetProcessHeap(), + 0, + Buffer, + &UserValue); + ok(Success == TRUE, "RtlSetUserValueHeap returned %u\n", Success); + + UserValue = InvalidPointer; + UserFlags = 0x55555555; + Success = RtlGetUserInfoHeap(RtlGetProcessHeap(), + 0, + Buffer, + &UserValue, + &UserFlags); + ok(Success == TRUE, "RtlGetUserInfoHeap returned %u\n", Success); + ok(UserValue == &UserValue, "UserValue = %p, expected %p\n", UserValue, &UserValue); + ok(UserFlags == HEAP_SETTABLE_USER_FLAG3, "UserFlags = %lx\n", UserFlags); + + /* shrink (preserves flags) */ + Buffer2 = RtlReAllocateHeap(RtlGetProcessHeap(), + HEAP_REALLOC_IN_PLACE_ONLY | HEAP_SETTABLE_USER_FLAG2, + Buffer, + OldSize / 2); + ok(Buffer2 == Buffer, "New Buffer is %p, expected %p\n", Buffer2, Buffer); + if (Buffer2) Buffer = Buffer2; + UserValue = InvalidPointer; + UserFlags = 0x55555555; + Success = RtlGetUserInfoHeap(RtlGetProcessHeap(), + 0, + Buffer, + &UserValue, + &UserFlags); + ok(Success == TRUE, "RtlGetUserInfoHeap returned %u\n", Success); + ok(UserValue == &UserValue, "UserValue = %p, expected %p\n", UserValue, &UserValue); + ok(UserFlags == HEAP_SETTABLE_USER_FLAG3, "UserFlags = %lx\n", UserFlags); + + /* grow (overwrites flags) */ + Buffer2 = RtlReAllocateHeap(RtlGetProcessHeap(), + HEAP_REALLOC_IN_PLACE_ONLY | HEAP_SETTABLE_USER_FLAG1, + Buffer, + OldSize / 4 * 3); + ok(Buffer2 == Buffer, "New Buffer is %p, expected %p\n", Buffer2, Buffer); + if (Buffer2) Buffer = Buffer2; + UserValue = InvalidPointer; + UserFlags = 0x55555555; + Success = RtlGetUserInfoHeap(RtlGetProcessHeap(), + 0, + Buffer, + &UserValue, + &UserFlags); + ok(Success == TRUE, "RtlGetUserInfoHeap returned %u\n", Success); + ok(UserValue == &UserValue, "UserValue = %p, expected %p\n", UserValue, &UserValue); + ok(UserFlags == HEAP_SETTABLE_USER_FLAG1, "UserFlags = %lx\n", UserFlags); + + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); }

8 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2016