Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[akhaldi] 47918: [PSDK] - Fix EVENT_FILTER_DESCRIPTOR redefinition.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 30 19:36:36 2010 New Revision: 47918 URL: http://svn.reactos.org/svn/reactos?rev=47918&view=rev Log: [PSDK] - Fix EVENT_FILTER_DESCRIPTOR redefinition. Modified: trunk/reactos/include/psdk/evntprov.h trunk/reactos/include/psdk/evntrace.h Modified: trunk/reactos/include/psdk/evntprov.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntprov.h?re… ============================================================================== --- trunk/reactos/include/psdk/evntprov.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/evntprov.h [iso-8859-1] Wed Jun 30 19:36:36 2010 @@ -19,6 +19,8 @@ */ #pragma once + +#define _EVNTPROV_ #ifndef EVNTAPI #ifndef MIDL_PASS @@ -67,11 +69,13 @@ } EVENT_DESCRIPTOR, *PEVENT_DESCRIPTOR; typedef const EVENT_DESCRIPTOR *PCEVENT_DESCRIPTOR; +#ifndef _EVNTRACE_ typedef struct _EVENT_FILTER_DESCRIPTOR { ULONGLONG Ptr; ULONG Size; ULONG Type; } EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR; +#endif typedef struct _EVENT_FILTER_HEADER { USHORT Id; Modified: trunk/reactos/include/psdk/evntrace.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntrace.h?re… ============================================================================== --- trunk/reactos/include/psdk/evntrace.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/evntrace.h [iso-8859-1] Wed Jun 30 19:36:36 2010 @@ -596,7 +596,9 @@ typedef struct _EVENT_RECORD EVENT_RECORD, *PEVENT_RECORD; typedef struct _EVENT_TRACE_LOGFILEW EVENT_TRACE_LOGFILEW, *PEVENT_TRACE_LOGFILEW; typedef struct _EVENT_TRACE_LOGFILEA EVENT_TRACE_LOGFILEA, *PEVENT_TRACE_LOGFILEA; +#ifndef _EVNTPROV_ typedef struct _EVENT_FILTER_DESCRIPTOR EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR; +#endif typedef ULONG (WINAPI *PEVENT_TRACE_BUFFER_CALLBACKW)(

14 years, 2 months

[mkupfer] 47917: - move set of msg-time (for messages) back to msg queue (msg time is needed for all mouse events not only mouse move) - ClickLock will work again

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Wed Jun 30 18:40:20 2010 New Revision: 47917 URL: http://svn.reactos.org/svn/reactos?rev=47917&view=rev Log: - move set of msg-time (for messages) back to msg queue (msg time is needed for all mouse events not only mouse move) - ClickLock will work again Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Jun 30 18:40:20 2010 @@ -179,7 +179,6 @@ { PWINDOW_OBJECT DesktopWindow; PSYSTEM_CURSORINFO CurInfo; - LARGE_INTEGER LargeTickCount; MSLLHOOKSTRUCT MouseHookData; HDC hDC; MSG Msg; @@ -222,9 +221,6 @@ //Store the new cursor position gpsi->ptCursor.x = x; gpsi->ptCursor.y = y; - - KeQueryTickCount(&LargeTickCount); - Msg.time = MsqCalculateMessageTime(&LargeTickCount); //Move the mouse pointer GreMovePointer(hDC, x, y); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Wed Jun 30 18:40:20 2010 @@ -171,9 +171,12 @@ VOID FASTCALL MsqInsertSystemMessage(MSG* Msg) { + LARGE_INTEGER LargeTickCount; KIRQL OldIrql; ULONG Prev; + KeQueryTickCount(&LargeTickCount); + Msg->time = MsqCalculateMessageTime(&LargeTickCount); /* * If we got WM_MOUSEMOVE and there are already messages in the * system message queue, check if the last message is mouse move

14 years, 2 months

[spetreolle] 47916: Fix typo. Dedicated to Physicus

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Jun 30 17:19:23 2010 New Revision: 47916 URL: http://svn.reactos.org/svn/reactos?rev=47916&view=rev Log: Fix typo. Dedicated to Physicus Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Wed Jun 30 17:19:23 2010 @@ -1,5 +1,5 @@ @ stdcall AcquireSRWLockExclusive(ptr) ntdll.RtlAcquireSRWLockExclusive -@ stdcall AcquireSRWLockShare(ptr) ntdll.RtlAcquireSRWLockShared +@ stdcall AcquireSRWLockShared(ptr) ntdll.RtlAcquireSRWLockShared @ stdcall ActivateActCtx(ptr ptr) @ stdcall AddAtomA(str) @ stdcall AddAtomW(wstr)

14 years, 2 months

