Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 39377: fix formatting (again)
by cwittich＠svn.reactos.org 04 Feb '09

04 Feb '09

Author: cwittich Date: Wed Feb 4 00:04:24 2009 New Revision: 39377 URL: http://svn.reactos.org/svn/reactos?rev=39377&view=rev Log: fix formatting (again) Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Wed Feb 4 00:04:24 2009 @@ -275,8 +275,8 @@ Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); Status = CdfsGetEntryName - (DeviceExt, &Context, &Block, &StreamOffset, - DirSize, (PVOID*)&Record, name, &DirIndex, &Offset); + (DeviceExt, &Context, &Block, &StreamOffset, + DirSize, (PVOID*)&Record, name, &DirIndex, &Offset); if (Status == STATUS_NO_MORE_ENTRIES) { @@ -295,8 +295,8 @@ ShortName.MaximumLength = 26; ShortName.Buffer = ShortNameBuffer; - OffsetOfEntry.QuadPart = StreamOffset.QuadPart + Offset; - CdfsShortNameCacheGet(Parent, &OffsetOfEntry, &LongName, &ShortName); + OffsetOfEntry.QuadPart = StreamOffset.QuadPart + Offset; + CdfsShortNameCacheGet(Parent, &OffsetOfEntry, &LongName, &ShortName); DPRINT("ShortName '%wZ'\n", &ShortName); Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Wed Feb 4 00:04:24 2009 @@ -106,15 +106,15 @@ CdfsDestroyFCB(PFCB Fcb) { PLIST_ENTRY Entry; - + ExDeleteResourceLite(&Fcb->PagingIoResource); ExDeleteResourceLite(&Fcb->MainResource); while (!IsListEmpty(&Fcb->ShortNameList)) { - Entry = Fcb->ShortNameList.Flink; - RemoveEntryList(Entry); - ExFreePool(Entry); + Entry = Fcb->ShortNameList.Flink; + RemoveEntryList(Entry); + ExFreePool(Entry); } ExFreePool(Fcb); @@ -541,8 +541,8 @@ ShortName.Buffer = ShortNameBuffer; memset(ShortNameBuffer, 0, 26); - OffsetOfEntry.QuadPart = StreamOffset.QuadPart + Offset; - CdfsShortNameCacheGet(DirectoryFcb, &OffsetOfEntry, &LongName, &ShortName); + OffsetOfEntry.QuadPart = StreamOffset.QuadPart + Offset; + CdfsShortNameCacheGet(DirectoryFcb, &OffsetOfEntry, &LongName, &ShortName); DPRINT("ShortName '%wZ'\n", &ShortName); Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Wed Feb 4 00:04:24 2009 @@ -103,9 +103,9 @@ { while (Number) { - *EndOfNumberTarget = '0' + (Number % 10); - EndOfNumberTarget--; - Number /= 10; + *EndOfNumberTarget = '0' + (Number % 10); + EndOfNumberTarget--; + Number /= 10; } return EndOfNumberTarget; } @@ -131,86 +131,86 @@ /* Try to find the name in our cache */ for (Entry = DirectoryFcb->ShortNameList.Flink; - Entry != &DirectoryFcb->ShortNameList; - Entry = Entry->Flink) - { - ShortNameEntry = CONTAINING_RECORD(Entry, CDFS_SHORT_NAME, Entry); - if (ShortNameEntry->StreamOffset.QuadPart == StreamOffset->QuadPart) - { - /* Cache hit */ - RtlCopyMemory - (ShortName->Buffer, ShortNameEntry->Name.Buffer, - ShortNameEntry->Name.Length); - ShortName->Length = ShortNameEntry->Name.Length; - ExReleaseResourceLite(&DirectoryFcb->NameListResource); - DPRINT("Yield short name %wZ from cache\n", ShortName); - return; - } - } - + Entry != &DirectoryFcb->ShortNameList; + Entry = Entry->Flink) + { + ShortNameEntry = CONTAINING_RECORD(Entry, CDFS_SHORT_NAME, Entry); + if (ShortNameEntry->StreamOffset.QuadPart == StreamOffset->QuadPart) + { + /* Cache hit */ + RtlCopyMemory + (ShortName->Buffer, ShortNameEntry->Name.Buffer, + ShortNameEntry->Name.Length); + ShortName->Length = ShortNameEntry->Name.Length; + ExReleaseResourceLite(&DirectoryFcb->NameListResource); + DPRINT("Yield short name %wZ from cache\n", ShortName); + return; + } + } + /* Cache miss */ if ((RtlIsNameLegalDOS8Dot3(LongName, NULL, &HasSpaces) == FALSE) || - (HasSpaces == TRUE)) - { - RtlGenerate8dot3Name(LongName, FALSE, &Context, ShortName); + (HasSpaces == TRUE)) + { + RtlGenerate8dot3Name(LongName, FALSE, &Context, ShortName); } else { - /* copy short name */ - RtlUpcaseUnicodeString - (ShortName, - LongName, - FALSE); + /* copy short name */ + RtlUpcaseUnicodeString + (ShortName, + LongName, + FALSE); } DPRINT("Initial Guess %wZ\n", ShortName); - + /* Find the part that'll be numberified */ LastDot = &ShortName->Buffer[(ShortName->Length / sizeof(WCHAR)) - 1]; for (Scan = ShortName->Buffer; - Scan - ShortName->Buffer < ShortName->Length; - Scan++) - if (*Scan == '.') LastDot = Scan - 1; - + Scan - ShortName->Buffer < ShortName->Length; + Scan++) + if (*Scan == '.') LastDot = Scan - 1; + /* Make it unique by scanning the cache and bumping */ /* Note that incrementing the ambiguous name is enough, since we add new - * entries at the tail. We'll scan over all collisions. */ + * entries at the tail. We'll scan over all collisions. */ /* XXX could perform better. */ for (Entry = DirectoryFcb->ShortNameList.Flink; - Entry != &DirectoryFcb->ShortNameList; - Entry = Entry->Flink) - { - ShortNameEntry = CONTAINING_RECORD(Entry, CDFS_SHORT_NAME, Entry); - if (RtlCompareUnicodeString - (ShortName, - &ShortNameEntry->Name, - TRUE) == 0) /* Match */ - { - Scan = CdfsWriteNumberInShortName(LastDot, ++Number); - *Scan = '~'; - DPRINT("Collide; try %wZ\n", ShortName); - } - } - + Entry != &DirectoryFcb->ShortNameList; + Entry = Entry->Flink) + { + ShortNameEntry = CONTAINING_RECORD(Entry, CDFS_SHORT_NAME, Entry); + if (RtlCompareUnicodeString + (ShortName, + &ShortNameEntry->Name, + TRUE) == 0) /* Match */ + { + Scan = CdfsWriteNumberInShortName(LastDot, ++Number); + *Scan = '~'; + DPRINT("Collide; try %wZ\n", ShortName); + } + } + /* We've scanned over all entries and now have a unique one. Cache it. */ ShortNameEntry = ExAllocatePool(PagedPool, sizeof(CDFS_SHORT_NAME)); if (!ShortNameEntry) { - /* We couldn't cache it, but we can return it. We run the risk of - * generating a non-unique name later. */ - ExReleaseResourceLite(&DirectoryFcb->NameListResource); - DPRINT1("Couldn't cache potentially clashing 8.3 name %wZ\n", ShortName); - return; - } - + /* We couldn't cache it, but we can return it. We run the risk of + * generating a non-unique name later. */ + ExReleaseResourceLite(&DirectoryFcb->NameListResource); + DPRINT1("Couldn't cache potentially clashing 8.3 name %wZ\n", ShortName); + return; + } + ShortNameEntry->StreamOffset = *StreamOffset; ShortNameEntry->Name.Buffer = ShortNameEntry->NameBuffer; ShortNameEntry->Name.Length = ShortName->Length; ShortNameEntry->Name.MaximumLength = sizeof(ShortNameEntry->NameBuffer); RtlCopyMemory - (ShortNameEntry->NameBuffer, - ShortName->Buffer, - ShortName->Length); + (ShortNameEntry->NameBuffer, + ShortName->Buffer, + ShortName->Length); InsertTailList(&DirectoryFcb->ShortNameList, &ShortNameEntry->Entry); ExReleaseResourceLite(&DirectoryFcb->NameListResource);

