Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 22889: - Try to update the CVS working copy instead of checkouting a new one each time - Delete unwanted files in ReactOS working copy
by hpoussin＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: hpoussin Date: Thu Jul 6 15:41:40 2006 New Revision: 22889 URL: http://svn.reactos.org/svn/reactos?rev=22889&view=rev Log: - Try to update the CVS working copy instead of checkouting a new one each time - Delete unwanted files in ReactOS working copy Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=22889&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Thu Jul 6 15:41:40 2006 @@ -32,11 +32,15 @@ ) :startdownload ECHO Downloading %2 ... ->NUL 2>NUL cvs.exe -z 3 checkout wine/dlls/%2 -IF NOT EXIST "wine\dlls\%2\" ( - ECHO Error when downloading %2. Are you sure it does exist? - COLOR 00 - GOTO :eof +IF NOT EXIST "wine\dlls\%2" ( + >NUL 2>NUL cvs.exe -z 3 checkout wine/dlls/%2 + IF NOT EXIST "wine\dlls\%2\" ( + ECHO Error when downloading %2. Are you sure it does exist? + COLOR 00 + GOTO :eof + ) +) ELSE ( + >NUL 2>NUL cvs.exe -z 3 update -PA wine/dlls/%2 ) SHIFT IF NOT "%2" == "" GOTO startdownload @@ -135,14 +139,17 @@ 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" ( + svn.exe delete "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL DEL "%WINE_ROS_DIR%\dll\win32\%2\%%f" ) ELSE IF "%%f" == "Makefile.in" ( + svn.exe delete "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL DEL "%WINE_ROS_DIR%\dll\win32\%2\%%f" ) ELSE IF NOT EXIST "wine\dlls\%2\%%f" ( SET WINE_FILE=%%f IF NOT "!WINE_FILE:~-9!" == "_ros.diff" ( svn.exe delete "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL IF ERRORLEVEL 2 GOTO :helpsvn + IF EXIST "%WINE_ROS_DIR%\dll\win32\%2\%%f" DEL "%WINE_ROS_DIR%\dll\win32\%2\%%f" ) ) ELSE ( svn.exe add "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL

1 0

[winesync] 22888: Update Wine-syncing doc
by winesync＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: winesync Date: Thu Jul 6 15:23:09 2006 New Revision: 22888 URL: http://svn.reactos.org/svn/reactos?rev=22888&view=rev Log: Update Wine-syncing doc Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Thu Jul 6 15:23:09 2006 @@ -38,13 +38,14 @@ The following libraries are shared with Wine. reactos/dll/win32/avifil32 # Synced to Wine-0_9_5 -reactos/dll/win32/cabinet # Synced to Wine-0_9_10 +reactos/dll/win32/cabinet # Autosync reactos/dll/win32/comctl32 # Synced to Wine-0_9_16 reactos/dll/win32/comdlg32 # Synced to Wine-0_9_16 -reactos/dll/win32/crypt32 # Synced to Wine-0_9_10 +reactos/dll/win32/crypt32 # Autosync +reactos/dll/win32/cryptdll # Autosync reactos/dll/win32/dbghelp # reactos/dll/win32/icmp # Synced to Wine-0_9_10 -reactos/dll/win32/imm32 # Synced to Wine-0_9_10 +reactos/dll/win32/imm32 # Autosync reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. reactos/dll/win32/mapi32 # Synced to Wine-0_9_10

1 0

[winesync] 22887: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: winesync Date: Thu Jul 6 15:22:04 2006 New Revision: 22887 URL: http://svn.reactos.org/svn/reactos?rev=22887&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/imm32/imm.c Modified: trunk/reactos/dll/win32/imm32/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm.c (original) +++ trunk/reactos/dll/win32/imm32/imm.c Thu Jul 6 15:22:04 2006 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> @@ -209,10 +209,10 @@ { InputContextData *data = (InputContextData*)hIMC; - WARN("(%p, %p): semi-stub\n",hWnd,hIMC); - - if (!data) - return FALSE; + WARN("(%p, %p): semi-stub\n", hWnd, hIMC); + + if (!hIMC) + return NULL; /* * WINE SPECIFIC! MAY CONFLICT @@ -227,7 +227,7 @@ * If already associated just return */ if (data->hwnd == hWnd) - return (HIMC)data; + return hIMC; if (IsWindow(data->hwnd)) { @@ -251,7 +251,7 @@ * TODO: We need to keep track of the old context associated * with a window and return it for now we will return NULL; */ - return (HIMC)NULL; + return NULL; } /***********************************************************************