[mjmartin] 47915: [win32k] - Remove dead code as in the old SetTimer and KillTimer functions.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Wed Jun 30 11:00:21 2010 New Revision: 47915 URL: http://svn.reactos.org/svn/reactos?rev=47915&view=rev Log: [win32k] - Remove dead code as in the old SetTimer and KillTimer functions. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Wed Jun 30 11:00:21 2010 @@ -448,102 +448,6 @@ DPRINT("TimerCount = %d\n", TimerCount); } -// -// -// Old Timer Queueing -// -// -UINT_PTR FASTCALL -InternalSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer) -{ - PWINDOW_OBJECT Window; - UINT_PTR Ret = 0; - PTHREADINFO pti; - PUSER_MESSAGE_QUEUE MessageQueue; - - DPRINT("IntSetTimer wnd %x id %p elapse %u timerproc %p systemtimer %s\n", - Wnd, IDEvent, Elapse, TimerFunc, SystemTimer ? "TRUE" : "FALSE"); - - if ((Wnd == NULL) && ! SystemTimer) - { - DPRINT("Window-less timer\n"); - /* find a free, window-less timer id */ - IntLockWindowlessTimerBitmap(); - IDEvent = RtlFindClearBitsAndSet(&WindowLessTimersBitMap, 1, HintIndex); - - if (IDEvent == (UINT_PTR) -1) - { - IntUnlockWindowlessTimerBitmap(); - DPRINT1("Unable to find a free window-less timer id\n"); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return 0; - } - - HintIndex = ++IDEvent; - IntUnlockWindowlessTimerBitmap(); - Ret = IDEvent; - pti = PsGetCurrentThreadWin32Thread(); - MessageQueue = pti->MessageQueue; - } - else - { - if (!(Window = UserGetWindowObject(Wnd))) - { - DPRINT1("Invalid window handle\n"); - return 0; - } - - if (Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) - { - DPRINT1("Trying to set timer for window in another process (shatter attack?)\n"); - SetLastWin32Error(ERROR_ACCESS_DENIED); - return 0; - } - - Ret = IDEvent; - MessageQueue = Window->pti->MessageQueue; - } - -#if 0 - - /* Windows NT/2k/XP behaviour */ - if (Elapse > 0x7fffffff) - { - DPRINT("Adjusting uElapse\n"); - Elapse = 1; - } - -#else - - /* Windows XP SP2 and Windows Server 2003 behaviour */ - if (Elapse > 0x7fffffff) - { - DPRINT("Adjusting uElapse\n"); - Elapse = 0x7fffffff; - } - -#endif - - /* Windows 2k/XP and Windows Server 2003 SP1 behaviour */ - if (Elapse < 10) - { - DPRINT("Adjusting uElapse\n"); - Elapse = 10; - } - - if (! MsqSetTimer(MessageQueue, Wnd, - IDEvent, Elapse, TimerFunc, - SystemTimer ? WM_SYSTIMER : WM_TIMER)) - { - DPRINT1("Failed to set timer in message queue\n"); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return 0; - } - -if (Ret == 0) ASSERT(FALSE); - return Ret; -} - BOOL FASTCALL DestroyTimersForWindow(PTHREADINFO pti, PWINDOW_OBJECT Window) { @@ -620,64 +524,6 @@ return pTmr ? TRUE : FALSE; } -// -// -// Old Kill Timer -// -// -BOOL FASTCALL -InternalKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer) -{ - PTHREADINFO pti; - PWINDOW_OBJECT Window = NULL; - - DPRINT("IntKillTimer wnd %x id %p systemtimer %s\n", - Wnd, IDEvent, SystemTimer ? "TRUE" : "FALSE"); - - pti = PsGetCurrentThreadWin32Thread(); - if (Wnd) - { - Window = UserGetWindowObject(Wnd); - - if (! MsqKillTimer(pti->MessageQueue, Wnd, - IDEvent, SystemTimer ? WM_SYSTIMER : WM_TIMER)) - { - // Give it another chance to find the timer. - if (Window && !( MsqKillTimer(Window->pti->MessageQueue, Wnd, - IDEvent, SystemTimer ? WM_SYSTIMER : WM_TIMER))) - { - DPRINT1("Unable to locate timer in message queue for Window.\n"); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - } - - /* window-less timer? */ - if ((Wnd == NULL) && ! SystemTimer) - { - if (! MsqKillTimer(pti->MessageQueue, Wnd, - IDEvent, SystemTimer ? WM_SYSTIMER : WM_TIMER)) - { - DPRINT1("Unable to locate timer in message queue for Window-less timer.\n"); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* Release the id */ - IntLockWindowlessTimerBitmap(); - - ASSERT(RtlAreBitsSet(&WindowLessTimersBitMap, IDEvent - 1, 1)); - RtlClearBits(&WindowLessTimersBitMap, IDEvent - 1, 1); - - HintIndex = IDEvent - 1; - - IntUnlockWindowlessTimerBitmap(); - } - - return TRUE; -} - NTSTATUS FASTCALL InitTimerImpl(VOID) {

