Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[aandrejevic] 67704: [FAST486] For regular protected mode interrupts, the TF and NT flags should be cleared.
by aandrejevic＠svn.reactos.org 13 May '15

13 May '15

Author: aandrejevic Date: Wed May 13 03:00:54 2015 New Revision: 67704 URL: http://svn.reactos.org/svn/reactos?rev=67704&view=rev Log: [FAST486] For regular protected mode interrupts, the TF and NT flags should be cleared. Modified: trunk/reactos/lib/fast486/common.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Wed May 13 03:00:54 2015 @@ -428,6 +428,9 @@ State->InstPtr.LowWord = IdtEntry->Offset; } + /* Clear TF and NT */ + State->Flags.Tf = State->Flags.Nt = FALSE; + if (OldVm) { /* Push GS, FS, DS and ES */

1 0

[aandrejevic] 67703: [FAST486] Addendum to r67702.
by aandrejevic＠svn.reactos.org 12 May '15

12 May '15

Author: aandrejevic Date: Tue May 12 21:37:10 2015 New Revision: 67703 URL: http://svn.reactos.org/svn/reactos?rev=67703&view=rev Log: [FAST486] Addendum to r67702. Modified: trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Tue May 12 21:37:10 2015 @@ -635,12 +635,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xF8); - /* No prefixes allowed */ - if (State->PrefixFlags) - { - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); /* Clear CF and return success */ State->Flags.Cf = FALSE; @@ -651,12 +646,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xF9); - /* No prefixes allowed */ - if (State->PrefixFlags) - { - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); /* Set CF and return success*/ State->Flags.Cf = TRUE; @@ -667,12 +657,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xF5); - /* No prefixes allowed */ - if (State->PrefixFlags) - { - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); /* Toggle CF and return success */ State->Flags.Cf = !State->Flags.Cf; @@ -684,12 +669,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFA); - /* No prefixes allowed */ - if (State->PrefixFlags) - { - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); /* Check for protected mode */ if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) @@ -719,12 +699,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFB); - /* No prefixes allowed */ - if (State->PrefixFlags) - { - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); /* Check for protected mode */ if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) @@ -754,12 +729,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFC); - /* No prefixes allowed */ - if (State->PrefixFlags) - { - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); /* Clear DF */ State->Flags.Df = FALSE; @@ -770,12 +740,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFD); - /* No prefixes allowed */ - if (State->PrefixFlags) - { - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); /* Set DF */ State->Flags.Df = TRUE; @@ -786,12 +751,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xF4); - /* No prefixes allowed */ - if (State->PrefixFlags) - { - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); /* Privileged instructions can only be executed under CPL = 0 */ if (Fast486GetCurrentPrivLevel(State) != 0)

1 0

[aandrejevic] 67702: [FAST486] Superfluous prefixes don't usually generate #UD, except for LOCK.
by aandrejevic＠svn.reactos.org 12 May '15

12 May '15

Author: aandrejevic Date: Tue May 12 20:08:39 2015 New Revision: 67702 URL: http://svn.reactos.org/svn/reactos?rev=67702&view=rev Log: [FAST486] Superfluous prefixes don't usually generate #UD, except for LOCK. Modified: trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Tue May 12 20:08:39 2015 @@ -1046,12 +1046,7 @@ /* Make sure this is the right instruction */ ASSERT((Opcode & 0xF8) == 0xB0); - if (State->PrefixFlags != 0) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); /* Fetch the byte */ if (!Fast486FetchByte(State, &Value)) @@ -1211,12 +1206,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x04); - if (State->PrefixFlags) - { - /* This opcode doesn't take any prefixes */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); if (!Fast486FetchByte(State, &SecondValue)) { @@ -1437,12 +1427,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x0C); - if (State->PrefixFlags) - { - /* This opcode doesn't take any prefixes */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); if (!Fast486FetchByte(State, &SecondValue)) { @@ -1872,12 +1857,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x34); - if (State->PrefixFlags) - { - /* This opcode doesn't take any prefixes */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); if (!Fast486FetchByte(State, &SecondValue)) { @@ -2073,12 +2053,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xA8); - if (State->PrefixFlags) - { - /* This opcode doesn't take any prefixes */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); if (!Fast486FetchByte(State, &SecondValue)) { @@ -2454,12 +2429,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x14); - if (State->PrefixFlags) - { - /* This opcode doesn't take any prefixes */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); if (!Fast486FetchByte(State, &SecondValue)) { @@ -2746,12 +2716,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x1C); - if (State->PrefixFlags) - { - /* This opcode doesn't take any prefixes */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); if (!Fast486FetchByte(State, &SecondValue)) { @@ -3073,12 +3038,7 @@ /* Make sure this is the right instruction */ ASSERT((Opcode & 0xEF) == 0x2C); - if (State->PrefixFlags) - { - /* This opcode doesn't take any prefixes */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return; - } + NO_LOCK_PREFIX(); if (!Fast486FetchByte(State, &SecondValue)) {

