Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[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

[greatlrd] 23141: fill the DDHALINFO almost to 100% now, we are mising the rops table. Almost all info that need be send back for frist call is done,
by greatlrd＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: greatlrd Date: Tue Jul 18 17:23:38 2006 New Revision: 23141 URL: http://svn.reactos.org/svn/reactos?rev=23141&view=rev Log: fill the DDHALINFO almost to 100% now, we are mising the rops table. Almost all info that need be send back for frist call is done, Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/ddenable.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/ddenable.c Tue Jul 18 17:23:38 2006 @@ -135,6 +135,7 @@ OUT DWORD *pdwFourCC) { PPDEV ppdev = (PPDEV)dhpdev; + int i; if (ppdev == NULL) return FALSE; @@ -162,22 +163,34 @@ */ if(!(pvmList && pdwFourCC)) - { + { + RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); pHalInfo->dwSize = sizeof(DDHALINFO); pHalInfo->ddCaps.dwCaps = DDCAPS_BLT | DDCAPS_BLTQUEUE | DDCAPS_BLTCOLORFILL | DDCAPS_READSCANLINE | DDCAPS_BLTSTRETCH | DDCAPS_COLORKEY | DDCAPS_CANBLTSYSMEM; - pHalInfo->ddCaps.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_PRIMARYSURFACE | DDSCAPS_FLIP; - + pHalInfo->ddCaps.dwFXCaps = DDFXCAPS_BLTSTRETCHY | DDFXCAPS_BLTSTRETCHX | + DDFXCAPS_BLTSTRETCHYN | DDFXCAPS_BLTSTRETCHXN | + DDFXCAPS_BLTSHRINKY | DDFXCAPS_BLTSHRINKX | + DDFXCAPS_BLTSHRINKYN | DDFXCAPS_BLTSHRINKXN | + DDFXCAPS_BLTMIRRORUPDOWN | DDFXCAPS_BLTMIRRORLEFTRIGHT; + + pHalInfo->ddCaps.dwCaps2 = DDCAPS2_NONLOCALVIDMEM | DDCAPS2_NONLOCALVIDMEMCAPS; + + pHalInfo->ddCaps.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_PRIMARYSURFACE | DDSCAPS_FLIP; + + pHalInfo->ddCaps.dwCKeyCaps = DDCKEYCAPS_SRCBLT | DDCKEYCAPS_SRCBLTCLRSPACE; + + pHalInfo->ddCaps.dwSVBCaps = DDCAPS_BLT; + pHalInfo->ddCaps.ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM | DDSCAPS_NONLOCALVIDMEM; /* Calc how much memmory is left on the video cards memmory */ pHalInfo->ddCaps.dwVidMemTotal = (ppdev->MemHeight - ppdev->ScreenHeight) * ppdev->ScreenDelta; /* fill in some basic info that we need */ - pHalInfo->vmiData.pvPrimary = ppdev->ScreenPtr; - pHalInfo->vmiData.fpPrimary = 0; + pHalInfo->vmiData.pvPrimary = ppdev->ScreenPtr; pHalInfo->vmiData.dwDisplayWidth = ppdev->ScreenWidth; pHalInfo->vmiData.dwDisplayHeight = ppdev->ScreenHeight; pHalInfo->vmiData.lDisplayPitch = ppdev->ScreenDelta; @@ -187,15 +200,26 @@ pHalInfo->vmiData.ddpfDisplay.dwRBitMask = ppdev->RedMask; pHalInfo->vmiData.ddpfDisplay.dwGBitMask = ppdev->GreenMask; pHalInfo->vmiData.ddpfDisplay.dwBBitMask = ppdev->BlueMask; - pHalInfo->vmiData.dwOffscreenAlign = 4; - pHalInfo->vmiData.dwZBufferAlign = 4; - pHalInfo->vmiData.dwTextureAlign = 4; + pHalInfo->vmiData.dwOffscreenAlign = 4; if ( ppdev->BitsPerPixel == 8 ) { pHalInfo->vmiData.ddpfDisplay.dwFlags |= DDPF_PALETTEINDEXED8; - } + } + + /* FIXME + Config the rops we do not doing that yet + for we need write the rops table + */ + for(i=0;i<DD_ROP_SPACE;i++ ) + { + // pHALInfo->ddCaps.dwSVBRops[i] = rops[i]; + // pHALInfo->ddCaps.dwRops[i] = rops[i]; + } } + + /* Now fix the memory alloc and other stuff */ + return TRUE; }

1 0

[tretiakov] 23140: Revert 21223 (was not good idea...)
by tretiakov＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: tretiakov Date: Tue Jul 18 17:14:12 2006 New Revision: 23140 URL: http://svn.reactos.org/svn/reactos?rev=23140&view=rev Log: Revert 21223 (was not good idea...) Modified: trunk/reactos/tools/mkhive/reginf.c Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c (original) +++ trunk/reactos/tools/mkhive/reginf.c Tue Jul 18 17:14:12 2006 @@ -358,37 +358,6 @@ return TRUE; } -ULONG get_flags(PINFCONTEXT Context) -{ - CHAR Buffer[MAX_INF_STRING_LENGTH], *p; - ULONG Ret = 0; - - if (!InfHostGetStringField (Context, 4, Buffer, MAX_INF_STRING_LENGTH, NULL)) - { - p = strtok(Buffer, " |"); - while(p) - { - if(isdigit(*p))Ret|=strtol(p, NULL, 0); - else if(strcmp(p, "BINVALUETYPE")==0) Ret|= FLG_ADDREG_BINVALUETYPE; - else if(strcmp(p, "NOCLOBBER")==0) Ret|= FLG_ADDREG_NOCLOBBER; - else if(strcmp(p, "DELVAL")==0) Ret|= FLG_ADDREG_DELVAL; - else if(strcmp(p, "APPEND")==0) Ret|= FLG_ADDREG_APPEND; - else if(strcmp(p, "KEYONLY")==0) Ret|= FLG_ADDREG_KEYONLY; - else if(strcmp(p, "OVERWRITEONLY")==0) Ret|= FLG_ADDREG_OVERWRITEONLY; - else if(strcmp(p, "TYPE_SZ")==0) Ret|= FLG_ADDREG_TYPE_SZ; - else if(strcmp(p, "TYPE_MULTI_SZ")==0) Ret|= FLG_ADDREG_TYPE_MULTI_SZ; - else if(strcmp(p, "TYPE_EXPAND_SZ")==0) Ret|= FLG_ADDREG_TYPE_EXPAND_SZ; - else if(strcmp(p, "TYPE_BINARY")==0) Ret|= FLG_ADDREG_TYPE_BINARY; - else if(strcmp(p, "TYPE_DWORD")==0) Ret|= FLG_ADDREG_TYPE_DWORD; - else if(strcmp(p, "TYPE_NONE")==0) Ret|= FLG_ADDREG_TYPE_NONE; - else if(strcmp(p, "TYPE_MASK")==0) Ret|= FLG_ADDREG_TYPE_MASK; - p = strtok(NULL, " |"); - } - } - - return Ret; -} - /*********************************************************************** * registry_callback @@ -431,7 +400,12 @@ { Flags = FLG_ADDREG_DELVAL; } - else Flags = get_flags(Context); + else + { + /* get flags */ + if (InfHostGetIntField (Context, 4, (PLONG)&Flags) != 0) + Flags = 0; + } DPRINT("Flags: %lx\n", Flags);

1 0

[tretiakov] 23139: Add Andrew Munger (waxdragon) to credits.
by tretiakov＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: tretiakov Date: Tue Jul 18 16:33:30 2006 New Revision: 23139 URL: http://svn.reactos.org/svn/reactos?rev=23139&view=rev Log: Add Andrew Munger (waxdragon) to credits. Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=23139&r1=23138… ============================================================================== --- trunk/reactos/CREDITS (original) +++ trunk/reactos/CREDITS Tue Jul 18 16:33:30 2006 @@ -3,6 +3,7 @@ Aleksey Bragin <aleksey(a)studiocerebral.com> Alex Ionescu <ionucu(a)videotron.ca> Andrew Greenwood <lists(a)silverblade.co.uk> +Andrew Munger <waxdragon(a)gmail.com> Arindam Das Art Yerkes <ayerkes(a)speakeasy.net> Boudewijn Dekker <ariadne(a)xs4all.nl>

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006