Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[pschweitzer] 62627: [SETUP16] Fix invalid free CID #715830

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Apr 5 15:47:49 2014 New Revision: 62627 URL: http://svn.reactos.org/svn/reactos?rev=62627&view=rev Log: [SETUP16] Fix invalid free CID #715830 Modified: trunk/reactos/base/applications/setup16/main.c Modified: trunk/reactos/base/applications/setup16/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/setup16/… ============================================================================== --- trunk/reactos/base/applications/setup16/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/setup16/main.c [iso-8859-1] Sat Apr 5 15:47:49 2014 @@ -48,7 +48,7 @@ fileop.hNameMappings = NULL; ret = SHFileOperation(&fileop); - HeapFree(GetProcessHeap(), 0, &pszFrom); + HeapFree(GetProcessHeap(), 0, pszFrom); return (ret == 0); }

10 years, 5 months

[tkreuzer] 62626: [PSEH3] Implement __finally support for C++

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Apr 5 15:41:03 2014 New Revision: 62626 URL: http://svn.reactos.org/svn/reactos?rev=62626&view=rev Log: [PSEH3] Implement __finally support for C++ Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h trunk/reactos/lib/pseh/i386/pseh3.c Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sat Apr 5 15:41:03 2014 @@ -10,7 +10,7 @@ #pragma once #define _PSEH3_H_ -#include "excpt.h" +#include <excpt.h> #ifdef __cplusplus extern "C" { @@ -111,7 +111,7 @@ #endif /* This attribute allows automatic cleanup of the registered frames */ -#define _SEH3$_AUTO_CLEANUP __attribute__((cleanup(_SEH3$_Unregister))) +#define _SEH3$_AUTO_CLEANUP __attribute__((cleanup(_SEH3$_AutoCleanup))) /* CLANG specific definitions! */ #ifdef __clang__ @@ -217,7 +217,7 @@ /* Use the global unregister function */ void __attribute__((regparm(1))) -_SEH3$_Unregister( +_SEH3$_AutoCleanup( volatile SEH3$_REGISTRATION_FRAME *Frame); /* These are only dummies here */ @@ -251,7 +251,7 @@ #define _SEH3$_DECLARE_EXCEPT_INTRINSICS() /* Since we cannot use nested functions, we declare these globally as macros */ -#define _abnormal_termination() (_SEH3$_TrylevelFrame.ScopeTable != 0) +#define _abnormal_termination() (_SEH3$_TrylevelFrame.ExceptionPointers != 0) #define _exception_code() (_SEH3$_TrylevelFrame.ExceptionPointers->ExceptionRecord->ExceptionCode) #define _exception_info() (_SEH3$_TrylevelFrame.ExceptionPointers) @@ -294,7 +294,7 @@ _SEH3$_NESTED_FUNC_OPEN(_Name) \ /* Declare the intrinsics for the finally function */ \ inline __attribute__((always_inline, gnu_inline)) \ - int _abnormal_termination() { return (_SEH3$_TrylevelFrame.ScopeTable != 0); } \ + int _abnormal_termination() { return (_SEH3$_TrylevelFrame.ExceptionPointers != 0); } \ \ /* This construct makes sure that the finally function returns */ \ /* a proper value at the end */ \ @@ -351,7 +351,7 @@ }; \ \ /* Forward declaration of the auto cleanup function */ \ - _SEH3$_DECLARE_CLEANUP_FUNC(_SEH3$_Unregister); \ + _SEH3$_DECLARE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \ \ /* Allocate a registration frame */ \ volatile SEH3$_REGISTRATION_FRAME _SEH3$_AUTO_CLEANUP _SEH3$_TrylevelFrame; \ @@ -412,8 +412,8 @@ /* End the try block */ \ while (0); \ _SEH3$_l_AfterTry: (void)0; \ - /* Set ScopeTable to 0, this is used by _abnormal_termination() */ \ - _SEH3$_TrylevelFrame.ScopeTable = 0; \ + /* Set ExceptionPointers to 0, this is used by _abnormal_termination() */ \ + _SEH3$_TrylevelFrame.ExceptionPointers = 0; \ \ goto _SEH3$_l_EndTry; \ \ @@ -454,7 +454,7 @@ _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ \ /* Implementation of the auto cleanup function */ \ - _SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_Unregister); \ + _SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \ \ /* Close the outer scope */ \ } while (0); Modified: trunk/reactos/lib/pseh/i386/pseh3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3.c?rev=… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] Sat Apr 5 15:41:03 2014 @@ -130,6 +130,23 @@ return FilterResult; } +void +__attribute__((regparm(1))) +_SEH3$_AutoCleanup( + SEH3$_REGISTRATION_FRAME *Frame) +{ + /* Check for __finally frames */ + if (Frame->ScopeTable->Target == NULL) + { + _SEH3$_InvokeFilter(Frame, Frame->ScopeTable->Filter); + } + + if (Frame->Handler) + _SEH3$_UnregisterFrame(Frame); + else + _SEH3$_UnregisterTryLevel(Frame); +} + static inline LONG _SEH3$_GetFilterResult(