1 0

[dreimer] 67701: [REGEXPL] Reenable for amd64
by dreimer＠svn.reactos.org 12 May '15

12 May '15

Author: dreimer Date: Tue May 12 19:16:30 2015 New Revision: 67701 URL: http://svn.reactos.org/svn/reactos?rev=67701&view=rev Log: [REGEXPL] Reenable for amd64 Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Tue May 12 19:16:30 2015 @@ -7,9 +7,7 @@ add_subdirectory(lsdd) add_subdirectory(man) add_subdirectory(pedump) -if(ARCH STREQUAL "i386") - add_subdirectory(regexpl) -endif() +add_subdirectory(regexpl) add_subdirectory(rosddt) add_subdirectory(screenshot) add_subdirectory(systeminfo)

1 0

[dreimer] 67700: [C++] Add amd64 version of r64555. Suggested and reviewed by Thomas Faber
by dreimer＠svn.reactos.org 12 May '15

12 May '15

Author: dreimer Date: Tue May 12 19:16:03 2015 New Revision: 67700 URL: http://svn.reactos.org/svn/reactos?rev=67700&view=rev Log: [C++] Add amd64 version of r64555. Suggested and reviewed by Thomas Faber Modified: trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s Modified: trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/amd64/cpprt.… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s [iso-8859-1] Tue May 12 19:16:03 2015 @@ -7,13 +7,19 @@ ALIAS <&alias> = <&orig> ENDM -; void __cdecl `eh vector constructor iterator'(void *,unsigned __int64,int,void (__cdecl*)(void *),void (__cdecl*)(void *)) +; void __cdecl `eh vector constructor iterator'(void * __ptr64,unsigned __int64,int,void (__cdecl*)(void * __ptr64),void (__cdecl*)(void * __ptr64)) DEFINE_ALIAS ??_L@YAXPEAX_KHP6AX0@Z2@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YAXPEAX_KHP6AX0@Z2@Z -; void __cdecl `eh vector destructor iterator'(void *,unsigned __int64,int,void (__cdecl*)(void *)) +; void __cdecl `eh vector destructor iterator'(void * __ptr64,unsigned __int64,int,void (__cdecl*)(void * __ptr64)) DEFINE_ALIAS ??_M@YAXPEAX_KHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z ; These are the same DEFINE_ALIAS __CxxFrameHandler3, __CxxFrameHandler +; void __cdecl operator delete(void * __ptr64,struct std::nothrow_t const & __ptr64) +DEFINE_ALIAS ??3@YAXPEAXAEBUnothrow_t@std@@@Z, ??3@YAXPEAX@Z + +; void __cdecl operator delete[](void * __ptr64,struct std::nothrow_t const & __ptr64) +DEFINE_ALIAS ??_V@YAXPEAXAEBUnothrow_t@std@@@Z, ??3@YAXPEAX@Z + END

1 0

[aandrejevic] 67699: Fix build. Forgot a file.
by aandrejevic＠svn.reactos.org 12 May '15

12 May '15

Author: aandrejevic Date: Tue May 12 19:11:53 2015 New Revision: 67699 URL: http://svn.reactos.org/svn/reactos?rev=67699&view=rev Log: Fix build. Forgot a file. Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Tue May 12 19:11:53 2015 @@ -529,6 +529,7 @@ BOOLEAN IntSignaled; BOOLEAN DoNotInterrupt; PULONG Tlb; + BOOLEAN TlbEmpty; #ifndef FAST486_NO_PREFETCH BOOLEAN PrefetchValid; ULONG PrefetchAddress;

1 0