1 0

[sedwards] 39376: Enable the hackish telnet daemon for network testing. Please forgive this commit as this does cause warnings. I will be cleaning this up, time premitting over the next few weeks.
by sedwards＠svn.reactos.org 04 Feb '09

04 Feb '09

Author: sedwards Date: Tue Feb 3 22:55:01 2009 New Revision: 39376 URL: http://svn.reactos.org/svn/reactos?rev=39376&view=rev Log: Enable the hackish telnet daemon for network testing. Please forgive this commit as this does cause warnings. I will be cleaning this up, time premitting over the next few weeks. Added: trunk/rosapps/applications/sysutils/telnetd/telnetd.rbuild (with props) trunk/rosapps/applications/sysutils/telnetd/telnetd.rc (with props) Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/sysu… ============================================================================== --- trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] Tue Feb 3 22:55:01 2009 @@ -52,6 +52,10 @@ <xi:include href="tcat/tcat.rbuild" /> </directory> + <directory name="telnetd"> + <xi:include href="telnetd/telnetd.rbuild" /> + </directory> + <directory name="utils"> <xi:include href="utils/utils.rbuild" /> </directory> Added: trunk/rosapps/applications/sysutils/telnetd/telnetd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/teln… ============================================================================== --- trunk/rosapps/applications/sysutils/telnetd/telnetd.rbuild (added) +++ trunk/rosapps/applications/sysutils/telnetd/telnetd.rbuild [iso-8859-1] Tue Feb 3 22:55:01 2009 @@ -1,0 +1,13 @@ +<module name="telnetd" type="win32cui" installbase="system32" installname="telnetd.exe" allowwarnings="true" unicode="yes"> + <include base="reactos"></include> + <include base="telnetd">..</include> + + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>ws2_32</library> + + <file>telnetd.c</file> + <file>serviceentry.c</file> + <file>telnetd.rc</file> +</module> Propchange: trunk/rosapps/applications/sysutils/telnetd/telnetd.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/sysutils/telnetd/telnetd.rbuild ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rosapps/applications/sysutils/telnetd/telnetd.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/teln… ============================================================================== --- trunk/rosapps/applications/sysutils/telnetd/telnetd.rc (added) +++ trunk/rosapps/applications/sysutils/telnetd/telnetd.rc [iso-8859-1] Tue Feb 3 22:55:01 2009 @@ -1,0 +1,7 @@ +/* $Id$ */ + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Simple Telnet Deamon\0" +#define REACTOS_STR_INTERNAL_NAME "telnetd\0" +#define REACTOS_STR_ORIGINAL_FILENAME "telnetd.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "fred.van.lieshout 'at' zonnet.nl\0" +#include <reactos/version.rc> Propchange: trunk/rosapps/applications/sysutils/telnetd/telnetd.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/sysutils/telnetd/telnetd.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[tkreuzer] 39375: csrsrv: convert to spec
by tkreuzer＠svn.reactos.org 04 Feb '09

04 Feb '09