10 years, 5 months

[pschweitzer] 62625: [VFATLIB] --MagicValues;

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Apr 5 15:39:09 2014 New Revision: 62625 URL: http://svn.reactos.org/svn/reactos?rev=62625&view=rev Log: [VFATLIB] --MagicValues; Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c trunk/reactos/lib/fslib/vfatlib/fat16.c trunk/reactos/lib/fslib/vfatlib/fat32.c Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Sat Apr 5 15:39:09 2014 @@ -72,7 +72,7 @@ /* Copy FAT16 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - 59); /* FAT16 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); /* FAT16 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat16.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] Sat Apr 5 15:39:09 2014 @@ -72,7 +72,7 @@ /* Copy FAT16 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - 59); /* FAT16 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); /* FAT16 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Sat Apr 5 15:39:09 2014 @@ -72,7 +72,7 @@ /* Copy FAT32 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - 87); /* FAT32 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT32_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT32_BOOT_SECTOR, OEMName)); /* FAT32 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000;

10 years, 5 months

[pschweitzer] 62624: [DISKPART] Fix leak CID #716329

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Apr 5 15:26:12 2014 New Revision: 62624 URL: http://svn.reactos.org/svn/reactos?rev=62624&view=rev Log: [DISKPART] Fix leak CID #716329 Modified: trunk/reactos/base/system/diskpart/diskpart.c Modified: trunk/reactos/base/system/diskpart/diskpart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] Sat Apr 5 15:26:12 2014 @@ -73,7 +73,10 @@ while (fgetws(tmp_string, MAX_STRING_SIZE, script) != NULL) { if (InterpretScript(tmp_string) == FALSE) + { + fclose(script); return FALSE; + } } /* Close the file */

10 years, 5 months

