Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[akhaldi] 50656: Reduce difference with the cmake branch, mostly msvc and amd64 fixes.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Feb 11 13:48:41 2011 New Revision: 50656 URL: http://svn.reactos.org/svn/reactos?rev=50656&view=rev Log: Reduce difference with the cmake branch, mostly msvc and amd64 fixes. Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/drivers/storage/classpnp/class.c trunk/reactos/drivers/storage/classpnp/obsolete.c trunk/reactos/include/crt/mingw32/intrin_x86.h trunk/reactos/include/crt/setjmp.h trunk/reactos/include/crt/stddef.h trunk/reactos/include/crt/stdlib.h trunk/reactos/include/crt/string.h trunk/reactos/include/crt/sys/stat.h trunk/reactos/include/crt/vadefs.h trunk/reactos/include/ndk/inline_ntcurrentteb.h trunk/reactos/include/ndk/peb_teb.h trunk/reactos/include/psdk/rpc.h trunk/reactos/include/psdk/strsafe.h trunk/reactos/include/psdk/unknown.h trunk/reactos/include/psdk/wspiapi.h trunk/reactos/include/reactos/asm.h trunk/reactos/include/reactos/mingw-w64/sect_attribs.h trunk/reactos/include/xdk/kefuncs.h trunk/reactos/lib/drivers/ip/network/i386/checksum.S trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/tools/unicode/string.c trunk/reactos/tools/unicode/wine/unicode.h Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -39,6 +39,10 @@ extern ULONG LoaderPagesSpanned; extern BOOLEAN AcpiPresent; +extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; +extern BOOLEAN WinLdrTerminalConnected; +extern void WinLdrSetupEms(IN PCHAR BootOptions); + BOOLEAN WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, IN PCH DllName, @@ -206,8 +210,6 @@ #ifdef _M_IX86 /* Set headless block pointer */ - extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; - extern BOOLEAN WinLdrTerminalConnected; if (WinLdrTerminalConnected) { Extension->HeadlessLoaderBlock = MmHeapAlloc(sizeof(HEADLESS_LOADER_BLOCK)); @@ -537,7 +539,6 @@ #ifdef _M_IX86 /* Setup redirection support */ - extern void WinLdrSetupEms(IN PCHAR BootOptions); WinLdrSetupEms(BootOptions); #endif /* Detect hardware */ Modified: trunk/reactos/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -2485,7 +2485,7 @@ retry = TRUE; } - if (retry && (irpStack->Parameters.Others.Argument4--)) { + if (retry && ((*(PCHAR*)&irpStack->Parameters.Others.Argument4)--)) { // // Retry request. Modified: trunk/reactos/drivers/storage/classpnp/obsolete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/o… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -161,7 +161,7 @@ retry = TRUE; } - if (retry && (irpStack->Parameters.Others.Argument4--)) { + if (retry && ((*(PCHAR*)&irpStack->Parameters.Others.Argument4)--)) { // // Retry request. If the class driver has supplied a StartIo, Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -1128,6 +1128,39 @@ __asm__ __volatile__("rep; outsl" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); } +__INTRIN_INLINE int _inp(unsigned short Port) +{ + return __inbyte(Port); +} + +__INTRIN_INLINE unsigned short _inpw(unsigned short Port) +{ + return __inword(Port); +} + +__INTRIN_INLINE unsigned long _inpd(unsigned short Port) +{ + return __indword(Port); +} + +__INTRIN_INLINE int _outp(unsigned short Port, int databyte) +{ + __outbyte(Port, databyte); + return databyte; +} + +__INTRIN_INLINE unsigned short _outpw(unsigned short Port, unsigned short dataword) +{ + __outword(Port, dataword); + return dataword; +} + +__INTRIN_INLINE unsigned long _outpd(unsigned short Port, unsigned long dataword) +{ + __outdword(Port, dataword); + return dataword; +} + /*** System information ***/ __INTRIN_INLINE void __cpuid(int CPUInfo[], const int InfoType) Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/setjmp.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/setjmp.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -145,9 +145,6 @@ #define _JMP_BUF_DEFINED #endif -#ifdef _MSC_VER -int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); -#else #ifdef USE_MINGW_SETJMP_TWO_ARGS #ifndef _INC_SETJMPEX #if defined(__x86_64) @@ -158,20 +155,19 @@ ({ void* value; __asm__ __volatile__("movl %%esp, %[value]" : [value] "=r" (value)); value; }) #endif #define setjmp(BUF) _setjmp((BUF),mingw_getsp()) - int __cdecl __MINGW_NOTHROW _setjmp(jmp_buf _Buf,void *_Ctx); -#else + int __MINGW_NOTHROW __cdecl _setjmp(jmp_buf _Buf,void *_Ctx); +#else /* _INC_SETJMPEX */ #undef setjmp #define setjmp(BUF) _setjmpex((BUF),mingw_getsp()) #define setjmpex(BUF) _setjmpex((BUF),mingw_getsp()) - int __cdecl __MINGW_NOTHROW _setjmpex(jmp_buf _Buf,void *_Ctx); -#endif -#else + int __MINGW_NOTHROW __cdecl _setjmpex(jmp_buf _Buf,void *_Ctx); +#endif /* _INC_SETJMPEX */ +#else /* !USE_MINGW_SETJMP_TWO_ARGS */ #ifndef _INC_SETJMPEX #define setjmp _setjmp #endif - int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); -#endif -#endif + int __MINGW_NOTHROW __cdecl setjmp(jmp_buf _Buf); +#endif /* !USE_MINGW_SETJMP_TWO_ARGS */ __declspec(noreturn) __MINGW_NOTHROW void __cdecl ms_longjmp(jmp_buf _Buf,int _Value)/* throw(...)*/; __declspec(noreturn) __MINGW_NOTHROW void __cdecl longjmp(jmp_buf _Buf,int _Value); Modified: trunk/reactos/include/crt/stddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stddef.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/stddef.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stddef.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -13,13 +13,7 @@ extern "C" { #endif -#ifndef _CRT_ERRNO_DEFINED -#define _CRT_ERRNO_DEFINED - _CRTIMP extern int *__cdecl _errno(void); -#define errno (*_errno()) - errno_t __cdecl _set_errno(int _Value); - errno_t __cdecl _get_errno(int *_Value); -#endif +#include <errno.h> _CRTIMP extern unsigned long __cdecl __threadid(void); #define _threadid (__threadid()) Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -134,13 +134,7 @@ _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler _Handler); _invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void); -#ifndef _CRT_ERRNO_DEFINED -#define _CRT_ERRNO_DEFINED - _CRTIMP extern int *__cdecl _errno(void); -#define errno (*_errno()) - errno_t __cdecl _set_errno(int _Value); - errno_t __cdecl _get_errno(int *_Value); -#endif +#include <errno.h> _CRTIMP unsigned long *__cdecl __doserrno(void); #define _doserrno (*__doserrno()) errno_t __cdecl _set_doserrno(unsigned long _Value); @@ -447,10 +441,10 @@ _CRTIMP void __cdecl _wsplitpath(const wchar_t *_FullPath,wchar_t *_Drive,wchar_t *_Dir,wchar_t *_Filename,wchar_t *_Ext); #endif - _CRTIMP void __cdecl _beep(unsigned _Frequency,unsigned _Duration) __MINGW_ATTRIB_DEPRECATED; + _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _beep(unsigned _Frequency,unsigned _Duration); /* Not to be confused with _set_error_mode (int). */ - _CRTIMP void __cdecl _seterrormode(int _Mode) __MINGW_ATTRIB_DEPRECATED; - _CRTIMP void __cdecl _sleep(unsigned long _Duration) __MINGW_ATTRIB_DEPRECATED; + _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _seterrormode(int _Mode); + _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _sleep(unsigned long _Duration); #endif #ifndef NO_OLDNAMES Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -82,6 +82,17 @@ _CRTIMP char *_strupr_l(char *_String,_locale_t _Locale); _CRTIMP size_t __cdecl strxfrm(char *_Dst,const char *_Src,size_t _MaxCount); _CRTIMP size_t __cdecl _strxfrm_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); +#if __STDC_WANT_SECURE_LIB__ + _CRTIMP errno_t __cdecl _strset_s(char *_Dst,size_t _DstSize,int _Value); + _CRTIMP errno_t __cdecl _strerror_s(char *_Buf,size_t _SizeInBytes,const char *_ErrMsg); + _CRTIMP errno_t __cdecl _strlwr_s(char *_Str,size_t _Size); + _CRTIMP errno_t __cdecl _strlwr_s_l(char *_Str,size_t _Size,_locale_t _Locale); + _CRTIMP errno_t __cdecl _strnset_s(char *_Str,size_t _Size,int _Val,size_t _MaxCount); + _CRTIMP errno_t __cdecl _strupr_s(char *_Str,size_t _Size); + _CRTIMP errno_t __cdecl _strupr_s_l(char *_Str,size_t _Size,_locale_t _Locale); + _CRTIMP errno_t __cdecl strcpy_s(char *_Dst, size_t _Size, const char *_Src); + _CRTIMP errno_t __cdecl strcat_s(char *_Dst, size_t _Size, const char *_Src); +#endif #ifndef NO_OLDNAMES _CRTIMP _CRT_NONSTDC_DEPRECATE(_strdup) char *__cdecl strdup(const char *_Src); @@ -102,27 +113,15 @@ _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsat_s) wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsat_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); -#endif _CRTIMP _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); _CRTIMP int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); _CRTIMP _CRT_INSECURE_DEPRECATE(wcscpy_s) wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcscpy_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); -#endif _CRTIMP size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); _CRTIMP wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); _CRTIMP size_t __cdecl wcslen(const wchar_t *_Str); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsnlen_s) size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsnlen_s(wchar_t **_Src, size_t _MaxCount); -#endif _CRTIMP int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsncpy_s) wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dest, size_t SizeInWords, const wchar_t *_Source ,size_t _Count); -#endif _CRTIMP _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); _CRTIMP _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); _CRTIMP size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); @@ -151,6 +150,20 @@ _CRTIMP int __cdecl _wcsncoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); _CRTIMP int __cdecl _wcsnicoll(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); +#if __STDC_WANT_SECURE_LIB__ + _CRTIMP errno_t __cdecl wcsat_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); + _CRTIMP errno_t __cdecl wcscpy_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); + _CRTIMP errno_t __cdecl wcsnlen_s(wchar_t **_Src, size_t _MaxCount); + _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dest, size_t SizeInWords, const wchar_t *_Source ,size_t _Count); + _CRTIMP errno_t __cdecl _wcserror_s(wchar_t *_Buf,size_t _SizeInWords,int _ErrNum); + _CRTIMP errno_t __cdecl __wcserror_s(wchar_t *_Buffer,size_t _SizeInWords,const wchar_t *_ErrMsg); + _CRTIMP errno_t __cdecl _wcsnset_s(wchar_t *_Dst,size_t _DstSizeInWords,wchar_t _Val,size_t _MaxCount); + _CRTIMP errno_t __cdecl _wcsset_s(wchar_t *_Str,size_t _SizeInWords,wchar_t _Val); + _CRTIMP errno_t __cdecl _wcslwr_s(wchar_t *_Str,size_t _SizeInWords); + _CRTIMP errno_t __cdecl _wcslwr_s_l(wchar_t *_Str,size_t _SizeInWords,_locale_t _Locale); + _CRTIMP errno_t __cdecl _wcsupr_s(wchar_t *_Str,size_t _Size); + _CRTIMP errno_t __cdecl _wcsupr_s_l(wchar_t *_Str,size_t _Size,_locale_t _Locale); +#endif #ifndef NO_OLDNAMES _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsdup) wchar_t *__cdecl wcsdup(const wchar_t *_Str); @@ -171,8 +184,6 @@ } #endif -#include <sec_api/string_s.h> - // HACK #define strcasecmp _stricmp #define strncasecmp _strnicmp @@ -180,3 +191,4 @@ #define wcsicmp _wcsicmp #endif + Modified: trunk/reactos/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/stat.h?rev… ============================================================================== --- trunk/reactos/include/crt/sys/stat.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/stat.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -187,9 +187,9 @@ _Stat->st_gid = _Stat64.st_gid; _Stat->st_rdev = _Stat64.st_rdev; _Stat->st_size = _Stat64.st_size; - _Stat->st_atime = _Stat64.st_atime; - _Stat->st_mtime = _Stat64.st_mtime; - _Stat->st_ctime = _Stat64.st_ctime; + _Stat->st_atime = (__time32_t)_Stat64.st_atime; + _Stat->st_mtime = (__time32_t)_Stat64.st_mtime; + _Stat->st_ctime = (__time32_t)_Stat64.st_ctime; return ret; } __CRT_INLINE int __cdecl _fstat32i64(int _FileDes, struct _stat32i64 *_Stat) @@ -204,9 +204,9 @@ _Stat->st_gid = _Stat64.st_gid; _Stat->st_rdev = _Stat64.st_rdev; _Stat->st_size = _Stat64.st_size; - _Stat->st_atime = _Stat64.st_atime; - _Stat->st_mtime = _Stat64.st_mtime; - _Stat->st_ctime = _Stat64.st_ctime; + _Stat->st_atime = (__time32_t)_Stat64.st_atime; + _Stat->st_mtime = (__time32_t)_Stat64.st_mtime; + _Stat->st_ctime = (__time32_t)_Stat64.st_ctime; return ret; } #endif /* _USE_32BIT_TIME_T */ Modified: trunk/reactos/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/vadefs.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/vadefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/vadefs.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -81,14 +81,24 @@ #define __va_copy(d,s) __builtin_va_copy(d,s) #elif defined(_MSC_VER) -#if defined(_M_IA64) || defined(_M_AMD64) || defined(_M_CEE) -#error Please implement me -#endif - +#if defined(_M_IX86) #define _crt_va_start(v,l) ((void)((v) = (va_list)_ADDRESSOF(l) + _INTSIZEOF(l))) #define _crt_va_arg(v,l) (*(l *)(((v) += _INTSIZEOF(l)) - _INTSIZEOF(l))) #define _crt_va_end(v) ((void)((v) = (va_list)0)) #define __va_copy(d,s) ((void)((d) = (s))) +#elif defined(_M_AMD64) +#define _PTRSIZEOF(n) ((sizeof(n) + sizeof(void*) - 1) & ~(sizeof(void*) - 1)) +#define _ISSTRUCT(t) ((sizeof(t) > sizeof(void*)) || (sizeof(t) & (sizeof(t)-1)) != 0) +#define _crt_va_start(v,l) ((void)((v) = (va_list)_ADDRESSOF(l) + _PTRSIZEOF(l))) +#define _crt_va_arg(v,t) (_ISSTRUCT(t) ? \ + (**(t**)(((v) += sizeof(void*)) - sizeof(void*))) : \ + (*(t*)(((v) += sizeof(void*)) - sizeof(void*)))) +#define _crt_va_end(v) ((void)((v) = (va_list)0)) +#define __va_copy(d,s) ((void)((d) = (s))) +#else //if defined(_M_IA64) || defined(_M_CEE) +#error Please implement me +#endif + #endif #if !defined(va_copy) && (!defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L) Modified: trunk/reactos/include/ndk/inline_ntcurrentteb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/inline_ntcurre… ============================================================================== --- trunk/reactos/include/ndk/inline_ntcurrentteb.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/inline_ntcurrentteb.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -1,20 +1,10 @@ #ifndef _INLINE_NT_CURRENTTEB_H_ #define _INLINE_NT_CURRENTTEB_H_ - -#ifdef __GNUC__ #if defined(_M_IX86) FORCEINLINE struct _TEB * NtCurrentTeb(void) { - struct _TEB *ret; - - __asm__ __volatile__ ( - "movl %%fs:0x18, %0\n" - : "=r" (ret) - : /* no inputs */ - ); - - return ret; + return (struct _TEB *)__readfsdword(0x18); } #elif defined(_M_ARM) @@ -24,63 +14,17 @@ #include <armddk.h> #elif defined(_M_AMD64) -FORCEINLINE struct _TEB * NtCurrentTeb(VOID) +FORCEINLINE struct _TEB * NtCurrentTeb(void) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } #elif defined(_M_PPC) -extern __inline__ struct _TEB * NtCurrentTeb(void) +FORCEINLINE struct _TEB * NtCurrentTeb(void) { - return __readfsdword_winnt(0x18); + return (struct _TEB *)__readfsdword_winnt(0x18); } #else -extern __inline__ struct _TEB * NtCurrentTeb(void) -{ - return __readfsdword_winnt(0x18); -} +#error Unsupported architecture #endif -#elif defined(__WATCOMC__) - -extern PVOID GetCurrentFiber(void); -#pragma aux GetCurrentFiber = \ - "mov eax, dword ptr fs:0x10" \ - value [eax] \ - modify [eax]; - -extern struct _TEB * NtCurrentTeb(void); -#pragma aux NtCurrentTeb = \ - "mov eax, dword ptr fs:0x18" \ - value [eax] \ - modify [eax]; - -#elif defined(_MSC_VER) - -#if (_MSC_FULL_VER >= 13012035) - -__inline PVOID GetCurrentFiber(void) { return (PVOID)(ULONG_PTR)__readfsdword(0x10); } -__inline struct _TEB * NtCurrentTeb(void) { return (struct _TEB *)(ULONG_PTR)__readfsdword(0x18); } - -#else - -static __inline PVOID GetCurrentFiber(void) -{ - PVOID p; - __asm mov eax, fs:[10h] - __asm mov [p], eax - return p; -} - -static __inline struct _TEB * NtCurrentTeb(void) -{ - struct _TEB *p; - __asm mov eax, fs:[18h] - __asm mov [p], eax - return p; -} - -#endif /* _MSC_FULL_VER */ - -#endif /* __GNUC__/__WATCOMC__/_MSC_VER */ - #endif//_INLINE_NT_CURRENTTEB_H_ Modified: trunk/reactos/include/ndk/peb_teb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/peb_teb.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/peb_teb.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/peb_teb.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -12,7 +12,7 @@ #define PTR(x) x #endif -#if defined(_WIN64) && !defined(EXPLICIT_32BIT) +#if (defined(_WIN64) && !defined(EXPLICIT_32BIT)) || defined(EXPLICIT_64BIT) #define GDI_HANDLE_BUFFER_SIZE 60 #else #define GDI_HANDLE_BUFFER_SIZE 34 Modified: trunk/reactos/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpc.h?rev=506… ============================================================================== --- trunk/reactos/include/psdk/rpc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpc.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -1,17 +1,11 @@ #if !defined( RPC_NO_WINDOWS_H ) && !defined( MAC ) && !defined( _MAC ) -#if defined (_OLE32_) -#ifndef RC_INVOKED -#include <stdarg.h> -#endif -#include <windef.h> -#include <winbase.h> -#else +#ifndef _INC_WINDOWS #include <windows.h> -#endif +#endif /* _INC_WINDOWS */ #endif -#ifdef __GNUC__ +#ifndef RC_INVOKED #include <pseh/pseh2.h> #endif Modified: trunk/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/strsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/strsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/strsafe.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -1,6 +1,7 @@ #ifndef __STRSAFE_H_ #define __STRSAFE_H_ +#include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -238,7 +239,11 @@ #else // !STRSAFE_LIB /* Create inlined versions */ +#ifdef __GNUC__ #define STRSAFEAPI HRESULT static __inline__ +#else +#define STRSAFEAPI HRESULT __inline +#endif #define STRSAFE_MAX_CXX STRSAFE_CCHtoCXX(STRSAFE_MAX_CCH) @@ -496,7 +501,7 @@ if (SUCCEEDED(hr)) { - if ((dwFlags & STRSAFE_FILL_BEHIND_NULL) && (iResult + 1 < cchMax)) + if ((dwFlags & STRSAFE_FILL_BEHIND_NULL) && ((size_t)iResult + 1 < cchMax)) { memset(pszDest + iResult + 1, dwFlags & 0xff, Modified: trunk/reactos/include/psdk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/unknown.h?rev… ============================================================================== --- trunk/reactos/include/psdk/unknown.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/unknown.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -16,8 +16,8 @@ * */ -#ifndef __unknwn_h__ -#define __unknwn_h__ +#ifndef _UNKNOWN_H_ +#define _UNKNOWN_H_ #ifdef __cplusplus extern "C" { @@ -70,5 +70,5 @@ IN POOL_TYPE PoolType ); -#endif +#endif /* _UNKNOWN_H_ */ Modified: trunk/reactos/include/psdk/wspiapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wspiapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wspiapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wspiapi.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -44,6 +44,12 @@ #define getaddrinfo WspiapiGetAddrInfo #define getnameinfo WspiapiGetNameInfo #define freeaddrinfo WspiapiFreeAddrInfo + +#if _MSC_VER +#define WSPIAPI_INLINE __inline +#else +#define WSPIAPI_INLINE static inline +#endif typedef int (WINAPI *WSPIAPI_PGETADDRINFO)( @@ -436,12 +442,12 @@ } WSPIAPI_FUNCTION; #define WSPIAPI_FUNCTION_ARRAY { \ - "getaddrinfo", (FARPROC) WspiapiLegacyGetAddrInfo, \ - "getnameinfo", (FARPROC) WspiapiLegacyGetNameInfo, \ - "freeaddrinfo", (FARPROC) WspiapiLegacyFreeAddrInfo, \ -} - -FORCEINLINE + {"getaddrinfo", (FARPROC) WspiapiLegacyGetAddrInfo}, \ + {"getnameinfo", (FARPROC) WspiapiLegacyGetNameInfo}, \ + {"freeaddrinfo", (FARPROC) WspiapiLegacyFreeAddrInfo} \ +} + +WSPIAPI_INLINE FARPROC WINAPI WspiapiLoad( @@ -503,7 +509,7 @@ return (rgtGlobal[wFunction].pfAddress); } -FORCEINLINE +WSPIAPI_INLINE int WINAPI WspiapiGetAddrInfo( @@ -522,7 +528,7 @@ return iError; } -FORCEINLINE +WSPIAPI_INLINE int WINAPI WspiapiGetNameInfo( @@ -544,7 +550,7 @@ return iError; } -FORCEINLINE +WSPIAPI_INLINE void WINAPI WspiapiFreeAddrInfo( Modified: trunk/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/asm.h?rev=… ============================================================================== --- trunk/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/asm.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -12,6 +12,7 @@ OPTION DOTNAME .586 +.XMM .MODEL FLAT ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING @@ -73,6 +74,10 @@ .long MACRO args:VARARG dd args +ENDM + +.double MACRO args:VARARG + dq args ENDM UNIMPLEMENTED MACRO name @@ -115,6 +120,10 @@ /* MASM compatible PUBLIC */ .macro PUBLIC symbol .global \symbol +.endm + +/* Dummy ASSUME */ +.macro ASSUME p1 p2 p3 p4 p5 p6 p7 p8 .endm /* MASM compatible ALIGN */ Modified: trunk/reactos/include/reactos/mingw-w64/sect_attribs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/… ============================================================================== --- trunk/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -9,7 +9,7 @@ #if defined(_M_IA64) || defined(_M_AMD64) #define _ATTRIBUTES #else -#define _ATTRIBUTES shared +#define _ATTRIBUTES read #endif /* Reference list of existing section for msvcrt. */ Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -208,7 +208,7 @@ #endif NTKERNELAPI -DECLSPEC_NORETURN +//DECLSPEC_NORETURN VOID NTAPI KeBugCheckEx( Modified: trunk/reactos/lib/drivers/ip/network/i386/checksum.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/i38… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/i386/checksum.S [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/i386/checksum.S [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -24,109 +24,111 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ - + /* * computes a partial checksum, e.g. for TCP/UDP fragments */ -/* +/* unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum) */ - -.text + +#include <asm.inc> + +.code .align 4 -.globl _csum_partial - +PUBLIC _csum_partial + #ifndef CONFIG_X86_USE_PPRO_CHECKSUM - /* + /* * Experiments with Ethernet and SLIP connections show that buff * is aligned on either a 2-byte or 4-byte boundary. We get at * least a twofold speedup on 486 and Pentium if it is 4-byte aligned. * Fortunately, it is easy to convert 2-byte alignment to 4-byte * alignment for the unrolled loop. - */ -_csum_partial: - pushl %esi - pushl %ebx - movl 20(%esp),%eax # Function arg: unsigned int sum - movl 16(%esp),%ecx # Function arg: int len - movl 12(%esp),%esi # Function arg: unsigned char *buff - testl $3, %esi # Check alignment. - jz 2f # Jump if alignment is ok. - testl $1, %esi # Check alignment. - jz 10f # Jump if alignment is boundary of 2bytes. + */ +_csum_partial: + push esi + push ebx + mov eax, [esp + 20] // Function arg: unsigned int sum + mov ecx, [esp + 16] // Function arg: int len + mov esi, [esp + 12] // Function arg: unsigned char *buff + test esi, 3 // Check alignment. + jz m2 // Jump if alignment is ok. + test esi, 1 // Check alignment. + jz l10 // Jump if alignment is boundary of 2bytes. // buf is odd - dec %ecx - jl 8f - movzbl (%esi), %ebx - adcl %ebx, %eax - roll $8, %eax - inc %esi - testl $2, %esi - jz 2f -10: - subl $2, %ecx # Alignment uses up two bytes. - jae 1f # Jump if we had at least two bytes. - addl $2, %ecx # ecx was < 2. Deal with it. - jmp 4f -1: movw (%esi), %bx - addl $2, %esi - addw %bx, %ax - adcl $0, %eax -2: - movl %ecx, %edx - shrl $5, %ecx - jz 2f - testl %esi, %esi -1: movl (%esi), %ebx - adcl %ebx, %eax - movl 4(%esi), %ebx - adcl %ebx, %eax - movl 8(%esi), %ebx - adcl %ebx, %eax - movl 12(%esi), %ebx - adcl %ebx, %eax - movl 16(%esi), %ebx - adcl %ebx, %eax - movl 20(%esi), %ebx - adcl %ebx, %eax - movl 24(%esi), %ebx - adcl %ebx, %eax - movl 28(%esi), %ebx - adcl %ebx, %eax - lea 32(%esi), %esi - dec %ecx - jne 1b - adcl $0, %eax -2: movl %edx, %ecx - andl $0x1c, %edx - je 4f - shrl $2, %edx # This clears CF -3: adcl (%esi), %eax - lea 4(%esi), %esi - dec %edx - jne 3b - adcl $0, %eax -4: andl $3, %ecx - jz 7f - cmpl $2, %ecx - jb 5f - movw (%esi),%cx - leal 2(%esi),%esi - je 6f - shll $16,%ecx -5: movb (%esi),%cl -6: addl %ecx,%eax - adcl $0, %eax -7: - testl $1, 12(%esp) - jz 8f - roll $8, %eax -8: - popl %ebx - popl %esi + dec ecx + jl l8 + movzx ebx, byte ptr [esi] + adc eax, ebx + rol eax, 8 + inc esi + test esi, 2 + jz m2 +l10: + sub ecx, 2 // Alignment uses up two bytes. + jae m1 // Jump if we had at least two bytes. + add ecx, 2 // ecx was < 2. Deal with it. + jmp l4 +m1: mov bx, [esi] + add esi, 2 + add ax, bx + adc eax, 0 +m2: + mov edx, ecx + shr ecx, 5 + jz l2 + test esi, esi +l1: mov ebx, [esi] + adc eax, ebx + mov ebx, [esi + 4] + adc eax, ebx + mov ebx, [esi + 8] + adc eax, ebx + mov ebx, [esi + 12] + adc eax, ebx + mov ebx, [esi + 16] + adc eax, ebx + mov ebx, [esi + 20] + adc eax, ebx + mov ebx, [esi + 24] + adc eax, ebx + mov ebx, [esi + 28] + adc eax, ebx + lea esi, [esi + 32] + dec ecx + jne l1 + adc eax, 0 +l2: mov ecx, edx + and edx, HEX(1c) + je l4 + shr edx, 2 // This clears CF +l3: adc eax, [esi] + lea esi, [esi + 4] + dec edx + jne l3 + adc eax, 0 +l4: and ecx, 3 + jz l7 + cmp ecx, 2 + jb l5 + mov cx, [esi] + lea esi, [esi + 2] + je l6 + shl ecx, 16 +l5: mov cl, [esi] +l6: add eax, ecx + adc eax, 0 +l7: + test dword ptr [esp + 12], 1 + jz l8 + rol eax, 8 +l8: + pop ebx + pop esi ret #else @@ -134,116 +136,118 @@ /* Version for PentiumII/PPro */ csum_partial: - pushl %esi - pushl %ebx - movl 20(%esp),%eax # Function arg: unsigned int sum - movl 16(%esp),%ecx # Function arg: int len - movl 12(%esp),%esi # Function arg: const unsigned char *buf - - testl $3, %esi - jnz 25f -10: - movl %ecx, %edx - movl %ecx, %ebx - andl $0x7c, %ebx - shrl $7, %ecx - addl %ebx,%esi - shrl $2, %ebx - negl %ebx - lea 45f(%ebx,%ebx,2), %ebx - testl %esi, %esi - jmp *%ebx - - # Handle 2-byte-aligned regions -20: addw (%esi), %ax - lea 2(%esi), %esi - adcl $0, %eax - jmp 10b -25: - testl $1, %esi - jz 30f - # buf is odd - dec %ecx - jl 90f - movzbl (%esi), %ebx - addl %ebx, %eax - adcl $0, %eax - roll $8, %eax - inc %esi - testl $2, %esi - jz 10b - -30: subl $2, %ecx - ja 20b - je 32f - addl $2, %ecx - jz 80f - movzbl (%esi),%ebx # csumming 1 byte, 2-aligned - addl %ebx, %eax - adcl $0, %eax - jmp 80f -32: - addw (%esi), %ax # csumming 2 bytes, 2-aligned - adcl $0, %eax - jmp 80f - -40: - addl -128(%esi), %eax - adcl -124(%esi), %eax - adcl -120(%esi), %eax - adcl -116(%esi), %eax - adcl -112(%esi), %eax - adcl -108(%esi), %eax - adcl -104(%esi), %eax - adcl -100(%esi), %eax - adcl -96(%esi), %eax - adcl -92(%esi), %eax - adcl -88(%esi), %eax - adcl -84(%esi), %eax - adcl -80(%esi), %eax - adcl -76(%esi), %eax - adcl -72(%esi), %eax - adcl -68(%esi), %eax - adcl -64(%esi), %eax - adcl -60(%esi), %eax - adcl -56(%esi), %eax - adcl -52(%esi), %eax - adcl -48(%esi), %eax - adcl -44(%esi), %eax - adcl -40(%esi), %eax - adcl -36(%esi), %eax - adcl -32(%esi), %eax - adcl -28(%esi), %eax - adcl -24(%esi), %eax - adcl -20(%esi), %eax - adcl -16(%esi), %eax - adcl -12(%esi), %eax - adcl -8(%esi), %eax - adcl -4(%esi), %eax -45: - lea 128(%esi), %esi - adcl $0, %eax - dec %ecx - jge 40b - movl %edx, %ecx -50: andl $3, %ecx - jz 80f - - # Handle the last 1-3 bytes without jumping - notl %ecx # 1->2, 2->1, 3->0, higher bits are masked - movl $0xffffff,%ebx # by the shll and shrl instructions - shll $3,%ecx - shrl %cl,%ebx - andl -128(%esi),%ebx # esi is 4-aligned so should be ok - addl %ebx,%eax - adcl $0,%eax -80: - testl $1, 12(%esp) - jz 90f - roll $8, %eax -90: - popl %ebx - popl %esi + push esi + push ebx + mov eax, [esp + 20] # Function arg: unsigned int sum + mov ecx, [esp + 16] # Function arg: int len + mov esi, [esp + 12] # Function arg: const unsigned char *buf + + test esi, 3 + jnz l25f +l10: + mov edx, ecx + mov ebx, ecx + and ebx, HEX(7c) + shr ecx, 7 + add esi, ebx + shr ebx, 2 + neg ebx + lea ebx, l45[ebx + ebx * 2] + test esi, esi + jmp dword ptr [ebx] + + // Handle 2-byte-aligned regions +l20: add ax, [esi] + lea esi, [esi + 2] + adc eax, 0 + jmp l10b +l25: + test esi, 1 + jz l30f + // buf is odd + dec ecx + jl l90 + movzb ebx, [esi] + add eax, ebx + adc eax, 0 + rol eax, 8 + inc esi + test esi, 2 + jz l10b + +l30: sub ecx, 2 + ja l20 + je l32 + add ecx, 2 + jz l80 + movzb ebx, [esi] // csumming 1 byte, 2-aligned + add eax, ebx + adc eax, 0 + jmp l80 +l32: + add ax, [esi] // csumming 2 bytes, 2-aligned + adc eax, 0 + jmp l80 + +l40: + add eax, [esi -128] + adc eax, [esi -124] + adc eax, [esi -120] + adc eax, [esi -116] + adc eax, [esi -112] + adc eax, [esi -108] + adc eax, [esi -104] + adc eax, [esi -100] + adc eax, [esi -96] + adc eax, [esi -92] + adc eax, [esi -88] + adc eax, [esi -84] + adc eax, [esi -80] + adc eax, [esi -76] + adc eax, [esi -72] + adc eax, [esi -68] + adc eax, [esi -64] + adc eax, [esi -60] + adc eax, [esi -56] + adc eax, [esi -52] + adc eax, [esi -48] + adc eax, [esi -44] + adc eax, [esi -40] + adc eax, [esi -36] + adc eax, [esi -32] + adc eax, [esi -28] + adc eax, [esi -24] + adc eax, [esi -20] + adc eax, [esi -16] + adc eax, [esi -12] + adc eax, [esi -8] + adc eax, [esi -4] +l45: + lea esi, [esi + 128] + adc eax, 0 + dec ecx + jge l40 + mov ecx, edx +l50: and ecx, 3 + jz l80 + + // Handle the last 1-3 bytes without jumping + not ecx // 1->2, 2->1, 3->0, higher bits are masked + mov ebx, HEX(ffffff) // by the shll and shrl instructions + shl ecx, 3 + shr ebx, cl + and ebx, [esi -128] // esi is 4-aligned so should be ok + add eax, ebx + adc eax, 0 +l80: + test dword ptr [esp + 12], 1 + jz l90 + rol eax, 8 +l90: + pop ebx + pop esi ret - + #endif + +END Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -144,6 +144,32 @@ sgdt [eax] } } + +FORCEINLINE +VOID +__fxsave(OUT PFX_SAVE_AREA SaveArea) +{ + __asm mov eax, SaveArea + __asm fxsave [eax] +} + +FORCEINLINE +VOID +__fxrstor(IN PFX_SAVE_AREA SaveArea) +{ + __asm mov eax, SaveArea + __asm fxrstor [eax] +} + +FORCEINLINE +VOID +__fnsave(OUT PFLOATING_SAVE_AREA SaveArea) +{ + __asm mov eax, SaveArea + __asm fnsave [eax] + __asm wait; +} + #define Ke386GetGlobalDescriptorTable __sgdt FORCEINLINE @@ -267,6 +293,28 @@ __asm mov ax, Value; __asm mov gs, ax; } + +extern ULONG KeI386FxsrPresent; + +FORCEINLINE +VOID +Ke386SaveFpuState(IN PVOID SaveArea) +{ + if (KeI386FxsrPresent) + { + __fxsave(SaveArea); + } + else + { + __fnsave(SaveArea); + } +} + +#define Ke386FnSave __fnsave +#define Ke386FxSave __fxsave +// The name suggest, that the original author didn't understand what frstor means +#define Ke386FxStore __fxrstor + #else #error Unknown compiler for inline assembler Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -109,7 +109,13 @@ #define CX86_CCR1 0xc1 /* NSC/Cyrix CPU indexed register access macros */ -#define getCx86(reg) ({ WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x22,(reg)); READ_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x23); }) +static __inline +ULONG +getCx86(UCHAR reg) +{ + WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x22, reg); + return READ_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x23); +} #define setCx86(reg, data) do { \ WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x22,(reg)); \ Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -18,15 +18,16 @@ /* GLOBALS ********************************************************************/ /* Template PTE and PDE for a kernel page */ -MMPTE ValidKernelPde = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; -MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; +MMPTE ValidKernelPde = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; +MMPTE ValidKernelPte = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; /* Template PDE for a demand-zero page */ -MMPDE DemandZeroPde = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; -MMPTE DemandZeroPte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; +MMPDE DemandZeroPde = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; +MMPTE DemandZeroPte = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; /* Template PTE for prototype page */ -MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}; +MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | + PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}}; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -128,6 +128,14 @@ #define PTE_EXECUTE_READWRITE 0x2 // Not worrying about NX yet #define PTE_EXECUTE_WRITECOPY 0x200 #define PTE_PROTOTYPE 0x400 + +// +// State Flags +// +#define PTE_VALID 0x1 +#define PTE_ACCESSED 0x20 +#define PTE_DIRTY 0x40 + // // Cache flags // Modified: trunk/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/string.c?rev… ============================================================================== --- trunk/reactos/tools/unicode/string.c [iso-8859-1] (original) +++ trunk/reactos/tools/unicode/string.c [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -21,7 +21,6 @@ #include <assert.h> #include <limits.h> #include <stdio.h> -#include <string.h> #define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" @@ -465,7 +464,7 @@ *fmta = '\0'; if (*iter == 'a' || *iter == 'A' || *iter == 'e' || *iter == 'E' || - *iter == 'f' || *iter == 'F' || + *iter == 'f' || *iter == 'F' || *iter == 'g' || *iter == 'G') sprintf(bufaiter, fmtbufa, va_arg(valist, double)); else Modified: trunk/reactos/tools/unicode/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wine/unicode… ============================================================================== --- trunk/reactos/tools/unicode/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/tools/unicode/wine/unicode.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -18,10 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_UNICODE_H -#define __WINE_UNICODE_H +#ifndef __WINE_WINE_UNICODE_H +#define __WINE_WINE_UNICODE_H #include <stdarg.h> +#include <string.h> #include <host/typedefs.h> // Definitions copied from <winnls.h> @@ -44,12 +45,24 @@ #define WC_NO_BEST_FIT_CHARS 1024 #define WC_ERR_INVALID_CHARS 0x0080 +#ifdef __WINE_WINE_TEST_H +#error This file should not be used in Wine tests +#endif + +#ifdef __cplusplus +extern "C" { +#endif + #ifndef WINE_UNICODE_API -#define WINE_UNICODE_API DECLSPEC_IMPORT +# if defined(_MSC_VER) || defined(__MINGW32__) +# define WINE_UNICODE_API DECLSPEC_IMPORT +# else +# define WINE_UNICODE_API +# endif #endif #ifndef WINE_UNICODE_INLINE -#define WINE_UNICODE_INLINE extern inline +#define WINE_UNICODE_INLINE static inline #endif /* code page info common to SBCS and DBCS */ @@ -117,20 +130,17 @@ extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); -WINE_UNICODE_INLINE int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ); WINE_UNICODE_INLINE int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) { return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); } -WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ); WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) { extern WINE_UNICODE_API const WCHAR wine_casemap_lower[]; return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; } -WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ); WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) { extern WINE_UNICODE_API const WCHAR wine_casemap_upper[]; @@ -139,74 +149,62 @@ /* the character type contains the C1_* flags in the low 12 bits */ /* and the C2_* type in the high 4 bits */ -WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ); WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ) { extern WINE_UNICODE_API const unsigned short wine_wctype_table[]; return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; } -WINE_UNICODE_INLINE int iscntrlW( WCHAR wc ); WINE_UNICODE_INLINE int iscntrlW( WCHAR wc ) { return get_char_typeW(wc) & C1_CNTRL; } -WINE_UNICODE_INLINE int ispunctW( WCHAR wc ); WINE_UNICODE_INLINE int ispunctW( WCHAR wc ) { return get_char_typeW(wc) & C1_PUNCT; } -WINE_UNICODE_INLINE int isspaceW( WCHAR wc ); WINE_UNICODE_INLINE int isspaceW( WCHAR wc ) { return get_char_typeW(wc) & C1_SPACE; } -WINE_UNICODE_INLINE int isdigitW( WCHAR wc ); WINE_UNICODE_INLINE int isdigitW( WCHAR wc ) { return get_char_typeW(wc) & C1_DIGIT; } -WINE_UNICODE_INLINE int isxdigitW( WCHAR wc ); WINE_UNICODE_INLINE int isxdigitW( WCHAR wc ) { return get_char_typeW(wc) & C1_XDIGIT; } -WINE_UNICODE_INLINE int islowerW( WCHAR wc ); WINE_UNICODE_INLINE int islowerW( WCHAR wc ) { return get_char_typeW(wc) & C1_LOWER; } -WINE_UNICODE_INLINE int isupperW( WCHAR wc ); WINE_UNICODE_INLINE int isupperW( WCHAR wc ) { return get_char_typeW(wc) & C1_UPPER; } -WINE_UNICODE_INLINE int isalnumW( WCHAR wc ); WINE_UNICODE_INLINE int isalnumW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); } -WINE_UNICODE_INLINE int isalphaW( WCHAR wc ); WINE_UNICODE_INLINE int isalphaW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_LOWER|C1_UPPER); } -WINE_UNICODE_INLINE int isgraphW( WCHAR wc ); WINE_UNICODE_INLINE int isgraphW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); } -WINE_UNICODE_INLINE int isprintW( WCHAR wc ); WINE_UNICODE_INLINE int isprintW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); @@ -214,15 +212,13 @@ /* some useful string manipulation routines */ -WINE_UNICODE_INLINE unsigned int strlenW( const WCHAR *str ); WINE_UNICODE_INLINE unsigned int strlenW( const WCHAR *str ) { const WCHAR *s = str; while (*s) s++; - return s - str; -} - -WINE_UNICODE_INLINE WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ); + return (unsigned int)(s - str); +} + WINE_UNICODE_INLINE WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) { WCHAR *p = dst; @@ -233,14 +229,12 @@ /* strncpy doesn't do what you think, don't use it */ #define strncpyW(d,s,n) error do_not_use_strncpyW_use_lstrcpynW_or_memcpy_instead -WINE_UNICODE_INLINE int strcmpW( const WCHAR *str1, const WCHAR *str2 ); WINE_UNICODE_INLINE int strcmpW( const WCHAR *str1, const WCHAR *str2 ) { while (*str1 && (*str1 == *str2)) { str1++; str2++; } return *str1 - *str2; } -WINE_UNICODE_INLINE int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ); WINE_UNICODE_INLINE int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) { if (n <= 0) return 0; @@ -248,21 +242,18 @@ return *str1 - *str2; } -WINE_UNICODE_INLINE WCHAR *strcatW( WCHAR *dst, const WCHAR *src ); WINE_UNICODE_INLINE WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) { strcpyW( dst + strlenW(dst), src ); return dst; } -WINE_UNICODE_INLINE WCHAR *strchrW( const WCHAR *str, WCHAR ch ); WINE_UNICODE_INLINE WCHAR *strchrW( const WCHAR *str, WCHAR ch ) { do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); return NULL; } -WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ); WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) { WCHAR *ret = NULL; @@ -270,14 +261,12 @@ return ret; } -WINE_UNICODE_INLINE WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ); WINE_UNICODE_INLINE WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) { for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)(ULONG_PTR)str; return NULL; } -WINE_UNICODE_INLINE size_t strspnW( const WCHAR *str, const WCHAR *accept ); WINE_UNICODE_INLINE size_t strspnW( const WCHAR *str, const WCHAR *accept ) { const WCHAR *ptr; @@ -285,7 +274,6 @@ return ptr - str; } -WINE_UNICODE_INLINE size_t strcspnW( const WCHAR *str, const WCHAR *reject ); WINE_UNICODE_INLINE size_t strcspnW( const WCHAR *str, const WCHAR *reject ) { const WCHAR *ptr; @@ -293,7 +281,6 @@ return ptr - str; } -WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ); WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ) { WCHAR *ret = str; @@ -301,7 +288,6 @@ return ret; } -WINE_UNICODE_INLINE WCHAR *struprW( WCHAR *str ); WINE_UNICODE_INLINE WCHAR *struprW( WCHAR *str ) { WCHAR *ret = str; @@ -309,7 +295,6 @@ return ret; } -WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ); WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end; @@ -317,7 +302,6 @@ return NULL; } -WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ); WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end; @@ -326,13 +310,11 @@ return ret; } -WINE_UNICODE_INLINE long int atolW( const WCHAR *str ); WINE_UNICODE_INLINE long int atolW( const WCHAR *str ) { return strtolW( str, (WCHAR **)0, 10 ); } -WINE_UNICODE_INLINE int atoiW( const WCHAR *str ); WINE_UNICODE_INLINE int atoiW( const WCHAR *str ) { return (int)atolW( str ); @@ -340,4 +322,8 @@ #undef WINE_UNICODE_INLINE -#endif /* __WINE_UNICODE_H */ +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINE_UNICODE_H */

