Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 37358: - Don't define PAGE_SIZE in typedefs.h as -- "this value is target specific, host tools MUST not use it and this line has to be removed". Instead, define it locally for cmlib. - Also correct TRUE definition in this header
by sginsberg＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sginsberg Date: Fri Nov 14 08:49:11 2008 New Revision: 37358 URL: http://svn.reactos.org/svn/reactos?rev=37358&view=rev Log: - Don't define PAGE_SIZE in typedefs.h as -- "this value is target specific, host tools MUST not use it and this line has to be removed". Instead, define it locally for cmlib. - Also correct TRUE definition in this header Modified: trunk/reactos/include/host/typedefs.h trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Fri Nov 14 08:49:11 2008 @@ -40,11 +40,7 @@ #define OPTIONAL #define FALSE 0 -#define TRUE (!(FALSE)) - -/* FIXME: this value is target specific, host tools MUST not use it - * and this line has to be removed */ -#define PAGE_SIZE 4096 +#define TRUE 1 #define ANYSIZE_ARRAY 1 Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=3735… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Fri Nov 14 08:49:11 2008 @@ -101,6 +101,21 @@ #ifndef ROUND_UP #define ROUND_UP(a,b) ((((a)+(b)-1)/(b))*(b)) #define ROUND_DOWN(a,b) (((a)/(b))*(b)) +#endif + +// +// PAGE_SIZE definition +// +#ifndef PAGE_SIZE +#if defined(_M_IX86) +#define PAGE_SIZE 0x1000 +#elif defined(_M_AMD64) +#define PAGE_SIZE 0x1000 +#elif defined(_M_ARM) +#define PAGE_SIZE 0x1000 +#else +#error Local PAGE_SIZE definition required +#endif #endif #define TAG_CM 0x68742020

1 0

[fireball] 37357: 2008-10-18 Reece Dunn include: Fixed the tom constant values.
by fireball＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: fireball Date: Fri Nov 14 04:13:08 2008 New Revision: 37357 URL: http://svn.reactos.org/svn/reactos?rev=37357&view=rev Log: 2008-10-18 Reece Dunn include: Fixed the tom constant values. Modified: trunk/reactos/include/psdk/tom.idl Modified: trunk/reactos/include/psdk/tom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tom.idl?rev=3… ============================================================================== --- trunk/reactos/include/psdk/tom.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/tom.idl [iso-8859-1] Fri Nov 14 04:13:08 2008 @@ -32,8 +32,8 @@ tomApplyLater = 1, tomTrackParms = 2, tomCacheParms = 3, - tomBackward = 0xc00000001, - tomForward = 0x3ffffffff, + tomBackward = 0xc0000001, + tomForward = 0x3fffffff, tomMove = 0, tomExtend = 1, tomNoSelection = 0, @@ -161,21 +161,21 @@ tomText = 0x2, tomHTML = 0x3, tomWordDocument = 0x4, - tomBold = 0x800000001, - tomItalic = 0x800000002, - tomUnderline = 0x800000004, - tomStrikeout = 0x800000008, - tomProtected = 0x800000010, - tomLink = 0x800000020, - tomSmallCaps = 0x800000040, - tomAllCaps = 0x800000080, - tomHidden = 0x800000100, - tomOutline = 0x800000200, - tomShadow = 0x800000400, - tomEmboss = 0x800000800, - tomImprint = 0x800001000, - tomDisabled = 0x800002000, - tomRevised = 0x800004000, + tomBold = 0x80000001, + tomItalic = 0x80000002, + tomUnderline = 0x80000004, + tomStrikeout = 0x80000008, + tomProtected = 0x80000010, + tomLink = 0x80000020, + tomSmallCaps = 0x80000040, + tomAllCaps = 0x80000080, + tomHidden = 0x80000100, + tomOutline = 0x80000200, + tomShadow = 0x80000400, + tomEmboss = 0x80000800, + tomImprint = 0x80001000, + tomDisabled = 0x80002000, + tomRevised = 0x80004000, tomNormalCaret = 0, tomKoreanBlockCaret = 0x1, tomIncludeInset = 0x1,

1 0

