Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[jimtabor] 37783: - Fixed hooking bug for Firefox, a plus, new SEH found a bug!

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Nov 30 17:39:20 2008 New Revision: 37783 URL: http://svn.reactos.org/svn/reactos?rev=37783&view=rev Log: - Fixed hooking bug for Firefox, a plus, new SEH found a bug! Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Sun Nov 30 17:39:20 2008 @@ -507,12 +507,12 @@ } _SEH2_END; - IntCbFreeMemory(Argument); - if (!NT_SUCCESS(Status)) { return 0; } + + if (Argument) IntCbFreeMemory(Argument); return Result; }

16 years

[dreimer] 37782: Some fixes. Thx goes out to PS 2.0 Graphical Tool

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Nov 30 17:34:41 2008 New Revision: 37782 URL: http://svn.reactos.org/svn/reactos?rev=37782&view=rev Log: Some fixes. Thx goes out to PS 2.0 Graphical Tool Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Sun Nov 30 17:34:41 2008 @@ -168,7 +168,7 @@ "" " all - Removes build logs and compiler output in the RosBE-Logs directory." " logs - Removes all build logs in the RosBE-Logs directory." - " All other commands will be parsed as "make COMMAND_clean" and cleans the" + " All other commands will be parsed as ""make COMMAND_clean"" and cleans the" " specific command." exit } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Sun Nov 30 17:34:41 2008 @@ -79,17 +79,17 @@ $ENV:TARGET_CPPFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" } if ($_ROSBE_HOST_GCCVERSION -eq "3.4.5") { - $ENV:PATH = $_ROSBE_BASEDIR\3.4.5\bin;$_ROSBE_BASEDIR\3.4.5\libexec\gcc\mingw32\3.4.5;$ENV:PATH - $_ROSBE_MINGWMAKE = $_ROSBE_BASEDIR\3.4.5\bin\mingw32-make.exe + $ENV:PATH = "$_ROSBE_BASEDIR\3.4.5\bin;$_ROSBE_BASEDIR\3.4.5\libexec\gcc\mingw32\3.4.5;$ENV:PATH" + $_ROSBE_MINGWMAKE = "$_ROSBE_BASEDIR\3.4.5\bin\mingw32-make.exe" # Set all paths (needed by Windows Vista) - $ENV:C_INCLUDE_PATH = $_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include - $ENV:CPLUS_INCLUDE_PATH = $_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5\mingw32;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include - $ENV:LIBRARY_PATH = $_ROSBE_BASEDIR\3.4.5\lib;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5 + $ENV:C_INCLUDE_PATH = "$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include" + $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5\mingw32;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include" + $ENV:LIBRARY_PATH = "$_ROSBE_BASEDIR\3.4.5\lib;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5" $ENV:HOST_CFLAGS = $null $ENV:HOST_CPPFLAGS = $null $ENV:TARGET_CFLAGS = $null $ENV:TARGET_CPPFLAGS = $null -) +} # # Display the current version of GCC, NASM, ld and make. # @@ -115,14 +115,14 @@ } } if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\bison.exe") { - & bison --version | find "GNU Bison" + & bison '--version' | select-string "GNU Bison" } else { if ($_ROSBE_MODE -eq "RosBE") { "WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC." } } if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\flex.exe") { - $fver = (& flex --version) -replace ".*version ((\d|\.)+).*",'$1' + $fver = (& flex '--version') -replace ".*version ((\d|\.)+).*",'$1' "flex $fver" } else { if ($_ROSBE_MODE -eq "RosBE") {

16 years

[hyperion] 37781: Bug closing extravaganza holiday special commit! modified base/shell/cmd/ren.c added base/shell/cmd/ren.txt Correct implementation of "ren" command in cmd Patch by Victor Martinez <vicmarcal@hotmail.com> added include/crt/mingw32/intrin.h added include/crt/mingw32/intrin_arm.h added include/crt/mingw32/intrin_ppc.h added include/crt/mingw32/intrin_x86.h added include/crt/mingw32/intrin_x86_64.h deleted include/psdk/intrin.h deleted include/psdk/intrin_arm.h deleted include/psdk

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Nov 30 17:08:02 2008 New Revision: 37781 URL: http://svn.reactos.org/svn/reactos?rev=37781&view=rev Log: Bug closing extravaganza holiday special commit! modified base/shell/cmd/ren.c added base/shell/cmd/ren.txt Correct implementation of "ren" command in cmd Patch by Victor Martinez <vicmarcal(a)hotmail.com> added include/crt/mingw32/intrin.h added include/crt/mingw32/intrin_arm.h added include/crt/mingw32/intrin_ppc.h added include/crt/mingw32/intrin_x86.h added include/crt/mingw32/intrin_x86_64.h deleted include/psdk/intrin.h deleted include/psdk/intrin_arm.h deleted include/psdk/intrin_ppc.h deleted include/psdk/intrin_x86.h deleted include/psdk/intrin_x86_64.h intrin.h positively IS NOT a PSDK header The "a" argument to _bittestandcomplement, _bittestandreset and _bittestandset is an input AND output argument, unlike the argument to _bittest. Move argument to outputs, change constraint to "+mr" Spotted by hto modified lib/3rdparty/mingw/cpu_features.c Stray semicolon Patch by hto from Bugzilla modified lib/sdk/crt/locale/locale.c Missing colon Patch by hto from Bugzilla See issue #3902,3921,3924,3926 for more details. Added: trunk/reactos/base/shell/cmd/ren.txt (with props) trunk/reactos/include/crt/mingw32/intrin.h (props changed) - copied unchanged from r37780, trunk/reactos/include/psdk/intrin.h trunk/reactos/include/crt/mingw32/intrin_arm.h (props changed) - copied unchanged from r37780, trunk/reactos/include/psdk/intrin_arm.h trunk/reactos/include/crt/mingw32/intrin_ppc.h (props changed) - copied unchanged from r37780, trunk/reactos/include/psdk/intrin_ppc.h trunk/reactos/include/crt/mingw32/intrin_x86.h (contents, props changed) - copied, changed from r37780, trunk/reactos/include/psdk/intrin_x86.h trunk/reactos/include/crt/mingw32/intrin_x86_64.h (props changed) - copied unchanged from r37780, trunk/reactos/include/psdk/intrin_x86_64.h Removed: trunk/reactos/include/psdk/intrin.h trunk/reactos/include/psdk/intrin_arm.h trunk/reactos/include/psdk/intrin_ppc.h trunk/reactos/include/psdk/intrin_x86.h trunk/reactos/include/psdk/intrin_x86_64.h Modified: trunk/reactos/base/shell/cmd/ren.c trunk/reactos/lib/3rdparty/mingw/cpu_features.c trunk/reactos/lib/sdk/crt/locale/locale.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.c?rev=3… Added: trunk/reactos/base/shell/cmd/ren.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.txt?rev… Copied: trunk/reactos/include/crt/mingw32/intrin_x86.h (from r37780, trunk/reactos/include/psdk/intrin_x86.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… Removed: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… Removed: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… Removed: trunk/reactos/include/psdk/intrin_ppc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_ppc.h?… Removed: trunk/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86.h?… Removed: trunk/reactos/include/psdk/intrin_x86_64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86_64… Modified: trunk/reactos/lib/3rdparty/mingw/cpu_features.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/cpu_fea… Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.…

16 years

[hyperion] 37780: Default debugging format might not be stabs - pass -gstabs+ instead of -g to gcc. And did you know ld doesn't actually have a -g switch? _Now_ we can upgrade to gcc 4.3.2 After a suggestion by hto from Bugzilla. Dmitry, start doing your own commits already See issue #3922 for more details.

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Nov 30 15:26:04 2008 New Revision: 37780 URL: http://svn.reactos.org/svn/reactos?rev=37780&view=rev Log: Default debugging format might not be stabs - pass -gstabs+ instead of -g to gcc. And did you know ld doesn't actually have a -g switch? _Now_ we can upgrade to gcc 4.3.2 After a suggestion by hto from Bugzilla. Dmitry, start doing your own commits already See issue #3922 for more details. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Nov 30 15:26:04 2008 @@ -1655,7 +1655,7 @@ backend->GetFullPath ( *pchFilename ).c_str() ); fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); fprintf ( fMakefile, - "\t%s -o %s %s %s -g %s\n\n", + "\t%s -o %s %s %s -gstabs+ %s\n\n", module.cplusplus ? cppc.c_str() : cc.c_str(), backend->GetFullName ( *pchFilename ).c_str(), module.cplusplus ? cxxflagsMacro.c_str() : cflagsMacro.c_str(), @@ -1894,7 +1894,7 @@ } else globalCflags += " -Wall -Wpointer-arith"; - globalCflags += " -g"; + globalCflags += " -gstabs+"; if ( backend->usePipe ) globalCflags += " -pipe"; if ( !module.allowWarnings ) @@ -1948,7 +1948,7 @@ fprintf ( fMakefile, - "%s_LFLAGS := $(PROJECT_LFLAGS) -g $(%s_LFLAGS)\n", + "%s_LFLAGS := $(PROJECT_LFLAGS) $(%s_LFLAGS)\n", module.name.c_str (), module.name.c_str () ); } @@ -3028,7 +3028,7 @@ backend->GetFullName ( junk_cpy ).c_str (), backend->GetFullName ( junk_tmp ).c_str () ); - fprintf ( fMakefile, "\t${ld} $(%s_LINKFORMAT) %s %s -g -o %s\n", + fprintf ( fMakefile, "\t${ld} $(%s_LINKFORMAT) %s %s -o %s\n", module.buildtype.c_str (), linkDepsMacro.c_str (), backend->GetFullName ( junk_tmp ).c_str (), @@ -3568,7 +3568,7 @@ fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); - fprintf ( fMakefile, "\t${gcc} $(%s_LINKFORMAT) %s %s -g -o %s\n", + fprintf ( fMakefile, "\t${gcc} $(%s_LINKFORMAT) %s %s -gstabs+ -o %s\n", module.buildtype.c_str(), objectsMacro.c_str(), libsMacro.c_str(),

