Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjansen] 71262: fix the build for msvc (2013?) users.
by mjansen＠svn.reactos.org 05 May '16

05 May '16

Author: mjansen Date: Thu May 5 12:43:57 2016 New Revision: 71262 URL: http://svn.reactos.org/svn/reactos?rev=71262&view=rev Log: fix the build for msvc (2013?) users. Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Thu May 5 12:43:57 2016 @@ -6139,7 +6139,7 @@ } else { // srb->Cdb[0] == SCSIOP_REQUEST_SENSE) PSENSE_DATA senseData = (PSENSE_DATA) srb->DataBuffer; - + (void)senseData; KdPrint3((PRINT_PREFIX "AtapiInterrupt: ATAPI command status %#x\n", status)); if (status == SRB_STATUS_DATA_OVERRUN) { // Check to see if we at least get mininum number of bytes

1 0

[mjansen] 71261: [NTOSKRNL][NTDLL_APITEST] Fix error returned from NtCreateSection when opening an empty file. CORE-11166
by mjansen＠svn.reactos.org 05 May '16

05 May '16

Author: mjansen Date: Thu May 5 12:06:07 2016 New Revision: 71261 URL: http://svn.reactos.org/svn/reactos?rev=71261&view=rev Log: [NTOSKRNL][NTDLL_APITEST] Fix error returned from NtCreateSection when opening an empty file. CORE-11166 Modified: trunk/reactos/ntoskrnl/mm/section.c trunk/rostests/apitests/ntdll/NtMapViewOfSection.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] Thu May 5 12:06:07 2016 @@ -2993,7 +2993,7 @@ { ObDereferenceObject(Section); ObDereferenceObject(FileObject); - return STATUS_FILE_INVALID; + return STATUS_MAPPED_FILE_SIZE_ZERO; } } 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] Thu May 5 12:06:07 2016 @@ -1351,6 +1351,53 @@ DeleteFileW(FileName); } +static void +Test_EmptyFile(VOID) +{ + NTSTATUS Status; + WCHAR TempPath[MAX_PATH]; + WCHAR FileName[MAX_PATH]; + HANDLE Handle; + HANDLE SectionHandle; + ULONG Length; + + 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; + } + + Status = NtCreateSection(&SectionHandle, + STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, + 0, 0, PAGE_READONLY, SEC_COMMIT, Handle); + ok_ntstatus(Status, STATUS_MAPPED_FILE_SIZE_ZERO); + + if (NT_SUCCESS(Status)) + NtClose(SectionHandle); + + Status = NtCreateSection(&SectionHandle, + STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, + 0, 0, PAGE_READONLY, SEC_IMAGE, Handle); + ok_ntstatus(Status, STATUS_INVALID_FILE_FOR_SECTION); + + if (NT_SUCCESS(Status)) + NtClose(SectionHandle); + + CloseHandle(Handle); + DeleteFileW(FileName); +} + START_TEST(NtMapViewOfSection) { Test_PageFileSection(); @@ -1358,4 +1405,5 @@ Test_BasedSection(); Test_NoLoadSection(FALSE); Test_NoLoadSection(TRUE); + Test_EmptyFile(); }

1 0

[pschweitzer] 71260: [BTRFS] Mark the CORE-11057 fix as local change. CORE-11172
by pschweitzer＠svn.reactos.org 05 May '16

05 May '16

Author: pschweitzer Date: Thu May 5 06:48:56 2016 New Revision: 71260 URL: http://svn.reactos.org/svn/reactos?rev=71260&view=rev Log: [BTRFS] Mark the CORE-11057 fix as local change. CORE-11172 Modified: trunk/reactos/drivers/filesystems/btrfs/write.c Modified: trunk/reactos/drivers/filesystems/btrfs/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/write.c [iso-8859-1] Thu May 5 06:48:56 2016 @@ -263,6 +263,10 @@ } if (s->offset >= offset && s->offset + s->size <= offset + size) { // delete entirely +#ifndef __REACTOS__ + RemoveEntryList(&s->list_entry); + +#endif if (s->offset + s->size == offset + size) { insbef = s->list_entry.Flink; RemoveEntryList(&s->list_entry);

1 0

[cwittich] 71259: [FREELDR] fix copypasta CORE-11161
by cwittich＠svn.reactos.org 04 May '16

04 May '16