[hbelusca] 62623: [RTL] Some fixes for RtlGetFullPathName_U(str): - Start to polish RtlpCollapsePath (Work in progress) - Correctly zero-out the path destination buffer They fix the following tests...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Apr 5 14:56:41 2014 New Revision: 62623 URL: http://svn.reactos.org/svn/reactos?rev=62623&view=rev Log: [RTL] Some fixes for RtlGetFullPathName_U(str): - Start to polish RtlpCollapsePath (Work in progress) - Correctly zero-out the path destination buffer They fix the following tests: * ntdll:RtlGetFullPathName_U (2 failures to full success) * ntdll:RtlGetFullPathName_UstrEx (2 failures to full success) Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=62623&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Sat Apr 5 14:56:41 2014 @@ -10,7 +10,7 @@ * Pierre Schweitzer (pierre(a)reactos.org) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <rtl.h> @@ -289,102 +289,137 @@ /****************************************************************** * RtlpCollapsePath (from WINE) * - * Helper for RtlGetFullPathName_U. - * 1) Convert slashes into backslashes - * 2) Get rid of duplicate backslashes - * 3) Get rid of . and .. components in the path. + * Helper for RtlGetFullPathName_U + * + * 1) Converts slashes into backslashes and gets rid of duplicated ones; + * 2) Gets rid of . and .. components in the path. + * + * Returns the full path length without its terminating NULL character. */ -static VOID -RtlpCollapsePath(PWSTR path, ULONG mark, BOOLEAN SkipTrailingPathSeparators) +static ULONG +RtlpCollapsePath(PWSTR Path, /* ULONG PathBufferSize, ULONG PathLength, */ ULONG mark, BOOLEAN SkipTrailingPathSeparators) { PWSTR p, next; - /* convert every / into a \ */ - for (p = path; *p; p++) + // FIXME: Do not suppose NULL-terminated strings!! + + ULONG PathLength = wcslen(Path); + PWSTR EndBuffer = Path + PathLength; // Path + PathBufferSize / sizeof(WCHAR); + PWSTR EndPath; + + /* Convert slashes into backslashes */ + for (p = Path; *p; p++) { if (*p == L'/') *p = L'\\'; } - /* collapse duplicate backslashes */ - next = path + max( 1, mark ); + /* Collapse duplicate backslashes */ + next = Path + max( 1, mark ); for (p = next; *p; p++) { if (*p != L'\\' || next[-1] != L'\\') *next++ = *p; } *next = UNICODE_NULL; - - p = path + mark; + EndPath = next; + + p = Path + mark; while (*p) { if (*p == L'.') { - switch(p[1]) + switch (p[1]) { case UNICODE_NULL: /* final . */ - if (p > path + mark) p--; + if (p > Path + mark) p--; *p = UNICODE_NULL; + EndPath = p; continue; + case L'\\': /* .\ component */ next = p + 2; - RtlMoveMemory( p, next, (wcslen(next) + 1) * sizeof(WCHAR) ); + // ASSERT(EndPath - next == wcslen(next)); + RtlMoveMemory(p, next, (EndPath - next + 1) * sizeof(WCHAR)); + EndPath -= (next - p); continue; + case L'.': if (p[2] == L'\\') /* ..\ component */ { next = p + 3; - if (p > path + mark) + if (p > Path + mark) { p--; - while (p > path + mark && p[-1] != L'\\') p--; + while (p > Path + mark && p[-1] != L'\\') p--; } - RtlMoveMemory( p, next, (wcslen(next) + 1) * sizeof(WCHAR) ); + // ASSERT(EndPath - next == wcslen(next)); + RtlMoveMemory(p, next, (EndPath - next + 1) * sizeof(WCHAR)); + EndPath -= (next - p); continue; } - else if (!p[2]) /* final .. */ + else if (p[2] == UNICODE_NULL) /* final .. */ { - if (p > path + mark) + if (p > Path + mark) { p--; - while (p > path + mark && p[-1] != L'\\') p--; - if (p > path + mark) p--; + while (p > Path + mark && p[-1] != L'\\') p--; + if (p > Path + mark) p--; } *p = UNICODE_NULL; + EndPath = p; continue; } break; } } - /* skip to the next component */ + + /* Skip to the next component */ while (*p && *p != L'\\') p++; if (*p == L'\\') { - /* remove last dot in previous dir name */ - if (p > path + mark && p[-1] == L'.') - RtlMoveMemory( p-1, p, (wcslen(p) + 1) * sizeof(WCHAR) ); + /* Remove last dot in previous dir name */ + if (p > Path + mark && p[-1] == L'.') + { + // ASSERT(EndPath - p == wcslen(p)); + RtlMoveMemory(p - 1, p, (EndPath - p + 1) * sizeof(WCHAR)); + EndPath--; + } else + { p++; + } } } /* Remove trailing backslashes if needed (after the UNC part if it exists) */ if (SkipTrailingPathSeparators) { - while (p > path + mark && IS_PATH_SEPARATOR(p[-1])) *p-- = UNICODE_NULL; + while (p > Path + mark && IS_PATH_SEPARATOR(p[-1])) p--; } /* Remove trailing spaces and dots (for all the path) */ - while (p > path && (p[-1] == L' ' || p[-1] == L'.')) *p-- = UNICODE_NULL; - - /* Null-terminate the string */ - *p = UNICODE_NULL; + while (p > Path && (p[-1] == L' ' || p[-1] == L'.')) p--; + + /* + * Zero-out the discarded buffer zone, starting just after + * the path string and going up to the end of the buffer. + * It also NULL-terminate the path string. + */ + ASSERT(EndBuffer >= p); + RtlZeroMemory(p, (EndBuffer - p + 1) * sizeof(WCHAR)); + + /* Return the real path length */ + PathLength = (p - Path); + // ASSERT(PathLength == wcslen(Path)); + return (PathLength * sizeof(WCHAR)); } /****************************************************************** * RtlpSkipUNCPrefix (from WINE) * * Helper for RtlGetFullPathName_U - * Skip the \\share\dir part of a file name and return the new position - * (which can point on the last backslash of "dir\") + * + * Skips the \\share\dir part of a file name and returns the new position + * (which can point on the last backslash of "dir\"). */ static SIZE_T RtlpSkipUNCPrefix(PCWSTR FileNameBuffer) @@ -542,7 +577,7 @@ return FullLength + sizeof(UNICODE_NULL); } - /* Zero out the destination buffer. FileName must be different from Buffer */ + /* Zero-out the destination buffer. FileName must be different from Buffer */ RtlZeroMemory(Buffer, Size); /* Get the path type */ @@ -551,7 +586,7 @@ /********************************************** - ** CODE REWRITTEN IS HAPPENING THERE ** + ** CODE REWRITING IS HAPPENING THERE ** **********************************************/ Source = FileNameBuffer; SourceLength = FileNameLength; @@ -619,7 +654,7 @@ * FIXME: Win2k seems to check that the environment * variable actually points to an existing directory. * If not, root of the drive is used (this seems also - * to be the only spot in RtlGetFullPathName that the + * to be the only place in RtlGetFullPathName that the * existence of a part of a path is checked). */ EnvVarValue.Buffer[EnvVarValue.Length / sizeof(WCHAR)] = L'\\'; @@ -709,13 +744,10 @@ /* * Build the full path */ - // if (ShortName) DPRINT1("buffer(1) = %S\n", Buffer); /* Copy the path's prefix */ if (PrefixLength) RtlMoveMemory(Buffer, Prefix, PrefixLength); - // if (ShortName) DPRINT1("buffer(2) = %S\n", Buffer); /* Copy the remaining part of the path */ RtlMoveMemory(Buffer + PrefixLength / sizeof(WCHAR), Source, SourceLength + sizeof(WCHAR)); - // if (ShortName) DPRINT1("buffer(3) = %S\n", Buffer); /* Some cleanup */ Prefix = NULL; @@ -726,15 +758,11 @@ } /* - * Finally, put the path in canonical form, - * i.e. simplify redundant . and .., etc... + * Finally, put the path in canonical form (remove redundant . and .., + * (back)slashes...) and retrieve the length of the full path name + * (without its terminating null character) (in chars). */ - // if (*PathType == RtlPathTypeUncAbsolute) DPRINT1("RtlpCollapsePath('%S', %lu)\n", Buffer, PrefixCut); - RtlpCollapsePath(Buffer, PrefixCut, SkipTrailingPathSeparators); - // if (ShortName) DPRINT1("buffer(4) = %S\n", Buffer); - - /* Get the length of the full path name, without its terminating null character */ - reqsize = wcslen(Buffer) * sizeof(WCHAR); + reqsize = RtlpCollapsePath(Buffer, /* Size, reqsize, */ PrefixCut, SkipTrailingPathSeparators); /* Find the file part, which is present after the last path separator */ if (ShortName) @@ -761,7 +789,8 @@ Quit: /* Release PEB lock */ RtlReleasePebLock(); - return (ULONG)reqsize; + + return reqsize; } NTSTATUS

