Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[weiden] 29250: Set the current device mode selection to the current one if the mode was changed successfully

by weiden＠svn.reactos.org

Author: weiden Date: Thu Sep 27 21:24:07 2007 New Revision: 29250 URL: http://svn.reactos.org/svn/reactos?rev=29250&view=rev Log: Set the current device mode selection to the current one if the mode was changed successfully Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 21:24:07 2007 @@ -347,6 +347,7 @@ { /* Save the new mode */ This->lpDevModeOnInit = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + This->lpSelDevMode = This->lpDevModeOnInit; return PSNRET_NOERROR; } else if (lChangeRet == DISP_CHANGE_RESTART)

17 years, 2 months

[cwittich] 29249: add shell extension for displaying processor information in device manager

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Sep 27 21:04:44 2007 New Revision: 29249 URL: http://svn.reactos.org/svn/reactos?rev=29249&view=rev Log: add shell extension for displaying processor information in device manager Added: trunk/reactos/dll/win32/shellext/devcpux/ trunk/reactos/dll/win32/shellext/devcpux/devcpux.def (with props) trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild (with props) trunk/reactos/dll/win32/shellext/devcpux/processor.c (with props) trunk/reactos/dll/win32/shellext/devcpux/processor.rc (with props) trunk/reactos/dll/win32/shellext/devcpux/resource.h (with props) Modified: trunk/reactos/dll/win32/shellext/shellext.rbuild Added: trunk/reactos/dll/win32/shellext/devcpux/devcpux.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/devcpux.def (added) +++ trunk/reactos/dll/win32/shellext/devcpux/devcpux.def Thu Sep 27 21:04:44 2007 @@ -1,0 +1,7 @@ +LIBRARY devcpux.dll + +EXPORTS + +PropSheetExtProc@12 + +; EOF Propchange: trunk/reactos/dll/win32/shellext/devcpux/devcpux.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild (added) +++ trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild Thu Sep 27 21:04:44 2007 @@ -1,0 +1,19 @@ +<module name="devcpux" type="win32dll" installbase="system32" installname="devcpux.dll"> + <importlibrary definition="devcpux.def" /> + <include base="devcpux">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>ntdll</library> + <library>powrprof</library> + <library>comctl32</library> + <file>processor.c</file> + <file>processor.rc</file> +</module> Propchange: trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/devcpux/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/processor.c (added) +++ trunk/reactos/dll/win32/shellext/devcpux/processor.c Thu Sep 27 21:04:44 2007 @@ -1,0 +1,121 @@ +/* + * PROJECT: ReactOS Shell Extensions + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: dll\win32\shellext\devcpux\processor.c + * PURPOSE: + * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)ReactOS.org> + * + */ + +#include <windows.h> +#include <setupapi.h> +#include <powrprof.h> + +#include "resource.h" + +HINSTANCE g_hInstance = NULL; +int APIENTRY ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam); + +BOOL +APIENTRY +DllMain (HANDLE hInstance, DWORD dwReason, LPVOID lpReserved) +{ + switch (dwReason) + { + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_ATTACH: + case DLL_PROCESS_DETACH: + break; + } + + g_hInstance = (HINSTANCE) hInstance; + return TRUE; +} + + +BOOL +APIENTRY +PropSheetExtProc(PSP_PROPSHEETPAGE_REQUEST PropPageRequest, LPFNADDPROPSHEETPAGE fAddFunc, LPARAM lParam) +{ + PROPSHEETPAGE PropSheetPage; + HPROPSHEETPAGE hPropSheetPage; + + if(PropPageRequest->PageRequested != SPPSR_ENUM_ADV_DEVICE_PROPERTIES) + return FALSE; + + if ((!PropPageRequest->DeviceInfoSet) || (!PropPageRequest->DeviceInfoData)) + return FALSE; + + ZeroMemory(&PropSheetPage, sizeof(PROPSHEETPAGE)); + PropSheetPage.dwSize = sizeof(PROPSHEETPAGE); + PropSheetPage.hInstance = g_hInstance; + PropSheetPage.pszTemplate = MAKEINTRESOURCE(DLG_PROCESSORINFO); + PropSheetPage.pfnDlgProc = ProcessorDlgProc; + + hPropSheetPage = CreatePropertySheetPage(&PropSheetPage); + if(hPropSheetPage) + return FALSE; + + if(!(*fAddFunc)(hPropSheetPage, lParam)) { + DestroyPropertySheetPage (hPropSheetPage); + return FALSE; + } + + return TRUE; +} + +void +AddFeature(WCHAR* szFeatures, WCHAR* Feature, BOOL* bFirst) +{ + if (!*bFirst) + wcscat(szFeatures, L", "); + *bFirst = FALSE; + wcscat(szFeatures, Feature); +} + +int +APIENTRY +ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam) +{ + switch (uMessage) { + case WM_INITDIALOG: + { + WCHAR szFeatures[MAX_PATH] = L""; + WCHAR szModel[3]; + WCHAR szStepping[3]; + WCHAR szCurrentMhz[10]; + BOOL bFirst = TRUE; + SYSTEM_INFO SystemInfo; + PROCESSOR_POWER_INFORMATION PowerInfo; + + if (IsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"MMX", &bFirst); + if (IsProcessorFeaturePresent(PF_XMMI_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"SSE", &bFirst); + if (IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"SSE2", &bFirst); + /*if (IsProcessorFeaturePresent(PF_SSE3_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"SSE3", &bFirst); */ + if (IsProcessorFeaturePresent(PF_3DNOW_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"3DNOW", &bFirst); + + SetDlgItemTextW(hDlg, IDC_FEATURES, szFeatures); + + GetSystemInfo(&SystemInfo); + + wsprintf(szModel, L"%x", HIBYTE(SystemInfo.wProcessorRevision)); + wsprintf(szStepping, L"%d", LOBYTE(SystemInfo.wProcessorRevision)); + + SetDlgItemTextW(hDlg, IDC_MODEL, szModel); + SetDlgItemTextW(hDlg, IDC_STEPPING, szStepping); + + CallNtPowerInformation(11, NULL, 0, &PowerInfo, sizeof(PowerInfo)); + wsprintf(szCurrentMhz, L"%ld %s", PowerInfo.CurrentMhz, L"MHz"); + SetDlgItemTextW(hDlg, IDC_CORESPEED, szCurrentMhz); + + return TRUE; + } + } + return FALSE; +} Propchange: trunk/reactos/dll/win32/shellext/devcpux/processor.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/devcpux/processor.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/processor.rc (added) +++ trunk/reactos/dll/win32/shellext/devcpux/processor.rc Thu Sep 27 21:04:44 2007 @@ -1,0 +1,31 @@ +#include <windows.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Processor Shell Extension\0" +#define REACTOS_STR_INTERNAL_NAME "processorext\0" +#define REACTOS_STR_ORIGINAL_FILENAME "processorext.dll\0" +#include <reactos/version.rc> + + +DLG_PROCESSORINFO DIALOG DISCARDABLE 0, 0, 200, 220 +STYLE WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "CPU" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Features:",-1,5,23,50,51 + LTEXT "Test",IDC_FEATURES,50,23,80,51 + + LTEXT "Model:",-1,5,33,50,51 + LTEXT "test",IDC_MODEL,50,33,80,51 + + LTEXT "Stepping:",-1,5,43,50,51 + LTEXT "test",IDC_STEPPING,50,43,80,51 + + + LTEXT "Core Speed:",-1,5,53,50,51 + LTEXT "test",IDC_CORESPEED,50,53,80,51 + + +END Propchange: trunk/reactos/dll/win32/shellext/devcpux/processor.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/devcpux/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/resource.h (added) +++ trunk/reactos/dll/win32/shellext/devcpux/resource.h Thu Sep 27 21:04:44 2007 @@ -1,0 +1,6 @@ +#define DLG_PROCESSORINFO 201 + +#define IDC_FEATURES 301 +#define IDC_MODEL 302 +#define IDC_STEPPING 303 +#define IDC_CORESPEED 304 Propchange: trunk/reactos/dll/win32/shellext/devcpux/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shellext/shellext.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/shellex… ============================================================================== --- trunk/reactos/dll/win32/shellext/shellext.rbuild (original) +++ trunk/reactos/dll/win32/shellext/shellext.rbuild Thu Sep 27 21:04:44 2007 @@ -10,4 +10,7 @@ <directory name="deskmon"> <xi:include href="deskmon/deskmon.rbuild" /> </directory> + <directory name="devcpux"> + <xi:include href="devcpux/devcpux.rbuild" /> + </directory> </group>

17 years, 2 months

