Author: sginsberg
Date: Sun Aug 9 16:18:01 2009
New Revision: 42563
URL:
http://svn.reactos.org/svn/reactos?rev=42563&view=rev
Log:
- 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"
Modified:
trunk/reactos/dll/win32/rasman/rasman.c
trunk/reactos/dll/win32/snmpapi/snmpapi.c
trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c
trunk/reactos/drivers/video/miniport/vbe/vbemp.h
trunk/reactos/drivers/video/miniport/vga/vgamp.h
trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
Modified: trunk/reactos/dll/win32/rasman/rasman.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/rasman.c?…
==============================================================================
--- trunk/reactos/dll/win32/rasman/rasman.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rasman/rasman.c [iso-8859-1] Sun Aug 9 16:18:01 2009
@@ -38,7 +38,7 @@
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);
Modified: trunk/reactos/dll/win32/snmpapi/snmpapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.…
==============================================================================
--- trunk/reactos/dll/win32/snmpapi/snmpapi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/snmpapi/snmpapi.c [iso-8859-1] Sun Aug 9 16:18:01 2009
@@ -12,19 +12,9 @@
#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
Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/…
==============================================================================
--- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Sun Aug 9 16:18:01
2009
@@ -11,9 +11,7 @@
#include <debug.h>
NTSTATUS
-#ifndef _MSC_VER
NTAPI
-#endif
DriverEntry(
PDRIVER_OBJECT DriverObject,
PUNICODE_STRING RegistryPath);
@@ -927,9 +925,7 @@
NTSTATUS
-#ifndef _MSC_VER
NTAPI
-#endif
DriverEntry(
PDRIVER_OBJECT DriverObject,
PUNICODE_STRING RegistryPath)
Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe…
==============================================================================
--- trunk/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] Sun Aug 9 16:18:01
2009
@@ -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>
Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga…
==============================================================================
--- trunk/reactos/drivers/video/miniport/vga/vgamp.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/miniport/vga/vgamp.h [iso-8859-1] Sun Aug 9 16:18:01
2009
@@ -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>
Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/xbo…
==============================================================================
--- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h [iso-8859-1] Sun Aug 9
16:18:01 2009
@@ -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