Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 50872: [RTL/DPH] - Implement DPH version of ReAllocateHeap. Scenario of falling back to normal heap is stubbed everywhere now. - Fix a bug in POINTER_ADD_BIAS which noone noticed.
by fireball＠svn.reactos.org 23 Feb '11

23 Feb '11

Author: fireball Date: Wed Feb 23 11:08:37 2011 New Revision: 50872 URL: http://svn.reactos.org/svn/reactos?rev=50872&view=rev Log: [RTL/DPH] - Implement DPH version of ReAllocateHeap. Scenario of falling back to normal heap is stubbed everywhere now. - Fix a bug in POINTER_ADD_BIAS which noone noticed. Modified: trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=50872&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Wed Feb 23 11:08:37 2011 @@ -1362,12 +1362,11 @@ Heap = RtlpPageHeapCreate(Flags, Addr, TotalSize, CommitSize, Lock, Parameters); if (Heap) return Heap; - //ASSERT(FALSE); - DPRINT1("Enabling page heap failed\n"); - /* Reset a special Parameters == -1 hack */ if ((ULONG_PTR)Parameters == (ULONG_PTR)-1) Parameters = NULL; + else + DPRINT1("Enabling page heap failed\n"); } /* Check validation flags */ Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=508… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Wed Feb 23 11:08:37 2011 @@ -174,7 +174,7 @@ /* Biased pointer macros */ #define IS_BIASED_POINTER(ptr) ((ULONG_PTR)(ptr) & 1) #define POINTER_REMOVE_BIAS(ptr) ((ULONG_PTR)(ptr) & ~(ULONG_PTR)1) -#define POINTER_ADD_BIAS(ptr) ((ULONG_PTR)(ptr) & 1) +#define POINTER_ADD_BIAS(ptr) ((ULONG_PTR)(ptr) | 1) ULONG RtlpDphBreakOptions = 0;//0xFFFFFFFF; @@ -1896,8 +1896,167 @@ PVOID Ptr, SIZE_T Size) { - UNIMPLEMENTED; - return NULL; + PDPH_HEAP_ROOT DphRoot; + PDPH_HEAP_BLOCK Node = NULL, AllocatedNode; + BOOLEAN Biased = FALSE, UseNormalHeap = FALSE, OldBlockPageHeap = TRUE; + ULONG DataSize, ValidationInfo; + PVOID NewAlloc = NULL; + + /* Check requested size */ + if (Size > 0x7FF00000) + { + DPRINT1("extreme size request\n"); + + /* Generate an exception if needed */ + if (Flags & HEAP_GENERATE_EXCEPTIONS) RtlpDphRaiseException(STATUS_NO_MEMORY); + + return NULL; + } + + /* Unbias the pointer if necessary */ + if (IS_BIASED_POINTER(HeapPtr)) + { + HeapPtr = (PVOID)POINTER_REMOVE_BIAS(HeapPtr); + Biased = TRUE; + } + + /* Get a pointer to the heap root */ + DphRoot = RtlpDphPointerFromHandle(HeapPtr); + if (!DphRoot) return NULL; + + /* Acquire the heap lock */ + RtlpDphPreProcessing(DphRoot, Flags); + + /* Perform internal validation if specified by flags */ + if (RtlpDphDebugOptions & DPH_DEBUG_INTERNAL_VALIDATE) + { + RtlpDphInternalValidatePageHeap(DphRoot, NULL, 0); + } + + /* Add heap flags */ + Flags |= DphRoot->HeapFlags; + + /* Exit with NULL right away if inplace is specified */ + if (Flags & HEAP_REALLOC_IN_PLACE_ONLY) + { + /* Release the lock */ + RtlpDphPostProcessing(DphRoot); + + /* Generate an exception if needed */ + if (Flags & HEAP_GENERATE_EXCEPTIONS) RtlpDphRaiseException(STATUS_NO_MEMORY); + + return NULL; + } + + /* Try to get node of the allocated block */ + AllocatedNode = RtlpDphFindBusyMemory(DphRoot, Ptr); + + if (!AllocatedNode) + { + /* This block was not found in page heap, try a normal heap instead */ + //RtlpDphNormalHeapFree(); + ASSERT(FALSE); + OldBlockPageHeap = FALSE; + } + + /* Check the block */ + if (!(DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN)) + { + if (!RtlpDphIsPageHeapBlock(DphRoot, AllocatedNode->pUserAllocation, &ValidationInfo, TRUE)) + { + RtlpDphReportCorruptedBlock(DphRoot, 3, AllocatedNode->pUserAllocation, ValidationInfo); + } + } + + /* Remove old one from the busy list */ + RtlpDphRemoveFromBusyList(DphRoot, AllocatedNode); + + if (!Biased && !RtlpDphShouldAllocateInPageHeap(DphRoot, Size)) + { + // FIXME: Use normal heap + ASSERT(FALSE); + UseNormalHeap = TRUE; + } + else + { + /* Now do a trick: bias the pointer and call our allocate routine */ + NewAlloc = RtlpPageHeapAllocate((PVOID)POINTER_ADD_BIAS(HeapPtr), Flags, Size); + } + + if (!NewAlloc) + { + /* New allocation failed, put the block back (if it was found in page heap) */ + RtlpDphPlaceOnBusyList(DphRoot, AllocatedNode); + + /* Release the lock */ + RtlpDphPostProcessing(DphRoot); + + /* Perform validation again if required */ + if (RtlpDphDebugOptions & DPH_DEBUG_INTERNAL_VALIDATE) + { + RtlpDphInternalValidatePageHeap(DphRoot, NULL, 0); + } + + /* Generate an exception if needed */ + if (Flags & HEAP_GENERATE_EXCEPTIONS) RtlpDphRaiseException(STATUS_NO_MEMORY); + + return NULL; + } + + /* Copy contents of the old block */ + if (AllocatedNode->nUserRequestedSize > Size) + DataSize = Size; + else + DataSize = AllocatedNode->nUserRequestedSize; + + if (DataSize != 0) RtlCopyMemory(NewAlloc, Ptr, DataSize); + + /* Copy user flags and values */ + if (!UseNormalHeap) + { + /* Get the node of the new block */ + Node = RtlpDphFindBusyMemory(DphRoot, NewAlloc); + ASSERT(Node != NULL); + + /* Set its values/flags */ + Node->UserValue = AllocatedNode->UserValue; + if (Flags & HEAP_SETTABLE_USER_FLAGS) + Node->UserFlags = Flags & HEAP_SETTABLE_USER_FLAGS; + else + Node->UserFlags = AllocatedNode->UserFlags; + } + + if (!OldBlockPageHeap) + { + /* Weird scenario, investigate */ + ASSERT(FALSE); + } + + /* Mark the old block as no access */ + if (AllocatedNode->nVirtualAccessSize != 0) + { + RtlpDphProtectVm(AllocatedNode->pVirtualBlock, AllocatedNode->nVirtualAccessSize, PAGE_NOACCESS); + } + + /* And place it on the free list */ + RtlpDphPlaceOnFreeList(DphRoot, AllocatedNode); + + // FIXME: Capture stack traces if needed + AllocatedNode->StackTrace = NULL; + + /* Finally allocation is done, perform validation again if required */ + if (RtlpDphDebugOptions & DPH_DEBUG_INTERNAL_VALIDATE && !Biased) + { + RtlpDphInternalValidatePageHeap(DphRoot, NULL, 0); + } + + /* Release the lock */ + RtlpDphPostProcessing(DphRoot); + + DPRINT("Allocated new user block pointer: %p\n", NewAlloc); + + /* Return pointer to user allocation */ + return NewAlloc; } BOOLEAN NTAPI

1 0

[janderwald] 50871: [MPLAY32] - Hackfix playback See issue #5867 for more details.
by janderwald＠svn.reactos.org 23 Feb '11

23 Feb '11

Author: janderwald Date: Wed Feb 23 10:32:56 2011 New Revision: 50871 URL: http://svn.reactos.org/svn/reactos?rev=50871&view=rev Log: [MPLAY32] - Hackfix playback See issue #5867 for more details. Modified: trunk/reactos/base/applications/mplay32/mplay32.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Wed Feb 23 10:32:56 2011 @@ -455,7 +455,7 @@ mciPlay.dwFrom = 0; mciPlay.dwTo = MaxFilePos; - mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD_PTR)&mciPlay); + mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM /*| MCI_TO*/, (DWORD_PTR)&mciPlay); if (mciError != 0) { MessageBox(hwnd, _T("Can't play!"), NULL, MB_OK);

1 0

[pschweitzer] 50870: [KMTEST] Adding more tests for FsRtlIs*InExpression() functions. All are failing (overrun / wrong result). Based on Thomas Faber's C program. See bug #5923
by pschweitzer＠svn.reactos.org 23 Feb '11

23 Feb '11

Author: pschweitzer Date: Wed Feb 23 10:20:23 2011 New Revision: 50870 URL: http://svn.reactos.org/svn/reactos?rev=50870&view=rev Log: [KMTEST] Adding more tests for FsRtlIs*InExpression() functions. All are failing (overrun / wrong result). Based on Thomas Faber's C program. See bug #5923 Modified: trunk/rostests/drivers/kmtest/ntos_fsrtl.c Modified: trunk/rostests/drivers/kmtest/ntos_fsrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_fsrtl… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] Wed Feb 23 10:20:23 2011 @@ -161,6 +161,22 @@ ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); RtlInitUnicodeString(&Name, L"aaaa"); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + + /* Tests from #5923 */ + RtlInitUnicodeString(&Expression, L"C:\\ReactOS\\**"); + RtlInitUnicodeString(&Name, L"C:\\ReactOS\\dings.bmp"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Expression, L"C:\\ReactOS\\***"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Expression, L"C:\\Windows\\*a*"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + + RtlInitUnicodeString(&Expression, L"C:\\ReactOS\\*.bmp"); + RtlInitUnicodeString(&Name, L"C:\\Windows\\explorer.exe"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Expression, L"*.bmp;*.dib"); + RtlInitUnicodeString(&Name, L"winhlp32.exe"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); } VOID FsRtlIsDbcsInExpressionTest() @@ -295,6 +311,22 @@ ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); RtlInitAnsiString(&Name, "aaaa"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + + /* Tests from #5923 */ + RtlInitAnsiString(&Expression, "C:\\ReactOS\\**"); + RtlInitAnsiString(&Name, "C:\\ReactOS\\dings.bmp"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Expression, "C:\\ReactOS\\***"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Expression, "C:\\Windows\\*a*"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + + RtlInitAnsiString(&Expression, "C:\\ReactOS\\*.bmp"); + RtlInitAnsiString(&Name, "C:\\Windows\\explorer.exe"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Expression, "*.bmp;*.dib"); + RtlInitAnsiString(&Name, "winhlp32.exe"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); } /* PUBLIC FUNCTIONS ***********************************************************/

1 0

[pschweitzer] 50869: [KERNEL32] Don't make CopyFileExA() rely on Wine's strings conversions functions
by pschweitzer＠svn.reactos.org 22 Feb '11

22 Feb '11

Author: pschweitzer Date: Tue Feb 22 19:07:45 2011 New Revision: 50869 URL: http://svn.reactos.org/svn/reactos?rev=50869&view=rev Log: [KERNEL32] Don't make CopyFileExA() rely on Wine's strings conversions functions Modified: trunk/reactos/dll/win32/kernel32/file/copy.c Modified: trunk/reactos/dll/win32/kernel32/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] Tue Feb 22 19:07:45 2011 @@ -314,37 +314,36 @@ */ BOOL WINAPI -CopyFileExA ( - LPCSTR lpExistingFileName, - LPCSTR lpNewFileName, - LPPROGRESS_ROUTINE lpProgressRoutine, - LPVOID lpData, - BOOL *pbCancel, - DWORD dwCopyFlags - ) -{ - PWCHAR ExistingFileNameW; - PWCHAR NewFileNameW; - BOOL Result; - - if (!(ExistingFileNameW = FilenameA2W(lpExistingFileName, FALSE))) - return FALSE; - - if (!(NewFileNameW = FilenameA2W(lpNewFileName, TRUE))) - return FALSE; - - Result = CopyFileExW (ExistingFileNameW , - NewFileNameW , - lpProgressRoutine, - lpData, - pbCancel, - dwCopyFlags); - - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NewFileNameW); - - return Result; +CopyFileExA(IN LPCSTR lpExistingFileName, + IN LPCSTR lpNewFileName, + IN LPPROGRESS_ROUTINE lpProgressRoutine OPTIONAL, + IN LPVOID lpData OPTIONAL, + IN LPBOOL pbCancel OPTIONAL, + IN DWORD dwCopyFlags) +{ + BOOL Result = FALSE; + UNICODE_STRING lpNewFileNameW; + PUNICODE_STRING lpExistingFileNameW; + + lpExistingFileNameW = Basep8BitStringToStaticUnicodeString(lpExistingFileName); + if (!lpExistingFileName) + { + return FALSE; + } + + if (Basep8BitStringToDynamicUnicodeString(&lpNewFileNameW, lpNewFileName)) + { + Result = CopyFileExW(lpExistingFileNameW->Buffer, + lpNewFileNameW.Buffer, + lpProgressRoutine, + lpData, + pbCancel, + dwCopyFlags); + + RtlFreeUnicodeString(&lpNewFileNameW); + } + + return Result; }

1 0

[pschweitzer] 50868: [KERNEL32] Don't make FindFirstChangeNotificationA() rely on Wine's strings conversions functions
by pschweitzer＠svn.reactos.org 22 Feb '11

22 Feb '11

Author: pschweitzer Date: Tue Feb 22 18:56:46 2011 New Revision: 50868 URL: http://svn.reactos.org/svn/reactos?rev=50868&view=rev Log: [KERNEL32] Don't make FindFirstChangeNotificationA() rely on Wine's strings conversions functions Modified: trunk/reactos/dll/win32/kernel32/file/cnotify.c Modified: trunk/reactos/dll/win32/kernel32/file/cnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cn… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/cnotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/cnotify.c [iso-8859-1] Tue Feb 22 18:56:46 2011 @@ -9,10 +9,14 @@ * Created 01/11/98 */ +/* INCLUDES *****************************************************************/ + #include <k32.h> #define NDEBUG #include <debug.h> +/* FUNCTIONS ****************************************************************/ + /* * @implemented */ @@ -35,20 +39,30 @@ */ HANDLE WINAPI -FindFirstChangeNotificationA ( - LPCSTR lpPathName, - BOOL bWatchSubtree, - DWORD dwNotifyFilter - ) -{ - PWCHAR PathNameW; - - if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) - return INVALID_HANDLE_VALUE; - - return FindFirstChangeNotificationW (PathNameW , - bWatchSubtree, - dwNotifyFilter); +FindFirstChangeNotificationA(IN LPCSTR lpPathName, + IN BOOL bWatchSubtree, + IN DWORD dwNotifyFilter) +{ + NTSTATUS Status; + ANSI_STRING PathNameString; + + RtlInitAnsiString(&PathNameString, lpPathName); + Status = RtlAnsiStringToUnicodeString(&(NtCurrentTeb()->StaticUnicodeString), &PathNameString, FALSE); + if (!NT_SUCCESS(Status)) + { + if (Status != STATUS_BUFFER_OVERFLOW) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + } + else + { + BaseSetLastNTError(Status); + } + return INVALID_HANDLE_VALUE; + } + + return FindFirstChangeNotificationW(NtCurrentTeb()->StaticUnicodeString.Buffer, + bWatchSubtree, dwNotifyFilter); }

1 0

[pschweitzer] 50867: [KERNEL32] Don't make GetBinaryTypeA() rely on Wine's strings conversions functions
by pschweitzer＠svn.reactos.org 22 Feb '11

22 Feb '11

Author: pschweitzer Date: Tue Feb 22 18:43:38 2011 New Revision: 50867 URL: http://svn.reactos.org/svn/reactos?rev=50867&view=rev Log: [KERNEL32] Don't make GetBinaryTypeA() rely on Wine's strings conversions functions Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/bi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/bintype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/bintype.c [iso-8859-1] Tue Feb 22 18:43:38 2011 @@ -301,23 +301,43 @@ */ BOOL WINAPI -GetBinaryTypeA ( - LPCSTR lpApplicationName, - LPDWORD lpBinaryType - ) +GetBinaryTypeA(IN LPCSTR lpApplicationName, + OUT LPDWORD lpBinaryType) { - PWCHAR ApplicationNameW; - - if(!lpApplicationName || !lpBinaryType) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if (!(ApplicationNameW = FilenameA2W(lpApplicationName, FALSE))) - return FALSE; - - return GetBinaryTypeW(ApplicationNameW, lpBinaryType); + ANSI_STRING ApplicationNameString; + UNICODE_STRING ApplicationNameW; + BOOL StringAllocated = FALSE, Result; + NTSTATUS Status; + + RtlInitAnsiString(&ApplicationNameString, lpApplicationName); + + if (ApplicationNameString.Length * sizeof(WCHAR) >= NtCurrentTeb()->StaticUnicodeString.MaximumLength) + { + StringAllocated = TRUE; + Status = RtlAnsiStringToUnicodeString(&ApplicationNameW, &ApplicationNameString, TRUE); + } + else + { + Status = RtlAnsiStringToUnicodeString(&(NtCurrentTeb()->StaticUnicodeString), &ApplicationNameString, FALSE); + } + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + if (StringAllocated) + { + Result = GetBinaryTypeW(ApplicationNameW.Buffer, lpBinaryType); + RtlFreeUnicodeString(&ApplicationNameW); + } + else + { + Result = GetBinaryTypeW(NtCurrentTeb()->StaticUnicodeString.Buffer, lpBinaryType); + } + + return Result; } /* EOF */

1 0

[tkreuzer] 50866: [CRT] Fix special behaviour of wsprintf: when used with # flag, the "0x" prefix does not count into the field width, so we have to add additional 2 characters here. Fixes Opera in...
by tkreuzer＠svn.reactos.org 22 Feb '11

22 Feb '11

Author: tkreuzer Date: Tue Feb 22 17:29:32 2011 New Revision: 50866 URL: http://svn.reactos.org/svn/reactos?rev=50866&view=rev Log: [CRT] Fix special behaviour of wsprintf: when used with # flag, the "0x" prefix does not count into the field width, so we have to add additional 2 characters here. Fixes Opera installer. See issue #5900 for more details. Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Tue Feb 22 17:29:32 2011 @@ -587,6 +587,9 @@ if (flags & FLAG_SPECIAL) { prefix = &digits[16]; +#ifdef _USER32_WSPRINTF + fieldwidth += 2; +#endif } case _T('u'):

1 0

[akhaldi] 50865: [NEWCC] - Add config.rbuild with NEWCC enabled by default.
by akhaldi＠svn.reactos.org 22 Feb '11

22 Feb '11

Author: akhaldi Date: Tue Feb 22 11:28:00 2011 New Revision: 50865 URL: http://svn.reactos.org/svn/reactos?rev=50865&view=rev Log: [NEWCC] - Add config.rbuild with NEWCC enabled by default. Added: branches/arty-newcc/config.rbuild (with props) Added: branches/arty-newcc/config.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/config.rbuild?rev=50… ============================================================================== --- branches/arty-newcc/config.rbuild (added) +++ branches/arty-newcc/config.rbuild [iso-8859-1] Tue Feb 22 11:28:00 2011 @@ -1,0 +1,107 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> +<group> + + + + + +<property name="SARCH" value="" /> + + + +<property name="OARCH" value="pentium" /> + + + +<property name="TUNE" value="i686" /> + + + +<property name="OPTIMIZE" value="1" /> + + + +<property name="KDBG" value="1" /> + + + +<property name="DBG" value="1" /> + + + +<property name="GDB" value="0" /> + + + +<property name="NSWPAT" value="0" /> + + +<property name="_WINKD_" value="0" /> + + +<property name="_ELF_" value="0" /> + + +<property name="BUILD_MP" value="1" /> + + +<property name="NEWCC" value="1" /> + +</group> Propchange: branches/arty-newcc/config.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 50864: [NOTEPAD] Patch by EDIJS <terminedijs at yahoo dot com>: Improve window caption string. By me: use StringCchCat instead of _tcscat to prevent possible buffer overruns. See issue #...
by tkreuzer＠svn.reactos.org 22 Feb '11

22 Feb '11

Author: tkreuzer Date: Tue Feb 22 09:59:49 2011 New Revision: 50864 URL: http://svn.reactos.org/svn/reactos?rev=50864&view=rev Log: [NOTEPAD] Patch by EDIJS <terminedijs at yahoo dot com>: Improve window caption string. By me: use StringCchCat instead of _tcscat to prevent possible buffer overruns. See issue #5871 for more details. Modified: trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/notepad.h Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Tue Feb 22 09:59:49 2011 @@ -112,31 +112,27 @@ /** * Sets the caption of the main window according to Globals.szFileTitle: - * Notepad - (untitled) if no file is open - * Notepad - [filename] if a file is given + * (untitled) - Notepad if no file is open + * [filename] - Notepad if a file is given */ static void UpdateWindowCaption(void) { TCHAR szCaption[MAX_STRING_LEN]; - TCHAR szUntitled[MAX_STRING_LEN]; - - LoadString(Globals.hInstance, STRING_NOTEPAD, szCaption, SIZEOF(szCaption)); - - if (Globals.szFileTitle[0] != '\0') { - static const TCHAR bracket_l[] = _T(" - ["); - static const TCHAR bracket_r[] = _T("]"); - _tcscat(szCaption, bracket_l); - _tcscat(szCaption, Globals.szFileTitle); - _tcscat(szCaption, bracket_r); + TCHAR szNotepad[MAX_STRING_LEN]; + + LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); + + if (Globals.szFileTitle[0] != '\0') + { + StringCchCat(szCaption, MAX_STRING_LEN, Globals.szFileTitle); } else { - static const TCHAR hyphen[] = _T(" - "); - LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, SIZEOF(szUntitled)); - _tcscat(szCaption, hyphen); - _tcscat(szCaption, szUntitled); + LoadString(Globals.hInstance, STRING_UNTITLED, szCaption, SIZEOF(szCaption)); } - + + StringCchCat(szCaption, MAX_STRING_LEN, _T(" - ")); + StringCchCat(szCaption, MAX_STRING_LEN, szNotepad); SetWindowText(Globals.hMainWnd, szCaption); } @@ -684,7 +680,7 @@ _tcscat(szText, _T(" ")); GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, szDate, MAX_STRING_LEN); _tcscat(szText, szDate); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szText); } VOID DoCreateStatusBar(VOID) @@ -766,7 +762,7 @@ { DWORD dwStyle; int iSize; - LPTSTR pTemp; + LPTSTR pTemp = NULL; iSize = 0; Modified: trunk/reactos/base/applications/notepad/notepad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/notepad.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/notepad.h [iso-8859-1] Tue Feb 22 09:59:49 2011 @@ -6,6 +6,7 @@ #include <tchar.h> #include <richedit.h> #include <malloc.h> +#include <strsafe.h> #include "main.h" #include "dialog.h"

1 0

[arty] 50863: [NEWCC] Reenable post-unmap flush. It seems to fix the regtest cd.
by arty＠svn.reactos.org 22 Feb '11

22 Feb '11

Author: arty Date: Tue Feb 22 04:39:26 2011 New Revision: 50863 URL: http://svn.reactos.org/svn/reactos?rev=50863&view=rev Log: [NEWCC] Reenable post-unmap flush. It seems to fix the regtest cd. Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Tue Feb 22 04:39:26 2011 @@ -767,12 +767,7 @@ CcpUnlock(); if (!Released) { - // Note: I thought this flush was needed based on the unwritten pages I had - // seen post-install, but realized that the installer is using sections to - // write files and we weren't pushing section pages. - // I corrected that seperately and this probably isn't needed anymore. - //if (RealBcb->Dirty) - //MiFlushMappedSection(RealBcb->BaseAddress, &RealBcb->FileOffset, &RealBcb->Map->FileSizes.FileSize, RealBcb->Dirty); + MiFlushMappedSection(RealBcb->BaseAddress, &RealBcb->FileOffset, &RealBcb->Map->FileSizes.FileSize, RealBcb->Dirty); CcpLock(); CcpUnpinData(RealBcb, TRUE); CcpUnlock();

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