- ne2000: Don't assume stdcall is default for MSVC

- snmpapi: Define SNMP_FUNC_TYPE for MSVC too
- rasman: Compatibly define function pointer prototype
- vbe/vga/xboxvmp: Fix assumption that _MSC_VER means "compiling with Microsoft's headers"

svn path=/trunk/; revision=42563

diff --git a/reactos/dll/win32/rasman/rasman.c b/reactos/dll/win32/rasman/rasman.c
index ff980e1..46c9697 100644 (file)
--- a/reactos/dll/win32/rasman/rasman.c
+++ b/reactos/dll/win32/rasman/rasman.c
@@ -38,7 +38,7 @@ RasSecurityDialogComplete(SECURITY_MESSAGE* pSecMsg)
 DWORD WINAPI
 RasSecurityDialogBegin(HPORT hPort, PBYTE pSendBuf,
     DWORD SendBufSize, PBYTE pRecvBuf, DWORD RecvBufSize,
-    VOID (WINAPI *RasSecurityDialogComplete)())
+    VOID (WINAPI *RasSecurityDialogComplete)(SECURITY_MESSAGE*))
 {
     FIXME("(%p,%p,0x%08x,%p,0x%08x,%p),stub!\n",hPort,pSendBuf,SendBufSize,
           pRecvBuf,RecvBufSize,*RasSecurityDialogComplete);

diff --git a/reactos/dll/win32/snmpapi/snmpapi.c b/reactos/dll/win32/snmpapi/snmpapi.c
index 80e6476..99c6758 100644 (file)
--- a/reactos/dll/win32/snmpapi/snmpapi.c
+++ b/reactos/dll/win32/snmpapi/snmpapi.c
@@ -12,20 +12,10 @@
 #include <winsock2.h>
 #include <windows.h>
 
-#ifdef __GNUC__
 #define SNMP_FUNC_TYPE WINAPI
-#endif
 #include <snmp.h>
 #include "debug.h"
 
-
-#ifdef __GNUC__
-#define EXPORT WINAPI
-#else
-#define EXPORT CALLBACK
-#endif
-
-
 #if DBG
 
 /* See debug.h for debug/trace constants */

diff --git a/reactos/drivers/network/dd/ne2000/ne2000/main.c b/reactos/drivers/network/dd/ne2000/ne2000/main.c
index 295b797..678e959 100644 (file)
--- a/reactos/drivers/network/dd/ne2000/ne2000/main.c
+++ b/reactos/drivers/network/dd/ne2000/ne2000/main.c
@@ -11,9 +11,7 @@
 #include <debug.h>
 
 NTSTATUS
-#ifndef _MSC_VER
 NTAPI
-#endif
 DriverEntry(
     PDRIVER_OBJECT DriverObject,
     PUNICODE_STRING RegistryPath);
@@ -927,9 +925,7 @@ static NDIS_STATUS NTAPI MiniportTransferData(
 
 
 NTSTATUS
-#ifndef _MSC_VER
 NTAPI
-#endif
 DriverEntry(
     PDRIVER_OBJECT DriverObject,
     PUNICODE_STRING RegistryPath)

diff --git a/reactos/drivers/video/miniport/vbe/vbemp.h b/reactos/drivers/video/miniport/vbe/vbemp.h
index 216dd74..187ba5e 100644 (file)
--- a/reactos/drivers/video/miniport/vbe/vbemp.h
+++ b/reactos/drivers/video/miniport/vbe/vbemp.h
@@ -24,7 +24,10 @@
 /* INCLUDES *******************************************************************/
 
 #ifdef _MSC_VER
-#include "dderror.h"
+#pragma message ("INVESTIGATE ME")
+#endif
+
+#if 0 //#ifdef _MSC_VER
 #include "devioctl.h"
 #else
 #include <ntddk.h>

diff --git a/reactos/drivers/video/miniport/vga/vgamp.h b/reactos/drivers/video/miniport/vga/vgamp.h
index c6c3934..d08d961 100644 (file)
--- a/reactos/drivers/video/miniport/vga/vgamp.h
+++ b/reactos/drivers/video/miniport/vga/vgamp.h
@@ -24,7 +24,10 @@
 /* INCLUDES *******************************************************************/
 
 #ifdef _MSC_VER
-#include "dderror.h"
+#pragma message ("INVESTIGATE ME")
+#endif
+
+#if 0 //#ifdef _MSC_VER
 #include "devioctl.h"
 #else
 #include <ntddk.h>

diff --git a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
index 05b1150..3ccf902 100644 (file)
--- a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
+++ b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
@@ -26,7 +26,10 @@
 /* INCLUDES *******************************************************************/
 
 #ifdef _MSC_VER
-#include "dderror.h"
+#pragma message ("INVESTIGATE ME")
+#endif
+
+#if 0 //#ifdef _MSC_VER
 #include "devioctl.h"
 #define PAGE_SIZE 4096
 #else