10 years, 5 months

[tkreuzer] 62622: [PSEH3] Simplify some code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Apr 5 14:38:42 2014 New Revision: 62622 URL: http://svn.reactos.org/svn/reactos?rev=62622&view=rev Log: [PSEH3] Simplify some code Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sat Apr 5 14:38:42 2014 @@ -226,36 +226,24 @@ #define _SEH3$_DECLARE_FILTER_FUNC(_Name) #define _SEH3$_DEFINE_DUMMY_FINALLY(_Name) -/* The "nested" functions are a piece of code with a ret instruction at the end */ -#define _SEH3$_NESTED_FUNC_OPEN() \ - { \ - int _SEH3$_Result = 0; \ - /* On invocation, the AllocaFrame field is loaded with the return esp value */ -#define _SEH3$_NESTED_FUNC_RETURN() \ +#define _SEH3$_NESTED_FUNC_RETURN(_Result) \ /* Restore esp and return to the caller */ \ asm volatile ("movl %[FixedEsp], %%esp\nret\n" \ - : : "a"(_SEH3$_Result), [FixedEsp]"m"(_SEH3$_TrylevelFrame.AllocaFrame) : "memory") - -#define _SEH3$_NESTED_FUNC_CLOSE() \ - /* Return to the caller */ \ - _SEH3$_NESTED_FUNC_RETURN(); \ + : : "a"(_Result), [FixedEsp]"m"(_SEH3$_TrylevelFrame.AllocaFrame) : "memory") + +/* The filter "function" */ +#define _SEH3$_DEFINE_FILTER_FUNC(_Name, expression) \ + { \ + /* Evaluate and return the filter expression */ \ + _SEH3$_NESTED_FUNC_RETURN((expression)); \ } -/* The filter function */ -#define _SEH3$_DEFINE_FILTER_FUNC(_Name, expression) \ - _SEH3$_NESTED_FUNC_OPEN() \ +#define _SEH3$_FINALLY_FUNC_OPEN(_Name) \ { \ - /* Evaluate the filter expression */ \ - _SEH3$_Result = (expression); \ - } \ - _SEH3$_NESTED_FUNC_CLOSE() - -#define _SEH3$_FINALLY_FUNC_OPEN(_Name) \ - _SEH3$_NESTED_FUNC_OPEN() \ /* This construct makes sure that the finally function returns */ \ /* a proper value at the end */ \ - for (; ; (void)({_SEH3$_NESTED_FUNC_RETURN(); 0;})) + for (; ; (void)({_SEH3$_NESTED_FUNC_RETURN(0); 0;})) #define _SEH3$_FILTER(_Filter, _FilterExpression) (&&_SEH3$_l_FilterOrFinally) #define _SEH3$_FINALLY(_Finally) (&&_SEH3$_l_FilterOrFinally)

