Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 32693: Daniel Zimmerman <netzimme@aim.com> - Implement RtlGetCallersAddress. - Add RtlCaptureStackBackTrace prototype to PSDK. See issue #3125 for more details.
by fireball＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: fireball Date: Sat Mar 15 04:29:54 2008 New Revision: 32693 URL: http://svn.reactos.org/svn/reactos?rev=3D32693&view=3Drev Log: Daniel Zimmerman <netzimme(a)aim.com> - Implement RtlGetCallersAddress. - Add RtlCaptureStackBackTrace prototype to PSDK. See issue #3125 for more details. Modified: trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/rtl/i386/except.c Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?= rev=3D32693&r1=3D32692&r2=3D32693&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sat Mar 15 04:29:54 2008 @@ -2903,6 +2903,17 @@ #endif = NTSYSAPI +WORD = +NTAPI +RtlCaptureStackBackTrace( + IN DWORD FramesToSkip, + IN DWORD FramesToCapture, + OUT PVOID *BackTrace, + OUT PDWORD BackTraceHash OPTIONAL +); + + +NTSYSAPI PVOID NTAPI RtlPcToFileHeader( Modified: trunk/reactos/lib/rtl/i386/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/except.c= ?rev=3D32693&r1=3D32692&r2=3D32693&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/lib/rtl/i386/except.c (original) +++ trunk/reactos/lib/rtl/i386/except.c Sat Mar 15 04:29:54 2008 @@ -16,14 +16,47 @@ /* PUBLIC FUNCTIONS ******************************************************= ****/ = /* - * @unimplemented + * @implemented */ VOID NTAPI RtlGetCallersAddress(OUT PVOID *CallersAddress, OUT PVOID *CallersCaller) { - UNIMPLEMENTED; + USHORT FrameCount; + PVOID BackTrace[2]; + PULONG BackTraceHash =3D NULL; + + /* Get the tow back trace address */ + FrameCount =3D RtlCaptureStackBackTrace(2, 2, &BackTrace[0],BackTraceH= ash); + + /* Only if user want it */ + if (*CallersAddress !=3D NULL) + { + /* only when first frames exist */ = + if (FrameCount >=3D 1) + { + *CallersAddress =3D BackTrace[0]; + } + else + { + *CallersAddress =3D NULL; + } + } + + /* Only if user want it */ + if (*CallersCaller !=3D NULL) + { + /* only when second frames exist */ = + if (FrameCount >=3D 2) + { + *CallersCaller =3D BackTrace[1]; + } + else + { + *CallersCaller =3D NULL; + } + } } = /*

1 0

