Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[fireball] 22785: Mikhail Zvyozdochkin: Fix compiling on linux (adding missing headers inclusion)

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jul 3 02:03:40 2006 New Revision: 22785 URL: http://svn.reactos.org/svn/reactos?rev=22785&view=rev Log: Mikhail Zvyozdochkin: Fix compiling on linux (adding missing headers inclusion) Modified: trunk/reactos/tools/rbuild/pch.h trunk/reactos/tools/ssprintf.cpp Modified: trunk/reactos/tools/rbuild/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/pch.h?rev=227… ============================================================================== --- trunk/reactos/tools/rbuild/pch.h (original) +++ trunk/reactos/tools/rbuild/pch.h Mon Jul 3 02:03:40 2006 @@ -32,6 +32,8 @@ #ifndef MAX_PATH #define MAX_PATH _MAX_PATH #endif//MAX_PATH +#else +#include <unistd.h> #endif//WIN32 #include <stdarg.h> Modified: trunk/reactos/tools/ssprintf.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ssprintf.cpp?rev=227… ============================================================================== --- trunk/reactos/tools/ssprintf.cpp (original) +++ trunk/reactos/tools/ssprintf.cpp Mon Jul 3 02:03:40 2006 @@ -25,6 +25,7 @@ #include "ssprintf.h" #ifndef WIN32 +#include <ctype.h> #define _finite __finite #define _isnan __isnan inline int iswdigit ( wchar_t c )

18 years, 5 months

[fireball] 22784: Mikhail Zvyozdochkin: Fix compiling on linux (adding proper include path for halxbox)

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jul 3 01:59:04 2006 New Revision: 22784 URL: http://svn.reactos.org/svn/reactos?rev=22784&view=rev Log: Mikhail Zvyozdochkin: Fix compiling on linux (adding proper include path for halxbox) Modified: trunk/reactos/hal/halx86/xbox/halxbox.rbuild Modified: trunk/reactos/hal/halx86/xbox/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halxbox.rb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/halxbox.rbuild (original) +++ trunk/reactos/hal/halx86/xbox/halxbox.rbuild Mon Jul 3 01:59:04 2006 @@ -1,6 +1,7 @@ <module name="halxbox" type="kernelmodedll" allowwarnings="true"> <importlibrary definition="../../hal/hal.def" /> <include base="hal_generic">../include</include> + <include base="halxbox">.</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="UP" />

18 years, 5 months

[hpoussin] 22783: Implement make command

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Jul 3 01:58:24 2006 New Revision: 22783 URL: http://svn.reactos.org/svn/reactos?rev=22783&view=rev Log: Implement make command Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=22783&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Mon Jul 3 01:58:24 2006 @@ -9,6 +9,7 @@ IF "%1" == "createrbuild" GOTO createrbuild IF "%1" == "link" GOTO link IF "%1" == "merge" GOTO merge +IF "%1" == "make" GOTO make IF "%1" == "fullprocessing" GOTO fullprocessing :help @@ -17,6 +18,7 @@ ECHO %0 createrbuild {wine_lib} [{wine_lib} ...] ECHO %0 link {path_to_reactos} {wine_lib} ECHO %0 merge {path_to_reactos} {wine_lib} [{wine_lib} ...] +ECHO %0 make {path_to_reactos} {wine_lib} [{wine_lib} ...] ECHO %0 fullprocessing {path_to_reactos} {wine_lib} [{wine_lib} ...] GOTO :eof @@ -162,6 +164,26 @@ ECHO http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 GOTO :eof +:make +SETLOCAL ENABLEEXTENSIONS +IF "%3" == "" GOTO help +IF NOT EXIST "%2\ReactOS.rbuild" ( + ECHO %2\ReactOS.rbuild doesn't exit. + GOTO :help +) +SET WINE_LIST= +SET WINE_ROS_DIR=%2 +:make_filllist +SHIFT +IF "%2" == "" GOTO make_doit +SET WINE_LIST=%WINE_LIST% %2 +GOTO make_filllist +:make_doit +PUSHD "%WINE_ROS_DIR%" +make.exe %WINE_LIST% +POPD +GOTO :eof + :fullprocessing SETLOCAL ENABLEEXTENSIONS IF "%3" == "" GOTO help @@ -182,9 +204,7 @@ CALL :merge merge "%WINE_ROS_DIR%" %WINE_LIST% IF ERRORLEVEL 1 GOTO :eof IF EXIST "%WINE_ROS_DIR%\makefile.auto" DEL "%WINE_ROS_DIR%\makefile.auto" -PUSHD "%WINE_ROS_DIR%" -make.exe %WINE_LIST% -POPD +CALL :make make "%WINE_ROS_DIR%" %WINE_LIST% IF ERRORLEVEL 1 GOTO :eof ECHO Compilation successful. You should try to run ReactOS to see if ECHO no visible regressions appeared before committing the changes.