10 years, 5 months

[pschweitzer] 62621: [BASESRV] Properly call RtlFillMemory in BaseSrvNLSInit. This fixes incomplete NlsUserInfo init CID #1102265

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Apr 5 14:30:22 2014 New Revision: 62621 URL: http://svn.reactos.org/svn/reactos?rev=62621&view=rev Log: [BASESRV] Properly call RtlFillMemory in BaseSrvNLSInit. This fixes incomplete NlsUserInfo init CID #1102265 Modified: trunk/reactos/subsystems/win/basesrv/nls.c Modified: trunk/reactos/subsystems/win/basesrv/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/nls… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] Sat Apr 5 14:30:22 2014 @@ -116,7 +116,7 @@ /* Initialize the data with all F's */ pNlsRegUserInfo = &StaticData->NlsUserInfo; - RtlFillMemory(&StaticData->NlsUserInfo, 0xFF, sizeof(StaticData->NlsUserInfo)); + RtlFillMemory(&StaticData->NlsUserInfo, sizeof(StaticData->NlsUserInfo), 0xFF); /* Set empty LCID */ pNlsRegUserInfo->UserLocaleId = 0;

10 years, 5 months

[tkreuzer] 62620: [PSEH2_TEST} Use the tests with C++, too.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Apr 5 14:24:16 2014 New Revision: 62620 URL: http://svn.reactos.org/svn/reactos?rev=62620&view=rev Log: [PSEH2_TEST} Use the tests with C++, too. Added: trunk/rostests/tests/pseh2/psehtest_cpp.cpp (with props) Modified: trunk/rostests/tests/pseh2/CMakeLists.txt trunk/rostests/tests/pseh2/psehtest.c Modified: trunk/rostests/tests/pseh2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/CMakeLists.tx… ============================================================================== --- trunk/rostests/tests/pseh2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/CMakeLists.txt [iso-8859-1] Sat Apr 5 14:24:16 2014 @@ -8,3 +8,14 @@ if(NOT MSVC) add_target_compile_flags(pseh2_test "-Wno-format") endif() + + +add_executable(pseh2_test_cpp psehtest_cpp.cpp psehtest2.c) +target_link_libraries(pseh2_test_cpp wine ${PSEH_LIB}) +set_module_type(pseh2_test_cpp win32cui) +add_importlibs(pseh2_test_cpp msvcrt kernel32 ntdll) +add_cd_file(TARGET pseh2_test_cpp DESTINATION reactos/bin FOR all) + +if(NOT MSVC) + add_target_compile_flags(pseh2_test_cpp "-Wno-format") +endif() Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Sat Apr 5 14:24:16 2014 @@ -22,6 +22,10 @@ #include <pseh/pseh2.h> +#ifdef __cplusplus +extern "C" { +#endif + #define STANDALONE #include <wine/test.h> @@ -54,7 +58,11 @@ extern void set_positive(int *); -static int call_test(int (*)(void)); +//static int call_test(int (*)(void)); + +#ifdef __cplusplus +} // extern "C" +#endif #define DEFINE_TEST(NAME_) static int NAME_(void) @@ -2485,6 +2493,25 @@ return TRUE; return FALSE; +} + +DEFINE_TEST(test_unvolatile_4) +{ + unsigned result = 0xdeadbeef; + + _SEH2_TRY + { + *(char*)0x80000000 = 1; + } + _SEH2_EXCEPT(result == 0xdeadbeef) + { + result = 2; + } + _SEH2_END; + + result = (result == 0xdeadbeef) ? 0 : result + 1; + + return result == 3; } DEFINE_TEST(test_finally_goto) @@ -2814,6 +2841,7 @@ USE_TEST(test_unvolatile), USE_TEST(test_unvolatile_2), USE_TEST(test_unvolatile_3), + USE_TEST(test_unvolatile_4), USE_TEST(test_finally_goto), USE_TEST(test_nested_exception), USE_TEST(test_PSEH3_bug), Added: trunk/rostests/tests/pseh2/psehtest_cpp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest_cpp.… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest_cpp.cpp (added) +++ trunk/rostests/tests/pseh2/psehtest_cpp.cpp [iso-8859-1] Sat Apr 5 14:24:16 2014 @@ -0,0 +1,3 @@ + + +#include "psehtest.c" Propchange: trunk/rostests/tests/pseh2/psehtest_cpp.cpp ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 5 months