13 years, 10 months

[tkreuzer] 50655: [FREELDR] Fix broken release version

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 10 20:26:41 2011 New Revision: 50655 URL: http://svn.reactos.org/svn/reactos?rev=50655&view=rev Log: [FREELDR] Fix broken release version Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/freeldr.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Thu Feb 10 20:26:41 2011 @@ -66,19 +66,6 @@ BOOLEAN DebugStartOfLine = TRUE; -// We need to emulate these, because the original ones don't work in freeldr -int __cdecl wctomb(char *mbchar, wchar_t wchar) -{ - *mbchar = wchar; - return 1; -} - -int __cdecl mbtowc (wchar_t *wchar, const char *mbchar, size_t count) -{ - *wchar = *mbchar; - return 1; -} - VOID DebugInit(VOID) { if (DebugPort & RS232) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Thu Feb 10 20:26:41 2011 @@ -53,3 +53,16 @@ #endif RunLoader(); } + +// We need to emulate these, because the original ones don't work in freeldr +int __cdecl wctomb(char *mbchar, wchar_t wchar) +{ + *mbchar = wchar; + return 1; +} + +int __cdecl mbtowc (wchar_t *wchar, const char *mbchar, size_t count) +{ + *wchar = *mbchar; + return 1; +}

13 years, 10 months

