ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merging fixes from Visual C++ branch

Browse Source 
modified   include/psdk/rpcndr.h
   Mask argument before casting in NdrFcShort

modified   include/psdk/winternl.h
   Visual C++-compatible placement of function attribute

modified   include/reactos/wine/port.h
   Visual C++ has interlocked intrinsics, too

modified   lib/3rdparty/adns/adns_win32/adns_unix_calls.c
modified   lib/3rdparty/adns/src/setup.c
   alloca -> _alloca

modified   lib/3rdparty/libwine/debug.c
   Fix a benign range check warning

modified   lib/3rdparty/libwine/debug_ros.c
   Properly decorate malloc replacement

modified   lib/3rdparty/libwine/string.c
   The actual function is called _stricmp

modified   lib/3rdparty/mingw/wcrt1.c
   Visual C++ support

svn path=/trunk/; revision=37659
This commit is contained in:
KJK::Hyperion
2008-11-26 14:28:19 +00:00
parent 9bd1f294f3
commit d29825fe8f
9 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/include/psdk/rpcndr.h
+1 -1
View File
@@ -111,7 +111,7 @@ typedef unsigned char boolean;
#define midl_user_free MIDL_user_free
#define midl_user_allocate MIDL_user_allocate
#define NdrFcShort(s) (unsigned char)(s & 0xff), (unsigned char)(s >> 8)
#define NdrFcShort(s) (unsigned char)(s & 0xff), (unsigned char)((s & 0xff00) >> 8)
#define NdrFcLong(s) (unsigned char)(s & 0xff), (unsigned char)((s & 0x0000ff00) >> 8), \
(unsigned char)((s & 0x00ff0000) >> 16), (unsigned char)(s >> 24)
reactos/include/psdk/winternl.h
+1 -1
View File
@@ -1987,7 +1987,7 @@ BOOL WINAPI RtlEqualPrefixSid(PSID,PSID);
BOOL WINAPI RtlEqualSid(PSID,PSID);
BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN);
BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);
void WINAPI RtlExitUserThread(ULONG) DECLSPEC_NORETURN;
DECLSPEC_NORETURN void WINAPI RtlExitUserThread(ULONG);
NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*);
LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT);
LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT);
reactos/include/reactos/wine/port.h
+1 -1
View File
@@ -326,7 +326,7 @@ extern int spawnvp(int mode, const char *cmdname, const char * const argv[]);
/* Interlocked functions */
#if defined(__i386__) && defined(__GNUC__) && !defined(WINE_PORT_NO_INTERLOCKED)
#if defined(_MSC_VER) || (defined(__i386__) && defined(__GNUC__) && !defined(WINE_PORT_NO_INTERLOCKED))
#define interlocked_cmpxchg InterlockedCompareExchange
#define interlocked_cmpxchg_ptr InterlockedCompareExchangePtr