Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 23151: add mouse properties registry keys
by janderwald＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: janderwald Date: Tue Jul 18 18:48:53 2006 New Revision: 23151 URL: http://svn.reactos.org/svn/reactos?rev=23151&view=rev Log: add mouse properties registry keys Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Tue Jul 18 18:48:53 2006 @@ -5,6 +5,14 @@ HKCU,"Control Panel",,0x00000012 HKCU,"Control Panel\Appearance",,0x00000012 +HKCU,"Control Panel\Mouse","MouseTrails",0x00010001,0x00000000 +HKCU,"Control Panel\Mouse","SnapToDefaultButton",0x00010001,0x00000000 +HKCU,"Control Panel\Mouse","MouseSpeed",0x00010001,0x00000001 +HKCU,"Control Panel\Mouse","MouseThreshold1",0x00010001,0x00000006 +HKCU,"Control Panel\Mouse","MouseThreshold2",0x00010001,0x0000000A +HKCU,"Control Panel\Mouse","DoubleClickSpeed",0x00010001,0x000001E0 +HKCU,"Control Panel\Mouse","SwapMouseButtons",0x00010001,0x00000000 + HKCU,"Control Panel\Desktop","AutoEndTasks",0x00000002,"0" HKCU,"Control Panel\Desktop","CursorBlinkRate",0x00000002,"530" HKCU,"Control Panel\Desktop","DragFullWindows",0x00000002,"0"

1 0

[hpoussin] 23150: Fix warnings detected by MSVC
by hpoussin＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: hpoussin Date: Tue Jul 18 18:41:55 2006 New Revision: 23150 URL: http://svn.reactos.org/svn/reactos?rev=23150&view=rev Log: Fix warnings detected by MSVC Modified: trunk/reactos/lib/recyclebin/openclose.c trunk/reactos/lib/recyclebin/recyclebin.c trunk/reactos/lib/recyclebin/recyclebin_v5.c Modified: trunk/reactos/lib/recyclebin/openclose.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/openclose.c… ============================================================================== --- trunk/reactos/lib/recyclebin/openclose.c (original) +++ trunk/reactos/lib/recyclebin/openclose.c Tue Jul 18 18:41:55 2006 @@ -170,7 +170,7 @@ } /* Search if the recycle bin has already been opened */ - driveLetter = toupper(driveLetter); + driveLetter = (WCHAR)toupper(driveLetter); ListEntry = ListHead.Flink; while (ListEntry != &ListHead) { Modified: trunk/reactos/lib/recyclebin/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin.c Tue Jul 18 18:41:55 2006 @@ -261,7 +261,6 @@ { PDELETED_FILE_DETAILS_W FileDetailsW = NULL; DWORD BufferSizeW = 0; - DWORD RequiredSizeW; BOOL ret = FALSE; if (BufferSize >= FIELD_OFFSET(DELETED_FILE_DETAILS_A, FileName)) @@ -279,7 +278,7 @@ } } - ret = GetDeletedFileDetailsW(hDeletedFile, BufferSizeW, FileDetailsW, &RequiredSizeW); + ret = GetDeletedFileDetailsW(hDeletedFile, BufferSizeW, FileDetailsW, RequiredSize); if (!ret) goto cleanup; Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.c Tue Jul 18 18:41:55 2006 @@ -24,6 +24,7 @@ CloseHandle5( IN HANDLE hDeletedFile) { + UNREFERENCED_PARAMETER(hDeletedFile); /* Nothing to do, as hDeletedFile is simply a DWORD... */ return TRUE; }

1 0