14 years, 2 months

[dreimer] 47914: Added Fox Audio Player to rapps and some more fixes. (Igor Paliychuk, myself)

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jun 30 10:19:30 2010 New Revision: 47914 URL: http://svn.reactos.org/svn/reactos?rev=47914&view=rev Log: Added Fox Audio Player to rapps and some more fixes. (Igor Paliychuk, myself) Added: trunk/reactos/base/applications/rapps/rapps/fap.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mpc.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] Wed Jun 30 10:19:30 2010 @@ -38,5 +38,5 @@ [Section.0422] Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° -Description = Ð Ð°Ð·Ð°ÑÑÑÐ²ÑÐ¹ÑÐµ Ð²Ð¼ÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" Ð¿ÑÑÐ»Ñ ÑÐ¾Ð³Ð¾ Ð´Ð²ÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. +Description = Ð Ð¾Ð·Ð°ÑÑÑÐ²ÑÐ¹ÑÐµ Ð²Ð¼ÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" Ð¿ÑÑÐ»Ñ ÑÐ¾Ð³Ð¾ Ð´Ð²ÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. URLSite = ÐÐµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Added: trunk/reactos/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/fap.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] Wed Jun 30 10:19:30 2010 @@ -1,0 +1,19 @@ +ï»¿; UTF-8 + +[Section] +Name = Fox Audio Player +Version = 0.7.2 +Licence = GPL +Description = Simple and lightweight audio player. +Size = 1.84MB +Category = 1 +URLSite = http://foxaudioplayer.sourceforge.net/ +URLDownload = http://svn.reactos.org/packages/fap-0.7.2-win32-bin.exe +CDPath = none + + +[Section.0422] +Description = Kleiner und einfacher Mediaplayer. + +[Section.0422] +Description = ÐÑÐ¾ÑÑÐ¸Ð¹ ÑÐ° Ð¼Ð°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ Ð°ÑÐ´ÑÐ¾ ÑÐ°Ð¹Ð»ÑÐ². Propchange: trunk/reactos/base/applications/rapps/rapps/fap.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Wed Jun 30 10:19:30 2010 @@ -12,7 +12,7 @@ CDPath = none [Section.0407] -Description = Open source Multiprotocol Instant Messaging Anwendung - funktioniert mÃ¶glicherweise nicht vollstÃ¤ndig. +Description = Open source Multiprotokoll Instant Messaging Anwendung - funktioniert mÃ¶glicherweise nicht vollstÃ¤ndig. [Section.040a] Description = AplicaciÃ³n de mensajerÃa instantÃ¡nea multiprotocolo de cÃ³digo abierto - Puede no funcionar en su totalidad. Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] Wed Jun 30 10:19:30 2010 @@ -12,7 +12,7 @@ CDPath = none [Section.0407] -Description = Ein Medienplayer. +Description = Ein Mediaplayer. [Section.040a] Description = Reproductor multimedia. Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Wed Jun 30 10:19:30 2010 @@ -23,6 +23,6 @@ Name = Biblioteka uruchomieniowa Simple Direct Media Layer (SDL) Description = Wymagana przez wiele gier (gÅÃ³wnie o otwartym ÅºrÃ³dle). Do jej rozpakowania potrzebny jest program 7-Zip lub podobny. -[Section.0415] +[Section.0422] Name = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ° Simple Direct Media Layer (SDL) Description = ÐÐµÐ¾Ð±ÑÑÐ´Ð½Ð° Ð´Ð»Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ Ð±Ð°Ð³Ð°ÑÑÐ¾Ñ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸Ñ ÑÐ³Ð¾Ñ. ÐÐ°Ð¼ Ð¿Ð¾ÑÑÑÐ±ÐµÐ½ 7-Zip Ð°Ð±Ð¾ Ð¿Ð¾Ð´ÑÐ±Ð½Ð° ÑÑÐ¸Ð»ÑÑÐ° ÑÐ¾Ð± ÑÐ¾Ð·Ð¿Ð°ÐºÑÐ²Ð°ÑÐ¸ ÑÑ. Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Wed Jun 30 10:19:30 2010 @@ -12,7 +12,7 @@ CDPath = none [Section.0407] -Description = Ein Medienplayer. +Description = Ein Mediaplayer. [Section.040a] Description = Reproductor multimedia.

14 years, 2 months

[dreimer] 47913: Add Visual C++ 2008 SP1 runtime to rapps and rename the others correctly.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jun 30 07:15:16 2010 New Revision: 47913 URL: http://svn.reactos.org/svn/reactos?rev=47913&view=rev Log: Add Visual C++ 2008 SP1 runtime to rapps and rename the others correctly. Added: trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/vc2005run.txt trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2008run.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt Modified: trunk/reactos/base/applications/rapps/rapps/vc2005run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005run.txt [iso-8859-1] Wed Jun 30 07:15:16 2010 @@ -1,7 +1,7 @@ ï»¿; UTF-8 [Section] -Name = Visual Studio 2005 Runtime +Name = Microsoft Visual C++ 2005 Redistributable Package Version = 7.0 Licence = Unknown Description = Visual Studio 2005 Runtime. Modified: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] Wed Jun 30 07:15:16 2010 @@ -1,7 +1,7 @@ ï»¿; UTF-8 [Section] -Name = Visual Studio 2005 Runtime SP1 +Name = Microsoft Visual C++ 2005 SP1 Redistributable Package Version = 7.1 Licence = Unknown Description = Visual Studio 2005 Runtime SP1. Modified: trunk/reactos/base/applications/rapps/rapps/vc2008run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2008run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2008run.txt [iso-8859-1] Wed Jun 30 07:15:16 2010 @@ -1,7 +1,7 @@ ï»¿; UTF-8 [Section] -Name = Visual Studio 2008 Runtime +Name = Microsoft Visual C++ 2008 Redistributable Package Version = 8.0 Licence = Unknown Description = Visual Studio 2008 Runtime. Added: trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt [iso-8859-1] Wed Jun 30 07:15:16 2010 @@ -1,0 +1,28 @@ +ï»¿; UTF-8 + +[Section] +Name = Microsoft Visual C++ 2008 SP1 Redistributable Package +Version = 8.0 +Licence = Unknown +Description = Visual Studio 2008 SP1 Runtime. +Size = 4.0MB +Category = 14 +URLSite = http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7… +URLDownload = http://download.microsoft.com/download/d/d/9/dd9a82d0-52ef-40db-8dab-795376… +CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = Visual Studio 2008 SP1 Laufzeitsystem. + +[Section.040a] +Licence = Desconocida +Description = Librerias Visual Studio 2008 SP1. + +[Section.0415] +Licence = Nieznana +Description = Biblioteki uruchomieniowe Visual Studio 2008 SP1. + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Studio 2008 SP1. Propchange: trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] Wed Jun 30 07:15:16 2010 @@ -1,7 +1,7 @@ ï»¿; UTF-8 [Section] -Name = Visual Studio 6 Runtime +Name = Microsoft Visual C++ 6 Redistributable Package Version = 6.0 Licence = Unknown Description = Visual Studio 6 Runtime.

14 years, 2 months

[evb] 47912: Implemented IRP dispatch to work in new PCI driver (PciDispatchIrp), fill out FDO IRP handlers which all stubs now, make up/down-call work (PciPassIrpFromFdoToPdo, PciPassDownIrp) Added the helper debug routines PCI driver receive IRP_QUERY_INTERFACE now and hit stub

by evb＠svn.reactos.org

Author: evb Date: Wed Jun 30 01:39:21 2010 New Revision: 47912 URL: http://svn.reactos.org/svn/reactos?rev=47912&view=rev Log: Implemented IRP dispatch to work in new PCI driver (PciDispatchIrp), fill out FDO IRP handlers which all stubs now, make up/down-call work (PciPassIrpFromFdoToPdo, PciPassDownIrp) Added the helper debug routines PCI driver receive IRP_QUERY_INTERFACE now and hit stub Modified: trunk/reactos/drivers/bus/pcix/debug.c trunk/reactos/drivers/bus/pcix/dispatch.c trunk/reactos/drivers/bus/pcix/fdo.c trunk/reactos/drivers/bus/pcix/init.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/power.c Modified: trunk/reactos/drivers/bus/pcix/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/debug.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] Wed Jun 30 01:39:21 2010 @@ -14,6 +14,171 @@ /* GLOBALS ********************************************************************/ +PCHAR PnpCodes[] = +{ + "START_DEVICE", + "QUERY_REMOVE_DEVICE", + "REMOVE_DEVICE", + "CANCEL_REMOVE_DEVICE", + "STOP_DEVICE", + "QUERY_STOP_DEVICE", + "CANCEL_STOP_DEVICE", + "QUERY_DEVICE_RELATIONS", + "QUERY_INTERFACE", + "QUERY_CAPABILITIES", + "QUERY_RESOURCES", + "QUERY_RESOURCE_REQUIREMENTS", + "QUERY_DEVICE_TEXT", + "FILTER_RESOURCE_REQUIREMENTS", + "** UNKNOWN PNP IRP Minor Code **", + "READ_CONFIG", + "WRITE_CONFIG", + "EJECT", + "SET_LOCK", + "QUERY_ID", + "QUERY_PNP_DEVICE_STATE", + "QUERY_BUS_INFORMATION", + "DEVICE_USAGE_NOTIFICATION" +}; + +PCHAR PoCodes[] = +{ + "WAIT_WAKE", + "POWER_SEQUENCE", + "SET_POWER", + "QUERY_POWER", +}; + +ULONG PciBreakOnPdoPowerIrp, PciBreakOnFdoPowerIrp; +ULONG PciBreakOnPdoPnpIrp, PciBreakOnFdoPnpIrp; + /* FUNCTIONS ******************************************************************/ +PCHAR +NTAPI +PciDebugPnpIrpTypeToText(IN USHORT MinorFunction) +{ + PCHAR Text; + + /* Catch invalid code */ + if (MinorFunction >= IRP_MN_SURPRISE_REMOVAL) + { + /* New version of Windows? Or driver bug */ + Text = "** UNKNOWN PNP IRP Minor Code **"; + } + else + { + /* Get the right text for it */ + Text = PnpCodes[MinorFunction]; + } + + /* Return the symbolic name for the IRP */ + return Text; +} + +PCHAR +NTAPI +PciDebugPoIrpTypeToText(IN USHORT MinorFunction) +{ + PCHAR Text; + + /* Catch invalid code */ + if (MinorFunction >= IRP_MN_QUERY_POWER) + { + /* New version of Windows? Or driver bug */ + Text = "** UNKNOWN PO IRP Minor Code **"; + } + else + { + /* Get the right text for it */ + Text = PoCodes[MinorFunction]; + } + + /* Return the symbolic name for the IRP */ + return Text; +} + +BOOLEAN +NTAPI +PciDebugIrpDispatchDisplay(IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension, + IN USHORT MaxMinor) +{ + //PPCI_PDO_EXTENSION PdoDeviceExtension; + ULONG BreakMask, DebugLevel = 0; + PCHAR IrpString; + + /* Only two functions are recognized */ + switch (IoStackLocation->MajorFunction) + { + case IRP_MJ_POWER: + + /* Get the string and the correct break mask for the extension */ + BreakMask = (DeviceExtension->ExtensionType == PciPdoExtensionType) ? + PciBreakOnPdoPowerIrp : PciBreakOnFdoPowerIrp; + IrpString = PciDebugPoIrpTypeToText(IoStackLocation->MinorFunction); + break; + + case IRP_MJ_PNP: + + /* Get the string and the correct break mask for the extension */ + BreakMask = (DeviceExtension->ExtensionType == PciFdoExtensionType) ? + PciBreakOnPdoPnpIrp : PciBreakOnFdoPnpIrp; + IrpString = PciDebugPnpIrpTypeToText(IoStackLocation->MinorFunction); + break; + + default: + + /* Other functions are not decoded */ + BreakMask = FALSE; + IrpString = ""; + break; + } + + /* Check if this is a PDO */ + if (DeviceExtension->ExtensionType == PciPdoExtensionType) + { + /* Choose the correct debug level based on which function this is */ + if (IoStackLocation->MajorFunction == IRP_MJ_POWER) + { + DebugLevel = 0x500; + } + else if (IoStackLocation->MajorFunction == IRP_MJ_PNP) + { + DebugLevel = 0x200; + } +#if 0 // after commit PDO support + /* For a PDO, print out the bus, device, and function number */ + PdoDeviceExtension = (PVOID)DeviceExtension; + DPRINT1("PDO(b=0x%x, d=0x%x, f=0x%x)<-%s\n", + PdoDeviceExtension->ParentFdoExtension->BaseBus, + PdoDeviceExtension->Slot.u.bits.DeviceNumber, + PdoDeviceExtension->Slot.u.bits.FunctionNumber, + IrpString); +#endif + } + else if (DeviceExtension->ExtensionType == PciFdoExtensionType) + { + /* Choose the correct debug level based on which function this is */ + if (IoStackLocation->MajorFunction == IRP_MJ_POWER) + { + DebugLevel = 0x400; + } + else if (IoStackLocation->MajorFunction == IRP_MJ_PNP) + { + DebugLevel = 0x100; + } + + /* For an FDO, just dump the extension pointer and IRP string */ + DPRINT1("FDO(%x)<-%s\n", DeviceExtension, IrpString); + } + + /* If the function is illegal for this extension, complain */ + if (IoStackLocation->MinorFunction > MaxMinor) + DPRINT1("Unknown IRP, minor = 0x%x\n", IoStackLocation->MinorFunction); + + /* Return whether or not the debugger should be broken into for this IRP */ + return ((1 << IoStackLocation->MinorFunction) & BreakMask); +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/dispatch.… ============================================================================== --- trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] Wed Jun 30 01:39:21 2010 @@ -18,13 +18,238 @@ NTSTATUS NTAPI +PciSetEventCompletion(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PKEVENT Event = (PVOID)Context; + ASSERT(Event); + + /* Set the event and return the appropriate status code */ + KeSetEvent(Event, FALSE, IO_NO_INCREMENT); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI +PciCallDownIrpStack(IN PPCI_FDO_EXTENSION DeviceExtension, + IN PIRP Irp) +{ + NTSTATUS Status; + KEVENT Event; + PAGED_CODE(); + DPRINT1("PciCallDownIrpStack ...\n"); + ASSERT_FDO(DeviceExtension); + + /* Initialize the wait event */ + KeInitializeEvent(&Event, SynchronizationEvent, 0); + + /* Setup a completion routine */ + IoCopyCurrentIrpStackLocationToNext(Irp); + IoSetCompletionRoutine(Irp, PciSetEventCompletion, &Event, TRUE, TRUE, TRUE); + + /* Call the attached device */ + Status = IofCallDriver(DeviceExtension->AttachedDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for it to complete the request, and get its status */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + /* Return that status back to the caller */ + return Status; +} + +NTSTATUS +NTAPI +PciPassIrpFromFdoToPdo(IN PPCI_FDO_EXTENSION DeviceExtension, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStackLocation; + NTSTATUS Status; + DPRINT1("Pci PassIrp ...\n"); + + /* Get the stack location to check which function this is */ + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + if (IoStackLocation->MajorFunction == IRP_MJ_POWER) + { + /* Power IRPs are special since we have to notify the Power Manager */ + IoCopyCurrentIrpStackLocationToNext(Irp); + PoStartNextPowerIrp(Irp); + Status = PoCallDriver(DeviceExtension->AttachedDeviceObject, Irp); + } + else + { + /* For a normal IRP, just call the next driver in the stack */ + IoSkipCurrentIrpStackLocation(Irp); + Status = IofCallDriver(DeviceExtension->AttachedDeviceObject, Irp); + } + + /* Return the status back to the caller */ + return Status; +} + +NTSTATUS +NTAPI PciDispatchIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - /* This function is not yet implemented */ - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; + PPCI_FDO_EXTENSION DeviceExtension; + PIO_STACK_LOCATION IoStackLocation; + PPCI_MJ_DISPATCH_TABLE IrpDispatchTable; + BOOLEAN PassToPdo; + NTSTATUS Status; + PPCI_MN_DISPATCH_TABLE TableArray = NULL, Table; + USHORT MaxMinor; + PCI_DISPATCH_STYLE DispatchStyle; + PCI_DISPATCH_FUNCTION DispatchFunction; + DPRINT1("PCI: Dispatch IRP\n"); + + /* Get the extension and I/O stack location for this IRP */ + DeviceExtension = (PPCI_FDO_EXTENSION)DeviceObject->DeviceExtension; + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + ASSERT((DeviceExtension->ExtensionType == PciPdoExtensionType) || + (DeviceExtension->ExtensionType == PciFdoExtensionType)); + + /* Deleted extensions don't respond to IRPs */ + if (DeviceExtension->DeviceState == PciDeleted) + { + /* Fail this IRP */ + Status = STATUS_NO_SUCH_DEVICE; + PassToPdo = FALSE; + } + else + { + /* Otherwise, get the dispatch table for the extension */ + IrpDispatchTable = DeviceExtension->IrpDispatchTable; + + /* And choose which function table to use */ + switch (IoStackLocation->MajorFunction) + { + case IRP_MJ_POWER: + + /* Power Manager IRPs */ + TableArray = IrpDispatchTable->PowerIrpDispatchTable; + MaxMinor = IrpDispatchTable->PowerIrpMaximumMinorFunction; + break; + + case IRP_MJ_PNP: + + /* Plug-and-Play Manager IRPs */ + TableArray = IrpDispatchTable->PnpIrpDispatchTable; + MaxMinor = IrpDispatchTable->PnpIrpMaximumMinorFunction; + break; + + case IRP_MJ_SYSTEM_CONTROL: + + /* WMI IRPs */ + DispatchFunction = IrpDispatchTable->SystemControlIrpDispatchFunction; + DispatchStyle = IrpDispatchTable->SystemControlIrpDispatchStyle; + MaxMinor = -1; + break; + + default: + + /* Unrecognized IRPs */ + DispatchFunction = IrpDispatchTable->OtherIrpDispatchFunction; + DispatchStyle = IrpDispatchTable->OtherIrpDispatchStyle; + MaxMinor = -1; + break; + } + + /* Only deal with recognized IRPs */ + if (MaxMinor != -1) + { + /* Make sure the function is recognized */ + if (IoStackLocation->MinorFunction > MaxMinor) + { + /* Pick the terminator, which should return unrecognized */ + Table = &TableArray[MaxMinor + 1]; + } + else + { + /* Pick the appropriate table for this function */ + Table = &TableArray[IoStackLocation->MinorFunction]; + } + + /* From that table, get the function code and dispatch style */ + DispatchStyle = Table->DispatchStyle; + DispatchFunction = Table->DispatchFunction; + } + + /* Print out debugging information, and see if we should break */ + if (PciDebugIrpDispatchDisplay(IoStackLocation, + DeviceExtension, + MaxMinor)) + { + /* The developer/user wants us to break for this IRP, do it */ + DbgBreakPoint(); + } + + /* Check if this IRP should be sent up the stack first */ + if (DispatchStyle == IRP_UPWARD) + { + /* Do it now before handling it ourselves */ + PciCallDownIrpStack(DeviceExtension, Irp); + } + + /* Call the our driver's handler for this IRP and deal with the IRP */ + Status = DispatchFunction(Irp, IoStackLocation, DeviceExtension); + switch (DispatchStyle) + { + /* Complete IRPs are completely immediately by our driver */ + case IRP_COMPLETE: + PassToPdo = FALSE; + break; + + /* Downward IRPs are send to the attached FDO */ + case IRP_DOWNWARD: + PassToPdo = TRUE; + break; + + /* Upward IRPs are completed immediately by our driver */ + case IRP_UPWARD: + PassToPdo = FALSE; + break; + + /* Dispatch IRPs are immediately returned */ + case IRP_DISPATCH: + return Status; + + /* There aren't any other dispatch styles! */ + default: + ASSERT(FALSE); + return Status; + } + } + + /* Pending IRPs are returned immediately */ + if (Status == STATUS_PENDING) return Status; + + /* Handled IRPs return their status in the status block */ + if (Status != STATUS_NOT_SUPPORTED) Irp->IoStatus.Status = Status; + + /* Successful, or unhandled IRPs that are "DOWNWARD" are sent to the PDO */ + if ((PassToPdo) && ((NT_SUCCESS(Status)) || (Status == STATUS_NOT_SUPPORTED))) + { + /* Let the PDO deal with it */ + Status = PciPassIrpFromFdoToPdo(DeviceExtension, Irp); + } + else + { + /* Otherwise, the IRP is returned with its status */ + Status = Irp->IoStatus.Status; + + /* Power IRPs need to notify the Power Manager that the next IRP can go */ + if (IoStackLocation->MajorFunction == IRP_MJ_POWER) PoStartNextPowerIrp(Irp); + + /* And now this IRP can be completed */ + IofCompleteRequest(Irp, IO_NO_INCREMENT); + } + + /* And the status returned back to the caller */ + return Status; } NTSTATUS Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Wed Jun 30 01:39:21 2010 @@ -19,40 +19,40 @@ PCI_MN_DISPATCH_TABLE PciFdoDispatchPowerTable[] = { - {IRP_DISPATCH, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DISPATCH, PciFdoWaitWake}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciFdoSetPowerState}, + {IRP_DOWNWARD, PciFdoIrpQueryPower}, {IRP_DOWNWARD, PciIrpNotSupported} }; PCI_MN_DISPATCH_TABLE PciFdoDispatchPnpTable[] = { - {IRP_UPWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DISPATCH, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DISPATCH, PciIrpNotSupported}, - {IRP_UPWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_UPWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, - {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_UPWARD, PciFdoIrpStartDevice}, + {IRP_DOWNWARD, PciFdoIrpQueryRemoveDevice}, + {IRP_DISPATCH, PciFdoIrpRemoveDevice}, + {IRP_DOWNWARD, PciFdoIrpCancelRemoveDevice}, + {IRP_DOWNWARD, PciFdoIrpStopDevice}, + {IRP_DOWNWARD, PciFdoIrpQueryStopDevice}, + {IRP_DOWNWARD, PciFdoIrpCancelStopDevice}, + {IRP_DOWNWARD, PciFdoIrpQueryDeviceRelations}, + {IRP_DISPATCH, PciFdoIrpQueryInterface}, + {IRP_UPWARD, PciFdoIrpQueryCapabilities}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_DOWNWARD, PciIrpNotSupported}, + {IRP_UPWARD, PciFdoIrpDeviceUsageNotification}, + {IRP_DOWNWARD, PciFdoIrpSurpriseRemoval}, + {IRP_DOWNWARD, PciFdoIrpQueryLegacyBusInformation}, {IRP_DOWNWARD, PciIrpNotSupported} }; @@ -69,6 +69,149 @@ }; /* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +PciFdoIrpStartDevice(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpQueryRemoveDevice(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpRemoveDevice(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpCancelRemoveDevice(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpStopDevice(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpQueryStopDevice(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpCancelStopDevice(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpQueryDeviceRelations(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpQueryInterface(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpQueryCapabilities(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpDeviceUsageNotification(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpSurpriseRemoval(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpQueryLegacyBusInformation(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} VOID NTAPI Modified: trunk/reactos/drivers/bus/pcix/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/init.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] Wed Jun 30 01:39:21 2010 @@ -389,7 +389,7 @@ Length, &NumberOfBytes); if (Status == STATUS_NO_MORE_ENTRIES) break; - + /* Null-terminate the keyname, because the kernel does not */ KeyInfo->Name[KeyInfo->NameLength / sizeof(WCHAR)] = UNICODE_NULL; Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Wed Jun 30 01:39:21 2010 @@ -289,6 +289,33 @@ ); // +// Power Routines +// +NTSTATUS +NTAPI +PciFdoWaitWake( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoSetPowerState( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpQueryPower( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +// // Bus FDO Routines // NTSTATUS @@ -296,6 +323,110 @@ PciAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject +); + +NTSTATUS +NTAPI +PciFdoIrpStartDevice( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpQueryRemoveDevice( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpRemoveDevice( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpCancelRemoveDevice( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpStopDevice( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpQueryStopDevice( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpCancelStopDevice( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpQueryDeviceRelations( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpQueryInterface( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpQueryCapabilities( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpDeviceUsageNotification( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpSurpriseRemoval( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciFdoIrpQueryLegacyBusInformation( + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension ); // @@ -439,6 +570,17 @@ ); // +// Debug Helpers +// +BOOLEAN +NTAPI +PciDebugIrpDispatchDisplay( + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension, + IN USHORT MaxMinor +); + +// // External Resources // extern SINGLE_LIST_ENTRY PciFdoExtensionListHead; Modified: trunk/reactos/drivers/bus/pcix/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/power.c [iso-8859-1] Wed Jun 30 01:39:21 2010 @@ -16,4 +16,37 @@ /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +PciFdoWaitWake(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoSetPowerState(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PciFdoIrpQueryPower(IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation, + IN PPCI_FDO_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_NOT_SUPPORTED; +} + /* EOF */