[fireball] 50654: - Add stubs for all page heap API functions. - Enable call to RtlpPageHeapDestroy() when necessary. - Reset Parameters==-1 hack after unsuccessful call to RtlpPageHeapCreate(), wo...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 10 18:21:53 2011 New Revision: 50654 URL: http://svn.reactos.org/svn/reactos?rev=50654&view=rev Log: - Add stubs for all page heap API functions. - Enable call to RtlpPageHeapDestroy() when necessary. - Reset Parameters==-1 hack after unsuccessful call to RtlpPageHeapCreate(), would be necessary when page heap is implemented.. Modified: trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/heap.h trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=50654&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Thu Feb 10 18:21:53 2011 @@ -1364,6 +1364,10 @@ //ASSERT(FALSE); DPRINT1("Enabling page heap failed\n"); + + /* Reset a special Parameters == -1 hack */ + if ((ULONG_PTR)Parameters == (ULONG_PTR)-1) + Parameters = NULL; } /* Check validation flags */ @@ -1715,6 +1719,9 @@ PHEAP_SEGMENT Segment; if (!HeapPtr) return NULL; + + /* Call page heap routine if required */ + if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) return RtlpPageHeapDestroy(HeapPtr); /* Call special heap */ if (RtlpHeapIsSpecial(Heap->Flags)) Modified: trunk/reactos/lib/rtl/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.h?rev=50654&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.h [iso-8859-1] Thu Feb 10 18:21:53 2011 @@ -385,6 +385,8 @@ ULONG Flags, PVOID Ptr); +/* heappage.c */ + HANDLE NTAPI RtlpPageHeapCreate(ULONG Flags, PVOID Addr, @@ -393,4 +395,49 @@ PVOID Lock, PRTL_HEAP_PARAMETERS Parameters); +PVOID NTAPI +RtlpPageHeapDestroy(HANDLE HeapPtr); + +PVOID NTAPI +RtlpPageHeapAllocate(IN PVOID HeapPtr, + IN ULONG Flags, + IN SIZE_T Size); + +BOOLEAN NTAPI +RtlpPageHeapFree(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr); + +PVOID NTAPI +RtlpPageHeapReAllocate(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr, + SIZE_T Size); + +BOOLEAN NTAPI +RtlpPageHeapGetUserInfo(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + PVOID *UserValue, + PULONG UserFlags); + +BOOLEAN NTAPI +RtlpPageHeapSetUserValue(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + PVOID UserValue); + +BOOLEAN +NTAPI +RtlpPageHeapSetUserFlags(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + ULONG UserFlagsReset, + ULONG UserFlagsSet); + +SIZE_T NTAPI +RtlpPageHeapSize(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr); + #endif Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Thu Feb 10 18:21:53 2011 @@ -36,4 +36,73 @@ return NULL; } +PVOID NTAPI +RtlpPageHeapDestroy(HANDLE HeapPtr) +{ + return FALSE; +} + +PVOID NTAPI +RtlpPageHeapAllocate(IN PVOID HeapPtr, + IN ULONG Flags, + IN SIZE_T Size) +{ + return NULL; +} + +BOOLEAN NTAPI +RtlpPageHeapFree(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr) +{ + return FALSE; +} + +PVOID NTAPI +RtlpPageHeapReAllocate(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr, + SIZE_T Size) +{ + return NULL; +} + +BOOLEAN NTAPI +RtlpPageHeapGetUserInfo(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + PVOID *UserValue, + PULONG UserFlags) +{ + return FALSE; +} + +BOOLEAN NTAPI +RtlpPageHeapSetUserValue(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + PVOID UserValue) +{ + return FALSE; +} + +BOOLEAN +NTAPI +RtlpPageHeapSetUserFlags(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + ULONG UserFlagsReset, + ULONG UserFlagsSet) +{ + return FALSE; +} + +SIZE_T NTAPI +RtlpPageHeapSize(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr) +{ + return 0; +} + /* EOF */

13 years, 10 months

[akhaldi] 50653: [XCOPY] - Spanish translation by JasonGenie at gmail dot com See issue #5889 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Feb 10 17:13:53 2011 New Revision: 50653 URL: http://svn.reactos.org/svn/reactos?rev=50653&view=rev Log: [XCOPY] - Spanish translation by JasonGenie at gmail dot com See issue #5889 for more details. Added: trunk/reactos/base/applications/cmdutils/xcopy/Es.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc Added: trunk/reactos/base/applications/cmdutils/xcopy/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Es.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Es.rc [iso-8859-1] Thu Feb 10 17:13:53 2011 @@ -1,0 +1,80 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Spanish language support + * + * Copyright (C) 2007 Jeisson T. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "xcopy.h" + +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Cantidad invalido de parametros - Use xcopy /? para obtener ayuda\n" + STRING_INVPARM, "Parametro invalido '%s' - Use xcopy /? para obtener ayuda\n" + STRING_PAUSE, "Unde <enter> para iniciar la copia\n" + STRING_SIMCOPY, "%d archivo(s) seran copiado(s)\n" + STRING_COPY, "%d archivo(s) copiado(s)\n" + STRING_QISDIR, "Es '%s' un nombre de archivo o de directorio\n\ + en el punto de destino?\n\ + (F - Archivo, D - Directorio)\n" + STRING_SRCPROMPT,"%s? (Si|No)\n" + STRING_OVERWRITE,"Destruir y escribir encima %s? (Si|No|Todo)\n" + STRING_COPYFAIL, "La copia de '%s' a '%s' ha faillecido con r/c %d\n" + STRING_OPENFAIL, "Impossible de abrir '%s'\n" + STRING_READFAIL, "Hubo un error durante la lectura de '%s'\n" + STRING_YES_CHAR, "S" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"A" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - Copia los archivos o directorios fuentes a un destino\n\ +\n\ +Sintaxis:\n\ +XCOPY fuente [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +En la cual:\n\ +\n\ +[/I] Asuma el directorio si el destino no existe y copia dos o\n\ +\tmas archivos\n\ +[/S] Copia directorios y subdirectorios\n\ +[/E] Copia directorios y subdirectorios, incluyendo las que estan vacias\n\ +[/Q] No mostrar la lista de los nombres de los archivos durante la copia (silencioso)\n\ +[/F] Mostrar todas las fuentes y todos los destinos durante la copia.\n\ +[/L] Simular la operacion, mostrando los nombres de archivos que seran copiados\n\ +[/W] Preguntar antes de iniciar la operacion de copia\n\ +[/T] Crear una estructura de repertorios vacios pero no copia los archivos\n\ +[/Y] No pide confirmacion cuando sobreescribe sobre los archivos\n\ +[/-Y] Pide confirmacion cuando sobreescribe los archivos\n\ +[/P] Pregunta al usuario ante de copiar cada archivo fuente\n\ +[/N] Copiar usando los nombres cortos\n\ +[/U] Copia solamente los archivos que ya existent en el punto de destino\n\ +[/R] Sobreescribir los archivos en lectura unica\n\ +[/H] Incluir los archivos escondidos y los del systema en la copia\n\ +[/C] Siempre continuar mismo si un error occure en la copia\n\ +[/A] Copia solamente archivos con el attributo de archivo definido\n\ +[/M] Copia solamente archivos con el attributo de archivo definido, supprime\n\ +\tl'attributo de archivo\n\ +[/D | /D:m-d-y] Copia los nuevos archivos or los que fueront modificado despues la fecha especificada.\n\ +\t\tSi la fecha no esta especificada, copia unicamente cuando el archivo de destino est mas viejo\n\ +\t\tque el archivo fuente\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Es.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Thu Feb 10 17:13:53 2011 @@ -30,6 +30,7 @@ #include "En.rc" #include "No.rc" #include "Pl.rc" +#include "Es.rc" /* UTF-8 */ #include "De.rc"

13 years, 10 months

[fireball] 50652: [RTL] - Move page heap related code to heappage.c.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 10 13:24:39 2011 New Revision: 50652 URL: http://svn.reactos.org/svn/reactos?rev=50652&view=rev Log: [RTL] - Move page heap related code to heappage.c. Added: trunk/reactos/lib/rtl/heappage.c (with props) Modified: trunk/reactos/lib/rtl/heapdbg.c trunk/reactos/lib/rtl/rtl.rbuild Modified: trunk/reactos/lib/rtl/heapdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heapdbg.c?rev=5065… ============================================================================== --- trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] Thu Feb 10 13:24:39 2011 @@ -14,12 +14,6 @@ #define NDEBUG #include <debug.h> -BOOLEAN RtlpPageHeapEnabled = FALSE; -ULONG RtlpPageHeapGlobalFlags; -ULONG RtlpPageHeapSizeRangeStart, RtlpPageHeapSizeRangeEnd; -ULONG RtlpPageHeapDllRangeStart, RtlpPageHeapDllRangeEnd; -WCHAR RtlpPageHeapTargetDlls[512]; - /* FUNCTIONS ******************************************************************/ HANDLE NTAPI @@ -548,18 +542,4 @@ return Result; } - -// Page heap -> move to another file - -HANDLE NTAPI -RtlpPageHeapCreate(ULONG Flags, - PVOID Addr, - SIZE_T TotalSize, - SIZE_T CommitSize, - PVOID Lock, - PRTL_HEAP_PARAMETERS Parameters) -{ - return NULL; -} - /* EOF */ Added: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c (added) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Thu Feb 10 13:24:39 2011 @@ -1,0 +1,39 @@ +/* COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/rtl/heappage.c + * PURPOSE: RTL Page Heap implementation + * PROGRAMMERS: Copyright 2011 Aleksey Bragin + */ + +/* Useful references: + http://msdn.microsoft.com/en-us/library/ms220938(VS.80).aspx +*/ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> +#include <heap.h> + +#define NDEBUG +#include <debug.h> + +BOOLEAN RtlpPageHeapEnabled = FALSE; +ULONG RtlpPageHeapGlobalFlags; +ULONG RtlpPageHeapSizeRangeStart, RtlpPageHeapSizeRangeEnd; +ULONG RtlpPageHeapDllRangeStart, RtlpPageHeapDllRangeEnd; +WCHAR RtlpPageHeapTargetDlls[512]; + +/* FUNCTIONS ******************************************************************/ + +HANDLE NTAPI +RtlpPageHeapCreate(ULONG Flags, + PVOID Addr, + SIZE_T TotalSize, + SIZE_T CommitSize, + PVOID Lock, + PRTL_HEAP_PARAMETERS Parameters) +{ + return NULL; +} + +/* EOF */ Propchange: trunk/reactos/lib/rtl/heappage.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Thu Feb 10 13:24:39 2011 @@ -74,6 +74,7 @@ <file>handle.c</file> <file>heap.c</file> <file>heapdbg.c</file> + <file>heappage.c</file> <file>image.c</file> <file>interlck.c</file> <file>message.c</file>

13 years, 10 months

[tkreuzer] 50651: [CLASSPNP] Fix a bug, I introduced.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 10 13:07:54 2011 New Revision: 50651 URL: http://svn.reactos.org/svn/reactos?rev=50651&view=rev Log: [CLASSPNP] Fix a bug, I introduced. Modified: branches/cmake-bringup/drivers/storage/classpnp/class.c branches/cmake-bringup/drivers/storage/classpnp/obsolete.c Modified: branches/cmake-bringup/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/class.c [iso-8859-1] Thu Feb 10 13:07:54 2011 @@ -2485,7 +2485,7 @@ retry = TRUE; } - if (retry && ((*(char*)&irpStack->Parameters.Others.Argument4)--)) { + if (retry && ((*(PCHAR*)&irpStack->Parameters.Others.Argument4)--)) { // // Retry request. Modified: branches/cmake-bringup/drivers/storage/classpnp/obsolete.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/obsolete.c [iso-8859-1] Thu Feb 10 13:07:54 2011 @@ -161,7 +161,7 @@ retry = TRUE; } - if (retry && ((*(char*)&irpStack->Parameters.Others.Argument4)--)) { + if (retry && ((*(PCHAR*)&irpStack->Parameters.Others.Argument4)--)) { // // Retry request. If the class driver has supplied a StartIo,

13 years, 10 months

[tkreuzer] 50650: Merge MSVC fixes from cmake branch

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 10 13:01:39 2011 New Revision: 50650 URL: http://svn.reactos.org/svn/reactos?rev=50650&view=rev Log: Merge MSVC fixes from cmake branch Modified: trunk/reactos/base/applications/mmc/precomp.h trunk/reactos/base/applications/mscutils/eventvwr/resource.h trunk/reactos/base/applications/network/ping/ping.c trunk/reactos/base/applications/paint/registry.c trunk/reactos/base/applications/rapps/rappsmsg.mc trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/taskmgr/resource.h trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/dll/win32/iphlpapi/dhcp_reactos.c trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c trunk/reactos/dll/win32/iphlpapi/registry.c trunk/reactos/dll/win32/kernel32/misc/lcformat.c trunk/reactos/drivers/base/kddll/kddll.h trunk/reactos/drivers/usb/usbehci/irp.c trunk/reactos/drivers/video/miniport/vga_new/vga.c trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/crtdefs.h trunk/reactos/include/crt/float.h trunk/reactos/include/crt/msc/intrin.h trunk/reactos/include/crt/sec_api/string_s.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/dxsdk/d3dx9shape.h trunk/reactos/include/dxsdk/dmksctrl.h trunk/reactos/include/dxsdk/dxsdkver.h trunk/reactos/include/dxsdk/pixplugin.h trunk/reactos/include/ndk/umfuncs.h trunk/reactos/include/reactos/mc/bugcodes.mc trunk/reactos/include/reactos/mc/errcodes.mc trunk/reactos/include/reactos/mc/ntstatus.mc trunk/reactos/include/reactos/undocuser.h trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/ddk/imm.h trunk/reactos/include/xdk/rtlfuncs.h trunk/reactos/lib/3rdparty/mingw/cinitexe.c trunk/reactos/lib/3rdparty/mingw/crt_handler.c trunk/reactos/lib/3rdparty/mingw/crtexe.c trunk/reactos/lib/3rdparty/mingw/merr.c trunk/reactos/lib/3rdparty/mingw/pesect.c trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/base/applications/mmc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/prec… ============================================================================== --- trunk/reactos/base/applications/mmc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/precomp.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1,4 +1,3 @@ -#pragma once #include <windows.h> #include <commctrl.h> Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -60,3 +60,4 @@ #define IDS_COLUMNUSER 306 #define IDS_COLUMNCOMPUTER 307 #define IDS_COLUMNEVENTDATA 308 + Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -738,6 +738,7 @@ FormatOutput(IDS_PACKETS_SENT_RECEIVED_LOST,\ SentCount, SentCount - LostCount, LostCount, Count); + /* Print approximate times or NO approximate times if 100% loss */ if ((SentCount - LostCount) > 0) { Modified: trunk/reactos/base/applications/paint/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/re… ============================================================================== --- trunk/reactos/base/applications/paint/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/registry.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -16,10 +16,10 @@ void SetWallpaper(TCHAR * FileName, DWORD dwStyle, DWORD dwTile) //FIXME: Has to be called 2x to apply the pattern (tiled/stretched) too { - SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) FileName, SPIF_UPDATEINIFILE); - HKEY hDesktop; TCHAR szStyle[3], szTile[3]; + + SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) FileName, SPIF_UPDATEINIFILE); if ((dwStyle > 2) || (dwTile > 2)) return; Modified: trunk/reactos/base/applications/rapps/rappsmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rappsmsg.mc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rappsmsg.mc [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -25,4 +25,3 @@ Removal of the program "%1" is called. . -; EOF Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -367,12 +367,14 @@ TCHAR Caption[128]; LPCTSTR pszKeyPath; HKEY hRootKey; + LONG regUnloadResult; + /* get the item key to unload */ pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); /* load and set the caption and flags for dialog */ LoadString(hInst, IDS_UNLOAD_HIVE, Caption, COUNT_OF(Caption)); /* now unload the hive */ - LONG regUnloadResult = RegUnLoadKey(hRootKey, pszKeyPath); + regUnloadResult = RegUnLoadKey(hRootKey, pszKeyPath); if(regUnloadResult == ERROR_SUCCESS) { /* refresh tree and list views */ Modified: trunk/reactos/base/applications/taskmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/resource.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -251,3 +251,4 @@ #define _APS_NEXT_SYMED_VALUE 110 #endif #endif + Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1725,8 +1725,9 @@ if (hmenu) { POINT pt; + int cmd; GetCursorPos(&pt); - int cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON|TPM_RETURNCMD, pt.x, pt.y, 0, This->hWndToolbar, NULL); + cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON|TPM_RETURNCMD, pt.x, pt.y, 0, This->hWndToolbar, NULL); if (cmd) { SetForegroundWindow(TaskItem->hWnd); // reactivate window after the context menu has closed PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, cmd, 0); @@ -1756,19 +1757,19 @@ TaskSwitchWnd_HandleTaskGroupRightClick(This, TaskGroup); return TRUE; - } + } } TaskItem = FindTaskItemByIndex(This, (INT)wIndex); - + if (TaskItem != NULL) { TaskSwitchWnd_HandleTaskItemRightClick(This, TaskItem); return TRUE; } - + return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -606,6 +606,8 @@ // if (IniReadSettingByName(SectionId, "Options", value, sizeof(value))) { + PCHAR File; + // // Append boot-time options // @@ -614,7 +616,6 @@ // // Check if a ramdisk file was given // - PCHAR File; File = strstr(value, "/RDIMAGEPATH="); if (File) { Modified: trunk/reactos/dll/win32/iphlpapi/dhcp_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/dhcp_re… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/dhcp_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/dhcp_reactos.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -11,9 +11,6 @@ #include "dhcpcsdk.h" #include "dhcpcapi.h" #include <assert.h> - -#define NDEBUG -#include "debug.h" DWORD APIENTRY DhcpRosGetAdapterInfo(DWORD AdapterIndex, PBOOL DhcpEnabled, Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum_… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -40,9 +40,6 @@ #include "ifenum.h" #include <assert.h> -//#define NDEBUG -#include "debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); /* Functions */ Modified: trunk/reactos/dll/win32/iphlpapi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/registr… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1,6 +1,4 @@ #include "iphlpapi_private.h" - -#include "debug.h" int GetLongestChildKeyName( HANDLE RegHandle ) { LONG Status; Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -3,7 +3,7 @@ * * Copyright 1995 Martin von Loewis * Copyright 1998 David Lee Lambert - * Copyright 2000 Julio CÃ©sar GÃ¡zquez + * Copyright 2000 Julio César Gázquez * Copyright 2003 Jon Griffiths * Copyright 2005 Dmitry Timoshkov * Modified: trunk/reactos/drivers/base/kddll/kddll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.h… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -12,14 +12,14 @@ #include <ntifs.h> #define NDEBUG #include <halfuncs.h> -#include <stdio.h> -#include <stdlib.h> #include <debug.h> #include "arc/arc.h" #include "windbgkd.h" #include <wdbgexts.h> #include <ioaccess.h> /* port intrinsics */ + +long atol(const char *str); typedef UCHAR BYTE, *PBYTE; Modified: trunk/reactos/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/irp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -540,6 +540,7 @@ if (!(PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus & 0x8000)) CompletePendingURBRequest(PdoDeviceExtension); + break; } case USB_REQUEST_SET_ADDRESS: Modified: trunk/reactos/drivers/video/miniport/vga_new/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/vga.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -93,7 +93,7 @@ PVIDEO_PALETTE_DATA PaletteBuffer, ULONG PaletteBufferSize ); - + VP_STATUS VgaSetColorLookup( PHW_DEVICE_EXTENSION HwDeviceExtension, @@ -846,10 +846,10 @@ case IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES: { - VideoDebugPrint((2, "VgaStartIO - Query Public Address Ranges\n")); - PVIDEO_PUBLIC_ACCESS_RANGES portAccess; ULONG physicalPortLength; + + VideoDebugPrint((2, "VgaStartIO - Query Public Address Ranges\n")); if (RequestPacket->OutputBufferLength < sizeof(VIDEO_PUBLIC_ACCESS_RANGES)) @@ -882,7 +882,7 @@ // eVb: 1.17 [END] VideoDebugPrint((2, "VgaStartIO - mapping ports to (%x)\n", portAccess->VirtualAddress)); } - + break; case IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES: @@ -891,7 +891,7 @@ status = ERROR_INVALID_FUNCTION; break; - + // // if we get here, an invalid IoControlCode was specified. // @@ -1371,7 +1371,7 @@ { PVIDEOMODE CurrentMode = HwDeviceExtension->CurrentMode; USHORT i; - + // // Check if the size of the data in the input buffer is large enough. // @@ -1400,9 +1400,9 @@ // // Check SVGA mode // - + if (CurrentMode->bitsPerPlane >= 8) return VbeSetColorLookup(HwDeviceExtension, ClutBuffer); -// eVb: 1.14 [END] +// eVb: 1.14 [END] // // Path for VGA mode // @@ -1507,11 +1507,11 @@ { VP_STATUS Status = NO_ERROR; ULONG Ranges, i; - + // // Try exclusive ranges (vga + ati) // - + Ranges = NUM_VGA_ACCESS_RANGES; for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = FALSE; if (VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange) != NO_ERROR) @@ -1519,14 +1519,14 @@ // // Not worked, try vga only // - + Ranges = 3; if (VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange) != NO_ERROR) { // // Still not, try shared ranges // - + for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = TRUE; Status = VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange); if (Status == NO_ERROR) @@ -1534,7 +1534,7 @@ // // It did work // - + VideoPortVerifyAccessRanges(DeviceExtension, 0, 0); Status = NO_ERROR; } @@ -1546,7 +1546,7 @@ // // Worked with exclusive, also try shared // - + for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = TRUE; Status = VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange); } Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -197,9 +197,9 @@ /* V86 TRAP HANDLERS **********************************************************/ #ifndef _MINIHAL_ +DECLSPEC_NORETURN VOID FASTCALL -DECLSPEC_NORETURN HalpTrap0DHandler(IN PKTRAP_FRAME TrapFrame) { /* Enter the trap */ Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -187,7 +187,7 @@ #endif #endif -#ifdef _WIN64 +#if defined(_WIN64) && !defined(_MSC_VER) #undef USE_MINGW_SETJMP_TWO_ARGS #define USE_MINGW_SETJMP_TWO_ARGS #endif Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -133,7 +133,13 @@ #endif #ifndef _CRT_ALIGN +#if defined (__midl) || defined(__WIDL__) +#define _CRT_ALIGN(x) +#elif defined(_MSC_VER) +#define _CRT_ALIGN(x) __declspec(align(x)) +#else #define _CRT_ALIGN(x) __attribute__ ((aligned(x))) +#endif #endif #ifndef _CRTNOALIAS Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=50… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -104,12 +104,12 @@ /* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask), * i.e. change the bits in unMask to have the values they have in unNew, * leaving other bits unchanged. */ -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _controlfp (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int unNew, unsigned int unMask); +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _controlfp (unsigned int unNew, unsigned int unMask); +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _control87 (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */ -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _statusfp (void); /* Report the FPU status word */ +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _clearfp (void); /* Clear the FPU status word */ +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _statusfp (void); /* Report the FPU status word */ #define _clear87 _clearfp #define _status87 _statusfp @@ -123,11 +123,11 @@ per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when building your application. */ -void __cdecl __MINGW_NOTHROW _fpreset (void); -void __cdecl __MINGW_NOTHROW fpreset (void); +__MINGW_NOTHROW void __cdecl _fpreset (void); +__MINGW_NOTHROW void __cdecl fpreset (void); /* Global 'variable' for the current floating point error code. */ -_CRTIMP int * __cdecl __MINGW_NOTHROW __fpecode(void); +__MINGW_NOTHROW _CRTIMP int * __cdecl __fpecode(void); #define _fpecode (*(__fpecode())) /* @@ -135,15 +135,15 @@ * but they really belong in math.h. */ -_CRTIMP double __cdecl __MINGW_NOTHROW _chgsign (double); -_CRTIMP double __cdecl __MINGW_NOTHROW _copysign (double, double); -_CRTIMP double __cdecl __MINGW_NOTHROW _logb (double); -_CRTIMP double __cdecl __MINGW_NOTHROW _nextafter (double, double); -_CRTIMP double __cdecl __MINGW_NOTHROW _scalb (double, long); +__MINGW_NOTHROW _CRTIMP double __cdecl _chgsign (double); +__MINGW_NOTHROW _CRTIMP double __cdecl _copysign (double, double); +__MINGW_NOTHROW _CRTIMP double __cdecl _logb (double); +__MINGW_NOTHROW _CRTIMP double __cdecl _nextafter (double, double); +__MINGW_NOTHROW _CRTIMP double __cdecl _scalb (double, long); -_CRTIMP int __cdecl __MINGW_NOTHROW _finite (double); -_CRTIMP int __cdecl __MINGW_NOTHROW _fpclass (double); -_CRTIMP int __cdecl __MINGW_NOTHROW _isnan (double); +__MINGW_NOTHROW _CRTIMP int __cdecl _finite (double); +__MINGW_NOTHROW _CRTIMP int __cdecl _fpclass (double); +__MINGW_NOTHROW _CRTIMP int __cdecl _isnan (double); #ifdef __cplusplus } Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -21,16 +21,10 @@ void _WriteBarrier(void); #pragma intrinsic(_WriteBarrier) -char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand); -#pragma intrinsic(_InterlockedCompareExchange8) -short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand); -#pragma intrinsic(_InterlockedCompareExchange16) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); #pragma intrinsic(_InterlockedCompareExchange) long _InterlockedExchange(volatile long * const Target, const long Value); #pragma intrinsic(_InterlockedExchange) -short _InterlockedExchangeAdd16(volatile short * const Addend, const short Value); -#pragma intrinsic(_InterlockedExchangeAdd16) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value); #pragma intrinsic(_InterlockedExchangeAdd) char _InterlockedAnd8(volatile char * const value, const char mask); @@ -51,8 +45,6 @@ #pragma intrinsic(_InterlockedXor16) long _InterlockedXor(volatile long * const value, const long mask); #pragma intrinsic(_InterlockedXor) -long _InterlockedAddLargeStatistic(volatile __int64 * const Addend, const long Value); -#pragma intrinsic(_InterlockedAddLargeStatistic) long _InterlockedDecrement(volatile long * const lpAddend); #pragma intrinsic(_InterlockedDecrement) long _InterlockedIncrement(volatile long * const lpAddend); @@ -66,7 +58,10 @@ unsigned char _interlockedbittestandset(volatile long * a, const long b); #pragma intrinsic(_interlockedbittestandset) -#if defined(_M_AMD64) +#if defined(_M_IX86) +long _InterlockedAddLargeStatistic(volatile __int64 * const Addend, const long Value); +#pragma intrinsic(_InterlockedAddLargeStatistic) +#elif defined(_M_AMD64) __int64 _InterlockedExchange64(volatile __int64 * const Target, const __int64 Value); #pragma intrinsic(_InterlockedExchange64) __int64 _InterlockedExchangeAdd64(volatile __int64 * const Addend, const __int64 Value); @@ -77,7 +72,7 @@ #pragma intrinsic(_InterlockedExchangePointer) __int64 _InterlockedAnd64(volatile __int64 * const value, const __int64 mask); #pragma intrinsic(_InterlockedAnd64) -long _InterlockedOr64(volatile __int64 * const value, const __int64 mask); +__int64 _InterlockedOr64(volatile __int64 * const value, const __int64 mask); #pragma intrinsic(_InterlockedOr64) __int64 _InterlockedCompareExchange64(volatile __int64 * const Destination, const __int64 Exchange, const __int64 Comperand); #pragma intrinsic(_InterlockedCompareExchange64) @@ -139,7 +134,7 @@ #pragma intrinsic(__addgsqword) #endif -//#if defined(_M_IX86) +#if defined(_M_IX86) /*** FS segment addressing ***/ void __writefsbyte(const unsigned long Offset, const unsigned char Data); #pragma intrinsic(__writefsbyte) @@ -165,7 +160,7 @@ #pragma intrinsic(__addfsword) void __addfsdword(const unsigned long Offset, const unsigned int Data); #pragma intrinsic(__addfsdword) -//#endif +#endif /*** Bit manipulation ***/ @@ -289,7 +284,12 @@ unsigned long __readcr0(void); unsigned long __readcr2(void); unsigned long __readcr3(void); -unsigned long __readcr4(void); +//unsigned long __readcr4(void); +//#pragma intrinsic(__readcr4) +// HACK: MSVC is broken +unsigned long ___readcr4(void); +#define __readcr4 ___readcr4 + unsigned int __readdr(unsigned int reg); void __writedr(unsigned reg, unsigned int value); #endif Modified: trunk/reactos/include/crt/sec_api/string_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/string… ============================================================================== --- trunk/reactos/include/crt/sec_api/string_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/string_s.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -21,6 +21,9 @@ _CRTIMP errno_t __cdecl _strnset_s(char *_Str,size_t _Size,int _Val,size_t _MaxCount); _CRTIMP errno_t __cdecl _strupr_s(char *_Str,size_t _Size); _CRTIMP errno_t __cdecl _strupr_s_l(char *_Str,size_t _Size,_locale_t _Locale); + _CRTIMP errno_t __cdecl strcpy_s(char *_Dst, size_t _Size, const char *_Src); + _CRTIMP errno_t __cdecl strcat_s(char *_Dst, size_t _Size, const char *_Src); + #ifndef _WSTRING_S_DEFINED #define _WSTRING_S_DEFINED _CRTIMP wchar_t *__cdecl wcstok_s(wchar_t *_Str,const wchar_t *_Delim,wchar_t **_Context); Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5065… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -7897,7 +7897,7 @@ { KIRQL OldIrql; - OldIrql = __readcr8(); + OldIrql = (KIRQL)__readcr8(); //ASSERT(OldIrql <= NewIrql); __writecr8(NewIrql); return OldIrql; @@ -9309,7 +9309,7 @@ ret64 = UnsignedMultiplyHigh(Pos ? Dividend.QuadPart : -Dividend.QuadPart, MagicDivisor.QuadPart); ret64 >>= ShiftCount; - ret.QuadPart = Pos ? ret64 : -ret64; + ret.QuadPart = Pos ? ret64 : -(LONG64)ret64; return ret; } #endif Modified: trunk/reactos/include/dxsdk/d3dx9shape.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9shape.h… ============================================================================== --- trunk/reactos/include/dxsdk/d3dx9shape.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/d3dx9shape.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -92,4 +92,4 @@ } #endif -#endif +#endif Modified: trunk/reactos/include/dxsdk/dmksctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmksctrl.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/dmksctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/dmksctrl.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -112,4 +112,4 @@ #pragma warning(pop) #endif -#endif +#endif Modified: trunk/reactos/include/dxsdk/dxsdkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdkver.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdkver.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/dxsdkver.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -7,4 +7,4 @@ #define _DXSDK_BUILD_MAJOR 91 #define _DXSDK_BUILD_MINOR 0000 -#endif +#endif Modified: trunk/reactos/include/dxsdk/pixplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/pixplugin.h?… ============================================================================== --- trunk/reactos/include/dxsdk/pixplugin.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/pixplugin.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -44,4 +44,4 @@ #ifdef __cplusplus }; -#endif +#endif Modified: trunk/reactos/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/umfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/umfuncs.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -157,6 +157,7 @@ IN HANDLE Process ); +NTSYSAPI NTSTATUS NTAPI DbgUiWaitStateChange( @@ -295,7 +296,7 @@ IN PVOID BaseAddress ); -typedef VOID NTAPI (*PLDR_CALLBACK)(PVOID CallbackContext, PVOID Name); +typedef VOID (NTAPI *PLDR_CALLBACK)(PVOID CallbackContext, PVOID Name); NTSTATUS NTAPI LdrVerifyImageMatchesChecksum( Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1,12 +1,3 @@ -; -; Created by : Marc Piulachs. -; This source code is offered for use in the public domain. -; - -; -; ntoskrnl.exe bug codes -; - MessageIdTypedef=ULONG SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS @@ -23,9 +14,6 @@ LanguageNames=(English=0x409:MSG00409) -; -; message definitions -; MessageId=0x7E Severity=Informational Facility=System @@ -1528,5 +1516,3 @@ Language=English An attempt was made to execute to non-executable memory. . - -; EOF Modified: trunk/reactos/include/reactos/mc/errcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/errcode… ============================================================================== --- trunk/reactos/include/reactos/mc/errcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/errcodes.mc [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1,7 +1,3 @@ -; -; kernel32.mc MESSAGE resources for kernel32.dll -; - MessageIdTypedef=ULONG SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS @@ -17,13 +13,6 @@ LanguageNames=(English=0x409:MSG00409) - -; -; message definitions -; - -; Facility=System - MessageId=0 Severity=Success Facility=System @@ -17172,8 +17161,6 @@ ERROR_EVT_CHANNEL_PATH_TOO_GENERAL - The specified channel path selects more than one instance of a channel. The operation requires that only one channel be selected. It may be necessary to scope channel path to version / publicKeyToken to select only one instance. . - -; Facility=WIN32 MessageId=0x000E Severity=Warning @@ -17208,8 +17195,6 @@ . -; Facility=ITF - MessageId=0x0000 Severity=Warning Facility=ITF @@ -17489,5 +17474,3 @@ Language=English CLASS_E_NOTLICENSED - Class is not licensed for use . - -; EOF Modified: trunk/reactos/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntstatu… ============================================================================== --- trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -20,7 +20,6 @@ ) LanguageNames=(English=0x409:MSG00409) -;#define STATUS_SUCCESS ((NTSTATUS)0x00000000L) MessageId=0x00 Severity=Success Facility=System Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -172,4 +172,4 @@ BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah); BOOL WINAPI UnregisterUserApiHook(VOID); -#endif +#endif Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -777,7 +777,9 @@ /* #undef HAVE_SYS_TIMES_H */ /* Define to 1 if you have the <sys/time.h> header file. */ -#define HAVE_SYS_TIME_H 1 +#ifndef _MSC_VER + #define HAVE_SYS_TIME_H 1 +#endif /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 Modified: trunk/reactos/include/reactos/wine/ddk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/ddk/i… ============================================================================== --- trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -2,7 +2,7 @@ #ifndef _WINE_IMM_H_ #define _WINE_IMM_H_ -#include <psdk/wingdi.h> +#include <wingdi.h> #ifdef WINE_NO_UNICODE_MACROS # define WINELIB_NAME_AW(func) \ Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -2630,7 +2630,7 @@ ret64 = UnsignedMultiplyHigh(Pos ? Dividend.QuadPart : -Dividend.QuadPart, MagicDivisor.QuadPart); ret64 >>= ShiftCount; - ret.QuadPart = Pos ? ret64 : -ret64; + ret.QuadPart = Pos ? ret64 : -(LONG64)ret64; return ret; } #endif Modified: trunk/reactos/lib/3rdparty/mingw/cinitexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/cinitex… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/cinitexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/cinitexe.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1,6 +1,10 @@ #include <stdio.h> #include <internal.h> #include <sect_attribs.h> + +#ifdef _MSC_VER +#pragma comment(linker, "/merge:.CRT=.rdata") +#endif _CRTALLOC(".CRT$XIA") _PVFV __xi_a[] = { NULL }; _CRTALLOC(".CRT$XIZ") _PVFV __xi_z[] = { NULL }; Modified: trunk/reactos/lib/3rdparty/mingw/crt_handler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt_han… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -16,7 +16,9 @@ #if defined (_WIN64) && defined (__ia64__) #error FIXME: Unsupported __ImageBase implementation. #else +#ifndef _MSC_VER #define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif /* This symbol is defined by the linker. */ extern IMAGE_DOS_HEADER __ImageBase; #endif Modified: trunk/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtexe.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -33,7 +33,10 @@ #endif /* Hack, for bug in ld. Will be removed soon. */ +#ifndef _MSC_VER #define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif + /* This symbol is defined by ld. */ extern IMAGE_DOS_HEADER __ImageBase; Modified: trunk/reactos/lib/3rdparty/mingw/merr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/merr.c?… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/merr.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/merr.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -50,4 +50,3 @@ type, pexcept->name, pexcept->arg1, pexcept->arg2, pexcept->retval); return 0; } - Modified: trunk/reactos/lib/3rdparty/mingw/pesect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pesect.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/pesect.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/pesect.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -11,7 +11,9 @@ #error FIXME: Unsupported __ImageBase implementation. #else /* Hack, for bug in ld. Will be removed soon. */ +#ifndef _MSC_VER #define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif /* This symbol is defined by the linker. */ extern IMAGE_DOS_HEADER __ImageBase; #endif Modified: trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pseudo-… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -46,7 +46,10 @@ extern char __RUNTIME_PSEUDO_RELOC_LIST__; extern char __RUNTIME_PSEUDO_RELOC_LIST_END__; -extern char __MINGW_LSYMBOL(_image_base__); +#ifndef _MSC_VER +#define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif +extern char __ImageBase; void _pei386_runtime_relocator (void); @@ -363,5 +366,5 @@ ++was_init; do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__, &__RUNTIME_PSEUDO_RELOC_LIST_END__, - &__MINGW_LSYMBOL(_image_base__)); + &__ImageBase); } Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1143,7 +1143,7 @@ /* Unlock the pushlock */ OldValue.Value = InterlockedExchangeAddSizeT((PSIZE_T)PushLock, - -(SIZE_T)EX_PUSH_LOCK_LOCK); + -(SSIZE_T)EX_PUSH_LOCK_LOCK); /* Sanity checks */ ASSERT(OldValue.Locked); Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -358,14 +358,14 @@ { /* The free was within the Depth */ InterlockedPushEntrySList(&List->L.ListHead, - (PSINGLE_LIST_ENTRY)Buffer); + (PSLIST_ENTRY)Buffer); } } else { /* The free was within the Depth */ InterlockedPushEntrySList(&List->L.ListHead, - (PSINGLE_LIST_ENTRY)Buffer); + (PSLIST_ENTRY)Buffer); } } Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -21,6 +21,7 @@ #endif #elif _MSC_VER #define UNREACHABLE __assume(0) +#define __builtin_expect(a,b) (a) #else #define UNREACHABLE #endif Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -549,7 +549,7 @@ if (ChargeQuota) Flags |= IRP_QUOTA_CHARGED; /* FIXME: Implement Lookaside Floats */ - + /* Figure out which Lookaside List to use */ if ((StackSize <= 8) && (ChargeQuota == FALSE)) { @@ -1832,7 +1832,7 @@ IoIs32bitProcess( IN PIRP Irp OPTIONAL) { -#pragma message IoIs32bitProcess is hardcoded to FALSE +#pragma message "IoIs32bitProcess is hardcoded to FALSE" return FALSE; } #endif Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -30,11 +30,6 @@ PDRIVER_OBJECT IopRootDriverObject; PIO_BUS_TYPE_GUID_LIST PnpBusTypeGuidList = NULL; - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, PnpInit) -#pragma alloc_text(INIT, PnpInit2) -#endif typedef struct _INVALIDATE_DEVICE_RELATION_DATA { Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -97,11 +97,13 @@ IN PMMADDRESS_NODE Parent, IN TABLE_SEARCH_RESULT Result) { + PMMVAD Vad; + /* Insert it into the tree */ RtlpInsertAvlTreeNode(Table, NewNode, Parent, Result); /* Now insert an ARM3 MEMORY_AREA for this node, unless the insert was already from the MEMORY_AREA code */ - PMMVAD Vad = (PMMVAD)NewNode; + Vad = (PMMVAD)NewNode; if (Vad->u.VadFlags.Spare == 0) { NTSTATUS Status; @@ -165,6 +167,8 @@ MiRemoveNode(IN PMMADDRESS_NODE Node, IN PMM_AVL_TABLE Table) { + PMMVAD Vad; + /* Call the AVL code */ RtlpDeleteAvlTreeNode(Table, Node); @@ -180,7 +184,7 @@ } /* Free the node from ReactOS view as well */ - PMMVAD Vad = (PMMVAD)Node; + Vad = (PMMVAD)Node; if (Vad->u.VadFlags.Spare == 0) { PMEMORY_AREA MemoryArea; Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=50… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -374,8 +374,9 @@ /* Build a lame VAD if this is a user-space allocation */ if ((marea->EndingAddress < MmSystemRangeStart) && (marea->Type != MEMORY_AREA_OWNED_BY_ARM3)) { + PMMVAD Vad; + ASSERT(marea->Type == MEMORY_AREA_VIRTUAL_MEMORY || marea->Type == MEMORY_AREA_SECTION_VIEW); - PMMVAD Vad; Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'Fake'); ASSERT(Vad); RtlZeroMemory(Vad, sizeof(MMVAD)); Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -29,7 +29,7 @@ #define DIR_SEPARATOR_CHAR '\\' #define DIR_SEPARATOR_STRING "\\" -#define strcasecmp _strcmpi +#define strcasecmp _stricmp #define strdup _strdup #define AllocateMemory(size) HeapAlloc(GetProcessHeap(), 0, size) @@ -80,7 +80,7 @@ #else /* DBG */ #undef DPRINT -#define DPRINT(_t_, _x_) +#define DPRINT(_t_, _x_) do { } while(0) #undef ASSERT #define ASSERT(_x_)