Author: tkreuzer Date: Tue Feb 3 21:41:43 2009 New Revision: 39375 URL: http://svn.reactos.org/svn/reactos?rev=39375&view=rev Log: csrsrv: convert to spec Added: branches/ros-amd64-bringup/reactos/subsystems/csr/csrsrv/csrsrv.spec (with props) Removed: branches/ros-amd64-bringup/reactos/subsystems/csr/csrsrv/csrsrv.def Removed: branches/ros-amd64-bringup/reactos/subsystems/csr/csrsrv/csrsrv.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/csr/csrsrv/csrsrv.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/csr/csrsrv/csrsrv.def (removed) @@ -1,38 +1,0 @@ -LIBRARY CSRSRV - -EXPORTS -CsrAddStaticServerThread@12 -CsrCallServerFromServer@8 -CsrConnectToUser@0 -CsrCreateProcess@24 -CsrCreateRemoteThread@8 -CsrCreateThread@12 -CsrCreateWait@24 -CsrDebugProcess@4 -CsrDebugProcessStop@4 -CsrDereferenceProcess@4 -CsrDereferenceThread@4 -CsrDereferenceWait@4 -CsrDestroyProcess@8 -CsrDestroyThread@4 -CsrExecServerThread@8 -CsrGetProcessLuid@8 -CsrImpersonateClient@4 -CsrLockProcessByClientId@8 -CsrLockThreadByClientId@8 -CsrMoveSatisfiedWait@8 -CsrNotifyWait@16 -CsrPopulateDosDevices@0 -CsrQueryApiPort@0 -CsrReferenceThread@4 -CsrRevertToSelf@0 -CsrServerInitialization@8 -CsrSetBackgroundPriority@4 -CsrSetCallingSpooler@4 -CsrSetForegroundPriority@4 -CsrShutdownProcesses@8 -CsrUnhandledExceptionFilter@8 -CsrUnlockProcess@4 -CsrUnlockThread@4 -CsrValidateMessageBuffer@16 -CsrValidateMessageString@8 Added: branches/ros-amd64-bringup/reactos/subsystems/csr/csrsrv/csrsrv.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/csr/csrsrv/csrsrv.spec (added) +++ branches/ros-amd64-bringup/reactos/subsystems/csr/csrsrv/csrsrv.spec [iso-8859-1] Tue Feb 3 21:41:43 2009 @@ -1,0 +1,35 @@ +@ stdcall CsrAddStaticServerThread(ptr ptr long) +@ stdcall CsrCallServerFromServer(ptr ptr) +@ stdcall CsrConnectToUser() +@ stdcall CsrCreateProcess(ptr ptr ptr ptr long ptr) +@ stdcall CsrCreateRemoteThread(ptr ptr) +@ stdcall CsrCreateThread(ptr ptr ptr) +@ stdcall CsrCreateWait(ptr ptr ptr ptr ptr ptr) +@ stdcall CsrDebugProcess(ptr) +@ stdcall CsrDebugProcessStop(ptr) +@ stdcall CsrDereferenceProcess(ptr) +@ stdcall CsrDereferenceThread(ptr) +@ stdcall CsrDereferenceWait(ptr) +@ stdcall CsrDestroyProcess(ptr long) +@ stdcall CsrDestroyThread(ptr) +@ stdcall CsrExecServerThread(ptr long) +@ stdcall CsrGetProcessLuid(ptr ptr) +@ stdcall CsrImpersonateClient(ptr) +@ stdcall CsrLockProcessByClientId(ptr ptr) +@ stdcall CsrLockThreadByClientId(ptr ptr) +@ stdcall CsrMoveSatisfiedWait(ptr ptr) +@ stdcall CsrNotifyWait(ptr long ptr ptr) +@ stdcall CsrPopulateDosDevices(ptr ptr) +@ stdcall CsrQueryApiPort() +@ stdcall CsrReferenceThread(ptr) +@ stdcall CsrRevertToSelf() +@ stdcall CsrServerInitialization(long ptr) +@ stdcall CsrSetBackgroundPriority(ptr) +@ stdcall CsrSetCallingSpooler(long) +@ stdcall CsrSetForegroundPriority(ptr) +@ stdcall CsrShutdownProcesses(ptr long) +@ stdcall CsrUnhandledExceptionFilter(ptr ptr) +@ stdcall CsrUnlockProcess(ptr) +@ stdcall CsrUnlockThread(ptr) +@ stdcall CsrValidateMessageBuffer(ptr ptr long long) +@ stdcall CsrValidateMessageString(ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/subsystems/csr/csrsrv/csrsrv.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[arty] 39374: Add a per-directory cache of short filenames allowing us to generate them uniquely. dir /x now shows properly unambiguous short filenames. Also, we weren't FsRtlEnterFilesystem ing in directory operations. Fix that too.
by arty＠svn.reactos.org 04 Feb '09

04 Feb '09

