[ros-diffs] [hyperion] 37200: Big grab bag commit modified dll/cpl/appwiz-new/appwiz.rc modified dll/cpl/appwiz/appwiz.rc modified dll/cpl/appwiz/createlink.c Don't blame the compiler for the build environment modified dll/win32/advapi32/advapi32.h modified dll/win32/advapi32/service/sctrl.c GetExceptionCode -> _SEH_GetExceptionCode modified dll/win32/advapi32/reg/reg.c Two TRACE statements were printing the wrong value. Spotted by Visual C++ modified include/crt/msc/stddef.h Implemented offsetof modified i

Author: hyperion
Date: Wed Nov  5 04:02:13 2008
New Revision: 37200

URL: http://svn.reactos.org/svn/reactos?rev=37200&view=rev
Log:
Big grab bag commit

modified   dll/cpl/appwiz-new/appwiz.rc
modified   dll/cpl/appwiz/appwiz.rc
modified   dll/cpl/appwiz/createlink.c
   Don't blame the compiler for the build environment

modified   dll/win32/advapi32/advapi32.h
modified   dll/win32/advapi32/service/sctrl.c
   GetExceptionCode -> _SEH_GetExceptionCode

modified   dll/win32/advapi32/reg/reg.c
   Two TRACE statements were printing the wrong value. Spotted by Visual C++

modified   include/crt/msc/stddef.h
   Implemented offsetof

modified   include/ddk/tdikrnl.h
modified   include/psdk/winternl.h
   Use the correct placement of extended attributes

modified   include/psdk/rpc.h
   Disable SEH for all compilers. Our build environment only supports PSEH at the moment

modified   include/psdk/rpcndr.h
   Mask before casting in NdrFcShort. Fixes a warning in Visual C++

modified   include/reactos/wine/port.h
   Enable interlocked intrinsics for Visual C++ too

modified   lib/3rdparty/adns/adns_win32/adns_unix_calls.c
modified   lib/3rdparty/adns/src/setup.c
   alloca is called _alloca

modified   lib/3rdparty/adns/src/internal.h
   Removed broken workaround

modified   lib/3rdparty/libwine/debug.c
   Fix a Visual C++ warning

modified   lib/3rdparty/libwine/debug_ros.c
   Add the proper decorations to libwine_malloc & libwine_free

modified   lib/3rdparty/libwine/string.c
   strcasecmp is inlined in the headers as a stub that calls _stricmp: define _stricmp
instead

Modified:
    branches/the-real-msvc/dll/cpl/appwiz-new/appwiz.rc
    branches/the-real-msvc/dll/cpl/appwiz/appwiz.rc
    branches/the-real-msvc/dll/cpl/appwiz/createlink.c
    branches/the-real-msvc/dll/win32/advapi32/advapi32.h
    branches/the-real-msvc/dll/win32/advapi32/reg/reg.c
    branches/the-real-msvc/dll/win32/advapi32/service/sctrl.c
    branches/the-real-msvc/include/crt/msc/stddef.h
    branches/the-real-msvc/include/ddk/tdikrnl.h
    branches/the-real-msvc/include/psdk/rpc.h
    branches/the-real-msvc/include/psdk/rpcndr.h
    branches/the-real-msvc/include/psdk/winternl.h
    branches/the-real-msvc/include/reactos/wine/port.h
    branches/the-real-msvc/lib/3rdparty/adns/adns_win32/adns_unix_calls.c
    branches/the-real-msvc/lib/3rdparty/adns/src/internal.h
    branches/the-real-msvc/lib/3rdparty/adns/src/setup.c
    branches/the-real-msvc/lib/3rdparty/libwine/debug.c
    branches/the-real-msvc/lib/3rdparty/libwine/debug_ros.c
    branches/the-real-msvc/lib/3rdparty/libwine/string.c

Modified: branches/the-real-msvc/dll/cpl/appwiz-new/appwiz.rc
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/cpl/appwiz-ne…
==============================================================================
--- branches/the-real-msvc/dll/cpl/appwiz-new/appwiz.rc [iso-8859-1] (original)
+++ branches/the-real-msvc/dll/cpl/appwiz-new/appwiz.rc [iso-8859-1] Wed Nov  5 04:02:13
2008
@@ -7,11 +7,7 @@
 #define REACTOS_STR_FILE_DESCRIPTION      "ReactOS Software Control Panel\0"
 #define REACTOS_STR_INTERNAL_NAME         "appwiz\0"
 #define REACTOS_STR_ORIGINAL_FILENAME     "appwiz.cpl\0"
-#ifdef _MSC_VER
-#include <../../../reactos/version.rc>
-#else
 #include <reactos/version.rc>
-#endif
 
 IDI_CPLSYSTEM         ICON "resources/applet.ico"
 IDI_APPICO            ICON "resources/1501.ico"

Modified: branches/the-real-msvc/dll/cpl/appwiz/appwiz.rc
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/cpl/appwiz/ap…
==============================================================================
--- branches/the-real-msvc/dll/cpl/appwiz/appwiz.rc [iso-8859-1] (original)
+++ branches/the-real-msvc/dll/cpl/appwiz/appwiz.rc [iso-8859-1] Wed Nov  5 04:02:13 2008
@@ -7,11 +7,7 @@
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Software Control Panel\0"
 #define REACTOS_STR_INTERNAL_NAME	"appwiz\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"appwiz.cpl\0"
-#ifdef _MSC_VER
-#include <../../../reactos/version.rc>
-#else
 #include <reactos/version.rc>
-#endif
 
 IDI_CPLSYSTEM ICON "resources/applet.ico"
 IDI_APPICO ICON "resources/1501.ico"

Modified: branches/the-real-msvc/dll/cpl/appwiz/createlink.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/cpl/appwiz/cr…
==============================================================================
--- branches/the-real-msvc/dll/cpl/appwiz/createlink.c [iso-8859-1] (original)
+++ branches/the-real-msvc/dll/cpl/appwiz/createlink.c [iso-8859-1] Wed Nov  5 04:02:13
2008
@@ -129,11 +129,7 @@
                         LoadStringW(hApplet, IDS_ERROR_NOT_FOUND, szPath, MAX_PATH) <
MAX_PATH)
                     {
                         WCHAR szError[MAX_PATH + 100];
-#ifdef _MSC_VER
-                        _swprintf(szError, szPath, pContext->szTarget);
-#else
                         swprintf(szError, szPath, pContext->szTarget);
-#endif
                         MessageBoxW(hwndDlg, szError, szDesc, MB_ICONERROR);
                     }
                     SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0,
-1);

Modified: branches/the-real-msvc/dll/win32/advapi32/advapi32.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/advapi3…
==============================================================================
--- branches/the-real-msvc/dll/win32/advapi32/advapi32.h [iso-8859-1] (original)
+++ branches/the-real-msvc/dll/win32/advapi32/advapi32.h [iso-8859-1] Wed Nov  5 04:02:13
2008
@@ -12,6 +12,9 @@
 
 /* C Headers */
 #include <stdio.h>
+#include <stdlib.h>
+
+#include <pseh/pseh.h>
 
 /* PSDK/NDK Headers */
 #define WIN32_NO_STATUS

Modified: branches/the-real-msvc/dll/win32/advapi32/reg/reg.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/advapi3…
==============================================================================
--- branches/the-real-msvc/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original)
+++ branches/the-real-msvc/dll/win32/advapi32/reg/reg.c [iso-8859-1] Wed Nov  5 04:02:13
2008
@@ -1925,7 +1925,7 @@
  * NOTES
  *  - Unless RRF_NOEXPAND is specified, REG_EXPAND_SZ values are automatically
  *    expanded and pdwType is set to REG_SZ instead.
- *  - Restrictions are applied after expanding, using RRF_RT_REG_EXPAND_SZ 
+ *  - Restrictions are applied after expanding, using RRF_RT_REG_EXPAND_SZ
  *    without RRF_NOEXPAND is thus not allowed.
  *    An exception is the case where RRF_RT_ANY is specified, because then
  *    RRF_NOEXPAND is allowed.
@@ -2027,7 +2027,7 @@
  * See RegGetValueW.
  */
 LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue,
-                          DWORD dwFlags, LPDWORD pdwType, PVOID pvData, 
+                          DWORD dwFlags, LPDWORD pdwType, PVOID pvData,
                           LPDWORD pcbData )
 {
     DWORD dwType, cbData = pcbData ? *pcbData : 0;
@@ -3905,7 +3905,7 @@
     static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data );
 
     TRACE("(%p,%s,%p,%p,%p,%p=%d)\n",
-          hkey, debugstr_w(name), reserved, type, data, count,
+          hkeyorg, debugstr_w(name), reserved, type, data, count,
           (count && data) ? *count : 0 );
 
     if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER;
@@ -4826,7 +4826,7 @@
     DWORD ret;
     NTSTATUS Status;
 
-    TRACE("(%p,%s,%d,%s,%d)\n", hKey, debugstr_a(lpSubKey), dwType,
debugstr_a(lpData), cbData );
+    TRACE("(%p,%s,%d,%s,%d)\n", hKeyOriginal, debugstr_a(lpSubKey), dwType,
debugstr_a(lpData), cbData );
 
     if (dwType != REG_SZ || !lpData) return ERROR_INVALID_PARAMETER;
 

Modified: branches/the-real-msvc/dll/win32/advapi32/service/sctrl.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/advapi3…
==============================================================================
--- branches/the-real-msvc/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original)
+++ branches/the-real-msvc/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Wed Nov  5
04:02:13 2008
@@ -552,7 +552,7 @@
     }
     _SEH_HANDLE
     {
-        SetLastError(ScmRpcStatusToWinError(RpcExceptionCode()));
+        SetLastError(ScmRpcStatusToWinError(_SEH_GetExceptionCode()));
         bResult = FALSE;
     }
     _SEH_END;
@@ -588,7 +588,7 @@
     }
     _SEH_HANDLE
     {
-        SetLastError(ScmRpcStatusToWinError(RpcExceptionCode()));
+        SetLastError(ScmRpcStatusToWinError(_SEH_GetExceptionCode()));
         bResult = FALSE;
     }
     _SEH_END;

Modified: branches/the-real-msvc/include/crt/msc/stddef.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/crt/msc/s…
==============================================================================
--- branches/the-real-msvc/include/crt/msc/stddef.h [iso-8859-1] (original)
+++ branches/the-real-msvc/include/crt/msc/stddef.h [iso-8859-1] Wed Nov  5 04:02:13 2008
@@ -413,7 +413,7 @@
 #ifdef _STDDEF_H
 
 /* Offset of member MEMBER in a struct of type TYPE. */
-#define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER)
+#define offsetof(TYPE, MEMBER) ((size_t)&(((TYPE *)0)->MEMBER))
 
 #endif /* _STDDEF_H was defined this time */
 

Modified: branches/the-real-msvc/include/ddk/tdikrnl.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/ddk/tdikr…
==============================================================================
--- branches/the-real-msvc/include/ddk/tdikrnl.h [iso-8859-1] (original)
+++ branches/the-real-msvc/include/ddk/tdikrnl.h [iso-8859-1] Wed Nov  5 04:02:13 2008
@@ -160,8 +160,8 @@
 #define TDI_EVENT_CHAINED_RECEIVE_EXPEDITED 9
 #define TDI_EVENT_ERROR_EX                  10
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_CONNECT)(
+typedef NTSTATUS
+(DDKAPI*PTDI_IND_CONNECT)(
   IN PVOID  TdiEventContext,
   IN LONG  RemoteAddressLength,
   IN PVOID  RemoteAddress,
@@ -186,8 +186,8 @@
   OUT CONNECTION_CONTEXT *ConnectionContext,
   OUT PIRP  *AcceptIrp);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_DISCONNECT)(
+typedef NTSTATUS
+(DDKAPI*PTDI_IND_DISCONNECT)(
   IN PVOID  TdiEventContext,
   IN CONNECTION_CONTEXT  ConnectionContext,
   IN LONG  DisconnectDataLength,
@@ -208,13 +208,13 @@
   IN PVOID  DisconnectInformation,
   IN ULONG  DisconnectFlags);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_ERROR)(
+typedef NTSTATUS
+(DDKAPI*PTDI_IND_ERROR)(
   IN PVOID  TdiEventContext,
   IN NTSTATUS  Status);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_ERROR_EX)(
+typedef NTSTATUS
+(DDKAPI*PTDI_IND_ERROR_EX)(
   IN PVOID  TdiEventContext,
   IN NTSTATUS  Status,
   IN PVOID  Buffer);
@@ -226,8 +226,8 @@
   IN PVOID  TdiEventContext,
   IN NTSTATUS  Status);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_RECEIVE)(
+typedef NTSTATUS
+(DDKAPI*PTDI_IND_RECEIVE)(
   IN PVOID  TdiEventContext,
   IN CONNECTION_CONTEXT  ConnectionContext,
   IN ULONG  ReceiveFlags,
@@ -250,8 +250,8 @@
   IN PVOID  Tsdu,
   OUT PIRP  *IoRequestPacket);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_RECEIVE_DATAGRAM)(
+typedef NTSTATUS
+(DDKAPI*PTDI_IND_RECEIVE_DATAGRAM)(
   IN PVOID  TdiEventContext,
   IN LONG  SourceAddressLength,
   IN PVOID  SourceAddress,
@@ -279,8 +279,8 @@
   IN PVOID  Tsdu,
   OUT PIRP  *IoRequestPacket);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_RECEIVE_EXPEDITED)(
+typedef NTSTATUS
+(DDKAPI*PTDI_IND_RECEIVE_EXPEDITED)(
   IN PVOID  TdiEventContext,
   IN CONNECTION_CONTEXT  ConnectionContext,
   IN ULONG  ReceiveFlags,
@@ -303,8 +303,8 @@
   IN PVOID  Tsdu,
   OUT PIRP  *IoRequestPacket);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_CHAINED_RECEIVE)(
+typedef NTSTATUS
+(DDKAPI*PTDI_IND_CHAINED_RECEIVE)(
   IN PVOID  TdiEventContext,
   IN CONNECTION_CONTEXT  ConnectionContext,
   IN ULONG  ReceiveFlags,
@@ -325,8 +325,8 @@
   IN PMDL  Tsdu,
   IN PVOID  TsduDescriptor);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_CHAINED_RECEIVE_DATAGRAM)(
+typedef NTSTATUS
+(DDKAPI*PTDI_IND_CHAINED_RECEIVE_DATAGRAM)(
   IN PVOID  TdiEventContext,
   IN LONG  SourceAddressLength,
   IN PVOID  SourceAddress,
@@ -353,8 +353,8 @@
   IN PMDL  Tsdu,
   IN PVOID  TsduDescriptor);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_CHAINED_RECEIVE_EXPEDITED)(
+typedef NTSTATUS
+(DDKAPI*PTDI_IND_CHAINED_RECEIVE_EXPEDITED)(
   IN PVOID  TdiEventContext,
   IN CONNECTION_CONTEXT  ConnectionContext,
   IN ULONG  ReceiveFlags,
@@ -375,8 +375,8 @@
   IN PMDL  Tsdu,
   IN PVOID  TsduDescriptor);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_SEND_POSSIBLE)(
+typedef NTSTATUS
+(DDKAPI*PTDI_IND_SEND_POSSIBLE)(
   IN PVOID  TdiEventContext,
   IN PVOID  ConnectionContext,
   IN ULONG  BytesAvailable);
@@ -870,49 +870,49 @@
   UCHAR  ContextData[1];
 } TDI_PNP_CONTEXT, *PTDI_PNP_CONTEXT;
 
