From aa8b33601d4ee7b8a6468c2cc0a6ee3e23fdd067 Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Sun, 9 Aug 2009 14:18:01 +0000 Subject: [PATCH] - 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 --- reactos/dll/win32/rasman/rasman.c | 2 +- reactos/dll/win32/snmpapi/snmpapi.c | 10 ---------- reactos/drivers/network/dd/ne2000/ne2000/main.c | 4 ---- reactos/drivers/video/miniport/vbe/vbemp.h | 5 ++++- reactos/drivers/video/miniport/vga/vgamp.h | 5 ++++- reactos/drivers/video/miniport/xboxvmp/xboxvmp.h | 5 ++++- 6 files changed, 13 insertions(+), 18 deletions(-) diff --git a/reactos/dll/win32/rasman/rasman.c b/reactos/dll/win32/rasman/rasman.c index ff980e15a7e..46c9697f214 100644 --- 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 80e6476d93c..99c67588527 100644 --- a/reactos/dll/win32/snmpapi/snmpapi.c +++ b/reactos/dll/win32/snmpapi/snmpapi.c @@ -12,20 +12,10 @@ #include #include -#ifdef __GNUC__ #define SNMP_FUNC_TYPE WINAPI -#endif #include #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 295b797a4da..678e959a6aa 100644 --- a/reactos/drivers/network/dd/ne2000/ne2000/main.c +++ b/reactos/drivers/network/dd/ne2000/ne2000/main.c @@ -11,9 +11,7 @@ #include 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 216dd744c77..187ba5ef63d 100644 --- 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 diff --git a/reactos/drivers/video/miniport/vga/vgamp.h b/reactos/drivers/video/miniport/vga/vgamp.h index c6c39342cf5..d08d961ab65 100644 --- 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 diff --git a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h index 05b11502382..3ccf9026930 100644 --- 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 -- 2.17.1