Author: arty Date: Tue Feb 3 21:39:23 2009 New Revision: 39374 URL: http://svn.reactos.org/svn/reactos?rev=39374&view=rev Log: Add a per-directory cache of short filenames allowing us to generate them uniquely. dir /x now shows properly unambiguous short filenames. Also, we weren't FsRtlEnterFilesystem ing in directory operations. Fix that too. Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Tue Feb 3 21:39:23 2009 @@ -162,8 +162,6 @@ PFILE_OBJECT StreamFileObject; CDINFO CdInfo; - - } DEVICE_EXTENSION, *PDEVICE_EXTENSION, VCB, *PVCB; @@ -172,6 +170,14 @@ #define FCB_IS_VOLUME 0x0004 #define MAX_PATH 260 + +typedef struct _CDFS_SHORT_NAME +{ + LIST_ENTRY Entry; + LARGE_INTEGER StreamOffset; + UNICODE_STRING Name; + WCHAR NameBuffer[13]; +} CDFS_SHORT_NAME, *PCDFS_SHORT_NAME; typedef struct _FCB { @@ -201,6 +207,9 @@ ULONG Flags; DIR_RECORD Entry; + + ERESOURCE NameListResource; + LIST_ENTRY ShortNameList; } FCB, *PFCB; @@ -224,8 +233,6 @@ #define TAG_CCB TAG('I', 'C', 'C', 'B') - - typedef struct { PDRIVER_OBJECT DriverObject; @@ -389,6 +396,12 @@ CdfsFileFlagsToAttributes(PFCB Fcb, PULONG FileAttributes); +VOID +CdfsShortNameCacheGet +(PFCB DirectoryFcb, + PLARGE_INTEGER StreamOffset, + PUNICODE_STRING LongName, + PUNICODE_STRING ShortName); /* rw.c */ Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Tue Feb 3 21:39:23 2009 @@ -31,7 +31,7 @@ #include "cdfs.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ @@ -176,9 +176,7 @@ PVOID Context = NULL; ULONG DirSize; PDIR_RECORD Record; - LARGE_INTEGER StreamOffset; - BOOLEAN HasSpaces; - GENERATE_NAME_CONTEXT NameContext; + LARGE_INTEGER StreamOffset, OffsetOfEntry; DPRINT("FindFile(Parent %x, FileToFind '%wZ', DirIndex: %d)\n", Parent, FileToFind, pDirIndex ? *pDirIndex : 0); @@ -276,8 +274,9 @@ DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); - Status = CdfsGetEntryName(DeviceExt, &Context, &Block, &StreamOffset, - DirSize, (PVOID*)&Record, name, &DirIndex, &Offset); + Status = CdfsGetEntryName + (DeviceExt, &Context, &Block, &StreamOffset, + DirSize, (PVOID*)&Record, name, &DirIndex, &Offset); if (Status == STATUS_NO_MORE_ENTRIES) { @@ -296,27 +295,8 @@ ShortName.MaximumLength = 26; ShortName.Buffer = ShortNameBuffer; - if ((RtlIsNameLegalDOS8Dot3(&LongName, NULL, &HasSpaces) == FALSE) || - (HasSpaces == TRUE)) - { - RtlZeroMemory(&NameContext, sizeof(GENERATE_NAME_CONTEXT)); - - /* FIXME: check if the generated filename already exists - * and generate a new one if this is the case */ - - /* Build short name */ - RtlGenerate8dot3Name(&LongName, - FALSE, - &NameContext, - &ShortName); - } - else - { - /* copy short name */ - RtlUpcaseUnicodeString(&ShortName, - &LongName, - FALSE); - } + OffsetOfEntry.QuadPart = StreamOffset.QuadPart + Offset; + CdfsShortNameCacheGet(Parent, &OffsetOfEntry, &LongName, &ShortName); DPRINT("ShortName '%wZ'\n", &ShortName); @@ -773,6 +753,7 @@ NTSTATUS Status; DPRINT("CdfsDirectoryControl() called\n"); + FsRtlEnterFileSystem(); Stack = IoGetCurrentIrpStackLocation(Irp); @@ -798,6 +779,7 @@ Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); + FsRtlExitFileSystem(); return(Status); } Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Tue Feb 3 21:39:23 2009 @@ -30,7 +30,7 @@ #include "cdfs.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ @@ -92,9 +92,11 @@ ExInitializeResourceLite(&Fcb->PagingIoResource); ExInitializeResourceLite(&Fcb->MainResource); + ExInitializeResourceLite(&Fcb->NameListResource); Fcb->RFCB.PagingIoResource = &Fcb->PagingIoResource; Fcb->RFCB.Resource = &Fcb->MainResource; Fcb->RFCB.IsFastIoPossible = FastIoIsNotPossible; + InitializeListHead(&Fcb->ShortNameList); return(Fcb); } @@ -103,8 +105,17 @@ VOID CdfsDestroyFCB(PFCB Fcb) { + PLIST_ENTRY Entry; + ExDeleteResourceLite(&Fcb->PagingIoResource); ExDeleteResourceLite(&Fcb->MainResource); + + while (!IsListEmpty(&Fcb->ShortNameList)) + { + Entry = Fcb->ShortNameList.Flink; + RemoveEntryList(Entry); + ExFreePool(Entry); + } ExFreePool(Fcb); } @@ -458,16 +469,13 @@ ULONG BlockOffset; NTSTATUS Status; - LARGE_INTEGER StreamOffset; + LARGE_INTEGER StreamOffset, OffsetOfEntry; PVOID Context; WCHAR ShortNameBuffer[13]; UNICODE_STRING ShortName; UNICODE_STRING LongName; UNICODE_STRING FileToFindUpcase; - BOOLEAN HasSpaces; - GENERATE_NAME_CONTEXT NameContext; - ASSERT(DeviceExt); ASSERT(DirectoryFcb); @@ -533,22 +541,8 @@ ShortName.Buffer = ShortNameBuffer; memset(ShortNameBuffer, 0, 26); - if ((RtlIsNameLegalDOS8Dot3(&LongName, NULL, &HasSpaces) == FALSE) || - (HasSpaces == TRUE)) - { - /* Build short name */ - RtlGenerate8dot3Name(&LongName, - FALSE, - &NameContext, - &ShortName); - } - else - { - /* copy short name */ - RtlUpcaseUnicodeString(&ShortName, - &LongName, - FALSE); - } + OffsetOfEntry.QuadPart = StreamOffset.QuadPart + Offset; + CdfsShortNameCacheGet(DirectoryFcb, &OffsetOfEntry, &LongName, &ShortName); DPRINT("ShortName '%wZ'\n", &ShortName); Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Tue Feb 3 21:39:23 2009 @@ -30,7 +30,7 @@ #include "cdfs.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ @@ -95,4 +95,126 @@ ((Fcb->Entry.FileFlags & FILE_FLAG_READONLY) ? FILE_ATTRIBUTE_READONLY : 0); } +/* Writes a number into a string, ending at the target position. */ +static PWCHAR +CdfsWriteNumberInShortName +(PWCHAR EndOfNumberTarget, + ULONG Number) +{ + while (Number) + { + *EndOfNumberTarget = '0' + (Number % 10); + EndOfNumberTarget--; + Number /= 10; + } + return EndOfNumberTarget; +} + +VOID +CdfsShortNameCacheGet +(PFCB DirectoryFcb, + PLARGE_INTEGER StreamOffset, + PUNICODE_STRING LongName, + PUNICODE_STRING ShortName) +{ + BOOLEAN HasSpaces; + PWCHAR LastDot, Scan; + ULONG Number = 1; + PLIST_ENTRY Entry; + PCDFS_SHORT_NAME ShortNameEntry; + GENERATE_NAME_CONTEXT Context = { }; + + DPRINT("CdfsShortNameCacheGet(%I64u,%wZ)\n", StreamOffset->QuadPart, LongName); + + /* Get the name list resource */ + ExAcquireResourceExclusiveLite(&DirectoryFcb->NameListResource, TRUE); + + /* Try to find the name in our cache */ + for (Entry = DirectoryFcb->ShortNameList.Flink; + Entry != &DirectoryFcb->ShortNameList; + Entry = Entry->Flink) + { + ShortNameEntry = CONTAINING_RECORD(Entry, CDFS_SHORT_NAME, Entry); + if (ShortNameEntry->StreamOffset.QuadPart == StreamOffset->QuadPart) + { + /* Cache hit */ + RtlCopyMemory + (ShortName->Buffer, ShortNameEntry->Name.Buffer, + ShortNameEntry->Name.Length); + ShortName->Length = ShortNameEntry->Name.Length; + ExReleaseResourceLite(&DirectoryFcb->NameListResource); + DPRINT("Yield short name %wZ from cache\n", ShortName); + return; + } + } + + /* Cache miss */ + if ((RtlIsNameLegalDOS8Dot3(LongName, NULL, &HasSpaces) == FALSE) || + (HasSpaces == TRUE)) + { + RtlGenerate8dot3Name(LongName, FALSE, &Context, ShortName); + } + else + { + /* copy short name */ + RtlUpcaseUnicodeString + (ShortName, + LongName, + FALSE); + } + + DPRINT("Initial Guess %wZ\n", ShortName); + + /* Find the part that'll be numberified */ + LastDot = &ShortName->Buffer[(ShortName->Length / sizeof(WCHAR)) - 1]; + for (Scan = ShortName->Buffer; + Scan - ShortName->Buffer < ShortName->Length; + Scan++) + if (*Scan == '.') LastDot = Scan - 1; + + /* Make it unique by scanning the cache and bumping */ + /* Note that incrementing the ambiguous name is enough, since we add new + * entries at the tail. We'll scan over all collisions. */ + /* XXX could perform better. */ + for (Entry = DirectoryFcb->ShortNameList.Flink; + Entry != &DirectoryFcb->ShortNameList; + Entry = Entry->Flink) + { + ShortNameEntry = CONTAINING_RECORD(Entry, CDFS_SHORT_NAME, Entry); + if (RtlCompareUnicodeString + (ShortName, + &ShortNameEntry->Name, + TRUE) == 0) /* Match */ + { + Scan = CdfsWriteNumberInShortName(LastDot, ++Number); + *Scan = '~'; + DPRINT("Collide; try %wZ\n", ShortName); + } + } + + /* We've scanned over all entries and now have a unique one. Cache it. */ + ShortNameEntry = ExAllocatePool(PagedPool, sizeof(CDFS_SHORT_NAME)); + if (!ShortNameEntry) + { + /* We couldn't cache it, but we can return it. We run the risk of + * generating a non-unique name later. */ + ExReleaseResourceLite(&DirectoryFcb->NameListResource); + DPRINT1("Couldn't cache potentially clashing 8.3 name %wZ\n", ShortName); + return; + } + + ShortNameEntry->StreamOffset = *StreamOffset; + ShortNameEntry->Name.Buffer = ShortNameEntry->NameBuffer; + ShortNameEntry->Name.Length = ShortName->Length; + ShortNameEntry->Name.MaximumLength = sizeof(ShortNameEntry->NameBuffer); + RtlCopyMemory + (ShortNameEntry->NameBuffer, + ShortName->Buffer, + ShortName->Length); + InsertTailList(&DirectoryFcb->ShortNameList, &ShortNameEntry->Entry); + ExReleaseResourceLite(&DirectoryFcb->NameListResource); + + DPRINT("Returning short name %wZ for long name %wZ\n", ShortName, LongName); +} + /* EOF */