[fireball] 37356: - Time to say goodbye to dosfsck port, it's been fully integrated into vfatlib, and the need in a standalone version disappeared.
by fireball＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: fireball Date: Fri Nov 14 03:35:59 2008 New Revision: 37356 URL: http://svn.reactos.org/svn/reactos?rev=37356&view=rev Log: - Time to say goodbye to dosfsck port, it's been fully integrated into vfatlib, and the need in a standalone version disappeared. Removed: trunk/rosapps/applications/sysutils/dosfsck/ Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/sysu… ============================================================================== --- trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] Fri Nov 14 03:35:59 2008 @@ -10,10 +10,6 @@ <directory name="chklib"> <xi:include href="chklib/chklib.rbuild" /> - </directory> - - <directory name="dosfsck"> - <xi:include href="dosfsck/dosfsck.rbuild" /> </directory> <directory name="gettype">

1 0

[sserapion] 37354: Kill auto-import insurgent.
by sserapion＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sserapion Date: Thu Nov 13 23:53:40 2008 New Revision: 37354 URL: http://svn.reactos.org/svn/reactos?rev=37354&view=rev Log: Kill auto-import insurgent. Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/stabs.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] Thu Nov 13 23:53:40 2008 @@ -62,8 +62,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); - -UINT64 _strtoui64( const char *nptr, char **endptr, int base ); #ifndef N_UNDF #define N_UNDF 0x00

1 0

[sserapion] 37353: Kill auto-import insurgent.
by sserapion＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sserapion Date: Thu Nov 13 23:53:00 2008 New Revision: 37353 URL: http://svn.reactos.org/svn/reactos?rev=37353&view=rev Log: Kill auto-import insurgent. Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/prototypes.h Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/prototypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/prototypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/prototypes.h [iso-8859-1] Thu Nov 13 23:53:00 2008 @@ -44,7 +44,6 @@ int sleep(int time); char *tail(); -int errno; char *mktemp(); void setbell(), setdebug(); void setglob(), sethash(), setport();

1 0

[sserapion] 37352: Correct definitions for WIN32 and WIN64.
by sserapion＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sserapion Date: Thu Nov 13 23:51:46 2008 New Revision: 37352 URL: http://svn.reactos.org/svn/reactos?rev=37352&view=rev Log: Correct definitions for WIN32 and WIN64. Modified: branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h Modified: branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h [iso-8859-1] Thu Nov 13 23:51:46 2008 @@ -140,7 +140,11 @@ #define ___int_ptrdiff_t_h #define _GCC_PTRDIFF_T #ifndef __PTRDIFF_TYPE__ -#define __PTRDIFF_TYPE__ long long int +# ifdef _WIN64 + #define __PTRDIFF_TYPE__ long long int +# else +# #define __PTRDIFF_TYPE__ long int +# endif #endif #ifndef _PTRDIFF_T_DEFINED #define _PTRDIFF_T_DEFINED @@ -204,7 +208,11 @@ #define __size_t #endif #ifndef __SIZE_TYPE__ -#define __SIZE_TYPE__ long long unsigned int +# ifdef _WIN64 +# define __SIZE_TYPE__ long long unsigned int +# else +# define __SIZE_TYPE__ long unsigned int +# endif #endif #if !(defined (__GNUG__) && defined (size_t)) typedef __SIZE_TYPE__ size_t; @@ -379,12 +387,12 @@ #endif /* NULL not defined and <stddef.h> or need NULL. */ #undef __need_NULL -#ifdef _STDDEF_H +#ifndef offsetof /* Offset of member MEMBER in a struct of type TYPE. */ #define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER) -#endif /* _STDDEF_H was defined this time */ +#endif /* !offsetof */ #endif /* !_STDDEF_H && !_STDDEF_H_ && !_ANSI_STDDEF_H && !__STDDEF_H__ || __need_XXX was not defined before */

1 0