1 0

[winesync] 22886: Delete unneeded makefile
by winesync＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: winesync Date: Thu Jul 6 15:18:46 2006 New Revision: 22886 URL: http://svn.reactos.org/svn/reactos?rev=22886&view=rev Log: Delete unneeded makefile Removed: trunk/reactos/dll/win32/cryptdll/Makefile.in Removed: trunk/reactos/dll/win32/cryptdll/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/Makefil… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/Makefile.in (original) +++ trunk/reactos/dll/win32/cryptdll/Makefile.in (removed) @@ -1,14 +1,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = cryptdll.dll -IMPORTLIB = libcryptdll.$(IMPLIBEXT) -IMPORTS = advapi32 kernel32 - -C_SRCS = \ - cryptdll.c - -@MAKE_DLL_RULES@ - -### Dependencies:

1 0

[winesync] 22885: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: winesync Date: Thu Jul 6 15:10:26 2006 New Revision: 22885 URL: http://svn.reactos.org/svn/reactos?rev=22885&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cryptdll/cryptdll.c Modified: trunk/reactos/dll/win32/cryptdll/cryptdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/cryptdll.c (original) +++ trunk/reactos/dll/win32/cryptdll/cryptdll.c Thu Jul 6 15:10:26 2006 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" @@ -32,6 +32,8 @@ TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL);

1 0

[winesync] 22884: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: winesync Date: Thu Jul 6 14:52:10 2006 New Revision: 22884 URL: http://svn.reactos.org/svn/reactos?rev=22884&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cabinet/cabinet.h trunk/reactos/dll/win32/cabinet/cabinet.rbuild trunk/reactos/dll/win32/cabinet/cabinet.rc trunk/reactos/dll/win32/cabinet/cabinet_main.c trunk/reactos/dll/win32/cabinet/fci.c trunk/reactos/dll/win32/cabinet/fdi.c Modified: trunk/reactos/dll/win32/cabinet/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.h (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.h Thu Jul 6 14:52:10 2006 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_CABINET_H #define __WINE_CABINET_H Modified: trunk/reactos/dll/win32/cabinet/cabinet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.rbuild (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.rbuild Thu Jul 6 14:52:10 2006 @@ -12,11 +12,8 @@ <library>kernel32</library> <library>ntdll</library> <file>cabinet_main.c</file> - <library>ntdll</library> <file>fci.c</file> - <library>ntdll</library> <file>fdi.c</file> - <library>ntdll</library> <file>cabinet.rc</file> <file>cabinet.spec</file> </module> Modified: trunk/reactos/dll/win32/cabinet/cabinet.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.rc (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.rc Thu Jul 6 14:52:10 2006 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define WINE_FILEDESCRIPTION_STR "Wine Cabinet File API" Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_main.c (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_main.c Thu Jul 6 14:52:10 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" Modified: trunk/reactos/dll/win32/cabinet/fci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fci.c (original) +++ trunk/reactos/dll/win32/cabinet/fci.c Thu Jul 6 14:52:10 2006 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c Thu Jul 6 14:52:10 2006 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * This is a largely redundant reimplementation of the stuff in cabextract.c. It

1 0