1 0

[cfinck] 39353: Gabriel Ilardi (gabrielilardi@hotmail.it) - Allow only one instance of Task-Manager to be run at the same time See issue #3976 for more details.
by cfinck＠svn.reactos.org 04 Feb '09

04 Feb '09

Author: cfinck Date: Tue Feb 3 16:25:39 2009 New Revision: 39353 URL: http://svn.reactos.org/svn/reactos?rev=39353&view=rev Log: Gabriel Ilardi (gabrielilardi(a)hotmail.it) - Allow only one instance of Task-Manager to be run at the same time See issue #3976 for more details. Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Tue Feb 3 16:25:39 2009 @@ -51,6 +51,12 @@ HANDLE hProcess; HANDLE hToken; TOKEN_PRIVILEGES tkp; + HANDLE hMutex; + + /* check wether we're already running or not */ + hMutex = CreateMutexW(NULL, TRUE, L"taskmgrros"); + if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) + return 1; /* Initialize global variables */ hInst = hInstance;

2 1

[tkreuzer] 39373: remove an old hack
by tkreuzer＠svn.reactos.org 04 Feb '09

04 Feb '09

Author: tkreuzer Date: Tue Feb 3 21:34:53 2009 New Revision: 39373 URL: http://svn.reactos.org/svn/reactos?rev=39373&view=rev Log: remove an old hack Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Tue Feb 3 21:34:53 2009 @@ -269,7 +269,7 @@ &Size); ASSERT(Module->TlsIndex < LdrpTlsCount); TlsData = &LdrpTlsArray[Module->TlsIndex]; - TlsData->StartAddressOfRawData = (PVOID)(ULONG_PTR)TlsDirectory->StartAddressOfRawData; + TlsData->StartAddressOfRawData = (PVOID)TlsDirectory->StartAddressOfRawData; TlsData->TlsDataSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData; TlsData->TlsZeroSize = TlsDirectory->SizeOfZeroFill; if (TlsDirectory->AddressOfCallBacks)

1 0

[tkreuzer] 39372: Fix LDR_DATA_TABLE_ENTRY mamber names
by tkreuzer＠svn.reactos.org 04 Feb '09

04 Feb '09

Author: tkreuzer Date: Tue Feb 3 21:15:10 2009 New Revision: 39372 URL: http://svn.reactos.org/svn/reactos?rev=39372&view=rev Log: Fix LDR_DATA_TABLE_ENTRY mamber names Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/startup.c branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Tue Feb 3 21:15:10 2009 @@ -425,7 +425,7 @@ InsertTailList(&Peb->Ldr->InLoadOrderModuleList, &NtModule->InLoadOrderLinks); InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &NtModule->InInitializationOrderModuleList); + &NtModule->InInitializationOrderLinks); #if defined(DBG) || defined(KDBG) Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Tue Feb 3 21:15:10 2009 @@ -2171,7 +2171,7 @@ #endif /* DBG || KDBG */ RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); InsertTailList(&NtCurrentPeb()->Ldr->InInitializationOrderModuleList, - &(*Module)->InInitializationOrderModuleList); + &(*Module)->InInitializationOrderLinks); RtlLeaveCriticalSection (NtCurrentPeb()->LoaderLock); } return STATUS_SUCCESS; @@ -2549,7 +2549,7 @@ Entry = ModuleListHead->Blink; while (Entry != ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); if (((UnloadAll && Module->LoadCount == 0xFFFF) || Module->LoadCount == 0) && Module->Flags & LDRP_ENTRY_PROCESSED && !(Module->Flags & LDRP_UNLOAD_IN_PROGRESS)) @@ -2582,14 +2582,14 @@ Entry = ModuleListHead->Blink; while (Entry != ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); Entry = Entry->Blink; if (Module->Flags & LDRP_UNLOAD_IN_PROGRESS && ((UnloadAll && Module->LoadCount != 0xFFFF) || Module->LoadCount == 0)) { /* remove the module entry from the list */ RemoveEntryList (&Module->InLoadOrderLinks); - RemoveEntryList (&Module->InInitializationOrderModuleList); + RemoveEntryList (&Module->InInitializationOrderLinks); NtUnmapViewOfSection (NtCurrentProcess (), Module->DllBase); NtClose (Module->SectionPointer); @@ -2642,7 +2642,7 @@ Entry = ModuleListHead->Flink; while (Entry != ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); if (!(Module->Flags & (LDRP_LOAD_IN_PROGRESS|LDRP_UNLOAD_IN_PROGRESS|LDRP_ENTRY_PROCESSED))) { Module->Flags |= LDRP_LOAD_IN_PROGRESS; @@ -2717,7 +2717,7 @@ while (Entry != ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); if (Module->Flags & LDRP_PROCESS_ATTACH_CALLED && !(Module->Flags & LDRP_DONT_CALL_FOR_THREADS) && !(Module->Flags & LDRP_UNLOAD_IN_PROGRESS)) @@ -2761,7 +2761,7 @@ Entry = ModuleListHead->Blink; while (Entry != ModuleListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); if (Module->Flags & LDRP_PROCESS_ATTACH_CALLED && !(Module->Flags & LDRP_DONT_CALL_FOR_THREADS) &&

