Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[winesync] 22886: Delete unneeded makefile

by winesync＠svn.reactos.org

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:

18 years, 5 months

[winesync] 22885: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

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);

18 years, 5 months

[winesync] 22884: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

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

18 years, 5 months

[winesync] 22883: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

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.…

18 years, 5 months

[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

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; }

18 years, 5 months

[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

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); + //} +} +

18 years, 5 months

[greatlrd] 22880: Fixing one bug, do not list current screensaver twice.

by greatlrd＠svn.reactos.org

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. */

18 years, 5 months

[greatlrd] 22879: Commit initiate work of implement of autostart of screen saver.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Jul 6 05:44:01 2006 New Revision: 22879 URL: http://svn.reactos.org/svn/reactos?rev=22879&view=rev Log: Commit initiate work of implement of autostart of screen saver. Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/include/desktopbg.h trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/csr.c Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h Thu Jul 6 05:44:01 2006 @@ -409,6 +409,12 @@ { HANDLE InputWaitHandle; } CSRSS_GET_INPUT_WAIT_HANDLE, *PCSRSS_GET_INPUT_WAIT_HANDLE; + +typedef struct +{ + BOOL Start; +} CSRSS_START_SCREEN_SAVER, *PCSRSS_START_SCREEN_SAVER; + #define CSR_API_MESSAGE_HEADER_SIZE(Type) (FIELD_OFFSET(CSR_API_MESSAGE, Data) + sizeof(Type)) #define CSRSS_MAX_WRITE_CONSOLE (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE)) @@ -477,6 +483,7 @@ #define SET_CONSOLE_OUTPUT_CP (0x34) #define GET_INPUT_WAIT_HANDLE (0x35) #define GET_PROCESS_LIST (0x36) +#define START_SCREEN_SAVER (0x37) /* Keep in sync with definition below. */ #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS)) @@ -542,6 +549,7 @@ CSRSS_SET_CONSOLE_OUTPUT_CP SetConsoleOutputCodePage; CSRSS_GET_INPUT_WAIT_HANDLE GetConsoleInputWaitHandle; CSRSS_GET_PROCESS_LIST GetProcessListRequest; + CSRSS_START_SCREEN_SAVER StartScreenSaver; } Data; } CSR_API_MESSAGE, *PCSR_API_MESSAGE; Modified: trunk/reactos/subsystems/win32/csrss/include/desktopbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/desktopbg.h (original) +++ trunk/reactos/subsystems/win32/csrss/include/desktopbg.h Thu Jul 6 05:44:01 2006 @@ -16,6 +16,7 @@ CSR_API(CsrShowDesktop); CSR_API(CsrHideDesktop); CSR_API(CsrRegisterSystemClasses); +CSR_API(CsrStartScreenSaver); BOOL FASTCALL DtbgIsDesktopVisible(VOID); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Thu Jul 6 05:44:01 2006 @@ -3301,4 +3301,52 @@ return Request->Status = STATUS_SUCCESS; } + +CSR_API(CsrStartScreenSaver) +{ + + DPRINT1("CsrStartScreenSaver : Start Screen Saver \n"); + + if (Request->Data.StartScreenSaver.Start == TRUE) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR szCmdline[MAX_PATH]; + + HKEY hKey; + WCHAR szBuffer[MAX_PATH]; + DWORD bufferSize = sizeof(szBuffer); + DWORD varType = REG_SZ; + LONG result; + + + + // FIXME read the register key for the screen saver + //swprintf(szCmdline, L"c:\\reactos\\system32\\matrix.scr /s"); + + RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_ALL_ACCESS, &hKey); + result = RegQueryValueExW(hKey, L"SCRNSAVE.EXE", 0, &varType, (LPBYTE)szBuffer, &bufferSize); + if(result == ERROR_SUCCESS) + { + swprintf(szCmdline, L"%s /s",szBuffer); + DPRINT1("CsrStartScreenSaver : OK %S\n",szCmdline); + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + } + else + { + DPRINT1("CsrStartScreenSaver : FAIL %S\n",szBuffer); + } + + RegCloseKey(hKey); + } + return Request->Status = STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Thu Jul 6 05:44:01 2006 @@ -68,6 +68,7 @@ CSRSS_DEFINE_API(GET_CONSOLE_OUTPUT_CP, CsrGetConsoleOutputCodePage), CSRSS_DEFINE_API(SET_CONSOLE_OUTPUT_CP, CsrSetConsoleOutputCodePage), CSRSS_DEFINE_API(GET_PROCESS_LIST, CsrGetProcessList), + CSRSS_DEFINE_API(START_SCREEN_SAVER, CsrStartScreenSaver), { 0, 0, NULL } }; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/csr.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/csr.c Thu Jul 6 05:44:01 2006 @@ -85,6 +85,47 @@ return Status; } + +NTSTATUS FASTCALL +co_CsrNotifyScreenSaver(PCSR_API_MESSAGE Request) +{ + NTSTATUS Status; + PEPROCESS OldProcess; + + if (NULL == CsrProcess) + { + return STATUS_INVALID_PORT_HANDLE; + } + + Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); + Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); + + /* Switch to the process in which the WindowsApiPort handle is valid */ + OldProcess = PsGetCurrentProcess(); + if (CsrProcess != OldProcess) + { + KeAttachProcess(&CsrProcess->Pcb); + } + + Status = ZwRequestWaitReplyPort(WindowsApiPort, + &Request->Header, + &Request->Header); + + + if (CsrProcess != OldProcess) + { + KeDetachProcess(); + } + + if (NT_SUCCESS(Status)) + { + Status = Request->Status; + } + + return Status; +} + + NTSTATUS STDCALL CsrInsertObject(HANDLE ObjectHandle,

18 years, 5 months

[ion] 22878: - Move the code in IoCreateFile inside IopParseDevice where it belongs. Currently only a raw move and hacks to make it not regress anything, but in the future we can now finally start applying some important fixes for proper communication with FSDs and setting a myriad of flags and settings required. Will also allow for some nice optimizations in the future.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 6 03:55:45 2006 New Revision: 22878 URL: http://svn.reactos.org/svn/reactos?rev=22878&view=rev Log: - Move the code in IoCreateFile inside IopParseDevice where it belongs. Currently only a raw move and hacks to make it not regress anything, but in the future we can now finally start applying some important fixes for proper communication with FSDs and setting a myriad of flags and settings required. Will also allow for some nice optimizations in the future. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c 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 03:55:45 2006 @@ -34,6 +34,10 @@ NTSTATUS Status; PFILE_OBJECT FileObject; PVPB Vpb; + PIRP Irp; + PEXTENDED_IO_STACK_LOCATION StackLoc; + IO_SECURITY_CONTEXT SecurityContext; + IO_STATUS_BLOCK IoStatusBlock; DPRINT("IopParseDevice:\n" "DeviceObject : %p\n" "RelatedFileObject : %p\n" @@ -45,6 +49,13 @@ /* Validate the open packet */ if (!IopValidateOpenPacket(OpenPacket)) return STATUS_OBJECT_TYPE_MISMATCH; + + RtlMapGenericMask(&AccessState->RemainingDesiredAccess, + &IoFileObjectType->TypeInfo.GenericMapping); + RtlMapGenericMask(&AccessState->OriginalDesiredAccess, + &IoFileObjectType->TypeInfo.GenericMapping); + SeSetAccessStateGenericMapping(AccessState, + &IoFileObjectType->TypeInfo.GenericMapping); /* Create the actual file object */ Status = ObCreateObject(AccessMode, @@ -112,9 +123,145 @@ Status = IopReferenceDeviceObject(DeviceObject); FileObject->DeviceObject = DeviceObject; - /* Set the file object and return success */ + FileObject->Type = IO_TYPE_FILE; + FileObject->Size = sizeof(FILE_OBJECT); + + if (OpenPacket->CreateOptions & + (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) + { + FileObject->Flags |= FO_SYNCHRONOUS_IO; + if (OpenPacket->CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) + { + FileObject->Flags |= FO_ALERTABLE_IO; + } + } + + if (OpenPacket->CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) + { + FileObject->Flags |= FO_NO_INTERMEDIATE_BUFFERING; + } + if (OpenPacket->CreateOptions & FILE_WRITE_THROUGH) + { + FileObject->Flags |= FO_WRITE_THROUGH; + } + if (OpenPacket->CreateOptions & FILE_SEQUENTIAL_ONLY) + { + FileObject->Flags |= FO_SEQUENTIAL_ONLY; + } + if (OpenPacket->CreateOptions & FILE_RANDOM_ACCESS) + { + FileObject->Flags |= FO_RANDOM_ACCESS; + } + + if (!(Attributes & OBJ_CASE_INSENSITIVE)) + { + FileObject->Flags |= FO_OPENED_CASE_SENSITIVE; + } + + SecurityContext.SecurityQos = SecurityQos; + SecurityContext.AccessState = AccessState; + SecurityContext.DesiredAccess = AccessState->RemainingDesiredAccess; + SecurityContext.FullCreateOptions = OpenPacket->CreateOptions; + + KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); + KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); + + Irp = IoAllocateIrp(FileObject->DeviceObject->StackSize, FALSE); + if (!Irp) return STATUS_UNSUCCESSFUL; + + /* Now set the IRP data */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = AccessMode; + Irp->Flags = IRP_CREATE_OPERATION | + IRP_SYNCHRONOUS_API;// | + //IRP_DEFER_IO_COMPLETION; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->UserEvent = &FileObject->Event; + Irp->UserIosb = &IoStatusBlock; + Irp->MdlAddress = NULL; + Irp->PendingReturned = FALSE; + Irp->UserEvent = NULL; + Irp->Cancel = FALSE; + Irp->CancelRoutine = NULL; + Irp->Tail.Overlay.AuxiliaryBuffer = NULL; + + StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); + StackLoc->Control = 0; + StackLoc->FileObject = FileObject; + + switch (OpenPacket->CreateFileType) + { + default: + case CreateFileTypeNone: + StackLoc->MajorFunction = IRP_MJ_CREATE; + StackLoc->Flags = OpenPacket->Options; + StackLoc->Parameters.Create.EaLength = OpenPacket->EaBuffer != NULL ? OpenPacket->EaLength : 0; + StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? SL_CASE_SENSITIVE: 0; + break; + + case CreateFileTypeNamedPipe: + StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; + StackLoc->Parameters.CreatePipe.Parameters = OpenPacket->MailslotOrPipeParameters; + break; + + case CreateFileTypeMailslot: + StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; + StackLoc->Parameters.CreateMailslot.Parameters = OpenPacket->MailslotOrPipeParameters; + break; + } + + /* Set the common data */ + Irp->Overlay.AllocationSize = OpenPacket->AllocationSize; + Irp->AssociatedIrp.SystemBuffer =OpenPacket->EaBuffer; + StackLoc->Parameters.Create.Options = (OpenPacket->Disposition << 24) | (OpenPacket->CreateOptions & 0x00FFFFFF); + StackLoc->Parameters.Create.FileAttributes = OpenPacket->FileAttributes; + StackLoc->Parameters.Create.ShareAccess = OpenPacket->ShareAccess; + StackLoc->Parameters.Create.SecurityContext = &SecurityContext; + + /* Reference the file object and call the driver */ + ObReferenceObject(FileObject); + Status = IoCallDriver(FileObject->DeviceObject, Irp ); + + /* Copy the status block */ + OpenPacket->Information = IoStatusBlock.Information; + OpenPacket->FinalStatus = IoStatusBlock.Status; + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } +#if 0 + else + { + KIRQL OldIrql; + PKNORMAL_ROUTINE NormalRoutine; + PVOID NormalContext; + + /* We'll have to complete it ourselves */ + ASSERT(!Irp->PendingReturned); + KeRaiseIrql(APC_LEVEL, &OldIrql); + IopCompleteRequest(&Irp->Tail.Apc, + &NormalRoutine, + &NormalContext, + (PVOID*)&FileObject, + &NormalContext); + KeLowerIrql(OldIrql); + } +#endif + if (!NT_SUCCESS(Status)) + { + FileObject->DeviceObject = NULL; + FileObject->Vpb = NULL; + FileObject = NULL; + //ObDereferenceObject(FileObject); + } + *Object = FileObject; - return STATUS_SUCCESS; + return Status; } NTSTATUS @@ -804,20 +951,11 @@ IN PVOID ExtraCreateParameters OPTIONAL, IN ULONG Options) { - PFILE_OBJECT FileObject = NULL; - PIRP Irp; - PEXTENDED_IO_STACK_LOCATION StackLoc; - IO_SECURITY_CONTEXT SecurityContext; KPROCESSOR_MODE AccessMode; HANDLE LocalHandle = 0; LARGE_INTEGER SafeAllocationSize; PVOID SystemEaBuffer = NULL; - NTSTATUS Status = STATUS_SUCCESS; - AUX_DATA AuxData; - ACCESS_STATE AccessState; - KIRQL OldIrql; - PKNORMAL_ROUTINE NormalRoutine; - PVOID NormalContext; + NTSTATUS Status = STATUS_SUCCESS; OPEN_PACKET OpenPacket; PAGED_CODE(); @@ -928,156 +1066,19 @@ &OpenPacket, &LocalHandle); - RtlMapGenericMask(&DesiredAccess, &IoFileObjectType->TypeInfo.GenericMapping); - ObReferenceObjectByHandle(LocalHandle, - DesiredAccess, - NULL, - KernelMode, - (PVOID*)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - FileObject->Type = IO_TYPE_FILE; - FileObject->Size = sizeof(FILE_OBJECT); - - if (CreateOptions & - (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) - { - FileObject->Flags |= FO_SYNCHRONOUS_IO; - if (CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) - { - FileObject->Flags |= FO_ALERTABLE_IO; - } - } - - if (CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) - { - FileObject->Flags |= FO_NO_INTERMEDIATE_BUFFERING; - } - if (CreateOptions & FILE_WRITE_THROUGH) - { - FileObject->Flags |= FO_WRITE_THROUGH; - } - if (CreateOptions & FILE_SEQUENTIAL_ONLY) - { - FileObject->Flags |= FO_SEQUENTIAL_ONLY; - } - if (CreateOptions & FILE_RANDOM_ACCESS) - { - FileObject->Flags |= FO_RANDOM_ACCESS; - } - - if (!(ObjectAttributes->Attributes & OBJ_CASE_INSENSITIVE)) - { - FileObject->Flags |= FO_OPENED_CASE_SENSITIVE; - } - - SeCreateAccessState(&AccessState, &AuxData, FILE_ALL_ACCESS, NULL); - SecurityContext.SecurityQos = NULL; /* ?? */ - SecurityContext.AccessState = &AccessState; - SecurityContext.DesiredAccess = DesiredAccess; - SecurityContext.FullCreateOptions = CreateOptions; - - KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); - KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); - - Irp = IoAllocateIrp(FileObject->DeviceObject->StackSize, FALSE); - if (!Irp) - { - ZwClose(LocalHandle); - return STATUS_UNSUCCESSFUL; - } - - /* Now set the IRP data */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = AccessMode; - Irp->Flags = IRP_CREATE_OPERATION | - IRP_SYNCHRONOUS_API | - IRP_DEFER_IO_COMPLETION; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = IoStatusBlock; - Irp->MdlAddress = NULL; - Irp->PendingReturned = FALSE; - Irp->UserEvent = NULL; - Irp->Cancel = FALSE; - Irp->CancelRoutine = NULL; - Irp->Tail.Overlay.AuxiliaryBuffer = NULL; - - StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); - StackLoc->Control = 0; - StackLoc->FileObject = FileObject; - - switch (CreateFileType) - { - default: - case CreateFileTypeNone: - StackLoc->MajorFunction = IRP_MJ_CREATE; - StackLoc->Flags = Options; - StackLoc->Parameters.Create.EaLength = SystemEaBuffer != NULL ? EaLength : 0; - StackLoc->Flags |= !(ObjectAttributes->Attributes & OBJ_CASE_INSENSITIVE) ? SL_CASE_SENSITIVE: 0; - break; - - case CreateFileTypeNamedPipe: - StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; - StackLoc->Parameters.CreatePipe.Parameters = ExtraCreateParameters; - break; - - case CreateFileTypeMailslot: - StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; - StackLoc->Parameters.CreateMailslot.Parameters = ExtraCreateParameters; - break; - } - - /* Set the common data */ - Irp->Overlay.AllocationSize = SafeAllocationSize; - Irp->AssociatedIrp.SystemBuffer = SystemEaBuffer; - StackLoc->Parameters.Create.Options = (CreateDisposition << 24) | (CreateOptions & 0x00FFFFFF); - StackLoc->Parameters.Create.FileAttributes = FileAttributes; - StackLoc->Parameters.Create.ShareAccess = ShareAccess; - StackLoc->Parameters.Create.SecurityContext = &SecurityContext; - - Status = IofCallDriver(FileObject->DeviceObject, Irp ); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - AccessMode, - FALSE, - NULL); - Status = IoStatusBlock->Status; - } - else - { - /* We'll have to complete it ourselves */ - ASSERT(!Irp->PendingReturned); - KeRaiseIrql(APC_LEVEL, &OldIrql); - IopCompleteRequest(&Irp->Tail.Apc, - &NormalRoutine, - &NormalContext, - (PVOID*)&FileObject, - &NormalContext); - KeLowerIrql(OldIrql); - } - - if (!NT_SUCCESS(Status)) - { - FileObject->DeviceObject = NULL; - FileObject->Vpb = NULL; - ObDereferenceObject(FileObject); - } - else - { - _SEH_TRY - { - *FileHandle = LocalHandle; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } + 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))

18 years, 5 months

[gedmurphy] 22877: update Wine file.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jul 6 02:52:42 2006 New Revision: 22877 URL: http://svn.reactos.org/svn/reactos?rev=22877&view=rev Log: update Wine file. 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 02:52:42 2006 @@ -40,7 +40,7 @@ reactos/dll/win32/avifil32 # Synced to Wine-0_9_5 reactos/dll/win32/cabinet # Synced to Wine-0_9_10 reactos/dll/win32/comctl32 # Synced to Wine-0_9_16 -reactos/dll/win32/comdlg32 # Synced to Wine-0_9_5 +reactos/dll/win32/comdlg32 # Synced to Wine-0_9_16 reactos/dll/win32/crypt32 # Synced to Wine-0_9_10 reactos/dll/win32/dbghelp # reactos/dll/win32/icmp # Synced to Wine-0_9_10

18 years, 5 months

← Newer
1
...
49
50
51
52
53
54
55
...
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