[winesync] 22883: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: winesync Date: Thu Jul 6 14:19:03 2006 New Revision: 22883 URL: http://svn.reactos.org/svn/reactos?rev=22883&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/crypt32/base64.c (with props) trunk/reactos/dll/win32/crypt32/context.c (with props) trunk/reactos/dll/win32/crypt32/crl.c (with props) trunk/reactos/dll/win32/crypt32/decode.c (with props) trunk/reactos/dll/win32/crypt32/version.rc (with props) Modified: trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/crypt32.rbuild trunk/reactos/dll/win32/crypt32/crypt32.rc trunk/reactos/dll/win32/crypt32/crypt32.spec trunk/reactos/dll/win32/crypt32/crypt32_De.rc trunk/reactos/dll/win32/crypt32/crypt32_En.rc trunk/reactos/dll/win32/crypt32/crypt32_Ko.rc trunk/reactos/dll/win32/crypt32/crypt32_No.rc trunk/reactos/dll/win32/crypt32/crypt32_private.h trunk/reactos/dll/win32/crypt32/crypt32_ros.diff trunk/reactos/dll/win32/crypt32/cryptres.h trunk/reactos/dll/win32/crypt32/encode.c trunk/reactos/dll/win32/crypt32/main.c trunk/reactos/dll/win32/crypt32/oid.c trunk/reactos/dll/win32/crypt32/proplist.c trunk/reactos/dll/win32/crypt32/protectdata.c trunk/reactos/dll/win32/crypt32/serialize.c trunk/reactos/dll/win32/crypt32/store.c trunk/reactos/dll/win32/crypt32/str.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/crypt32/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/base64.c… Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… Added: trunk/reactos/dll/win32/crypt32/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/context.… Added: trunk/reactos/dll/win32/crypt32/crl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crl.c?re… Modified: trunk/reactos/dll/win32/crypt32/crypt32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… Modified: trunk/reactos/dll/win32/crypt32/crypt32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… Modified: trunk/reactos/dll/win32/crypt32/crypt32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/crypt32/crypt32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/crypt32/crypt32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/crypt32/crypt32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/crypt32/crypt32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/crypt32/cryptres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cryptres… Added: trunk/reactos/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/decode.c… Modified: trunk/reactos/dll/win32/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/encode.c… Modified: trunk/reactos/dll/win32/crypt32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/main.c?r… Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re… Modified: trunk/reactos/dll/win32/crypt32/proplist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/proplist… Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… Modified: trunk/reactos/dll/win32/crypt32/serialize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/serializ… Modified: trunk/reactos/dll/win32/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/store.c?… Modified: trunk/reactos/dll/win32/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?re… Added: trunk/reactos/dll/win32/crypt32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/version.…

1 0