1 0

[tkreuzer] 39371: rbuild: this got lost, too
by tkreuzer＠svn.reactos.org 04 Feb '09

04 Feb '09

Author: tkreuzer Date: Tue Feb 3 19:45:14 2009 New Revision: 39371 URL: http://svn.reactos.org/svn/reactos?rev=39371&view=rev Log: rbuild: this got lost, too Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/pch.h Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/pch.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/pch.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/pch.h [iso-8859-1] Tue Feb 3 19:45:14 2009 @@ -28,8 +28,6 @@ #include <map> #include <set> #include <utility> -#include <cstdlib> -#include <cstdio> #ifdef WIN32 #include <windows.h>

1 0

[tkreuzer] 39370: rbuild: merge what got lost from r38301
by tkreuzer＠svn.reactos.org 04 Feb '09

04 Feb '09

Author: tkreuzer Date: Tue Feb 3 19:44:23 2009 New Revision: 39370 URL: http://svn.reactos.org/svn/reactos?rev=39370&view=rev Log: rbuild: merge what got lost from r38301 Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/backend.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/backend.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/backend.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/backend.cpp [iso-8859-1] Tue Feb 3 19:44:23 2009 @@ -32,7 +32,7 @@ Backend::Factory::Factory ( const std::string& name_, const std::string& description_ ) { string name(name_); - _strlwr ( &name[0] ); + strlwr ( &name[0] ); if ( !ref++ ) factories = new map<string,Factory*>; (*factories)[name] = this; @@ -55,7 +55,7 @@ Configuration& configuration ) { string sname ( name ); - _strlwr ( &sname[0] ); + strlwr ( &sname[0] ); if ( !factories || !factories->size () ) throw InvalidOperationException ( __FILE__, __LINE__,

1 0

[tkreuzer] 39367: sync widl to trunk r39350
by tkreuzer＠svn.reactos.org 04 Feb '09

04 Feb '09

