- Make most of the the video stack compile with msvc

svn path=/trunk/; revision=42206

diff --git a/reactos/drivers/video/displays/framebuf/pointer.c b/reactos/drivers/video/displays/framebuf/pointer.c
index 9b1b113..cd41ff0 100644 (file)
--- a/reactos/drivers/video/displays/framebuf/pointer.c
+++ b/reactos/drivers/video/displays/framebuf/pointer.c
@@ -65,7 +65,7 @@ DrvMovePointer(
    IN LONG y,
    IN RECTL *prcl)
 {
-   return EngMovePointer(pso, x, y, prcl);
+   EngMovePointer(pso, x, y, prcl);
 }
 
 #else

diff --git a/reactos/drivers/video/font/bmfd/bmfd.h b/reactos/drivers/video/font/bmfd/bmfd.h
index 9163253..d9b5fb5 100644 (file)
--- a/reactos/drivers/video/font/bmfd/bmfd.h
+++ b/reactos/drivers/video/font/bmfd/bmfd.h
@@ -263,11 +263,15 @@ typedef struct
 ULONG
 DbgPrint(IN PCHAR Format, IN ...);
 
-static __inline__
-void
-DbgBreakPoint(void)
+FORCEINLINE
+VOID
+DbgBreakPoint(VOID)
 {
+#ifdef __GNUC__
     asm volatile ("int $3");
+#else
+   __asm int 3;
+#endif
 }
 
 DHPDEV

diff --git a/reactos/drivers/video/font/ftfd/ftfd.h b/reactos/drivers/video/font/ftfd/ftfd.h
index d043ee9..9806a17 100644 (file)
--- a/reactos/drivers/video/font/ftfd/ftfd.h
+++ b/reactos/drivers/video/font/ftfd/ftfd.h
@@ -52,11 +52,15 @@ typedef struct
 ULONG
 DbgPrint(IN PCHAR Format, IN ...);
 
-static __inline__
-void
-DbgBreakPoint(void)
+FORCEINLINE
+VOID
+DbgBreakPoint(VOID)
 {
+#ifdef __GNUC__
     asm volatile ("int $3");
+#else
+   __asm int 3;
+#endif
 }
 
 DHPDEV