[ion] 22882: - Allocate a copy of the EA buffer even for kernel-mode requests, also make the call use a tagged buffer. - Document call to ObOpenObjectByName - Properly handle and document all possible cases (parse failures vs I/o failures vs both), and handle dereferencing and status codes nicely. - Detect if the FSD is reparsing, which we don't support now (we'll bugcheck for now, so we can quickly detect this later instead of handling it wrong).
by ion＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: ion Date: Thu Jul 6 07:40:16 2006 New Revision: 22882 URL: http://svn.reactos.org/svn/reactos?rev=22882&view=rev Log: - Allocate a copy of the EA buffer even for kernel-mode requests, also make the call use a tagged buffer. - Document call to ObOpenObjectByName - Properly handle and document all possible cases (parse failures vs I/o failures vs both), and handle dereferencing and status codes nicely. - Detect if the FSD is reparsing, which we don't support now (we'll bugcheck for now, so we can quickly detect this later instead of handling it wrong). Modified: trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h Thu Jul 6 07:40:16 2006 @@ -52,6 +52,7 @@ #define TAG_APC TAG('K', 'A', 'P', 'C') #define TAG_IO TAG('I', 'o', ' ', ' ') #define TAG_ERROR_LOG TAG('I', 'o', 'E', 'r') +#define TAG_EA TAG('I', 'o', 'E', 'a') /* formerly located in io/work.c */ #define TAG_IOWI TAG('I', 'O', 'W', 'I') Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Thu Jul 6 07:40:16 2006 @@ -47,6 +47,9 @@ CompleteName, RemainingName); + /* Assume failure */ + *Object = NULL; + /* Validate the open packet */ if (!IopValidateOpenPacket(OpenPacket)) return STATUS_OBJECT_TYPE_MISMATCH; @@ -99,7 +102,6 @@ { /* Couldn't mount, fail the lookup */ ObDereferenceObject(FileObject); - *Object = NULL; return STATUS_UNSUCCESSFUL; } } @@ -220,6 +222,7 @@ /* Reference the file object and call the driver */ ObReferenceObject(FileObject); + OpenPacket->FileObject = FileObject; Status = IoCallDriver(FileObject->DeviceObject, Irp ); /* Copy the status block */ @@ -252,16 +255,45 @@ KeLowerIrql(OldIrql); } #endif + + /* The driver failed to create the file */ if (!NT_SUCCESS(Status)) { + /* Check if we have a name */ + if (FileObject->FileName.Length) + { + /* Free it */ + ExFreePool(FileObject->FileName.Buffer); + FileObject->FileName.Length = 0; + } + + /* Clear its device object */ FileObject->DeviceObject = NULL; - FileObject->Vpb = NULL; - FileObject = NULL; - //ObDereferenceObject(FileObject); - } - + + /* Clear the file object in the open packet */ + OpenPacket->FileObject = NULL; + + /* Dereference the file object */ + ObDereferenceObject(FileObject); + + /* Set the status and return */ + OpenPacket->FinalStatus = Status; + return Status; + } + else if (Status == STATUS_REPARSE) + { + /* FIXME: We don't handle this at all! */ + KEBUGCHECK(0); + } + + /* Otherwise, we were successful. Reference the object, set status */ + ObReferenceObject(FileObject); + OpenPacket->FinalStatus = IoStatusBlock.Status; + OpenPacket->ParseCheck = TRUE; + + /* Return the object and status */ *Object = FileObject; - return Status; + return OpenPacket->FinalStatus; } NTSTATUS @@ -992,7 +1024,9 @@ sizeof(ULONG)); /* marshal EaBuffer */ - SystemEaBuffer = ExAllocatePool(NonPagedPool, EaLength); + SystemEaBuffer = ExAllocatePoolWithTag(NonPagedPool, + EaLength, + TAG_EA); if(!SystemEaBuffer) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -1021,7 +1055,13 @@ SafeAllocationSize.QuadPart = 0; } - if ((EaBuffer) && (EaLength)) SystemEaBuffer = EaBuffer; + if ((EaBuffer) && (EaLength)) + { + SystemEaBuffer = ExAllocatePoolWithTag(NonPagedPool, + EaLength, + TAG_EA); + RtlCopyMemory(SystemEaBuffer, EaBuffer, EaLength); + } } if(Options & IO_CHECK_CREATE_PARAMETERS) @@ -1057,7 +1097,14 @@ OpenPacket.DummyFileObject = NULL; OpenPacket.InternalFlags = 0; - /* First try to open an existing named object */ + /* + * Attempt opening the file. This will call the I/O Parse Routine for + * the File Object (IopParseDevice) which will create the object and + * send the IRP to its device object. Note that we have two statuses + * to worry about: the Object Manager's status (in Status) and the I/O + * status, which is in the Open Packet's Final Status, and determined + * by the Parse Check member. + */ Status = ObOpenObjectByName(ObjectAttributes, NULL, AccessMode, @@ -1066,26 +1113,97 @@ &OpenPacket, &LocalHandle); - DPRINT1("Status: %lx %lx\n", Status, LocalHandle); - - _SEH_TRY - { - *FileHandle = LocalHandle; - IoStatusBlock->Information = OpenPacket.Information; - IoStatusBlock->Status = OpenPacket.FinalStatus; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - /* cleanup EABuffer if captured */ - if (AccessMode != KernelMode && (SystemEaBuffer)) - { - ExFreePool(SystemEaBuffer); - } - + /* Free the EA Buffer */ + if (OpenPacket.EaBuffer) ExFreePool(OpenPacket.EaBuffer); + + /* Now check for Ob or Io failure */ + if (!(NT_SUCCESS(Status)) || (OpenPacket.ParseCheck != TRUE)) + { + /* Check if Ob thinks well went well */ + if (NT_SUCCESS(Status)) + { + /* + * Tell it otherwise. Because we didn't use an ObjectType, + * it incorrectly returned us a handle to God knows what. + */ + ZwClose(LocalHandle); + Status = STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Now check the Io status */ + if (!NT_SUCCESS(OpenPacket.FinalStatus)) + { + /* Use this status instead of Ob's */ + Status = OpenPacket.FinalStatus; + + /* Check if it was only a warning */ + if (NT_WARNING(Status)) + { + /* Protect write with SEH */ + _SEH_TRY + { + /* In this case, we copy the I/O Status back */ + IoStatusBlock->Information = OpenPacket.Information; + IoStatusBlock->Status = OpenPacket.FinalStatus; + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } + else if ((OpenPacket.FileObject) && (OpenPacket.ParseCheck != 1)) + { + /* + * This can happen in the very bizare case where the parse routine + * actually executed more then once (due to a reparse) and ended + * up failing after already having created the File Object. + */ + if (OpenPacket.FileObject->FileName.Length) + { + /* It had a name, free it */ + ExFreePool(OpenPacket.FileObject->FileName.Buffer); + } + + /* Clear the device object to invalidate the FO, and dereference */ + OpenPacket.FileObject->DeviceObject = NULL; + ObDereferenceObject(OpenPacket.FileObject); + } + } + else + { + /* We reached success and have a valid file handle */ + OpenPacket.FileObject->Flags |= FO_HANDLE_CREATED; + + /* Enter SEH for write back */ + _SEH_TRY + { + /* Write back the handle and I/O Status */ + *FileHandle = LocalHandle; + IoStatusBlock->Information = OpenPacket.Information; + IoStatusBlock->Status = OpenPacket.FinalStatus; + + /* Get the Io status */ + Status = OpenPacket.FinalStatus; + } + _SEH_HANDLE + { + /* Get the exception status */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + /* Check if we were 100% successful */ + if ((OpenPacket.ParseCheck == TRUE) && (OpenPacket.FileObject)) + { + /* Dereference the File Object */ + ObDereferenceObject(OpenPacket.FileObject); + } + + /* Return status */ return Status; }

1 0

[greatlrd] 22881: Save Screen Saver you select with right value to the system register when u select apply or ok
by greatlrd＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: greatlrd Date: Thu Jul 6 06:29:16 2006 New Revision: 22881 URL: http://svn.reactos.org/svn/reactos?rev=22881&view=rev Log: Save Screen Saver you select with right value to the system register when u select apply or ok Modified: trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c Thu Jul 6 06:29:16 2006 @@ -9,6 +9,7 @@ */ #include "desk.h" +void SetScreenSaver(); #define MAX_SCREENSAVERS 100 @@ -186,6 +187,7 @@ switch(lpnm->code) { case PSN_APPLY: { + SetScreenSaver(); return TRUE; } break; case NM_RCLICK: @@ -398,3 +400,27 @@ } } +void SetScreenSaver() +{ + HKEY regKey; + + RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); + RegSetValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, REG_SZ, (BYTE *)g_ScreenSaverItems[ImageListSelection].szFilename, _tcslen(g_ScreenSaverItems[ImageListSelection].szFilename)*sizeof(TCHAR)); + // RegSetValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, REG_SZ, g_ScreenSaverItems[ImageListSelection].szFilename, sizeof(TCHAR) * 2); + + + RegCloseKey(regKey); + + //if(g_backgroundItems[g_backgroundSelection].bWallpaper == TRUE) + //{ + // SystemParametersInfo(SPI_SETDESKWALLPAPER, + // 0, + // g_backgroundItems[g_backgroundSelection].szFilename, + // SPIF_UPDATEINIFILE); + //} + //else + //{ + // SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, TEXT(""), SPIF_UPDATEINIFILE); + //} +} +

1 0

[greatlrd] 22880: Fixing one bug, do not list current screensaver twice.
by greatlrd＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: greatlrd Date: Thu Jul 6 05:55:53 2006 New Revision: 22880 URL: http://svn.reactos.org/svn/reactos?rev=22880&view=rev Log: Fixing one bug, do not list current screensaver twice. Modified: trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c Thu Jul 6 05:55:53 2006 @@ -243,14 +243,14 @@ LV_ITEM listItem; LV_COLUMN dummy; RECT clientRect; - HKEY regKey; + //HKEY regKey; SHFILEINFO sfi; HIMAGELIST himl; HIMAGELIST g_hScreenShellImageList = NULL; - TCHAR wallpaperFilename[MAX_PATH]; - DWORD bufferSize = sizeof(wallpaperFilename); - DWORD varType = REG_SZ; - LONG result; + //TCHAR wallpaperFilename[MAX_PATH]; + //DWORD bufferSize = sizeof(wallpaperFilename); + //DWORD varType = REG_SZ; + //LONG result; UINT i = 0; int g_ScreenlistViewItemCount = 0; ScreenSaverItem *ScreenSaverItem = NULL; @@ -288,6 +288,7 @@ g_ScreenlistViewItemCount++; /* Add current screensaver if any */ + /* RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); result = RegQueryValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize); @@ -329,9 +330,12 @@ g_ScreenlistViewItemCount++; } - } + } + + RegCloseKey(regKey); + */ /* Add all the screensavers in the C:\ReactOS\System32 directory. */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs