Ros-diffs

ros-diffs@reactos.org

81390 discussions

[zguo] 62053: [0.3.16] Tag final revision of 0.3.16.
by zguo＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: zguo Date: Sat Feb 8 18:05:49 2014 New Revision: 62053 URL: http://svn.reactos.org/svn/reactos?rev=62053&view=rev Log: [0.3.16] Tag final revision of 0.3.16. Added: tags/ReactOS-0.3.16/ (props changed) - copied from r61930, branches/ReactOS-0.3.16/ Propchange: tags/ReactOS-0.3.16/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 8 18:05:49 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: tags/ReactOS-0.3.16/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: tags/ReactOS-0.3.16/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tags/ReactOS-0.3.16/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk:61898

1 0

[bfreisen] 62052: [MSPAINT] - properly refresh scroll box client when moving a selection - use meaningful macros for some integer constants
by bfreisen＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: bfreisen Date: Sat Feb 8 17:49:24 2014 New Revision: 62052 URL: http://svn.reactos.org/svn/reactos?rev=62052&view=rev Log: [MSPAINT] - properly refresh scroll box client when moving a selection - use meaningful macros for some integer constants Modified: trunk/reactos/base/applications/mspaint/selection.c trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/selection.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/selection.c [iso-8859-1] Sat Feb 8 17:49:24 2014 @@ -10,14 +10,30 @@ #include "precomp.h" +/* DEFINES **********************************************************/ + +#define ACTION_MOVE 0 +#define ACTION_RESIZE_TOP_LEFT 1 +#define ACTION_RESIZE_TOP 2 +#define ACTION_RESIZE_TOP_RIGHT 3 +#define ACTION_RESIZE_LEFT 4 +#define ACTION_RESIZE_RIGHT 5 +#define ACTION_RESIZE_BOTTOM_LEFT 6 +#define ACTION_RESIZE_BOTTOM 7 +#define ACTION_RESIZE_BOTTOM_RIGHT 8 + /* FUNCTIONS ********************************************************/ -LPCTSTR cursors[9] = { IDC_SIZEALL, IDC_SIZENWSE, IDC_SIZENS, IDC_SIZENESW, - IDC_SIZEWE, IDC_SIZEWE, IDC_SIZENESW, IDC_SIZENS, IDC_SIZENWSE +LPCTSTR cursors[9] = { /* action to mouse cursor lookup table */ + IDC_SIZEALL, + + IDC_SIZENWSE, IDC_SIZENS, IDC_SIZENESW, + IDC_SIZEWE, IDC_SIZEWE, + IDC_SIZENESW, IDC_SIZENS, IDC_SIZENWSE }; BOOL moving = FALSE; -int action = 0; +int action = ACTION_MOVE; POINTS pos; POINTS frac; POINT delta; @@ -70,27 +86,27 @@ if (y < 3) { if (x < 3) - return 1; + return ACTION_RESIZE_TOP_LEFT; if ((x < w / 2 + 2) && (x >= w / 2 - 1)) - return 2; + return ACTION_RESIZE_TOP; if (x >= w - 3) - return 3; + return ACTION_RESIZE_TOP_RIGHT; } if ((y < h / 2 + 2) && (y >= h / 2 - 1)) { if (x < 3) - return 4; + return ACTION_RESIZE_LEFT; if (x >= w - 3) - return 5; + return ACTION_RESIZE_RIGHT; } if (y >= h - 3) { if (x < 3) - return 6; + return ACTION_RESIZE_BOTTOM_LEFT; if ((x < w / 2 + 2) && (x >= w / 2 - 1)) - return 7; + return ACTION_RESIZE_BOTTOM; if (x >= w - 3) - return 8; + return ACTION_RESIZE_BOTTOM_RIGHT; } return 0; } @@ -118,9 +134,10 @@ delta.x = 0; delta.y = 0; SetCapture(hwnd); - if (action != 0) + if (action != ACTION_MOVE) SetCursor(LoadCursor(NULL, cursors[action])); moving = TRUE; + InvalidateRect(hScrlClient, NULL, TRUE); break; case WM_MOUSEMOVE: if (moving) @@ -144,50 +161,50 @@ } switch (action) { - case 0: /* move selection */ + case ACTION_MOVE: /* move selection */ deltaUsed.x = delta.x; deltaUsed.y = delta.y; OffsetRect(&rectSel_dest, deltaUsed.x, deltaUsed.y); break; - case 1: /* resize at upper left corner */ + case ACTION_RESIZE_TOP_LEFT: /* resize at upper left corner */ deltaUsed.x = min(delta.x, RECT_WIDTH(rectSel_dest) - 1); deltaUsed.y = min(delta.y, RECT_HEIGHT(rectSel_dest) - 1); rectSel_dest.left += deltaUsed.x; rectSel_dest.top += deltaUsed.y; break; - case 2: /* resize at top edge */ + case ACTION_RESIZE_TOP: /* resize at top edge */ deltaUsed.x = delta.x; deltaUsed.y = min(delta.y, RECT_HEIGHT(rectSel_dest) - 1); rectSel_dest.top += deltaUsed.y; break; - case 3: /* resize at upper right corner */ + case ACTION_RESIZE_TOP_RIGHT: /* resize at upper right corner */ deltaUsed.x = max(delta.x, -(RECT_WIDTH(rectSel_dest) - 1)); deltaUsed.y = min(delta.y, RECT_HEIGHT(rectSel_dest) - 1); rectSel_dest.top += deltaUsed.y; rectSel_dest.right += deltaUsed.x; break; - case 4: /* resize at left edge */ + case ACTION_RESIZE_LEFT: /* resize at left edge */ deltaUsed.x = min(delta.x, RECT_WIDTH(rectSel_dest) - 1); deltaUsed.y = delta.y; rectSel_dest.left += deltaUsed.x; break; - case 5: /* resize at right edge */ + case ACTION_RESIZE_RIGHT: /* resize at right edge */ deltaUsed.x = max(delta.x, -(RECT_WIDTH(rectSel_dest) - 1)); deltaUsed.y = delta.y; rectSel_dest.right += deltaUsed.x; break; - case 6: /* resize at lower left corner */ + case ACTION_RESIZE_BOTTOM_LEFT: /* resize at lower left corner */ deltaUsed.x = min(delta.x, RECT_WIDTH(rectSel_dest) - 1); deltaUsed.y = max(delta.y, -(RECT_HEIGHT(rectSel_dest) - 1)); rectSel_dest.left += deltaUsed.x; rectSel_dest.bottom += deltaUsed.y; break; - case 7: /* resize at bottom edge */ + case ACTION_RESIZE_BOTTOM: /* resize at bottom edge */ deltaUsed.x = delta.x; deltaUsed.y = max(delta.y, -(RECT_HEIGHT(rectSel_dest) - 1)); rectSel_dest.bottom += deltaUsed.y; break; - case 8: /* resize at lower right corner */ + case ACTION_RESIZE_BOTTOM_RIGHT: /* resize at lower right corner */ deltaUsed.x = max(delta.x, -(RECT_WIDTH(rectSel_dest) - 1)); deltaUsed.y = max(delta.y, -(RECT_HEIGHT(rectSel_dest) - 1)); rectSel_dest.right += deltaUsed.x; @@ -200,13 +217,13 @@ _stprintf(sizeStr, _T("%d x %d"), RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest)); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); - if (activeTool == 10) /* text tool */ + if (activeTool == TOOL_TEXT) { Text(hDrawingDC, rectSel_dest.left, rectSel_dest.top, rectSel_dest.right, rectSel_dest.bottom, fgColor, bgColor, textToolText, hfontTextFont, transpBg); } else { - if (action != 0) + if (action != ACTION_MOVE) StretchBlt(hDrawingDC, rectSel_dest.left, rectSel_dest.top, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC, 0, 0, GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY); else if (transpBg == 0) @@ -221,7 +238,6 @@ InvalidateRect(hImageArea, NULL, FALSE); pos.x = GET_X_LPARAM(lParam); pos.y = GET_Y_LPARAM(lParam); - //SendMessage(hwnd, WM_PAINT, 0, 0); } else { @@ -231,7 +247,7 @@ pos.y = GET_Y_LPARAM(lParam); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) NULL); action = identifyCorner(pos.x, pos.y, w, h); - if (action != 0) + if (action != ACTION_MOVE) SetCursor(LoadCursor(NULL, cursors[action])); } break; @@ -240,9 +256,9 @@ { moving = FALSE; ReleaseCapture(); - if (action != 0) - { - if (activeTool == 10) /* text tool */ + if (action != ACTION_MOVE) + { + if (activeTool == TOOL_TEXT) { } Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Sat Feb 8 17:49:24 2014 @@ -23,7 +23,7 @@ activeTool = tool; pointSP = 0; // resets the point-buffer of the polygon and bezier functions InvalidateRect(hToolSettings, NULL, TRUE); - ShowWindow(hTrackbarZoom, (tool == 6) ? SW_SHOW : SW_HIDE); + ShowWindow(hTrackbarZoom, (tool == TOOL_ZOOM) ? SW_SHOW : SW_HIDE); } void @@ -279,7 +279,7 @@ case WM_INITMENUPOPUP: { HMENU menu = GetMenu(hMainWnd); - BOOL trueSelection = (IsWindowVisible(hSelection) && ((activeTool == 1) || (activeTool == 2))); + BOOL trueSelection = (IsWindowVisible(hSelection) && ((activeTool == TOOL_FREESEL) || (activeTool == TOOL_RECTSEL))); switch (lParam) { case 0: /* File menu */