diff --git a/reactos/drivers/video/videoprt/agp.c b/reactos/drivers/video/videoprt/agp.c
index 3b1f81d..f4852d5 100644 (file)
--- a/reactos/drivers/video/videoprt/agp.c
+++ b/reactos/drivers/video/videoprt/agp.c
@@ -253,6 +253,7 @@ IntAgpCommitVirtual(
 {
    PVIDEO_PORT_AGP_VIRTUAL_MAPPING VirtualMapping;
    PVOID BaseAddress = NULL;
+   PHYSICAL_ADDRESS PhysicalAddress;
    NTSTATUS Status;
 
    TRACE_(VIDEOPRT, "AgpCommitVirtual - VirtualContext: 0x%x Pages: %d, Offset: 0x%x\n",
@@ -279,7 +280,7 @@ IntAgpCommitVirtual(
       ULONG OffsetInBytes = Offset * PAGE_SIZE;
       BaseAddress = (PVOID)((ULONG_PTR)VirtualMapping->MappedAddress +
                                        OffsetInBytes);
-      PHYSICAL_ADDRESS PhysicalAddress = VirtualMapping->AgpMapping->PhysicalAddress;
+      PhysicalAddress = VirtualMapping->AgpMapping->PhysicalAddress;
       PhysicalAddress.QuadPart += OffsetInBytes;
 
       Status = ZwFreeVirtualMemory(VirtualMapping->ProcessHandle,

diff --git a/reactos/include/ddk/miniport.h b/reactos/include/ddk/miniport.h
index 98a3364..b147c25 100644 (file)
--- a/reactos/include/ddk/miniport.h
+++ b/reactos/include/ddk/miniport.h
@@ -58,8 +58,8 @@ typedef struct _VIDEO_ACCESS_RANGE {
 } VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE;
 #endif
 
-typedef VOID DDKAPI
-(*PBANKED_SECTION_ROUTINE)(
+typedef VOID
+(DDKAPI *PBANKED_SECTION_ROUTINE)(
   IN ULONG  ReadBank,
   IN ULONG  WriteBank,
   IN PVOID  Context);

diff --git a/reactos/include/ddk/video.h b/reactos/include/ddk/video.h
index ae2d305..71a8f9c 100644 (file)
--- a/reactos/include/ddk/video.h
+++ b/reactos/include/ddk/video.h
@@ -143,15 +143,15 @@ typedef struct _VP_SCATTER_GATHER_LIST {
   VP_SCATTER_GATHER_ELEMENT  Elements[0];
 } VP_SCATTER_GATHER_LIST, *PVP_SCATTER_GATHER_LIST;
 
-typedef VOID DDKAPI
-(*PEXECUTE_DMA)(
+typedef VOID
+(DDKAPI *PEXECUTE_DMA)(
        IN PVOID  HwDeviceExtension,
        IN PVP_DMA_ADAPTER  VpDmaAdapter,
        IN PVP_SCATTER_GATHER_LIST  SGList,
        IN PVOID  Context);
 
-typedef PVOID DDKAPI
-(*PVIDEO_PORT_GET_PROC_ADDRESS)(
+typedef PVOID
+(DDKAPI *PVIDEO_PORT_GET_PROC_ADDRESS)(
   IN PVOID  HwDeviceExtension,
   IN PUCHAR  FunctionName);
 
@@ -187,16 +187,16 @@ typedef struct _VIDEO_PORT_CONFIG_INFO {
   ULONGLONG  SystemMemorySize;
 } VIDEO_PORT_CONFIG_INFO, *PVIDEO_PORT_CONFIG_INFO;
 
-typedef VP_STATUS DDKAPI
-(*PVIDEO_HW_FIND_ADAPTER)(
+typedef VP_STATUS
+(DDKAPI *PVIDEO_HW_FIND_ADAPTER)(
        IN PVOID  HwDeviceExtension,
        IN PVOID  HwContext,
        IN PWSTR  ArgumentString,
        IN OUT  PVIDEO_PORT_CONFIG_INFO  ConfigInfo,
        OUT PUCHAR  Again);
 
-typedef VP_STATUS DDKAPI
-(*PVIDEO_HW_POWER_GET)(
+typedef VP_STATUS
+(DDKAPI *PVIDEO_HW_POWER_GET)(
   IN PVOID  HwDeviceExtension,
   IN ULONG  HwId,
   IN OUT  PVIDEO_POWER_MANAGEMENT  VideoPowerControl);
@@ -256,15 +256,15 @@ typedef struct _VIDEO_ACCESS_RANGE {
 } VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE;
 #endif
 
-typedef VOID DDKAPI
-(*PVIDEO_HW_LEGACYRESOURCES)(
+typedef VOID
+(DDKAPI *PVIDEO_HW_LEGACYRESOURCES)(
   IN ULONG  VendorId,
   IN ULONG  DeviceId,
   IN OUT  PVIDEO_ACCESS_RANGE  *LegacyResourceList,
   IN OUT  PULONG  LegacyResourceCount);
 
-typedef VP_STATUS DDKAPI
-(*PMINIPORT_QUERY_DEVICE_ROUTINE)(
+typedef VP_STATUS
+(DDKAPI *PMINIPORT_QUERY_DEVICE_ROUTINE)(
   IN PVOID  HwDeviceExtension,
   IN PVOID  Context,
   IN VIDEO_DEVICE_DATA_TYPE  DeviceDataType,

diff --git a/reactos/include/dxsdk/ddraw.h b/reactos/include/dxsdk/ddraw.h
index 699819d..685f0ad 100644 (file)
--- a/reactos/include/dxsdk/ddraw.h
+++ b/reactos/include/dxsdk/ddraw.h
@@ -8,8 +8,8 @@
 #include <objbase.h>
 #else
 #define IUnknown void
-#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT)
-        #define CO_E_NOTINITIALIZED 0x800401F0
+#if !defined(NT_BUILD_ENVIRONMENT) && !defined(_WINNT_H)
+        #define CO_E_NOTINITIALIZED 0x800401F0L
 #endif
 #endif
 
@@ -37,7 +37,7 @@
   #endif
 #endif
 
-#if defined(WINNT) || !defined(WIN32)
+#if defined(_WINNT_H) || !defined(WIN32)
 #ifndef _HRESULT_DEFINED
 #define _HRESULT_DEFINED
   typedef long HRESULT;