Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[ion] 15079: Implement FsRtlMdlRead, FsRtlMdlReadComplete, FsMdlReadCompleteDev, FsRtlMdlWRiteComplete, FsRtlMdlWriteCompleteDev, FsRtlPrepareMdlWrite, CcMdlReadCompleted, CcMdlWriteComplete, CcMdlReadCompleteDev

by ion＠svn.reactos.com

Implement FsRtlMdlRead, FsRtlMdlReadComplete, FsMdlReadCompleteDev, FsRtlMdlWRiteComplete, FsRtlMdlWriteCompleteDev, FsRtlPrepareMdlWrite, CcMdlReadCompleted, CcMdlWriteComplete, CcMdlReadCompleteDev Modified: trunk/reactos/ntoskrnl/cc/mdl.c Modified: trunk/reactos/ntoskrnl/fs/mdl.c Modified: trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S _____ Modified: trunk/reactos/ntoskrnl/cc/mdl.c --- trunk/reactos/ntoskrnl/cc/mdl.c 2005-05-07 12:04:59 UTC (rev 15078) +++ trunk/reactos/ntoskrnl/cc/mdl.c 2005-05-07 15:19:33 UTC (rev 15079) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -17,11 +17,11 @@ /* FUNCTIONS *****************************************************************/ /* - * @unimplemented + * @implemented */ VOID STDCALL -CcMdlRead ( +CcMdlRead( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -32,73 +32,119 @@ UNIMPLEMENTED; } -/********************************************************************** +/* * NAME INTERNAL - * CcMdlReadCompleteDev@8 + * CcMdlReadCompleteDev@8 * * DESCRIPTION * * ARGUMENTS - * MdlChain - * DeviceObject - * + * MdlChain + * DeviceObject + * * RETURN VALUE - * None. + * None. * * NOTE * Used by CcMdlReadComplete@8 and FsRtl * */ -VOID STDCALL -CcMdlReadCompleteDev (IN PMDL MdlChain, - IN PDEVICE_OBJECT DeviceObject) +VOID +STDCALL +CcMdlReadCompleteDev(IN PMDL MdlChain, + IN PFILE_OBJECT FileObject) { - UNIMPLEMENTED; + PMDL Mdl; + + /* Free MDLs */ + while ((Mdl = MdlChain)) + { + MdlChain = Mdl->Next; + MmUnlockPages(Mdl); + IoFreeMdl(Mdl); + } } - -/********************************************************************** - * NAME EXPORTED - * CcMdlReadComplete@8 +/* + * NAME EXPORTED + * CcMdlReadComplete@8 * * DESCRIPTION * * ARGUMENTS * * RETURN VALUE - * None. + * None. * * NOTE - * From Bo Branten's ntifs.h v13. + * From Bo Branten's ntifs.h v13. * - * @unimplemented + * @implemented */ -VOID STDCALL -CcMdlReadComplete (IN PFILE_OBJECT FileObject, - IN PMDL MdlChain) +VOID +STDCALL +CcMdlReadComplete(IN PFILE_OBJECT FileObject, + IN PMDL MdlChain) { - PDEVICE_OBJECT DeviceObject = NULL; + PDEVICE_OBJECT DeviceObject = NULL; + PFAST_IO_DISPATCH FastDispatch; - DeviceObject = IoGetRelatedDeviceObject (FileObject); - /* FIXME: try fast I/O first */ - CcMdlReadCompleteDev (MdlChain, - DeviceObject); + /* Get Fast Dispatch Data */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlReadComplete) + { + /* Use the fast path */ + FastDispatch->MdlReadComplete(FileObject, + MdlChain, + DeviceObject); + } + + /* Use slow path */ + CcMdlReadCompleteDev(MdlChain, FileObject); } /* - * @unimplemented + * @implemented */ VOID STDCALL -CcMdlWriteComplete ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain - ) +CcMdlWriteComplete(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain) { - UNIMPLEMENTED; + PDEVICE_OBJECT DeviceObject = NULL; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Fast Dispatch Data */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlWriteComplete) + { + /* Use the fast path */ + FastDispatch->MdlWriteComplete(FileObject, + FileOffset, + MdlChain, + DeviceObject); + } + + /* Use slow path */ + CcMdlWriteCompleteDev(FileOffset, MdlChain, FileObject); } +VOID +STDCALL +CcMdlWriteCompleteDev(IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN PFILE_OBJECT FileObject) +{ + UNIMPLEMENTED; +} + /* * @unimplemented */ _____ Modified: trunk/reactos/ntoskrnl/fs/mdl.c --- trunk/reactos/ntoskrnl/fs/mdl.c 2005-05-07 12:04:59 UTC (rev 15078) +++ trunk/reactos/ntoskrnl/fs/mdl.c 2005-05-07 15:19:33 UTC (rev 15079) @@ -1,19 +1,25 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel * FILE: ntoskrnl/fs/mdl.c - * PURPOSE: No purpose listed. + * PURPOSE: Cached MDL Access Helper Routines for File System Drivers * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ +/* INCLUDES ****************************************************************/ + #include <ntoskrnl.h> +#define NDEBUG #include <internal/debug.h> +/* GLOBALS *******************************************************************/ + extern ULONG CcFastReadResourceMiss; extern ULONG CcFastReadNoWait; +/* FUNCTIONS *****************************************************************/ + /* * @implemented */ @@ -54,150 +60,150 @@ CcFastReadNoWait++; } - -/********************************************************************** - * NAME EXPORTED - * FsRtlMdlRead@24 +/* + * NAME EXPORTED + * FsRtlMdlRead@24 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE * - * @unimplemented + * @implemented */ BOOLEAN STDCALL -FsRtlMdlRead ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG LockKey, - OUT PMDL *MdlChain, - OUT PIO_STATUS_BLOCK IoStatus - ) +FsRtlMdlRead(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus) { - return FALSE; /* FIXME: call FsRtlMdlReadDev ? */ + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlRead) + { + /* Use the fast path */ + return FastDispatch->MdlRead(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if (FastDispatch && FastDispatch->MdlRead && + BaseDeviceObject != DeviceObject) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlMdlReadDev(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + DeviceObject); } - -/********************************************************************** - * NAME EXPORTED - * FsRtlMdlReadComplete@8 +/* + * NAME EXPORTED + * FsRtlMdlReadComplete@8 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE * - * @unimplemented + * @implemented */ -BOOLEAN STDCALL +BOOLEAN +STDCALL FsRtlMdlReadComplete(IN PFILE_OBJECT FileObject, - IN OUT PMDL Mdl) + IN OUT PMDL MdlChain) { - PDEVICE_OBJECT DeviceObject [2] = {NULL}; - PDRIVER_OBJECT DriverObject = NULL; - - /* - * Try fast I/O first - */ - DeviceObject [0] = IoGetRelatedDeviceObject (FileObject); - DriverObject = DeviceObject [0]->DriverObject; - if (NULL != DriverObject->FastIoDispatch) - { -#if 0 - if (IRP_MJ_READ <= DriverObject->FastIoDispatch->Count) - { - return FALSE; - } - if (NULL == DriverObject->FastIoDispatch->Dispatch [IRP_MJ_READ]) - { - return FALSE; - } - return DriverObject->FastIoDispatch->Dispatch - [IRP_MJ_READ] ( - Mdl, - NULL /* FIXME: how to get the IRP? */ - ); -#endif - } - /* - * Default I/O path - */ - DeviceObject [1] = IoGetBaseFileSystemDeviceObject (FileObject); - /* - * Did IoGetBaseFileSystemDeviceObject () - * returned the same device - * IoGetRelatedDeviceObject () returned? - */ - if (DeviceObject [1] != DeviceObject [0]) - { -#if 0 - DriverObject = DeviceObject [1]->DriverObject; - if (NULL != DriverObject->FastIoDispatch) - { - /* - * Check if the driver provides - * IRP_MJ_READ. - */ - if (IRP_MJ_READ <= DriverObject->FastIoDispatch->Count) - { - if (NULL == DriverObject->FastIoDispatch->Dispatch [IRP_MJ_READ]) - { - return FALSE; - } - } - } -#endif - DeviceObject [0] = DeviceObject [1]; - } - return FsRtlMdlReadCompleteDev ( - FileObject, - Mdl, - DeviceObject [0] - ); + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlReadComplete) + { + /* Use the fast path */ + return FastDispatch->MdlReadComplete(FileObject, + MdlChain, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if (FastDispatch && FastDispatch->MdlReadComplete && + BaseDeviceObject != DeviceObject) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlMdlReadCompleteDev(FileObject, MdlChain, DeviceObject); } -/********************************************************************** - * NAME EXPORTED - * FsRtlMdlReadCompleteDev@12 +/* + * NAME EXPORTED + * FsRtlMdlReadCompleteDev@12 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE * * NOTE - * From Bo Branten's ntifs.h v13. - * (CcMdlReadCompleteDev declared in internal/cc.h) + * From Bo Branten's ntifs.h v13. + * (CcMdlReadCompleteDev declared in internal/cc.h) * * @implemented */ BOOLEAN STDCALL -FsRtlMdlReadCompleteDev ( - IN PFILE_OBJECT FileObject, - IN PMDL MdlChain, - IN PDEVICE_OBJECT DeviceObject - ) +FsRtlMdlReadCompleteDev(IN PFILE_OBJECT FileObject, + IN PMDL MdlChain, + IN PDEVICE_OBJECT DeviceObject) { - FileObject = FileObject; /* unused parameter */ - CcMdlReadCompleteDev (MdlChain, DeviceObject); - return TRUE; + /* Call the Cache Manager */ + CcMdlReadCompleteDev(MdlChain, FileObject); + return TRUE; } - -/********************************************************************** - * NAME EXPORTED - * FsRtlMdlReadDev@28 +/* + * NAME EXPORTED + * FsRtlMdlReadDev@28 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE @@ -206,99 +212,162 @@ */ BOOLEAN STDCALL -FsRtlMdlReadDev ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG LockKey, - OUT PMDL *MdlChain, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject - ) +FsRtlMdlReadDev(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) { - return FALSE; + UNIMPLEMENTED; + return FALSE; } -/********************************************************************** - * NAME EXPORTED - * FsRtlMdlWriteComplete@12 +/* + * NAME EXPORTED + * FsRtlMdlWriteComplete@12 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE * - * @unimplemented + * @implemented */ BOOLEAN STDCALL -FsRtlMdlWriteComplete ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain - ) +FsRtlMdlWriteComplete(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain) { - return FALSE; /* FIXME: call FsRtlMdlWriteCompleteDev ? */ + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlWriteComplete) + { + /* Use the fast path */ + return FastDispatch->MdlWriteComplete(FileObject, + FileOffset, + MdlChain, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if (FastDispatch && FastDispatch->MdlWriteComplete && + BaseDeviceObject != DeviceObject) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlMdlWriteCompleteDev(FileObject, + FileOffset, + MdlChain, + DeviceObject); } - -/********************************************************************** - * NAME EXPORTED - * FsRtlMdlWriteCompleteDev@16 +/* + * NAME EXPORTED + * FsRtlMdlWriteCompleteDev@16 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE * - * @unimplemented + * @implemented */ BOOLEAN STDCALL -FsRtlMdlWriteCompleteDev ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain, - IN PDEVICE_OBJECT DeviceObject - ) +FsRtlMdlWriteCompleteDev(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN PDEVICE_OBJECT DeviceObject) { - return FALSE; + /* Call the Cache Manager */ + CcMdlWriteCompleteDev(FileOffset, MdlChain, FileObject); + return TRUE; } -/********************************************************************** - * NAME EXPORTED - * FsRtlPrepareMdlWrite@24 +/* + * NAME EXPORTED + * FsRtlPrepareMdlWrite@24 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE * - * @unimplemented + * @implemented */ BOOLEAN STDCALL -FsRtlPrepareMdlWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG LockKey, - OUT PMDL *MdlChain, - OUT PIO_STATUS_BLOCK IoStatus - ) +FsRtlPrepareMdlWrite(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus) { - return FALSE; /* call FsRtlPrepareMdlWriteDev ? */ + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->PrepareMdlWrite) + { + /* Use the fast path */ + return FastDispatch->PrepareMdlWrite(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if (FastDispatch && FastDispatch->PrepareMdlWrite && + BaseDeviceObject != DeviceObject) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlPrepareMdlWriteDev(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + DeviceObject); } - -/********************************************************************** - * NAME EXPORTED - * FsRtlPrepareMdlWriteDev@28 +/* + * NAME EXPORTED + * FsRtlPrepareMdlWriteDev@28 * * DESCRIPTION * @@ -310,17 +379,16 @@ */ BOOLEAN STDCALL -FsRtlPrepareMdlWriteDev ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG LockKey, - OUT PMDL *MdlChain, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject - ) +FsRtlPrepareMdlWriteDev(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) { - return FALSE; + UNIMPLEMENTED; + return FALSE; } _____ Modified: trunk/reactos/ntoskrnl/include/internal/cc.h --- trunk/reactos/ntoskrnl/include/internal/cc.h 2005-05-07 12:04:59 UTC (rev 15078) +++ trunk/reactos/ntoskrnl/include/internal/cc.h 2005-05-07 15:19:33 UTC (rev 15079) @@ -62,9 +62,16 @@ CSHORT RefCount; /* (At offset 0x34 on WinNT4) */ } INTERNAL_BCB, *PINTERNAL_BCB; -VOID STDCALL -CcMdlReadCompleteDev (IN PMDL MdlChain, - IN PDEVICE_OBJECT DeviceObject); +VOID +STDCALL +CcMdlReadCompleteDev(IN PMDL MdlChain, + IN PFILE_OBJECT FileObject); + +VOID +STDCALL +CcMdlWriteCompleteDev(IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN PFILE_OBJECT FileObject); NTSTATUS CcRosFlushCacheSegment(PCACHE_SEGMENT CacheSegment); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-05-07 12:04:59 UTC (rev 15078) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-05-07 15:19:33 UTC (rev 15079) @@ -157,7 +157,10 @@ mov [edi+KTHREAD_KERNEL_STACK], esp mov esp, [esi+KTHREAD_KERNEL_STACK] - /* Change the address space */ + /* + * Sadly, ROS memory management is screwed up, so + * we must change the address space here. + */ mov eax, [esi+KTHREAD_APCSTATE_PROCESS] mov eax, [eax+KPROCESS_DIRECTORY_TABLE_BASE] mov cr3, eax @@ -200,10 +203,6 @@ /* Set current IOPM offset in the TSS */ mov [ebp+KTSS_IOMAPBASE], cx - - /* Change the address space */ - mov eax, [edi+KPROCESS_DIRECTORY_TABLE_BASE] - mov cr3, eax SameProcess:

19 years, 4 months

[greatlrd] 15078: Forget change two line in chcp so it did not compile

by greatlrd＠svn.reactos.com

Forget change two line in chcp so it did not compile Modified: trunk/reactos/subsys/system/cmd/chcp.c _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-05-07 11:54:22 UTC (rev 15077) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-05-07 12:04:59 UTC (rev 15078) @@ -41,7 +41,7 @@ { /* display active code page number */ LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, GetCodePage); + ConErrPrintf(szMsg, InputCodePage); return 0; } @@ -55,7 +55,7 @@ /* save old code page */ - uOldCodePage = GetCodePage; + uOldCodePage = InputCodePage; uNewCodePage = (UINT)_ttoi(arg[0]);

19 years, 4 months

[greatlrd] 15077: the name GetCodePage and OutCodePage is a bit misleading, change it to InputCodePage and OutputCodePage

by greatlrd＠svn.reactos.com

the name GetCodePage and OutCodePage is a bit misleading, change it to InputCodePage and OutputCodePage Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-05-07 11:14:58 UTC (rev 15076) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-05-07 11:54:22 UTC (rev 15077) @@ -77,7 +77,7 @@ SetConsoleOutputCP (uNewCodePage); InitLocale (); - GetCodePage = GetConsoleCP(); + InputCodePage= GetConsoleCP(); } freep (arg); _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-05-07 11:14:58 UTC (rev 15076) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-05-07 11:54:22 UTC (rev 15077) @@ -427,8 +427,8 @@ } /* Get code page if it has been change */ - GetCodePage = GetConsoleCP(); - OutCodePage = GetConsoleOutputCP(); + InputCodePage= GetConsoleCP(); + OutputCodePage = GetConsoleOutputCP(); #ifndef __REACTOS__ SetConsoleTitle (szWindowTitle); #endif @@ -1419,8 +1419,8 @@ #endif SetFileApisToOEM(); - GetCodePage = 0; - OutCodePage = 0; + InputCodePage= 0; + OutputCodePage = 0; hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, @@ -1433,8 +1433,8 @@ wColor = Info.wAttributes; wDefColor = wColor; - GetCodePage = GetConsoleCP(); - OutCodePage = GetConsoleOutputCP(); + InputCodePage= GetConsoleCP(); + OutputCodePage = GetConsoleOutputCP(); /* check switches on command-line */ Initialize(argc, argv); _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-05-07 11:14:58 UTC (rev 15076) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-05-07 11:54:22 UTC (rev 15077) @@ -298,8 +298,8 @@ VOID PrintTime (VOID); /* cache codepage */ -extern UINT GetCodePage; -extern UINT OutCodePage; +extern UINT InputCodePage; +extern UINT OutputCodePage; /* Prototypes for MEMORY.C */ INT CommandMemory (LPTSTR, LPTSTR); _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-05-07 11:14:58 UTC (rev 15076) +++ trunk/reactos/subsys/system/cmd/console.c 2005-05-07 11:54:22 UTC (rev 15077) @@ -20,8 +20,8 @@ #define OUTPUT_BUFFER_SIZE 4096 -UINT GetCodePage; -UINT OutCodePage; +UINT InputCodePage; +UINT OutputCodePage; VOID ConInDisable (VOID) @@ -111,7 +111,7 @@ ReadFile (hFile, (PVOID)pBuf, dwLength, &dwRead, NULL); #ifdef _UNICODE - MultiByteToWideChar( GetCodePage, 0, pBuf, dwLength + 1, lpInput, dwLength + 1); + MultiByteToWideChar( InputCodePage, 0, pBuf, dwLength + 1, lpInput, dwLength + 1); #endif p = lpInput; for (i = 0; i < dwRead; i++, p++) @@ -139,7 +139,7 @@ WCHAR ws[2]; ws[0] = c; ws[1] = 0; - WideCharToMultiByte( OutCodePage, 0, ws, 2, as, 2, NULL, NULL); + WideCharToMultiByte( OutputCodePage, 0, ws, 2, as, 2, NULL, NULL); cc = as[0]; #else cc = c; @@ -165,7 +165,7 @@ len = _tcslen(szText); #ifdef _UNICODE pBuf = malloc(len + 1); - len = WideCharToMultiByte( OutCodePage, 0, szText, len + 1, pBuf, len + 1, NULL, NULL) - 1; + len = WideCharToMultiByte( OutputCodePage, 0, szText, len + 1, pBuf, len + 1, NULL, NULL) - 1; #else pBuf = szText; #endif @@ -200,7 +200,7 @@ len = _vstprintf (szOut, szFormat, arg_ptr); #ifdef _UNICODE pBuf = malloc(len + 1); - len = WideCharToMultiByte( OutCodePage, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1; + len = WideCharToMultiByte( OutputCodePage, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1; #else pBuf = szOut; #endif _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-05-07 11:14:58 UTC (rev 15076) +++ trunk/reactos/subsys/system/cmd/start.c 2005-05-07 11:54:22 UTC (rev 15077) @@ -115,8 +115,8 @@ CloseHandle (prci.hThread); CloseHandle (prci.hProcess); /* Get New code page if it has change */ - GetCodePage = GetConsoleCP(); - OutCodePage = GetConsoleOutputCP(); + InputCodePage= GetConsoleCP(); + OutputCodePage = GetConsoleOutputCP(); } else {

19 years, 4 months

[greatlrd] 15076: Add cache for codepage so it does not call hole time on csrss when it wring out text

by greatlrd＠svn.reactos.com

Add cache for codepage so it does not call hole time on csrss when it wring out text it will incress the speed. Thx w3seek and kjk for the idea. Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-05-07 08:32:28 UTC (rev 15075) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-05-07 11:14:58 UTC (rev 15076) @@ -14,6 +14,8 @@ #include "precomp.h" #include "resource.h" + + #ifdef INCLUDE_CMD_CHCP INT CommandChcp (LPTSTR cmd, LPTSTR param) @@ -39,7 +41,7 @@ { /* display active code page number */ LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, GetConsoleCP()); + ConErrPrintf(szMsg, GetCodePage); return 0; } @@ -53,7 +55,7 @@ /* save old code page */ - uOldCodePage = GetConsoleCP(); + uOldCodePage = GetCodePage; uNewCodePage = (UINT)_ttoi(arg[0]); @@ -72,8 +74,10 @@ } else { + SetConsoleOutputCP (uNewCodePage); InitLocale (); + GetCodePage = GetConsoleCP(); } freep (arg); _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-05-07 08:32:28 UTC (rev 15075) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-05-07 11:14:58 UTC (rev 15076) @@ -426,6 +426,9 @@ ENABLE_PROCESSED_INPUT ); } + /* Get code page if it has been change */ + GetCodePage = GetConsoleCP(); + OutCodePage = GetConsoleOutputCP(); #ifndef __REACTOS__ SetConsoleTitle (szWindowTitle); #endif @@ -1416,6 +1419,8 @@ #endif SetFileApisToOEM(); + GetCodePage = 0; + OutCodePage = 0; hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, @@ -1428,6 +1433,9 @@ wColor = Info.wAttributes; wDefColor = wColor; + GetCodePage = GetConsoleCP(); + OutCodePage = GetConsoleOutputCP(); + /* check switches on command-line */ Initialize(argc, argv); _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-05-07 08:32:28 UTC (rev 15075) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-05-07 11:14:58 UTC (rev 15076) @@ -292,10 +292,14 @@ extern TCHAR cDecimalSeparator; extern INT nNumberGroups; + VOID InitLocale (VOID); VOID PrintDate (VOID); VOID PrintTime (VOID); +/* cache codepage */ +extern UINT GetCodePage; +extern UINT OutCodePage; /* Prototypes for MEMORY.C */ INT CommandMemory (LPTSTR, LPTSTR); _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-05-07 08:32:28 UTC (rev 15075) +++ trunk/reactos/subsys/system/cmd/console.c 2005-05-07 11:14:58 UTC (rev 15076) @@ -11,12 +11,19 @@ * Remove all hardcode string to En.rc */ + + #include "precomp.h" #include "resource.h" #define OUTPUT_BUFFER_SIZE 4096 + +UINT GetCodePage; +UINT OutCodePage; + + VOID ConInDisable (VOID) { HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); @@ -104,7 +111,7 @@ ReadFile (hFile, (PVOID)pBuf, dwLength, &dwRead, NULL); #ifdef _UNICODE - MultiByteToWideChar( GetConsoleCP(), 0, pBuf, dwLength + 1, lpInput, dwLength + 1); + MultiByteToWideChar( GetCodePage, 0, pBuf, dwLength + 1, lpInput, dwLength + 1); #endif p = lpInput; for (i = 0; i < dwRead; i++, p++) @@ -132,7 +139,7 @@ WCHAR ws[2]; ws[0] = c; ws[1] = 0; - WideCharToMultiByte( GetConsoleOutputCP(), 0, ws, 2, as, 2, NULL, NULL); + WideCharToMultiByte( OutCodePage, 0, ws, 2, as, 2, NULL, NULL); cc = as[0]; #else cc = c; @@ -158,7 +165,7 @@ len = _tcslen(szText); #ifdef _UNICODE pBuf = malloc(len + 1); - len = WideCharToMultiByte( GetConsoleOutputCP(), 0, szText, len + 1, pBuf, len + 1, NULL, NULL) - 1; + len = WideCharToMultiByte( OutCodePage, 0, szText, len + 1, pBuf, len + 1, NULL, NULL) - 1; #else pBuf = szText; #endif @@ -193,7 +200,7 @@ len = _vstprintf (szOut, szFormat, arg_ptr); #ifdef _UNICODE pBuf = malloc(len + 1); - len = WideCharToMultiByte( GetConsoleOutputCP(), 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1; + len = WideCharToMultiByte( OutCodePage, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1; #else pBuf = szOut; #endif _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-05-07 08:32:28 UTC (rev 15075) +++ trunk/reactos/subsys/system/cmd/start.c 2005-05-07 11:14:58 UTC (rev 15076) @@ -114,6 +114,9 @@ } CloseHandle (prci.hThread); CloseHandle (prci.hProcess); + /* Get New code page if it has change */ + GetCodePage = GetConsoleCP(); + OutCodePage = GetConsoleOutputCP(); } else {

19 years, 4 months

[weiden] 15043: - fixed Read/WriteFile(Ex) and properly wait on completion for synchronous operations

by weiden＠svn.reactos.com

- fixed Read/WriteFile(Ex) and properly wait on completion for synchronous operations - prevent completion port notification by not passing an APC context to the kernel when the low-order bit of the event handle is set (for asynchronous operations) Modified: trunk/reactos/lib/kernel32/file/rw.c _____ Modified: trunk/reactos/lib/kernel32/file/rw.c --- trunk/reactos/lib/kernel32/file/rw.c 2005-05-06 13:35:27 UTC (rev 15042) +++ trunk/reactos/lib/kernel32/file/rw.c 2005-05-06 14:02:45 UTC (rev 15043) @@ -23,78 +23,104 @@ * @implemented */ BOOL STDCALL -WriteFile(HANDLE hFile, - LPCVOID lpBuffer, - DWORD nNumberOfBytesToWrite, - LPDWORD lpNumberOfBytesWritten, - LPOVERLAPPED lpOverLapped) +WriteFile(IN HANDLE hFile, + IN LPCVOID lpBuffer, + IN DWORD nNumberOfBytesToWrite OPTIONAL, + OUT LPDWORD lpNumberOfBytesWritten OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL) { - HANDLE hEvent = NULL; - LARGE_INTEGER Offset; - NTSTATUS errCode; - IO_STATUS_BLOCK IIosb; - PIO_STATUS_BLOCK IoStatusBlock; - PLARGE_INTEGER ptrOffset; + NTSTATUS Status; - DPRINT("WriteFile(hFile %x)\n",hFile); + DPRINT("WriteFile(hFile %x)\n", hFile); - if (lpOverLapped == NULL && lpNumberOfBytesWritten == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - } + if (lpNumberOfBytesWritten != NULL) + { + *lpNumberOfBytesWritten = 0; + } - if (lpNumberOfBytesWritten) - { - *lpNumberOfBytesWritten = 0; - } - if (IsConsoleHandle(hFile)) { - return(WriteConsoleA(hFile, - lpBuffer, - nNumberOfBytesToWrite, - lpNumberOfBytesWritten, - NULL)); + return WriteConsoleA(hFile, + lpBuffer, + nNumberOfBytesToWrite, + lpNumberOfBytesWritten, + lpOverlapped); } - if (lpOverLapped != NULL) + if (lpOverlapped != NULL) { - Offset.u.LowPart = lpOverLapped->Offset; - Offset.u.HighPart = lpOverLapped->OffsetHigh; - lpOverLapped->Internal = STATUS_PENDING; - hEvent = lpOverLapped->hEvent; - IoStatusBlock = (PIO_STATUS_BLOCK)lpOverLapped; - ptrOffset = &Offset; + LARGE_INTEGER Offset; + PVOID ApcContext; + + Offset.u.LowPart = lpOverlapped->Offset; + Offset.u.HighPart = lpOverlapped->OffsetHigh; + lpOverlapped->Internal = STATUS_PENDING; + ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); + + Status = NtWriteFile(hFile, + lpOverlapped->hEvent, + NULL, + ApcContext, + (PIO_STATUS_BLOCK)lpOverlapped, + (PVOID)lpBuffer, + nNumberOfBytesToWrite, + &Offset, + NULL); + + /* return FALSE in case of failure and pending operations! */ + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + if (lpNumberOfBytesWritten != NULL) + { + *lpNumberOfBytesWritten = lpOverlapped->InternalHigh; + } } else { - ptrOffset = NULL; - IoStatusBlock = &IIosb; + IO_STATUS_BLOCK Iosb; + + Status = NtWriteFile(hFile, + NULL, + NULL, + NULL, + &Iosb, + (PVOID)lpBuffer, + nNumberOfBytesToWrite, + NULL, + NULL); + + /* wait in case operation is pending */ + if (Status == STATUS_PENDING) + { + Status = NtWaitForSingleObject(hFile, + FALSE, + NULL); + if (NT_SUCCESS(Status)) + { + Status = Iosb.Status; + } + } + + if (NT_SUCCESS(Status)) + { + /* lpNumberOfBytesWritten must not be NULL here, in fact Win doesn't + check that case either and crashes (only after the operation + completed) */ + *lpNumberOfBytesWritten = Iosb.Information; + } + else + { + SetLastErrorByStatus(Status); + return FALSE; + } } - - errCode = NtWriteFile(hFile, - hEvent, - NULL, - NULL, - IoStatusBlock, - (PVOID)lpBuffer, - nNumberOfBytesToWrite, - ptrOffset, - NULL); - - if (!NT_SUCCESS(errCode) || errCode == STATUS_PENDING) - { - SetLastErrorByStatus (errCode); - return FALSE; - } - if (lpNumberOfBytesWritten != NULL ) - { - *lpNumberOfBytesWritten = IoStatusBlock->Information; - } - - DPRINT("WriteFile() succeeded\n"); - return(TRUE); + DPRINT("WriteFile() succeeded\n"); + return TRUE; } @@ -102,87 +128,119 @@ * @implemented */ BOOL STDCALL -ReadFile( - HANDLE hFile, - LPVOID lpBuffer, - DWORD nNumberOfBytesToRead, - LPDWORD lpNumberOfBytesRead, - LPOVERLAPPED lpOverLapped - ) +ReadFile(IN HANDLE hFile, + IN LPVOID lpBuffer, + IN DWORD nNumberOfBytesToRead, + OUT LPDWORD lpNumberOfBytesRead OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL) { - HANDLE hEvent = NULL; - LARGE_INTEGER Offset; - NTSTATUS errCode; - IO_STATUS_BLOCK IIosb; - PIO_STATUS_BLOCK IoStatusBlock; - PLARGE_INTEGER ptrOffset; + NTSTATUS Status; - if (lpOverLapped == NULL && lpNumberOfBytesRead == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - } + DPRINT("ReadFile(hFile %x)\n", hFile); - if (lpNumberOfBytesRead) - { - *lpNumberOfBytesRead = 0; - } - - if (IsConsoleHandle(hFile)) - { - return(ReadConsoleA(hFile, - lpBuffer, - nNumberOfBytesToRead, - lpNumberOfBytesRead, - NULL)); - } - - if (lpOverLapped) - { - Offset.u.LowPart = lpOverLapped->Offset; - Offset.u.HighPart = lpOverLapped->OffsetHigh; - lpOverLapped->Internal = STATUS_PENDING; - hEvent = lpOverLapped->hEvent; - IoStatusBlock = (PIO_STATUS_BLOCK)lpOverLapped; - ptrOffset = &Offset; - } - else - { - ptrOffset = NULL; - IoStatusBlock = &IIosb; - } - - errCode = NtReadFile(hFile, - hEvent, - NULL, - NULL, - IoStatusBlock, - lpBuffer, - nNumberOfBytesToRead, - ptrOffset, - NULL); + if (lpNumberOfBytesRead != NULL) + { + *lpNumberOfBytesRead = 0; + } - /* for non-overlapped io, a end-of-file error is translated to - a successful operation with zero bytes read */ - if (!lpOverLapped && errCode == STATUS_END_OF_FILE) - { - /* IoStatusBlock->Information should contain zero in case of an error, but to be safe, - set lpNumberOfBytesRead to zero manually instead of using IoStatusBlock->Information */ - *lpNumberOfBytesRead = 0; - return TRUE; - } - - if (!NT_SUCCESS(errCode) || errCode == STATUS_PENDING) - { - SetLastErrorByStatus (errCode); - return FALSE; - } + if (IsConsoleHandle(hFile)) + { + return ReadConsoleA(hFile, + lpBuffer, + nNumberOfBytesToRead, + lpNumberOfBytesRead, + lpOverlapped); + } - if (lpNumberOfBytesRead != NULL) - { - *lpNumberOfBytesRead = IoStatusBlock->Information; - } - - return(TRUE); + if (lpOverlapped != NULL) + { + LARGE_INTEGER Offset; + PVOID ApcContext; + + Offset.u.LowPart = lpOverlapped->Offset; + Offset.u.HighPart = lpOverlapped->OffsetHigh; + lpOverlapped->Internal = STATUS_PENDING; + ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); + + Status = NtReadFile(hFile, + lpOverlapped->hEvent, + NULL, + ApcContext, + (PIO_STATUS_BLOCK)lpOverlapped, + lpBuffer, + nNumberOfBytesToRead, + &Offset, + NULL); + + /* return FALSE in case of failure and pending operations! */ + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + { + if (Status == STATUS_END_OF_FILE && + lpNumberOfBytesRead != NULL) + { + *lpNumberOfBytesRead = 0; + } + + SetLastErrorByStatus(Status); + return FALSE; + } + + if (lpNumberOfBytesRead != NULL) + { + *lpNumberOfBytesRead = lpOverlapped->InternalHigh; + } + } + else + { + IO_STATUS_BLOCK Iosb; + + Status = NtReadFile(hFile, + NULL, + NULL, + NULL, + &Iosb, + lpBuffer, + nNumberOfBytesToRead, + NULL, + NULL); + + /* wait in case operation is pending */ + if (Status == STATUS_PENDING) + { + Status = NtWaitForSingleObject(hFile, + FALSE, + NULL); + if (NT_SUCCESS(Status)) + { + Status = Iosb.Status; + } + } + + if (Status == STATUS_END_OF_FILE) + { + /* lpNumberOfBytesRead must not be NULL here, in fact Win doesn't + check that case either and crashes (only after the operation + completed) */ + *lpNumberOfBytesRead = Iosb.Information; + return TRUE; + } + + if (NT_SUCCESS(Status)) + { + /* lpNumberOfBytesRead must not be NULL here, in fact Win doesn't + check that case either and crashes (only after the operation + completed) */ + *lpNumberOfBytesRead = Iosb.Information; + } + else + { + SetLastErrorByStatus(Status); + return FALSE; + } + } + + DPRINT("ReadFile() succeeded\n"); + return TRUE; } VOID STDCALL @@ -191,13 +249,13 @@ ULONG Reserved) { DWORD dwErrorCode; - LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine = + LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine = (LPOVERLAPPED_COMPLETION_ROUTINE)ApcContext; dwErrorCode = RtlNtStatusToDosError(IoStatusBlock->Status); - lpCompletionRoutine(dwErrorCode, - IoStatusBlock->Information, - (LPOVERLAPPED)IoStatusBlock); + lpCompletionRoutine(dwErrorCode, + IoStatusBlock->Information, + (LPOVERLAPPED)IoStatusBlock); } @@ -205,54 +263,36 @@ * @implemented */ BOOL STDCALL -WriteFileEx (HANDLE hFile, - LPCVOID lpBuffer, - DWORD nNumberOfBytesToWrite, - LPOVERLAPPED lpOverLapped, - LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +WriteFileEx(IN HANDLE hFile, + IN LPCVOID lpBuffer, + IN DWORD nNumberOfBytesToWrite OPTIONAL, + IN LPOVERLAPPED lpOverlapped, + IN LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - LARGE_INTEGER Offset; - NTSTATUS errCode; - PIO_STATUS_BLOCK IoStatusBlock; - PLARGE_INTEGER ptrOffset; - - DPRINT("WriteFileEx(hFile %x)\n",hFile); - - Offset.u.LowPart = lpOverLapped->Offset; - Offset.u.HighPart = lpOverLapped->OffsetHigh; - lpOverLapped->Internal = STATUS_PENDING; - IoStatusBlock = (PIO_STATUS_BLOCK)lpOverLapped; - ptrOffset = &Offset; + NTSTATUS Status; - errCode = NtWriteFile(hFile, - NULL, - ApcRoutine, - lpCompletionRoutine, - IoStatusBlock, - (PVOID)lpBuffer, - nNumberOfBytesToWrite, - ptrOffset, - NULL); - - if (NT_ERROR(errCode)) + Offset.u.LowPart = lpOverlapped->Offset; + Offset.u.HighPart = lpOverlapped->OffsetHigh; + lpOverlapped->Internal = STATUS_PENDING; + + Status = NtWriteFile(hFile, + NULL, + ApcRoutine, + lpCompletionRoutine, + (PIO_STATUS_BLOCK)lpOverlapped, + (PVOID)lpBuffer, + nNumberOfBytesToWrite, + &Offset, + NULL); + + if (!NT_SUCCESS(Status)) { - SetLastErrorByStatus (errCode); - DPRINT("WriteFileEx() failed\n"); + SetLastErrorByStatus(Status); return FALSE; } - - if (NT_WARNING(errCode)) - { - SetLastErrorByStatus(errCode); - } - else - { - SetLastError(0); - } - - DPRINT("WriteFileEx() succeeded\n"); - return(TRUE); + + return TRUE; } @@ -260,49 +300,36 @@ * @implemented */ BOOL STDCALL -ReadFileEx(HANDLE hFile, - LPVOID lpBuffer, - DWORD nNumberOfBytesToRead, - LPOVERLAPPED lpOverLapped, - LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +ReadFileEx(IN HANDLE hFile, + IN LPVOID lpBuffer, + IN DWORD nNumberOfBytesToRead OPTIONAL, + IN LPOVERLAPPED lpOverlapped, + IN LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { LARGE_INTEGER Offset; - NTSTATUS errCode; - PIO_STATUS_BLOCK IoStatusBlock; - PLARGE_INTEGER ptrOffset; + NTSTATUS Status; - Offset.u.LowPart = lpOverLapped->Offset; - Offset.u.HighPart = lpOverLapped->OffsetHigh; - lpOverLapped->Internal = STATUS_PENDING; - IoStatusBlock = (PIO_STATUS_BLOCK)lpOverLapped; - ptrOffset = &Offset; + Offset.u.LowPart = lpOverlapped->Offset; + Offset.u.HighPart = lpOverlapped->OffsetHigh; + lpOverlapped->Internal = STATUS_PENDING; - errCode = NtReadFile(hFile, - NULL, - ApcRoutine, - lpCompletionRoutine, - IoStatusBlock, - lpBuffer, - nNumberOfBytesToRead, - ptrOffset, - NULL); + Status = NtReadFile(hFile, + NULL, + ApcRoutine, + lpCompletionRoutine, + (PIO_STATUS_BLOCK)lpOverlapped, + lpBuffer, + nNumberOfBytesToRead, + &Offset, + NULL); - if (NT_ERROR(errCode)) + if (!NT_SUCCESS(Status)) { - SetLastErrorByStatus (errCode); - return(FALSE); + SetLastErrorByStatus(Status); + return FALSE; } - if (NT_WARNING(errCode)) - { - SetLastErrorByStatus(errCode); - } - else - { - SetLastError(0); - } - - return(TRUE); + return TRUE; } /* EOF */

19 years, 4 months

[chorns] 15075: Make expat a static library

by chorns＠svn.reactos.com

Make expat a static library Modified: branches/xmlbuildsystem/reactos/baseaddress.xml Modified: branches/xmlbuildsystem/reactos/lib/expat/expat.xml _____ Modified: branches/xmlbuildsystem/reactos/baseaddress.xml --- branches/xmlbuildsystem/reactos/baseaddress.xml 2005-05-07 08:15:07 UTC (rev 15074) +++ branches/xmlbuildsystem/reactos/baseaddress.xml 2005-05-07 08:32:28 UTC (rev 15075) @@ -101,4 +101,3 @@ <property name="BASEADDRESS_W2_32" value="0x77780000" /> <property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> <property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" /> -<property name="BASEADDRESS_EXPAT" value="0x79000000" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/expat/expat.xml --- branches/xmlbuildsystem/reactos/lib/expat/expat.xml 2005-05-07 08:15:07 UTC (rev 15074) +++ branches/xmlbuildsystem/reactos/lib/expat/expat.xml 2005-05-07 08:32:28 UTC (rev 15075) @@ -1,10 +1,8 @@ -<module name="expat" type="win32dll"> - <importlibrary definition="lib/libexpat.def" /> +<module name="expat" type="staticlibrary"> <include base="expat">.</include> <include base="expat">lib</include> <define name="HAVE_EXPAT_CONFIG_H" /> <define name="__USE_W32API" /> - <library>kernel32</library> <directory name="lib"> <file>xmlparse.c</file> <file>xmlrole.c</file>

19 years, 4 months

[chorns] 15074: Correct typo

by chorns＠svn.reactos.com

Correct typo Modified: branches/xmlbuildsystem/reactos/baseaddress.xml _____ Modified: branches/xmlbuildsystem/reactos/baseaddress.xml --- branches/xmlbuildsystem/reactos/baseaddress.xml 2005-05-07 08:08:12 UTC (rev 15073) +++ branches/xmlbuildsystem/reactos/baseaddress.xml 2005-05-07 08:15:07 UTC (rev 15074) @@ -66,7 +66,7 @@ <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> <property name="BASEADDRESS_WINSPOOL" value="0x77800000" /> <property name="BASEADDRESS_VERSION" value="0x77a90000" /> -<property name="BASEADDRESS_WS2_32" value="0x777aa000" /> +<property name="BASEADDRESS_WS2_32" value="0x77aa0000" /> <property name="BASEADDRESS_OLE32" value="0x77a50000" /> <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" />

19 years, 4 months

[chorns] 15073: Correctly forward exports to NTDLL

by chorns＠svn.reactos.com

Correctly forward exports to NTDLL Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.def _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.def --- branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.def 2005-05-07 07:46:54 UTC (rev 15072) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.def 2005-05-07 08:08:12 UTC (rev 15073) @@ -517,11 +517,11 @@ _strdate _strdup _strerror -_stricmp=NTDLL.stricmp +_stricmp=NTDLL._stricmp _stricoll _strlwr=NTDLL._strlwr _strncoll -_strnicmp=NTDLL.strnicmp +_strnicmp=NTDLL._strnicmp _strnicoll _strnset _strrev

19 years, 4 months

[chorns] 15072: Smdll is a native DLL. Thanks to Ge van Geldorp for figuring this out.

by chorns＠svn.reactos.com

Smdll is a native DLL. Thanks to Ge van Geldorp for figuring this out. Modified: branches/xmlbuildsystem/reactos/lib/smdll/smdll.xml _____ Modified: branches/xmlbuildsystem/reactos/lib/smdll/smdll.xml --- branches/xmlbuildsystem/reactos/lib/smdll/smdll.xml 2005-05-07 06:09:56 UTC (rev 15071) +++ branches/xmlbuildsystem/reactos/lib/smdll/smdll.xml 2005-05-07 07:46:54 UTC (rev 15072) @@ -1,4 +1,4 @@ -<module name="smdll" type="win32dll" baseaddress="${BASEADDRESS_SMDLL}" installbase="system32" installname="smdll.dll"> +<module name="smdll" type="nativedll" baseaddress="${BASEADDRESS_SMDLL}" installbase="system32" installname="smdll.dll"> <importlibrary definition="smdll.def" /> <include base="smdll">.</include> <define name="_DISABLE_TIDENTS" />

19 years, 4 months

[ion] 15070: Fix driver loading. patch by tinus

by ion＠svn.reactos.com

Fix driver loading. patch by tinus Modified: trunk/reactos/ntoskrnl/io/driver.c _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-05-07 01:13:04 UTC (rev 15069) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-05-07 01:17:36 UTC (rev 15070) @@ -916,8 +916,20 @@ NULL); if (!NT_SUCCESS(Status) || Service->Start > 1) { - ExFreePool(Service->ServiceGroup.Buffer); - ExFreePool(Service->ImagePath.Buffer); + /* + * If something goes wrong during RtlQueryRegistryValues + * it'll just drop everything on the floor and return, + * so you have to check if the buffers were filled. + * Luckily we zerofilled the Service. + */ + if (Service->ServiceGroup.Buffer) + { + ExFreePool(Service->ServiceGroup.Buffer); + } + if (Service->ImagePath.Buffer) + { + ExFreePool(Service->ImagePath.Buffer); + } ExFreePool(Service); return(Status); }

19 years, 4 months

← Newer
1
...
61
62
63
64
65
66
67
...
82
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 May 2005