16 years

[sginsberg] 37779: - Make this shit readable -- oh wait this is a commit message... Clean up indentation a bit.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Nov 30 14:12:04 2008 New Revision: 37779 URL: http://svn.reactos.org/svn/reactos?rev=37779&view=rev Log: - Make this shit readable -- oh wait this is a commit message... Clean up indentation a bit. Modified: trunk/reactos/drivers/filesystems/fastfat/direntry.c Modified: trunk/reactos/drivers/filesystems/fastfat/direntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/direntry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/direntry.c [iso-8859-1] Sun Nov 30 14:12:04 2008 @@ -17,137 +17,155 @@ vfatDirEntryGetFirstCluster (PDEVICE_EXTENSION pDeviceExt, PDIR_ENTRY pFatDirEntry) { - ULONG cluster; - - if (pDeviceExt->FatInfo.FatType == FAT32) - { - cluster = pFatDirEntry->Fat.FirstCluster | - (pFatDirEntry->Fat.FirstClusterHigh << 16); - } - else if (pDeviceExt->Flags & VCB_IS_FATX) - { - cluster = pFatDirEntry->FatX.FirstCluster; - } - else - { - cluster = pFatDirEntry->Fat.FirstCluster; - } - - return cluster; -} - -static BOOLEAN FATIsDirectoryEmpty(PVFATFCB Fcb) -{ - LARGE_INTEGER FileOffset; - PVOID Context = NULL; - PFAT_DIR_ENTRY FatDirEntry; - ULONG Index, MaxIndex; - - if (vfatFCBIsRoot(Fcb)) - { - Index = 0; - } - else - { - Index = 2; - } - - FileOffset.QuadPart = 0; - MaxIndex = Fcb->RFCB.FileSize.u.LowPart / sizeof(FAT_DIR_ENTRY); - - while (Index < MaxIndex) - { - if (Context == NULL || (Index % FAT_ENTRIES_PER_PAGE) == 0) - { - if (Context != NULL) - { - CcUnpinData(Context); - } - if (!CcMapData(Fcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, &Context, (PVOID*)&FatDirEntry)) - { - return TRUE; - } - FatDirEntry += Index % FAT_ENTRIES_PER_PAGE; - } - if (FAT_ENTRY_END(FatDirEntry)) - { - CcUnpinData(Context); - return TRUE; - } - if (!FAT_ENTRY_DELETED(FatDirEntry)) - { - CcUnpinData(Context); - return FALSE; - } - Index++; - FatDirEntry++; - } - if (Context) - { - CcUnpinData(Context); - } - return TRUE; -} - -static BOOLEAN FATXIsDirectoryEmpty(PVFATFCB Fcb) -{ - LARGE_INTEGER FileOffset; - PVOID Context = NULL; - PFATX_DIR_ENTRY FatXDirEntry; - ULONG Index, MaxIndex; - - Index = 0; - - FileOffset.QuadPart = 0; - MaxIndex = Fcb->RFCB.FileSize.u.LowPart / sizeof(FATX_DIR_ENTRY); - - while (Index < MaxIndex) - { - if (Context == NULL || (Index % FATX_ENTRIES_PER_PAGE) == 0) - { - if (Context != NULL) - { + ULONG cluster; + + if (pDeviceExt->FatInfo.FatType == FAT32) + { + cluster = pFatDirEntry->Fat.FirstCluster | + (pFatDirEntry->Fat.FirstClusterHigh << 16); + } + else if (pDeviceExt->Flags & VCB_IS_FATX) + { + cluster = pFatDirEntry->FatX.FirstCluster; + } + else + { + cluster = pFatDirEntry->Fat.FirstCluster; + } + + return cluster; +} + +static +BOOLEAN +FATIsDirectoryEmpty(PVFATFCB Fcb) +{ + LARGE_INTEGER FileOffset; + PVOID Context = NULL; + PFAT_DIR_ENTRY FatDirEntry; + ULONG Index, MaxIndex; + + if (vfatFCBIsRoot(Fcb)) + { + Index = 0; + } + else + { + Index = 2; + } + + FileOffset.QuadPart = 0; + MaxIndex = Fcb->RFCB.FileSize.u.LowPart / sizeof(FAT_DIR_ENTRY); + + while (Index < MaxIndex) + { + if (Context == NULL || (Index % FAT_ENTRIES_PER_PAGE) == 0) + { + if (Context != NULL) + { + CcUnpinData(Context); + } + + if (!CcMapData(Fcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, &Context, (PVOID*)&FatDirEntry)) + { + return TRUE; + } + + FatDirEntry += Index % FAT_ENTRIES_PER_PAGE; + } + + if (FAT_ENTRY_END(FatDirEntry)) + { CcUnpinData(Context); - } - if (!CcMapData(Fcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, &Context, (PVOID*)&FatXDirEntry)) - { return TRUE; - } - FatXDirEntry += Index % FATX_ENTRIES_PER_PAGE; - } - if (FATX_ENTRY_END(FatXDirEntry)) - { - CcUnpinData(Context); - return TRUE; - } - if (!FATX_ENTRY_DELETED(FatXDirEntry)) - { - CcUnpinData(Context); - return FALSE; - } - Index++; - FatXDirEntry++; - } - if (Context) - { - CcUnpinData(Context); - } - return TRUE; -} - -BOOLEAN VfatIsDirectoryEmpty(PVFATFCB Fcb) -{ - if (Fcb->Flags & FCB_IS_FATX_ENTRY) - return FATXIsDirectoryEmpty(Fcb); - else - return FATIsDirectoryEmpty(Fcb); -} - -NTSTATUS FATGetNextDirEntry(PVOID * pContext, - PVOID * pPage, - IN PVFATFCB pDirFcb, - PVFAT_DIRENTRY_CONTEXT DirContext, - BOOLEAN First) + } + + if (!FAT_ENTRY_DELETED(FatDirEntry)) + { + CcUnpinData(Context); + return FALSE; + } + + Index++; + FatDirEntry++; + } + + if (Context) + { + CcUnpinData(Context); + } + + return TRUE; +} + +static +BOOLEAN +FATXIsDirectoryEmpty(PVFATFCB Fcb) +{ + LARGE_INTEGER FileOffset; + PVOID Context = NULL; + PFATX_DIR_ENTRY FatXDirEntry; + ULONG Index = 0, MaxIndex; + + FileOffset.QuadPart = 0; + MaxIndex = Fcb->RFCB.FileSize.u.LowPart / sizeof(FATX_DIR_ENTRY); + + while (Index < MaxIndex) + { + if (Context == NULL || (Index % FATX_ENTRIES_PER_PAGE) == 0) + { + if (Context != NULL) + { + CcUnpinData(Context); + } + + if (!CcMapData(Fcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, &Context, (PVOID*)&FatXDirEntry)) + { + return TRUE; + } + + FatXDirEntry += Index % FATX_ENTRIES_PER_PAGE; + } + + if (FATX_ENTRY_END(FatXDirEntry)) + { + CcUnpinData(Context); + return TRUE; + } + + if (!FATX_ENTRY_DELETED(FatXDirEntry)) + { + CcUnpinData(Context); + return FALSE; + } + + Index++; + FatXDirEntry++; + } + + if (Context) + { + CcUnpinData(Context); + } + + return TRUE; +} + +BOOLEAN +VfatIsDirectoryEmpty(PVFATFCB Fcb) +{ + if (Fcb->Flags & FCB_IS_FATX_ENTRY) + return FATXIsDirectoryEmpty(Fcb); + else + return FATIsDirectoryEmpty(Fcb); +} + +NTSTATUS +FATGetNextDirEntry(PVOID *pContext, + PVOID *pPage, + IN PVFATFCB pDirFcb, + PVFAT_DIRENTRY_CONTEXT DirContext, + BOOLEAN First) { ULONG dirMap; PWCHAR pName; @@ -168,182 +186,198 @@ if (*pContext == NULL || (DirContext->DirIndex % FAT_ENTRIES_PER_PAGE) == 0) { - if (*pContext != NULL) - { - CcUnpinData(*pContext); - } - if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || - !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) - { - *pContext = NULL; - return STATUS_NO_MORE_ENTRIES; - } - } - + if (*pContext != NULL) + { + CcUnpinData(*pContext); + } + + if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || + !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) + { + *pContext = NULL; + return STATUS_NO_MORE_ENTRIES; + } + } fatDirEntry = (PFAT_DIR_ENTRY)(*pPage) + DirContext->DirIndex % FAT_ENTRIES_PER_PAGE; longNameEntry = (slot*) fatDirEntry; dirMap = 0; if (First) - { + { /* This is the first call to vfatGetNextDirEntry. Possible the start index points - * into a long name or points to a short name with an assigned long name. - * We must go back to the real start of the entry */ + * into a long name or points to a short name with an assigned long name. + * We must go back to the real start of the entry */ while (DirContext->DirIndex > 0 && - !FAT_ENTRY_END(fatDirEntry) && - !FAT_ENTRY_DELETED(fatDirEntry) && - ((!FAT_ENTRY_LONG(fatDirEntry) && !Back) || - (FAT_ENTRY_LONG(fatDirEntry) && !(longNameEntry->id & 0x40)))) - { + !FAT_ENTRY_END(fatDirEntry) && + !FAT_ENTRY_DELETED(fatDirEntry) && + ((!FAT_ENTRY_LONG(fatDirEntry) && !Back) || + (FAT_ENTRY_LONG(fatDirEntry) && !(longNameEntry->id & 0x40)))) + { DirContext->DirIndex--; - Back = TRUE; + Back = TRUE; + if ((DirContext->DirIndex % FAT_ENTRIES_PER_PAGE) == FAT_ENTRIES_PER_PAGE - 1) - { + { CcUnpinData(*pContext); FileOffset.u.LowPart -= PAGE_SIZE; + if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) - { - *pContext = NULL; - return STATUS_NO_MORE_ENTRIES; - } + { + *pContext = NULL; + return STATUS_NO_MORE_ENTRIES; + } + fatDirEntry = (PFAT_DIR_ENTRY)(*pPage) + DirContext->DirIndex % FAT_ENTRIES_PER_PAGE; longNameEntry = (slot*) fatDirEntry; - } - else - { + } + else + { fatDirEntry--; - longNameEntry--; - } - } + longNameEntry--; + } + } if (Back && !FAT_ENTRY_END(fatDirEntry) && - (FAT_ENTRY_DELETED(fatDirEntry) || !FAT_ENTRY_LONG(fatDirEntry))) - { + (FAT_ENTRY_DELETED(fatDirEntry) || !FAT_ENTRY_LONG(fatDirEntry))) + { DirContext->DirIndex++; - if ((DirContext->DirIndex % FAT_ENTRIES_PER_PAGE) == 0) - { - CcUnpinData(*pContext); - FileOffset.u.LowPart += PAGE_SIZE; - if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || - !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) - { - *pContext = NULL; - return STATUS_NO_MORE_ENTRIES; - } - fatDirEntry = (PFAT_DIR_ENTRY)*pPage; - longNameEntry = (slot*) *pPage; - } - else - { - fatDirEntry++; - longNameEntry++; - } - } - } + + if ((DirContext->DirIndex % FAT_ENTRIES_PER_PAGE) == 0) + { + CcUnpinData(*pContext); + FileOffset.u.LowPart += PAGE_SIZE; + + if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || + !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) + { + *pContext = NULL; + return STATUS_NO_MORE_ENTRIES; + } + + fatDirEntry = (PFAT_DIR_ENTRY)*pPage; + longNameEntry = (slot*) *pPage; + } + else + { + fatDirEntry++; + longNameEntry++; + } + } + } DirContext->StartIndex = DirContext->DirIndex; CheckSum = 0; while (TRUE) - { - if (FAT_ENTRY_END(fatDirEntry)) - { - CcUnpinData(*pContext); - *pContext = NULL; - return STATUS_NO_MORE_ENTRIES; - } - - if (FAT_ENTRY_DELETED(fatDirEntry)) - { - dirMap = 0; - DirContext->LongNameU.Buffer[0] = 0; - DirContext->StartIndex = DirContext->DirIndex + 1; - } - else - { - if (FAT_ENTRY_LONG(fatDirEntry)) - { - if (dirMap == 0) - { - DPRINT (" long name entry found at %d\n", DirContext->DirIndex); - RtlZeroMemory(DirContext->LongNameU.Buffer, DirContext->LongNameU.MaximumLength); - CheckSum = longNameEntry->alias_checksum; - Valid = TRUE; - } - - DPRINT (" name chunk1:[%.*S] chunk2:[%.*S] chunk3:[%.*S]\n", - 5, longNameEntry->name0_4, - 6, longNameEntry->name5_10, - 2, longNameEntry->name11_12); - - index = (longNameEntry->id & 0x1f) - 1; - dirMap |= 1 << index; - pName = DirContext->LongNameU.Buffer + 13 * index; - - RtlCopyMemory(pName, longNameEntry->name0_4, 5 * sizeof(WCHAR)); - RtlCopyMemory(pName + 5, longNameEntry->name5_10, 6 * sizeof(WCHAR)); - RtlCopyMemory(pName + 11, longNameEntry->name11_12, 2 * sizeof(WCHAR)); - - DPRINT (" longName: [%S]\n", DirContext->LongNameU.Buffer); - if (CheckSum != longNameEntry->alias_checksum) - { - DPRINT1("Found wrong alias checksum in long name entry (first %x, current %x, %S)\n", - CheckSum, longNameEntry->alias_checksum, DirContext->LongNameU.Buffer); - Valid = FALSE; - } - } - else - { - shortCheckSum = 0; + { + if (FAT_ENTRY_END(fatDirEntry)) + { + CcUnpinData(*pContext); + *pContext = NULL; + return STATUS_NO_MORE_ENTRIES; + } + + if (FAT_ENTRY_DELETED(fatDirEntry)) + { + dirMap = 0; + DirContext->LongNameU.Buffer[0] = 0; + DirContext->StartIndex = DirContext->DirIndex + 1; + } + else + { + if (FAT_ENTRY_LONG(fatDirEntry)) + { + if (dirMap == 0) + { + DPRINT (" long name entry found at %d\n", DirContext->DirIndex); + RtlZeroMemory(DirContext->LongNameU.Buffer, DirContext->LongNameU.MaximumLength); + CheckSum = longNameEntry->alias_checksum; + Valid = TRUE; + } + + DPRINT(" name chunk1:[%.*S] chunk2:[%.*S] chunk3:[%.*S]\n", + 5, longNameEntry->name0_4, + 6, longNameEntry->name5_10, + 2, longNameEntry->name11_12); + + index = (longNameEntry->id & 0x1f) - 1; + dirMap |= 1 << index; + pName = DirContext->LongNameU.Buffer + 13 * index; + + RtlCopyMemory(pName, longNameEntry->name0_4, 5 * sizeof(WCHAR)); + RtlCopyMemory(pName + 5, longNameEntry->name5_10, 6 * sizeof(WCHAR)); + RtlCopyMemory(pName + 11, longNameEntry->name11_12, 2 * sizeof(WCHAR)); + + DPRINT (" longName: [%S]\n", DirContext->LongNameU.Buffer); + + if (CheckSum != longNameEntry->alias_checksum) + { + DPRINT1("Found wrong alias checksum in long name entry (first %x, current %x, %S)\n", + CheckSum, longNameEntry->alias_checksum, DirContext->LongNameU.Buffer); + Valid = FALSE; + } + } + else + { + shortCheckSum = 0; for (i = 0; i < 11; i++) - { + { shortCheckSum = (((shortCheckSum & 1) << 7) | ((shortCheckSum & 0xfe) >> 1)) + fatDirEntry->ShortName[i]; - } - if (shortCheckSum != CheckSum && DirContext->LongNameU.Buffer[0]) - { - DPRINT1("Checksum from long and short name is not equal (short: %x, long: %x, %S)\n", - shortCheckSum, CheckSum, DirContext->LongNameU.Buffer); - DirContext->LongNameU.Buffer[0] = 0; - } - if (Valid == FALSE) - { - DirContext->LongNameU.Buffer[0] = 0; - } - - RtlCopyMemory (&DirContext->DirEntry.Fat, fatDirEntry, sizeof (FAT_DIR_ENTRY)); - break; - } - } - DirContext->DirIndex++; - if ((DirContext->DirIndex % FAT_ENTRIES_PER_PAGE) == 0) - { - CcUnpinData(*pContext); - FileOffset.u.LowPart += PAGE_SIZE; - if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || - !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) - { - *pContext = NULL; - return STATUS_NO_MORE_ENTRIES; - } - fatDirEntry = (PFAT_DIR_ENTRY)*pPage; - longNameEntry = (slot*) *pPage; - } - else - { - fatDirEntry++; - longNameEntry++; - } - } + } + + if (shortCheckSum != CheckSum && DirContext->LongNameU.Buffer[0]) + { + DPRINT1("Checksum from long and short name is not equal (short: %x, long: %x, %S)\n", + shortCheckSum, CheckSum, DirContext->LongNameU.Buffer); + DirContext->LongNameU.Buffer[0] = 0; + } + + if (Valid == FALSE) + { + DirContext->LongNameU.Buffer[0] = 0; + } + + RtlCopyMemory (&DirContext->DirEntry.Fat, fatDirEntry, sizeof (FAT_DIR_ENTRY)); + break; + } + } + + DirContext->DirIndex++; + + if ((DirContext->DirIndex % FAT_ENTRIES_PER_PAGE) == 0) + { + CcUnpinData(*pContext); + FileOffset.u.LowPart += PAGE_SIZE; + + if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || + !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) + { + *pContext = NULL; + return STATUS_NO_MORE_ENTRIES; + } + + fatDirEntry = (PFAT_DIR_ENTRY)*pPage; + longNameEntry = (slot*) *pPage; + } + else + { + fatDirEntry++; + longNameEntry++; + } + } + DirContext->LongNameU.Length = wcslen(DirContext->LongNameU.Buffer) * sizeof(WCHAR); vfat8Dot3ToString(&DirContext->DirEntry.Fat, &DirContext->ShortNameU); + if (DirContext->LongNameU.Length == 0) - { + { RtlCopyUnicodeString(&DirContext->LongNameU, &DirContext->ShortNameU); - } + } + return STATUS_SUCCESS; }