14 years, 2 months

[jimtabor] 47911: [Win32k] - Set caret blink rate for global server information too.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jun 29 22:13:13 2010 New Revision: 47911 URL: http://svn.reactos.org/svn/reactos?rev=47911&view=rev Log: [Win32k] - Set caret blink rate for global server information too. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] Tue Jun 29 22:13:13 2010 @@ -73,6 +73,7 @@ } WinStaObject->CaretBlinkRate = uMSeconds; + gpsi->dtCaretBlink = uMSeconds; return TRUE; }

14 years, 2 months

[fireball] 47910: - Giannis Adamopoulos: Never allow bringing shell window to foreground in SWM.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jun 29 21:56:07 2010 New Revision: 47910 URL: http://svn.reactos.org/svn/reactos?rev=47910&view=rev Log: - Giannis Adamopoulos: Never allow bringing shell window to foreground in SWM. Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Tue Jun 29 21:56:07 2010 @@ -550,6 +550,20 @@ SwmSetForeground(HWND hWnd) { PSWM_WINDOW SwmWin; + extern struct window *shell_window; + + /* Check for a shell window */ + UserEnterExclusive(); + + /* Don't allow the shell window to become foreground */ + if(shell_window && + (get_window((UINT_PTR)hWnd) == shell_window)) + { + UserLeave(); + return; + } + + UserLeave(); /* Acquire the lock */ SwmAcquire(); Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] Tue Jun 29 21:56:07 2010 @@ -98,7 +98,7 @@ }; /* global window pointers */ -static struct window *shell_window; +/*static*/ struct window *shell_window; static struct window *shell_listview; static struct window *progman_window; static struct window *taskman_window;