[pschweitzer] 32692: [FORMATTING] Fix indentation (only for functional code)
by pschweitzer＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: pschweitzer Date: Sat Mar 15 04:25:09 2008 New Revision: 32692 URL: http://svn.reactos.org/svn/reactos?rev=3D32692&view=3Drev Log: [FORMATTING] Fix indentation (only for functional code) Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fcb.c?rev=3D32692&r1=3D32691&r2=3D32692&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c Sat Mar 15 04:25:09 2008 @@ -46,14 +46,14 @@ NtfsGetNextPathElement(PWCHAR FileName) { if (*FileName =3D=3D L'\0') - { - return(NULL); - } + { + return(NULL); + } = while (*FileName !=3D L'\0' && *FileName !=3D L'\\') - { - FileName++; - } + { + FileName++; + } = return(FileName); } @@ -76,17 +76,17 @@ RtlZeroMemory(Fcb, sizeof(NTFS_FCB)); = if (FileName) - { - wcscpy(Fcb->PathName, FileName); - if (wcsrchr(Fcb->PathName, '\\') !=3D 0) - { - Fcb->ObjectName =3D wcsrchr(Fcb->PathName, '\\'); - } - else - { - Fcb->ObjectName =3D Fcb->PathName; - } - } + { + wcscpy(Fcb->PathName, FileName); + if (wcsrchr(Fcb->PathName, '\\') !=3D 0) + { + Fcb->ObjectName =3D wcsrchr(Fcb->PathName, '\\'); + } + else + { + Fcb->ObjectName =3D Fcb->PathName; + } + } = ExInitializeResourceLite(&Fcb->MainResource); = @@ -121,14 +121,14 @@ = VOID NtfsGrabFCB(PNTFS_VCB Vcb, - PNTFS_FCB Fcb) + PNTFS_FCB Fcb) { KIRQL oldIrql; = DPRINT("grabbing FCB at %p: %S, refCount:%d\n", - Fcb, - Fcb->PathName, - Fcb->RefCount); + Fcb, + Fcb->PathName, + Fcb->RefCount); = KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); Fcb->RefCount++; @@ -138,30 +138,30 @@ = VOID NtfsReleaseFCB(PNTFS_VCB Vcb, - PNTFS_FCB Fcb) + PNTFS_FCB Fcb) { KIRQL oldIrql; = DPRINT("releasing FCB at %p: %S, refCount:%d\n", - Fcb, - Fcb->PathName, - Fcb->RefCount); + Fcb, + Fcb->PathName, + Fcb->RefCount); = KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); Fcb->RefCount--; if (Fcb->RefCount <=3D 0 && !NtfsFCBIsDirectory(Fcb)) - { - RemoveEntryList(&Fcb->FcbListEntry); - CcUninitializeCacheMap (Fcb->FileObject, NULL, NULL); - NtfsDestroyFCB(Fcb); - } + { + RemoveEntryList(&Fcb->FcbListEntry); + CcUninitializeCacheMap (Fcb->FileObject, NULL, NULL); + NtfsDestroyFCB(Fcb); + } KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); } = = VOID NtfsAddFCBToTable(PNTFS_VCB Vcb, - PNTFS_FCB Fcb) + PNTFS_FCB Fcb) { KIRQL oldIrql; = @@ -174,7 +174,7 @@ = PNTFS_FCB NtfsGrabFCBFromTable(PNTFS_VCB Vcb, - PCWSTR FileName) + PCWSTR FileName) { KIRQL oldIrql; PNTFS_FCB Fcb; @@ -183,31 +183,31 @@ KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); = if (FileName =3D=3D NULL || *FileName =3D=3D 0) - { - DPRINT("Return FCB for stream file object\n"); - Fcb =3D Vcb->StreamFileObject->FsContext; + { + DPRINT("Return FCB for stream file object\n"); + Fcb =3D Vcb->StreamFileObject->FsContext; + Fcb->RefCount++; + KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); + return(Fcb); + } + + current_entry =3D Vcb->FcbListHead.Flink; + while (current_entry !=3D &Vcb->FcbListHead) + { + Fcb =3D CONTAINING_RECORD(current_entry, NTFS_FCB, FcbListEntry); + + DPRINT("Comparing '%S' and '%S'\n", FileName, Fcb->PathName); + if (_wcsicmp(FileName, Fcb->PathName) =3D=3D 0) + { Fcb->RefCount++; KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); return(Fcb); } = - current_entry =3D Vcb->FcbListHead.Flink; - while (current_entry !=3D &Vcb->FcbListHead) - { - Fcb =3D CONTAINING_RECORD(current_entry, NTFS_FCB, FcbListEntry); - - DPRINT("Comparing '%S' and '%S'\n", FileName, Fcb->PathName); - if (_wcsicmp(FileName, Fcb->PathName) =3D=3D 0) - { - Fcb->RefCount++; - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); - return(Fcb); - } - //FIXME: need to compare against short name in FCB here = - current_entry =3D current_entry->Flink; - } + current_entry =3D current_entry->Flink; + } KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); = return(NULL); @@ -216,7 +216,7 @@ = NTSTATUS NtfsFCBInitializeCache(PNTFS_VCB Vcb, - PNTFS_FCB Fcb) + PNTFS_FCB Fcb) { PFILE_OBJECT FileObject; NTSTATUS Status; @@ -226,11 +226,10 @@ = newCCB =3D ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_CCB), TAG_CCB= ); if (newCCB =3D=3D NULL) - { + { return(STATUS_INSUFFICIENT_RESOURCES); - } - RtlZeroMemory(newCCB, - sizeof(NTFS_CCB)); + } + RtlZeroMemory(newCCB, sizeof(NTFS_CCB)); = FileObject->SectionObjectPointer =3D &Fcb->SectionObjectPointers; FileObject->FsContext =3D Fcb; @@ -286,9 +285,9 @@ = Fcb =3D NtfsGrabFCBFromTable(Vcb, L"\\"); if (Fcb =3D=3D NULL) - { - Fcb =3D NtfsMakeRootFCB(Vcb); - } + { + Fcb =3D NtfsMakeRootFCB(Vcb); + } = return(Fcb); } @@ -387,16 +386,16 @@ = NTSTATUS NtfsAttachFCBToFileObject(PNTFS_VCB Vcb, - PNTFS_FCB Fcb, - PFILE_OBJECT FileObject) + PNTFS_FCB Fcb, + PFILE_OBJECT FileObject) { PNTFS_CCB newCCB; = newCCB =3D ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_CCB), TAG_CCB= ); if (newCCB =3D=3D NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } + { + return(STATUS_INSUFFICIENT_RESOURCES); + } memset(newCCB, 0, sizeof(NTFS_CCB)); = FileObject->SectionObjectPointer =3D &Fcb->SectionObjectPointers; @@ -406,15 +405,15 @@ Fcb->DevExt =3D Vcb; = if (!(Fcb->Flags & FCB_CACHE_INITIALIZED)) - { - CcInitializeCacheMap(FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - NULL, - NULL); - - Fcb->Flags |=3D FCB_CACHE_INITIALIZED; - } + { + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + NULL, + NULL); + + Fcb->Flags |=3D FCB_CACHE_INITIALIZED; + } = //DPRINT("file open: fcb:%x file size: %d\n", Fcb, Fcb->Entry.DataLength= L); = @@ -424,9 +423,9 @@ = static NTSTATUS NtfsDirFindFile(PNTFS_VCB Vcb, - PNTFS_FCB DirectoryFcb, - PWSTR FileToFind, - PNTFS_FCB *FoundFCB) + PNTFS_FCB DirectoryFcb, + PWSTR FileToFind, + PNTFS_FCB *FoundFCB) { #if 0 WCHAR TempName[2]; @@ -535,9 +534,9 @@ = NTSTATUS NtfsGetFCBForFile(PNTFS_VCB Vcb, - PNTFS_FCB *pParentFCB, - PNTFS_FCB *pFCB, - const PWSTR pFileName) + PNTFS_FCB *pParentFCB, + PNTFS_FCB *pFCB, + const PWSTR pFileName) { NTSTATUS Status; WCHAR pathName [MAX_PATH]; @@ -547,10 +546,10 @@ PNTFS_FCB parentFCB; = DPRINT("NtfsGetFCBForFile(%p, %p, %p, '%S')\n", - Vcb, - pParentFCB, - pFCB, - pFileName); + Vcb, + pParentFCB, + pFCB, + pFileName); = /* Dummy code */ // FCB =3D NtfsOpenRootFCB(Vcb); @@ -560,97 +559,97 @@ #if 1 /* Trivial case, open of the root directory on volume */ if (pFileName [0] =3D=3D L'\0' || wcscmp(pFileName, L"\\") =3D=3D 0) - { - DPRINT("returning root FCB\n"); - - FCB =3D NtfsOpenRootFCB(Vcb); - *pFCB =3D FCB; - *pParentFCB =3D NULL; - - return((FCB !=3D NULL) ? STATUS_SUCCESS : STATUS_OBJECT_PATH_NOT_FOU= ND); - } + { + DPRINT("returning root FCB\n"); + + FCB =3D NtfsOpenRootFCB(Vcb); + *pFCB =3D FCB; + *pParentFCB =3D NULL; + + return((FCB !=3D NULL) ? STATUS_SUCCESS : STATUS_OBJECT_PATH_NOT_FOUND= ); + } else - { - currentElement =3D pFileName + 1; - wcscpy (pathName, L"\\"); - FCB =3D NtfsOpenRootFCB (Vcb); - } + { + currentElement =3D pFileName + 1; + wcscpy (pathName, L"\\"); + FCB =3D NtfsOpenRootFCB (Vcb); + } parentFCB =3D NULL; = /* Parse filename and check each path element for existance and access */ while (NtfsGetNextPathElement(currentElement) !=3D 0) - { - /* Skip blank directory levels */ - if ((NtfsGetNextPathElement(currentElement) - currentElement) =3D=3D= 0) - { - currentElement++; - continue; - } - - DPRINT("Parsing, currentElement:%S\n", currentElement); - DPRINT(" parentFCB:%p FCB:%p\n", parentFCB, FCB); - - /* Descend to next directory level */ - if (parentFCB) - { - NtfsReleaseFCB(Vcb, parentFCB); - parentFCB =3D NULL; - } - - /* fail if element in FCB is not a directory */ - if (!NtfsFCBIsDirectory(FCB)) - { - DPRINT("Element in requested path is not a directory\n"); - - NtfsReleaseFCB(Vcb, FCB); - FCB =3D 0; - *pParentFCB =3D NULL; - *pFCB =3D NULL; - - return(STATUS_OBJECT_PATH_NOT_FOUND); - } - parentFCB =3D FCB; - - /* Extract next directory level into dirName */ - NtfsWSubString(pathName, - pFileName, - NtfsGetNextPathElement(currentElement) - pFileName); - DPRINT(" pathName:%S\n", pathName); - - FCB =3D NtfsGrabFCBFromTable(Vcb, pathName); - if (FCB =3D=3D NULL) - { - NtfsWSubString(elementName, - currentElement, - NtfsGetNextPathElement(currentElement) - currentElement); - DPRINT(" elementName:%S\n", elementName); - - Status =3D NtfsDirFindFile(Vcb, parentFCB, elementName, &FCB); - if (Status =3D=3D STATUS_OBJECT_NAME_NOT_FOUND) - { - *pParentFCB =3D parentFCB; - *pFCB =3D NULL; - currentElement =3D NtfsGetNextPathElement(currentElement); - if (*currentElement =3D=3D L'\0' || NtfsGetNextPathElement(currentE= lement + 1) =3D=3D 0) - { - return(STATUS_OBJECT_NAME_NOT_FOUND); - } - else - { - return(STATUS_OBJECT_PATH_NOT_FOUND); - } - } - else if (!NT_SUCCESS(Status)) - { - NtfsReleaseFCB(Vcb, parentFCB); - *pParentFCB =3D NULL; - *pFCB =3D NULL; - - return(Status); - } - } - currentElement =3D NtfsGetNextPathElement(currentElement); - } + { + /* Skip blank directory levels */ + if ((NtfsGetNextPathElement(currentElement) - currentElement) =3D=3D 0) + { + currentElement++; + continue; + } + + DPRINT("Parsing, currentElement:%S\n", currentElement); + DPRINT(" parentFCB:%p FCB:%p\n", parentFCB, FCB); + + /* Descend to next directory level */ + if (parentFCB) + { + NtfsReleaseFCB(Vcb, parentFCB); + parentFCB =3D NULL; + } + + /* fail if element in FCB is not a directory */ + if (!NtfsFCBIsDirectory(FCB)) + { + DPRINT("Element in requested path is not a directory\n"); + + NtfsReleaseFCB(Vcb, FCB); + FCB =3D 0; + *pParentFCB =3D NULL; + *pFCB =3D NULL; + + return(STATUS_OBJECT_PATH_NOT_FOUND); + } + parentFCB =3D FCB; + + /* Extract next directory level into dirName */ + NtfsWSubString(pathName, + pFileName, + NtfsGetNextPathElement(currentElement) - pFileName); + DPRINT(" pathName:%S\n", pathName); + + FCB =3D NtfsGrabFCBFromTable(Vcb, pathName); + if (FCB =3D=3D NULL) + { + NtfsWSubString(elementName, + currentElement, + NtfsGetNextPathElement(currentElement) - currentEleme= nt); + DPRINT(" elementName:%S\n", elementName); + + Status =3D NtfsDirFindFile(Vcb, parentFCB, elementName, &FCB); + if (Status =3D=3D STATUS_OBJECT_NAME_NOT_FOUND) + { + *pParentFCB =3D parentFCB; + *pFCB =3D NULL; + currentElement =3D NtfsGetNextPathElement(currentElement); + if (*currentElement =3D=3D L'\0' || NtfsGetNextPathElement(current= Element + 1) =3D=3D 0) + { + return(STATUS_OBJECT_NAME_NOT_FOUND); + } + else + { + return(STATUS_OBJECT_PATH_NOT_FOUND); + } + } + else if (!NT_SUCCESS(Status)) + { + NtfsReleaseFCB(Vcb, parentFCB); + *pParentFCB =3D NULL; + *pFCB =3D NULL; + + return(Status); + } + } + currentElement =3D NtfsGetNextPathElement(currentElement); + } = *pParentFCB =3D parentFCB; *pFCB =3D FCB;

