Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[nyadav] 51952: [AUDSRV] Revamp Audio Server API with RPC
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 09:20:19 2011 New Revision: 51952 URL: http://svn.reactos.org/svn/reactos?rev=51952&view=rev Log: [AUDSRV] Revamp Audio Server API with RPC Added: branches/nyadav-audio-branch/dll/win32/audsrvapi/ (with props) branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt (with props) branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c (with props) branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h (with props) branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec (with props) branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c (with props) Removed: branches/nyadav-audio-branch/dll/win32/audiosrv2/ Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri May 27 09:20:19 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt (added) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt [iso-8859-1] Fri May 27 09:20:19 2011 @@ -1,0 +1,21 @@ +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/audsrv) + +spec2def(audsrvapi.dll audsrvapi.spec) + +list(APPEND SOURCE + dllmain.c + audsrvapi.c + ${CMAKE_CURRENT_BINARY_DIR}/audsrvapi.def) + +add_library(audsrvapi SHARED ${SOURCE}) +set_module_type(audsrvapi win32dll) + +target_link_libraries(audsrvapi audsrvrpc uuid wine ${PSEH_LIB}) + + +add_pch(audsrv ${CMAKE_CURRENT_SOURCE_DIR}/audsrv.h ${SOURCE}) + +add_importlibs(audsrvapi rpcrt4 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) +add_cab_target(audsrvapi 1) +add_importlib_target(audsrvapi.spec) Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c (added) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Fri May 27 09:20:19 2011 @@ -1,0 +1,1 @@ +#include "audsrvapi.h" Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h (added) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h [iso-8859-1] Fri May 27 09:20:19 2011 @@ -1,0 +1,2 @@ +#include "audsrvrpc_c.h" +#include <audsrvapi.h> Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== (empty) Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c (added) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] Fri May 27 09:20:19 2011 @@ -1,0 +1,18 @@ + +#include "audsrvapi.h" + +BOOL APIENTRY DllMain( HMODULE hModule, + DWORD ul_reason_for_call, + LPVOID lpReserved + ) +{ + switch (ul_reason_for_call) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[nyadav] 51951: [AUDSRV] Revamp Audio Server Api with RPC
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 09:05:47 2011 New Revision: 51951 URL: http://svn.reactos.org/svn/reactos?rev=51951&view=rev Log: [AUDSRV] Revamp Audio Server Api with RPC Added: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.c (with props) branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.h (with props) branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.spec (with props) Removed: branches/nyadav-audio-branch/dll/win32/audiosrv2/audiosrv2dll.spec Modified: branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c Removed: branches/nyadav-audio-branch/dll/win32/audiosrv2/audiosrv2dll.spec URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audiosrv2/audiosrv2dll.spec [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audiosrv2/audiosrv2dll.spec (removed) @@ -1,1 +1,0 @@ -@ stdcall getmixerengine() Added: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.c (added) +++ branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.c [iso-8859-1] Fri May 27 09:05:47 2011 @@ -1,0 +1,1 @@ +#include "audsrvapi.h" Propchange: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.h (added) +++ branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.h [iso-8859-1] Fri May 27 09:05:47 2011 @@ -1,0 +1,2 @@ +#include "audsrvrpc_c.h" +#include <audsrvapi.h> Propchange: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.spec URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== (empty) Propchange: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.spec ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c [iso-8859-1] Fri May 27 09:05:47 2011 @@ -1,5 +1,5 @@ -#include "audsrv.h" +#include "audsrvapi.h" BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call,

1 0

[nyadav] 51950: [AUDSRV] Revamp Audio Server Api with RPC
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 09:00:12 2011 New Revision: 51950 URL: http://svn.reactos.org/svn/reactos?rev=51950&view=rev Log: [AUDSRV] Revamp Audio Server Api with RPC Modified: branches/nyadav-audio-branch/dll/win32/CMakeLists.txt Modified: branches/nyadav-audio-branch/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/C… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/CMakeLists.txt [iso-8859-1] Fri May 27 09:00:12 2011 @@ -7,7 +7,7 @@ add_subdirectory(advpack) add_subdirectory(atl) add_subdirectory(authz) -add_subdirectory(audiosrv2) +add_subdirectory(audsrvapi) add_subdirectory(avicap32) add_subdirectory(avifil32) add_subdirectory(batt)