13 years, 10 months

[tkreuzer] 50649: [USB] Fix merge artifact

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 10 12:56:12 2011 New Revision: 50649 URL: http://svn.reactos.org/svn/reactos?rev=50649&view=rev Log: [USB] Fix merge artifact Modified: branches/cmake-bringup/drivers/usb/usbehci/usbehci.h Modified: branches/cmake-bringup/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/usbehci.h [iso-8859-1] Thu Feb 10 12:56:12 2011 @@ -17,7 +17,6 @@ #define DEVICEBUSY 0x04 #define DEVICESTOPPED 0x08 #define DEVICESTALLED 0x10 -#define DEVICEREMOVED 0x20 #define DEVICEREMOVED 0x20

13 years, 10 months

[tkreuzer] 50648: [RTL] Merge changes to rtl from cmake branch. Mostly use portable interlocked functions

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 10 11:47:17 2011 New Revision: 50648 URL: http://svn.reactos.org/svn/reactos?rev=50648&view=rev Log: [RTL] Merge changes to rtl from cmake branch. Mostly use portable interlocked functions Modified: trunk/reactos/lib/rtl/actctx.c trunk/reactos/lib/rtl/critical.c trunk/reactos/lib/rtl/largeint.c trunk/reactos/lib/rtl/rtl.h trunk/reactos/lib/rtl/srw.c trunk/reactos/lib/rtl/timerqueue.c trunk/reactos/lib/rtl/vectoreh.c trunk/reactos/lib/rtl/wait.c trunk/reactos/lib/rtl/workitem.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=50648… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -575,12 +575,12 @@ static inline void actctx_addref( ACTIVATION_CONTEXT *actctx ) { - _InterlockedExchangeAdd( &actctx->ref_count, 1 ); + InterlockedExchangeAdd( &actctx->ref_count, 1 ); } static void actctx_release( ACTIVATION_CONTEXT *actctx ) { - if (_InterlockedExchangeAdd( &actctx->ref_count, -1 ) == 1) + if (InterlockedExchangeAdd( &actctx->ref_count, -1 ) == 1) { unsigned int i, j; Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -59,15 +59,15 @@ /* We failed, this is bad... */ DPRINT1("Failed to Create Event!\n"); - _InterlockedDecrement(&CriticalSection->LockCount); + InterlockedDecrement(&CriticalSection->LockCount); RtlRaiseStatus(Status); return; } DPRINT("Created Event: %p \n", hNewEvent); - if (_InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, - (PVOID)hNewEvent, - 0)) { + if (InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, + (PVOID)hNewEvent, + 0)) { /* Some just created an event */ DPRINT("Closing already created event: %p\n", hNewEvent); @@ -437,7 +437,7 @@ HANDLE Thread = (HANDLE)NtCurrentTeb()->ClientId.UniqueThread; /* Try to Lock it */ - if (_InterlockedIncrement(&CriticalSection->LockCount) != 0) { + if (InterlockedIncrement(&CriticalSection->LockCount) != 0) { /* * We've failed to lock it! Does this thread @@ -621,7 +621,7 @@ if (--CriticalSection->RecursionCount) { /* Someone still owns us, but we are free. This needs to be done atomically. */ - _InterlockedDecrement(&CriticalSection->LockCount); + InterlockedDecrement(&CriticalSection->LockCount); } else { @@ -630,7 +630,7 @@ CriticalSection->OwningThread = 0; /* Was someone wanting us? This needs to be done atomically. */ - if (-1 != _InterlockedDecrement(&CriticalSection->LockCount)) { + if (-1 != InterlockedDecrement(&CriticalSection->LockCount)) { /* Let him have us */ RtlpUnWaitCriticalSection(CriticalSection); @@ -662,7 +662,7 @@ RtlTryEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { /* Try to take control */ - if (_InterlockedCompareExchange(&CriticalSection->LockCount, + if (InterlockedCompareExchange(&CriticalSection->LockCount, 0, -1) == -1) { @@ -674,7 +674,7 @@ } else if (CriticalSection->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { /* It's already ours */ - _InterlockedIncrement(&CriticalSection->LockCount); + InterlockedIncrement(&CriticalSection->LockCount); CriticalSection->RecursionCount++; return TRUE; } Modified: trunk/reactos/lib/rtl/largeint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/largeint.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/largeint.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/largeint.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -14,6 +14,40 @@ /* FUNCTIONS *****************************************************************/ +#undef RtlUlonglongByteSwap +#undef RtlUlongByteSwap +#undef RtlUshortByteSwap + +/* + * @implemented + */ +USHORT +FASTCALL +RtlUshortByteSwap(IN USHORT Source) +{ + return _byteswap_ushort(Source); +} + +/* + * @implemented + */ +ULONG +FASTCALL +RtlUlongByteSwap(IN ULONG Source) +{ + return _byteswap_ulong(Source); +} + +/* + * @implemented + */ +ULONGLONG +FASTCALL +RtlUlonglongByteSwap(IN ULONGLONG Source) +{ + return _byteswap_uint64(Source); +} + /* * @implemented */ Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=50648&r1… ============================================================================== --- trunk/reactos/lib/rtl/rtl.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.h [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -32,6 +32,17 @@ #include <intrin.h> +/* Use intrinsics for x86 and x64 */ +#if defined(_M_IX86) || defined(_M_AMD64) +#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedIncrement _InterlockedIncrement +#define InterlockedDecrement _InterlockedDecrement +#define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchange _InterlockedExchange +#define InterlockedBitTestAndSet _interlockedbittestandset +#define InterlockedBitTestAndSet64 _interlockedbittestandset64 +#endif + #endif /* RTL_H */ /* EOF */ Modified: trunk/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/srw.c?rev=50648&r1… ============================================================================== --- trunk/reactos/lib/rtl/srw.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/srw.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -131,7 +131,7 @@ } } - (void)_InterlockedExchangePointer(&SRWLock->Ptr, (PVOID)NewValue); + (void)InterlockedExchangePointer(&SRWLock->Ptr, (PVOID)NewValue); if (FirstWaitBlock->Exclusive) { @@ -186,7 +186,7 @@ NewValue = RTL_SRWLOCK_OWNED; } - (void)_InterlockedExchangePointer(&SRWLock->Ptr, (PVOID)NewValue); + (void)InterlockedExchangePointer(&SRWLock->Ptr, (PVOID)NewValue); (void)InterlockedOr(&FirstWaitBlock->Wake, TRUE); @@ -420,9 +420,9 @@ NewValue = (CurrentValue >> RTL_SRWLOCK_BITS) + 1; NewValue = (NewValue << RTL_SRWLOCK_BITS) | (CurrentValue & RTL_SRWLOCK_MASK); - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { /* Successfully incremented the shared count, we acquired the lock */ break; @@ -499,9 +499,9 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { RtlpAcquireSRWLockSharedWait(SRWLock, &StackWaitBlock, @@ -521,9 +521,9 @@ RTL_SRWLOCK_SHARED nor the RTL_SRWLOCK_OWNED bit is set */ ASSERT(!(CurrentValue & RTL_SRWLOCK_CONTENDED)); - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { /* Successfully set the shared count, we acquired the lock */ break; @@ -580,9 +580,9 @@ NewValue = (NewValue << RTL_SRWLOCK_BITS) | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED; } - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { /* Successfully released the lock */ break; @@ -639,9 +639,9 @@ NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENDED | RTL_SRWLOCK_OWNED; - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { RtlpAcquireSRWLockExclusiveWait(SRWLock, &StackWaitBlock); @@ -697,9 +697,9 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { RtlpAcquireSRWLockExclusiveWait(SRWLock, &StackWaitBlock); @@ -767,9 +767,9 @@ ASSERT(!(CurrentValue & ~RTL_SRWLOCK_OWNED)); NewValue = 0; - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { /* We released the lock */ break; Modified: trunk/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timerqueue.c?rev=5… ============================================================================== --- trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -372,7 +372,7 @@ NTSTATUS status = RtlCreateTimerQueue(&q); if (status == STATUS_SUCCESS) { - PVOID p = _InterlockedCompareExchangePointer( + PVOID p = InterlockedCompareExchangePointer( (void **) &default_timer_queue, q, NULL); if (p) /* Got beat to the punch. */ Modified: trunk/reactos/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/vectoreh.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -61,7 +61,7 @@ if (--veh->Refs == 0) { RemoveEntryList (&veh->ListEntry); - _InterlockedDecrement (&RtlpVectoredExceptionsInstalled); + InterlockedDecrement (&RtlpVectoredExceptionsInstalled); Remove = TRUE; } Ret = TRUE; @@ -74,7 +74,7 @@ { CurrentEntry = veh->ListEntry.Flink; RemoveEntryList (&veh->ListEntry); - _InterlockedDecrement (&RtlpVectoredExceptionsInstalled); + InterlockedDecrement (&RtlpVectoredExceptionsInstalled); RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); RtlFreeHeap(RtlGetProcessHeap(), @@ -136,7 +136,7 @@ InsertTailList(&RtlpVectoredExceptionHead, &veh->ListEntry); } - _InterlockedIncrement (&RtlpVectoredExceptionsInstalled); + InterlockedIncrement (&RtlpVectoredExceptionsInstalled); RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); } @@ -190,4 +190,23 @@ return Ret; } +PVOID +NTAPI +RtlAddVectoredContinueHandler( + IN ULONG FirstHandler, + IN PVECTORED_EXCEPTION_HANDLER VectoredHandler) +{ + UNIMPLEMENTED; + return NULL; +} + +ULONG +NTAPI +RtlRemoveVectoredContinueHandler( + IN PVOID VectoredHandlerHandle) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */ Modified: trunk/reactos/lib/rtl/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/wait.c?rev=50648&r… ============================================================================== --- trunk/reactos/lib/rtl/wait.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/wait.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -91,7 +91,7 @@ completion_event = Wait->CompletionEvent; if (completion_event) NtSetEvent( completion_event, NULL ); - if (_InterlockedIncrement( &Wait->DeleteCount ) == 2 ) + if (InterlockedIncrement( &Wait->DeleteCount ) == 2 ) { NtClose( Wait->CancelEvent ); RtlFreeHeap( RtlGetProcessHeap(), 0, Wait ); @@ -220,7 +220,7 @@ if (Status != STATUS_SUCCESS) return Status; - (void)_InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); + (void)InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); if (Wait->CallbackInProgress) NtWaitForSingleObject( CompletionEvent, FALSE, NULL ); @@ -229,7 +229,7 @@ } else { - (void)_InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); + (void)InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); if (Wait->CallbackInProgress) Status = STATUS_PENDING; @@ -239,7 +239,7 @@ Status = STATUS_PENDING; } - if (_InterlockedIncrement( &Wait->DeleteCount ) == 2 ) + if (InterlockedIncrement( &Wait->DeleteCount ) == 2 ) { Status = STATUS_SUCCESS; NtClose( Wait->CancelEvent ); Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/workitem.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -55,7 +55,7 @@ do { - InitStatus = _InterlockedCompareExchange(&ThreadPoolInitialized, + InitStatus = InterlockedCompareExchange(&ThreadPoolInitialized, 2, 0); if (InitStatus == 0) @@ -91,7 +91,7 @@ Finish: /* Initialization done */ - _InterlockedExchange(&ThreadPoolInitialized, + InterlockedExchange(&ThreadPoolInitialized, 1); break; } @@ -223,11 +223,11 @@ } /* update the requests counter */ - _InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); } } @@ -237,11 +237,11 @@ { NTSTATUS Status = STATUS_SUCCESS; - _InterlockedIncrement(&ThreadPoolWorkerThreadsRequests); + InterlockedIncrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedIncrement(&ThreadPoolWorkerThreadsLongRequests); + InterlockedIncrement(&ThreadPoolWorkerThreadsLongRequests); } if (WorkItem->Flags & WT_EXECUTEINPERSISTENTTHREAD) @@ -270,11 +270,11 @@ if (!NT_SUCCESS(Status)) { - _InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); } } @@ -351,11 +351,11 @@ } /* update the requests counter */ - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); } } @@ -461,14 +461,14 @@ ASSERT(IoThread != NULL); - _InterlockedIncrement(&ThreadPoolIOWorkerThreadsRequests); + InterlockedIncrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { /* We're about to queue a long function, mark the thread */ IoThread->Flags |= WT_EXECUTELONGFUNCTION; - _InterlockedIncrement(&ThreadPoolIOWorkerThreadsLongRequests); + InterlockedIncrement(&ThreadPoolIOWorkerThreadsLongRequests); } /* It's time to queue the work item */ @@ -480,11 +480,11 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to queue APC for work item 0x%p\n", WorkItem->Function); - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); } } @@ -543,7 +543,7 @@ BOOLEAN Terminate; NTSTATUS Status = STATUS_SUCCESS; - if (_InterlockedIncrement(&ThreadPoolIOWorkerThreads) > MAX_WORKERTHREADS) + if (InterlockedIncrement(&ThreadPoolIOWorkerThreads) > MAX_WORKERTHREADS) { /* Oops, too many worker threads... */ goto InitFailed; @@ -562,10 +562,10 @@ DPRINT1("Failed to create handle to own thread! Status: 0x%x\n", Status); InitFailed: - _InterlockedDecrement(&ThreadPoolIOWorkerThreads); + InterlockedDecrement(&ThreadPoolIOWorkerThreads); /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); RtlExitUserThread(Status); @@ -579,7 +579,7 @@ (PLIST_ENTRY)&ThreadInfo.ListEntry); /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); for (;;) @@ -626,7 +626,7 @@ if (Terminate) { /* Rundown the thread and unlink it from the list */ - _InterlockedDecrement(&ThreadPoolIOWorkerThreads); + InterlockedDecrement(&ThreadPoolIOWorkerThreads); RemoveEntryList((PLIST_ENTRY)&ThreadInfo.ListEntry); } @@ -663,10 +663,10 @@ PKNORMAL_ROUTINE ApcRoutine; NTSTATUS Status = STATUS_SUCCESS; - if (_InterlockedIncrement(&ThreadPoolWorkerThreads) > MAX_WORKERTHREADS) + if (InterlockedIncrement(&ThreadPoolWorkerThreads) > MAX_WORKERTHREADS) { /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); /* Oops, too many worker threads... */ @@ -675,7 +675,7 @@ } /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); for (;;) @@ -736,7 +736,7 @@ if (Terminate) { - _InterlockedDecrement(&ThreadPoolWorkerThreads); + InterlockedDecrement(&ThreadPoolWorkerThreads); Status = STATUS_SUCCESS; break; }

13 years, 10 months

[tkreuzer] 50647: Merge CRT changes from cmake branch (mainly MSVC compilation fixes)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 10 11:35:05 2011 New Revision: 50647 URL: http://svn.reactos.org/svn/reactos?rev=50647&view=rev Log: Merge CRT changes from cmake branch (mainly MSVC compilation fixes) Modified: trunk/reactos/lib/sdk/crt/except/cpp.c trunk/reactos/lib/sdk/crt/except/cppexcept.c trunk/reactos/lib/sdk/crt/except/except.c trunk/reactos/lib/sdk/crt/include/internal/file.h trunk/reactos/lib/sdk/crt/include/internal/time.h trunk/reactos/lib/sdk/crt/math/abs.c trunk/reactos/lib/sdk/crt/math/acos.c trunk/reactos/lib/sdk/crt/math/asin.c trunk/reactos/lib/sdk/crt/math/cosf.c trunk/reactos/lib/sdk/crt/math/cosh.c trunk/reactos/lib/sdk/crt/math/labs.c trunk/reactos/lib/sdk/crt/math/logf.c trunk/reactos/lib/sdk/crt/math/modf.c trunk/reactos/lib/sdk/crt/math/powf.c trunk/reactos/lib/sdk/crt/math/sinf.c trunk/reactos/lib/sdk/crt/math/sinh.c trunk/reactos/lib/sdk/crt/math/tanh.c trunk/reactos/lib/sdk/crt/mem/memcmp.c trunk/reactos/lib/sdk/crt/misc/assert.c trunk/reactos/lib/sdk/crt/stdlib/rot.c trunk/reactos/lib/sdk/crt/string/scanf.h trunk/reactos/lib/sdk/crt/string/strset.c trunk/reactos/lib/sdk/crt/string/wcs.c trunk/reactos/lib/sdk/crt/time/ctime.c trunk/reactos/lib/sdk/crt/time/futime.c trunk/reactos/lib/sdk/crt/time/utime.c Modified: trunk/reactos/lib/sdk/crt/except/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cpp.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -63,6 +63,10 @@ #define THISCALL(func) __thiscall_ ## func #define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) + +#ifdef _MSC_VER +#include <internal/wine_msc.h> +#else #define DEFINE_THISCALL_WRAPPER(func,args) \ extern void THISCALL(func)(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ @@ -70,6 +74,8 @@ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#endif /* _MSC_VER */ + #else /* __i386__ */ #define THISCALL(func) func @@ -658,6 +664,7 @@ /* vtables */ +#ifdef __GNUC__ #ifdef _WIN64 #define __ASM_VTABLE(name,funcs) \ @@ -700,6 +707,16 @@ #ifndef __GNUC__ } +#endif +#endif + +#ifdef _MSC_VER +#pragma message ("HAXX!") +const vtable_ptr MSVCRT_exception_vtable; +const vtable_ptr MSVCRT_bad_typeid_vtable; +const vtable_ptr MSVCRT_bad_cast_vtable; +const vtable_ptr MSVCRT___non_rtti_object_vtable; +const vtable_ptr MSVCRT_type_info_vtable; #endif /* Static RTTI for exported objects */ Modified: trunk/reactos/lib/sdk/crt/except/cppexcept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cppexce… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -45,6 +45,9 @@ { void *ret; int dummy; +#ifdef _MSC_VER +#pragma message ("call_ebp_func is unimplemented for MSC") +#else __asm__ __volatile__ ("pushl %%ebx\n\t" "pushl %%ebp\n\t" "movl %4,%%ebp\n\t" @@ -53,6 +56,7 @@ "popl %%ebx" : "=a" (ret), "=S" (dummy), "=D" (dummy) : "0" (func), "1" (ebp) : "ecx", "edx", "memory" ); +#endif return ret; } @@ -60,6 +64,9 @@ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); +#ifdef _MSC_VER +#pragma message ("call_copy_ctor is unimplemented for MSC") +#else if (has_vbase) /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ __asm__ __volatile__("pushl $1; pushl %2; call *%0" @@ -67,19 +74,28 @@ else __asm__ __volatile__("pushl %2; call *%0" : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); +#endif } /* call the destructor of the exception object */ static inline void call_dtor( void *func, void *object ) { +#ifdef _MSC_VER +#pragma message ("call_dtor is unimplemented for MSC") +#else __asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" ); +#endif } /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) { +#ifdef _MSC_VER +#pragma message ("continue_after_catch is unimplemented for MSC") +#else __asm__ __volatile__("movl -4(%0),%%esp; leal 12(%0),%%ebp; jmp *%1" : : "r" (frame), "a" (addr) ); +#endif for (;;) ; /* unreached */ } @@ -415,6 +431,14 @@ */ extern DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ); +#ifdef _MSC_VER +#pragma message ("__CxxFrameHandler is unimplemented for MSC") +DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, + PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ) +{ + return 0; +} +#else __ASM_GLOBAL_FUNC( __CxxFrameHandler, "pushl $0\n\t" /* nested_trylevel */ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -434,7 +458,7 @@ "add $28,%esp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -28\n\t") "ret" ) - +#endif /********************************************************************* * __CxxLongjmpUnwind (MSVCRT.@) Modified: trunk/reactos/lib/sdk/crt/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/except.… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/except.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/except.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -96,6 +96,57 @@ : "ecx", "edx", "memory" ); return ret; } +#elif defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4731) // Don't complain about changing ebp +void __inline call_finally_block( void *code_block, void *base_ptr ) +{ + __asm + { + mov eax, code_block + mov ebp, base_ptr + call [eax] + } +} + +int __inline call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *_ebp ) +{ + int _ret; + __asm + { + push ebp + mov eax, arg + push eax + mov ebp, _ebp + mov eax, func + call [eax] + mov _ret, eax + pop ebp + pop ebp + } + return _ret; +} +int __inline call_unwind_func( int (*func)(void), void *_ebp ) +{ + int _ret; + + __asm + { + push ebp + push ebx + push esi + push edi + mov ebp, _ebp + call dword ptr [func] + mov _ret, eax + pop edi + pop esi + pop ebx + pop ebp + } + return _ret; +} +#pragma warning(pop) #endif static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec, Modified: trunk/reactos/lib/sdk/crt/include/internal/file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/file.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/file.h [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -127,8 +127,6 @@ int _isnanl(long double x); int _isinfl(long double x); -int _isnan(double x); -int _isinf(double x); /* Flags for the iobuf structure (for reference) */ #if 0 Modified: trunk/reactos/lib/sdk/crt/include/internal/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/time.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/time.h [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -20,9 +20,9 @@ ULargeInt.HighPart = FileTime->dwHighDateTime; ULargeInt.QuadPart -= DIFFTIME; - time = ULargeInt.QuadPart / 10000000; + time = (time_t)(ULargeInt.QuadPart / 10000000); if (millitm) - *millitm = (ULargeInt.QuadPart % 10000000) / 10000; + *millitm = (USHORT)((ULargeInt.QuadPart % 10000000) / 10000); return time; } Modified: trunk/reactos/lib/sdk/crt/math/abs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/abs.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/abs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/abs.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -1,4 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ + +#ifdef _MSC_VER +#pragma warning(disable: 4164) +#pragma function(abs) +#endif /* * @implemented Modified: trunk/reactos/lib/sdk/crt/math/acos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/acos.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/acos.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/acos.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -21,6 +21,9 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(acos) +#endif double acos(double __x) { Modified: trunk/reactos/lib/sdk/crt/math/asin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/asin.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/asin.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/asin.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -21,6 +21,9 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(asin) +#endif double asin(double __x) { Modified: trunk/reactos/lib/sdk/crt/math/cosf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/cosf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/cosf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/cosf.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -3,7 +3,9 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ +#define cosf _dummy_cosf #include <math.h> +#undef cosf float cosf(float _X) { Modified: trunk/reactos/lib/sdk/crt/math/cosh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/cosh.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/cosh.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/cosh.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -1,6 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <math.h> +#ifdef _MSC_VER +#pragma function(cosh) +#endif /* * @implemented Modified: trunk/reactos/lib/sdk/crt/math/labs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/labs.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/labs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/labs.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -1,4 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ + +#ifdef _MSC_VER +#pragma warning(disable: 4164) +#pragma function(labs) +#endif /* * @implemented Modified: trunk/reactos/lib/sdk/crt/math/logf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/logf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/logf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/logf.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -3,7 +3,9 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ +#define logf _dummy_logf #include <math.h> +#undef logf float logf(float _X) { Modified: trunk/reactos/lib/sdk/crt/math/modf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/modf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/modf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/modf.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -9,8 +9,9 @@ * is preserved. * ==================================================== */ - +#define modfl _dummy_modfl #include <precomp.h> +#undef modfl //static const double one = 1.0; Modified: trunk/reactos/lib/sdk/crt/math/powf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/powf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/powf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/powf.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -3,7 +3,8 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include <math.h> + +double __cdecl pow(double x, double y); float powf(float x, float y) { Modified: trunk/reactos/lib/sdk/crt/math/sinf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/sinf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/sinf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/sinf.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -3,7 +3,9 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ +#define sinf _dummy_sinf #include <math.h> +#undef sinf float sinf(float _X) { Modified: trunk/reactos/lib/sdk/crt/math/sinh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/sinh.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/sinh.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/sinh.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -1,5 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <math.h> + +#ifdef _MSC_VER +#pragma function(sinh) +#endif /* * @implemented Modified: trunk/reactos/lib/sdk/crt/math/tanh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/tanh.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/tanh.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/tanh.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -1,6 +1,10 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <math.h> + +#ifdef _MSC_VER +#pragma function(tanh) +#endif /* * @implemented Modified: trunk/reactos/lib/sdk/crt/mem/memcmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memcmp.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memcmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memcmp.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -3,6 +3,11 @@ */ #include <string.h> + +#ifdef _MSC_VER +#pragma warning(disable: 4164) +#pragma function(memcmp) +#endif int memcmp(const void *s1, const void *s2, size_t n) { Modified: trunk/reactos/lib/sdk/crt/misc/assert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/assert.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -32,7 +32,7 @@ /* Get MessageBoxA function pointer */ hmodUser32 = LoadLibrary("user32.dll"); - pMessageBoxA = GetProcAddress(hmodUser32, "MessageBoxA"); + pMessageBoxA = (PVOID)GetProcAddress(hmodUser32, "MessageBoxA"); if (!pMessageBoxA) { abort(); Modified: trunk/reactos/lib/sdk/crt/stdlib/rot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/rot.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/rot.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/rot.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -9,6 +9,10 @@ */ #include <stdlib.h> + +#ifdef _MSC_VER +#pragma function(_rotr, _rotl, _rotr, _lrotl, _lrotr) +#endif unsigned int _rotr( unsigned int value, int shift ); /* Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -460,7 +460,7 @@ if ((*(format - 1)) < *(format + 1)) RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1)); else - RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); + RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); format++; } else RtlSetBits(&bitMask, *format, 1); Modified: trunk/reactos/lib/sdk/crt/string/strset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strset.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strset.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strset.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -10,6 +10,9 @@ #if defined(__GNUC__) && !defined(__clang__) #define __int64 long long +#elif defined(_MSC_VER) +#pragma warning(disable: 4164) +#pragma function(_strset) #endif #ifdef _WIN64 @@ -49,3 +52,4 @@ } return t; } + Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -47,6 +47,10 @@ #undef vprintf #undef vwprintf +#ifdef _MSC_VER +#pragma function(_wcsset) +#endif + #ifndef _LIBCNT_ /********************************************************************* * _wcsdup (MSVCRT.@) Modified: trunk/reactos/lib/sdk/crt/time/ctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/ctime.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -7,6 +7,7 @@ */ #define MINGW_HAS_SECURE_API 1 +#define RC_INVOKED 1 // to prevent inline functions #include <tchar.h> #include <time.h> #include "bitsfixup.h" Modified: trunk/reactos/lib/sdk/crt/time/futime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/futime.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/futime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/futime.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -6,6 +6,7 @@ * PROGRAMERS: Timo Kreuzer */ #include <precomp.h> +#define RC_INVOKED 1 // to prevent inline functions #include <time.h> #include <sys/utime.h> #include "bitsfixup.h" Modified: trunk/reactos/lib/sdk/crt/time/utime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/utime.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/utime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/utime.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -7,6 +7,7 @@ */ #include <precomp.h> #include <tchar.h> +#define RC_INVOKED 1 // to prevent inline functions #include <sys/utime.h> #include "bitsfixup.h"

13 years, 10 months

← Newer
1
...
26
27
28
29
30
31
32
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2011