1 0

[pschweitzer] 32691: - Renamed all control block structures to (P)NTFS_xCB - Added an identifier field to those structures (not yet used)
by pschweitzer＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: pschweitzer Date: Sat Mar 15 03:51:47 2008 New Revision: 32691 URL: http://svn.reactos.org/svn/reactos?rev=3D32691&view=3Drev Log: - Renamed all control block structures to (P)NTFS_xCB - Added an identifier field to those structures (not yet used) Modified: trunk/reactos/drivers/filesystems/ntfs/close.c trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/finfo.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/close.c?rev=3D32691&r1=3D32690&r2=3D32691&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/close.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/close.c Sat Mar 15 03:51:47 2008 @@ -43,13 +43,13 @@ * FUNCTION: Closes a file */ { - PCCB Ccb; + PNTFS_CCB Ccb; = DPRINT("NtfsCloseFile(DeviceExt %p, FileObject %p)\n", DeviceExt, FileObject); = - Ccb =3D (PCCB)(FileObject->FsContext2); + Ccb =3D (PNTFS_CCB)(FileObject->FsContext2); = DPRINT("Ccb %p\n", Ccb); if (Ccb =3D=3D NULL) Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/create.c?rev=3D32691&r1=3D32690&r2=3D32691&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/create.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c Sat Mar 15 03:51:47 2008 @@ -41,7 +41,7 @@ PWSTR *pAbsoluteFilename) { PWSTR rcName; - PFCB Fcb; + PNTFS_FCB Fcb; = DPRINT("try related for %S\n", pRelativeFileName); Fcb =3D pFileObject->FsContext; @@ -82,8 +82,8 @@ * FUNCTION: Opens a file */ { - PFCB ParentFcb; - PFCB Fcb; + PNTFS_FCB ParentFcb; + PNTFS_FCB Fcb; NTSTATUS Status; PWSTR AbsFileName =3D NULL; = Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/dirctl.c?rev=3D32691&r1=3D32690&r2=3D32691&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c Sat Mar 15 03:51:47 2008 @@ -489,8 +489,8 @@ ULONG FileIndex =3D 0; PUCHAR Buffer =3D NULL; PFILE_NAMES_INFORMATION Buffer0 =3D NULL; - PFCB Fcb; - PCCB Ccb; + PNTFS_FCB Fcb; + PNTFS_CCB Ccb; // FCB TempFcb; BOOLEAN First =3D FALSE; PIO_STACK_LOCATION Stack; @@ -507,8 +507,8 @@ Stack =3D IoGetCurrentIrpStackLocation(Irp); FileObject =3D Stack->FileObject; = - Ccb =3D (PCCB)FileObject->FsContext2; - Fcb =3D (PFCB)FileObject->FsContext; + Ccb =3D (PNTFS_CCB)FileObject->FsContext2; + Fcb =3D (PNTFS_FCB)FileObject->FsContext; = /* Obtain the callers parameters */ BufferLength =3D Stack->Parameters.QueryDirectory.Length; Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fcb.c?rev=3D32691&r1=3D32690&r2=3D32691&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c Sat Mar 15 03:51:47 2008 @@ -67,13 +67,13 @@ } = = -PFCB +PNTFS_FCB NtfsCreateFCB(PCWSTR FileName) { - PFCB Fcb; - - Fcb =3D ExAllocatePoolWithTag(NonPagedPool, sizeof(FCB), TAG_FCB); - RtlZeroMemory(Fcb, sizeof(FCB)); + PNTFS_FCB Fcb; + + Fcb =3D ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_FCB), TAG_FCB); + RtlZeroMemory(Fcb, sizeof(NTFS_FCB)); = if (FileName) { @@ -95,7 +95,7 @@ = = VOID -NtfsDestroyFCB(PFCB Fcb) +NtfsDestroyFCB(PNTFS_FCB Fcb) { ExDeleteResourceLite(&Fcb->MainResource); = @@ -104,7 +104,7 @@ = = BOOLEAN -NtfsFCBIsDirectory(PFCB Fcb) +NtfsFCBIsDirectory(PNTFS_FCB Fcb) { // return(Fcb->entry.Attrib & FILE_ATTRIBUTE_DIRECTORY); // return(Fcb->Entry.FileFlags & 0x02); @@ -113,15 +113,15 @@ = = BOOLEAN -NtfsFCBIsRoot(PFCB Fcb) +NtfsFCBIsRoot(PNTFS_FCB Fcb) { return(wcscmp(Fcb->PathName, L"\\") =3D=3D 0); } = = VOID -NtfsGrabFCB(PDEVICE_EXTENSION Vcb, - PFCB Fcb) +NtfsGrabFCB(PNTFS_VCB Vcb, + PNTFS_FCB Fcb) { KIRQL oldIrql; = @@ -137,8 +137,8 @@ = = VOID -NtfsReleaseFCB(PDEVICE_EXTENSION Vcb, - PFCB Fcb) +NtfsReleaseFCB(PNTFS_VCB Vcb, + PNTFS_FCB Fcb) { KIRQL oldIrql; = @@ -160,8 +160,8 @@ = = VOID -NtfsAddFCBToTable(PDEVICE_EXTENSION Vcb, - PFCB Fcb) +NtfsAddFCBToTable(PNTFS_VCB Vcb, + PNTFS_FCB Fcb) { KIRQL oldIrql; = @@ -172,12 +172,12 @@ } = = -PFCB -NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb, +PNTFS_FCB +NtfsGrabFCBFromTable(PNTFS_VCB Vcb, PCWSTR FileName) { KIRQL oldIrql; - PFCB Fcb; + PNTFS_FCB Fcb; PLIST_ENTRY current_entry; = KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); @@ -194,7 +194,7 @@ current_entry =3D Vcb->FcbListHead.Flink; while (current_entry !=3D &Vcb->FcbListHead) { - Fcb =3D CONTAINING_RECORD(current_entry, FCB, FcbListEntry); + Fcb =3D CONTAINING_RECORD(current_entry, NTFS_FCB, FcbListEntry); = DPRINT("Comparing '%S' and '%S'\n", FileName, Fcb->PathName); if (_wcsicmp(FileName, Fcb->PathName) =3D=3D 0) @@ -215,22 +215,22 @@ = = NTSTATUS -NtfsFCBInitializeCache(PVCB Vcb, - PFCB Fcb) +NtfsFCBInitializeCache(PNTFS_VCB Vcb, + PNTFS_FCB Fcb) { PFILE_OBJECT FileObject; NTSTATUS Status; - PCCB newCCB; + PNTFS_CCB newCCB; = FileObject =3D IoCreateStreamFileObject(NULL, Vcb->StorageDevice); = - newCCB =3D ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), TAG_CCB); + newCCB =3D ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_CCB), TAG_CCB= ); if (newCCB =3D=3D NULL) { return(STATUS_INSUFFICIENT_RESOURCES); } RtlZeroMemory(newCCB, - sizeof(CCB)); + sizeof(NTFS_CCB)); = FileObject->SectionObjectPointer =3D &Fcb->SectionObjectPointers; FileObject->FsContext =3D Fcb; @@ -253,10 +253,10 @@ } = = -PFCB -NtfsMakeRootFCB(PDEVICE_EXTENSION Vcb) -{ - PFCB Fcb; +PNTFS_FCB +NtfsMakeRootFCB(PNTFS_VCB Vcb) +{ + PNTFS_FCB Fcb; = Fcb =3D NtfsCreateFCB(L"\\"); = @@ -279,10 +279,10 @@ } = = -PFCB -NtfsOpenRootFCB(PDEVICE_EXTENSION Vcb) -{ - PFCB Fcb; +PNTFS_FCB +NtfsOpenRootFCB(PNTFS_VCB Vcb) +{ + PNTFS_FCB Fcb; = Fcb =3D NtfsGrabFCBFromTable(Vcb, L"\\"); if (Fcb =3D=3D NULL) @@ -386,18 +386,18 @@ = = NTSTATUS -NtfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb, - PFCB Fcb, +NtfsAttachFCBToFileObject(PNTFS_VCB Vcb, + PNTFS_FCB Fcb, PFILE_OBJECT FileObject) { - PCCB newCCB; - - newCCB =3D ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), TAG_CCB); + PNTFS_CCB newCCB; + + newCCB =3D ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_CCB), TAG_CCB= ); if (newCCB =3D=3D NULL) { return(STATUS_INSUFFICIENT_RESOURCES); } - memset(newCCB, 0, sizeof(CCB)); + memset(newCCB, 0, sizeof(NTFS_CCB)); = FileObject->SectionObjectPointer =3D &Fcb->SectionObjectPointers; FileObject->FsContext =3D Fcb; @@ -423,10 +423,10 @@ = = static NTSTATUS -NtfsDirFindFile(PDEVICE_EXTENSION DeviceExt, - PFCB DirectoryFcb, +NtfsDirFindFile(PNTFS_VCB Vcb, + PNTFS_FCB DirectoryFcb, PWSTR FileToFind, - PFCB *FoundFCB) + PNTFS_FCB *FoundFCB) { #if 0 WCHAR TempName[2]; @@ -534,17 +534,17 @@ = = NTSTATUS -NtfsGetFCBForFile(PDEVICE_EXTENSION Vcb, - PFCB *pParentFCB, - PFCB *pFCB, +NtfsGetFCBForFile(PNTFS_VCB Vcb, + PNTFS_FCB *pParentFCB, + PNTFS_FCB *pFCB, const PWSTR pFileName) { NTSTATUS Status; WCHAR pathName [MAX_PATH]; WCHAR elementName [MAX_PATH]; PWCHAR currentElement; - PFCB FCB; - PFCB parentFCB; + PNTFS_FCB FCB; + PNTFS_FCB parentFCB; = DPRINT("NtfsGetFCBForFile(%p, %p, %p, '%S')\n", Vcb, Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/finfo.c?rev=3D32691&r1=3D32690&r2=3D32691&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/finfo.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c Sat Mar 15 03:51:47 2008 @@ -36,7 +36,7 @@ /* FUNCTIONS *************************************************************= ***/ = static NTSTATUS -NtfsGetStandardInformation(PFCB Fcb, +NtfsGetStandardInformation(PNTFS_FCB Fcb, PDEVICE_OBJECT DeviceObject, PFILE_STANDARD_INFORMATION StandardInfo, PULONG BufferLength) @@ -91,7 +91,7 @@ = static NTSTATUS NtfsGetBasicInformation(PFILE_OBJECT FileObject, - PFCB Fcb, + PNTFS_FCB Fcb, PDEVICE_OBJECT DeviceObject, PFILE_BASIC_INFORMATION BasicInfo, PULONG BufferLength) @@ -123,7 +123,7 @@ = static NTSTATUS NtfsGetNameInformation(PFILE_OBJECT FileObject, - PFCB Fcb, + PNTFS_FCB Fcb, PDEVICE_OBJECT DeviceObject, PFILE_NAME_INFORMATION NameInfo, PULONG BufferLength) @@ -157,7 +157,7 @@ = = static NTSTATUS -NtfsGetInternalInformation(PFCB Fcb, +NtfsGetInternalInformation(PNTFS_FCB Fcb, PFILE_INTERNAL_INFORMATION InternalInfo, PULONG BufferLength) { @@ -188,7 +188,7 @@ FILE_INFORMATION_CLASS FileInformationClass; PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; - PFCB Fcb; + PNTFS_FCB Fcb; PVOID SystemBuffer; ULONG BufferLength; = Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fsctl.c?rev=3D32691&r1=3D32690&r2=3D32691&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c Sat Mar 15 03:51:47 2008 @@ -308,8 +308,8 @@ PDEVICE_OBJECT NewDeviceObject =3D NULL; PDEVICE_OBJECT DeviceToMount; PIO_STACK_LOCATION Stack; - PFCB Fcb =3D NULL; - PCCB Ccb =3D NULL; + PNTFS_FCB Fcb =3D NULL; + PNTFS_CCB Ccb =3D NULL; PVPB Vpb; NTSTATUS Status; = @@ -373,7 +373,7 @@ } = Ccb =3D ExAllocatePoolWithTag(NonPagedPool, - sizeof(CCB), + sizeof(NTFS_CCB), TAG_CCB); if (Ccb =3D=3D NULL) { @@ -381,7 +381,7 @@ goto ByeBye; } RtlZeroMemory(Ccb, - sizeof(CCB)); + sizeof(NTFS_CCB)); = DeviceExt->StreamFileObject->FsContext =3D Fcb; DeviceExt->StreamFileObject->FsContext2 =3D Ccb; Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/ntfs.c?rev=3D32691&r1=3D32690&r2=3D32691&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c Sat Mar 15 03:51:47 2008 @@ -102,7 +102,6 @@ ObReferenceObject(NtfsGlobalData->DeviceObject); = ErrorEnd: - if (!NT_SUCCESS(Status)) { if (NtfsGlobalData) @@ -111,7 +110,6 @@ ExFreePoolWithTag(NtfsGlobalData, TAG('N', 'D', 'R', 'G')); } } - = = return Status; } Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/ntfs.h?rev=3D32691&r1=3D32690&r2=3D32691&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h Sat Mar 15 03:51:47 2008 @@ -84,9 +84,23 @@ = } NTFS_INFO, *PNTFS_INFO; = - -typedef struct -{ +#define NTFS_TYPE_CCB TAG('F','S',0,2) +#define NTFS_TYPE_FCB TAG('F','S',0,3) +#define NTFS_TYPE_VCB TAG('F','S',0,5) +#define NTFS_TYPE_IRP_CONTEST TAG('F','S',0,6) +#define NTFS_TYPE_GLOBAL_DATA TAG('F','S',0,7) + +typedef struct +{ + ULONG Type; + ULONG Size; +} NTFSIDENTIFIER, *PNTFSIDENTIFIER; + + +typedef struct +{ + NTFSIDENTIFIER Identifier; + ERESOURCE DirResource; // ERESOURCE FatResource; = @@ -100,7 +114,7 @@ NTFS_INFO NtfsInfo; = = -} DEVICE_EXTENSION, *PDEVICE_EXTENSION, VCB, *PVCB; +} DEVICE_EXTENSION, *PDEVICE_EXTENSION, NTFS_VCB, *PNTFS_VCB; = = #define FCB_CACHE_INITIALIZED 0x0001 @@ -110,6 +124,8 @@ = typedef struct _FCB { + NTFSIDENTIFIER Identifier; + FSRTL_COMMON_FCB_HEADER RFCB; SECTION_OBJECT_POINTERS SectionObjectPointers; = @@ -133,11 +149,12 @@ // DIR_RECORD Entry; = = -} FCB, *PFCB; - - -typedef struct _CCB -{ +} NTFS_FCB, *PNTFS_FCB; + + +typedef struct +{ + NTFSIDENTIFIER Identifier; LIST_ENTRY NextCCB; PFILE_OBJECT PtrFileObject; LARGE_INTEGER CurrentByteOffset; @@ -147,18 +164,9 @@ PWCHAR DirectorySearchPattern; ULONG LastCluster; ULONG LastOffset; -} CCB, *PCCB; +} NTFS_CCB, *PNTFS_CCB; = #define TAG_CCB TAG('I', 'C', 'C', 'B') - -#define NTFS_TYPE_IRP_CONTEST TAG('F','S',0,6) -#define NTFS_TYPE_GLOBAL_DATA TAG('F','S',0,7) - -typedef struct -{ - ULONG Type; - ULONG Size; -} NTFSIDENTIFIER, *PNTFSIDENTIFIER; = typedef struct { @@ -419,53 +427,53 @@ = /* fcb.c */ = -PFCB +PNTFS_FCB NtfsCreateFCB(PCWSTR FileName); = VOID -NtfsDestroyFCB(PFCB Fcb); +NtfsDestroyFCB(PNTFS_FCB Fcb); = BOOLEAN -NtfsFCBIsDirectory(PFCB Fcb); +NtfsFCBIsDirectory(PNTFS_FCB Fcb); = BOOLEAN -NtfsFCBIsRoot(PFCB Fcb); - -VOID -NtfsGrabFCB(PDEVICE_EXTENSION Vcb, - PFCB Fcb); - -VOID -NtfsReleaseFCB(PDEVICE_EXTENSION Vcb, - PFCB Fcb); - -VOID -NtfsAddFCBToTable(PDEVICE_EXTENSION Vcb, - PFCB Fcb); - -PFCB -NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb, +NtfsFCBIsRoot(PNTFS_FCB Fcb); + +VOID +NtfsGrabFCB(PNTFS_VCB Vcb, + PNTFS_FCB Fcb); + +VOID +NtfsReleaseFCB(PNTFS_VCB Vcb, + PNTFS_FCB Fcb); + +VOID +NtfsAddFCBToTable(PNTFS_VCB Vcb, + PNTFS_FCB Fcb); + +PNTFS_FCB +NtfsGrabFCBFromTable(PNTFS_VCB Vcb, PCWSTR FileName); = NTSTATUS -NtfsFCBInitializeCache(PVCB Vcb, - PFCB Fcb); - -PFCB -NtfsMakeRootFCB(PDEVICE_EXTENSION Vcb); - -PFCB -NtfsOpenRootFCB(PDEVICE_EXTENSION Vcb); - -NTSTATUS -NtfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb, - PFCB Fcb, +NtfsFCBInitializeCache(PNTFS_VCB Vcb, + PNTFS_FCB Fcb); + +PNTFS_FCB +NtfsMakeRootFCB(PNTFS_VCB Vcb); + +PNTFS_FCB +NtfsOpenRootFCB(PNTFS_VCB Vcb); + +NTSTATUS +NtfsAttachFCBToFileObject(PNTFS_VCB Vcb, + PNTFS_FCB Fcb, PFILE_OBJECT FileObject); = NTSTATUS -NtfsGetFCBForFile(PDEVICE_EXTENSION Vcb, - PFCB *pParentFCB, - PFCB *pFCB, +NtfsGetFCBForFile(PNTFS_VCB Vcb, + PNTFS_FCB *pParentFCB, + PNTFS_FCB *pFCB, const PWSTR pFileName); = =

1 0

[tkreuzer] 32690: make syscalldump dump the names of the functions in apfnSimpleCall array.
by tkreuzer＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: tkreuzer Date: Fri Mar 14 22:08:30 2008 New Revision: 32690 URL: http://svn.reactos.org/svn/reactos?rev=3D32690&view=3Drev Log: make syscalldump dump the names of the functions in apfnSimpleCall array. Modified: trunk/rosapps/devutils/syscalldump/syscalldump.c Modified: trunk/rosapps/devutils/syscalldump/syscalldump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/syscalldump/= syscalldump.c?rev=3D32690&r1=3D32689&r2=3D32690&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rosapps/devutils/syscalldump/syscalldump.c (original) +++ trunk/rosapps/devutils/syscalldump/syscalldump.c Fri Mar 14 22:08:30 20= 08 @@ -86,7 +86,14 @@ ULONG SymbolSize, PVOID UserContext) { - printf("%s@%d ", pSymInfo->Name, (UINT)UserContext); + if ((UINT)UserContext =3D=3D -1) + { + printf("%s ", pSymInfo->Name); + } + else + { + printf("%s@%d ", pSymInfo->Name, (UINT)UserContext); + } return TRUE; } = @@ -100,6 +107,8 @@ UINT i; BOOL bX64; DWORD64 dwW32pServiceTable, dwW32pServiceLimit, dwW32pArgumentTable; + DWORD64 dwSimpleCall; + PVOID *pfnSimpleCall; DWORD dwServiceLimit; BYTE *pdwArgs; = @@ -152,7 +161,7 @@ goto cleanup; } = - hMap =3D CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL); = + hMap =3D CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL); if (!hMap) { printf("CreateFileMapping() failed: %ld\n", GetLastError()); @@ -205,6 +214,20 @@ } } = + /* Dump apfnSimpleCall */ + printf("\nDumping apfnSimpleCall:\n"); + dwSimpleCall =3D GetOffsetFromName(hProcess, &Sym.Symbol, pModule, "apfnS= impleCall", &bX64); + pfnSimpleCall =3D (PVOID*)(pModule + dwSimpleCall); + i =3D 0; + while (pfnSimpleCall[i] !=3D NULL) + { + printf("0x%x:", i); + SymEnumSymbolsForAddr(hProcess, (DWORD64)(ULONG_PTR)pfnSimpleCall[i], En= umSymbolsProc, (PVOID)-1); + printf("\n"); + i++; + } + + cleanup: if (pModule) {

1 0

[tkreuzer] 32689: NtGdiExtGetObjectW has really nothing to do with dcs, move it to gdiobj.c
by tkreuzer＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: tkreuzer Date: Fri Mar 14 20:10:53 2008 New Revision: 32689 URL: http://svn.reactos.org/svn/reactos?rev=3D32689&view=3Drev Log: NtGdiExtGetObjectW has really nothing to do with dcs, move it to gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/dc.c?rev=3D32689&r1=3D32688&r2=3D32689&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Fri Mar 14 20:10:53 = 2008 @@ -1659,111 +1659,6 @@ return ret; } = -INT -FASTCALL -IntGdiGetObject(IN HANDLE Handle, - IN INT cbCount, - IN LPVOID lpBuffer) -{ - PVOID pGdiObject; - INT Result =3D 0; - DWORD dwObjectType; - - pGdiObject =3D GDIOBJ_LockObj(Handle, GDI_OBJECT_TYPE_DONTCARE); - if (!pGdiObject) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - - dwObjectType =3D GDIOBJ_GetObjectType(Handle); - switch (dwObjectType) - { - case GDI_OBJECT_TYPE_PEN: - case GDI_OBJECT_TYPE_EXTPEN: - Result =3D PEN_GetObject((PGDIBRUSHOBJ) pGdiObject, cbCount, (PLOG= PEN) lpBuffer); // IntGdiCreatePenIndirect - break; - - case GDI_OBJECT_TYPE_BRUSH: - Result =3D BRUSH_GetObject((PGDIBRUSHOBJ ) pGdiObject, cbCount, (L= PLOGBRUSH)lpBuffer); - break; - - case GDI_OBJECT_TYPE_BITMAP: - Result =3D BITMAP_GetObject((BITMAPOBJ *) pGdiObject, cbCount, lpB= uffer); - break; - case GDI_OBJECT_TYPE_FONT: - Result =3D FontGetObject((PTEXTOBJ) pGdiObject, cbCount, lpBuffer); -#if 0 - // Fix the LOGFONT structure for the stock fonts - if (FIRST_STOCK_HANDLE <=3D Handle && Handle <=3D LAST_STOCK_HANDL= E) - { - FixStockFontSizeW(Handle, cbCount, lpBuffer); - } -#endif - break; - - case GDI_OBJECT_TYPE_PALETTE: - Result =3D PALETTE_GetObject((PPALGDI) pGdiObject, cbCount, lpBuff= er); - break; - - default: - DPRINT1("GDI object type 0x%08x not implemented\n", dwObjectType); - break; - } - - GDIOBJ_UnlockObjByPtr(pGdiObject); - - return Result; -} - -INT -NTAPI -NtGdiExtGetObjectW(IN HANDLE hGdiObj, - IN INT cbCount, - OUT LPVOID lpBuffer) -{ - INT iRetCount =3D 0; - INT cbCopyCount; - union - { - BITMAP bitmap; - DIBSECTION dibsection; - LOGPEN logpen; - LOGBRUSH logbrush; - LOGFONTW logfontw; - EXTLOGFONTW extlogfontw; - ENUMLOGFONTEXDVW enumlogfontexdvw; - } Object; - - // Normalize to the largest supported object size - cbCount =3D min((UINT)cbCount, sizeof(Object)); - - // Now do the actual call - iRetCount =3D IntGdiGetObject(hGdiObj, cbCount, lpBuffer ? &Object : N= ULL); - cbCopyCount =3D min((UINT)cbCount, (UINT)iRetCount); - - // Make sure we have a buffer and a copy size - if ((cbCopyCount) && (lpBuffer)) - { - // Enter SEH for buffer transfer - _SEH_TRY - { - // Probe the buffer and copy it - ProbeForWrite(lpBuffer, cbCopyCount, sizeof(WORD)); - RtlCopyMemory(lpBuffer, &Object, cbCopyCount); - } - _SEH_HANDLE - { - // Clear the return value. - // Do *NOT* set last error here! - iRetCount =3D 0; - } - _SEH_END; - } - // Return the count - return iRetCount; -} - BOOL APIENTRY NtGdiResetDC( Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/gdiobj.c?rev=3D32689&r1=3D32688&r2=3D32689&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Fri Mar 14 20:10= :53 2008 @@ -1596,4 +1596,109 @@ return GDIOBJ_FreeObj(h, GDI_OBJECT_TYPE_CLIOBJ); } = +INT +FASTCALL +IntGdiGetObject(IN HANDLE Handle, + IN INT cbCount, + IN LPVOID lpBuffer) +{ + PVOID pGdiObject; + INT Result =3D 0; + DWORD dwObjectType; + + pGdiObject =3D GDIOBJ_LockObj(Handle, GDI_OBJECT_TYPE_DONTCARE); + if (!pGdiObject) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + dwObjectType =3D GDIOBJ_GetObjectType(Handle); + switch (dwObjectType) + { + case GDI_OBJECT_TYPE_PEN: + case GDI_OBJECT_TYPE_EXTPEN: + Result =3D PEN_GetObject((PGDIBRUSHOBJ) pGdiObject, cbCount, (PLOG= PEN) lpBuffer); // IntGdiCreatePenIndirect + break; + + case GDI_OBJECT_TYPE_BRUSH: + Result =3D BRUSH_GetObject((PGDIBRUSHOBJ ) pGdiObject, cbCount, (L= PLOGBRUSH)lpBuffer); + break; + + case GDI_OBJECT_TYPE_BITMAP: + Result =3D BITMAP_GetObject((BITMAPOBJ *) pGdiObject, cbCount, lpB= uffer); + break; + case GDI_OBJECT_TYPE_FONT: + Result =3D FontGetObject((PTEXTOBJ) pGdiObject, cbCount, lpBuffer); +#if 0 + // Fix the LOGFONT structure for the stock fonts + if (FIRST_STOCK_HANDLE <=3D Handle && Handle <=3D LAST_STOCK_HANDL= E) + { + FixStockFontSizeW(Handle, cbCount, lpBuffer); + } +#endif + break; + + case GDI_OBJECT_TYPE_PALETTE: + Result =3D PALETTE_GetObject((PPALGDI) pGdiObject, cbCount, lpBuff= er); + break; + + default: + DPRINT1("GDI object type 0x%08x not implemented\n", dwObjectType); + break; + } + + GDIOBJ_UnlockObjByPtr(pGdiObject); + + return Result; +} + +INT +NTAPI +NtGdiExtGetObjectW(IN HANDLE hGdiObj, + IN INT cbCount, + OUT LPVOID lpBuffer) +{ + INT iRetCount =3D 0; + INT cbCopyCount; + union + { + BITMAP bitmap; + DIBSECTION dibsection; + LOGPEN logpen; + LOGBRUSH logbrush; + LOGFONTW logfontw; + EXTLOGFONTW extlogfontw; + ENUMLOGFONTEXDVW enumlogfontexdvw; + } Object; + + // Normalize to the largest supported object size + cbCount =3D min((UINT)cbCount, sizeof(Object)); + + // Now do the actual call + iRetCount =3D IntGdiGetObject(hGdiObj, cbCount, lpBuffer ? &Object : N= ULL); + cbCopyCount =3D min((UINT)cbCount, (UINT)iRetCount); + + // Make sure we have a buffer and a copy size + if ((cbCopyCount) && (lpBuffer)) + { + // Enter SEH for buffer transfer + _SEH_TRY + { + // Probe the buffer and copy it + ProbeForWrite(lpBuffer, cbCopyCount, sizeof(WORD)); + RtlCopyMemory(lpBuffer, &Object, cbCopyCount); + } + _SEH_HANDLE + { + // Clear the return value. + // Do *NOT* set last error here! + iRetCount =3D 0; + } + _SEH_END; + } + // Return the count + return iRetCount; +} + /* EOF */