Author: tkreuzer Date: Tue Feb 3 19:23:02 2009 New Revision: 39367 URL: http://svn.reactos.org/svn/reactos?rev=39367&view=rev Log: sync widl to trunk r39350 Modified: branches/ros-amd64-bringup/reactos/tools/widl/header.c branches/ros-amd64-bringup/reactos/tools/widl/parser.tab.c branches/ros-amd64-bringup/reactos/tools/widl/parser.y branches/ros-amd64-bringup/reactos/tools/widl/typegen.c branches/ros-amd64-bringup/reactos/tools/widl/typelib.c branches/ros-amd64-bringup/reactos/tools/widl/typetree.h branches/ros-amd64-bringup/reactos/tools/widl/widltypes.h branches/ros-amd64-bringup/reactos/tools/widl/write_msft.c Modified: branches/ros-amd64-bringup/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/widl/header.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/widl/header.c [iso-8859-1] Tue Feb 3 19:23:02 2009 @@ -63,7 +63,7 @@ if (is_attr(type->attrs, t)) return 1; else if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) type = type_pointer_get_ref(type); else return 0; @@ -79,7 +79,7 @@ if (is_attr(t->attrs, attr)) return 1; else if (type_is_alias(t)) - t = t->orig; + t = type_alias_get_aliasee(t); else return 0; } } @@ -110,8 +110,7 @@ int is_void(const type_t *t) { - if (!t->type && !t->ref) return 1; - return 0; + return type_get_type(t) == TYPE_VOID; } int is_conformant_array(const type_t *t) @@ -424,7 +423,7 @@ } if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) type = type_pointer_get_ref(type); else if (is_array(type)) @@ -472,7 +471,7 @@ static void write_typedef(FILE *header, type_t *type) { fprintf(header, "typedef "); - write_type_def_or_decl(header, type->orig, FALSE, "%s", type->name); + write_type_def_or_decl(header, type_alias_get_aliasee(type), FALSE, "%s", type->name); fprintf(header, ";\n"); } Modified: branches/ros-amd64-bringup/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/widl/parser.tab.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/widl/parser.tab.c [iso-8859-1] Tue Feb 3 19:23:02 2009 @@ -4764,7 +4764,7 @@ { ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE); if (!ptr_attr && type_is_alias(ptr)) - ptr = ptr->orig; + ptr = type_alias_get_aliasee(ptr); else break; } @@ -5098,7 +5098,7 @@ static void fix_type(type_t *t) { if (type_is_alias(t) && is_incomplete(t)) { - type_t *ot = t->orig; + type_t *ot = type_alias_get_aliasee(t); fix_type(ot); if (is_struct(ot->type) || is_union(ot->type)) t->details.structure = ot->details.structure; @@ -5701,9 +5701,9 @@ break; } if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) - type = type->ref; + type = type_pointer_get_ref(type); else if (is_array(type)) type = type_array_get_element(type); else @@ -5763,7 +5763,7 @@ if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) break; if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) { ptr_level++; Modified: branches/ros-amd64-bringup/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/widl/parser.y [iso-8859-1] Tue Feb 3 19:23:02 2009 @@ -1443,7 +1443,7 @@ { ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE); if (!ptr_attr && type_is_alias(ptr)) - ptr = ptr->orig; + ptr = type_alias_get_aliasee(ptr); else break; } @@ -1777,7 +1777,7 @@ static void fix_type(type_t *t) { if (type_is_alias(t) && is_incomplete(t)) { - type_t *ot = t->orig; + type_t *ot = type_alias_get_aliasee(t); fix_type(ot); if (is_struct(ot->type) || is_union(ot->type)) t->details.structure = ot->details.structure; @@ -2380,9 +2380,9 @@ break; } if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) - type = type->ref; + type = type_pointer_get_ref(type); else if (is_array(type)) type = type_array_get_element(type); else @@ -2442,7 +2442,7 @@ if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) break; if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) { ptr_level++; Modified: branches/ros-amd64-bringup/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/widl/typegen.c [iso-8859-1] Tue Feb 3 19:23:02 2009 @@ -515,7 +515,7 @@ } if (type_is_alias(t)) - t = t->orig; + t = type_alias_get_aliasee(t); else return 0; } @@ -1053,7 +1053,7 @@ size_t size = 0; if (type_is_alias(t)) - size = type_memsize(t->orig, align); + size = type_memsize(type_alias_get_aliasee(t), align); else if (t->declarray && is_conformant_array(t)) { type_memsize(type_array_get_element(t), align); @@ -2325,6 +2325,8 @@ } *tfsoff += write_conf_or_var_desc(file, NULL, *tfsoff, st, &dummy_expr ); + print_file(file, 2, "NdrFcShort(0x2),\t/* Offset= 2 (%u) */\n", *tfsoff + 2); + *tfsoff += 2; } print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", size, size); Modified: branches/ros-amd64-bringup/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/widl/typelib.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/widl/typelib.c [iso-8859-1] Tue Feb 3 19:23:02 2009 @@ -50,28 +50,12 @@ int is_ptr(const type_t *t) { - unsigned char c = t->type; - return c == RPC_FC_RP - || c == RPC_FC_UP - || c == RPC_FC_FP - || c == RPC_FC_OP; + return type_get_type(t) == TYPE_POINTER; } int is_array(const type_t *t) { - switch (t->type) - { - case RPC_FC_SMFARRAY: - case RPC_FC_LGFARRAY: - case RPC_FC_SMVARRAY: - case RPC_FC_LGVARRAY: - case RPC_FC_CARRAY: - case RPC_FC_CVARRAY: - case RPC_FC_BOGUS_ARRAY: - return TRUE; - default: - return FALSE; - } + return type_get_type(t) == TYPE_ARRAY; } /* List of oleauto types that should be recognized by name. Modified: branches/ros-amd64-bringup/reactos/tools/widl/typetree.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/widl/typetree.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/widl/typetree.h [iso-8859-1] Tue Feb 3 19:23:02 2009 @@ -39,47 +39,78 @@ /* FIXME: shouldn't need to export this */ type_t *duptype(type_t *t, int dupname); +/* un-alias the type until finding the non-alias type */ +static inline type_t *type_get_real_type(const type_t *type) +{ + if (type->is_alias) + return type_get_real_type(type->orig); + else + return (type_t *)type; +} + +static inline enum type_type type_get_type(const type_t *type) +{ + return type_get_type_detect_alias(type_get_real_type(type)); +} + +static inline unsigned char type_basic_get_fc(const type_t *type) +{ + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_BASIC); + return type->type; +} + static inline var_list_t *type_struct_get_fields(const type_t *type) { - assert(is_struct(type->type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_STRUCT); return type->details.structure->fields; } static inline var_list_t *type_function_get_args(const type_t *type) { - assert(type->type == RPC_FC_FUNCTION); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_FUNCTION); return type->details.function->args; } static inline type_t *type_function_get_rettype(const type_t *type) { - assert(type->type == RPC_FC_FUNCTION); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_FUNCTION); return type->ref; } static inline var_list_t *type_enum_get_values(const type_t *type) { - assert(type->type == RPC_FC_ENUM16 || type->type == RPC_FC_ENUM32); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ENUM); return type->details.enumeration->enums; } static inline var_t *type_union_get_switch_value(const type_t *type) { - assert(type->type == RPC_FC_ENCAPSULATED_UNION); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ENCAPSULATED_UNION); return LIST_ENTRY(list_head(type->details.structure->fields), var_t, entry); } static inline var_list_t *type_encapsulated_union_get_fields(const type_t *type) { - assert(type->type == RPC_FC_ENCAPSULATED_UNION); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ENCAPSULATED_UNION); return type->details.structure->fields; } static inline var_list_t *type_union_get_cases(const type_t *type) { - assert(type->type == RPC_FC_ENCAPSULATED_UNION || - type->type == RPC_FC_NON_ENCAPSULATED_UNION); - if (type->type == RPC_FC_ENCAPSULATED_UNION) + enum type_type type_type; + + type = type_get_real_type(type); + type_type = type_get_type(type); + + assert(type_type == TYPE_UNION || type_type == TYPE_ENCAPSULATED_UNION); + if (type_type == TYPE_ENCAPSULATED_UNION) { const var_t *uv = LIST_ENTRY(list_tail(type->details.structure->fields), const var_t, entry); return uv->type->details.structure->fields; @@ -90,25 +121,29 @@ static inline statement_list_t *type_iface_get_stmts(const type_t *type) { - assert(type->type == RPC_FC_IP); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); return type->details.iface->stmts; } static inline type_t *type_iface_get_inherit(const type_t *type) { - assert(type->type == RPC_FC_IP); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); return type->ref; } static inline var_list_t *type_dispiface_get_props(const type_t *type) { - assert(type->type == RPC_FC_IP); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); return type->details.iface->disp_props; } static inline var_list_t *type_dispiface_get_methods(const type_t *type) { - assert(type->type == RPC_FC_IP); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); return type->details.iface->disp_methods; } @@ -119,60 +154,70 @@ static inline int type_is_complete(const type_t *type) { - if (type->type == RPC_FC_FUNCTION) + switch (type_get_type_detect_alias(type)) + { + case TYPE_FUNCTION: return (type->details.function != NULL); - else if (type->type == RPC_FC_IP) + case TYPE_INTERFACE: return (type->details.iface != NULL); - else if (type->type == RPC_FC_ENUM16 || type->type == RPC_FC_ENUM32) + case TYPE_ENUM: return (type->details.enumeration != NULL); - else if (is_struct(type->type) || is_union(type->type)) + case TYPE_UNION: + case TYPE_ENCAPSULATED_UNION: + case TYPE_STRUCT: return (type->details.structure != NULL); - else + case TYPE_VOID: + case TYPE_BASIC: + case TYPE_ALIAS: + case TYPE_MODULE: + case TYPE_COCLASS: + case TYPE_POINTER: + case TYPE_ARRAY: return TRUE; + } + return FALSE; } static inline int type_array_has_conformance(const type_t *type) { - assert(is_array(type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); return (type->details.array.size_is != NULL); } static inline int type_array_has_variance(const type_t *type) { - assert(is_array(type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); return (type->details.array.length_is != NULL); } static inline unsigned long type_array_get_dim(const type_t *type) { - assert(is_array(type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); return type->details.array.dim; } static inline expr_t *type_array_get_conformance(const type_t *type) { - assert(is_array(type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); return type->details.array.size_is; } static inline expr_t *type_array_get_variance(const type_t *type) { - assert(is_array(type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); return type->details.array.length_is; } static inline type_t *type_array_get_element(const type_t *type) { - assert(is_array(type)); - return type->ref; -} - -static inline type_t *type_get_real_type(const type_t *type) -{ - if (type->is_alias) - return type_get_real_type(type->orig); - else - return (type_t *)type; + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); + return type->ref; } static inline int type_is_alias(const type_t *type) @@ -180,15 +225,23 @@ return type->is_alias; } +static inline type_t *type_alias_get_aliasee(const type_t *type) +{ + assert(type_is_alias(type)); + return type->orig; +} + static inline ifref_list_t *type_coclass_get_ifaces(const type_t *type) { - assert(type->type == RPC_FC_COCLASS); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_COCLASS); return type->details.coclass.ifaces; } static inline type_t *type_pointer_get_ref(const type_t *type) { - assert(is_ptr(type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_POINTER); return type->ref; } Modified: branches/ros-amd64-bringup/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/widl/widltypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/widl/widltypes.h [iso-8859-1] Tue Feb 3 19:23:02 2009 @@ -310,6 +310,23 @@ ifref_list_t *ifaces; }; +enum type_type +{ + TYPE_VOID, + TYPE_BASIC, /* ints, floats and handles */ + TYPE_ENUM, + TYPE_STRUCT, + TYPE_ENCAPSULATED_UNION, + TYPE_UNION, + TYPE_ALIAS, + TYPE_MODULE, + TYPE_COCLASS, + TYPE_FUNCTION, + TYPE_INTERFACE, + TYPE_POINTER, + TYPE_ARRAY, +}; + struct _type_t { const char *name; unsigned char type; @@ -469,10 +486,75 @@ return func_type->details.function->args; } +static inline enum type_type type_get_type_detect_alias(const type_t *type) +{ + if (type->is_alias) + return TYPE_ALIAS; + switch (type->type) + { + case 0: + return TYPE_VOID; + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_USMALL: + case RPC_FC_SMALL: + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_HYPER: + case RPC_FC_IGNORE: + case RPC_FC_FLOAT: + case RPC_FC_DOUBLE: + case RPC_FC_ERROR_STATUS_T: + case RPC_FC_BIND_PRIMITIVE: + return TYPE_BASIC; + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + return TYPE_ENUM; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_FP: + case RPC_FC_OP: + return TYPE_POINTER; + case RPC_FC_STRUCT: + case RPC_FC_PSTRUCT: + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + case RPC_FC_CVSTRUCT: + case RPC_FC_BOGUS_STRUCT: + return TYPE_STRUCT; + case RPC_FC_ENCAPSULATED_UNION: + return TYPE_ENCAPSULATED_UNION; + case RPC_FC_NON_ENCAPSULATED_UNION: + return TYPE_UNION; + case RPC_FC_SMFARRAY: + case RPC_FC_LGFARRAY: + case RPC_FC_SMVARRAY: + case RPC_FC_LGVARRAY: + case RPC_FC_CARRAY: + case RPC_FC_CVARRAY: + case RPC_FC_BOGUS_ARRAY: + return TYPE_ARRAY; + case RPC_FC_FUNCTION: + return TYPE_FUNCTION; + case RPC_FC_COCLASS: + return TYPE_COCLASS; + case RPC_FC_IP: + return TYPE_INTERFACE; + case RPC_FC_MODULE: + return TYPE_MODULE; + default: + assert(0); + return 0; + } +} + #define STATEMENTS_FOR_EACH_FUNC(stmt, stmts) \ if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, statement_t, entry ) \ if (stmt->type == STMT_DECLARATION && stmt->u.var->stgclass == STG_NONE && \ - stmt->u.var->type->type == RPC_FC_FUNCTION) + type_get_type_detect_alias(stmt->u.var->type) == TYPE_FUNCTION) static inline int statements_has_func(const statement_list_t *stmts) { Modified: branches/ros-amd64-bringup/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/widl/write_msft.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/widl/write_msft.c [iso-8859-1] Tue Feb 3 19:23:02 2009 @@ -979,7 +979,7 @@ /* typedef'd types without public attribute aren't included in the typelib */ while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) - type = type->orig; + type = type_alias_get_aliasee(type); chat("encode_type: VT_USERDEFINED - type %p name = %s type->type %d idx %d\n", type, type->name, type->type, type->typelib_idx); @@ -2093,8 +2093,11 @@ tdef->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->attrs); - encode_type(typelib, get_type_vt(tdef->orig), tdef->orig, &msft_typeinfo->typeinfo->datatype1, &msft_typeinfo->typeinfo->size, - &alignment, &msft_typeinfo->typeinfo->datatype2); + encode_type(typelib, get_type_vt(type_alias_get_aliasee(tdef)), + type_alias_get_aliasee(tdef), + &msft_typeinfo->typeinfo->datatype1, + &msft_typeinfo->typeinfo->size, + &alignment, &msft_typeinfo->typeinfo->datatype2); msft_typeinfo->typeinfo->typekind |= (alignment << 11 | alignment << 6); } @@ -2267,7 +2270,7 @@ if (is_attr(type_entry->type->attrs, ATTR_PUBLIC)) add_typedef_typeinfo(typelib, type_entry->type); else - add_type_typeinfo(typelib, type_entry->type->orig); + add_type_typeinfo(typelib, type_alias_get_aliasee(type_entry->type)); } break; }

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