[aandrejevic] 67698: [FAST486] - Only flush the TLB when needed. - Flush the TLB after a reset.
by aandrejevic＠svn.reactos.org 12 May '15

12 May '15

Author: aandrejevic Date: Tue May 12 19:10:52 2015 New Revision: 67698 URL: http://svn.reactos.org/svn/reactos?rev=67698&view=rev Log: [FAST486] - Only flush the TLB when needed. - Flush the TLB after a reset. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/extraops.c trunk/reactos/lib/fast486/fast486.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Tue May 12 19:10:52 2015 @@ -834,7 +834,7 @@ } /* Flush the TLB */ - if (State->Tlb) RtlFillMemory(State->Tlb, NUM_TLB_ENTRIES * sizeof(ULONG), 0xFF); + Fast486FlushTlb(State); /* Update the CPL */ if (NewTssLimit >= (sizeof(FAST486_TSS) - 1)) State->Cpl = GET_SEGMENT_RPL(NewTss.Cs); Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Tue May 12 19:10:52 2015 @@ -138,10 +138,21 @@ { /* Set the TLB entry */ State->Tlb[VirtualAddress >> 12] = TableEntry.Value; + State->TlbEmpty = FALSE; } /* Return the table entry */ return TableEntry.Value; +} + +FORCEINLINE +VOID +FASTCALL +Fast486FlushTlb(PFAST486_STATE State) +{ + if (!State->Tlb || State->TlbEmpty) return; + RtlFillMemory(State->Tlb, NUM_TLB_ENTRIES * sizeof(ULONG), 0xFF); + State->TlbEmpty = TRUE; } FORCEINLINE Modified: trunk/reactos/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.c [iso-8859-1] Tue May 12 19:10:52 2015 @@ -640,10 +640,10 @@ State->PrefetchValid = FALSE; #endif - if (State->Tlb && (ModRegRm.Register == (INT)FAST486_REG_CR3)) + if (ModRegRm.Register == (INT)FAST486_REG_CR3) { /* Flush the TLB */ - RtlFillMemory(State->Tlb, NUM_TLB_ENTRIES * sizeof(ULONG), 0xFF); + Fast486FlushTlb(State); } /* Load a value to the control register */ Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Tue May 12 19:10:52 2015 @@ -284,6 +284,9 @@ State->IntAckCallback = IntAckCallback; State->FpuCallback = FpuCallback; State->Tlb = Tlb; + + /* Flush the TLB */ + Fast486FlushTlb(State); } VOID

1 0

[dreimer] 67697: [REDEXPL] This is evil under amd64, too... so we disable it for now. [ROSHTTPD] UINT -> size_t [NCFTP] About time to clean this mess. Are we a Unix? No sir!
by dreimer＠svn.reactos.org 12 May '15

12 May '15

Author: dreimer Date: Tue May 12 18:14:39 2015 New Revision: 67697 URL: http://svn.reactos.org/svn/reactos?rev=67697&view=rev Log: [REDEXPL] This is evil under amd64, too... so we disable it for now. [ROSHTTPD] UINT -> size_t [NCFTP] About time to clean this mess. Are we a Unix? No sir! Modified: trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h trunk/rosapps/applications/net/ncftp/ncftp/getline.c trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h trunk/rosapps/applications/net/ncftp/sio/syshdrs.h trunk/rosapps/applications/net/roshttpd/common/list.cpp trunk/rosapps/applications/net/roshttpd/include/list.h trunk/rosapps/applications/sysutils/CMakeLists.txt Modified: trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/lib… ============================================================================== --- trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h [iso-8859-1] Tue May 12 18:14:39 2015 @@ -9,7 +9,6 @@ # include <config.h> #endif -#if defined(WIN32) || defined(_WINDOWS) # include "wincfg.h" # include <winsock2.h> /* Includes <windows.h> */ //# include <shlobj.h> @@ -56,77 +55,6 @@ # endif # define NO_SIGNALS 1 # define USE_SIO 1 -#else /* UNIX */ - -#if defined(AIX) || defined(_AIX) -# define _ALL_SOURCE 1 -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/time.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <sys/wait.h> -#if !defined(HAVE_GETCWD) && defined(HAVE_GETWD) -# include <sys/param.h> -#endif - -#include <netinet/in.h> -#include <arpa/inet.h> -#include <arpa/telnet.h> -#include <netdb.h> -#include <errno.h> -#include <stdio.h> -#include <string.h> -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif -#include <stddef.h> -#include <stdlib.h> -#include <ctype.h> -#include <signal.h> -#include <setjmp.h> -#include <stdarg.h> -#include <time.h> -#include <pwd.h> -#include <dirent.h> -#include <fcntl.h> - -#ifdef HAVE_NET_ERRNO_H -# include <net/errno.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif -#ifdef HAVE_NSERVE_H -# include <nserve.h> -#endif -#ifdef HAVE_RESOLV_H -# include <resolv.h> -#endif -#ifdef CAN_USE_SYS_SELECT_H -# include <sys/select.h> -#endif - -#ifdef HAVE_GETCWD -# ifndef HAVE_UNISTD_H - extern char *getcwd(); -# endif -#else -# ifdef HAVE_GETWD -# include <sys/param.h> -# ifndef MAXPATHLEN -# define MAXPATHLEN 1024 -# endif - extern char *getwd(char *); -# endif -#endif - -#endif /* UNIX */ - #if defined(HAVE_LONG_LONG) && defined(HAVE_OPEN64) # define Open open64 Modified: trunk/rosapps/applications/net/ncftp/ncftp/getline.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf… ============================================================================== --- trunk/rosapps/applications/net/ncftp/ncftp/getline.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/ncftp/getline.c [iso-8859-1] Tue May 12 18:14:39 2015 @@ -20,7 +20,6 @@ static const char copyright[] = "getline: Copyright (C) 1991, 1992, 1993, Chris Thewalt"; -#if defined(WIN32) || defined(_WINDOWS) # include <windows.h> # include <sys/types.h> # include <sys/stat.h> @@ -59,54 +58,6 @@ # define UNC_PATH_PREFIX "\\\\" # define IsUNCPrefixed(s) (IsLocalPathDelim(s[0]) && IsLocalPathDelim(s[1])) # define __windows__ 1 -#else -# ifndef __unix__ -# define __unix__ 1 -# endif -# if defined(AIX) || defined(_AIX) -# define _ALL_SOURCE 1 -# endif -# if defined(HAVE_CONFIG_H) -# include <config.h> -# else -# /* guess */ -# define HAVE_TERMIOS_H 1 -# define HAVE_UNISTD_H 1 -# endif -# ifdef HAVE_UNISTD_H -# include <unistd.h> -# endif -# include <sys/types.h> -# include <sys/time.h> -# include <sys/stat.h> -# ifdef CAN_USE_SYS_SELECT_H -# include <sys/select.h> -# endif -# include <fcntl.h> -# include <errno.h> -# include <dirent.h> -# include <pwd.h> -# ifdef HAVE_TERMIOS_H /* use HAVE_TERMIOS_H interface */ -# include <termios.h> - struct termios new_termios, old_termios; -# else /* not HAVE_TERMIOS_H */ -# include <sys/ioctl.h> -# ifdef TIOCSETN /* use BSD interface */ -# include <sgtty.h> - struct sgttyb new_tty, old_tty; - struct tchars tch; - struct ltchars ltch; -# else /* use SYSV interface */ -# include <termio.h> - struct termio new_termio, old_termio; -# endif /* TIOCSETN */ -# endif /* HAVE_TERMIOS_H */ -# define LOCAL_PATH_DELIM '/' -# define LOCAL_PATH_DELIM_STR "/" -# define _StrFindLocalPathDelim(a) strchr(a, LOCAL_PATH_DELIM) -# define _StrRFindLocalPathDelim(a) strrchr(a, LOCAL_PATH_DELIM) -# define IsLocalPathDelim(c) (c == LOCAL_PATH_DELIM) -#endif /********************* C library headers ********************************/ Modified: trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf… ============================================================================== --- trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h [iso-8859-1] Tue May 12 18:14:39 2015 @@ -9,7 +9,6 @@ # include <config.h> #endif -#if defined(WIN32) || defined(_WINDOWS) # define SELECT_TYPE_ARG1 int # define SELECT_TYPE_ARG234 (fd_set *) # define SELECT_TYPE_ARG5 (struct timeval *) @@ -84,68 +83,6 @@ # define FOPEN_WRITE_TEXT "wt" # define FOPEN_APPEND_TEXT "at" # endif -#else /* UNIX */ -# if defined(AIX) || defined(_AIX) -# define _ALL_SOURCE 1 -# endif -# ifdef HAVE_UNISTD_H -# include <unistd.h> -# endif -# include <sys/types.h> -# include <sys/stat.h> -# include <sys/socket.h> -# include <sys/wait.h> -# ifdef CAN_USE_SYS_SELECT_H -# include <sys/select.h> -# endif -# if defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME) -# include <sys/utsname.h> -# endif -# include <netinet/in.h> -# include <arpa/inet.h> -# include <netdb.h> -# include <errno.h> -# include <stdio.h> -# include <string.h> -# ifdef HAVE_STRINGS_H -# include <strings.h> -# endif -# include <stddef.h> -# include <stdlib.h> -# include <ctype.h> -# include <signal.h> -# include <setjmp.h> -# include <stdarg.h> -# include <assert.h> -# include <time.h> -# include <pwd.h> -# include <fcntl.h> -# if defined(HAVE_SYS_IOCTL_H) && defined(HAVE_TERMIOS_H) -# include <sys/ioctl.h> -# include <termios.h> -# endif -# ifdef HAVE_LOCALE_H -# include <locale.h> -# endif -# ifdef HAVE_GETCWD -# ifndef HAVE_UNISTD_H - extern char *getcwd(); -# endif -# else -# ifdef HAVE_GETWD -# include <sys/param.h> -# ifndef MAXPATHLEN -# define MAXPATHLEN 1024 -# endif - extern char *getwd(char *); -# endif -# endif -# ifndef FOPEN_READ_TEXT -# define FOPEN_READ_TEXT "r" -# define FOPEN_WRITE_TEXT "w" -# define FOPEN_APPEND_TEXT "a" -# endif -#endif /* UNIX */ #ifndef STDIN_FILENO # define STDIN_FILENO 0 Modified: trunk/rosapps/applications/net/ncftp/sio/syshdrs.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/sio… ============================================================================== --- trunk/rosapps/applications/net/ncftp/sio/syshdrs.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/sio/syshdrs.h [iso-8859-1] Tue May 12 18:14:39 2015 @@ -9,12 +9,10 @@ # include "config.h" #endif -#if defined(WIN32) || defined(_WINDOWS) /* Include "wincfg.h" in place of "config.h" */ # include "wincfg.h" # include <winsock2.h> /* includes <windows.h> */ # include <io.h> -//# define _POSIX_ 1 # ifdef HAVE_UNISTD_H # include <unistd.h> # endif @@ -56,77 +54,6 @@ # endif # define NO_SIGNALS 1 # define NO_UNIX_DOMAIN_SOCKETS 1 -#else /* UNIX */ - -#if defined(AIX) || defined(_AIX) -# define _ALL_SOURCE 1 -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <sys/types.h> -#include <sys/time.h> -#include <sys/stat.h> -#include <sys/socket.h> -#include <sys/un.h> -#include <sys/ioctl.h> -#if !defined(HAVE_GETCWD) && defined(HAVE_GETWD) -# include <sys/param.h> -#endif - -#include <netinet/in.h> -#include <netinet/tcp.h> -#include <arpa/inet.h> -#include <arpa/telnet.h> -#include <netdb.h> -#include <errno.h> -#include <stdio.h> -#include <string.h> -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif -#include <stddef.h> -#include <stdlib.h> -#include <ctype.h> -#include <signal.h> -#include <setjmp.h> -#include <stdarg.h> -#include <time.h> -#include <fcntl.h> - -#ifdef HAVE_NET_ERRNO_H -# include <net/errno.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif -#ifdef HAVE_NSERVE_H -# include <nserve.h> -#endif -#ifdef HAVE_RESOLV_H -# include <resolv.h> -#endif -#ifdef CAN_USE_SYS_SELECT_H -# include <sys/select.h> -#endif - -#ifdef HAVE_GETCWD -# ifndef HAVE_UNISTD_H - extern char *getcwd(); -# endif -#else -# ifdef HAVE_GETWD -# include <sys/param.h> -# ifndef MAXPATHLEN -# define MAXPATHLEN 1024 -# endif - extern char *getwd(char *); -# endif -#endif - -#define HAVE_RECVMSG 1 - -#endif /* UNIX */ #if defined(HAVE_LONG_LONG) && defined(HAVE_OPEN64) # define Open open64 Modified: trunk/rosapps/applications/net/roshttpd/common/list.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/roshttpd/… ============================================================================== --- trunk/rosapps/applications/net/roshttpd/common/list.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/net/roshttpd/common/list.cpp [iso-8859-1] Tue May 12 18:14:39 2015 @@ -34,7 +34,7 @@ Prev = prev; } -void* CListNode::operator new(/*size_t*/ UINT size) +void* CListNode::operator new(size_t size) { PVOID p; if (hHeap == NULL) { Modified: trunk/rosapps/applications/net/roshttpd/include/list.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/roshttpd/… ============================================================================== --- trunk/rosapps/applications/net/roshttpd/include/list.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/roshttpd/include/list.h [iso-8859-1] Tue May 12 18:14:39 2015 @@ -14,7 +14,7 @@ CListNode(); CListNode(VOID *element, CListNode *next, CListNode *prev); ~CListNode() {}; - void* operator new(/*size_t s*/ UINT s); + void* operator new(size_t s); VOID operator delete(void* p); VOID SetElement(PVOID element); Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Tue May 12 18:14:39 2015 @@ -7,7 +7,9 @@ add_subdirectory(lsdd) add_subdirectory(man) add_subdirectory(pedump) -add_subdirectory(regexpl) +if(ARCH STREQUAL "i386") + add_subdirectory(regexpl) +endif() add_subdirectory(rosddt) add_subdirectory(screenshot) add_subdirectory(systeminfo)

1 0

[dreimer] 67696: [OLEAUT32] Wine guys... if you put all stuff which uses one local variable in a #ifdef __i386__, then god heaven... put that one in a #ifdef, too! Should be sent upstream!
by dreimer＠svn.reactos.org 12 May '15

12 May '15

Author: dreimer Date: Tue May 12 18:09:04 2015 New Revision: 67696 URL: http://svn.reactos.org/svn/reactos?rev=67696&view=rev Log: [OLEAUT32] Wine guys... if you put all stuff which uses one local variable in a #ifdef __i386__, then god heaven... put that one in a #ifdef, too! Should be sent upstream! Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] Tue May 12 18:09:04 2015 @@ -1714,7 +1714,9 @@ /* nrofargs including This */ int nrofargs = 1; ITypeInfo *tinfo2; +#ifdef __i386__ TMAsmProxy *xasm = proxy->asmstubs + num; +#endif HRESULT hres; const FUNCDESC *fdesc;

1 0

[aandrejevic] 67695: [FAST486] Fix TLB flushing. An unused entry should be INVALID_TLB_ENTRY (0xFFFFFFFF) and not 0.
by aandrejevic＠svn.reactos.org 12 May '15

12 May '15

Author: aandrejevic Date: Tue May 12 17:09:16 2015 New Revision: 67695 URL: http://svn.reactos.org/svn/reactos?rev=67695&view=rev Log: [FAST486] Fix TLB flushing. An unused entry should be INVALID_TLB_ENTRY (0xFFFFFFFF) and not 0. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/extraops.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Tue May 12 17:09:16 2015 @@ -834,7 +834,7 @@ } /* Flush the TLB */ - if (State->Tlb) RtlZeroMemory(State->Tlb, NUM_TLB_ENTRIES * sizeof(ULONG)); + if (State->Tlb) RtlFillMemory(State->Tlb, NUM_TLB_ENTRIES * sizeof(ULONG), 0xFF); /* Update the CPL */ if (NewTssLimit >= (sizeof(FAST486_TSS) - 1)) State->Cpl = GET_SEGMENT_RPL(NewTss.Cs); Modified: trunk/reactos/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.c [iso-8859-1] Tue May 12 17:09:16 2015 @@ -643,7 +643,7 @@ if (State->Tlb && (ModRegRm.Register == (INT)FAST486_REG_CR3)) { /* Flush the TLB */ - RtlZeroMemory(State->Tlb, NUM_TLB_ENTRIES * sizeof(ULONG)); + RtlFillMemory(State->Tlb, NUM_TLB_ENTRIES * sizeof(ULONG), 0xFF); } /* Load a value to the control register */

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015