1 0

[cfinck] 32688: Aaand yet another one, including fixed indentation for the whole file (sorry for the commit spam, but I'm trying to solve the building problems of a user over IRC :D)
by cfinck＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: cfinck Date: Fri Mar 14 19:44:07 2008 New Revision: 32688 URL: http://svn.reactos.org/svn/reactos?rev=3D32688&view=3Drev Log: Aaand yet another one, including fixed indentation for the whole file (sorry for the commit spam, but I'm trying to solve the building problems o= f a user over IRC :D) Modified: trunk/reactos/tools/sysreg/os_support.cpp Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_suppo= rt.cpp?rev=3D32688&r1=3D32687&r2=3D32688&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Fri Mar 14 19:44:07 2008 @@ -8,6 +8,7 @@ */ = #include "os_support.h" +#include <cstdlib> = namespace System_ { @@ -19,7 +20,7 @@ void OsSupport::checkAlarms() { struct timeval tm; - size_t i; + size_t i; #if 0 // gettimeofday(&tm, 0); #endif @@ -109,33 +110,33 @@ return 0; } #endif - bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcode) - { - HANDLE hProcess =3D OpenProcess(PROCESS_TERMINATE, FALSE, pid); - if (!hProcess) - { - return false; - } - - bool ret =3D TerminateProcess(hProcess, exitcode); - CloseHandle(hProcess); - return ret; - } - - OsSupport::ProcessID OsSupport::createProcess(const char *procname, int p= rocargsnum, const char **procargs, bool wait) - { - STARTUPINFO siStartInfo; - PROCESS_INFORMATION piProcInfo; - OsSupport::ProcessID pid; + bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcod= e) + { + HANDLE hProcess =3D OpenProcess(PROCESS_TERMINATE, FALSE, pid); + if (!hProcess) + { + return false; + } + + bool ret =3D TerminateProcess(hProcess, exitcode); + CloseHandle(hProcess); + return ret; + } + + OsSupport::ProcessID OsSupport::createProcess(const char *procname, in= t procargsnum, const char **procargs, bool wait) + { + STARTUPINFO siStartInfo; + PROCESS_INFORMATION piProcInfo; + OsSupport::ProcessID pid; DWORD length =3D 0; char * szBuffer; char * cmd; - ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); - ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); - - siStartInfo.cb =3D sizeof(STARTUPINFO); - siStartInfo.wShowWindow =3D SW_SHOWNORMAL; - siStartInfo.dwFlags =3D STARTF_USESHOWWINDOW; + ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); + ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); + + siStartInfo.cb =3D sizeof(STARTUPINFO); + siStartInfo.wShowWindow =3D SW_SHOWNORMAL; + siStartInfo.dwFlags =3D STARTF_USESHOWWINDOW; = if (procargsnum) { @@ -173,27 +174,27 @@ cmd =3D _strdup(procname); = } - if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, = NULL, NULL, &siStartInfo, &piProcInfo)) - { + if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, NORMAL_PRIORITY_C= LASS, NULL, NULL, &siStartInfo, &piProcInfo)) + { cerr << "Error: CreateProcess failed " << cmd << endl; - pid =3D 0; - } - else - { - pid =3D piProcInfo.dwProcessId; + pid =3D 0; + } + else + { + pid =3D piProcInfo.dwProcessId; if (wait) { WaitForSingleObject(piProcInfo.hThread, INFINITE); } - CloseHandle(piProcInfo.hProcess); - CloseHandle(piProcInfo.hThread); - } - free(cmd); - return pid; - } - void OsSupport::delayExecution(long value) - { - Sleep(value * 1000); + CloseHandle(piProcInfo.hProcess); + CloseHandle(piProcInfo.hThread); + } + free(cmd); + return pid; + } + void OsSupport::delayExecution(long value) + { + Sleep(value * 1000); } = DWORD WINAPI AlarmThread(LPVOID param) @@ -243,23 +244,23 @@ /*************************************************************************= *******************************************/ = = - struct sigaction OsSupport::s_sact; - - - OsSupport::ProcessID OsSupport::createProcess(const char *procname, int p= rocargsnum, const char **procargs, bool bWait) - { - ProcessID pid; - - if ((pid =3D fork()) < 0) - { - cerr << "OsSupport::createProcess> fork failed" << endl; - return 0; - } - if (pid =3D=3D 0) - { - execv(procname, (char* const*)procargs); - return 0; - } + struct sigaction OsSupport::s_sact; + + + OsSupport::ProcessID OsSupport::createProcess(const char *procname, in= t procargsnum, const char **procargs, bool bWait) + { + ProcessID pid; + + if ((pid =3D fork()) < 0) + { + cerr << "OsSupport::createProcess> fork failed" << endl; + return 0; + } + if (pid =3D=3D 0) + { + execv(procname, (char* const*)procargs); + return 0; + } else { /* parent process */ @@ -268,14 +269,14 @@ waitpid(pid, NULL, 0); } } - return pid; - } - - bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcode) - { - kill(pid, SIGKILL); - return true; - } + return pid; + } + + bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcod= e) + { + kill(pid, SIGKILL); + return true; + } = void OsSupport::delayExecution(long value) {

1 0

[cfinck] 32687: Add yet another missing include
by cfinck＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: cfinck Date: Fri Mar 14 19:38:42 2008 New Revision: 32687 URL: http://svn.reactos.org/svn/reactos?rev=3D32687&view=3Drev Log: Add yet another missing include Modified: trunk/reactos/tools/sysreg/file_reader.cpp Modified: trunk/reactos/tools/sysreg/file_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_rea= der.cpp?rev=3D32687&r1=3D32686&r2=3D32687&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/file_reader.cpp (original) +++ trunk/reactos/tools/sysreg/file_reader.cpp Fri Mar 14 19:38:42 2008 @@ -8,8 +8,10 @@ */ = #include "file_reader.h" -#include <assert.h> +#include <cassert> #include <cstdio> +#include <cstring> + namespace System_ { //------------------------------------------------------------------------= ---------------

1 0

[cfinck] 32686: - Add <cstring> for "memset", "strchr" and "strstr" - Use the C++ wrapper headers consistently - Fix indentation
by cfinck＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: cfinck Date: Fri Mar 14 19:35:48 2008 New Revision: 32686 URL: http://svn.reactos.org/svn/reactos?rev=3D32686&view=3Drev Log: - Add <cstring> for "memset", "strchr" and "strstr" - Use the C++ wrapper headers consistently - Fix indentation Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpip= e_reader.cpp?rev=3D32686&r1=3D32685&r2=3D32686&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Fri Mar 14 19:35:48 2008 @@ -11,7 +11,8 @@ #include "namedpipe_reader.h" = #include <iostream> -#include <assert.h> +#include <cassert> +#include <cstring> = namespace System_ { @@ -22,51 +23,51 @@ #else const char * NamedPipeReader::s_LineBreak =3D "\x0D\x0A\0"; #endif - using std::vector; + using std::vector; //------------------------------------------------------------------------= --------------- NamedPipeReader::NamedPipeReader() : DataSource(), h_Pipe(NULLVAL), m_= Buffer(0) - { - } - -//------------------------------------------------------------------------= --------------- - NamedPipeReader::~NamedPipeReader() - { + { + } + +//------------------------------------------------------------------------= --------------- + NamedPipeReader::~NamedPipeReader() + { if (m_Buffer) free(m_Buffer); - } - - bool NamedPipeReader::isSourceOpen() - { - return true; - } - -//------------------------------------------------------------------------= --------------- - - bool NamedPipeReader::openSource(const string & PipeCmd) - { - if (h_Pipe !=3D NULLVAL) - { - cerr << "NamedPipeReader::openPipe> pipe already open" << endl; - return false; - } + } + + bool NamedPipeReader::isSourceOpen() + { + return true; + } + +//------------------------------------------------------------------------= --------------- + + bool NamedPipeReader::openSource(const string & PipeCmd) + { + if (h_Pipe !=3D NULLVAL) + { + cerr << "NamedPipeReader::openPipe> pipe already open" << endl; + return false; + } #ifndef __LINUX__ - h_Pipe =3D CreateFile(PipeCmd.c_str(), - GENERIC_WRITE | GENERIC_READ, - 0, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - (HANDLE) - NULL); - - if(INVALID_HANDLE_VALUE =3D=3D h_Pipe) { + h_Pipe =3D CreateFile(PipeCmd.c_str(), + GENERIC_WRITE | GENERIC_READ, + 0, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + (HANDLE) + NULL); + + if(INVALID_HANDLE_VALUE =3D=3D h_Pipe) { cerr << "NamedPipeReader::openPipe> failed to open pipe " << P= ipeCmd << " Error:" << GetLastError() << endl; - h_Pipe =3D NULLVAL; - return false; - } - else - { - cout << "NamedPipeReader::openPipe> successfully opened pipe" << endl; + h_Pipe =3D NULLVAL; + return false; + } + else + { + cout << "NamedPipeReader::openPipe> successfully opened pipe" = << endl; = if (!m_Buffer) { @@ -74,49 +75,49 @@ m_Buffer =3D (char*)malloc(sizeof(char) * m_BufferLength); } ConnectNamedPipe(h_Pipe, - 0); + 0); return true; - } -#else - h_Pipe =3D open(PipeCmd.c_str(), O_RDONLY); - - if(INVALID_HANDLE_VALUE =3D=3D h_Pipe) { - cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd <<= endl; - h_Pipe =3D NULLVAL; - return false; - } - else - { + } +#else + h_Pipe =3D open(PipeCmd.c_str(), O_RDONLY); + + if(INVALID_HANDLE_VALUE =3D=3D h_Pipe) { + cerr << "NamedPipeReader::openPipe> failed to open pipe " << P= ipeCmd << endl; + h_Pipe =3D NULLVAL; + return false; + } + else + { cout << "NamedPipeReader::openPipe> successfully opened pipe h= andle: "<< h_Pipe << endl << "Src: " << PipeCmd << endl; if (!m_Buffer) { m_BufferLength =3D 100; m_Buffer =3D (char*)malloc(sizeof(char) * m_BufferLength); } - return true; - } -#endif - } - -//------------------------------------------------------------------------= --------------- - - bool NamedPipeReader::closeSource() = - { + return true; + } +#endif + } + +//------------------------------------------------------------------------= --------------- + + bool NamedPipeReader::closeSource() = + { cerr << "NamedPipeReader::closePipe> entered" << endl; - if (h_Pipe =3D=3D NULLVAL) - { - cerr << "NamedPipeReader::closePipe> pipe is not open" << endl; - return false; - } + if (h_Pipe =3D=3D NULLVAL) + { + cerr << "NamedPipeReader::closePipe> pipe is not open" << endl; + return false; + } #ifdef __LINUX__ close(h_Pipe); #else - DisconnectNamedPipe(h_Pipe); - CloseHandle(h_Pipe); -#endif - h_Pipe =3D NULLVAL; - return true; - } + DisconnectNamedPipe(h_Pipe); + CloseHandle(h_Pipe); +#endif + h_Pipe =3D NULLVAL; + return true; + } //------------------------------------------------------------------------= --------------- void NamedPipeReader::insertLine(std::vector<string> & vect, string li= ne, bool append_line) { @@ -133,14 +134,14 @@ = } //------------------------------------------------------------------------= --------------- - void NamedPipeReader::extractLines(char * buffer, std::vector<string> & v= ect, bool & append_line, unsigned long cbRead) - { + void NamedPipeReader::extractLines(char * buffer, std::vector<string> = & vect, bool & append_line, unsigned long cbRead) + { #if 0 long offset =3D 0; size_t start_size =3D vect.size (); char * start =3D buffer; buffer[cbRead] =3D '\0'; - char * end =3D strstr(buffer, s_LineBreak); + char * end =3D strstr(buffer, s_LineBreak); = //cout << "extractLines entered with append_line: " << append_line= << " cbRead: " << cbRead << "buffer: " << buffer << endl; = @@ -189,90 +190,90 @@ = #else DWORD buf_offset =3D 0; - char * offset =3D strchr(buffer, '\x0D'); - while(offset) - { - /// - /// HACKHACK - /// due to some mysterious reason, strchr / strstr sometimes returns - /// not always the offset to the CR character but to the next LF - /// in MSVC 2005 (Debug Modus) - - if (offset[0] =3D=3D '\x0A') - { - if (buf_offset) - { - offset--; - } - else - { - //TODO - // implement me special case - } - } - - if (offset[0] =3D=3D '\x0D') - { - buf_offset +=3D 2; - offset[0] =3D '\0'; - offset +=3D2; - } - else - { - /// - /// BUG detected in parsing code - /// - abort(); - } - - string line =3D buffer; - if (append_line) - { - assert(vect.empty () =3D=3D false); - string prev_line =3D vect[vect.size () -1]; - prev_line +=3D line; - vect.pop_back (); - vect.push_back (prev_line); - append_line =3D false; - } - else - { - vect.push_back (line); - } - - buf_offset +=3D line.length(); - if (buf_offset >=3D cbRead) - { - break; - } - buffer =3D offset; - - offset =3D strstr(buffer, "\n"); - } - if (buf_offset < cbRead) - { - buffer[cbRead - buf_offset] =3D '\0'; - string line =3D buffer; - if (append_line) - { - assert(vect.empty () =3D=3D false); - string prev_line =3D vect[vect.size () -1]; - vect.pop_back (); - prev_line +=3D line; - vect.push_back (prev_line); - } - else - { - vect.push_back (line); - append_line =3D true; - } - } - else - { - append_line =3D false; - } -#endif - } + char * offset =3D strchr(buffer, '\x0D'); + while(offset) + { + /// + /// HACKHACK + /// due to some mysterious reason, strchr / strstr sometimes r= eturns + /// not always the offset to the CR character but to the next = LF + /// in MSVC 2005 (Debug Modus) + + if (offset[0] =3D=3D '\x0A') + { + if (buf_offset) + { + offset--; + } + else + { + //TODO + // implement me special case + } + } + + if (offset[0] =3D=3D '\x0D') + { + buf_offset +=3D 2; + offset[0] =3D '\0'; + offset +=3D2; + } + else + { + /// + /// BUG detected in parsing code + /// + abort(); + } + + string line =3D buffer; + if (append_line) + { + assert(vect.empty () =3D=3D false); + string prev_line =3D vect[vect.size () -1]; + prev_line +=3D line; + vect.pop_back (); + vect.push_back (prev_line); + append_line =3D false; + } + else + { + vect.push_back (line); + } + + buf_offset +=3D line.length(); + if (buf_offset >=3D cbRead) + { + break; + } + buffer =3D offset; + + offset =3D strstr(buffer, "\n"); + } + if (buf_offset < cbRead) + { + buffer[cbRead - buf_offset] =3D '\0'; + string line =3D buffer; + if (append_line) + { + assert(vect.empty () =3D=3D false); + string prev_line =3D vect[vect.size () -1]; + vect.pop_back (); + prev_line +=3D line; + vect.push_back (prev_line); + } + else + { + vect.push_back (line); + append_line =3D true; + } + } + else + { + append_line =3D false; + } +#endif + } //------------------------------------------------------------------------= --------------- bool NamedPipeReader::readPipe(char * buffer, int bufferlength, long &= bytesread) { @@ -284,12 +285,12 @@ #else DWORD cbRead =3D 0; BOOL fSuccess =3D ReadFile(h_Pipe, - buffer, - (bufferlength-1) * sizeof(char), - &cbRead, - NULL); - = - if (!fSuccess && GetLastError() !=3D ERROR_MORE_DATA) + buffer, + (bufferlength-1) * sizeof(char), + &cbRead, + NULL); + = + if (!fSuccess && GetLastError() !=3D ERROR_MORE_DATA) return false; #endif = @@ -298,9 +299,9 @@ } //------------------------------------------------------------------------= --------------- = - bool NamedPipeReader::readSource(vector<string> & vect) - { - size_t lines =3D vect.size (); + bool NamedPipeReader::readSource(vector<string> & vect) + { + size_t lines =3D vect.size (); = if (h_Pipe =3D=3D NULLVAL) { @@ -314,9 +315,9 @@ return false; } = - bool append_line =3D false; - do - { + bool append_line =3D false; + do + { memset(m_Buffer, 0x0, m_BufferLength * sizeof(char)); long cbRead =3D 0; =

1 0

[cfinck] 32685: - Consistently use the C++ wrapper headers (cstdio, cstdlib, ...) around the standard C headers and also add <cstring> for "strtok", "strcpy" and "strncmp" - Remove a useless typedef, which causes a warning with newer GCC's
by cfinck＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: cfinck Date: Fri Mar 14 19:23:40 2008 New Revision: 32685 URL: http://svn.reactos.org/svn/reactos?rev=3D32685&view=3Drev Log: - Consistently use the C++ wrapper headers (cstdio, cstdlib, ...) around th= e standard C headers and also add <cstring> for "strtok", "strcpy" and "str= ncmp" - Remove a useless typedef, which causes a warning with newer GCC's Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_= test.cpp?rev=3D32685&r1=3D32684&r2=3D32685&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Fri Mar 14 19:23:40 2008 @@ -20,13 +20,14 @@ #include <iostream> #include <vector> #include <fstream> -#include <time.h> -#include <float.h> -#include <stdio.h> -#include <stdlib.h> -#include <assert.h> -#include <math.h> -#include <signal.h> +#include <cassert> +#include <cfloat> +#include <cmath> +#include <csignal> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctime> #ifndef __LINUX__ #include <io.h> #include <errno.h> Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_= test.h?rev=3D32685&r1=3D32684&r2=3D32685&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Fri Mar 14 19:23:40 2008 @@ -117,7 +117,7 @@ = void dumpCheckpoints(); = -typedef enum DebugState +enum DebugState { DebugStateContinue =3D 1, /* continue debugging */ DebugStateBSODDetected, /* bsod detected */

1 0

[tkreuzer] 32684: enable a additional GDI_DEBUG backtraces
by tkreuzer＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: tkreuzer Date: Fri Mar 14 19:10:27 2008 New Revision: 32684 URL: http://svn.reactos.org/svn/reactos?rev=3D32684&view=3Drev Log: enable a additional GDI_DEBUG backtraces Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/gdiobj.c?rev=3D32684&r1=3D32683&r2=3D32684&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Fri Mar 14 19:10= :27 2008 @@ -313,12 +313,12 @@ #define GDIDBG_TRACECALLER() \ DPRINT1("-> called from:\n"); \ KeRosDumpStackFrames(NULL, 20); -#define GDIDBG_TRACEALLOCATOR(index) -// DPRINT1("-> allocated from:\n"); -// KeRosDumpStackFrames(GDIHandleAllocator[index], GDI_STACK_LEVELS); -#define GDIDBG_TRACELOCKER(index) -// DPRINT1("-> locked from:\n"); -// KeRosDumpStackFrames(GDIHandleLocker[index], GDI_STACK_LEVELS); +#define GDIDBG_TRACEALLOCATOR(index) \ + DPRINT1("-> allocated from:\n"); \ + KeRosDumpStackFrames(GDIHandleAllocator[index], GDI_STACK_LEVELS); +#define GDIDBG_TRACELOCKER(index) \ + DPRINT1("-> locked from:\n"); \ + KeRosDumpStackFrames(GDIHandleLocker[index], GDI_STACK_LEVELS); #define GDIDBG_CAPTUREALLOCATOR(index) \ CaptureStackBackTace((PVOID*)GDIHandleAllocator[index], GDI_STACK_LEVELS= ); #define GDIDBG_CAPTURELOCKER(index) \

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