[tkreuzer] 29248: Basic implementation of NtGdiSetDIBitsToDeviceInternal() todo: handle XlateObj Now apparition (open source pdf viewer) works on ros.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Sep 27 21:04:29 2007 New Revision: 29248 URL: http://svn.reactos.org/svn/reactos?rev=29248&view=rev Log: Basic implementation of NtGdiSetDIBitsToDeviceInternal() todo: handle XlateObj Now apparition (open source pdf viewer) works on ros. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Thu Sep 27 21:04:29 2007 @@ -332,8 +332,117 @@ IN OPTIONAL HANDLE hcmXform ) { - UNIMPLEMENTED; - return 0; + INT ret = 0; + NTSTATUS Status = STATUS_SUCCESS; + PDC pDC; + HBITMAP hSourceBitmap = NULL; + SURFOBJ *pDestSurf = NULL, *pSourceSurf = NULL; + RECTL rcDest; + POINTL ptSource; + INT DIBWidth; + SIZEL SourceSize; + XLATEOBJ *XlateObj = NULL; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + if (pDC->IsIC) + { + DC_UnlockDc(pDC); + return 0; + } + + pDestSurf = EngLockSurface((HSURF)pDC->w.hBitmap); + if (!pDestSurf) + { + /* FIXME: SetLastError ? */ + DC_UnlockDc(pDC); + return 0; + } + + SourceSize.cx = bmi->bmiHeader.biWidth; + SourceSize.cy = ScanLines; + DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount); + + rcDest.left = XDest; + rcDest.top = YDest; + rcDest.right = XDest + Width; + rcDest.bottom = YDest + Height; + ptSource.x = XSrc; + ptSource.y = YSrc; + + /* Enter SEH, as the bits are user mode */ + _SEH_TRY + { + hSourceBitmap = EngCreateBitmap(SourceSize, + DIBWidth, + BitmapFormat(bmi->bmiHeader.biBitCount, bmi->bmiHeader.biCompression), + bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, + (PVOID) Bits); + if (!hSourceBitmap) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + Status = STATUS_NO_MEMORY; + _SEH_LEAVE; + } + + pSourceSurf = EngLockSurface((HSURF)hSourceBitmap); + if (!pSourceSurf) + { + Status = STATUS_UNSUCCESSFUL; + _SEH_LEAVE; + } + + /* FIXME: handle XlateObj */ + XlateObj = NULL; + + /* Copy the bits */ + Status = IntEngBitBlt(pDestSurf, + pSourceSurf, + NULL, + pDC->CombinedClip, + XlateObj, + &rcDest, + &ptSource, + NULL, + NULL, + NULL, + ROP3_TO_ROP4(SRCCOPY)); + + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (NT_SUCCESS(Status)) + { + /* FIXME: Should probably be only the number of lines actually copied */ + ret = ScanLines; + } + + if (pSourceSurf) + { + EngUnlockSurface(pSourceSurf); + } + + if (hSourceBitmap) + { + EngDeleteSurface((HSURF)hSourceBitmap); + } + + if (pDestSurf) + { + EngUnlockSurface(pDestSurf); + } + + DC_UnlockDc(pDC); + + return ret; } /* Converts a device-dependent bitmap to a DIB */

17 years, 2 months

