[ros-diffs] [sginsberg] 42206: - Make most of the the video stack compile with msvc

Author: sginsberg
Date: Sat Jul 25 15:15:22 2009
New Revision: 42206

URL: http://svn.reactos.org/svn/reactos?rev=42206&view=rev
Log:
- Make most of the the video stack compile with msvc

Modified:
    trunk/reactos/drivers/video/displays/framebuf/pointer.c
    trunk/reactos/drivers/video/font/bmfd/bmfd.h
    trunk/reactos/drivers/video/font/ftfd/ftfd.h
    trunk/reactos/drivers/video/videoprt/agp.c
    trunk/reactos/include/ddk/miniport.h
    trunk/reactos/include/ddk/video.h
    trunk/reactos/include/dxsdk/ddraw.h

Modified: trunk/reactos/drivers/video/displays/framebuf/pointer.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fram...
==============================================================================
--- trunk/reactos/drivers/video/displays/framebuf/pointer.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/displays/framebuf/pointer.c [iso-8859-1] Sat Jul 25 15:15:22 2009
@@ -65,7 +65,7 @@
    IN LONG y,
    IN RECTL *prcl)
 {
-   return EngMovePointer(pso, x, y, prcl);
+   EngMovePointer(pso, x, y, prcl);
 }

#else

Modified: trunk/reactos/drivers/video/font/bmfd/bmfd.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/bmf...
==============================================================================
--- trunk/reactos/drivers/video/font/bmfd/bmfd.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/font/bmfd/bmfd.h [iso-8859-1] Sat Jul 25 15:15:22 2009
@@ -263,11 +263,15 @@
 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

Modified: trunk/reactos/drivers/video/font/ftfd/ftfd.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/ftf...
==============================================================================
--- trunk/reactos/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sat Jul 25 15:15:22 2009
@@ -52,11 +52,15 @@
 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

Modified: trunk/reactos/drivers/video/videoprt/agp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/agp....
==============================================================================
--- trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] Sat Jul 25 15:15:22 2009
@@ -253,6 +253,7 @@
 {
    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 @@
       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,

Modified: trunk/reactos/include/ddk/miniport.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/miniport.h?rev=...
==============================================================================
--- trunk/reactos/include/ddk/miniport.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/miniport.h [iso-8859-1] Sat Jul 25 15:15:22 2009
@@ -58,8 +58,8 @@
 } 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);

Modified: trunk/reactos/include/ddk/video.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=422...
==============================================================================
--- trunk/reactos/include/ddk/video.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/video.h [iso-8859-1] Sat Jul 25 15:15:22 2009
@@ -143,15 +143,15 @@
   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 @@
   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 @@
 } 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,

Modified: trunk/reactos/include/dxsdk/ddraw.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=4...
==============================================================================
--- trunk/reactos/include/dxsdk/ddraw.h [iso-8859-1] (original)
+++ trunk/reactos/include/dxsdk/ddraw.h [iso-8859-1] Sat Jul 25 15:15:22 2009
@@ -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;