1 0

[nyadav] 51949: Audio Server API with RPC
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 08:50:55 2011 New Revision: 51949 URL: http://svn.reactos.org/svn/reactos?rev=51949&view=rev Log: Audio Server API with RPC Modified: branches/nyadav-audio-branch/dll/win32/audiosrv2/CMakeLists.txt branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c Modified: branches/nyadav-audio-branch/dll/win32/audiosrv2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audiosrv2/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audiosrv2/CMakeLists.txt [iso-8859-1] Fri May 27 08:50:55 2011 @@ -1,16 +1,20 @@ +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/audsrv) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/audiosrv2) - -spec2def(audiosrv2dll.dll audiosrv2dll.spec) +spec2def(audsrvapi.dll audsrvapi.spec) list(APPEND SOURCE dllmain.c - ${CMAKE_CURRENT_BINARY_DIR}/audiosrv2dll.def) + ${CMAKE_CURRENT_BINARY_DIR}/audsrvapi.def) -add_library(audiosrv2dll SHARED ${SOURCE}) -set_module_type(audiosrv2dll win32dll) +add_library(audsrvapi SHARED ${SOURCE}) +set_module_type(audsrvapi win32dll) -target_link_libraries(audiosrv2dll uuid wine) -add_importlibs(audiosrv2dll ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(audiosrv2dll 1) -add_importlib_target(audiosrv2dll.spec) +target_link_libraries(audsrvapi audsrvrpc uuid wine ${PSEH_LIB}) + + +add_pch(audsrv ${CMAKE_CURRENT_SOURCE_DIR}/audsrv.h ${SOURCE}) + +add_importlibs(audsrvapi rpcrt4 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) +add_cab_target(audsrvapi 1) +add_importlib_target(audsrvapi.spec) Modified: branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c [iso-8859-1] Fri May 27 08:50:55 2011 @@ -1,68 +1,18 @@ -#include <audiosrv.h> - -static MixerEngine * lpvMem = NULL; -static HANDLE hMapObject = NULL; +#include "audsrv.h" BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved ) { -BOOL fInit, fIgnore; switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: - hMapObject = CreateFileMapping( - INVALID_HANDLE_VALUE, // use paging file - NULL, // default security attributes - PAGE_READWRITE, // read/write access - 0, // size: high 32-bits - sizeof(MixerEngine),TEXT("MixerEngine")); // size: low 32-bits - if (hMapObject == NULL) - return FALSE; - - fInit = (GetLastError() != ERROR_ALREADY_EXISTS); - - lpvMem = (MixerEngine *)MapViewOfFile( - hMapObject, // object to map view of - FILE_MAP_WRITE, // read/write access - 0, // high offset: map from - 0, // low offset: beginning - 0); // default: map entire file - if (lpvMem == NULL) - return FALSE; - - if (fInit) - lpvMem->dead=0; - lpvMem->masterchannels=0; - lpvMem->masterbitspersample=0; - lpvMem->masterchannelmask=0; - lpvMem->masterdoublebuf[0]=NULL; - lpvMem->masterdoublebuf[1]=NULL; - lpvMem->masterfreq=0; - lpvMem->mastervolume=0; - lpvMem->mute=0; - lpvMem->portstream=NULL; - lpvMem->workingbuffer=0; - lpvMem->mixerthread=NULL; - lpvMem->playerthread=NULL; - lpvMem->EventPool[0]=CreateEvent(NULL,FALSE,FALSE,NULL); - lpvMem->EventPool[1]=CreateEvent(NULL,FALSE,FALSE,NULL); - - break; case DLL_THREAD_ATTACH: case DLL_THREAD_DETACH: - break; case DLL_PROCESS_DETACH: - fIgnore = UnmapViewOfFile(lpvMem); - fIgnore = CloseHandle(hMapObject); break; } return TRUE; } - -WINAPI MixerEngine * getmixerengine() -{ -return lpvMem; -}