[fireball] 29247: - Coalesce all calls to MmUpdatePageDir through a single inlined function - MiSyncProcessThreadViews, and fix callers which assumed that the kernel stack is KERNEL_STACK_SIZE, when in fact, it may be KERNEL_LARGE_STACK_SIZE. We now detect and handle this, fixing a bug in KiAttachProcess. - Remove all old-scheduler code, it's not needed anymore, nor it's going to be ever supported.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Sep 27 20:28:56 2007 New Revision: 29247 URL: http://svn.reactos.org/svn/reactos?rev=29247&view=rev Log: - Coalesce all calls to MmUpdatePageDir through a single inlined function - MiSyncProcessThreadViews, and fix callers which assumed that the kernel stack is KERNEL_STACK_SIZE, when in fact, it may be KERNEL_LARGE_STACK_SIZE. We now detect and handle this, fixing a bug in KiAttachProcess. - Remove all old-scheduler code, it's not needed anymore, nor it's going to be ever supported. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/ke/balmgr.c trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/procobj.c (contents, props changed) trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/thrdschd.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 (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Sep 27 20:28:56 2007 @@ -1474,7 +1474,7 @@ FORCEINLINE VOID NTAPI -MiSyncThreadProcessViews(IN PKPROCESS Process, +MiSyncThreadProcessViews(IN PVOID Process, IN PVOID Address, IN ULONG Size) { Modified: trunk/reactos/ntoskrnl/ke/balmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/balmgr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ke/balmgr.c (original) +++ trunk/reactos/ntoskrnl/ke/balmgr.c Thu Sep 27 20:28:56 2007 @@ -40,10 +40,6 @@ /* Lock the dispatcher and PRCB */ OldIrql = KiAcquireDispatcherLock(); KiAcquirePrcbLock(Prcb); -#ifndef NEW_SCHEDULER - goto OldSched; -#endif - /* Check if there's any thread that need help */ Summary = Prcb->ReadySummary & ((1 << THREAD_BOOST_PRIORITY) - 2); if (Summary) @@ -76,7 +72,6 @@ if (WaitLimit >= Thread->WaitTime) { /* Remove the thread from the queue */ - DPRINT1("Thread: %p\n", Thread); NextEntry = NextEntry->Blink; ASSERT((Prcb->ReadySummary & PRIORITY_MASK(Index))); if (RemoveEntryList(NextEntry->Flink)) @@ -114,9 +109,6 @@ } /* Release the locks and dispatcher */ -#ifndef NEW_SCHEDULER -OldSched: -#endif KiReleasePrcbLock(Prcb); KiReleaseDispatcherLock(OldIrql); Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Thu Sep 27 20:28:56 2007 @@ -687,11 +687,6 @@ call @KiRetireDpcList@4 CheckSchedule: -#ifndef NEW_SCHEDULER - /* FIXME: ROS HACK */ - call _NtYieldExecution@0 -#endif - /* Check if a next thread is queued */ cmp dword ptr [ebx+KPCR_PRCB_NEXT_THREAD], 0 #ifdef CONFIG_SMP Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c Thu Sep 27 20:28:56 2007 @@ -29,27 +29,6 @@ PVOID KeRaiseUserExceptionDispatcher; /* PRIVATE FUNCTIONS *********************************************************/ - -FORCEINLINE -VOID -NTAPI -UpdatePageDirs(IN PKTHREAD Thread, - IN PKPROCESS Process) -{ - /* - * The stack and the thread structure of the current process may be - * located in a page which is not present in the page directory of - * the process we're attaching to. That would lead to a page fault - * when this function returns. However, since the processor can't - * call the page fault handler 'cause it can't push EIP on the stack, - * this will show up as a stack fault which will crash the entire system. - * To prevent this, make sure the page directory of the process we're - * attaching to is up-to-date. - */ - MmUpdatePageDir((PEPROCESS)Process, - (PVOID)Thread->StackLimit, - KERNEL_STACK_SIZE); -} VOID NTAPI @@ -463,13 +442,15 @@ KeAttachProcess(IN PKPROCESS Process) { KLOCK_QUEUE_HANDLE ApcLock; - PKTHREAD Thread; + PKTHREAD Thread = KeGetCurrentThread(); ASSERT_PROCESS(Process); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Make sure that we are in the right page directory */ - Thread = KeGetCurrentThread(); - UpdatePageDirs(Thread, Process); + MiSyncThreadProcessViews(Process, + (PVOID)Thread->StackLimit, + Thread->LargeStack ? + KERNEL_STACK_SIZE : KERNEL_LARGE_STACK_SIZE); /* Check if we're already in that process */ if (Thread->ApcState.Process == Process) return; @@ -595,7 +576,10 @@ ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Make sure that we are in the right page directory */ - UpdatePageDirs(Thread, Process); + MiSyncThreadProcessViews(Process, + (PVOID)Thread->StackLimit, + Thread->LargeStack ? + KERNEL_STACK_SIZE : KERNEL_LARGE_STACK_SIZE); /* Crash system if DPC is being executed! */ if (KeIsExecutingDpc()) Propchange: trunk/reactos/ntoskrnl/ke/procobj.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Thu Sep 27 20:28:56 2007 @@ -810,11 +810,11 @@ Thread->StackLimit = (ULONG_PTR)KernelStack - KERNEL_STACK_SIZE; Thread->KernelStackResident = TRUE; - /* ROS Mm HACK */ - MmUpdatePageDir((PEPROCESS)Process, - (PVOID)Thread->StackLimit, - KERNEL_STACK_SIZE); - MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); + /* Make sure that we are in the right page directory */ + MiSyncThreadProcessViews(Process, + Thread, + KERNEL_STACK_SIZE); + MiSyncThreadProcessViews(Process, Thread, sizeof(ETHREAD)); #if defined(_M_IX86) /* Enter SEH to avoid crashes due to user mode */ @@ -1006,7 +1006,6 @@ /* Lock the PRCB */ KiAcquirePrcbLock(Prcb); -#ifdef NEW_SCHEDULER /* Check if there's no next thread scheduled */ if (!Prcb->NextThread) { @@ -1015,14 +1014,6 @@ NextThread->State = Standby; Prcb->NextThread = NextThread; } -#else - /* We need to dispatch a new thread */ - NextThread = NULL; - CurrentThread->WaitIrql = OldIrql; - KiDispatchThreadNoLock(Ready); - KeLowerIrql(OldIrql); - return; -#endif /* Release the PRCB lock */ KiReleasePrcbLock(Prcb); @@ -1124,7 +1115,6 @@ /* Lock the PRCB */ KiAcquirePrcbLock(Prcb); -#ifdef NEW_SCHEDULER /* Check if there's no next thread scheduled */ if (!Prcb->NextThread) { @@ -1133,14 +1123,6 @@ NextThread->State = Standby; Prcb->NextThread = NextThread; } -#else - /* We need to dispatch a new thread */ - NextThread = NULL; - CurrentThread->WaitIrql = OldIrql; - KiDispatchThreadNoLock(Ready); - KeLowerIrql(OldIrql); - return; -#endif /* Release the PRCB lock */ KiReleasePrcbLock(Prcb); Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c Thu Sep 27 20:28:56 2007 @@ -265,152 +265,6 @@ KiReleasePrcbLock(Prcb); } -VOID -KiInsertIntoThreadList(KPRIORITY Priority, - PKTHREAD Thread) -{ - ASSERT(Ready == Thread->State); - ASSERT(Thread->Priority == Priority); - - if (Priority >= MAXIMUM_PRIORITY || Priority < LOW_PRIORITY) { - - DPRINT1("Invalid thread priority (%d)\n", Priority); - KEBUGCHECK(0); - } - - InsertTailList(&KeGetCurrentPrcb()->DispatcherReadyListHead[Priority], &Thread->WaitListEntry); - KeGetCurrentPrcb()->ReadySummary |= (1 << Priority); -} - -VOID -KiRemoveFromThreadList(PKTHREAD Thread) -{ - ASSERT(Ready == Thread->State); - RemoveEntryList(&Thread->WaitListEntry); - if (IsListEmpty(&KeGetCurrentPrcb()->DispatcherReadyListHead[Thread->Priority])) { - - KeGetCurrentPrcb()->ReadySummary &= ~(1 << Thread->Priority); - } -} - -PKTHREAD -KiScanThreadList(KPRIORITY Priority, - KAFFINITY Affinity) -{ - PKTHREAD current; - ULONG Mask; - - Mask = (1 << Priority); - - if (KeGetCurrentPrcb()->ReadySummary & Mask) { - - LIST_FOR_EACH(current, &KeGetCurrentPrcb()->DispatcherReadyListHead[Priority], KTHREAD, WaitListEntry) { - - if (current->State != Ready) { - - DPRINT1("%p/%d\n", current, current->State); - } - - ASSERT(current->State == Ready); - - if (current->Affinity & Affinity) { - - KiRemoveFromThreadList(current); - return(current); - } - } - } - - return(NULL); -} - -BOOLEAN -STDCALL -KiDispatchThreadNoLock(ULONG NewThreadStatus) -{ - KPRIORITY CurrentPriority; - PKTHREAD Candidate; - ULONG Affinity; - PKTHREAD CurrentThread = KeGetCurrentThread(); - BOOLEAN ApcState; - - DPRINT("KiDispatchThreadNoLock() %d/%d/%d/%d\n", KeGetCurrentProcessorNumber(), - CurrentThread, NewThreadStatus, CurrentThread->State); - - CurrentThread->State = (UCHAR)NewThreadStatus; - - if (NewThreadStatus == Ready) { - - KiInsertIntoThreadList(CurrentThread->Priority, - CurrentThread); - } - - Affinity = 1 << KeGetCurrentProcessorNumber(); - - for (CurrentPriority = HIGH_PRIORITY; CurrentPriority >= LOW_PRIORITY; CurrentPriority--) { - - Candidate = KiScanThreadList(CurrentPriority, Affinity); - - if (Candidate == CurrentThread) { - - Candidate->State = Running; - KiReleaseDispatcherLockFromDpcLevel(); - return FALSE; - } - - if (Candidate != NULL) { - - PKTHREAD OldThread; - PKTHREAD IdleThread; - - DPRINT("Scheduling %x(%d)\n",Candidate, CurrentPriority); - - Candidate->State = Running; - - OldThread = CurrentThread; - CurrentThread = Candidate; - IdleThread = KeGetCurrentPrcb()->IdleThread; - - if (OldThread == IdleThread) { - - KiIdleSummary &= ~Affinity; - - } else if (CurrentThread == IdleThread) { - - KiIdleSummary |= Affinity; - } - - MmUpdatePageDir((PEPROCESS)PsGetCurrentProcess(),((PETHREAD)CurrentThread)->ThreadsProcess, sizeof(EPROCESS)); - - /* Special note for Filip: This will release the Dispatcher DB Lock ;-) -- Alex */ - DPRINT("You are : %x, swapping to: %x.\n", OldThread, CurrentThread); - KeGetCurrentPrcb()->CurrentThread = CurrentThread; - ApcState = KiSwapContext(OldThread, CurrentThread); - DPRINT("You are : %x, swapped from: %x\n", OldThread, CurrentThread); - return ApcState; - } - } - - DPRINT1("CRITICAL: No threads are ready (CPU%d)\n", KeGetCurrentProcessorNumber()); - KEBUGCHECK(0); - return FALSE; -} - -VOID -STDCALL -KiDispatchThread(ULONG NewThreadStatus) -{ - KIRQL OldIrql; - - if (KeGetCurrentPrcb()->IdleThread == NULL) { - return; - } - - OldIrql = KiAcquireDispatcherLock(); - KiDispatchThreadNoLock(NewThreadStatus); - KeLowerIrql(OldIrql); -} - PKTHREAD FASTCALL KiSelectNextThread(IN PKPRCB Prcb) @@ -446,9 +300,6 @@ KIRQL WaitIrql; LONG_PTR WaitStatus; PKTHREAD NextThread; -#ifdef NEW_SCHEDULER - PEPROCESS HackOfDoom = PsGetCurrentProcess(); -#endif ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); /* Acquire the PRCB lock */ @@ -465,7 +316,6 @@ } else { -#ifdef NEW_SCHEDULER /* Try to find a ready thread */ NextThread = KiSelectReadyThread(0, Prcb); if (NextThread) @@ -484,10 +334,6 @@ Prcb->CurrentThread = NextThread; NextThread->State = Running; } -#else - /* Find a new thread to run */ - ApcState = KiDispatchThreadNoLock(Waiting); -#endif } /* Sanity check and release the PRCB */ @@ -497,13 +343,13 @@ /* Save the wait IRQL */ WaitIrql = CurrentThread->WaitIrql; -#ifdef NEW_SCHEDULER /* REACTOS Mm Hack of Doom */ - MmUpdatePageDir(HackOfDoom,((PETHREAD)NextThread)->ThreadsProcess, sizeof(EPROCESS)); + MiSyncThreadProcessViews(PsGetCurrentProcess(), + ((PETHREAD)NextThread)->ThreadsProcess, + sizeof(EPROCESS)); /* Swap contexts */ ApcState = KiSwapContext(CurrentThread, NextThread); -#endif /* Get the wait status */ WaitStatus = CurrentThread->WaitStatus; @@ -552,13 +398,7 @@ else { /* Insert the thread on the deferred ready list */ -#ifdef NEW_SCHEDULER KiInsertDeferredReadyList(Thread); -#else - /* Insert the thread into the thread list */ - Thread->State = Ready; - KiInsertIntoThreadList(Thread->Priority, Thread); -#endif } } @@ -586,7 +426,6 @@ /* Calculate new Priority */ Thread->Priority = KiComputeNewPriority(Thread, 1); -#ifdef NEW_SCHEDULER /* Check if there's no next thread scheduled */ if (!Prcb->NextThread) { @@ -604,11 +443,6 @@ /* This thread can be preempted again */ Thread->Preempted = FALSE; } -#else - /* We need to dispatch a new thread */ - NextThread = NULL; - KiDispatchThread(Ready); -#endif } } @@ -651,7 +485,6 @@ if ((Thread->State == Ready) && (Thread->NextProcessor == Prcb->Number)) { -#ifdef NEW_SCHEDULER /* Sanity check */ ASSERT((Prcb->ReadySummary & PRIORITY_MASK(Thread->Priority))); @@ -663,20 +496,12 @@ Prcb->ReadySummary ^= PRIORITY_MASK(Thread-> Priority); } -#else - KiRemoveFromThreadList(Thread); -#endif /* Update priority */ Thread->Priority = (SCHAR)Priority; /* Re-insert it at its current priority */ -#ifndef NEW_SCHEDULER - KiInsertIntoThreadList(Priority, Thread); - //KiDispatchThreadNoLock(Ready); -#else KiInsertDeferredReadyList(Thread); -#endif /* Release the PRCB Lock */ KiReleasePrcbLock(Prcb); @@ -751,7 +576,6 @@ /* Check if there was a change and there's no new thread */ if ((Priority < OldPriority) && !(Prcb->NextThread)) { -#ifdef NEW_SCHEDULER /* Find a new thread */ NewThread = KiSelectReadyThread(Priority + 1, Prcb); if (NewThread) @@ -763,19 +587,6 @@ /* Request an interrupt */ RequestInterrupt = TRUE; } -#else - /* Check for threads with a higher priority */ - if (KeGetCurrentPrcb()->ReadySummary & ~((1 << (Priority + 1)) - 1)) - { - /* Found a thread, is it us? */ - if (Thread == KeGetCurrentThread()) - { - /* Dispatch us */ - //KiDispatchThreadNoLock(Ready); - return; - } - } -#endif } /* Release the lock and check if we need an interrupt */ @@ -854,7 +665,6 @@ NTAPI NtYieldExecution(VOID) { -#ifdef NEW_SCHEDULER NTSTATUS Status = STATUS_NO_YIELD_PERFORMED; KIRQL OldIrql; PKPRCB Prcb = KeGetCurrentPrcb(); @@ -920,9 +730,6 @@ /* Lower IRQL and return */ KeLowerIrql(OldIrql); return Status; -#else - KiDispatchThread(Ready); - return STATUS_SUCCESS; -#endif -} - +} + +

17 years, 2 months

[jimtabor] 29246: - First try bug fix for #2698.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Sep 27 19:54:51 2007 New Revision: 29246 URL: http://svn.reactos.org/svn/reactos?rev=29246&view=rev Log: - First try bug fix for #2698. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Sep 27 19:54:51 2007 @@ -156,7 +156,7 @@ HDC FASTCALL DC_GetNextDC (PDC pDC); VOID FASTCALL DC_SetNextDC (PDC pDC, HDC hNextDC); VOID FASTCALL DC_SetOwnership(HDC DC, PEPROCESS Owner); -VOID FASTCALL IntGdiCopyFromSaveState(PDC, PDC); +VOID FASTCALL IntGdiCopyFromSaveState(PDC, PDC, HDC); VOID FASTCALL IntGdiCopyToSaveState(PDC, PDC); VOID FASTCALL DC_UpdateXforms(PDC dc); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Sep 27 19:54:51 2007 @@ -252,7 +252,7 @@ IntGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); PDC dc = DC_LockDc ( dce->hDC ); - IntGdiCopyFromSaveState(dc, defaultDCstate); // Was SetDCState. + IntGdiCopyFromSaveState(dc, defaultDCstate, dce->hDC ); // Was SetDCState. dce->DCXFlags &= ~DCX_DCEBUSY; if (dce->DCXFlags & DCX_DCEDIRTY) Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Sep 27 19:54:51 2007 @@ -1365,10 +1365,8 @@ VOID FASTCALL -IntGdiCopyFromSaveState(PDC dc, PDC dcs) -{ - HDC hDC = dc->hSelf; - +IntGdiCopyFromSaveState(PDC dc, PDC dcs, HDC hDC) +{ dc->w.flags = dcs->w.flags & ~DC_SAVED; dc->w.hFirstBitmap = dcs->w.hFirstBitmap; @@ -1512,7 +1510,7 @@ { if ( dcs->w.flags & DC_SAVED ) { - IntGdiCopyFromSaveState( dc, dcs); + IntGdiCopyFromSaveState( dc, dcs, dc->hSelf); } else {

17 years, 2 months

[weiden] 29245: Set eol-style to native

by weiden＠svn.reactos.org

Author: weiden Date: Thu Sep 27 19:50:28 2007 New Revision: 29245 URL: http://svn.reactos.org/svn/reactos?rev=29245&view=rev Log: Set eol-style to native Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc (contents, props changed) trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc (contents, props changed) trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc (contents, props changed) trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc (contents, props changed) Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc Thu Sep 27 19:50:28 2007 @@ -1,47 +1,47 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Adapter" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Adaptertyp", -1, 7, 3, 237, 50 - LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20 - PUSHBUTTON "&Einstellungen", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 - GROUPBOX "Adapter Information", -1, 7, 56, 237, 75 - LTEXT "Chiptyp:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "DAC Typ:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Speichergröße:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Zeichenfolge:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "BIOS Informationen:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX - PUSHBUTTON "Alle Modi auf&listen...", IDC_LISTALLMODES, 7, 139, 75, 14 -END - -IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Alle Modi auflisten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 - PUSHBUTTON "Abbrechen", IDCANCEL, 167, 115, 50, 15 - GROUPBOX "Alle gültigen Modi auflisten", -1, 6, 7, 212, 98 - LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - IDS_MODEFMT "%d von %d, %s, %s" - IDS_DEFREFRESHRATE "Standard" - IDES_REFRESHRATEFMT "%d Hertz" - IDS_4BPP "16 Farben" - IDS_8BPP "256 Farben" - IDS_15BPP "High Color (15 bit)" - IDS_16BPP "High Color (16 bit)" - IDS_24BPP "True Color (24 bit)" - IDS_32BPP "True Color (32 bit)" -END +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Adapter" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Adaptertyp", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20 + PUSHBUTTON "&Einstellungen", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Adapter Information", -1, 7, 56, 237, 75 + LTEXT "Chiptyp:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "DAC Typ:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "Speichergröße:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "Zeichenfolge:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "BIOS Informationen:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "Alle Modi auf&listen...", IDC_LISTALLMODES, 7, 139, 75, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Alle Modi auflisten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 + PUSHBUTTON "Abbrechen", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "Alle gültigen Modi auflisten", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d von %d, %s, %s" + IDS_DEFREFRESHRATE "Standard" + IDES_REFRESHRATEFMT "%d Hertz" + IDS_4BPP "16 Farben" + IDS_8BPP "256 Farben" + IDS_15BPP "High Color (15 bit)" + IDS_16BPP "High Color (16 bit)" + IDS_24BPP "True Color (24 bit)" + IDS_32BPP "True Color (32 bit)" +END Propchange: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc Thu Sep 27 19:50:28 2007 @@ -1,56 +1,56 @@ -/* - * PROJECT: ReactOS Advanced display adapter properties - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/shellext/deskadp/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for deskadp.dll - * TRANSLATOR: Artem Reznikov - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Àäàïòåð" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Òèï àäàïòåðà", -1, 7, 3, 237, 50 - LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX - PUSHBUTTON "Â&ëàñòèâîñò³", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 - GROUPBOX "Â³äîìîñò³ ïðî àäàïòåð", -1, 7, 56, 237, 75 - LTEXT "Òèï ì³êðîñõåì:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "Òèï ÖÀÏ:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Îá'ºì ïàì'ÿò³:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Ðÿäîê êîíòðîëåðà:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "Â³äîìîñò³ ïðî BIOS:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX - PUSHBUTTON "&Ñïèñîê óñ³õ ðåæèì³â...", IDC_LISTALLMODES, 7, 139, 75, 14 -END - -IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Ñïèñîê óñ³õ ðåæèì³â" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 167, 115, 50, 15 - GROUPBOX "Ñïèñîê ïðèïóñòèìèõ ðåæèì³â", -1, 6, 7, 212, 98 - LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - IDS_MODEFMT "%d íà %d, %s, %s" - IDS_DEFREFRESHRATE "÷àñòîòà çà çàìîâ÷óâàííÿì" - IDES_REFRESHRATEFMT "%d Ãö" - IDS_4BPP "16 êîëüîð³â" - IDS_8BPP "256 êîëüîð³â" - IDS_15BPP "High Color (15 á³ò)" - IDS_16BPP "High Color (16 á³ò)" - IDS_24BPP "True Color (24 á³òà)" - IDS_32BPP "True Color (32 á³òà)" -END - +/* + * PROJECT: ReactOS Advanced display adapter properties + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/shellext/deskadp/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for deskadp.dll + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Àäàïòåð" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Òèï àäàïòåðà", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "Â&ëàñòèâîñò³", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Â³äîìîñò³ ïðî àäàïòåð", -1, 7, 56, 237, 75 + LTEXT "Òèï ì³êðîñõåì:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "Òèï ÖÀÏ:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "Îá'ºì ïàì'ÿò³:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "Ðÿäîê êîíòðîëåðà:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "Â³äîìîñò³ ïðî BIOS:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "&Ñïèñîê óñ³õ ðåæèì³â...", IDC_LISTALLMODES, 7, 139, 75, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Ñïèñîê óñ³õ ðåæèì³â" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "Ñïèñîê ïðèïóñòèìèõ ðåæèì³â", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d íà %d, %s, %s" + IDS_DEFREFRESHRATE "÷àñòîòà çà çàìîâ÷óâàííÿì" + IDES_REFRESHRATEFMT "%d Ãö" + IDS_4BPP "16 êîëüîð³â" + IDS_8BPP "256 êîëüîð³â" + IDS_15BPP "High Color (15 á³ò)" + IDS_16BPP "High Color (16 á³ò)" + IDS_24BPP "True Color (24 á³òà)" + IDS_32BPP "True Color (32 á³òà)" +END + Propchange: trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc Thu Sep 27 19:50:28 2007 @@ -1,12 +1,12 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -IDD_MONITOR DIALOGEX 0, 0, 224, 226 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Monitor" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Monitortyp", -1, 7, 3, 237, 52 - LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX - PUSHBUTTON "&Einstellungen", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED -END - +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_MONITOR DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Monitor" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Monitortyp", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "&Einstellungen", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED +END + Propchange: trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc Thu Sep 27 19:50:28 2007 @@ -1,20 +1,20 @@ -/* - * PROJECT: ReactOS Advanced display monitor properties - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/shellext/deskmon/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for deskmon.dll - * TRANSLATOR: Artem Reznikov - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -IDD_MONITOR DIALOGEX 0, 0, 224, 226 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ìîí³òîð" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Òèï ìîí³òîðà", -1, 7, 3, 237, 52 - LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX - PUSHBUTTON "Â&ëàñòèâîñò³", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED -END - +/* + * PROJECT: ReactOS Advanced display monitor properties + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/shellext/deskmon/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for deskmon.dll + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ìîí³òîð" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Òèï ìîí³òîðà", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "Â&ëàñòèâîñò³", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED +END + Propchange: trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 2 months