14 years, 2 months

[janderwald] 47909: [PORTCLS] - Check if there is a silence buffer available when there is no audio mapping available - ignore failure for allocation requirements

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jun 29 21:14:09 2010 New Revision: 47909 URL: http://svn.reactos.org/svn/reactos?rev=47909&view=rev Log: [PORTCLS] - Check if there is a silence buffer available when there is no audio mapping available - ignore failure for allocation requirements Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Tue Jun 29 21:14:09 2010 @@ -259,7 +259,7 @@ m_CurrentOffset = Offset = 0; } - if (!Irp) + if (!Irp && m_SilenceBuffer && m_MaxFrameSize) { DPRINT("NoIrp\n"); // no irp available, use silence buffer @@ -267,6 +267,13 @@ *BufferSize = m_MaxFrameSize; return STATUS_SUCCESS; } + + if (!Irp) + { + // no irp buffer available + return STATUS_UNSUCCESSFUL; + } + // get stream header StreamHeader = (PKSSTREAM_HEADER)Irp->Tail.Overlay.DriverContext[2]; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Tue Jun 29 21:14:09 2010 @@ -824,7 +824,6 @@ if (!NT_SUCCESS(Status)) { DPRINT("GetAllocatorFraming failed with %x\n", Status); - return Status; } DPRINT("OptionFlags %x RequirementsFlag %x PoolType %x Frames %lu FrameSize %lu FileAlignment %lu\n",

14 years, 2 months

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 June 2010