[sserapion] 37351: Declare war, shock and awe, and utterly defeat auto-import in one day.
by sserapion＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sserapion Date: Thu Nov 13 23:49:21 2008 New Revision: 37351 URL: http://svn.reactos.org/svn/reactos?rev=37351&view=rev Log: Declare war, shock and awe, and utterly defeat auto-import in one day. Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h branches/ros-amd64-bringup/reactos/include/crt/stdio.h Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] Thu Nov 13 23:49:21 2008 @@ -22,28 +22,50 @@ #define __stdcall #endif -#ifndef __GNUC__ +#if defined(_MSC_VER) +# ifdef _DLL # ifndef __MINGW_IMPORT # define __MINGW_IMPORT __declspec(dllimport) # endif # ifndef _CRTIMP # define _CRTIMP __declspec(dllimport) # endif +# else +# ifndef __MINGW_IMPORT +# define __MINGW_IMPORT +# endif +# ifndef _CRTIMP +# define _CRTIMP +# endif +#endif # define __DECLSPEC_SUPPORTED # define __attribute__(x) /* nothing */ -#else /* __GNUC__ */ +# define __restrict__/* nothing */ +#elif defined(__GNUC__) # ifdef __declspec # ifndef __MINGW_IMPORT +# ifdef _DLL /* Note the extern. This is needed to work around GCC's limitations in handling dllimport attribute. */ # define __MINGW_IMPORT extern __attribute__ ((__dllimport__)) +# else +# define __MINGW_IMPORT extern +# endif # endif # ifndef _CRTIMP -# ifdef __USE_CRTIMP -# define _CRTIMP __attribute__ ((dllimport)) -# else -# define _CRTIMP -# endif +# undef __USE_CRTIMP +# if !defined (_CRTBLD) && !defined (_SYSCRT) +# define __USE_CRTIMP 1 +# endif +# ifdef __USE_CRTIMP +# ifdef _DLL +# define _CRTIMP __attribute__ ((dllimport)) +# else +# define _CRTIMP +# endif +# else +# define _CRTIMP +# endif # endif # define __DECLSPEC_SUPPORTED # else /* __declspec */ @@ -53,6 +75,15 @@ # define _CRTIMP # endif # endif /* __declspec */ +#else +# ifndef __MINGW_IMPORT +# define __MINGW_IMPORT __declspec(dllimport) +# endif +# ifndef _CRTIMP +# define _CRTIMP __declspec(dllimport) +# endif +# define __DECLSPEC_SUPPORTED +# define __attribute__(x)/* nothing */ #endif #if defined (__GNUC__) && defined (__GNUC_MINOR__) @@ -63,12 +94,22 @@ #define __MINGW_GNUC_PREREQ(major, minor) 0 #endif +#if defined (_MSC_VER) +#define __MINGW_MSC_PREREQ(major,minor) \ + ((_MSC_VER /100) > (major) \ + || ((_MSC)VER /100) == (major) && (_MSC_VER) % 100) >=(minor))) +#else +#define __MINGW_MSC_PREREQ(major, minor) 0 +#endif + #define USE___UUIDOF 0 #ifdef __cplusplus # define __CRT_INLINE inline #else -# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# if defined(_MSC_VER) +# define __CRT_INLINE __inline +# elif __GNUC_STDC_INLINE__ # define __CRT_INLINE extern inline __attribute__((__gnu_inline__)) # else # define __CRT_INLINE extern __inline__ @@ -88,6 +129,9 @@ #ifdef __GNUC__ #define __MINGW_ATTRIB_NORETURN __attribute__ ((__noreturn__)) #define __MINGW_ATTRIB_CONST __attribute__ ((__const__)) +#elif __MINGW_MSC_PREREQ(12, 0) +#define __MINGW_ATTRIB_NORETURN __declspec(noreturn) +#define __MINGW_ATTRIB_CONST #else #define __MINGW_ATTRIB_NORETURN #define __MINGW_ATTRIB_CONST @@ -112,15 +156,22 @@ #if __MINGW_GNUC_PREREQ (3, 1) #define __MINGW_ATTRIB_DEPRECATED __attribute__ ((__deprecated__)) +#elif __MINGW_MSC_PREREQ(12, 0) +#define __MINGW_ATTRIB_DEPRECATED __declspec(deprecated) #else #define __MINGW_ATTRIB_DEPRECATED -#endif /* GNUC >= 3.1 */ +#endif #if __MINGW_GNUC_PREREQ (3, 3) #define __MINGW_NOTHROW __attribute__ ((__nothrow__)) +#elif __MINGW_MSC_PREREQ(12, 0) && defined (__cplusplus) +#define __MINGW_NOTHROW __declspec(nothrow) #else #define __MINGW_NOTHROW -#endif /* GNUC >= 3.3 */ +#endif + +/* TODO: Mark (almost) all CRT functions as __MINGW_NOTHROW. This will +allow GCC to optimize away some EH unwind code, at least in DW2 case. */ #ifndef __MSVCRT_VERSION__ /* High byte is the major version, low byte is the minor. */ Modified: branches/ros-amd64-bringup/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/stdio.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/stdio.h [iso-8859-1] Thu Nov 13 23:49:21 2008 @@ -242,9 +242,10 @@ #if __MINGW_GNUC_PREREQ(4,4) #pragma push_macro("vsnprintf") #pragma push_macro("snprintf") +#endif #undef vsnprintf #undef snprintf -#endif + extern #ifdef gnu_printf __attribute__((format(gnu_printf, 3, 0))) __attribute__((nonnull (3))) @@ -261,14 +262,7 @@ int __cdecl sprintf(char *_Dest,const char *_Format,...); int __cdecl vsprintf(char *_Dest,const char *_Format,va_list _Args); #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ - __CRT_INLINE int __cdecl snprintf(char* s, size_t n, const char* format, ...) { - int r; - va_list a; - __mingw_va_start(a, format); - r = _vsnprintf (s, n, format, a); - __mingw_va_end(a); - return r; - } + int __cdecl snprintf(char* s, size_t n, const char* format, ...); __CRT_INLINE int __cdecl vsnprintf (char* s, size_t n, const char* format,va_list arg) { return _vsnprintf ( s, n, format, arg); }