Author: cwittich Date: Wed May 4 08:28:44 2016 New Revision: 71259 URL: http://svn.reactos.org/svn/reactos?rev=71259&view=rev Log: [FREELDR] fix copypasta CORE-11161 Modified: trunk/reactos/boot/freeldr/freeldr/ntldr/registry.c Modified: trunk/reactos/boot/freeldr/freeldr/ntldr/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ntldr… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ntldr/registry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ntldr/registry.c [iso-8859-1] Wed May 4 08:28:44 2016 @@ -132,7 +132,7 @@ &DataSize); if (Error != ERROR_SUCCESS) { - ERR("RegQueryValue('Default') failed (Error %u)\n", (int)Error); + ERR("RegQueryValue('LastKnownGood') failed (Error %u)\n", (int)Error); return Error; }

1 0

[akhaldi] 71258: [0.4.1] Merge the fix for enumerating ADS from files with 3+ streams, by Pierre in r71245. CORE-11164
by akhaldi＠svn.reactos.org 03 May '16

03 May '16

Author: akhaldi Date: Tue May 3 22:36:26 2016 New Revision: 71258 URL: http://svn.reactos.org/svn/reactos?rev=71258&view=rev Log: [0.4.1] Merge the fix for enumerating ADS from files with 3+ streams, by Pierre in r71245. CORE-11164 Modified: branches/ros-branch-0_4_1/ (props changed) branches/ros-branch-0_4_1/reactos/ (props changed) branches/ros-branch-0_4_1/reactos/dll/win32/kernel32/client/file/find.c Propchange: branches/ros-branch-0_4_1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 3 22:36:26 2016 @@ -1 +1 @@ -/trunk:71217,71231,71252,71255 +/trunk:71217,71231,71245,71252,71255 Propchange: branches/ros-branch-0_4_1/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 3 22:36:26 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,71252 +/trunk/reactos:71217,71231-71232,71245,71252 Modified: branches/ros-branch-0_4_1/reactos/dll/win32/kernel32/client/file/find.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_1/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] Tue May 3 22:36:26 2016 @@ -1129,7 +1129,7 @@ /* Select next stream if possible */ if (FindStreamData->CurrentInfo->NextEntryOffset != 0) { - FindStreamData->CurrentInfo = (PFILE_STREAM_INFORMATION)((ULONG_PTR)FindStreamData->FileStreamInfo + + FindStreamData->CurrentInfo = (PFILE_STREAM_INFORMATION)((ULONG_PTR)FindStreamData->CurrentInfo + FindStreamData->CurrentInfo->NextEntryOffset); /* Return the information */

1 0

[akhaldi] 71257: [0.4.1] Merge the scroll bar glitch fix by Herschel Ralston in r71231. CORE-3923 CORE-11155
by akhaldi＠svn.reactos.org 03 May '16

03 May '16

Author: akhaldi Date: Tue May 3 22:31:13 2016 New Revision: 71257 URL: http://svn.reactos.org/svn/reactos?rev=71257&view=rev Log: [0.4.1] Merge the scroll bar glitch fix by Herschel Ralston in r71231. CORE-3923 CORE-11155 Modified: branches/ros-branch-0_4_1/ (props changed) branches/ros-branch-0_4_1/reactos/ (props changed) branches/ros-branch-0_4_1/reactos/win32ss/user/user32/controls/scrollbar.c Propchange: branches/ros-branch-0_4_1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 3 22:31:13 2016 @@ -1 +1 @@ -/trunk:71217,71252,71255 +/trunk:71217,71231,71252,71255 Propchange: branches/ros-branch-0_4_1/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 3 22:31:13 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,71232,71252 +/trunk/reactos:71217,71231-71232,71252 Modified: branches/ros-branch-0_4_1/reactos/win32ss/user/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_1/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] Tue May 3 22:31:13 2016 @@ -855,6 +855,7 @@ NewInfo.rgstate[ScrollTrackHitTest] = ScrollBarInfo.rgstate[ScrollTrackHitTest]; NtUserSetScrollBarInfo(Wnd, IntScrollGetObjectId(SBType), &NewInfo); + IntDrawScrollInterior(Wnd,Dc,SBType,Vertical,&ScrollBarInfo); IntDrawScrollArrows(Dc, &ScrollBarInfo, Vertical); break;

1 0

[akhaldi] 71256: [0.4.1] Merge the UniATA sync in revisions 71252 and 71255. CORE-11157
by akhaldi＠svn.reactos.org 03 May '16

03 May '16

Author: akhaldi Date: Tue May 3 22:25:27 2016 New Revision: 71256 URL: http://svn.reactos.org/svn/reactos?rev=71256&view=rev Log: [0.4.1] Merge the UniATA sync in revisions 71252 and 71255. CORE-11157 Added: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/atacmd_map.cpp - copied unchanged from r71252, trunk/reactos/drivers/storage/ide/uniata/atacmd_map.cpp branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/atacmd_map.h - copied unchanged from r71252, trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/bm_devs.cpp - copied unchanged from r71252, trunk/reactos/drivers/storage/ide/uniata/bm_devs.cpp branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/bm_devs_decl.h - copied unchanged from r71252, trunk/reactos/drivers/storage/ide/uniata/bm_devs_decl.h branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/stdafx.cpp - copied unchanged from r71252, trunk/reactos/drivers/storage/ide/uniata/stdafx.cpp Modified: branches/ros-branch-0_4_1/ (props changed) branches/ros-branch-0_4_1/reactos/ (props changed) branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/CMakeLists.txt branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/atapi.h branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/bm_devs.h branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/bsmaster.h branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_ata.cpp branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_dma.cpp branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_init.cpp branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_probe.cpp branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_queue.cpp branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_sata.cpp branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_sata.h branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/tools.h branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/uata_ctl.h branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/uniata_ver.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/tools.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/uata_ctl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver…

1 0

[akhaldi] 71255: [UNIATA] Fix PCH.
by akhaldi＠svn.reactos.org 03 May '16

03 May '16

Author: akhaldi Date: Tue May 3 22:23:02 2016 New Revision: 71255 URL: http://svn.reactos.org/svn/reactos?rev=71255&view=rev Log: [UNIATA] Fix PCH. Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Tue May 3 22:23:02 2016 @@ -18,7 +18,7 @@ id_queue.cpp id_sata.cpp ros_glue/ros_glue.cpp - stdafx.cpp) + stdafx.h) add_library(uniata SHARED ${SOURCE} idedma.rc)

1 0

[akhaldi] 71254: [0.4.1] Apply the usetup path localization fix by Wim Hueskes. CORE-9656
by akhaldi＠svn.reactos.org 03 May '16

03 May '16

Author: akhaldi Date: Tue May 3 21:49:08 2016 New Revision: 71254 URL: http://svn.reactos.org/svn/reactos?rev=71254&view=rev Log: [0.4.1] Apply the usetup path localization fix by Wim Hueskes. CORE-9656 Modified: branches/ros-branch-0_4_1/reactos/base/setup/usetup/interface/usetup.c Modified: branches/ros-branch-0_4_1/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_1/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue May 3 21:49:08 2016 @@ -629,6 +629,10 @@ * * Next pages: IntroPage, QuitPage * + * SIDEEFFECTS + * Init SelectedLanguageId + * Init LanguageId + * * RETURNS * Number of the next page. */ @@ -772,6 +776,8 @@ * Init RequiredPartitionDiskSpace * Init IsUnattendedSetup * If unattended, init *List and sets the Codepage + * If unattended, init SelectedLanguageId + * If unattended, init LanguageId * * RETURNS * Number of the next page. @@ -906,10 +912,10 @@ /* new part */ wcscpy(SelectedLanguageId,LocaleID); + LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); /* first we hack LanguageList */ ListEntry = GetFirstListEntry(LanguageList); - while (ListEntry != NULL) { if (!wcsicmp(LocaleID, GetListEntryUserData(ListEntry)))

1 0

[akhaldi] 71253: [0.4.1] * Disable COMMAND.COM debugging messages. CORE-10710
by akhaldi＠svn.reactos.org 03 May '16

03 May '16

Author: akhaldi Date: Tue May 3 21:40:38 2016 New Revision: 71253 URL: http://svn.reactos.org/svn/reactos?rev=71253&view=rev Log: [0.4.1] * Disable COMMAND.COM debugging messages. CORE-10710 Modified: branches/ros-branch-0_4_1/reactos/subsystems/mvdm/dos/command.S Modified: branches/ros-branch-0_4_1/reactos/subsystems/mvdm/dos/command.S URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_4_1/reactos/subsystems/mvdm/dos/command.S [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/subsystems/mvdm/dos/command.S [iso-8859-1] Tue May 3 21:40:38 2016 @@ -18,6 +18,8 @@ #include <isvbop.inc> // #define NDEBUG + +#define NDEBUG /* DEFINES ********************************************************************/

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