[hpoussin] 23149: Fix some 'unreferenced variable' warnings
by hpoussin＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: hpoussin Date: Tue Jul 18 18:40:55 2006 New Revision: 23149 URL: http://svn.reactos.org/svn/reactos?rev=23149&view=rev Log: Fix some 'unreferenced variable' warnings Modified: trunk/reactos/dll/win32/acledit/acledit.c trunk/reactos/dll/win32/acledit/stubs.c Modified: trunk/reactos/dll/win32/acledit/acledit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.c (original) +++ trunk/reactos/dll/win32/acledit/acledit.c Tue Jul 18 18:40:55 2006 @@ -42,6 +42,8 @@ DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved); + switch (dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/win32/acledit/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/acledit/stubs.c (original) +++ trunk/reactos/dll/win32/acledit/stubs.c Tue Jul 18 18:40:55 2006 @@ -26,6 +26,7 @@ WINAPI EditAuditInfo(DWORD Unknown) { + UNREFERENCED_PARAMETER(Unknown); UNIMPLEMENTED; return 0; } @@ -34,6 +35,7 @@ WINAPI EditOwnerInfo(DWORD Unknown) { + UNREFERENCED_PARAMETER(Unknown); UNIMPLEMENTED; return 0; } @@ -42,6 +44,7 @@ WINAPI EditPermissionInfo(DWORD Unknown) { + UNREFERENCED_PARAMETER(Unknown); UNIMPLEMENTED; return 0; } @@ -50,8 +53,11 @@ WINAPI FMExtensionProcW(HWND hWnd, WORD wEvent, - LONG lParam) + LONG lParam) { + UNREFERENCED_PARAMETER(hWnd); + UNREFERENCED_PARAMETER(wEvent); + UNREFERENCED_PARAMETER(lParam); UNIMPLEMENTED; return 0; } @@ -72,6 +78,19 @@ LPDWORD lpdwChangeContextStatus, DWORD Reserved) { + UNREFERENCED_PARAMETER(hWndOwner); + UNREFERENCED_PARAMETER(hInstance); + UNREFERENCED_PARAMETER(lpMachineName); + UNREFERENCED_PARAMETER(pAclDlgControl); + UNREFERENCED_PARAMETER(pAclEditControl); + UNREFERENCED_PARAMETER(lpObjectName); + UNREFERENCED_PARAMETER(pChangeCallback); + UNREFERENCED_PARAMETER(pChangeCallbackContext); + UNREFERENCED_PARAMETER(pObjectSecurity); + UNREFERENCED_PARAMETER(bNoReadPermission); + UNREFERENCED_PARAMETER(bReadOnly); + UNREFERENCED_PARAMETER(lpdwChangeContextStatus); + UNREFERENCED_PARAMETER(Reserved); UNIMPLEMENTED; return 0; } @@ -87,12 +106,26 @@ PACL_CHANGE pChangeCallback, PVOID pChangeCallbackContext, PSECURITY_DESCRIPTOR pObjectSecurity, - BOOL NoReadPermission, - BOOL NoOwnerChange, + BOOL bNoReadPermission, + BOOL bNoOwnerChange, LPDWORD lpdwChangeContextStatus, PACL_HELP_CONTROL pHelpInfo, DWORD Reserved) { + UNREFERENCED_PARAMETER(hWndOwner); + UNREFERENCED_PARAMETER(hInstance); + UNREFERENCED_PARAMETER(lpMachineName); + UNREFERENCED_PARAMETER(lpObjectType); + UNREFERENCED_PARAMETER(lpObjectName); + UNREFERENCED_PARAMETER(dwObjectCount); + UNREFERENCED_PARAMETER(pChangeCallback); + UNREFERENCED_PARAMETER(pChangeCallbackContext); + UNREFERENCED_PARAMETER(pObjectSecurity); + UNREFERENCED_PARAMETER(bNoReadPermission); + UNREFERENCED_PARAMETER(bNoOwnerChange); + UNREFERENCED_PARAMETER(lpdwChangeContextStatus); + UNREFERENCED_PARAMETER(pHelpInfo); + UNREFERENCED_PARAMETER(Reserved); UNIMPLEMENTED; return 0; } @@ -112,6 +145,18 @@ LPDWORD lpdwChangeContextStatus, DWORD Reserved) { + UNREFERENCED_PARAMETER(hWndOwner); + UNREFERENCED_PARAMETER(hInstance); + UNREFERENCED_PARAMETER(lpMachineName); + UNREFERENCED_PARAMETER(pAclDlgControl); + UNREFERENCED_PARAMETER(pAclEditControl); + UNREFERENCED_PARAMETER(lpObjectName); + UNREFERENCED_PARAMETER(pChangeCallback); + UNREFERENCED_PARAMETER(pChangeCallbackContext); + UNREFERENCED_PARAMETER(pObjectSecurity); + UNREFERENCED_PARAMETER(bNoReadPermission); + UNREFERENCED_PARAMETER(lpdwChangeContextStatus); + UNREFERENCED_PARAMETER(Reserved); UNIMPLEMENTED; return 0; }

1 0

[hpoussin] 23148: Fix some 'unreferenced variable' warnings
by hpoussin＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: hpoussin Date: Tue Jul 18 18:39:37 2006 New Revision: 23148 URL: http://svn.reactos.org/svn/reactos?rev=23148&view=rev Log: Fix some 'unreferenced variable' warnings Modified: trunk/reactos/base/applications/sndvol32/misc.c trunk/reactos/base/applications/sndvol32/mixer.c trunk/reactos/base/applications/sndvol32/sndvol32.c Modified: trunk/reactos/base/applications/sndvol32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/misc.c (original) +++ trunk/reactos/base/applications/sndvol32/misc.c Tue Jul 18 18:39:37 2006 @@ -79,11 +79,11 @@ ln * sizeof(WCHAR)); if ((*lpTarget) != NULL) { - INT Ret; - if (!(Ret = LoadStringW(hInst, - uID, - *lpTarget, - ln))) + INT Ret = LoadStringW(hInst, + uID, + *lpTarget, + ln); + if (!Ret) { LocalFree((HLOCAL)(*lpTarget)); } Modified: trunk/reactos/base/applications/sndvol32/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/mixer.c (original) +++ trunk/reactos/base/applications/sndvol32/mixer.c Tue Jul 18 18:39:37 2006 @@ -25,7 +25,7 @@ */ #include <sndvol32.h> -#define NO_MIXER_SELECTED (~0) +#define NO_MIXER_SELECTED ((UINT)(~0)) static VOID ClearMixerCache(PSND_MIXER Mixer) @@ -394,7 +394,7 @@ { if (Mixer->hmx) { - int lnsz; + UINT lnsz; PSND_MIXER_DESTINATION Line; LPMIXERLINE lpl = NULL; Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.c (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.c Tue Jul 18 18:39:37 2006 @@ -70,6 +70,8 @@ LRESULT lres; PPREFERENCES_FILL_DEVICES FillContext = (PPREFERENCES_FILL_DEVICES)Context; + UNREFERENCED_PARAMETER(Mixer); + lres = SendMessage(FillContext->hComboBox, CB_ADDSTRING, 0, @@ -101,7 +103,10 @@ PVOID Context) { PPREFERENCES_CONTEXT PrefContext = (PPREFERENCES_CONTEXT)Context; - + + UNREFERENCED_PARAMETER(Mixer); + UNREFERENCED_PARAMETER(DisplayControls); + switch (Line->dwComponentType) { case MIXERLINE_COMPONENTTYPE_DST_SPEAKERS: @@ -178,6 +183,9 @@ HWND hwndControls; LVITEM lvi; UINT i; + + UNREFERENCED_PARAMETER(Mixer); + UNREFERENCED_PARAMETER(LineID); if (Line->cControls != 0) { @@ -543,6 +551,7 @@ static VOID DeleteMixerWindowControls(PMIXER_WINDOW MixerWindow) { + UNREFERENCED_PARAMETER(MixerWindow); } static BOOL @@ -797,6 +806,10 @@ MSG Msg; int Ret = 1; + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpszCmdLine); + UNREFERENCED_PARAMETER(nCmdShow); + hAppInstance = hInstance; hAppHeap = GetProcessHeap();

1 0

[hpoussin] 23147: Fix wrong library names in export files
by hpoussin＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: hpoussin Date: Tue Jul 18 18:38:35 2006 New Revision: 23147 URL: http://svn.reactos.org/svn/reactos?rev=23147&view=rev Log: Fix wrong library names in export files Modified: trunk/reactos/dll/cpl/access/access.def trunk/reactos/dll/cpl/sysdm/sysdm.def Modified: trunk/reactos/dll/cpl/access/access.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.def?… ============================================================================== --- trunk/reactos/dll/cpl/access/access.def (original) +++ trunk/reactos/dll/cpl/access/access.def Tue Jul 18 18:38:35 2006 @@ -1,4 +1,4 @@ -LIBRARY cplsample.cpl +LIBRARY access.cpl EXPORTS CPlApplet Modified: trunk/reactos/dll/cpl/sysdm/sysdm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.def?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.def (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.def Tue Jul 18 18:38:35 2006 @@ -1,4 +1,4 @@ -LIBRARY cplsample.cpl +LIBRARY sysdm.cpl EXPORTS CPlApplet

1 0