16 years

[hyperion] 37778: Correctly parse the output of gcc --version for TDM builds of gcc. We can now upgrade to gcc 4.3.2 Patch by niski from Bugzilla See issue #3922 for more details.

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Nov 30 13:56:43 2008 New Revision: 37778 URL: http://svn.reactos.org/svn/reactos?rev=37778&view=rev Log: Correctly parse the output of gcc --version for TDM builds of gcc. We can now upgrade to gcc 4.3.2 Patch by niski from Bugzilla See issue #3922 for more details. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Nov 30 13:56:43 2008 @@ -822,7 +822,7 @@ buffer[i] = '\0'; pclose ( fp ); - char separators[] = " "; + char separators[] = " ()"; char *token; char *prevtoken = NULL;

16 years

[hyperion] 37777: Patch by hto from Bugzilla See issue #3827 for more details.

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Nov 30 13:50:25 2008 New Revision: 37777 URL: http://svn.reactos.org/svn/reactos?rev=37777&view=rev Log: Patch by hto from Bugzilla See issue #3827 for more details. Modified: trunk/reactos/dll/win32/advapi32/misc/trace.c Modified: trunk/reactos/dll/win32/advapi32/misc/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] Sun Nov 30 13:50:25 2008 @@ -27,7 +27,7 @@ ) { DPRINT1("GetTraceLoggerHandle stub()\n"); - return HandleToUlong(INVALID_HANDLE_VALUE); /* BUGBUG: should we use HandleToLong instead? */ + return (TRACEHANDLE)-1; }

16 years

[hyperion] 37776: modified include/reactos/probe.h Workaround for gcc 4.1.3. See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 modified ntoskrnl/include/internal/mm.h gcc 4.3.2 doesn't like to be told to inline MmAcquirePageListLock modified ntoskrnl/include/internal/probe.h Cleaning up after TSVN's buggy "apply patch" modified subsystems/win32/win32k/ntuser/message.c Silence a gcc 4.3.2 warning (possibly incorrectly) modified dll/directx/ddraw/ddraw.rbuild modified dll/win32/gdi32/gdi32.

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Nov 30 13:28:11 2008 New Revision: 37776 URL: http://svn.reactos.org/svn/reactos?rev=37776&view=rev Log: modified include/reactos/probe.h Workaround for gcc 4.1.3. See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 modified ntoskrnl/include/internal/mm.h gcc 4.3.2 doesn't like to be told to inline MmAcquirePageListLock modified ntoskrnl/include/internal/probe.h Cleaning up after TSVN's buggy "apply patch" modified subsystems/win32/win32k/ntuser/message.c Silence a gcc 4.3.2 warning (possibly incorrectly) modified dll/directx/ddraw/ddraw.rbuild modified dll/win32/gdi32/gdi32.rbuild modified dll/win32/kernel32/kernel32.rbuild modified dll/win32/psapi/psapi.rbuild modified dll/win32/setupapi/setupapi.rbuild modified dll/win32/syssetup/syssetup.rbuild modified dll/win32/user32/user32.rbuild modified drivers/input/kbdclass/kbdclass.rbuild modified drivers/input/mouclass/mouclass.rbuild modified drivers/network/afd/afd.rbuild modified drivers/network/tcpip/tcpip.rbuild modified lib/rtl/rtl.rbuild modified subsystems/win32/win32k/win32k.rbuild modified subsystems/win32/win32k/objects/gdiobj.c gcc 4.1.3 workarounds. See embedded comments modified base/services/eventlog/eventlog.h modified dll/win32/advapi32/advapi32.h Removed superfluous includes of pseh/pseh.h modified dll/directx/ddraw/Ddraw/ddraw_displaymode.c modified dll/directx/ddraw/Ddraw/ddraw_main.c modified dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c modified dll/directx/ddraw/Ddraw/GetCaps.c modified dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c modified dll/directx/ddraw/main.c modified dll/directx/ddraw/rosdraw.h modified dll/directx/ddraw/Surface/surface_main.c ddraw migrated to PSEH 2.0 modified dll/win32/gdi32/include/precomp.h modified dll/win32/gdi32/misc/misc.c modified dll/win32/gdi32/objects/bitmap.c gdi32 migrated to PSEH 2.0 modified dll/win32/kernel32/except/except.c modified dll/win32/kernel32/file/find.c modified dll/win32/kernel32/k32.h modified dll/win32/kernel32/mem/isbad.c modified dll/win32/kernel32/misc/console.c modified dll/win32/kernel32/process/procsup.c modified dll/win32/kernel32/string/lstring.c modified dll/win32/kernel32/thread/thread.c kernel32 migrated to PSEH 2.0 modified dll/win32/psapi/precomp.h modified dll/win32/psapi/psapi.c psapi migrated to PSEH 2.0 modified dll/win32/setupapi/cfgmgr.c modified dll/win32/setupapi/setupapi_private.h setupapi migrated to PSEH 2.0 modified dll/win32/syssetup/wizard.c syssetup migrated to PSEH 2.0 modified dll/win32/user32/include/user32.h modified dll/win32/user32/windows/class.c modified dll/win32/user32/windows/text.c modified dll/win32/user32/windows/window.c user32 migrated to PSEH 2.0 modified drivers/input/kbdclass/kbdclass.c modified drivers/input/kbdclass/kbdclass.h kbdclass migrated to PSEH 2.0 modified drivers/input/mouclass/mouclass.c modified drivers/input/mouclass/mouclass.h mouclass migrated to PSEH 2.0 modified drivers/network/afd/afd/info.c modified drivers/network/afd/afd/lock.c modified drivers/network/afd/afd/tdi.c modified drivers/network/afd/afd/tdiconn.c afd migrated to PSEH 2.0 modified drivers/network/lan/lan/lan.c lan migrated to PSEH 2.0 modified drivers/network/tcpip/tcpip/dispatch.c tcpip migrated to PSEH 2.0 modified lib/rtl/debug.c modified lib/rtl/res.c modified lib/rtl/rtl.h modified lib/rtl/unicode.c modified lib/rtl/workitem.c rtl migrated to PSEH 2.0 modified ntoskrnl/include/precomp.h ntoskrnl migrated to PSEH 2.0 modified subsystems/csr/csrsrv/api.c csrsrv migrated to PSEH 2.0 modified subsystems/win32/win32k/eng/bitblt.c modified subsystems/win32/win32k/eng/mem.c modified subsystems/win32/win32k/include/mmcopy.h modified subsystems/win32/win32k/misc/copy.c modified subsystems/win32/win32k/ntuser/callback.c modified subsystems/win32/win32k/ntuser/class.c modified subsystems/win32/win32k/ntuser/clipboard.c modified subsystems/win32/win32k/ntuser/cursoricon.c modified subsystems/win32/win32k/ntuser/display.c modified subsystems/win32/win32k/ntuser/hook.c modified subsystems/win32/win32k/ntuser/input.c modified subsystems/win32/win32k/ntuser/kbdlayout.c modified subsystems/win32/win32k/ntuser/menu.c modified subsystems/win32/win32k/ntuser/misc.c modified subsystems/win32/win32k/ntuser/ntstubs.c modified subsystems/win32/win32k/ntuser/painting.c modified subsystems/win32/win32k/ntuser/simplecall.c modified subsystems/win32/win32k/ntuser/sysparams.c modified subsystems/win32/win32k/ntuser/window.c modified subsystems/win32/win32k/objects/bitblt.c modified subsystems/win32/win32k/objects/bitmaps.c modified subsystems/win32/win32k/objects/brush.c modified subsystems/win32/win32k/objects/cliprgn.c modified subsystems/win32/win32k/objects/color.c modified subsystems/win32/win32k/objects/coord.c modified subsystems/win32/win32k/objects/dc.c modified subsystems/win32/win32k/objects/dcutil.c modified subsystems/win32/win32k/objects/dibobj.c modified subsystems/win32/win32k/objects/fillshap.c modified subsystems/win32/win32k/objects/font.c modified subsystems/win32/win32k/objects/freetype.c modified subsystems/win32/win32k/objects/icm.c modified subsystems/win32/win32k/objects/line.c modified subsystems/win32/win32k/objects/path.c modified subsystems/win32/win32k/objects/pen.c modified subsystems/win32/win32k/objects/print.c modified subsystems/win32/win32k/objects/region.c modified subsystems/win32/win32k/objects/text.c modified subsystems/win32/win32k/pch.h win32k migrated to PSEH 2.0 Modified: trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/include/precomp.h trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/dll/win32/kernel32/except/except.c trunk/reactos/dll/win32/kernel32/file/find.c trunk/reactos/dll/win32/kernel32/k32.h trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/kernel32/mem/isbad.c trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/dll/win32/kernel32/process/procsup.c trunk/reactos/dll/win32/kernel32/string/lstring.c trunk/reactos/dll/win32/kernel32/thread/thread.c trunk/reactos/dll/win32/psapi/precomp.h trunk/reactos/dll/win32/psapi/psapi.c trunk/reactos/dll/win32/psapi/psapi.rbuild trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/syssetup/syssetup.rbuild trunk/reactos/dll/win32/syssetup/wizard.c trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/dll/win32/user32/windows/text.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/drivers/input/mouclass/mouclass.h trunk/reactos/drivers/input/mouclass/mouclass.rbuild trunk/reactos/drivers/network/afd/afd.rbuild trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/afd/afd/tdiconn.c trunk/reactos/drivers/network/lan/lan/lan.c trunk/reactos/drivers/network/tcpip/tcpip.rbuild trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/include/reactos/probe.h trunk/reactos/lib/rtl/debug.c trunk/reactos/lib/rtl/res.c trunk/reactos/lib/rtl/rtl.h trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/rtl/unicode.c trunk/reactos/lib/rtl/workitem.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/probe.h trunk/reactos/ntoskrnl/include/precomp.h trunk/reactos/subsystems/csr/csrsrv/api.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/mem.c trunk/reactos/subsystems/win32/win32k/include/mmcopy.h trunk/reactos/subsystems/win32/win32k/misc/copy.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/color.c trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/print.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/pch.h trunk/reactos/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… Modified: trunk/reactos/dll/win32/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/pr… Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… Modified: trunk/reactos/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Modified: trunk/reactos/dll/win32/kernel32/mem/isbad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/isb… Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… Modified: trunk/reactos/dll/win32/kernel32/string/lstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/string/… Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… Modified: trunk/reactos/dll/win32/psapi/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/precomp.h?… Modified: trunk/reactos/dll/win32/psapi/psapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.c?re… Modified: trunk/reactos/dll/win32/psapi/psapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.rbui… Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Modified: trunk/reactos/dll/win32/syssetup/syssetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… Modified: trunk/reactos/dll/win32/user32/windows/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/t… Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… Modified: trunk/reactos/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… Modified: trunk/reactos/drivers/input/mouclass/mouclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… Modified: trunk/reactos/drivers/network/afd/afd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd.rb… Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… Modified: trunk/reactos/drivers/network/lan/lan/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/lan/lan/la… Modified: trunk/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?re… Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=37776&… Modified: trunk/reactos/lib/rtl/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/res.c?rev=37776&r1… Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=37776&r1… Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=377… Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=3777… Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=377… Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/precomp.h… Modified: trunk/reactos/subsystems/csr/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/api.… Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/include/mmcopy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/misc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…

16 years

[dreimer] 37775: Another nice gimmick I just invented by accident.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Nov 30 13:21:30 2008 New Revision: 37775 URL: http://svn.reactos.org/svn/reactos?rev=37775&view=rev Log: Another nice gimmick I just invented by accident. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Sun Nov 30 13:21:30 2008 @@ -131,6 +131,8 @@ end } elseif ("$args" -ne "") { - "Unknown parameter specified. Try ''help [COMMAND]''." + $cl = "$args" + "_clean" + make $cl + $cl = $null end } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Sun Nov 30 13:21:30 2008 @@ -168,6 +168,8 @@ "" " all - Removes build logs and compiler output in the RosBE-Logs directory." " logs - Removes all build logs in the RosBE-Logs directory." + " All other commands will be parsed as "make COMMAND_clean" and cleans the" + " specific command." exit } if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Sun Nov 30 13:21:30 2008 @@ -29,7 +29,7 @@ goto :EOC ) if not "%1" == "" ( - echo Unknown parameter specified. Try 'help [COMMAND]'. + "%_ROSBE_BASEDIR%\Build.cmd" %1_clean goto :EOC ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Sun Nov 30 13:21:30 2008 @@ -174,6 +174,8 @@ echo. echo all - Removes build logs and compiler output in the RosBE-Logs directory. echo logs - Removes all build logs in the RosBE-Logs directory. + echo All other commands will be parsed as "make COMMAND_clean" and cleans the + echo specific command. goto :EOC ) if exist "%_ROSBE_BASEDIR%\Config.cmd" (

16 years

[gschneider] 37774: Update C++ demangle code to recent wine, now all msvcrt cpp tests pass except one.

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Nov 30 13:19:45 2008 New Revision: 37774 URL: http://svn.reactos.org/svn/reactos?rev=37774&view=rev Log: Update C++ demangle code to recent wine, now all msvcrt cpp tests pass except one. Modified: trunk/reactos/lib/sdk/crt/wine/undname.c Modified: trunk/reactos/lib/sdk/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/undname.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] Sun Nov 30 13:19:45 2008 @@ -23,6 +23,7 @@ #include "wine/port.h" #include <assert.h> +#include <stdio.h> #include <stdarg.h> #include "windef.h" @@ -43,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* TODO: - * - document a bit (grammar + fonctions) + * - document a bit (grammar + functions) * - back-port this new code into tools/winedump/msmangle.c */ @@ -67,7 +68,7 @@ #define UNDNAME_NO_COMPLEX_TYPE (0x8000) /* How data types modifiers are stored: - * M (in the following definitions) is defined for + * M (in the following definitions) is defined for * 'A', 'B', 'C' and 'D' as follows * {<A>}: "" * {<B>}: "const " @@ -81,7 +82,7 @@ * in data fields: * same as for arguments and also the following * ?<M>x {<M>}x - * + * */ #define MAX_ARRAY_ELTS 32 @@ -103,6 +104,7 @@ const char* current; /* pointer in input (mangled) string */ char* result; /* demangled string */ + struct array names; /* array of names for back reference */ struct array stack; /* stack of parsed strings */ void* alloc_list; /* linked list of allocated blocks */ @@ -140,7 +142,7 @@ sym->avail_in_first = 0; ptr = (char*)sym->alloc_list + sizeof(void*); } - else + else { if (len > sym->avail_in_first) { @@ -172,7 +174,7 @@ while (sym->alloc_list) { next = *(void**)sym->alloc_list; - sym->mem_free_ptr(sym->alloc_list); + if(sym->mem_free_ptr) sym->mem_free_ptr(sym->alloc_list); sym->alloc_list = next; } sym->avail_in_first = 0; @@ -191,7 +193,7 @@ * str_array_push * Adding a new string to an array */ -static void str_array_push(struct parsed_symbol* sym, const char* ptr, size_t len, +static void str_array_push(struct parsed_symbol* sym, const char* ptr, int len, struct array* a) { assert(ptr); @@ -201,7 +203,7 @@ a->elts[a->num] = und_alloc(sym, len + 1); assert(a->elts[a->num]); memcpy(a->elts[a->num], ptr, len); - a->elts[a->num][len] = '\0'; + a->elts[a->num][len] = '\0'; if (++a->num >= a->max) a->max = a->num; { int i; @@ -212,7 +214,7 @@ c = '>'; if (i < a->start) c = '-'; else if (i >= a->num) c = '}'; - TRACE("\t%d%c %s\n", i, c, a->elts[i]); + TRACE("%p\t%d%c %s\n", a, i, c, a->elts[i]); } } } @@ -227,18 +229,18 @@ assert(cref); if (cref->start + idx >= cref->max) { - WARN("Out of bounds: %p %d + %d >= %d\n", + WARN("Out of bounds: %p %d + %d >= %d\n", cref, cref->start, idx, cref->max); return NULL; } - TRACE("Returning %p[%d] => %s\n", + TRACE("Returning %p[%d] => %s\n", cref, idx, cref->elts[cref->start + idx]); return cref->elts[cref->start + idx]; } /****************************************************************** * str_printf - * Helper for printf type of command (only %s and %c are implemented) + * Helper for printf type of command (only %s and %c are implemented) * while dynamically allocating the buffer */ static char* str_printf(struct parsed_symbol* sym, const char* format, ...) @@ -265,7 +267,7 @@ else len++; } va_end(args); - if (!(tmp = (char*)und_alloc(sym, len))) return NULL; + if (!(tmp = und_alloc(sym, len))) return NULL; va_start(args, format); for (p = tmp, i = 0; format[i]; i++) { @@ -300,19 +302,65 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, struct array* pmt, BOOL in_args); +static const char* get_number(struct parsed_symbol* sym) +{ + char* ptr; + BOOL sgn = FALSE; + + if (*sym->current == '?') + { + sgn = TRUE; + sym->current++; + } + if (*sym->current >= '0' && *sym->current <= '8') + { + ptr = und_alloc(sym, 3); + if (sgn) ptr[0] = '-'; + ptr[sgn ? 1 : 0] = *sym->current + 1; + ptr[sgn ? 2 : 1] = '\0'; + sym->current++; + } + else if (*sym->current == '9') + { + ptr = und_alloc(sym, 4); + if (sgn) ptr[0] = '-'; + ptr[sgn ? 1 : 0] = '1'; + ptr[sgn ? 2 : 1] = '0'; + ptr[sgn ? 3 : 2] = '\0'; + sym->current++; + } + else if (*sym->current >= 'A' && *sym->current <= 'P') + { + long ret = 0; + + while (*sym->current >= 'A' && *sym->current <= 'P') + { + ret *= 16; + ret += *sym->current++ - 'A'; + } + if (*sym->current != '@') return NULL; + + ptr = und_alloc(sym, 17); + sprintf(ptr, "%s%ld", sgn ? "-" : "", ret); + sym->current++; + } + else return NULL; + return ptr; +} + /****************************************************************** * get_args * Parses a list of function/method arguments, creates a string corresponding * to the arguments' list. */ -static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_term, +static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_term, char open_char, char close_char) { struct datatype_t ct; struct array arg_collect; char* args_str = NULL; - int i; + unsigned int i; str_array_init(&arg_collect); @@ -327,13 +375,9 @@ } if (!demangle_datatype(sym, &ct, pmt_ref, TRUE)) return NULL; - /* 'void' terminates an argument list */ - if (!strcmp(ct.left, "void")) - { - if (!z_term && *sym->current == '@') sym->current++; - break; - } - str_array_push(sym, str_printf(sym, "%s%s", ct.left, ct.right), -1, + /* 'void' terminates an argument list in a function */ + if (z_term && !strcmp(ct.left, "void")) break; + str_array_push(sym, str_printf(sym, "%s%s", ct.left, ct.right), -1, &arg_collect); if (!strcmp(ct.left, "...")) break; } @@ -342,8 +386,8 @@ */ if (z_term && *sym->current++ != 'Z') return NULL; - if (arg_collect.num == 0 || - (arg_collect.num == 1 && !strcmp(arg_collect.elts[0], "void"))) + if (arg_collect.num == 0 || + (arg_collect.num == 1 && !strcmp(arg_collect.elts[0], "void"))) return str_printf(sym, "%cvoid%c", open_char, close_char); for (i = 1; i < arg_collect.num; i++) { @@ -351,12 +395,12 @@ } if (close_char == '>' && args_str && args_str[strlen(args_str) - 1] == '>') - args_str = str_printf(sym, "%c%s%s %c", + args_str = str_printf(sym, "%c%s%s %c", open_char, arg_collect.elts[0], args_str, close_char); else - args_str = str_printf(sym, "%c%s%s%c", + args_str = str_printf(sym, "%c%s%s%c", open_char, arg_collect.elts[0], args_str, close_char); - + return args_str; } @@ -377,19 +421,22 @@ return TRUE; } -static const char* get_modified_type(struct parsed_symbol* sym, char modif) +static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, + struct array *pmt_ref, char modif, BOOL in_args) { const char* modifier; - const char* ret = NULL; const char* str_modif; switch (modif) { case 'A': str_modif = " &"; break; + case 'B': str_modif = " & volatile"; break; case 'P': str_modif = " *"; break; case 'Q': str_modif = " * const"; break; + case 'R': str_modif = " * volatile"; break; + case 'S': str_modif = " * const volatile"; break; case '?': str_modif = ""; break; - default: return NULL; + default: return FALSE; } if (get_modifier(*sym->current++, &modifier)) @@ -397,27 +444,122 @@ unsigned mark = sym->stack.num; struct datatype_t sub_ct; + /* multidimensional arrays */ + if (*sym->current == 'Y') + { + const char* n1; + int num; + + sym->current++; + if (!(n1 = get_number(sym))) return FALSE; + num = atoi(n1); + + if (str_modif[0] == ' ' && !modifier) + str_modif++; + + if (modifier) + { + str_modif = str_printf(sym, " (%s%s)", modifier, str_modif); + modifier = NULL; + } + else + str_modif = str_printf(sym, " (%s)", str_modif); + + while (num--) + str_modif = str_printf(sym, "%s[%s]", str_modif, get_number(sym)); + } + /* Recurse to get the referred-to type */ - if (!demangle_datatype(sym, &sub_ct, NULL, FALSE)) + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) + return FALSE; + if (modifier) + ct->left = str_printf(sym, "%s %s%s", sub_ct.left, modifier, str_modif ); + else + { + /* don't insert a space between duplicate '*' */ + if (!in_args && str_modif[0] && str_modif[1] == '*' && sub_ct.left[strlen(sub_ct.left)-1] == '*') + str_modif++; + ct->left = str_printf(sym, "%s%s", sub_ct.left, str_modif ); + } + ct->right = sub_ct.right; + sym->stack.num = mark; + } + return TRUE; +} + +/****************************************************************** + * get_literal_string + * Gets the literal name from the current position in the mangled + * symbol to the first '@' character. It pushes the parsed name to + * the symbol names stack and returns a pointer to it or NULL in + * case of an error. + */ +static char* get_literal_string(struct parsed_symbol* sym) +{ + const char *ptr = sym->current; + + do { + if (!((*sym->current >= 'A' && *sym->current <= 'Z') || + (*sym->current >= 'a' && *sym->current <= 'z') || + (*sym->current >= '0' && *sym->current <= '9') || + *sym->current == '_' || *sym->current == '$')) { + TRACE("Failed at '%c' in %s\n", *sym->current, ptr); return NULL; - ret = str_printf(sym, "%s%s%s%s%s", - sub_ct.left, sub_ct.left && modifier ? " " : NULL, - modifier, sub_ct.right, str_modif); - sym->stack.num = mark; - } - return ret; + } + } while (*++sym->current != '@'); + sym->current++; + str_array_push(sym, ptr, sym->current - 1 - ptr, &sym->names); + + return str_array_get_ref(&sym->names, sym->names.num - sym->names.start - 1); +} + +/****************************************************************** + * get_template_name + * Parses a name with a template argument list and returns it as + * a string. + * In a template argument list the back reference to the names + * table is separately created. '0' points to the class component + * name with the template arguments. We use the same stack array + * to hold the names but save/restore the stack state before/after + * parsing the template argument list. + */ +static char* get_template_name(struct parsed_symbol* sym) +{ + char *name, *args; + unsigned num_mark = sym->names.num; + unsigned start_mark = sym->names.start; + unsigned stack_mark = sym->stack.num; + struct array array_pmt; + + sym->names.start = sym->names.num; + if (!(name = get_literal_string(sym))) + return FALSE; + str_array_init(&array_pmt); + args = get_args(sym, &array_pmt, FALSE, '<', '>'); + if (args != NULL) + name = str_printf(sym, "%s%s", name, args); + sym->names.num = num_mark; + sym->names.start = start_mark; + sym->stack.num = stack_mark; + return name; } /****************************************************************** * get_class - * Parses class as a list of parent-classes, separated by '@', terminated by '@@' - * and stores the result in 'a' array. Each parent-classes, as well as the inner - * element (either field/method name or class name), are stored as allocated - * strings in the array. + * Parses class as a list of parent-classes, terminated by '@' and stores the + * result in 'a' array. Each parent-classes, as well as the inner element + * (either field/method name or class name), are represented in the mangled + * name by a literal name ([a-zA-Z0-9_]+ terminated by '@') or a back reference + * ([0-9]) or a name with template arguments ('?$' literal name followed by the + * template argument list). The class name components appear in the reverse + * order in the mangled name, e.g aaa@bbb@ccc@@ will be demangled to + * ccc::bbb::aaa + * For each of these class name components a string will be allocated in the + * array. */ static BOOL get_class(struct parsed_symbol* sym) { - const char* ptr; + const char* name = NULL; while (*sym->current != '@') { @@ -428,40 +570,23 @@ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': - ptr = str_array_get_ref(&sym->stack, *sym->current++ - '0'); - if (!ptr) return FALSE; - str_array_push(sym, ptr, -1, &sym->stack); + name = str_array_get_ref(&sym->names, *sym->current++ - '0'); break; case '?': - if (*++sym->current == '$') + if (*++sym->current == '$') { - const char* name = ++sym->current; - char* full = NULL; - char* args = NULL; - unsigned num_mark = sym->stack.num; - unsigned start_mark = sym->stack.start; - - while (*sym->current++ != '@'); - - sym->stack.start = sym->stack.num; - str_array_push(sym, name, sym->current - name -1, &sym->stack); - args = get_args(sym, NULL, FALSE, '<', '>'); - if (args != NULL) - { - full = str_printf(sym, "%s%s", sym->stack.elts[num_mark], args); - } - if (!full) return FALSE; - sym->stack.elts[num_mark] = full; - sym->stack.num = num_mark + 1; - sym->stack.start = start_mark; + sym->current++; + if ((name = get_template_name(sym))) + str_array_push(sym, name, -1, &sym->names); } break; default: - ptr = sym->current; - while (*sym->current++ != '@'); - str_array_push(sym, ptr, sym->current - 1 - ptr, &sym->stack); + name = get_literal_string(sym); break; } + if (!name) + return FALSE; + str_array_push(sym, name, -1, &sym->stack); } sym->current++; return TRUE; @@ -469,15 +594,16 @@ /****************************************************************** * get_class_string - * From an array collected by get_class, constructs the corresponding (allocated) - * string - */ -static char* get_class_string(struct parsed_symbol* sym, /*const struct array* a, */int start) + * From an array collected by get_class in sym->stack, constructs the + * corresponding (allocated) string + */ +static char* get_class_string(struct parsed_symbol* sym, int start) { int i; size_t len, sz; char* ret; struct array *a = &sym->stack; + for (len = 0, i = start; i < a->num; i++) { assert(a->elts[i]); @@ -500,13 +626,27 @@ } /****************************************************************** + * get_class_name + * Wrapper around get_class and get_class_string. + */ +static char* get_class_name(struct parsed_symbol* sym) +{ + unsigned mark = sym->stack.num; + char* s = NULL; + + if (get_class(sym)) + s = get_class_string(sym, mark); + sym->stack.num = mark; + return s; +} + +/****************************************************************** * get_calling_convention * Returns a static string corresponding to the calling convention described * by char 'ch'. Sets export to TRUE iff the calling convention is exported. */ -static BOOL get_calling_convention(struct parsed_symbol* sym, char ch, - const char** call_conv, const char** exported, - unsigned flags) +static BOOL get_calling_convention(char ch, const char** call_conv, + const char** exported, unsigned flags) { *call_conv = *exported = NULL; @@ -522,7 +662,8 @@ case 'E': case 'F': *call_conv = "thiscall"; break; case 'G': case 'H': *call_conv = "stdcall"; break; case 'I': case 'J': *call_conv = "fastcall"; break; - case 'K': break; + case 'K': case 'L': break; + case 'M': *call_conv = "clrcall"; break; default: ERR("Unknown calling convention %c\n", ch); return FALSE; } } @@ -536,7 +677,8 @@ case 'E': case 'F': *call_conv = "__thiscall"; break; case 'G': case 'H': *call_conv = "__stdcall"; break; case 'I': case 'J': *call_conv = "__fastcall"; break; - case 'K': break; + case 'K': case 'L': break; + case 'M': *call_conv = "__clrcall"; break; default: ERR("Unknown calling convention %c\n", ch); return FALSE; } } @@ -548,10 +690,10 @@ * get_simple_type * Return a string containing an allocated string for a simple data type */ -static const char* get_simple_type(struct parsed_symbol* sym, char c) +static const char* get_simple_type(char c) { const char* type_string; - + switch (c) { case 'C': type_string = "signed char"; break; @@ -572,14 +714,15 @@ } return type_string; } + /******************************************************************* - * get_extented_type + * get_extended_type * Return a string containing an allocated string for a simple data type */ -static const char* get_extended_type(struct parsed_symbol* sym, char c) +static const char* get_extended_type(char c) { const char* type_string; - + switch (c) { case 'D': type_string = "__int8"; break; @@ -614,39 +757,39 @@ assert(ct); ct->left = ct->right = NULL; - + switch (dt = *sym->current++) { case '_': /* MS type: __int8,__int16 etc */ - ct->left = get_extended_type(sym, *sym->current++); + ct->left = get_extended_type(*sym->current++); break; case 'C': case 'D': case 'E': case 'F': case 'G': case 'H': case 'I': case 'J': case 'K': case 'M': case 'N': case 'O': case 'X': case 'Z': /* Simple data types */ - ct->left = get_simple_type(sym, dt); + ct->left = get_simple_type(dt); add_pmt = FALSE; break; case 'T': /* union */ case 'U': /* struct */ case 'V': /* class */ - /* Class/struct/union */ - { - unsigned mark = sym->stack.num; + case 'Y': /* cointerface */ + /* Class/struct/union/cointerface */ + { const char* struct_name = NULL; const char* type_name = NULL; - if (!get_class(sym) || - !(struct_name = get_class_string(sym, mark))) goto done; - sym->stack.num = mark; - if (!(sym->flags & UNDNAME_NO_COMPLEX_TYPE)) + if (!(struct_name = get_class_name(sym))) + goto done; + if (!(sym->flags & UNDNAME_NO_COMPLEX_TYPE)) { switch (dt) { case 'T': type_name = "union "; break; case 'U': type_name = "struct "; break; case 'V': type_name = "class "; break; + case 'Y': type_name = "cointerface "; break; } } ct->left = str_printf(sym, "%s%s", type_name, struct_name); @@ -654,13 +797,25 @@ break; case '?': /* not all the time is seems */ - if (!(ct->left = get_modified_type(sym, '?'))) goto done; - break; - case 'A': - if (!(ct->left = get_modified_type(sym, 'A'))) goto done; - break; - case 'Q': - if (!(ct->left = get_modified_type(sym, in_args ? 'Q' : 'P'))) goto done; + if (in_args) + { + const char* ptr; + if (!(ptr = get_number(sym))) goto done; + ct->left = str_printf(sym, "`template-parameter-%s'", ptr); + } + else + { + if (!get_modified_type(ct, sym, pmt_ref, '?', in_args)) goto done; + } + break; + case 'A': /* reference */ + case 'B': /* volatile reference */ + if (!get_modified_type(ct, sym, pmt_ref, dt, in_args)) goto done; + break; + case 'Q': /* const pointer */ + case 'R': /* volatile pointer */ + case 'S': /* const volatile pointer */ + if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P', in_args)) goto done; break; case 'P': /* Pointer */ if (isdigit(*sym->current)) @@ -674,8 +829,8 @@ struct datatype_t sub_ct; unsigned mark = sym->stack.num; - if (!get_calling_convention(sym, *sym->current++, - &call_conv, &exported, + if (!get_calling_convention(*sym->current++, + &call_conv, &exported, sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE) || !demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) goto done; @@ -684,23 +839,21 @@ if (!args) goto done; sym->stack.num = mark; - ct->left = str_printf(sym, "%s%s (%s*", + ct->left = str_printf(sym, "%s%s (%s*", sub_ct.left, sub_ct.right, call_conv); ct->right = str_printf(sym, ")%s", args); } else goto done; } - else if (!(ct->left = get_modified_type(sym, 'P'))) goto done; + else if (!get_modified_type(ct, sym, pmt_ref, 'P', in_args)) goto done; break; case 'W': if (*sym->current == '4') { char* enum_name; - unsigned mark = sym->stack.num; sym->current++; - if (!get_class(sym) || - !(enum_name = get_class_string(sym, mark))) goto done; - sym->stack.num = mark; + if (!(enum_name = get_class_name(sym))) + goto done; if (sym->flags & UNDNAME_NO_COMPLEX_TYPE) ct->left = enum_name; else @@ -711,51 +864,77 @@ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': /* Referring back to previously parsed type */ - ct->left = str_array_get_ref(pmt_ref, dt - '0'); + /* left and right are pushed as two separate strings */ + ct->left = str_array_get_ref(pmt_ref, (dt - '0') * 2); + ct->right = str_array_get_ref(pmt_ref, (dt - '0') * 2 + 1); if (!ct->left) goto done; add_pmt = FALSE; break; case '$': - if (sym->current[0] != '0') goto done; - if (sym->current[1] >= '0' && sym->current[1] <= '9') - { - char* ptr; - ptr = und_alloc(sym, 2); - ptr[0] = sym->current[1] + 1; - ptr[1] = 0; - ct->left = ptr; - sym->current += 2; - } - else if ((sym->current[1] >= 'A' && sym->current[1] <= 'P') && - sym->current[2] == '@') - { - char* ptr; - ptr = und_alloc(sym, 3); - if (sym->current[1] <= 'J') + switch (*sym->current++) + { + case '0': + if (!(ct->left = get_number(sym))) goto done; + break; + case 'D': { - ptr[0] = '0' + sym->current[1] - 'A'; - ptr[1] = 0; + const char* ptr; + if (!(ptr = get_number(sym))) goto done; + ct->left = str_printf(sym, "`template-parameter%s'", ptr); } - else + break; + case 'F': { - ptr[0] = '1'; - ptr[1] = sym->current[1] - 'K' + '0'; - ptr[2] = 0; + const char* p1; + const char* p2; + if (!(p1 = get_number(sym))) goto done; + if (!(p2 = get_number(sym))) goto done; + ct->left = str_printf(sym, "{%s,%s}", p1, p2); } - ct->left = ptr; - sym->current += 3; - } - else goto done; + break; + case 'G': + { + const char* p1; + const char* p2; + const char* p3; + if (!(p1 = get_number(sym))) goto done; + if (!(p2 = get_number(sym))) goto done; + if (!(p3 = get_number(sym))) goto done; + ct->left = str_printf(sym, "{%s,%s,%s}", p1, p2, p3); + } + break; + case 'Q': + { + const char* ptr; + if (!(ptr = get_number(sym))) goto done; + ct->left = str_printf(sym, "`non-type-template-parameter%s'", ptr); + } + break; + case '$': + if (*sym->current == 'C') + { + const char* ptr; + + sym->current++; + if (!get_modifier(*sym->current++, &ptr)) goto done; + if (!demangle_datatype(sym, ct, pmt_ref, in_args)) goto done; + ct->left = str_printf(sym, "%s %s", ct->left, ptr); + } + break; + } break; default : ERR("Unknown type %c\n", dt); break; } if (add_pmt && pmt_ref && in_args) - str_array_push(sym, str_printf(sym, "%s%s", ct->left, ct->right), - -1, pmt_ref); + { + /* left and right are pushed as two separate strings */ + str_array_push(sym, ct->left ? ct->left : "", -1, pmt_ref); + str_array_push(sym, ct->right ? ct->right : "", -1, pmt_ref); + } done: - + return ct->left != NULL; } @@ -772,7 +951,6 @@ struct datatype_t ct; char* name = NULL; BOOL ret = FALSE; - char dt; /* 0 private static * 1 protected static @@ -792,7 +970,7 @@ case '0': access = "private: "; break; case '1': access = "protected: "; break; case '2': access = "public: "; break; - } + } } if (!(sym->flags & UNDNAME_NO_MEMBER_TYPE)) @@ -803,13 +981,17 @@ name = get_class_string(sym, 0); - switch (dt = *sym->current++) + switch (*sym->current++) { case '0': case '1': case '2': case '3': case '4': case '5': { unsigned mark = sym->stack.num; - if (!demangle_datatype(sym, &ct, NULL, FALSE)) goto done; + struct array pmt; + + str_array_init(&pmt); + + if (!demangle_datatype(sym, &ct, &pmt, FALSE)) goto done; if (!get_modifier(*sym->current++, &modifier)) goto done; sym->stack.num = mark; } @@ -820,21 +1002,24 @@ if (!get_modifier(*sym->current++, &modifier)) goto done; if (*sym->current != '@') { - unsigned mark = sym->stack.num; char* cls = NULL; - if (!get_class(sym) || - !(cls = get_class_string(sym, mark))) goto done; - sym->stack.num = mark; + if (!(cls = get_class_name(sym))) + goto done; ct.right = str_printf(sym, "{for `%s'}", cls); } break; + case '8': + case '9': + modifier = ct.left = ct.right = NULL; + break; default: goto done; } if (sym->flags & UNDNAME_NAME_ONLY) ct.left = ct.right = modifier = NULL; + sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s", access, - member_type, ct.left, - modifier && ct.left ? " " : NULL, modifier, + member_type, ct.left, + modifier && ct.left ? " " : NULL, modifier, modifier || ct.left ? " " : NULL, name, ct.right); ret = TRUE; done: @@ -848,6 +1033,7 @@ */ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) { + char accmem; const char* access = NULL; const char* member_type = NULL; struct datatype_t ct_ret; @@ -888,10 +1074,12 @@ * 'Y' * 'Z' */ + accmem = *sym->current++; + if (accmem < 'A' || accmem > 'Z') goto done; if (!(sym->flags & UNDNAME_NO_ACCESS_SPECIFIERS)) { - switch ((*sym->current - 'A') / 8) + switch ((accmem - 'A') / 8) { case 0: access = "private: "; break; case 1: access = "protected: "; break; @@ -900,33 +1088,38 @@ } if (!(sym->flags & UNDNAME_NO_MEMBER_TYPE)) { - if (*sym->current >= 'A' && *sym->current <= 'X') - { - switch ((*sym->current - 'A') % 8) + if (accmem <= 'X') + { + switch ((accmem - 'A') % 8) { case 2: case 3: member_type = "static "; break; case 4: case 5: member_type = "virtual "; break; - case 6: case 7: member_type = "thunk "; break; + case 6: case 7: + access = str_printf(sym, "[thunk]:%s", access); + member_type = "virtual "; + break; } } } - if (*sym->current >= 'A' && *sym->current <= 'X') - { - if (!((*sym->current - 'A') & 2)) + name = get_class_string(sym, 0); + + if ((accmem - 'A') % 8 == 6 || (accmem - '8') % 8 == 7) /* a thunk */ + name = str_printf(sym, "%s`adjustor{%s}' ", name, get_number(sym)); + + if (accmem <= 'X') + { + if (((accmem - 'A') % 8) != 2 && ((accmem - 'A') % 8) != 3) { /* Implicit 'this' pointer */ /* If there is an implicit this pointer, const modifier follows */ - if (!get_modifier(*++sym->current, &modifier)) goto done; - } - } - else if (*sym->current < 'A' || *sym->current > 'Z') goto done; - sym->current++; - - name = get_class_string(sym, 0); - - if (!get_calling_convention(sym, *sym->current++, - &call_conv, &exported, sym->flags)) + if (!get_modifier(*sym->current, &modifier)) goto done; + sym->current++; + } + } + + if (!get_calling_convention(*sym->current++, &call_conv, &exported, + sym->flags)) goto done; str_array_init(&array_pmt); @@ -960,41 +1153,58 @@ * Yet!!! FIXME */ sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s%s%s%s%s", - access, member_type, ct_ret.left, + access, member_type, ct_ret.left, (ct_ret.left && !ct_ret.right) ? " " : NULL, call_conv, call_conv ? " " : NULL, exported, - name, args_str, modifier, + name, args_str, modifier, modifier ? " " : NULL, ct_ret.right); ret = TRUE; done: return ret; } +/****************************************************************** + * handle_template + * Does the final parsing and handling for a name with templates + */ +static BOOL handle_template(struct parsed_symbol* sym) +{ + const char* name; + const char* args; + + assert(*sym->current++ == '$'); + if (!(name = get_literal_string(sym))) return FALSE; + if (!(args = get_args(sym, NULL, FALSE, '<', '>'))) return FALSE; + sym->result = str_printf(sym, "%s%s", name, args); + return TRUE; +} + /******************************************************************* - * demangle_symbol + * symbol_demangle * Demangle a C++ linker symbol */ static BOOL symbol_demangle(struct parsed_symbol* sym) { BOOL ret = FALSE; unsigned do_after = 0; + static CHAR dashed_null[] = "--null--"; + + /* FIXME seems wrong as name, as it demangles a simple data type */ + if (sym->flags & UNDNAME_NO_ARGUMENTS) + { + struct datatype_t ct; + + if (demangle_datatype(sym, &ct, NULL, FALSE)) + { + sym->result = str_printf(sym, "%s%s", ct.left, ct.right); + ret = TRUE; + } + goto done; + } /* MS mangled names always begin with '?' */ if (*sym->current != '?') return FALSE; - - /* FIXME seems wrong as name, as it demangles a simple data type */ - if (sym->flags & UNDNAME_NO_ARGUMENTS) - { - struct datatype_t ct; - - if (demangle_datatype(sym, &ct, NULL, FALSE)) - { - sym->result = str_printf(sym, "%s%s", ct.left, ct.right); - ret = TRUE; - } - goto done; - } - + str_array_init(&sym->names); str_array_init(&sym->stack); sym->current++; @@ -1070,6 +1280,44 @@ case 'M': function_name = "`eh vector destructor iterator'"; break; case 'N': function_name = "`eh vector vbase constructor iterator'"; break; case 'O': function_name = "`copy constructor closure'"; break; + case 'R': + sym->flags |= UNDNAME_NO_FUNCTION_RETURNS; + switch (*++sym->current) + { + case '0': + { + struct datatype_t ct; + struct array pmt; + + sym->current++; + str_array_init(&pmt); + demangle_datatype(sym, &ct, &pmt, FALSE); + function_name = str_printf(sym, "%s%s `RTTI Type Descriptor'", + ct.left, ct.right); + sym->current--; + } + break; + case '1': + { + const char* n1, *n2, *n3, *n4; + sym->current++; + n1 = get_number(sym); + n2 = get_number(sym); + n3 = get_number(sym); + n4 = get_number(sym); + sym->current--; + function_name = str_printf(sym, "`RTTI Base Class Descriptor at (%s,%s,%s,%s)'", + n1, n2, n3, n4); + } + break; + case '2': function_name = "`RTTI Base Class Array'"; break; + case '3': function_name = "`RTTI Class Hierarchy Descriptor'"; break; + case '4': function_name = "`RTTI Complete Object Locator'"; break; + default: + ERR("Unknown RTTI operator: _R%c\n", *sym->current); + break; + } + break; case 'S': function_name = "`local vftable'"; break; case 'T': function_name = "`local vftable constructor closure'"; break; case 'U': function_name = "operator new[]"; break; @@ -1091,7 +1339,7 @@ { case 1: case 2: sym->stack.num = sym->stack.max = 1; - sym->stack.elts[0] = "--null--"; + sym->stack.elts[0] = dashed_null; break; case 4: sym->result = (char*)function_name; @@ -1101,16 +1349,28 @@ str_array_push(sym, function_name, -1, &sym->stack); break; } - sym->stack.start = 1; - } + } + else if (*sym->current == '$') + { + /* Strange construct, it's a name with a template argument list + and that's all. */ + sym->current++; + ret = (sym->result = get_template_name(sym)) != NULL; + goto done; + } + else if (*sym->current == '?' && sym->current[1] == '$') + do_after = 5; /* Either a class name, or '@' if the symbol is not a class member */ - if (*sym->current != '@') - { + switch (*sym->current) + { + case '@': sym->current++; break; + case '$': break; + default: /* Class the function is associated with, terminated by '@@' */ if (!get_class(sym)) goto done; - } - else sym->current++; + break; + } switch (do_after) { @@ -1128,19 +1388,22 @@ case 3: sym->flags &= ~UNDNAME_NO_FUNCTION_RETURNS; break; + case 5: + sym->names.start = 1; + break; } /* Function/Data type and access level */ - if (*sym->current >= '0' && *sym->current <= '7') + if (*sym->current >= '0' && *sym->current <= '9') ret = handle_data(sym); else if (*sym->current >= 'A' && *sym->current <= 'Z') ret = handle_method(sym, do_after == 3); + else if (*sym->current == '$') + ret = handle_template(sym); else ret = FALSE; done: - if (ret) - assert(sym->result); - if (!ret) - ERR("Failed at %s\n", sym->current); + if (ret) assert(sym->result); + else WARN("Failed at %s\n", sym->current); return ret; } @@ -1163,15 +1426,16 @@ * Success: A string pointing to the unmangled name, allocated with memget. * Failure: NULL. */ -char* __unDNameEx(char* buffer, const char* mangled, int buflen, - malloc_func_t memget, free_func_t memfree, - void* unknown, unsigned short int flags) +char* CDECL __unDNameEx(char* buffer, const char* mangled, int buflen, + malloc_func_t memget, free_func_t memfree, + void* unknown, unsigned short int flags) { struct parsed_symbol sym; - - TRACE("(%p,%s,%d,%p,%p,%p,%x) stub!\n", + const char* result; + + TRACE("(%p,%s,%d,%p,%p,%p,%x)\n", buffer, mangled, buflen, memget, memfree, unknown, flags); - + /* The flags details is not documented by MS. However, it looks exactly * like the UNDNAME_ manifest constants from imagehlp.h and dbghelp.h * So, we copied those (on top of the file) @@ -1187,20 +1451,16 @@ sym.mem_free_ptr = memfree; sym.current = mangled; - if (symbol_demangle(&sym)) - { - if (buffer && buflen) - { - memcpy(buffer, sym.result, buflen - 1); - buffer[buflen - 1] = '\0'; - } - else - { - buffer = memget(strlen(sym.result) + 1); - if (buffer) strcpy(buffer, sym.result); - } - } - else buffer = NULL; + result = symbol_demangle(&sym) ? sym.result : mangled; + if (buffer && buflen) + { + lstrcpynA( buffer, result, buflen); + } + else + { + buffer = memget(strlen(result) + 1); + if (buffer) strcpy(buffer, result); + } und_free_all(&sym); @@ -1211,10 +1471,9 @@ /********************************************************************* * __unDName (MSVCRT.@) */ -char* __unDName(char* buffer, const char* mangled, int buflen, - malloc_func_t memget, free_func_t memfree, - unsigned short int flags) +char* CDECL __unDName(char* buffer, const char* mangled, int buflen, + malloc_func_t memget, free_func_t memfree, + unsigned short int flags) { return __unDNameEx(buffer, mangled, buflen, memget, memfree, NULL, flags); } -

16 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008