[pschweitzer] 62619: [ACPI] Disable PCH as it breaks build (when globally enabled)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Apr 5 14:11:03 2014 New Revision: 62619 URL: http://svn.reactos.org/svn/reactos?rev=62619&view=rev Log: [ACPI] Disable PCH as it breaks build (when globally enabled) Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Sat Apr 5 14:11:03 2014 @@ -163,7 +163,7 @@ ${ACPICA_SOURCE} acpica/utilities/utglobal.c) -add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE) +#add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE) set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE") add_dependencies(acpica bugcodes)

10 years, 5 months

[pschweitzer] 62618: [RTL] Properly check for total length in LdrpGetProcedureAddress(). It contains more than just a name. Fixes a buffer overrun. CID #716122

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Apr 5 13:13:01 2014 New Revision: 62618 URL: http://svn.reactos.org/svn/reactos?rev=62618&view=rev Log: [RTL] Properly check for total length in LdrpGetProcedureAddress(). It contains more than just a name. Fixes a buffer overrun. CID #716122 Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sat Apr 5 13:13:01 2014 @@ -2267,7 +2267,7 @@ } /* Check if our buffer is large enough */ - if (Name->Length > sizeof(ImportBuffer)) + if (Length > sizeof(ImportBuffer)) { /* Allocate from heap, plus 2 bytes for the Hint */ ImportName = RtlAllocateHeap(RtlGetProcessHeap(),

10 years, 5 months

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 April 2014