1 0

[cgutman] 51947: [USETUP] - Disable the 1st stage user-mode PnP manager because it is creating incomplete registry keys which is confusing the real user-mode PnP manager and preventing devices inst...
by cgutman＠svn.reactos.org 27 May '11

27 May '11

Author: cgutman Date: Fri May 27 03:40:22 2011 New Revision: 51947 URL: http://svn.reactos.org/svn/reactos?rev=51947&view=rev Log: [USETUP] - Disable the 1st stage user-mode PnP manager because it is creating incomplete registry keys which is confusing the real user-mode PnP manager and preventing devices installed in 1st stage from appearing in device manager - Fixes displaying PCI bus controllers in device manager - I need to discuss with Herve what should be done with this code Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri May 27 03:40:22 2011 @@ -3776,10 +3776,14 @@ INPUT_RECORD Ir; PAGE_NUMBER Page; LARGE_INTEGER Time; - NTSTATUS Status; +// NTSTATUS Status; NtQuerySystemTime(&Time); +#if 0 /* This minimal PnP implementation causes problems because it writes + * half complete registry entries which cause devices installed by this + * method (PCI) to be improperly installed and not recognized by device manager + */ Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, @@ -3791,6 +3795,7 @@ &hPnpThread, NULL); if (!NT_SUCCESS(Status)) +#endif hPnpThread = INVALID_HANDLE_VALUE; if (!CONSOLE_Init())

1 0

[cgutman] 51946: [NTOSKRNL] - Quick fix for the crash loading boot-time legacy drivers - More device node flag state fixes coming soon
by cgutman＠svn.reactos.org 27 May '11

27 May '11

Author: cgutman Date: Fri May 27 02:11:05 2011 New Revision: 51946 URL: http://svn.reactos.org/svn/reactos?rev=51946&view=rev Log: [NTOSKRNL] - Quick fix for the crash loading boot-time legacy drivers - More device node flag state fixes coming soon Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri May 27 02:11:05 2011 @@ -327,6 +327,12 @@ HANDLE InstanceHandle = INVALID_HANDLE_VALUE, ControlHandle = INVALID_HANDLE_VALUE; UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; + + if (((DeviceNode->Flags & DNF_STARTED) && !(DeviceNode->Flags & DNF_HAS_PROBLEM)) || + (DeviceNode->Flags & DNF_START_REQUEST_PENDING)) + { + return STATUS_SUCCESS; + } Status = IopAssignDeviceResources(DeviceNode); if (!NT_SUCCESS(Status))

1 0

[jimtabor] 51945: [Win32k|User32] - Remove NtUserGetLastInputInfo.
by jimtabor＠svn.reactos.org 27 May '11

27 May '11

Author: jimtabor Date: Fri May 27 01:36:41 2011 New Revision: 51945 URL: http://svn.reactos.org/svn/reactos?rev=51945&view=rev Log: [Win32k|User32] - Remove NtUserGetLastInputInfo. Modified: trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db trunk/reactos/subsystems/win32/win32k/w32ksvc.h Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Fri May 27 01:36:41 2011 @@ -181,7 +181,6 @@ return NtUserGetKeyNameText( lParam, lpString, nSize ); } - /* * @implemented */ @@ -190,7 +189,6 @@ { return (SHORT) NtUserGetKeyState((DWORD) nVirtKey); } - /* * @implemented @@ -225,16 +223,23 @@ return (int)NtUserCallOneParam((DWORD_PTR) nTypeFlag, ONEPARAM_ROUTINE_GETKEYBOARDTYPE); } - /* * @implemented */ BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO plii) { - return NtUserGetLastInputInfo(plii); -} - + TRACE("%p\n", plii); + + if (plii->cbSize != sizeof (*plii) ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + plii->dwTime = gpsi->dwLastRITEventTickCount; + return TRUE; +} /* * @implemented @@ -247,7 +252,6 @@ strtoul(pwszKLID, NULL, 16), Flags); } - /* * @implemented @@ -263,7 +267,6 @@ Flags); } - /* * @implemented */ @@ -273,7 +276,6 @@ { return MapVirtualKeyExA( uCode, uMapType, GetKeyboardLayout( 0 ) ); } - /* * @implemented Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Fri May 27 01:36:41 2011 @@ -3161,11 +3161,6 @@ BOOL NTAPI -NtUserGetLastInputInfo( - PLASTINPUTINFO plii); - -BOOL -NTAPI NtUserGetMinMaxInfo( HWND hwnd, MINMAXINFO *MinMaxInfo, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Fri May 27 01:36:41 2011 @@ -65,43 +65,10 @@ LARGE_INTEGER TickCount; KeQueryTickCount(&TickCount); LastInputTick = TickCount.u.LowPart * (KeQueryTimeIncrement() / 10000); + if (gpsi) gpsi->dwLastRITEventTickCount = LastInputTick; } return LastInputTick; } - -BOOL -APIENTRY -NtUserGetLastInputInfo(PLASTINPUTINFO plii) -{ - BOOL ret = TRUE; - - UserEnterShared(); - - _SEH2_TRY - { - if (ProbeForReadUint(&plii->cbSize) != sizeof(LASTINPUTINFO)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; - _SEH2_LEAVE; - } - - ProbeForWrite(plii, sizeof(LASTINPUTINFO), sizeof(DWORD)); - - plii->dwTime = IntLastInputTick(FALSE); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - ret = FALSE; - } - _SEH2_END; - - UserLeave(); - - return ret; -} - VOID FASTCALL ProcessMouseInputData(PMOUSE_INPUT_DATA Data, ULONG InputCount) Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Fri May 27 01:36:41 2011 @@ -683,7 +683,6 @@ # NtUserBuildMenuItemList 4 NtUserGetMenuDefaultItem 3 -NtUserGetLastInputInfo 1 NtUserGetMinMaxInfo 3 NtUserGetMonitorInfo 2 NtUserMenuInfo 3 Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] Fri May 27 01:36:41 2011 @@ -683,7 +683,6 @@ SVC_(UserBuildMenuItemList, 4) SVC_(UserGetMenuDefaultItem, 3) -SVC_(UserGetLastInputInfo, 1) SVC_(UserGetMinMaxInfo, 3) SVC_(UserGetMonitorInfo, 2) SVC_(UserMenuInfo, 3)

1 0

[cgutman] 51944: [NTOSKRNL] - Implement IoInvalidateDeviceState
by cgutman＠svn.reactos.org 26 May '11

26 May '11

Author: cgutman Date: Thu May 26 22:49:27 2011 New Revision: 51944 URL: http://svn.reactos.org/svn/reactos?rev=51944&view=rev Log: [NTOSKRNL] - Implement IoInvalidateDeviceState Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu May 26 22:49:27 2011 @@ -168,6 +168,20 @@ return IopSynchronousCall(DeviceObject, &Stack, &Dummy); } +NTSTATUS +NTAPI +IopQueryStopDevice(IN PDEVICE_OBJECT DeviceObject) +{ + IO_STACK_LOCATION Stack; + PVOID Dummy; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_QUERY_STOP_DEVICE; + + return IopSynchronousCall(DeviceObject, &Stack, &Dummy); +} + VOID NTAPI IopSendRemoveDevice(IN PDEVICE_OBJECT DeviceObject) @@ -180,6 +194,21 @@ Stack.MinorFunction = IRP_MN_REMOVE_DEVICE; /* Drivers should never fail a IRP_MN_REMOVE_DEVICE request */ + IopSynchronousCall(DeviceObject, &Stack, &Dummy); +} + +VOID +NTAPI +IopSendStopDevice(IN PDEVICE_OBJECT DeviceObject) +{ + IO_STACK_LOCATION Stack; + PVOID Dummy; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_STOP_DEVICE; + + /* Drivers should never fail a IRP_MN_STOP_DEVICE request */ IopSynchronousCall(DeviceObject, &Stack, &Dummy); } @@ -298,12 +327,6 @@ HANDLE InstanceHandle = INVALID_HANDLE_VALUE, ControlHandle = INVALID_HANDLE_VALUE; UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; - - if (DeviceNode->Flags & (DNF_STARTED | DNF_START_REQUEST_PENDING)) - { - /* Nothing to do here */ - return STATUS_SUCCESS; - } Status = IopAssignDeviceResources(DeviceNode); if (!NT_SUCCESS(Status)) @@ -3551,13 +3574,93 @@ } /* - * @unimplemented + * @implemented */ VOID NTAPI IoInvalidateDeviceState(IN PDEVICE_OBJECT PhysicalDeviceObject) { - UNIMPLEMENTED; + PDEVICE_NODE DeviceNode = IopGetDeviceNode(PhysicalDeviceObject); + IO_STACK_LOCATION Stack; + ULONG PnPFlags; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_QUERY_PNP_DEVICE_STATE; + + Status = IopSynchronousCall(PhysicalDeviceObject, &Stack, (PVOID*)&PnPFlags); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IRP_MN_QUERY_PNP_DEVICE_STATE failed with status 0x%x\n", Status); + return; + } + + if ((PnPFlags & PNP_DEVICE_REMOVED) || + ((PnPFlags & PNP_DEVICE_FAILED) && !(PnPFlags & PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED))) + { + /* Surprise removal */ + + IopSendSurpriseRemoval(PhysicalDeviceObject); + + /* Tell the user-mode PnP manager that a device was removed */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_SURPRISE_REMOVAL, + &DeviceNode->InstancePath); + + IopSendRemoveDevice(PhysicalDeviceObject); + } + else if ((PnPFlags & PNP_DEVICE_FAILED) && (PnPFlags & PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED)) + { + /* Stop for resource rebalance */ + + if (NT_SUCCESS(IopQueryStopDevice(PhysicalDeviceObject))) + { + IopSendStopDevice(PhysicalDeviceObject); + } + } + + /* Resource rebalance */ + if (PnPFlags & PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED) + { + DPRINT("Sending IRP_MN_QUERY_RESOURCES to device stack\n"); + + Status = IopInitiatePnpIrp(PhysicalDeviceObject, + &IoStatusBlock, + IRP_MN_QUERY_RESOURCES, + NULL); + if (NT_SUCCESS(Status) && IoStatusBlock.Information) + { + DeviceNode->BootResources = + (PCM_RESOURCE_LIST)IoStatusBlock.Information; + IopDeviceNodeSetFlag(DeviceNode, DNF_HAS_BOOT_CONFIG); + } + else + { + DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status); + DeviceNode->BootResources = NULL; + } + + DPRINT("Sending IRP_MN_QUERY_RESOURCE_REQUIREMENTS to device stack\n"); + + Status = IopInitiatePnpIrp(PhysicalDeviceObject, + &IoStatusBlock, + IRP_MN_QUERY_RESOURCE_REQUIREMENTS, + NULL); + if (NT_SUCCESS(Status)) + { + DeviceNode->ResourceRequirements = + (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information; + } + else + { + DPRINT("IopInitiatePnpIrp() failed (Status %08lx)\n", Status); + DeviceNode->ResourceRequirements = NULL; + } + + /* IRP_MN_FILTER_RESOURCE_REQUIREMENTS is called indirectly by IopStartDevice */ + IopStartDevice(DeviceNode); + } } /**

1 0

[rharabien] 51943: [HAL] - Use ExFreePoolWithTag instead of ExFreePool - Add definitions of used tags
by rharabien＠svn.reactos.org 26 May '11

26 May '11

Author: rharabien Date: Thu May 26 22:22:37 2011 New Revision: 51943 URL: http://svn.reactos.org/svn/reactos?rev=51943&view=rev Log: [HAL] - Use ExFreePoolWithTag instead of ExFreePool - Add definitions of used tags Modified: trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c trunk/reactos/hal/halx86/generic/legacy/bussupp.c trunk/reactos/hal/halx86/include/hal.h Modified: trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c [iso-8859-1] Thu May 26 22:22:37 2011 @@ -36,7 +36,7 @@ /* Allocate the array */ Array = ExAllocatePoolWithTag(NonPagedPool, Size, - 'BusH'); + TAG_BUS_HANDLER); if (!Array) KeBugCheckEx(HAL_MEMORY_ALLOCATION, Size, 0, (ULONG_PTR)__FILE__, __LINE__); /* Initialize it */ @@ -263,7 +263,7 @@ /* Allocate the bus handler */ Bus = ExAllocatePoolWithTag(NonPagedPool, sizeof(HAL_BUS_HANDLER) + ExtraData, - 'HsuB'); + TAG_BUS_HANDLER); if (!Bus) return STATUS_INSUFFICIENT_RESOURCES; /* Return the handler */ @@ -404,11 +404,11 @@ //MmUnlockPagableImageSection(CodeHandle); /* Free all allocations */ - if (Bus) ExFreePool(Bus); - if (InterfaceArray) ExFreePool(InterfaceArray); - if (InterfaceBusNumberArray) ExFreePool(InterfaceBusNumberArray); - if (ConfigArray) ExFreePool(ConfigArray); - if (ConfigBusNumberArray) ExFreePool(ConfigBusNumberArray); + if (Bus) ExFreePoolWithTag(Bus, TAG_BUS_HANDLER); + if (InterfaceArray) ExFreePoolWithTag(InterfaceArray, TAG_BUS_HANDLER); + if (InterfaceBusNumberArray) ExFreePoolWithTag(InterfaceBusNumberArray, TAG_BUS_HANDLER); + if (ConfigArray) ExFreePoolWithTag(ConfigArray, TAG_BUS_HANDLER); + if (ConfigBusNumberArray) ExFreePoolWithTag(ConfigBusNumberArray, TAG_BUS_HANDLER); /* And we're done */ return Status; Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] Thu May 26 22:22:37 2011 @@ -572,7 +572,7 @@ if (PciData.VendorID == PCI_INVALID_VENDORID) return STATUS_UNSUCCESSFUL; /* Allocate the supported range structure */ - *Range = ExAllocatePoolWithTag(PagedPool, sizeof(SUPPORTED_RANGE), 'Hal '); + *Range = ExAllocatePoolWithTag(PagedPool, sizeof(SUPPORTED_RANGE), TAG_HAL); if (!*Range) return STATUS_INSUFFICIENT_RESOURCES; /* Set it up */ @@ -766,7 +766,7 @@ PagedPool, sizeof(CM_RESOURCE_LIST) + (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), - ' laH'); + TAG_HAL); if (NULL == *AllocatedResources) return STATUS_NO_MEMORY; @@ -1015,7 +1015,7 @@ sizeof(PCI_REGISTRY_INFO_INTERNAL) + (KeyInformation.Values * sizeof(PCI_CARD_DESCRIPTOR)), - ' laH'); + TAG_HAL); if (PciRegistryInfo) { /* Get the first card descriptor entry */ @@ -1069,7 +1069,7 @@ /* Just allocate the basic structure then */ PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(PCI_REGISTRY_INFO_INTERNAL), - ' laH'); + TAG_HAL); if (!PciRegistryInfo) return NULL; } @@ -1119,7 +1119,7 @@ MaxPciBusNumber = PciRegistryInfo->NoBuses - 1; /* Free the info structure */ - ExFreePool(PciRegistryInfo); + ExFreePoolWithTag(PciRegistryInfo, TAG_HAL); } /* Initialize the PCI lock */ Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Thu May 26 22:22:37 2011 @@ -1096,7 +1096,7 @@ HalpGetNMICrashFlag(); /* Free the registry data */ - ExFreePool(PciRegistryInfo); + ExFreePoolWithTag(PciRegistryInfo, TAG_HAL); /* Tell PnP if this hard supports correct decoding */ HalpMarkChipsetDecode(ExtendedAddressDecoding); @@ -1256,7 +1256,7 @@ Handler = HalReferenceHandlerForBus(InterfaceType, BusNumber); if (!(Handler) || !(Handler->TranslateBusAddress)) { - DPRINT1("No translator!\n"); + DPRINT1("No translator Interface: %x, Bus: %x, Handler: %x!\n", InterfaceType, BusNumber, Handler); return FALSE; } Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Thu May 26 22:22:37 2011 @@ -45,6 +45,9 @@ #include "internal/i386/intrin_i.h" #endif +#define TAG_HAL ' laH' +#define TAG_BUS_HANDLER 'BusH' + /* Internal HAL Headers */ #include "apic.h" #include "bus.h"

1 0

[cgutman] 51942: [NTOSKRNL] - Implement the kernel backend of graceful device removal/ejection
by cgutman＠svn.reactos.org 26 May '11

26 May '11

Author: cgutman Date: Thu May 26 22:09:02 2011 New Revision: 51942 URL: http://svn.reactos.org/svn/reactos?rev=51942&view=rev Log: [NTOSKRNL] - Implement the kernel backend of graceful device removal/ejection Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu May 26 22:09:02 2011 @@ -125,6 +125,20 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +IopSendEject(IN PDEVICE_OBJECT DeviceObject) +{ + IO_STACK_LOCATION Stack; + PVOID Dummy; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_EJECT; + + return IopSynchronousCall(DeviceObject, &Stack, &Dummy); +} + VOID NTAPI IopSendSurpriseRemoval(IN PDEVICE_OBJECT DeviceObject) @@ -138,6 +152,20 @@ /* Drivers should never fail a IRP_MN_SURPRISE_REMOVAL request */ IopSynchronousCall(DeviceObject, &Stack, &Dummy); +} + +NTSTATUS +NTAPI +IopQueryRemoveDevice(IN PDEVICE_OBJECT DeviceObject) +{ + IO_STACK_LOCATION Stack; + PVOID Dummy; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_QUERY_REMOVE_DEVICE; + + return IopSynchronousCall(DeviceObject, &Stack, &Dummy); } VOID @@ -3687,14 +3715,221 @@ return Status; } +NTSTATUS +NTAPI +IopPrepareDeviceForRemoval(IN PDEVICE_OBJECT DeviceObject) +{ + PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); + IO_STACK_LOCATION Stack; + IO_STATUS_BLOCK IoStatusBlock; + PDEVICE_RELATIONS DeviceRelations; + NTSTATUS Status; + ULONG i; + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, + &DeviceNode->InstancePath); + + if (IopQueryRemoveDevice(DeviceObject) != STATUS_SUCCESS) + { + DPRINT1("Removal vetoed by failing the query remove request\n"); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVAL_VETOED, + &DeviceNode->InstancePath); + + return STATUS_UNSUCCESSFUL; + } + + Stack.Parameters.QueryDeviceRelations.Type = RemovalRelations; + + Status = IopInitiatePnpIrp(DeviceObject, + &IoStatusBlock, + IRP_MN_QUERY_DEVICE_RELATIONS, + &Stack); + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + { + DPRINT("IopInitiatePnpIrp() failed with status 0x%08lx\n", Status); + return Status; + } + + DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; + + if (DeviceRelations) + { + for (i = 0; i < DeviceRelations->Count; i++) + { + PDEVICE_NODE RelationsDeviceNode = IopGetDeviceNode(DeviceRelations->Objects[i]); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, + &RelationsDeviceNode->InstancePath); + + if (IopQueryRemoveDevice(DeviceRelations->Objects[i]) != STATUS_SUCCESS) + { + DPRINT1("Device removal vetoed by failing a dependent query remove request\n"); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVAL_VETOED, + &RelationsDeviceNode->InstancePath); + + Status = STATUS_UNSUCCESSFUL; + + goto cleanup; + } + else + { + IopSendRemoveDevice(DeviceRelations->Objects[i]); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_SAFE_REMOVAL, + &RelationsDeviceNode->InstancePath); + + ObDereferenceObject(DeviceRelations->Objects[i]); + + DeviceRelations->Objects[i] = NULL; + } + } + + ExFreePool(DeviceRelations); + + DeviceRelations = NULL; + } + + Status = STATUS_SUCCESS; + +cleanup: + if (DeviceRelations) + { + for (i = 0; i < DeviceRelations->Count; i++) + { + if (DeviceRelations->Objects[i]) + { + ObDereferenceObject(DeviceRelations->Objects[i]); + } + } + + ExFreePool(DeviceRelations); + } + + return Status; +} + /* - * @unimplemented + * @implemented */ VOID NTAPI IoRequestDeviceEject(IN PDEVICE_OBJECT PhysicalDeviceObject) { - UNIMPLEMENTED; + PDEVICE_NODE DeviceNode = IopGetDeviceNode(PhysicalDeviceObject); + PDEVICE_RELATIONS DeviceRelations; + IO_STATUS_BLOCK IoStatusBlock; + IO_STACK_LOCATION Stack; + DEVICE_CAPABILITIES Capabilities; + NTSTATUS Status; + ULONG i; + + IopQueueTargetDeviceEvent(&GUID_DEVICE_KERNEL_INITIATED_EJECT, + &DeviceNode->InstancePath); + + if (IopQueryDeviceCapabilities(DeviceNode, &Capabilities) != STATUS_SUCCESS) + { + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, + &DeviceNode->InstancePath); + return; + } + + Stack.Parameters.QueryDeviceRelations.Type = EjectionRelations; + + Status = IopInitiatePnpIrp(PhysicalDeviceObject, + &IoStatusBlock, + IRP_MN_QUERY_DEVICE_RELATIONS, + &Stack); + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + { + DPRINT("IopInitiatePnpIrp() failed with status 0x%08lx\n", Status); + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, + &DeviceNode->InstancePath); + return; + } + + DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; + + if (DeviceRelations) + { + for (i = 0; i < DeviceRelations->Count; i++) + { + PDEVICE_NODE RelationsDeviceNode = IopGetDeviceNode(DeviceRelations->Objects[i]); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, + &RelationsDeviceNode->InstancePath); + + if (IopQueryRemoveDevice(DeviceRelations->Objects[i]) != STATUS_SUCCESS) + { + DPRINT1("Device removal vetoed by failing a query remove request (ejection relations)\n"); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVAL_VETOED, + &RelationsDeviceNode->InstancePath); + + goto cleanup; + } + else + { + IopSendRemoveDevice(DeviceRelations->Objects[i]); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_SAFE_REMOVAL, + &RelationsDeviceNode->InstancePath); + + ObDereferenceObject(DeviceRelations->Objects[i]); + + DeviceRelations->Objects[i] = NULL; + } + } + + ExFreePool(DeviceRelations); + + DeviceRelations = NULL; + } + + if (IopPrepareDeviceForRemoval(PhysicalDeviceObject) != STATUS_SUCCESS) + { + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, + &DeviceNode->InstancePath); + return; + } + + if (Capabilities.EjectSupported) + { + if (IopSendEject(PhysicalDeviceObject) != STATUS_SUCCESS) + { + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, + &DeviceNode->InstancePath); + + return; + } + } + else + { + DeviceNode->Flags |= DNF_DISABLED; + } + +cleanup: + if (DeviceRelations) + { + for (i = 0; i < DeviceRelations->Count; i++) + { + if (DeviceRelations->Objects[i]) + { + ObDereferenceObject(DeviceRelations->Objects[i]); + } + } + + ExFreePool(DeviceRelations); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, + &DeviceNode->InstancePath); + } + else + { + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT, + &DeviceNode->InstancePath); + } } /*

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
52
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 May 2011