[fireball] 29244: - Fix multiple bugs in RtlWalkFrameChain and secure it against any possibility of a bugcheck while walking the stack. - Fix bugs in RtlUnwind and RtlExceptionDispatch which assumed the DPC stack size was 4KB instead of 12KB. - Fix multiple bugs in RtlpGetStackLimits and seure it against bugchecks. Properly detect DPC or invalid stacks. - PsConvertToGuiThread should acquire a guarded region, not a critical section, to stop all APCs. - Fix bug in bugzilla reporting which was maki

by fireball＠svn.reactos.org

Author: fireball Date: Thu Sep 27 17:07:43 2007 New Revision: 29244 URL: http://svn.reactos.org/svn/reactos?rev=29244&view=rev Log: - Fix multiple bugs in RtlWalkFrameChain and secure it against any possibility of a bugcheck while walking the stack. - Fix bugs in RtlUnwind and RtlExceptionDispatch which assumed the DPC stack size was 4KB instead of 12KB. - Fix multiple bugs in RtlpGetStackLimits and seure it against bugchecks. Properly detect DPC or invalid stacks. - PsConvertToGuiThread should acquire a guarded region, not a critical section, to stop all APCs. - Fix bug in bugzilla reporting which was making things crash. - Unlock address space before raising to HIGH_LEVEL in KeBugCheck. - Display blue screen at APC_LEVEL, to avoid the assertion in procobj.c when trying to attach to csrss. This should fix the recursive bugchecking when the GUI is up, and also take down the GUI properly. The fix is a hack. - Fix bogus implementation of IoGetStackLimits and make it work properly. - Make MmCreateKernelStack return the base of the stack, not the limit, and fix all callers appropriately. - Remove svn:needs-lock properties of various files, whose contents either changes too often or whose contents is definately clean. Bugreports and information - by Alex. Modified: trunk/reactos/lib/rtl/exception.c trunk/reactos/ntoskrnl/io/iomgr/util.c trunk/reactos/ntoskrnl/ke/bug.c (contents, props changed) trunk/reactos/ntoskrnl/ke/i386/abios.c (props changed) trunk/reactos/ntoskrnl/ke/i386/exp.c (props changed) trunk/reactos/ntoskrnl/ke/i386/kiinit.c (contents, props changed) trunk/reactos/ntoskrnl/ke/i386/ldt.c (props changed) trunk/reactos/ntoskrnl/ke/i386/thrdini.c (props changed) trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/ntoskrnl/rtl/libsupp.c (contents, props changed) trunk/reactos/ntoskrnl/rtl/misc.c (props changed) trunk/reactos/ntoskrnl/rtl/strtok.c (props changed) Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=29… ============================================================================== --- trunk/reactos/lib/rtl/exception.c (original) +++ trunk/reactos/lib/rtl/exception.c Thu Sep 27 17:07:43 2007 @@ -122,12 +122,11 @@ IN ULONG Count, IN ULONG Flags) { - PULONG Stack, NewStack; + ULONG_PTR Stack, NewStack, StackBegin, StackEnd; ULONG Eip; - ULONG_PTR StackBegin, StackEnd; BOOLEAN Result, StopSearch = FALSE; ULONG i = 0; - + /* Get current EBP */ #if defined(_M_IX86) #if defined __GNUC__ @@ -136,16 +135,16 @@ __asm mov Stack, ebp #endif #elif defined(_M_MIPS) - __asm__("move $sp, %0" : "=r" (Stack) : ); + __asm__("move $sp, %0" : "=r" (Stack) : ); #elif defined(_M_PPC) __asm__("mr %0,1" : "=r" (Stack) : ); #else #error Unknown architecture #endif - + /* Set it as the stack begin limit as well */ StackBegin = (ULONG_PTR)Stack; - + /* Check if we're called for non-logging mode */ if (!Flags) { @@ -155,52 +154,65 @@ &StackEnd); if (!Result) return 0; } - - /* Loop the frames */ - for (i = 0; i < Count; i++) - { - /* Check if we're past the stack */ - if ((ULONG_PTR)Stack >= StackEnd) break; - - /* Check if this is the first entry */ -#if 0 - if (!i) + + /* Use a SEH block for maximum protection */ + _SEH_TRY + { + /* Loop the frames */ + for (i = 0; i < Count; i++) { - if ((ULONG_PTR)Stack != StackBegin) break; + /* + * Leave if we're past the stack, + * if we're before the stack, + * or if we've reached ourselves. + */ + if ((Stack >= StackEnd) || + (!i ? (Stack < StackBegin) : (Stack <= StackBegin)) || + ((StackEnd - Stack) < (2 * sizeof(ULONG_PTR)))) + { + /* We're done or hit a bad address */ + break; + } + + /* Get new stack and EIP */ + NewStack = *(PULONG_PTR)Stack; + Eip = *(PULONG_PTR)(Stack + sizeof(ULONG_PTR)); + + /* Check if the new pointer is above the oldone and past the end */ + if (!((Stack < NewStack) && (NewStack < StackEnd))) + { + /* Stop searching after this entry */ + StopSearch = TRUE; + } + + /* Also make sure that the EIP isn't a stack address */ + if ((StackBegin < Eip) && (Eip < StackEnd)) break; + + /* Check if we reached a user-mode address */ + if (!(Flags) && !(Eip & 0x80000000)) break; + + /* Save this frame */ + Callers[i] = (PVOID)Eip; + + /* Check if we should continue */ + if (StopSearch) + { + /* Return the next index */ + i++; + break; + } + + /* Move to the next stack */ + Stack = NewStack; } - else - { - if ((ULONG_PTR)Stack == StackBegin) break; - } -#endif - - /* Make sure there's enough frames */ - if ((StackEnd - (ULONG_PTR)Stack) < (2 * sizeof(ULONG_PTR))) break; - - /* Get new stack and EIP */ - NewStack = (PULONG)Stack[0]; - Eip = Stack[1]; - - /* Check if the new pointer is above the oldone and past the end */ - if (!((Stack < NewStack) && ((ULONG_PTR)NewStack < StackEnd))) - { - /* Stop searching after this entry */ - StopSearch = TRUE; - } - - /* Also make sure that the EIP isn't a stack address */ - if ((StackBegin < Eip) && (Eip < StackEnd)) break; - - /* Save this frame */ - Callers[i] = (PVOID)Eip; - - /* Check if we should continue */ - if (StopSearch) break; - - /* Move to the next stack */ - Stack = NewStack; - } - + } + _SEH_HANDLE + { + /* No index */ + i = 0; + } + _SEH_END; + /* Return frames parsed */ return i; } Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/util.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/util.c Thu Sep 27 17:07:43 2007 @@ -12,6 +12,11 @@ #define NDEBUG #include <internal/debug.h> +VOID +NTAPI +RtlpGetStackLimits(PULONG_PTR StackBase, + PULONG_PTR StackLimit); + /* DATA **********************************************************************/ KSPIN_LOCK CancelSpinLock; @@ -48,10 +53,33 @@ IoGetStackLimits(OUT PULONG LowLimit, OUT PULONG HighLimit) { - /* Return the limits from the TEB... this is wrong! */ - DPRINT1("FIXME: IoGetStackLimits returning B*LLSHIT!\n"); - *LowLimit = (ULONG)NtCurrentTeb()->Tib.StackLimit; - *HighLimit = (ULONG)NtCurrentTeb()->Tib.StackBase; + PKPRCB Prcb = KeGetCurrentPrcb(); + ULONG_PTR DpcStack = (ULONG_PTR)(Prcb->DpcStack); + volatile ULONG_PTR StackAddress; + + /* Save our stack address so we always know it's valid */ + StackAddress = (ULONG_PTR)(&StackAddress); + + /* Get stack values */ + RtlpGetStackLimits(LowLimit, HighLimit); + + /* Check if we're outside the stack */ + if ((StackAddress < *LowLimit) || (StackAddress > *HighLimit)) + { + /* Check if we may be in a DPC */ + if (KeGetCurrentIrql() >= DISPATCH_LEVEL) + { + /* Check if we really are in a DPC */ + if ((Prcb->DpcRoutineActive) && + (StackAddress <= DpcStack) && + (StackAddress >= DpcStack - KERNEL_STACK_SIZE)) + { + /* Use the DPC stack limits */ + *HighLimit = DpcStack; + *LowLimit = DpcStack - KERNEL_STACK_SIZE; + } + } + } } /* Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2924… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Thu Sep 27 17:07:43 2007 @@ -222,9 +222,7 @@ "BIOS Version: %wZ\n" "Video BIOS Date: %wZ\n" "Video BIOS Version: %wZ\n" - "Memory: %d\n" - "NT Build Number: %lx\n" - "NT Build Lab: %s\n", + "Memory: %d\n", KeProcessorArchitecture, KeFeatureBits, KiFastSystemCallDisable, @@ -251,9 +249,7 @@ &KeRosBiosVersion, &KeRosVideoBiosDate, &KeRosVideoBiosVersion, - MmStats.NrTotalPages * PAGE_SIZE, - NtBuildNumber, - NtBuildLab); + MmStats.NrTotalPages * PAGE_SIZE); #endif } @@ -640,7 +636,6 @@ PVOID DriverBase; PLDR_DATA_TABLE_ENTRY LdrEntry; PULONG_PTR HardErrorParameters; - KIRQL OldIrql; #ifdef CONFIG_SMP LONG i = 0; #endif @@ -976,15 +971,15 @@ } } - /* Raise IRQL to HIGH_LEVEL */ - _disable(); - KeRaiseIrql(HIGH_LEVEL, &OldIrql); - /* ROS HACK: Unlock the Kernel Address Space if we own it */ if (KernelAddressSpaceLock.Owner == KeGetCurrentThread()) { MmUnlockAddressSpace(MmGetKernelAddressSpace()); } + + /* Raise IRQL to HIGH_LEVEL */ + _disable(); + KfRaiseIrql(HIGH_LEVEL); /* Avoid recursion */ if (!InterlockedDecrement((PLONG)&KeBugCheckCount)) @@ -1006,11 +1001,13 @@ #endif /* Display the BSOD */ + KfLowerIrql(APC_LEVEL); // This is a nastier hack than any ever before KiDisplayBlueScreen(MessageId, IsHardError, HardErrCaption, HardErrMessage, AnsiName); + KfRaiseIrql(HIGH_LEVEL); /* Check if the debugger is disabled but we can enable it */ if (!(KdDebuggerEnabled) && !(KdPitchDebugger)) Propchange: trunk/reactos/ntoskrnl/ke/bug.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ke/i386/abios.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ke/i386/exp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Thu Sep 27 17:07:43 2007 @@ -582,7 +582,7 @@ /* Allocate the DPC Stack */ DpcStack = MmCreateKernelStack(FALSE, 0); if (!DpcStack) KeBugCheckEx(NO_PAGES_AVAILABLE, 1, 0, 0, 0); - Prcb->DpcStack = (PVOID)((ULONG_PTR)DpcStack + KERNEL_STACK_SIZE); + Prcb->DpcStack = DpcStack; /* Allocate the IOPM save area. */ Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool, Propchange: trunk/reactos/ntoskrnl/ke/i386/kiinit.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ke/i386/ldt.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ke/i386/thrdini.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Thu Sep 27 17:07:43 2007 @@ -797,8 +797,7 @@ if (!KernelStack) { /* We don't, allocate one */ - KernelStack = (PVOID)((ULONG_PTR)MmCreateKernelStack(FALSE, 0) + - KERNEL_STACK_SIZE); + KernelStack = MmCreateKernelStack(FALSE, 0); if (!KernelStack) return STATUS_INSUFFICIENT_RESOURCES; /* Remember for later */ @@ -806,8 +805,8 @@ } /* Set the Thread Stacks */ - Thread->InitialStack = (PCHAR)KernelStack; - Thread->StackBase = (PCHAR)KernelStack; + Thread->InitialStack = KernelStack; + Thread->StackBase = KernelStack; Thread->StackLimit = (ULONG_PTR)KernelStack - KERNEL_STACK_SIZE; Thread->KernelStackResident = TRUE; Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c Thu Sep 27 17:07:43 2007 @@ -242,8 +242,9 @@ KEBUGCHECK(0); } - /* Return the stack */ - return KernelStack; + /* Return the stack base */ + return (PVOID)((ULONG_PTR)KernelStack + + (GuiStack ? KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE)); } /* Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Thu Sep 27 17:07:43 2007 @@ -52,8 +52,7 @@ if (!Thread->Tcb.LargeStack) { /* We don't create one */ - NewStack = (ULONG_PTR)MmCreateKernelStack(TRUE, 0) + - KERNEL_LARGE_STACK_SIZE; + NewStack = (ULONG_PTR)MmCreateKernelStack(TRUE, 0); if (!NewStack) { /* Panic in user-mode */ @@ -61,15 +60,15 @@ return STATUS_NO_MEMORY; } - /* We're about to switch stacks. Enter a critical region */ - KeEnterCriticalRegion(); + /* We're about to switch stacks. Enter a guarded region */ + KeEnterGuardedRegion(); /* Switch stacks */ OldStack = KeSwitchKernelStack((PVOID)NewStack, (PVOID)(NewStack - KERNEL_STACK_SIZE)); - /* Leave the critical region */ - KeLeaveCriticalRegion(); + /* Leave the guarded region */ + KeLeaveGuardedRegion(); /* Delete the old stack */ MmDeleteKernelStack(OldStack, FALSE); Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Thu Sep 27 17:07:43 2007 @@ -197,11 +197,11 @@ /* Check if we are in a DPC and the stack matches */ if ((Prcb->DpcRoutineActive) && (RegistrationFrameEnd <= DpcStack) && - ((ULONG_PTR)RegistrationFrame >= DpcStack - 4096)) + ((ULONG_PTR)RegistrationFrame >= DpcStack - KERNEL_STACK_SIZE)) { /* Update the limits to the DPC Stack's */ *StackHigh = DpcStack; - *StackLow = DpcStack - 4096; + *StackLow = DpcStack - KERNEL_STACK_SIZE; return TRUE; } } @@ -218,18 +218,37 @@ { PKTHREAD Thread = KeGetCurrentThread(); - /* FIXME: Super native implementation */ - + /* Don't even try at ISR level or later */ + if (KeGetCurrentIrql() > DISPATCH_LEVEL) return FALSE; + /* Start with defaults */ *StackBegin = Thread->StackLimit; *StackEnd = (ULONG_PTR)Thread->StackBase; - - /* Check if we seem to be on the DPC stack */ - if ((*StackBegin > Ebp) || (Ebp > *StackEnd)) + + /* Check if EBP is inside the stack */ + if ((*StackBegin <= Ebp) && (Ebp <= *StackEnd)) { - /* FIXME: TODO */ - //ASSERT(FALSE); - DPRINT1("Stacks: %p %p %p\n", Ebp, *StackBegin, *StackEnd); + /* Then make the stack start at EBP */ + *StackBegin = Ebp; + } + else + { + /* Now we're going to assume we're on the DPC stack */ + *StackEnd = (ULONG_PTR)(KeGetPcr()->Prcb->DpcStack); + *StackBegin = *StackEnd - KERNEL_STACK_SIZE; + + /* Check if we seem to be on the DPC stack */ + if ((*StackEnd) && (*StackBegin < Ebp) && (Ebp <= *StackEnd)) + { + /* We're on the DPC stack */ + *StackBegin = Ebp; + } + else + { + /* We're somewhere else entirely... use EBP for safety */ + *StackBegin = Ebp; + *StackEnd = (ULONG_PTR)PAGE_ALIGN(*StackBegin); + } } /* Return success */ Propchange: trunk/reactos/ntoskrnl/rtl/libsupp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/rtl/misc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/rtl/strtok.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

17 years, 2 months

[fireball] 29243: - Slightly cleanup the code. - Enable allocation of the adapter channel in case of Start I/O.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Sep 27 16:34:53 2007 New Revision: 29243 URL: http://svn.reactos.org/svn/reactos?rev=29243&view=rev Log: - Slightly cleanup the code. - Enable allocation of the adapter channel in case of Start I/O. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Thu Sep 27 16:34:53 2007 @@ -137,6 +137,13 @@ ScsiPortIoTimer(PDEVICE_OBJECT DeviceObject, PVOID Context); +IO_ALLOCATION_ACTION +STDCALL +ScsiPortAllocateAdapterChannel(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID MapRegisterBase, + IN PVOID Context); + static NTSTATUS SpiBuildDeviceMap (PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, PUNICODE_STRING RegistryPath); @@ -336,7 +343,6 @@ SCSI_PORT_DEVICE_EXTENSION, MiniPortDeviceExtension); - /* Initialize our pointers */ NextMa = DeviceExtension->MappedAddressList; LastMa = NextMa; @@ -384,22 +390,44 @@ IN PVOID Buffer, IN ULONG Length) { - if (Length) - { - /* If Length is non-zero, just forward the call to - HalGetBusData() function */ - return HalGetBusData(BusDataType, - SystemIoBusNumber, - SlotNumber, - Buffer, - Length); - } - - /* We have a more complex case here */ - UNIMPLEMENTED; - return 0; + DPRINT("ScsiPortGetBusData()\n"); + + if (Length) + { + /* If Length is non-zero, just forward the call to + HalGetBusData() function */ + return HalGetBusData(BusDataType, + SystemIoBusNumber, + SlotNumber, + Buffer, + Length); + } + + /* We have a more complex case here */ + UNIMPLEMENTED; + return 0; } +/* + * @implemented + */ +ULONG STDCALL +ScsiPortSetBusDataByOffset(IN PVOID DeviceExtension, + IN ULONG BusDataType, + IN ULONG SystemIoBusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length) +{ + DPRINT("ScsiPortSetBusDataByOffset()\n"); + return HalSetBusDataByOffset(BusDataType, + SystemIoBusNumber, + SlotNumber, + Buffer, + Offset, + Length); +} /* * @implemented @@ -461,7 +489,7 @@ } /* - * @implemented + * @unimplemented */ PVOID STDCALL ScsiPortGetLogicalUnit(IN PVOID HwDeviceExtension, @@ -504,7 +532,7 @@ /* - * @unimplemented + * @implemented */ SCSI_PHYSICAL_ADDRESS STDCALL ScsiPortGetPhysicalAddress(IN PVOID HwDeviceExtension, @@ -1654,13 +1682,11 @@ } else { -#if 0 HalFreeCommonBuffer(DeviceExtension->AdapterObject, DeviceExtension->CommonBufferLength, - DeviceExtension->PhysicalCommonBuffer, + DeviceExtension->PhysicalAddress, DeviceExtension->SrbExtensionBuffer, FALSE); -#endif } } @@ -1684,8 +1710,6 @@ DPRINT("Deleting device %p\n", DeviceExtension->DeviceObject); IoDeleteDevice(DeviceExtension->DeviceObject); } - - /* * @unimplemented @@ -1699,7 +1723,6 @@ DPRINT1("ScsiPortIoMapTransfer()\n"); UNIMPLEMENTED; } - /* * @unimplemented @@ -1725,7 +1748,6 @@ DPRINT("ScsiPortLogError() done\n"); } - /* * @implemented */ @@ -1875,29 +1897,6 @@ /* Request a DPC after we're done with the interrupt */ DeviceExtension->InterruptData.Flags |= SCSI_PORT_NOTIFICATION_NEEDED; } - - -/* - * @implemented - */ -ULONG STDCALL -ScsiPortSetBusDataByOffset(IN PVOID DeviceExtension, - IN ULONG BusDataType, - IN ULONG SystemIoBusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - DPRINT("ScsiPortSetBusDataByOffset()\n"); - return(HalSetBusDataByOffset(BusDataType, - SystemIoBusNumber, - SlotNumber, - Buffer, - Offset, - Length)); -} - /* * @implemented @@ -2869,22 +2868,16 @@ DeviceExtension->AdapterObject != NULL && !DeviceExtension->MapRegisters) { -#if 0 IoAllocateAdapterChannel( DeviceExtension->AdapterObject, DeviceObject, DeviceExtension->PortCapabilities.MaximumPhysicalPages, - ScsiPortAllocationRoutine, + ScsiPortAllocateAdapterChannel, LunExtension ); return; -#else - /* TODO: DMA is not implemented yet */ - ASSERT(FALSE); -#endif - } - + } KeAcquireSpinLockAtDpcLevel(&DeviceExtension->SpinLock); @@ -4081,7 +4074,6 @@ } } - /* Flush adapter if needed */ if (SrbInfo->BaseOfMapRegister) { @@ -4416,8 +4408,6 @@ IoFreeIrp(Irp); return STATUS_MORE_PROCESSING_REQUIRED; } - - static BOOLEAN STDCALL ScsiPortIsr(IN PKINTERRUPT Interrupt, @@ -5484,6 +5474,7 @@ IN PVOID SystemArgument2) { DPRINT1("Miniport timer DPC\n"); + ASSERT(FALSE); } static NTSTATUS @@ -5616,7 +5607,6 @@ } } - /* Look at device params */ Key = NULL; if (InternalConfigInfo->Parameter) @@ -5742,7 +5732,6 @@ UNICODE_STRING UnicodeString; ANSI_STRING AnsiString; NTSTATUS Status = STATUS_SUCCESS; - KeyValueInformation = (PKEY_VALUE_FULL_INFORMATION) Buffer; @@ -6064,7 +6053,6 @@ } } - NTSTATUS STDCALL SpQueryDeviceCallout(IN PVOID Context, @@ -6086,7 +6074,31 @@ return STATUS_SUCCESS; } - +IO_ALLOCATION_ACTION +STDCALL +ScsiPortAllocateAdapterChannel(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID MapRegisterBase, + IN PVOID Context) +{ + KIRQL Irql; + PSCSI_PORT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + + /* Guard access with the spinlock */ + KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); + + /* Save MapRegisterBase we've got here */ + DeviceExtension->MapRegisterBase = MapRegisterBase; + + /* Start pending request */ + KeSynchronizeExecution(DeviceExtension->Interrupt, + ScsiPortStartPacket, DeviceObject); + + /* Release spinlock we took */ + KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + + return KeepObject; +} static NTSTATUS

17 years, 2 months

[dreimer] 29242: Bug 2697: Ukrainian translation update German Translations by me.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Sep 27 14:17:05 2007 New Revision: 29242 URL: http://svn.reactos.org/svn/reactos?rev=29242&view=rev Log: Bug 2697: Ukrainian translation update German Translations by me. Added: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/access/lang/uk-UA.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc Modified: trunk/reactos/dll/cpl/access/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/access/lang/uk-UA.rc Thu Sep 27 14:17:05 2007 @@ -1,3 +1,11 @@ +/* + * PROJECT: Accessibility Control Panel Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/access/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Accessibility Control Panel Applet + * TRANSLATOR: Rostislav Zabolotny + */ + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc Thu Sep 27 14:17:05 2007 @@ -60,19 +60,19 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Êîíô³ãóðàö³ÿ êíîïîê", -1, 5, 5, 230, 70 - CHECKBOX "&Ïîì³íÿòè ïðèçíà÷åííÿ êíîïîê", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 + CHECKBOX "Î&áì³íÿòè ïðèçíà÷åííÿ êíîïîê", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü, ùîá ïðèçíà÷èòè ïðàâó êíîïêó äëÿ âèêîíàííÿ òàêèõ îñíîâíèõ ôóíêö³é, ÿê âèá³ð ³ ïåðåòÿãóâàííÿ", -1, 10, 30, 150, 30 GROUPBOX "Øâèäê³ñòü ïîäâ³éíîãî êëàöàííÿ", -1, 5, 75, 230, 70 - LTEXT "Çðîá³òü ïîäâ³éíå êëàöàííÿ ïî ïàïö³. ßêùî ïàïêà íå â³äêðèâàºòüñÿ àáî íå çàêðèâàºòüñÿ, âèáåð³òü íèæ÷ó øâèäê³ñòü.", -1, 10, 85, 150, 30 + LTEXT "Äâ³÷³ êëàöí³òü ïî ö³é ïàïö³. ßêùî ïàïêà íå â³äêðèâàºòüñÿ àáî íå çàêðèâàºòüñÿ, âèáåð³òü íèæ÷ó øâèäê³ñòü.", -1, 10, 85, 150, 30 LTEXT "&Øâèäê³ñòü: Íèæ÷å", -1, 10, 120, 90, 8 LTEXT "Âèùå", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE - GROUPBOX "Çàë³ïàí³ÿ", -1, 5, 150, 230, 70 - CHECKBOX "&Â³âìêíóòè Çàë³ïàí³ÿ", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 + GROUPBOX "Çàëèïàííÿ êíîïêè ìèø³", -1, 5, 150, 230, 70 + CHECKBOX "&Óâ³ìêíóòè çàëèïàííÿ", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Ïàðàìåòðè...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 - LTEXT "Äîçâîëÿº âèêîíóâàòè âèä³ëåííÿ ³ ïåðåòÿãóâàííÿ áåç óòðèìóâàííÿ êíîïêè ìèø³ íàòèñíóòîþ. Äëÿ ââ³ìêíåííÿ íåíàäîâãî çàòðèìàéòå êíîïêó â íàòèñíóòîìó ïîëîæåíí³. Äëÿ âèâ³ëüíåííÿ çíîâó êëàöí³òü.", -1, 10, 180, 190, 30 + LTEXT "Äîçâîëÿº âèêîíóâàòè âèä³ëåííÿ é ïåðåòÿãóâàííÿ, íå óòðèìóþ÷è êíîïêó ìèø³ íàòèñíóòîþ. Ùîá óâ³ìêíóòè öåé ðåæèì, íåíàäîâãî íàòèñí³òü êíîïêó ìèø³. Ùîá âèìêíóòè öåé ðåæèì, íàòèñí³òü êíîïêó ìèø³ ùå ðàç.", -1, 10, 180, 190, 30 END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 @@ -87,7 +87,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Íàñòðîéêà", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Ââ³ìêíóòè &ò³íü âêàç³âíèêà", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + CHECKBOX "Óâ³ìêíóòè &ò³íü âêàç³âíèêà", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "&Çà çàìîâ÷óâàííÿì", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Îãëÿä", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc Thu Sep 27 14:17:05 2007 @@ -131,13 +131,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Íåìîæëèâî ñòâîðèòè â³êíî âëàñòèâîñòåé" IDS_OUT_OF_MEMORY "Íåäîñòàòíüî ïàì'ÿò³" IDS_CANNOT_SAVE_CHANGES "Íåìîæëèâî çáåðåãòè âíåñåí³ çì³íè" - IDS_STATUS_NON_OPERATIONAL "Non-operational" - IDS_STATUS_UNREACHABLE "No WAN adapter found" - IDS_STATUS_DISCONNECTED "Disconnected" - IDS_STATUS_CONNECTING "Connecting" - IDS_STATUS_CONNECTED "Connected" - IDS_STATUS_OPERATIONAL "Connected" - IDS_SPEED_MBPS "%d Mbps" - IDS_DURATION_DAY "%d day %s" - IDS_DURATION_DAYS "%d days %s" + IDS_STATUS_NON_OPERATIONAL "Íå ïðàöþº" + IDS_STATUS_UNREACHABLE "Íå çíàéäåíèé àäàïòåð WAN" + IDS_STATUS_DISCONNECTED "Â³äêëþ÷åíî" + IDS_STATUS_CONNECTING "Ï³äêëþ÷åííÿ" + IDS_STATUS_CONNECTED "Ï³äêëþ÷åíî" + IDS_STATUS_OPERATIONAL "Ï³äêëþ÷åíî" + IDS_SPEED_MBPS "%d Ìá³ò/ñ" + IDS_DURATION_DAY "%d äåíü %s" + IDS_DURATION_DAYS "%d äí³â %s" END Added: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc Thu Sep 27 14:17:05 2007 @@ -1,0 +1,47 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Adapter" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Adaptertyp", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20 + PUSHBUTTON "&Einstellungen", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Adapter Information", -1, 7, 56, 237, 75 + LTEXT "Chiptyp:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "DAC Typ:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "Speichergröße:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "Zeichenfolge:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "BIOS Informationen:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "Alle Modi auf&listen...", IDC_LISTALLMODES, 7, 139, 75, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Alle Modi auflisten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 + PUSHBUTTON "Abbrechen", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "Alle gültigen Modi auflisten", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d von %d, %s, %s" + IDS_DEFREFRESHRATE "Standard" + IDES_REFRESHRATEFMT "%d Hertz" + IDS_4BPP "16 Farben" + IDS_8BPP "256 Farben" + IDS_15BPP "High Color (15 bit)" + IDS_16BPP "High Color (16 bit)" + IDS_24BPP "True Color (24 bit)" + IDS_32BPP "True Color (32 bit)" +END Added: trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc (added) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc Thu Sep 27 14:17:05 2007 @@ -1,0 +1,56 @@ +/* + * PROJECT: ReactOS Advanced display adapter properties + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/shellext/deskadp/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for deskadp.dll + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Àäàïòåð" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Òèï àäàïòåðà", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "Â&ëàñòèâîñò³", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Â³äîìîñò³ ïðî àäàïòåð", -1, 7, 56, 237, 75 + LTEXT "Òèï ì³êðîñõåì:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "Òèï ÖÀÏ:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "Îá'ºì ïàì'ÿò³:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "Ðÿäîê êîíòðîëåðà:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "Â³äîìîñò³ ïðî BIOS:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "&Ñïèñîê óñ³õ ðåæèì³â...", IDC_LISTALLMODES, 7, 139, 75, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Ñïèñîê óñ³õ ðåæèì³â" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "Ñïèñîê ïðèïóñòèìèõ ðåæèì³â", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d íà %d, %s, %s" + IDS_DEFREFRESHRATE "÷àñòîòà çà çàìîâ÷óâàííÿì" + IDES_REFRESHRATEFMT "%d Ãö" + IDS_4BPP "16 êîëüîð³â" + IDS_8BPP "256 êîëüîð³â" + IDS_15BPP "High Color (15 á³ò)" + IDS_16BPP "High Color (16 á³ò)" + IDS_24BPP "True Color (24 á³òà)" + IDS_32BPP "True Color (32 á³òà)" +END + Modified: trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc Thu Sep 27 14:17:05 2007 @@ -3,5 +3,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#include "lang/de-DE.rc" #include "lang/en-US.rc" - +#include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc Thu Sep 27 14:17:05 2007 @@ -1,0 +1,12 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_MONITOR DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Monitor" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Monitortyp", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "&Einstellungen", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED +END + Added: trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc (added) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc Thu Sep 27 14:17:05 2007 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS Advanced display monitor properties + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/shellext/deskmon/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for deskmon.dll + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ìîí³òîð" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Òèï ìîí³òîðà", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "Â&ëàñòèâîñò³", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED +END + Modified: trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc Thu Sep 27 14:17:05 2007 @@ -3,5 +3,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#include "lang/de-DE.rc" #include "lang/en-US.rc" - +#include "lang/uk-UA.rc"

17 years, 2 months

[fireball] 29241: - Handle NextLuRequest and ResetDetected in ScsiPortNotification() API - Add UNIMPLEMENTED into ScsiPortGetBusData() when it's called with Length = 0. Does not happen so far, when tested with BusLogic.sys in our tree.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Sep 27 14:04:56 2007 New Revision: 29241 URL: http://svn.reactos.org/svn/reactos?rev=29241&view=rev Log: - Handle NextLuRequest and ResetDetected in ScsiPortNotification() API - Add UNIMPLEMENTED into ScsiPortGetBusData() when it's called with Length = 0. Does not happen so far, when tested with BusLogic.sys in our tree. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Thu Sep 27 14:04:56 2007 @@ -384,11 +384,20 @@ IN PVOID Buffer, IN ULONG Length) { - return(HalGetBusData(BusDataType, - SystemIoBusNumber, - SlotNumber, - Buffer, - Length)); + if (Length) + { + /* If Length is non-zero, just forward the call to + HalGetBusData() function */ + return HalGetBusData(BusDataType, + SystemIoBusNumber, + SlotNumber, + Buffer, + Length); + } + + /* We have a more complex case here */ + UNIMPLEMENTED; + return 0; } @@ -1812,40 +1821,56 @@ DeviceExtension->InterruptData.Flags |= SCSI_PORT_NEXT_REQUEST_READY; break; - case NextLuRequest: - { - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - - PathId = (UCHAR) va_arg (ap, int); - TargetId = (UCHAR) va_arg (ap, int); - Lun = (UCHAR) va_arg (ap, int); - - DPRINT1 ("Notify: NextLuRequest(PathId %u TargetId %u Lun %u)\n", - PathId, TargetId, Lun); - /* FIXME: Implement it! */ - ASSERT(FALSE); - -// DeviceExtension->IrpFlags |= IRP_FLAG_NEXT; -// DeviceExtension->IrpFlags |= IRP_FLAG_NEXT_LU; - - /* Hack! */ -// DeviceExtension->IrpFlags |= IRP_FLAG_NEXT; - } - break; + case NextLuRequest: + { + UCHAR PathId; + UCHAR TargetId; + UCHAR Lun; + PSCSI_PORT_LUN_EXTENSION LunExtension; + + PathId = (UCHAR) va_arg (ap, int); + TargetId = (UCHAR) va_arg (ap, int); + Lun = (UCHAR) va_arg (ap, int); + + DPRINT("Notify: NextLuRequest(PathId %u TargetId %u Lun %u)\n", + PathId, TargetId, Lun); + + /* Mark it in the flags field */ + DeviceExtension->InterruptData.Flags |= SCSI_PORT_NEXT_REQUEST_READY; + + /* Get the LUN extension */ + LunExtension = SpiGetLunExtension(DeviceExtension, + PathId, + TargetId, + Lun); + + /* This request should not be processed if */ + if ((LunExtension && LunExtension->ReadyLun) || + (LunExtension && LunExtension->SrbInfo.Srb)) + { + /* Nothing to do here */ + break; + } + + /* Add this LUN to the list */ + LunExtension->ReadyLun = DeviceExtension->InterruptData.ReadyLun; + DeviceExtension->InterruptData.ReadyLun = LunExtension; + } + break; case ResetDetected: - DPRINT1("Notify: ResetDetected\n"); - /* FIXME: ??? */ - break; + DPRINT("Notify: ResetDetected\n"); + /* Add RESET flags */ + DeviceExtension->InterruptData.Flags |= + SCSI_PORT_RESET | SCSI_PORT_RESET_REPORTED; + break; default: DPRINT1 ("Unsupported notification %lu\n", NotificationType); break; } - va_end(ap); + va_end(ap); /* Request a DPC after we're done with the interrupt */ DeviceExtension->InterruptData.Flags |= SCSI_PORT_NOTIFICATION_NEEDED;

17 years, 2 months

← Newer
1
...
5
6
7
8
9
10
11
...
59
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 September 2007