[ion] 23146: [AUDIT] - State.c is clean, it is merely a collection of trivial ~10 line wrappers around the actual kernel (Ke) functions which do the work. - Rename suspend.c to state.c (since it also had resume APIs) and add alert APIs from kthread to it too. - Fix a bug in one of the alert APIs which was probing for a valid pointer even if the caller had given NULL (which is valid if the caller doesn't want the previous state returned).
by ion＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: ion Date: Tue Jul 18 18:34:06 2006 New Revision: 23146 URL: http://svn.reactos.org/svn/reactos?rev=23146&view=rev Log: [AUDIT] - State.c is clean, it is merely a collection of trivial ~10 line wrappers around the actual kernel (Ke) functions which do the work. - Rename suspend.c to state.c (since it also had resume APIs) and add alert APIs from kthread to it too. - Fix a bug in one of the alert APIs which was probing for a valid pointer even if the caller had given NULL (which is valid if the caller doesn't want the previous state returned). Added: trunk/reactos/ntoskrnl/ps/state.c (contents, props changed) - copied, changed from r23131, trunk/reactos/ntoskrnl/ps/suspend.c Removed: trunk/reactos/ntoskrnl/ps/suspend.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Tue Jul 18 18:34:06 2006 @@ -310,6 +310,25 @@ IN OUT PKTHREAD Thread ); +BOOLEAN +NTAPI +KeAlertThread( + IN PKTHREAD Thread, + IN KPROCESSOR_MODE AlertMode +); + +ULONG +NTAPI +KeAlertResumeThread( + IN PKTHREAD Thread +); + +ULONG +NTAPI +KeResumeThread( + IN PKTHREAD Thread +); + PVOID NTAPI KeSwitchKernelStack( Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Tue Jul 18 18:34:06 2006 @@ -443,8 +443,8 @@ } ULONG -STDCALL -KeResumeThread(PKTHREAD Thread) +NTAPI +KeResumeThread(IN PKTHREAD Thread) { ULONG PreviousCount; KIRQL OldIrql; @@ -624,7 +624,7 @@ } ULONG -STDCALL +NTAPI KeAlertResumeThread(IN PKTHREAD Thread) { ULONG PreviousCount; @@ -674,9 +674,9 @@ } BOOLEAN -STDCALL -KeAlertThread(PKTHREAD Thread, - KPROCESSOR_MODE AlertMode) +NTAPI +KeAlertThread(IN PKTHREAD Thread, + IN KPROCESSOR_MODE AlertMode) { KIRQL OldIrql; BOOLEAN PreviousState; @@ -1550,109 +1550,6 @@ return OldState; } -/* - * - * NOT EXPORTED - */ -NTSTATUS -STDCALL -NtAlertResumeThread(IN HANDLE ThreadHandle, - OUT PULONG SuspendCount) -{ - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PETHREAD Thread; - NTSTATUS Status; - ULONG PreviousState; - - /* Check if parameters are valid */ - if(PreviousMode != KernelMode) { - - _SEH_TRY { - - ProbeForWriteUlong(SuspendCount); - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; - } - - /* Reference the Object */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_SUSPEND_RESUME, - PsThreadType, - PreviousMode, - (PVOID*)&Thread, - NULL); - - /* Check for Success */ - if (NT_SUCCESS(Status)) { - - /* Call the Kernel Function */ - PreviousState = KeAlertResumeThread(&Thread->Tcb); - - /* Dereference Object */ - ObDereferenceObject(Thread); - - if (SuspendCount) { - - _SEH_TRY { - - *SuspendCount = PreviousState; - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; - } - } - - /* Return status */ - return Status; -} - -/* - * @implemented - * - * EXPORTED - */ -NTSTATUS -STDCALL -NtAlertThread (IN HANDLE ThreadHandle) -{ - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PETHREAD Thread; - NTSTATUS Status; - - /* Reference the Object */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_SUSPEND_RESUME, - PsThreadType, - PreviousMode, - (PVOID*)&Thread, - NULL); - - /* Check for Success */ - if (NT_SUCCESS(Status)) { - - /* - * Do an alert depending on the processor mode. If some kmode code wants to - * enforce a umode alert it should call KeAlertThread() directly. If kmode - * code wants to do a kmode alert it's sufficient to call it with Zw or just - * use KeAlertThread() directly - */ - KeAlertThread(&Thread->Tcb, PreviousMode); - - /* Dereference Object */ - ObDereferenceObject(Thread); - } - - /* Return status */ - return Status; -} - NTSTATUS STDCALL NtDelayExecution(IN BOOLEAN Alertable, Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Tue Jul 18 18:34:06 2006 @@ -295,7 +295,7 @@ <file>query.c</file> <file>quota.c</file> <file>security.c</file> - <file>suspend.c</file> + <file>state.c</file> <file>thread.c</file> <file>win32.c</file> </directory> Copied: trunk/reactos/ntoskrnl/ps/state.c (from r23131, trunk/reactos/ntoskrnl/ps/suspend.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/state.c?p2=tru… ============================================================================== --- trunk/reactos/ntoskrnl/ps/suspend.c (original) +++ trunk/reactos/ntoskrnl/ps/state.c Tue Jul 18 18:34:06 2006 @@ -1,11 +1,10 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ps/suspend.c - * PURPOSE: Thread managment - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ps/state.c + * PURPOSE: Process Manager: Process/Thread State Control + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Thomas Weidenmueller (w3seek(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -14,48 +13,139 @@ #define NDEBUG #include <internal/debug.h> -ULONG -STDCALL -KeResumeThread(PKTHREAD Thread); - /* FUNCTIONS *****************************************************************/ /* - * FUNCTION: Decrements a thread's resume count - * ARGUMENTS: - * ThreadHandle = Handle to the thread that should be resumed - * ResumeCount = The resulting resume count. - * RETURNS: Status + * @implemented */ NTSTATUS -STDCALL +NTAPI +NtAlertThread(IN HANDLE ThreadHandle) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PETHREAD Thread; + NTSTATUS Status; + + /* Reference the Object */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_SUSPEND_RESUME, + PsThreadType, + PreviousMode, + (PVOID*)&Thread, + NULL); + if (NT_SUCCESS(Status)) + { + /* + * Do an alert depending on the processor mode. If some kmode code wants to + * enforce a umode alert it should call KeAlertThread() directly. If kmode + * code wants to do a kmode alert it's sufficient to call it with Zw or just + * use KeAlertThread() directly + */ + KeAlertThread(&Thread->Tcb, PreviousMode); + + /* Dereference Object */ + ObDereferenceObject(Thread); + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +NtAlertResumeThread(IN HANDLE ThreadHandle, + OUT PULONG SuspendCount) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PETHREAD Thread; + NTSTATUS Status = STATUS_SUCCESS; + ULONG PreviousState; + + /* Check if we came from user mode with a suspend count */ + if ((SuspendCount) && (PreviousMode != KernelMode)) + { + /* Enter SEH for probing */ + _SEH_TRY + { + /* Probe the count */ + ProbeForWriteUlong(SuspendCount); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Fail on exception */ + if (!NT_SUCCESS(Status)) return Status; + } + + /* Reference the Object */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_SUSPEND_RESUME, + PsThreadType, + PreviousMode, + (PVOID*)&Thread, + NULL); + if (NT_SUCCESS(Status)) + { + /* Call the Kernel Function */ + PreviousState = KeAlertResumeThread(&Thread->Tcb); + + /* Dereference Object */ + ObDereferenceObject(Thread); + + /* Check if the caller gave a suspend count */ + if (SuspendCount) + { + /* Enter SEH for write */ + _SEH_TRY + { + /* Write state back */ + *SuspendCount = PreviousState; + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI NtResumeThread(IN HANDLE ThreadHandle, - IN PULONG SuspendCount OPTIONAL) + OUT PULONG SuspendCount OPTIONAL) { PETHREAD Thread; ULONG Prev; - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - PreviousMode = ExGetPreviousMode(); - - DPRINT("NtResumeThead(ThreadHandle %lx SuspendCount %p)\n", - ThreadHandle, SuspendCount); - - /* Check buffer validity */ - if(SuspendCount && PreviousMode != KernelMode) { - - _SEH_TRY { - + /* Check if caller gave a suspend count from user mode */ + if ((SuspendCount) && (PreviousMode != KernelMode)) + { + /* Enter SEH for probing */ + _SEH_TRY + { + /* Probe the count */ ProbeForWriteUlong(SuspendCount); - } _SEH_HANDLE { - + } + _SEH_HANDLE + { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - - } _SEH_END; - + } + _SEH_END; + + /* Fail on exception */ if(!NT_SUCCESS(Status)) return Status; } @@ -66,50 +156,37 @@ PreviousMode, (PVOID*)&Thread, NULL); - if (!NT_SUCCESS(Status)) { - - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Call the Kernel Function */ Prev = KeResumeThread(&Thread->Tcb); - /* Return it */ - if(SuspendCount) { - - _SEH_TRY { - + /* Check if the caller wanted the count back */ + if (SuspendCount) + { + /* Enter SEH for write back */ + _SEH_TRY + { + /* Write the count */ *SuspendCount = Prev; - - } _SEH_HANDLE { - + } + _SEH_HANDLE + { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - - } _SEH_END; - } - - /* Dereference and Return */ - ObDereferenceObject ((PVOID)Thread); - return Status; -} - -/* - * FUNCTION: Increments a thread's suspend count - * ARGUMENTS: - * ThreadHandle = Handle to the thread that should be resumed - * PreviousSuspendCount = The resulting/previous suspend count. - * REMARK: - * A thread will be suspended if its suspend count is greater than 0. - * This procedure maps to the win32 SuspendThread function. ( - * documentation about the the suspend count can be found here aswell ) - * The suspend count is not increased if it is greater than - * MAXIMUM_SUSPEND_COUNT. - * RETURNS: Status - */ -NTSTATUS -STDCALL + } + _SEH_END; + } + + /* Dereference and return */ + ObDereferenceObject(Thread); + return Status; +} + +NTSTATUS +NTAPI NtSuspendThread(IN HANDLE ThreadHandle, - IN PULONG PreviousSuspendCount OPTIONAL) + OUT PULONG PreviousSuspendCount OPTIONAL) { PETHREAD Thread; ULONG Prev; @@ -117,18 +194,23 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - /* Check buffer validity */ - if(PreviousSuspendCount && PreviousMode != KernelMode) - { + /* Check if caller gave a suspend count from user mode */ + if ((PreviousSuspendCount) && (PreviousMode != KernelMode)) + { + /* Enter SEH for probing */ _SEH_TRY { + /* Probe the count */ ProbeForWriteUlong(PreviousSuspendCount); - } + } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; - + } + _SEH_END; + + /* Fail on exception */ if(!NT_SUCCESS(Status)) return Status; } @@ -163,29 +245,24 @@ /* Don't fail if we merely couldn't write the handle back */ if (Status != STATUS_SUSPEND_COUNT_EXCEEDED) Status = STATUS_SUCCESS; - } _SEH_END; + } + _SEH_END; /* Return */ ObDereferenceObject(Thread); return Status; } - -/* - * @unimplemented - */ -NTSTATUS -STDCALL +NTSTATUS +NTAPI NtSuspendProcess(IN HANDLE ProcessHandle) { - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process; NTSTATUS Status; - PAGED_CODE(); - PreviousMode = ExGetPreviousMode(); - + /* Reference the process */ Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_SUSPEND_RESUME, PsProcessType, @@ -197,29 +274,23 @@ /* FIXME */ Status = STATUS_NOT_IMPLEMENTED; DPRINT1("NtSuspendProcess not yet implemented!\n"); - ObDereferenceObject(Process); } - return Status; -} - - -/* - * @unimplemented - */ -NTSTATUS -STDCALL + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI NtResumeProcess(IN HANDLE ProcessHandle) { - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process; NTSTATUS Status; - PAGED_CODE(); - PreviousMode = ExGetPreviousMode(); - + /* Reference the process */ Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_SUSPEND_RESUME, PsProcessType, @@ -231,11 +302,20 @@ /* FIXME */ Status = STATUS_NOT_IMPLEMENTED; DPRINT1("NtResumeProcess not yet implemented!\n"); - ObDereferenceObject(Process); } - return Status; + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +NtTestAlert(VOID) +{ + /* Check and Alert Thread if needed */ + return KeTestAlertThread(ExGetPreviousMode()) ? + STATUS_ALERTED : STATUS_SUCCESS; } /* EOF */ Propchange: trunk/reactos/ntoskrnl/ps/state.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/ps/state.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Removed: trunk/reactos/ntoskrnl/ps/suspend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/suspend.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/suspend.c (original) +++ trunk/reactos/ntoskrnl/ps/suspend.c (removed) @@ -1,241 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ps/suspend.c - * PURPOSE: Thread managment - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -ULONG -STDCALL -KeResumeThread(PKTHREAD Thread); - -/* FUNCTIONS *****************************************************************/ - -/* - * FUNCTION: Decrements a thread's resume count - * ARGUMENTS: - * ThreadHandle = Handle to the thread that should be resumed - * ResumeCount = The resulting resume count. - * RETURNS: Status - */ -NTSTATUS -STDCALL -NtResumeThread(IN HANDLE ThreadHandle, - IN PULONG SuspendCount OPTIONAL) -{ - PETHREAD Thread; - ULONG Prev; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - DPRINT("NtResumeThead(ThreadHandle %lx SuspendCount %p)\n", - ThreadHandle, SuspendCount); - - /* Check buffer validity */ - if(SuspendCount && PreviousMode != KernelMode) { - - _SEH_TRY { - - ProbeForWriteUlong(SuspendCount); - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; - - if(!NT_SUCCESS(Status)) return Status; - } - - /* Get the Thread Object */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_SUSPEND_RESUME, - PsThreadType, - PreviousMode, - (PVOID*)&Thread, - NULL); - if (!NT_SUCCESS(Status)) { - - return Status; - } - - /* Call the Kernel Function */ - Prev = KeResumeThread(&Thread->Tcb); - - /* Return it */ - if(SuspendCount) { - - _SEH_TRY { - - *SuspendCount = Prev; - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; - } - - /* Dereference and Return */ - ObDereferenceObject ((PVOID)Thread); - return Status; -} - -/* - * FUNCTION: Increments a thread's suspend count - * ARGUMENTS: - * ThreadHandle = Handle to the thread that should be resumed - * PreviousSuspendCount = The resulting/previous suspend count. - * REMARK: - * A thread will be suspended if its suspend count is greater than 0. - * This procedure maps to the win32 SuspendThread function. ( - * documentation about the the suspend count can be found here aswell ) - * The suspend count is not increased if it is greater than - * MAXIMUM_SUSPEND_COUNT. - * RETURNS: Status - */ -NTSTATUS -STDCALL -NtSuspendThread(IN HANDLE ThreadHandle, - IN PULONG PreviousSuspendCount OPTIONAL) -{ - PETHREAD Thread; - ULONG Prev; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - - /* Check buffer validity */ - if(PreviousSuspendCount && PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWriteUlong(PreviousSuspendCount); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } _SEH_END; - - if(!NT_SUCCESS(Status)) return Status; - } - - /* Get the Thread Object */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_SUSPEND_RESUME, - PsThreadType, - PreviousMode, - (PVOID*)&Thread, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Guard with SEH because KeSuspendThread can raise an exception */ - _SEH_TRY - { - /* Make sure the thread isn't terminating */ - if ((Thread != PsGetCurrentThread()) && (Thread->Terminated)) - { - ObDereferenceObject(Thread); - return STATUS_THREAD_IS_TERMINATING; - } - - /* Call the Kernel function */ - Prev = KeSuspendThread(&Thread->Tcb); - - /* Return the Previous Count */ - if (PreviousSuspendCount) *PreviousSuspendCount = Prev; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - - /* Don't fail if we merely couldn't write the handle back */ - if (Status != STATUS_SUSPEND_COUNT_EXCEEDED) Status = STATUS_SUCCESS; - } _SEH_END; - - /* Return */ - ObDereferenceObject(Thread); - return Status; -} - - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -NtSuspendProcess(IN HANDLE ProcessHandle) -{ - KPROCESSOR_MODE PreviousMode; - PEPROCESS Process; - NTSTATUS Status; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_SUSPEND_RESUME, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); - if (NT_SUCCESS(Status)) - { - /* FIXME */ - Status = STATUS_NOT_IMPLEMENTED; - DPRINT1("NtSuspendProcess not yet implemented!\n"); - - ObDereferenceObject(Process); - } - - return Status; -} - - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -NtResumeProcess(IN HANDLE ProcessHandle) -{ - KPROCESSOR_MODE PreviousMode; - PEPROCESS Process; - NTSTATUS Status; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_SUSPEND_RESUME, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); - if (NT_SUCCESS(Status)) - { - /* FIXME */ - Status = STATUS_NOT_IMPLEMENTED; - DPRINT1("NtResumeProcess not yet implemented!\n"); - - ObDereferenceObject(Process); - } - - return Status; -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Tue Jul 18 18:34:06 2006 @@ -840,14 +840,6 @@ return(STATUS_SUCCESS); } -NTSTATUS -NTAPI -NtTestAlert(VOID) -{ - /* Check and Alert Thread if needed */ - return KeTestAlertThread(ExGetPreviousMode()) ? STATUS_ALERTED : STATUS_SUCCESS; -} - /* * @implemented */

1 0

[hpoussin] 23145: Fix some 'unreferenced variable' warnings
by hpoussin＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: hpoussin Date: Tue Jul 18 17:56:00 2006 New Revision: 23145 URL: http://svn.reactos.org/svn/reactos?rev=23145&view=rev Log: Fix some 'unreferenced variable' warnings Modified: trunk/reactos/base/setup/welcome/welcome.c Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c (original) +++ trunk/reactos/base/setup/welcome/welcome.c Tue Jul 18 17:56:00 2006 @@ -114,6 +114,9 @@ WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; BITMAP BitmapInfo; + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpszCmdLine); + hInstance = hInst; /* Load icons */ @@ -313,6 +316,9 @@ HDC ScreenDC; DWORD dwTop; DWORD dwHeight = 0; + + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); hbrLightBlue = CreateSolidBrush(LIGHT_BLUE); hbrDarkBlue = CreateSolidBrush(DARK_BLUE); @@ -457,6 +463,8 @@ static LRESULT OnCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam); + if (LOWORD(wParam) == IDC_CLOSEBUTTON) { DestroyWindow(hWnd); @@ -518,6 +526,9 @@ BITMAP bmpInfo; TCHAR version[50]; + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); + hdc = BeginPaint(hWnd, &ps); /* Banner panel */ @@ -662,6 +673,9 @@ TCHAR szText[80]; int iBkMode; + UNREFERENCED_PARAMETER(hWnd); + UNREFERENCED_PARAMETER(wParam); + if (lpDis->hwndItem == hwndCloseButton) { DrawFrameControl(lpDis->hDC, @@ -707,6 +721,9 @@ static LRESULT OnMouseMove(HWND hWnd, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); + if (nTopic != -1) { nTopic = -1; @@ -721,6 +738,8 @@ static LRESULT OnCtlColorStatic(HWND hWnd, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(hWnd); + if ((HWND)lParam == hwndCheckButton) { SetBkColor((HDC)wParam, LIGHT_BLUE); @@ -734,6 +753,9 @@ static LRESULT OnActivate(HWND hWnd, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(hWnd); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); nTopic = -1; InvalidateRect(hwndMain, &rcRightPanel, TRUE); @@ -745,6 +767,10 @@ OnDestroy(HWND hWnd, WPARAM wParam, LPARAM lParam) { int i; + + UNREFERENCED_PARAMETER(hWnd); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); for (i=0;i<10;i++) {

1 0

[hpoussin] 23144: Fix a warning (unused variable)
by hpoussin＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: hpoussin Date: Tue Jul 18 17:55:22 2006 New Revision: 23144 URL: http://svn.reactos.org/svn/reactos?rev=23144&view=rev Log: Fix a warning (unused variable) Modified: trunk/reactos/base/applications/network/tracert/tracert.c trunk/reactos/base/applications/network/tracert/tracert.h Modified: trunk/reactos/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/tracert/tracert.c (original) +++ trunk/reactos/base/applications/network/tracert/tracert.c Tue Jul 18 17:55:22 2006 @@ -208,7 +208,7 @@ /* if RecievePacket timed out we don't bother decoding */ if (iRecieveReturn != 1) { - iDecRes = DecodeResponse(iPacketSize, iSeqNum); + iDecRes = DecodeResponse(iPacketSize); switch (iDecRes) { @@ -570,7 +570,7 @@ * It all is well, print the time taken for the round trip. * */ -static INT DecodeResponse(INT iPacketSize, USHORT iSeqNum) +static INT DecodeResponse(INT iPacketSize) { unsigned short header_len = recvpacket.h_len * 4; /* cast the recieved packet into an ECHO reply and a TTL Exceed so we can check the ID*/ Modified: trunk/reactos/base/applications/network/tracert/tracert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/tracert/tracert.h (original) +++ trunk/reactos/base/applications/network/tracert/tracert.h Tue Jul 18 17:55:22 2006 @@ -77,7 +77,7 @@ static VOID PreparePacket(INT packetSize, USHORT seqNum); static INT SendPacket(INT datasize); static INT ReceivePacket(INT datasize); -static INT DecodeResponse(INT packetSize, USHORT seqNum); +static INT DecodeResponse(INT packetSize); static LONGLONG GetTime(void); static WORD CheckSum(PUSHORT data, UINT size); static VOID Usage(void);

1 0

[janderwald] 23143: * check parameters
by janderwald＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: janderwald Date: Tue Jul 18 17:45:37 2006 New Revision: 23143 URL: http://svn.reactos.org/svn/reactos?rev=23143&view=rev Log: * check parameters Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c Tue Jul 18 17:45:37 2006 @@ -344,6 +344,11 @@ Entries, EntriesCount); UserEnterExclusive(); + if (!Entries || !EntriesCount) + { + RETURN( (HACCEL) 0 ); + } + Accel = ObmCreateObject(gHandleTable, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); if (Accel == NULL)

1 0

[janderwald] 23142: * check parameters in CreateAcceleratorTableA/W and DestroyAcceleratorTable
by janderwald＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: janderwald Date: Tue Jul 18 17:44:39 2006 New Revision: 23142 URL: http://svn.reactos.org/svn/reactos?rev=23142&view=rev Log: * check parameters in CreateAcceleratorTableA/W and DestroyAcceleratorTable Modified: trunk/reactos/dll/win32/user32/windows/accel.c Modified: trunk/reactos/dll/win32/user32/windows/accel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/a… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/accel.c (original) +++ trunk/reactos/dll/win32/user32/windows/accel.c Tue Jul 18 17:44:39 2006 @@ -187,6 +187,9 @@ U32_ACCEL_CACHE_ENTRY ** ppEntry; ULONG_PTR nUsage = 0; + if (!hAccel) + return FALSE; + EnterCriticalSection(&U32AccelCacheLock); /* see if this accelerator table has been cached */ @@ -281,6 +284,8 @@ */ HACCEL WINAPI CreateAcceleratorTableW(LPACCEL lpaccl, int cEntries) { + if (!cEntries || !lpaccl) return (HACCEL)0; + return NtUserCreateAcceleratorTable(lpaccl, cEntries); } @@ -325,6 +330,8 @@ HACCEL WINAPI CreateAcceleratorTableA(LPACCEL lpaccl, int cEntries) { int i; + + if (!cEntries || !lpaccl) return (HACCEL)0; for(i = 0; i < cEntries; ++ i) if(!lpaccl[i].fVirt)

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