1 0

[tkreuzer] 62051: [NTOSKRNL] Implement MiLockVirtualMemory / MiUnlockVirtualMemory. Due to missing WS list support, hack the WS list entries into the PFN, until we support WS lists.
by tkreuzer＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: tkreuzer Date: Sat Feb 8 17:45:19 2014 New Revision: 62051 URL: http://svn.reactos.org/svn/reactos?rev=62051&view=rev Log: [NTOSKRNL] Implement MiLockVirtualMemory / MiUnlockVirtualMemory. Due to missing WS list support, hack the WS list entries into the PFN, until we support WS lists. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Feb 8 17:45:19 2014 @@ -391,6 +391,9 @@ MI_PFN_USAGES PfnUsage; CHAR ProcessName[16]; #endif + + // HACK until WS lists are supported + MMWSLE Wsle; } MMPFN, *PMMPFN; extern PMMPFN MmPfnDatabase; Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat Feb 8 17:45:19 2014 @@ -2859,6 +2859,258 @@ return Status; } +FORCEINLINE +BOOLEAN +MI_IS_LOCKED_VA( + PMMPFN Pfn1, + ULONG LockType) +{ + // HACK until we have proper WSLIST support + PMMWSLE Wsle = &Pfn1->Wsle; + + if ((LockType & MAP_PROCESS) && (Wsle->u1.e1.LockedInWs)) + return TRUE; + if ((LockType & MAP_SYSTEM) && (Wsle->u1.e1.LockedInMemory)) + return TRUE; + + return FALSE; +} + +FORCEINLINE +VOID +MI_LOCK_VA( + PMMPFN Pfn1, + ULONG LockType) +{ + // HACK until we have proper WSLIST support + PMMWSLE Wsle = &Pfn1->Wsle; + + if (!Wsle->u1.e1.LockedInWs && + !Wsle->u1.e1.LockedInMemory) + { + MiReferenceProbedPageAndBumpLockCount(Pfn1); + } + + if (LockType & MAP_PROCESS) + Wsle->u1.e1.LockedInWs = 1; + if (LockType & MAP_SYSTEM) + Wsle->u1.e1.LockedInMemory = 1; +} + +FORCEINLINE +VOID +MI_UNLOCK_VA( + PMMPFN Pfn1, + ULONG LockType) +{ + // HACK until we have proper WSLIST support + PMMWSLE Wsle = &Pfn1->Wsle; + + if (LockType & MAP_PROCESS) + Wsle->u1.e1.LockedInWs = 0; + if (LockType & MAP_SYSTEM) + Wsle->u1.e1.LockedInMemory = 0; + + if (!Wsle->u1.e1.LockedInWs && + !Wsle->u1.e1.LockedInMemory) + { + MiDereferencePfnAndDropLockCount(Pfn1); + } +} + +static +NTSTATUS +MiCheckVadsForLockOperation( + _Inout_ PVOID *BaseAddress, + _Inout_ PSIZE_T RegionSize, + _Inout_ PVOID *EndAddress) + +{ + PMMVAD Vad; + PVOID CurrentVa; + + /* Get the base address and align the start address */ + *EndAddress = (PUCHAR)*BaseAddress + *RegionSize; + *EndAddress = ALIGN_UP_POINTER_BY(*EndAddress, PAGE_SIZE); + *BaseAddress = ALIGN_DOWN_POINTER_BY(*BaseAddress, PAGE_SIZE); + + /* First loop and check all VADs */ + CurrentVa = *BaseAddress; + while (CurrentVa < *EndAddress) + { + /* Get VAD */ + Vad = MiLocateAddress(CurrentVa); + if (Vad == NULL) + { + /// FIXME: this might be a memory area for a section view... + return STATUS_ACCESS_VIOLATION; + } + + /* Check VAD type */ + if ((Vad->u.VadFlags.VadType != VadNone) && + (Vad->u.VadFlags.VadType != VadImageMap) && + (Vad->u.VadFlags.VadType != VadWriteWatch)) + { + *EndAddress = CurrentVa; + *RegionSize = (PUCHAR)*EndAddress - (PUCHAR)*BaseAddress; + return STATUS_INCOMPATIBLE_FILE_MAP; + } + + CurrentVa = (PVOID)((Vad->EndingVpn + 1) << PAGE_SHIFT); + } + + *RegionSize = (PUCHAR)*EndAddress - (PUCHAR)*BaseAddress; + return STATUS_SUCCESS; +} + +static +NTSTATUS +MiLockVirtualMemory( + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T RegionSize, + IN ULONG MapType) +{ + PEPROCESS CurrentProcess; + PMMSUPPORT AddressSpace; + PVOID CurrentVa, EndAddress; + PMMPTE PointerPte, LastPte; + PMMPDE PointerPde; +#if (_MI_PAGING_LEVELS >= 3) + PMMPDE PointerPpe; +#endif +#if (_MI_PAGING_LEVELS == 4) + PMMPDE PointerPxe; +#endif + PMMPFN Pfn1; + NTSTATUS Status, TempStatus; + + /* Lock the address space */ + AddressSpace = MmGetCurrentAddressSpace(); + MmLockAddressSpace(AddressSpace); + + /* Make sure we still have an address space */ + CurrentProcess = PsGetCurrentProcess(); + if (CurrentProcess->VmDeleted) + { + Status = STATUS_PROCESS_IS_TERMINATING; + goto Cleanup; + } + + /* Check the VADs in the requested range */ + Status = MiCheckVadsForLockOperation(BaseAddress, RegionSize, &EndAddress); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* Enter SEH for probing */ + _SEH2_TRY + { + /* Loop all pages and probe them */ + CurrentVa = *BaseAddress; + while (CurrentVa < EndAddress) + { + (void)(*(volatile CHAR*)CurrentVa); + CurrentVa = (PUCHAR)CurrentVa + PAGE_SIZE; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + goto Cleanup; + } + _SEH2_END; + + /* All pages were accessible, since we hold the address space lock, nothing + can be de-committed. Assume success for now. */ + Status = STATUS_SUCCESS; + + /* Get the PTE and PDE */ + PointerPte = MiAddressToPte(*BaseAddress); + PointerPde = MiAddressToPde(*BaseAddress); +#if (_MI_PAGING_LEVELS >= 3) + PointerPpe = MiAddressToPpe(*BaseAddress); +#endif +#if (_MI_PAGING_LEVELS == 4) + PointerPxe = MiAddressToPxe(*BaseAddress); +#endif + + /* Get the last PTE */ + LastPte = MiAddressToPte((PVOID)((ULONG_PTR)EndAddress - 1)); + + /* Lock the process working set */ + MiLockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + + /* Loop the pages */ + do + { + /* Check for a page that is not accessible */ + while ( +#if (_MI_PAGING_LEVELS == 4) + (PointerPxe->u.Hard.Valid == 0) || +#endif +#if (_MI_PAGING_LEVELS >= 3) + (PointerPpe->u.Hard.Valid == 0) || +#endif + (PointerPde->u.Hard.Valid == 0) || + (PointerPte->u.Hard.Valid == 0)) + { + /* Release process working set */ + MiUnlockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + + /* Access the page */ + CurrentVa = MiPteToAddress(PointerPte); + + //HACK: Pass a placeholder TrapInformation so the fault handler knows we're unlocked + TempStatus = MmAccessFault(TRUE, CurrentVa, KernelMode, (PVOID)0xBADBADA3); + if (!NT_SUCCESS(TempStatus)) + { + // This should only happen, when remote backing storage is not accessible + ASSERT(FALSE); + Status = TempStatus; + goto Cleanup; + } + + /* Lock the process working set */ + MiLockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + } + + /* Get the PFN */ + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(PointerPte)); + ASSERT(Pfn1 != NULL); + + /* Check the previous lock status */ + if (MI_IS_LOCKED_VA(Pfn1, MapType)) + { + Status = STATUS_WAS_LOCKED; + } + + /* Lock it */ + MI_LOCK_VA(Pfn1, MapType); + + /* Go to the next PTE */ + PointerPte++; + + /* Check if we're on a PDE boundary */ + if (MiIsPteOnPdeBoundary(PointerPte)) PointerPde++; +#if (_MI_PAGING_LEVELS >= 3) + if (MiIsPteOnPpeBoundary(PointerPte)) PointerPpe++; +#endif +#if (_MI_PAGING_LEVELS == 4) + if (MiIsPteOnPxeBoundary(PointerPte)) PointerPxe++; +#endif + } while (PointerPte <= LastPte); + + /* Release process working set */ + MiUnlockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + +Cleanup: + /* Unlock address space */ + MmUnlockAddressSpace(AddressSpace); + + return Status; +} + NTSTATUS NTAPI NtLockVirtualMemory(IN HANDLE ProcessHandle, @@ -2987,9 +3239,11 @@ } // - // Oops :( - // - UNIMPLEMENTED; + // Call the internal function + // + Status = MiLockVirtualMemory(&CapturedBaseAddress, + &CapturedBytesToLock, + MapType); // // Detach if needed @@ -3010,7 +3264,7 @@ // Return data to user // *BaseAddress = CapturedBaseAddress; - *NumberOfBytesToLock = 0; + *NumberOfBytesToLock = CapturedBytesToLock; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -3024,8 +3278,174 @@ // // Return status // - return STATUS_SUCCESS; + return Status; } + + +static +NTSTATUS +MiUnlockVirtualMemory( + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T RegionSize, + IN ULONG MapType) +{ + PEPROCESS CurrentProcess; + PMMSUPPORT AddressSpace; + PVOID EndAddress; + PMMPTE PointerPte, LastPte; + PMMPDE PointerPde; +#if (_MI_PAGING_LEVELS >= 3) + PMMPDE PointerPpe; +#endif +#if (_MI_PAGING_LEVELS == 4) + PMMPDE PointerPxe; +#endif + PMMPFN Pfn1; + NTSTATUS Status; + + /* Lock the address space */ + AddressSpace = MmGetCurrentAddressSpace(); + MmLockAddressSpace(AddressSpace); + + /* Make sure we still have an address space */ + CurrentProcess = PsGetCurrentProcess(); + if (CurrentProcess->VmDeleted) + { + Status = STATUS_PROCESS_IS_TERMINATING; + goto Cleanup; + } + + /* Check the VADs in the requested range */ + Status = MiCheckVadsForLockOperation(BaseAddress, RegionSize, &EndAddress); + + /* Note: only bail out, if we hit an area without a VAD. If we hit an + incompatible VAD we continue, like Windows does */ + if (Status == STATUS_ACCESS_VIOLATION) + { + Status = STATUS_NOT_LOCKED; + goto Cleanup; + } + + /* Get the PTE and PDE */ + PointerPte = MiAddressToPte(*BaseAddress); + PointerPde = MiAddressToPde(*BaseAddress); +#if (_MI_PAGING_LEVELS >= 3) + PointerPpe = MiAddressToPpe(*BaseAddress); +#endif +#if (_MI_PAGING_LEVELS == 4) + PointerPxe = MiAddressToPxe(*BaseAddress); +#endif + + /* Get the last PTE */ + LastPte = MiAddressToPte((PVOID)((ULONG_PTR)EndAddress - 1)); + + /* Lock the process working set */ + MiLockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + + /* Loop the pages */ + do + { + /* Check for a page that is not present */ + if ( +#if (_MI_PAGING_LEVELS == 4) + (PointerPxe->u.Hard.Valid == 0) || +#endif +#if (_MI_PAGING_LEVELS >= 3) + (PointerPpe->u.Hard.Valid == 0) || +#endif + (PointerPde->u.Hard.Valid == 0) || + (PointerPte->u.Hard.Valid == 0)) + { + /* Remember it, but keep going */ + Status = STATUS_NOT_LOCKED; + } + else + { + /* Get the PFN */ + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(PointerPte)); + ASSERT(Pfn1 != NULL); + + /* Check if all of the requested locks are present */ + if (((MapType & MAP_SYSTEM) && !MI_IS_LOCKED_VA(Pfn1, MAP_SYSTEM)) || + ((MapType & MAP_PROCESS) && !MI_IS_LOCKED_VA(Pfn1, MAP_PROCESS))) + { + /* Remember it, but keep going */ + Status = STATUS_NOT_LOCKED; + + /* Check if no lock is present */ + if (!MI_IS_LOCKED_VA(Pfn1, MAP_PROCESS | MAP_SYSTEM)) + { + DPRINT1("FIXME: Should remove the page from WS\n"); + } + } + } + + /* Go to the next PTE */ + PointerPte++; + + /* Check if we're on a PDE boundary */ + if (MiIsPteOnPdeBoundary(PointerPte)) PointerPde++; +#if (_MI_PAGING_LEVELS >= 3) + if (MiIsPteOnPpeBoundary(PointerPte)) PointerPpe++; +#endif +#if (_MI_PAGING_LEVELS == 4) + if (MiIsPteOnPxeBoundary(PointerPte)) PointerPxe++; +#endif + } while (PointerPte <= LastPte); + + /* Check if we hit a page that was not locked */ + if (Status == STATUS_NOT_LOCKED) + { + goto CleanupWithWsLock; + } + + /* All pages in the region were locked, so unlock them all */ + + /* Get the PTE and PDE */ + PointerPte = MiAddressToPte(*BaseAddress); + PointerPde = MiAddressToPde(*BaseAddress); +#if (_MI_PAGING_LEVELS >= 3) + PointerPpe = MiAddressToPpe(*BaseAddress); +#endif +#if (_MI_PAGING_LEVELS == 4) + PointerPxe = MiAddressToPxe(*BaseAddress); +#endif + + /* Loop the pages */ + do + { + /* Unlock it */ + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(PointerPte)); + MI_UNLOCK_VA(Pfn1, MapType); + + /* Go to the next PTE */ + PointerPte++; + + /* Check if we're on a PDE boundary */ + if (MiIsPteOnPdeBoundary(PointerPte)) PointerPde++; +#if (_MI_PAGING_LEVELS >= 3) + if (MiIsPteOnPpeBoundary(PointerPte)) PointerPpe++; +#endif +#if (_MI_PAGING_LEVELS == 4) + if (MiIsPteOnPxeBoundary(PointerPte)) PointerPxe++; +#endif + } while (PointerPte <= LastPte); + + /* Everything is done */ + Status = STATUS_SUCCESS; + +CleanupWithWsLock: + + /* Release process working set */ + MiUnlockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + +Cleanup: + /* Unlock address space */ + MmUnlockAddressSpace(AddressSpace); + + return Status; +} + NTSTATUS NTAPI @@ -3155,9 +3575,11 @@ } // - // Oops :( - // - UNIMPLEMENTED; + // Call the internal function + // + Status = MiUnlockVirtualMemory(&CapturedBaseAddress, + &CapturedBytesToUnlock, + MapType); // // Detach if needed @@ -3177,8 +3599,8 @@ // // Return data to user // - *BaseAddress = PAGE_ALIGN(CapturedBaseAddress); - *NumberOfBytesToUnlock = 0; + *BaseAddress = CapturedBaseAddress; + *NumberOfBytesToUnlock = CapturedBytesToUnlock; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -4414,7 +4836,7 @@ PMEMORY_AREA MemoryArea; SIZE_T PRegionSize; PVOID PBaseAddress; - ULONG_PTR CommitReduction = 0; + LONG_PTR CommitReduction = 0; ULONG_PTR StartingAddress, EndingAddress; PMMVAD Vad; NTSTATUS Status;

1 0

[akhaldi] 62050: [SNDREC32] * Don't compile these two source files just yet, they're empty.
by akhaldi＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: akhaldi Date: Sat Feb 8 17:44:38 2014 New Revision: 62050 URL: http://svn.reactos.org/svn/reactos?rev=62050&view=rev Log: [SNDREC32] * Don't compile these two source files just yet, they're empty. Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] Sat Feb 8 17:44:38 2014 @@ -4,8 +4,8 @@ add_executable(sndrec32 audio_format.cpp audio_membuffer.cpp - audio_producer.cpp - audio_receiver.cpp + #audio_producer.cpp + #audio_receiver.cpp audio_resampler_acm.cpp audio_wavein.cpp audio_waveout.cpp

1 0

[akhaldi] 62049: [NETID] * Properly name the resource file. Fixes *nix build.
by akhaldi＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: akhaldi Date: Sat Feb 8 17:40:22 2014 New Revision: 62049 URL: http://svn.reactos.org/svn/reactos?rev=62049&view=rev Log: [NETID] * Properly name the resource file. Fixes *nix build. Added: trunk/reactos/dll/win32/netid/lang/sq-AL.rc - copied unchanged from r62043, trunk/reactos/dll/win32/netid/lang/sq-Al.rc Removed: trunk/reactos/dll/win32/netid/lang/sq-Al.rc Removed: trunk/reactos/dll/win32/netid/lang/sq-Al.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/sq-Al… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/sq-Al.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/sq-Al.rc (removed) @@ -1,84 +0,0 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TRANSLATION: 23-01-2014 -*/ - -LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL - -IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Emri Kompjuterit" -FONT 8, "MS Shell Dlg" -BEGIN - ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON - LTEXT "ReactOS pÃ«rdor informacionin e mÃ«poshtÃ«m pÃ«r tÃ« identifikuar kompjuterin tuaj nÃ« rrjet.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "PÃ«rshkrimi Kompjuterit:", IDC_STATIC, 6, 40, 90, 9 - EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Emri plotÃ« kompjuterit:", IDC_STATIC, 6, 68, 85, 9 - EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "GrupPune:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 - EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "PÃ«r tÃ« pÃ«rdorur Magjistarin Rrjetit Identifikues pÃ«r t'u futur nÃ« njÃ« domain dhe pÃ«r tÃ« krijuar njÃ« pÃ«rdorues lokal, klikoni ""ID Rrjetit"".", IDC_STATIC, 6, 113, 172, 24 - PUSHBUTTON "&ID Rrjetit...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "PÃ«r tÃ« riemÃ«rtuar kÃ«tÃ« kompjuter apo tÃ« bashkohet me njÃ« domain, klikoni ""Ndrysho"".", IDC_STATIC, 6, 149, 170, 17 - PUSHBUTTON "&Ndrysho...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 - LTEXT "ShÃ«nim: VetÃ«m AdministratorÃ«t mund tÃ« ndryshojnÃ« identifikimin e kÃ«tij kompjuteri.", IDC_STATIC, 6, 179, 300, 9 -END - -IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Emri Kompjuterit Ndryshon" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "(mesazhi shkon kÃ«tu)", 1017, 7, 5, 218, 30 - LTEXT "&Emri kompjuterit:", -1, 7, 41, 219, 8 - EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT - LTEXT "Emri plotÃ« kompjuterit:", 1016, 7, 72, 218, 10 - EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - PUSHBUTTON "&M'shumÃ«...", 1003, 150, 102, 75, 14 - GROUPBOX "AnÃ«tarÃ« i", 1018, 7, 119, 219, 73 - AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP - AUTORADIOBUTTON "&GrupPune:", 1004, 17, 161, 191, 10 - EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP - PUSHBUTTON "&Gjej domain tim", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED - EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT - DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP - PUSHBUTTON "Anulo", 2, 176, 203, 50, 14 -END - -IDD_PROPPAGEDNSANDNETBIOS DIALOGEX 0, 0, 266, 125 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "DNS prapashtesÃ« dhe NetBIOS emri kompjuterit" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Prapashtesa priamre e DNS'sÃ« tÃ« kÃ«tij kompjuterit:", -1, 7, 5, 253, 8 - EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL - AUTOCHECKBOX "&Ndrysho prapashtesÃ«m primare DNS'sÃ« kur antarÃ«simi i domain-it ndryshon", 115, 11, 39, 250, 10 - LTEXT "&NetBIOS emri kompjuterit:", -1, 7, 57, 148, 8 - EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY - DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 - PUSHBUTTON "Anulo", 2, 209, 104, 50, 14 - LTEXT "Ky emÃ«r Ã«shtÃ« pÃ«rdorur pÃ«r ndÃ«rveprim me kompjutera tÃ« vjetÃ«r dhe shÃ«rbimet.", 13, 7, 88, 253, 8 -END - -STRINGTABLE -BEGIN - 1 "* panjohur *" - 2 "GRUPPUNE" - 3 "Gabimi nÃ« vijim ndodhi duke u pÃ«rpjekur pÃ«r tÃ« lexuar informacionin e anÃ«tarÃ«simit tÃ« domain-it:" - 4 "Emri Kompjuterit Ndryshon" - 5 "GrupPune:" - 6 "Domain:" - 22 "MirÃ«sivine tek %1 grupipunÃ«s." - 23 "MirÃ«sivine tek %1 domain." - 24 "Ju duhet tÃ« rinisni kÃ«tÃ« kompjuter qÃ« ndryshimet tÃ« hyjnÃ« nÃ« fuqi." - 25 "Ju mund tÃ« ndryshoni emrin dhe anÃ«tarÃ«simin e kÃ«tij kompjuteri. Ndryshimet mund tÃ« ndikojnÃ« nÃ« hyrjet e burimeve nÃ« rrjet." - 1021 "Shenime: VetÃ«m AdministratorÃ«t mund tÃ« ndryshojnÃ« identifikimin e kÃ«tij kompjuteri." - 1022 "Shenim: Identifikimi i kompjuterit nuk mund tÃ« ndryshohet sepse:" - 1030 "Emri i ri kompjuterik ""%s"" pÃ«rmban karaktere tÃ« cilat nuk janÃ« tÃ« lejuara. KarakterÃ«t tÃ« cilat nuk janÃ« tÃ« lejuar pÃ«rfshijnÃ« ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" - /* Windows allows using these characters, although it displays a warning message. - Forbidding the use of these characters means incompatibility with Windows. */ - 3210 "&Detaje >>" - 3220 "<< &Detaje" - 4000 "Informacion" - 4001 "Nuk mund tÃ« vihet njÃ« emÃ«r i ri kompjuterik!" -END

1 0

[akhaldi] 62048: [CONSOLE] * Properly name the resource file. Fixes *nix build.
by akhaldi＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: akhaldi Date: Sat Feb 8 17:34:10 2014 New Revision: 62048 URL: http://svn.reactos.org/svn/reactos?rev=62048&view=rev Log: [CONSOLE] * Properly name the resource file. Fixes *nix build. Added: trunk/reactos/dll/cpl/console/lang/sq-AL.rc - copied unchanged from r62043, trunk/reactos/dll/cpl/console/lang/sq-Al.rc Removed: trunk/reactos/dll/cpl/console/lang/sq-Al.rc Removed: trunk/reactos/dll/cpl/console/lang/sq-Al.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/sq-Al… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/sq-Al.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/sq-Al.rc (removed) @@ -1,158 +0,0 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TR: 04-01-2014 -*/ - -LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL - -IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Opsione" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Masa Kursorit", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "Vogel", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 - CONTROL "&Mesem", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 - CONTROL "Madhe", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 - GROUPBOX "Shfaq Opsione", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "Dritare", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 - CONTROL "Monitor Plote", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "Historiku Komandave", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "&Buffer Masa:", -1, 14, 101, 70, 12 - EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 - LTEXT "&Numri i Buffers:", -1, 14, 124, 70, 12 - EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15 - CHECKBOX "Hiq Duplikimet e Vjetra", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 - GROUPBOX "Modifiko Opsione", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP - CHECKBOX "MÃ«nyra e shpejt Modifikimi", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP - CHECKBOX "MÃ«nyr Futje", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Font" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Dritare Preview:", -1, 10, 10, 94, 10 - LTEXT "MasÃ«:", -1, 180, 10, 36, 10 - CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Statik", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL - LTEXT "&Font:", -1, 10, 105, 33, 10 - CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 - LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL - GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 - CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Statik", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 - LTEXT "Ãdo krarakter Ã«shtÃ«:", -1, 124, 166, 75, 10 - LTEXT "pixeli ekranit i gjerÃ«\npixel ekranit i gjatÃ«", -1, 136, 180, 101, 20 - LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 - LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 -END - -IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Pamja" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Dritare Preview:", -1, 8, 6, 95, 10 - CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Statik", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 - GROUPBOX "Masa e Ekranit Buffer", -1, 130, 12, 115, 50 - LTEXT "GjerÃ«:", -1, 140, 28, 40, 10 - LTEXT "GjatÃ«:", -1, 140, 46, 39, 10 - EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14 - EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14 - GROUPBOX "Masa Dritares", -1, 130, 65, 115, 47 - LTEXT "&GjerÃ«:", -1, 140, 78, 39, 10 - LTEXT "&GjatÃ«:", -1, 140, 95, 37, 10 - EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14 - EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14 - GROUPBOX "Pozicioni Dritares", -1, 130, 116, 115, 64 - LTEXT "&Majtas:", -1, 140, 132, 38, 10 - LTEXT "&Lart:", -1, 140, 149, 40, 10 - EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14 - EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14 - CHECKBOX "Lejo sistemin e &pozicionimit dritares", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 -END - -IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Ngjyra" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Monitori &Teksti", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | - WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10 - CONTROL "Monitori &Sfond", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | - WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10 - CONTROL "&Popup Texkst", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | - WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10 - CONTROL "Pop&up Sfondi", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | - WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10 - GROUPBOX "PÃ«rzgjidh ngjyrat e komponenteve", -1, 105, 6, 140, 60 - LTEXT "&Kuq:", -1, 135, 18, 30, 10 - EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14 - LTEXT "&Jeshil:", -1, 135, 34, 30, 10 - EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14 - LTEXT "&Blu:", -1, 135, 50, 30, 10 - EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14 - CONTROL "", IDC_STATIC_COLOR1, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 23, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR2, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 36, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR3, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 49, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR4, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 62, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR5, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR6, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 88, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR7, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR8, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 114, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR9, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 127, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR10, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 140, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR11, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 153, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR12, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 166, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR13, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 179, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR14, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR15, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR16, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12 - GROUPBOX "Preview (monitor)", -1, 8, 100, 237, 55 - CONTROL "", IDC_STATIC_SCREEN_COLOR, "Statik", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40 - GROUPBOX "Preview (Popup)", -1, 8, 160, 237, 55 - CONTROL "", IDC_STATIC_POPUP_COLOR, "Statik", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40 -END - -IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 -STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Apliko Konfigurimet" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Apliko Konfigurimet vetem tek dritarja aktuale", IDC_RADIO_APPLY_CURRENT, - "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10 - CONTROL "&Ruaj Konfigurimet per dritaret e te ardhmes me te njejtin emer", IDC_RADIO_APPLY_ALL, - "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10 - PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE - PUSHBUTTON "Anulo", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Console" - IDS_CPLDESCRIPTION "Konfigurim i parametrave te konsole." - IDS_APPLY_SHORTCUT_ALL "Modifiko &shkurtimi qe filloj kete dritare" - IDS_RASTERFONTS "Raster Fonts" -END

1 0

[akhaldi] 62047: [WINHLP32] * We don't need to allow warnings in GCC builds anymore.
by akhaldi＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: akhaldi Date: Sat Feb 8 17:26:49 2014 New Revision: 62047 URL: http://svn.reactos.org/svn/reactos?rev=62047&view=rev Log: [WINHLP32] * We don't need to allow warnings in GCC builds anymore. Modified: trunk/reactos/base/applications/winhlp32/CMakeLists.txt Modified: trunk/reactos/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Sat Feb 8 17:26:49 2014 @@ -20,9 +20,3 @@ target_link_libraries(winhlp32 wine) add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all) - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(winhlp32) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif()

1 0

[akhaldi] 62046: [RAPPS] * We don't need to set these includes here.
by akhaldi＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: akhaldi Date: Sat Feb 8 17:18:23 2014 New Revision: 62046 URL: http://svn.reactos.org/svn/reactos?rev=62046&view=rev Log: [RAPPS] * We don't need to set these includes here. Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sat Feb 8 17:18:23 2014 @@ -17,10 +17,6 @@ winmain.c rapps.rc) -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${REACTOS_BINARY_DIR}/include/reactos) - add_executable(rapps ${SOURCE}) add_pch(rapps rapps.h) set_module_type(rapps win32gui UNICODE)

1 0

[tkreuzer] 62045: [NTOSKRNL] Fix LDR entry reference count. CORE-7862 #resolve
by tkreuzer＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: tkreuzer Date: Sat Feb 8 16:28:14 2014 New Revision: 62045 URL: http://svn.reactos.org/svn/reactos?rev=62045&view=rev Log: [NTOSKRNL] Fix LDR entry reference count. CORE-7862 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sat Feb 8 16:28:14 2014 @@ -1896,8 +1896,8 @@ } else { - /* No referencing needed */ - LdrEntry->LoadCount = 0; + /* Add a reference for all other modules as well */ + LdrEntry->LoadCount = 1; } /* Remember this came from the loader */

1 0

[akhaldi] 62044: [INETCOMM] * Add header guards to the main header. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 08 Feb '14

08 Feb '14

Author: akhaldi Date: Sat Feb 8 16:22:49 2014 New Revision: 62044 URL: http://svn.reactos.org/svn/reactos?rev=62044&view=rev Log: [INETCOMM] * Add header guards to the main header. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_private.h Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] Sat Feb 8 16:22:49 2014 @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#ifndef _INETCOMM_PRIVATE_H_ +#define _INETCOMM_PRIVATE_H_ + #include <stdio.h> #define WIN32_NO_STATUS @@ -99,3 +101,5 @@ HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; + +#endif /* _INETCOMM_PRIVATE_H_ */

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