-typedef VOID DDKAPI
-(*TDI_ADD_ADDRESS_HANDLER)(
+typedef VOID
+(DDKAPI*TDI_ADD_ADDRESS_HANDLER)(
   IN PTA_ADDRESS  Address);
 
-typedef VOID DDKAPI
-(*TDI_ADD_ADDRESS_HANDLER_V2)(
+typedef VOID
+(DDKAPI*TDI_ADD_ADDRESS_HANDLER_V2)(
   IN PTA_ADDRESS  Address,
   IN PUNICODE_STRING  DeviceName,
   IN PTDI_PNP_CONTEXT  Context);
 
-typedef VOID DDKAPI
-(*TDI_BINDING_HANDLER)(
+typedef VOID
+(DDKAPI*TDI_BINDING_HANDLER)(
   IN TDI_PNP_OPCODE  PnPOpcode,
   IN PUNICODE_STRING  DeviceName,
   IN PWSTR  MultiSZBindList);
 
-typedef VOID DDKAPI
-(*TDI_BIND_HANDLER)(
+typedef VOID
+(DDKAPI*TDI_BIND_HANDLER)(
   IN PUNICODE_STRING  DeviceName);
 
-typedef VOID DDKAPI
-(*TDI_DEL_ADDRESS_HANDLER)(
+typedef VOID
+(DDKAPI*TDI_DEL_ADDRESS_HANDLER)(
   IN PTA_ADDRESS  Address);
 
-typedef VOID DDKAPI
-(*TDI_DEL_ADDRESS_HANDLER_V2)(
+typedef VOID
+(DDKAPI*TDI_DEL_ADDRESS_HANDLER_V2)(
   IN PTA_ADDRESS  Address,
   IN PUNICODE_STRING  DeviceName,
   IN PTDI_PNP_CONTEXT  Context);
 
-typedef NTSTATUS DDKAPI
-(*TDI_PNP_POWER_HANDLER)(
+typedef NTSTATUS
+(DDKAPI*TDI_PNP_POWER_HANDLER)(
   IN PUNICODE_STRING  DeviceName,
   IN PNET_PNP_EVENT  PowerEvent,
   IN PTDI_PNP_CONTEXT  Context1,
   IN PTDI_PNP_CONTEXT  Context2);
 
-typedef VOID DDKAPI
-(*TDI_UNBIND_HANDLER)(
+typedef VOID
+(DDKAPI*TDI_UNBIND_HANDLER)(
   IN PUNICODE_STRING  DeviceName);
 
-typedef VOID DDKAPI
-(*ProviderPnPPowerComplete)(
+typedef VOID
+(DDKAPI*ProviderPnPPowerComplete)(
   IN PNET_PNP_EVENT  NetEvent,
   IN NTSTATUS  ProviderStatus);
 

Modified: branches/the-real-msvc/include/psdk/rpc.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/rpc.…
==============================================================================
--- branches/the-real-msvc/include/psdk/rpc.h [iso-8859-1] (original)
+++ branches/the-real-msvc/include/psdk/rpc.h [iso-8859-1] Wed Nov  5 04:02:13 2008
@@ -127,7 +127,7 @@
     #include <excpt.h>
     #include <winerror.h>
 
-    #ifndef __GNUC__
+    #if 0
         #define RpcTryExcept __try {
         #define RpcExcept(expr) } __except (expr) {
         #define RpcEndExcept }

Modified: branches/the-real-msvc/include/psdk/rpcndr.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/rpcn…
==============================================================================
--- branches/the-real-msvc/include/psdk/rpcndr.h [iso-8859-1] (original)
+++ branches/the-real-msvc/include/psdk/rpcndr.h [iso-8859-1] Wed Nov  5 04:02:13 2008
@@ -111,7 +111,7 @@
 #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)
 

Modified: branches/the-real-msvc/include/psdk/winternl.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/wint…
==============================================================================
--- branches/the-real-msvc/include/psdk/winternl.h [iso-8859-1] (original)
+++ branches/the-real-msvc/include/psdk/winternl.h [iso-8859-1] Wed Nov  5 04:02:13 2008
@@ -1990,7 +1990,7 @@
 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);

Modified: branches/the-real-msvc/include/reactos/wine/port.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w…
==============================================================================
--- branches/the-real-msvc/include/reactos/wine/port.h [iso-8859-1] (original)
+++ branches/the-real-msvc/include/reactos/wine/port.h [iso-8859-1] Wed Nov  5 04:02:13
2008
@@ -326,7 +326,7 @@
 
 /* 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

Modified: branches/the-real-msvc/lib/3rdparty/adns/adns_win32/adns_unix_calls.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/adns…
==============================================================================
--- branches/the-real-msvc/lib/3rdparty/adns/adns_win32/adns_unix_calls.c [iso-8859-1]
(original)
+++ branches/the-real-msvc/lib/3rdparty/adns/adns_win32/adns_unix_calls.c [iso-8859-1] Wed
Nov  5 04:02:13 2008
@@ -38,7 +38,7 @@
 	for(; i < iovCount; i++)
 		total_len += iov[i].iov_len;
 
-	p = buf = (char *)alloca( (size_t) total_len);
+	p = buf = (char *)_alloca( (size_t) total_len);
 
 	for(; i < iovCount; i++)
 	{

Modified: branches/the-real-msvc/lib/3rdparty/adns/src/internal.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/adns…
==============================================================================
--- branches/the-real-msvc/lib/3rdparty/adns/src/internal.h [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/3rdparty/adns/src/internal.h [iso-8859-1] Wed Nov  5
04:02:13 2008
@@ -31,7 +31,7 @@
 #define ADNS_INTERNAL_H_INCLUDED
 
 #include "config.h"
-/*typedef unsigned char byte;*/ /* FIXME: horrible kludge to avoid conflicts with an SDK
type */
+typedef unsigned char byte;
 
 #include <stdarg.h>
 #include <assert.h>

Modified: branches/the-real-msvc/lib/3rdparty/adns/src/setup.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/adns…
==============================================================================
--- branches/the-real-msvc/lib/3rdparty/adns/src/setup.c [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/3rdparty/adns/src/setup.c [iso-8859-1] Wed Nov  5 04:02:13
2008
@@ -573,7 +573,7 @@
   char PathBuf[MAX_PATH];
   struct in_addr addr;
   #define ADNS_PFIXED_INFO_BLEN (2048)
-  PFIXED_INFO network_info = (PFIXED_INFO)alloca(ADNS_PFIXED_INFO_BLEN);
+  PFIXED_INFO network_info = (PFIXED_INFO)_alloca(ADNS_PFIXED_INFO_BLEN);
   ULONG network_info_blen = ADNS_PFIXED_INFO_BLEN;
   DWORD network_info_result;
   PIP_ADDR_STRING pip;

Modified: branches/the-real-msvc/lib/3rdparty/libwine/debug.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/libw…
==============================================================================
--- branches/the-real-msvc/lib/3rdparty/libwine/debug.c [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/3rdparty/libwine/debug.c [iso-8859-1] Wed Nov  5 04:02:13
2008
@@ -188,7 +188,7 @@
     char *wine_debug;
     DWORD dwLength;
     /* GetEnvironmentVariableA will change LastError! */
-    DWORD LastError = GetLastError(); 
+    DWORD LastError = GetLastError();
 
     if (nb_debug_options != -1) return;  /* already initialized */
     nb_debug_options = 0;
@@ -278,7 +278,7 @@
 /* default implementation of wine_dbgstr_an */
 static const char *default_dbgstr_an( const char *str, int n )
 {
-    static const char hex[16] = "0123456789abcdef";
+    static const char hex[16] = { '0', '1', '2', '3',
'4', '5', '6', '7', '8', '9', 'a',
'b', 'c', 'd', 'e', 'f' };
     char *dst, *res;
     size_t size;
 

Modified: branches/the-real-msvc/lib/3rdparty/libwine/debug_ros.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/libw…
==============================================================================
--- branches/the-real-msvc/lib/3rdparty/libwine/debug_ros.c [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/3rdparty/libwine/debug_ros.c [iso-8859-1] Wed Nov  5
04:02:13 2008
@@ -8,6 +8,7 @@
 
 #include "debug.c"
 
+__MINGW_ATTRIB_MALLOC
 void *malloc(size_t size)
 {
     return LocalAlloc(0, size);
@@ -24,6 +25,7 @@
     return LocalReAlloc(ptr, size, LMEM_MOVEABLE);
 }
 
+__MINGW_ATTRIB_MALLOC
 char *_strdup(const char *str)
 {
     char *newstr = malloc(strlen(str) + 1);

Modified: branches/the-real-msvc/lib/3rdparty/libwine/string.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/libw…
==============================================================================
--- branches/the-real-msvc/lib/3rdparty/libwine/string.c [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/3rdparty/libwine/string.c [iso-8859-1] Wed Nov  5 04:02:13
2008
@@ -4,11 +4,11 @@
 
 #ifndef HAVE_STRCASECMP
 
-#ifdef strcasecmp
-# undef strcasecmp
+#ifdef _stricmp
+# undef _stricmp
 #endif
 
-int strcasecmp( const char *str1, const char *str2 )
+int _stricmp( const char *str1, const char *str2 )
 {
     const unsigned char *ustr1 = (const unsigned char *)str1;
     const unsigned char *ustr2 = (const unsigned char *)str2;