18 years, 5 months

[hpoussin] 22782: Delete now useless code

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Jul 3 01:35:31 2006 New Revision: 22782 URL: http://svn.reactos.org/svn/reactos?rev=22782&view=rev Log: Delete now useless code Removed: trunk/reactos/dll/win32/lzexpand/

18 years, 5 months

[hpoussin] 22781: Delete now useless code

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Jul 3 01:35:06 2006 New Revision: 22781 URL: http://svn.reactos.org/svn/reactos?rev=22781&view=rev Log: Delete now useless code Removed: trunk/reactos/dll/win32/richedit/

18 years, 5 months

[hpoussin] 22780: Rename richedit to riched32 and lzexpand to lz32

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Jul 3 01:33:02 2006 New Revision: 22780 URL: http://svn.reactos.org/svn/reactos?rev=22780&view=rev Log: Rename richedit to riched32 and lzexpand to lz32 Added: trunk/reactos/dll/win32/lz32/ - copied from r22778, trunk/reactos/dll/win32/lzexpand/ trunk/reactos/dll/win32/riched32/ - copied from r22778, trunk/reactos/dll/win32/richedit/ Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Mon Jul 3 01:33:02 2006 @@ -166,7 +166,7 @@ dll\win32\iphlpapi\iphlpapi.dll 1 dll\win32\kernel32\kernel32.dll 1 dll\win32\lsasrv\lsasrv.dll 1 -dll\win32\lzexpand\lz32.dll 1 +dll\win32\lz32\lz32.dll 1 dll\win32\mapi32\mapi32.dll 1 dll\win32\winmm\midimap\midimap.dll 1 dll\win32\mmdrv\mmdrv.dll 1 @@ -194,7 +194,7 @@ dll\win32\psapi\psapi.dll 1 dll\win32\powrprof\powrprof.dll 1 dll\win32\riched20\riched20.dll 1 -dll\win32\richedit\riched32.dll 1 +dll\win32\riched32\riched32.dll 1 dll\win32\rpcrt4\rpcrt4.dll 1 dll\win32\samlib\samlib.dll 1 dll\win32\samsrv\samsrv.dll 1 Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Mon Jul 3 01:33:02 2006 @@ -91,8 +91,8 @@ <directory name="lsasrv"> <xi:include href="lsasrv/lsasrv.rbuild" /> </directory> -<directory name="lzexpand"> - <xi:include href="lzexpand/lz32.rbuild" /> +<directory name="lz32"> + <xi:include href="lz32/lz32.rbuild" /> </directory> <directory name="mapi32"> <xi:include href="mapi32/mapi32.rbuild" /> @@ -172,8 +172,8 @@ <directory name="riched20"> <xi:include href="riched20/riched20.rbuild" /> </directory> -<directory name="richedit"> - <xi:include href="richedit/riched32.rbuild" /> +<directory name="riched32"> + <xi:include href="riched32/riched32.rbuild" /> </directory> <directory name="rpcrt4"> <xi:include href="rpcrt4/rpcrt4.rbuild" />

18 years, 5 months

[hpoussin] 22779: Misc fixes/changes due to Fireball feedback

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Jul 3 00:39:38 2006 New Revision: 22779 URL: http://svn.reactos.org/svn/reactos?rev=22779&view=rev Log: Misc fixes/changes due to Fireball feedback Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=22779&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Mon Jul 3 00:39:38 2006 @@ -6,7 +6,7 @@ IF "%1" == "" GOTO help IF "%1" == "download" GOTO download -IF "%1" == "process" GOTO process +IF "%1" == "createrbuild" GOTO createrbuild IF "%1" == "link" GOTO link IF "%1" == "merge" GOTO merge IF "%1" == "fullprocessing" GOTO fullprocessing @@ -14,7 +14,7 @@ :help ECHO Syntax: ECHO %0 download {wine_lib} [{wine_lib} ...] -ECHO %0 process {wine_lib} [{wine_lib} ...] +ECHO %0 createrbuild {wine_lib} [{wine_lib} ...] ECHO %0 link {path_to_reactos} {wine_lib} ECHO %0 merge {path_to_reactos} {wine_lib} [{wine_lib} ...] ECHO %0 fullprocessing {path_to_reactos} {wine_lib} [{wine_lib} ...] @@ -37,15 +37,15 @@ >NUL 2>NUL cvs.exe logout GOTO :eof -:process +:createrbuild SETLOCAL ENABLEEXTENSIONS SETLOCAL ENABLEDELAYEDEXPANSION SET WINE_BATCH=%0 IF "%2" == "" GOTO help -:startprocess +:startcreaterbuild IF NOT EXIST wine\dlls\%2\makefile.in ( ECHO WARNING: Did you forget "%WINE_BATCH% download %2"? - GOTO :processnext + GOTO :createrbuildnext ) SET WINE_LOWER=abcdefghijklmnopqrstuvwxyz0123456789 @@ -83,9 +83,9 @@ ECHO ^<file^>%2.spec^</file^> ECHO ^</module^> -:processnext -SHIFT -IF NOT "%2" == "" GOTO startprocess +:createrbuildnext +SHIFT +IF NOT "%2" == "" GOTO startcreaterbuild DEL %WINE_TMPFILE1% GOTO :eof @@ -103,7 +103,7 @@ ) IF NOT EXIST "wine\dlls\%3\%3.rbuild" ( ECHO wine\dlls\%3.rbuild doesn't exist. - ECHO Did you forget "%WINE_BATCH% process %3 >wine\dlls\%3\%3.rbuild"? + ECHO Did you forget "%WINE_BATCH% createrbuild %3 >wine\dlls\%3\%3.rbuild"? GOTO :eof ) >NUL 2>NUL junction.exe "%2\dll\win32\%3.wine" "wine\dlls\%3" @@ -124,6 +124,7 @@ SHIFT IF "%2" == "" GOTO :eof IF NOT EXIST "wine\dlls\%2" GOTO :mergenext +ATTRIB -R "%WINE_ROS_DIR%\dll\win32\%2\*" >NUL COPY /Y "wine\dlls\%2\*.*" "%WINE_ROS_DIR%\dll\win32\%2" >NUL FOR /F "delims=" %%f IN ('DIR /B "%WINE_ROS_DIR%\dll\win32\%2\*.*"') DO ( IF "%%f" == ".cvsignore" ( @@ -175,9 +176,8 @@ CALL :download download%WINE_LIST% IF ERRORLEVEL 1 GOTO :eof FOR %%m IN (%WINE_LIST%) DO ( - >wine\dlls\%%m\%%m.rbuild CALL :process process %%m - CALL :link link "%WINE_ROS_DIR%" %%m - IF ERRORLEVEL 1 GOTO :eof + >wine\dlls\%%m\%%m.rbuild CALL :createrbuild createrbuild %%m + >NUL CALL :link link "%WINE_ROS_DIR%" %%m ) CALL :merge merge "%WINE_ROS_DIR%" %WINE_LIST% IF ERRORLEVEL 1 GOTO :eof @@ -185,6 +185,9 @@ PUSHD "%WINE_ROS_DIR%" make.exe %WINE_LIST% POPD +IF ERRORLEVEL 1 GOTO :eof +ECHO Compilation successful. You should try to run ReactOS to see if +ECHO no visible regressions appeared before committing the changes. GOTO :eof :internal_analyseline

18 years, 5 months

[hpoussin] 22778: Don't let the user write the password, as it can be part of CVSROOT

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Jul 2 23:57:19 2006 New Revision: 22778 URL: http://svn.reactos.org/svn/reactos?rev=22778&view=rev Log: Don't let the user write the password, as it can be part of CVSROOT Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=22778&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Sun Jul 2 23:57:19 2006 @@ -22,9 +22,8 @@ :download IF "%2" == "" GOTO help -SET CVSROOT=:pserver:cvs@cvs.winehq.org:/home/wine -ECHO *** Password is "cvs" *** -cvs.exe login +SET CVSROOT=:pserver:cvs:cvs@cvs.winehq.org:/home/wine +cvs.exe login >NUL IF ERRORLEVEL 2 ( ECHO Error when executing cvs.exe. Try to download the lastest version at ECHO http://ftp.gnu.org/non-gnu/cvs/binary/stable/x86-woe/

18 years, 5 months

[ekohl] 22777: Implement CM_Open_DevNode_Key and add CM_Open_DevNode_Key_Ex stub.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 2 23:20:45 2006 New Revision: 22777 URL: http://svn.reactos.org/svn/reactos?rev=22777&view=rev Log: Implement CM_Open_DevNode_Key and add CM_Open_DevNode_Key_Ex stub. Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/include/ddk/cfgmgr32.h trunk/reactos/include/reactos/wine/cfgmgr32.h Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Sun Jul 2 23:20:45 2006 @@ -159,8 +159,8 @@ CM_Open_Class_KeyW(a)24=SETUPAPI.CM_Open_Class_KeyW CM_Open_Class_Key_ExA(a)28=SETUPAPI.CM_Open_Class_Key_ExA CM_Open_Class_Key_ExW(a)28=SETUPAPI.CM_Open_Class_Key_ExW -;CM_Open_DevNode_Key -;CM_Open_DevNode_Key_Ex +CM_Open_DevNode_Key(a)24=SETUPAPI.CM_Open_DevNode_Key +CM_Open_DevNode_Key_Ex(a)28=SETUPAPI.CM_Open_DevNode_Key_Ex ;CM_Query_Arbitrator_Free_Data ;CM_Query_Arbitrator_Free_Data_Ex ;CM_Query_Arbitrator_Free_Size Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Sun Jul 2 23:20:45 2006 @@ -2478,6 +2478,35 @@ } return CR_SUCCESS; +} + + +/*********************************************************************** + * CM_Open_DevNode_Key [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Open_DevNode_Key( + DEVINST dnDevNode, REGSAM samDesired, ULONG ulHardwareProfile, + REGDISPOSITION Disposition, PHKEY phkDevice, ULONG ulFlags) +{ + TRACE("%lx %lx %lu %lx %p %lx\n", dnDevNode, samDesired, + ulHardwareProfile, Disposition, phkDevice, ulFlags); + return CM_Open_DevNode_Key_Ex(dnDevNode, samDesired, ulHardwareProfile, + Disposition, phkDevice, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Open_DevNode_Key_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Open_DevNode_Key_Ex( + DEVINST dnDevNode, REGSAM samDesired, ULONG ulHardwareProfile, + REGDISPOSITION Disposition, PHKEY phkDevice, ULONG ulFlags, + HMACHINE hMachine) +{ + FIXME("%lx %lx %lu %lx %p %lx %lx\n", dnDevNode, samDesired, + ulHardwareProfile, Disposition, phkDevice, ulFlags, hMachine); + + return CR_CALL_NOT_IMPLEMENTED; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Sun Jul 2 23:20:45 2006 @@ -143,8 +143,8 @@ @ stdcall CM_Open_Class_KeyW(ptr wstr long long ptr long) @ stdcall CM_Open_Class_Key_ExA(ptr str long long ptr long long) @ stdcall CM_Open_Class_Key_ExW(ptr wstr long long ptr long long) -@ stub CM_Open_DevNode_Key -@ stub CM_Open_DevNode_Key_Ex +@ stdcall CM_Open_DevNode_Key(ptr long long long ptr long) +@ stdcall CM_Open_DevNode_Key_Ex(ptr long long long ptr long long) @ stub CM_Query_Arbitrator_Free_Data @ stub CM_Query_Arbitrator_Free_Data_Ex @ stub CM_Query_Arbitrator_Free_Size Modified: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… ============================================================================== --- trunk/reactos/include/ddk/cfgmgr32.h (original) +++ trunk/reactos/include/ddk/cfgmgr32.h Sun Jul 2 23:20:45 2006 @@ -1804,8 +1804,31 @@ #define CM_Open_Class_Key_Ex CM_Open_Class_Key_ExA #endif /* UNICODE */ -/* FIXME: Obsolete CM_Open_DevNode_Key */ -/* FIXME: Obsolete CM_Open_DevNode_Key_Ex */ +CMAPI +CONFIGRET +WINAPI +CM_Open_DevNode_Key( + IN DEVINST dnDevNode, + IN REGSAM samDesired, + IN ULONG ulHardwareProfile, + IN REGDISPOSITION Disposition, + OUT PHKEY phkDevice, + IN ULONG ulFlags); + +CMAPI +CONFIGRET +WINAPI +CM_Open_DevNode_Key_Ex( + IN DEVINST dnDevNode, + IN REGSAM samDesired, + IN ULONG ulHardwareProfile, + IN REGDISPOSITION Disposition, + OUT PHKEY phkDevice, + IN ULONG ulFlags, + IN HMACHINE hMachine); + +#define CM_Open_DevInst_Key CM_Open_DevNode_Key +#define CM_Open_DevInst_Key_Ex CM_Open_DevNode_Key_Ex /* CM_Query_And_Remove_SubTree.ulFlags constants */ #define CM_REMOVE_UI_OK 0x00000000 Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/cfgmg… ============================================================================== --- trunk/reactos/include/reactos/wine/cfgmgr32.h (original) +++ trunk/reactos/include/reactos/wine/cfgmgr32.h Sun Jul 2 23:20:45 2006 @@ -304,6 +304,8 @@ CONFIGRET WINAPI CM_Open_Class_Key_ExA( LPGUID, LPCSTR, REGSAM, REGDISPOSITION, PHKEY, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Open_Class_Key_ExW( LPGUID, LPCWSTR, REGSAM, REGDISPOSITION, PHKEY, ULONG, HMACHINE ); #define CM_Open_Class_Key_Ex WINELIB_NAME_AW(CM_Open_Class_Key_Ex) +CONFIGRET WINAPI CM_Open_DevNode_Key( DEVINST, REGSAM, ULONG, REGDISPOSITION, PHKEY, ULONG ); +CONFIGRET WINAPI CM_Open_DevNode_Key_Ex( DEVINST, REGSAM, ULONG, REGDISPOSITION, PHKEY, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Reenumerate_DevNode( DEVINST, ULONG ); CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex( DEVINST, ULONG, HMACHINE );

18 years, 5 months

[ion] 22776: - More of the same for NtNotifyChangeDirectoryFile.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 23:11:26 2006 New Revision: 22776 URL: http://svn.reactos.org/svn/reactos?rev=22776&view=rev Log: - More of the same for NtNotifyChangeDirectoryFile. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sun Jul 2 23:11:26 2006 @@ -972,7 +972,7 @@ NTSTATUS NTAPI NtNotifyChangeDirectoryFile(IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, + IN HANDLE EventHandle OPTIONAL, IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, @@ -982,80 +982,109 @@ IN BOOLEAN WatchTree) { PIRP Irp; + PKEVENT Event = NULL; PDEVICE_OBJECT DeviceObject; PFILE_OBJECT FileObject; PIO_STACK_LOCATION IoStack; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN LockedForSync = FALSE; PAGED_CODE(); - if(PreviousMode != KernelMode) - { + /* Check if we're called from user mode */ + if (PreviousMode != KernelMode) + { + /* Enter SEH for probing */ _SEH_TRY { + /* Probe the I/O STatus block */ ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); - if(BufferSize) ProbeForWrite(Buffer, BufferSize, sizeof(ULONG)); + + /* Probe the buffer */ + if (BufferSize) ProbeForWrite(Buffer, BufferSize, sizeof(ULONG)); } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; - } - + /* Check if probing failed */ + if (!NT_SUCCESS(Status)) return Status; + } + + /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, FILE_LIST_DIRECTORY, IoFileObjectType, PreviousMode, - (PVOID *)&FileObject, + (PVOID*)&FileObject, NULL); - if (Status != STATUS_SUCCESS) return(Status); - - DeviceObject = FileObject->DeviceObject; - + if (!NT_SUCCESS(Status)) return Status; + + /* Check if we have an event handle */ + if (EventHandle) + { + /* Reference it */ + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_MODIFY_STATE, + ExEventObjectType, + PreviousMode, + (PVOID *)&Event, + NULL); + if (Status != STATUS_SUCCESS) return Status; + KeClearEvent(Event); + } + + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Lock it */ + IopLockFileObject(FileObject); + LockedForSync = TRUE; + } + + /* Clear File Object event */ + KeClearEvent(&FileObject->Event); + + /* Get the device object */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + + /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) - { - ObDereferenceObject(FileObject); - return STATUS_UNSUCCESSFUL; - } - - if (!Event) Event = &FileObject->Event; - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; + if (!Irp) return IopCleanupFailedIrp(FileObject, Event); + + /* Set up the IRP */ Irp->RequestorMode = PreviousMode; Irp->UserIosb = IoStatusBlock; + Irp->UserEvent = Event; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->UserEvent = Event; - KeResetEvent( Event ); - Irp->UserBuffer = Buffer; + Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; + /* Set up Stack Data */ IoStack = IoGetNextIrpStackLocation(Irp); - IoStack->MajorFunction = IRP_MJ_DIRECTORY_CONTROL; IoStack->MinorFunction = IRP_MN_NOTIFY_CHANGE_DIRECTORY; - IoStack->Flags = 0; - IoStack->Control = 0; - IoStack->DeviceObject = DeviceObject; IoStack->FileObject = FileObject; - if (WatchTree) IoStack->Flags = SL_WATCH_TREE; - + /* Set parameters */ IoStack->Parameters.NotifyDirectory.CompletionFilter = CompletionFilter; IoStack->Parameters.NotifyDirectory.Length = BufferSize; - - Status = IoCallDriver(FileObject->DeviceObject,Irp); - - /* FIXME: Should we wait here or not for synchronously opened files? */ - - return Status; + if (WatchTree) IoStack->Flags = SL_WATCH_TREE; + + /* Perform the call */ + return IopPerformSynchronousRequest(DeviceObject, + Irp, + FileObject, + FALSE, + PreviousMode, + LockedForSync, + IopOtherTransfer); } /*

18 years, 5 months

← Newer
1
...
59
60
61
62
63
64
65
66
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006