1 0

[cgutman] 37350: - Fail if we aren't in the right state
by cgutman＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: cgutman Date: Thu Nov 13 20:43:36 2008 New Revision: 37350 URL: http://svn.reactos.org/svn/reactos?rev=37350&view=rev Log: - Fail if we aren't in the right state Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Thu Nov 13 20:43:36 2008 @@ -110,7 +110,7 @@ TDI_QUERY_ADDRESS_INFO, Mdl ); } else { - if( FCB->Connection.Object == NULL ) { + if( FCB->Connection.Object == NULL || (FCB->State != SOCKET_STATE_BOUND && FCB->State != SOCKET_STATE_CONNECTED) ) { return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); }

1 0

[cgutman] 37349: - Enable some code that works now
by cgutman＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: cgutman Date: Thu Nov 13 20:31:03 2008 New Revision: 37349 URL: http://svn.reactos.org/svn/reactos?rev=37349&view=rev Log: - Enable some code that works now Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Thu Nov 13 20:31:03 2008 @@ -592,14 +592,9 @@ AdapterBinding->NdisOpenBlock.RequestCompleteHandler = Protocol->Chars.RequestCompleteHandler; -#if 0 - /* XXX this looks fishy */ - /* OK, this really *is* fishy - it bugchecks */ /* Put on protocol's bound adapters list */ ExInterlockedInsertTailList(&Protocol->AdapterListHead, &AdapterBinding->ProtocolListEntry, &Protocol->Lock); -#endif - - /* XXX so does this */ + /* Put protocol on adapter's bound protocols list */ NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); ExInterlockedInsertTailList(&Adapter->ProtocolListHead, &AdapterBinding->AdapterListEntry, &Adapter->NdisMiniportBlock.Lock);

1 0

[cgutman] 37348: - Fix protocol binding
by cgutman＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: cgutman Date: Thu Nov 13 18:54:26 2008 New Revision: 37348 URL: http://svn.reactos.org/svn/reactos?rev=37348&view=rev Log: - Fix protocol binding Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Thu Nov 13 18:54:26 2008 @@ -610,7 +610,8 @@ } VOID -ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PPROTOCOL_BINDING Protocol, IN PNDIS_PROTOCOL_CHARACTERISTICS ProtocolCharacteristics) +NTAPI +ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PNDIS_PROTOCOL_CHARACTERISTICS ProtocolCharacteristics) { /* * bind the protocol to all of its miniports @@ -845,13 +846,19 @@ InitializeListHead(&Protocol->AdapterListHead); - ndisBindMiniportsToProtocol(Status, Protocol, ProtocolCharacteristics); + /* We must set this before the call to ndisBindMiniportsToProtocol because the protocol's + * BindAdapter handler might need it */ + + *NdisProtocolHandle = Protocol; + + ndisBindMiniportsToProtocol(Status, &Protocol->Chars); if (*Status == NDIS_STATUS_SUCCESS) { ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); - *NdisProtocolHandle = Protocol; - } else + } else { ExFreePool(Protocol); + *NdisProtocolHandle = NULL; + } } @@ -970,7 +977,7 @@ PPROTOCOL_BINDING Protocol = NdisProtocolHandle; NDIS_STATUS NdisStatus; - ndisBindMiniportsToProtocol(&NdisStatus, Protocol, &Protocol->Chars); + ndisBindMiniportsToProtocol(&NdisStatus, &Protocol->Chars); } /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs