diff --git a/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt b/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt
index 219829f10aa..250a391b272 100644
--- a/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt
+++ b/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt
@@ -13,23 +13,10 @@ add_library(framebuf_new SHARED
     ${SOURCE}
     framebuf_new.rc)
 
-if(ARCH STREQUAL "i386")
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    if(MSVC)
-        #add_target_compile_flags(framebuf_new "/Gz")
-        set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz")
-    else()
-        #add_target_compile_flags(framebuf_new "-mrtd -fno-builtin")
-        set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin")
-    endif()
-endif()
-
 set_entrypoint(framebuf_new DrvEnableDriver 12)
 set_subsystem(framebuf_new native)
 set_image_base(framebuf_new 0x00010000)
-
 target_link_libraries(framebuf_new libcntpr)
-
 add_importlibs(framebuf_new win32k)
 add_pch(framebuf_new driver.h)
 add_dependencies(framebuf_new psdk bugcodes)
diff --git a/reactos/win32ss/drivers/displays/framebuf_new/driver.h b/reactos/win32ss/drivers/displays/framebuf_new/driver.h
index 64ebbbc51a4..ec3ae7bab56 100644
--- a/reactos/win32ss/drivers/displays/framebuf_new/driver.h
+++ b/reactos/win32ss/drivers/displays/framebuf_new/driver.h
@@ -51,14 +51,14 @@ typedef struct  _PDEV
 // eVb: 3.1 [END]
 } PDEV, *PPDEV;
 
-DWORD getAvailableModes(HANDLE, PVIDEO_MODE_INFORMATION *, DWORD *);
-BOOL bInitPDEV(PPDEV, PDEVMODEW, GDIINFO *, DEVINFO *);
-BOOL bInitSURF(PPDEV, BOOL);
-BOOL bInitPaletteInfo(PPDEV, DEVINFO *);
-BOOL bInitPointer(PPDEV, DEVINFO *);
-BOOL bInit256ColorPalette(PPDEV);
-VOID vDisablePalette(PPDEV);
-VOID vDisableSURF(PPDEV);
+DWORD NTAPI getAvailableModes(HANDLE, PVIDEO_MODE_INFORMATION *, DWORD *);
+BOOL NTAPI bInitPDEV(PPDEV, PDEVMODEW, GDIINFO *, DEVINFO *);
+BOOL NTAPI bInitSURF(PPDEV, BOOL);
+BOOL NTAPI bInitPaletteInfo(PPDEV, DEVINFO *);
+BOOL NTAPI bInitPointer(PPDEV, DEVINFO *);
+BOOL NTAPI bInit256ColorPalette(PPDEV);
+VOID NTAPI vDisablePalette(PPDEV);
+VOID NTAPI vDisableSURF(PPDEV);
 
 #define MAX_CLUT_SIZE (sizeof(VIDEO_CLUT) + (sizeof(ULONG) * 256))
 
diff --git a/reactos/win32ss/drivers/displays/framebuf_new/enable.c b/reactos/win32ss/drivers/displays/framebuf_new/enable.c
index 8031da8a173..0b5c7c6c999 100644
--- a/reactos/win32ss/drivers/displays/framebuf_new/enable.c
+++ b/reactos/win32ss/drivers/displays/framebuf_new/enable.c
@@ -42,7 +42,7 @@ static DRVFN gadrvfn[] =
 *
 \**************************************************************************/
 
-BOOL DrvEnableDriver(
+BOOL NTAPI DrvEnableDriver(
 ULONG iEngineVersion,
 ULONG cj,
 PDRVENABLEDATA pded)
@@ -82,7 +82,7 @@ PDRVENABLEDATA pded)
 *
 \**************************************************************************/
 
-DHPDEV DrvEnablePDEV(
+DHPDEV NTAPI DrvEnablePDEV(
 DEVMODEW   *pDevmode,       // Pointer to DEVMODE
 PWSTR       pwszLogAddress, // Logical address
 ULONG       cPatterns,      // number of patterns
@@ -166,7 +166,7 @@ error_free:
 *
 \**************************************************************************/
 
-VOID DrvCompletePDEV(
+VOID NTAPI DrvCompletePDEV(
 DHPDEV dhpdev,
 HDEV  hdev)
 {
@@ -181,7 +181,7 @@ HDEV  hdev)
 *
 \**************************************************************************/
 
-VOID DrvDisablePDEV(
+VOID NTAPI DrvDisablePDEV(
 DHPDEV dhpdev)
 {
     vDisablePalette((PPDEV) dhpdev);
@@ -197,7 +197,7 @@ DHPDEV dhpdev)
 *
 \**************************************************************************/
 
-HSURF DrvEnableSurface(
+HSURF NTAPI DrvEnableSurface(
 DHPDEV dhpdev)
 {
     PPDEV ppdev;
@@ -284,7 +284,7 @@ DHPDEV dhpdev)
 *
 \**************************************************************************/
 
-VOID DrvDisableSurface(
+VOID NTAPI DrvDisableSurface(
 DHPDEV dhpdev)
 {
     EngDeleteSurface(((PPDEV) dhpdev)->hsurfEng);
@@ -299,7 +299,7 @@ DHPDEV dhpdev)
 *
 \**************************************************************************/
 
-BOOL DrvAssertMode(
+BOOL NTAPI DrvAssertMode(
 DHPDEV dhpdev,
 BOOL bEnable)
 {
@@ -371,7 +371,7 @@ BOOL bEnable)
 *
 \**************************************************************************/
 
-ULONG DrvGetModes(
+ULONG NTAPI DrvGetModes(
 HANDLE hDriver,
 ULONG cjSize,
 DEVMODEW *pdm)
diff --git a/reactos/win32ss/drivers/displays/framebuf_new/palette.c b/reactos/win32ss/drivers/displays/framebuf_new/palette.c
index c8cff990e2b..1a56d3617dd 100644
--- a/reactos/win32ss/drivers/displays/framebuf_new/palette.c
+++ b/reactos/win32ss/drivers/displays/framebuf_new/palette.c
@@ -36,7 +36,7 @@ const PALETTEENTRY BASEPALETTE[20] =
     { 0xFF,0xFF,0xFF,0 },       // 19
 };
 
-BOOL bInitDefaultPalette(PPDEV ppdev, DEVINFO *pDevInfo);
+BOOL NTAPI bInitDefaultPalette(PPDEV ppdev, DEVINFO *pDevInfo);
 
 /******************************Public*Routine******************************\
 * bInitPaletteInfo
@@ -47,7 +47,7 @@ BOOL bInitDefaultPalette(PPDEV ppdev, DEVINFO *pDevInfo);
 *
 \**************************************************************************/
 
-BOOL bInitPaletteInfo(PPDEV ppdev, DEVINFO *pDevInfo)
+BOOL NTAPI bInitPaletteInfo(PPDEV ppdev, DEVINFO *pDevInfo)
 {
     if (!bInitDefaultPalette(ppdev, pDevInfo))
         return(FALSE);
@@ -62,7 +62,7 @@ BOOL bInitPaletteInfo(PPDEV ppdev, DEVINFO *pDevInfo)
 *
 \**************************************************************************/
 
-VOID vDisablePalette(PPDEV ppdev)
+VOID NTAPI vDisablePalette(PPDEV ppdev)
 {
 // Delete the default palette if we created one.
 
@@ -83,7 +83,7 @@ VOID vDisablePalette(PPDEV ppdev)
 *
 \**************************************************************************/
 
-BOOL bInitDefaultPalette(PPDEV ppdev, DEVINFO *pDevInfo)
+BOOL NTAPI bInitDefaultPalette(PPDEV ppdev, DEVINFO *pDevInfo)
 {
     if (ppdev->ulBitCount == 8)
     {
@@ -190,7 +190,7 @@ BOOL bInitDefaultPalette(PPDEV ppdev, DEVINFO *pDevInfo)
 *
 \**************************************************************************/
 
-BOOL bInit256ColorPalette(PPDEV ppdev)
+BOOL NTAPI bInit256ColorPalette(PPDEV ppdev)
 {
     BYTE        ajClutSpace[MAX_CLUT_SIZE];
     PVIDEO_CLUT pScreenClut;
@@ -255,7 +255,7 @@ BOOL bInit256ColorPalette(PPDEV ppdev)
 *
 \**************************************************************************/
 
-BOOL DrvSetPalette(
+BOOL NTAPI DrvSetPalette(
 DHPDEV  dhpdev,
 PALOBJ* ppalo,
 FLONG   fl,
diff --git a/reactos/win32ss/drivers/displays/framebuf_new/pointer.c b/reactos/win32ss/drivers/displays/framebuf_new/pointer.c
index dc1950828e2..9cf412424e6 100644
--- a/reactos/win32ss/drivers/displays/framebuf_new/pointer.c
+++ b/reactos/win32ss/drivers/displays/framebuf_new/pointer.c
@@ -8,17 +8,17 @@
 
 #include "driver.h"
 
-BOOL bCopyColorPointer(
+BOOL NTAPI bCopyColorPointer(
 PPDEV ppdev,
 SURFOBJ *psoMask,
 SURFOBJ *psoColor,
 XLATEOBJ *pxlo);
 
-BOOL bCopyMonoPointer(
+BOOL NTAPI bCopyMonoPointer(
 PPDEV ppdev,
 SURFOBJ *psoMask);
 
-BOOL bSetHardwarePointerShape(
+BOOL NTAPI bSetHardwarePointerShape(
 SURFOBJ  *pso,
 SURFOBJ  *psoMask,
 SURFOBJ  *psoColor,
@@ -34,7 +34,7 @@ FLONG     fl);
 *
 \**************************************************************************/
 
-VOID DrvMovePointer
+VOID NTAPI DrvMovePointer
 (
     SURFOBJ *pso,
     LONG     x,
@@ -107,7 +107,7 @@ VOID DrvMovePointer
 *
 \**************************************************************************/
 
-ULONG DrvSetPointerShape
+ULONG NTAPI DrvSetPointerShape
 (
     SURFOBJ  *pso,
     SURFOBJ  *psoMask,
@@ -202,7 +202,7 @@ ULONG DrvSetPointerShape
 *
 \**************************************************************************/
 
-BOOL bSetHardwarePointerShape(
+BOOL NTAPI bSetHardwarePointerShape(
 SURFOBJ  *pso,
 SURFOBJ  *psoMask,
 SURFOBJ  *psoColor,
@@ -293,7 +293,7 @@ FLONG     fl)
 *
 \**************************************************************************/
 
-BOOL bCopyMonoPointer(
+BOOL NTAPI bCopyMonoPointer(
     PPDEV    ppdev,
     SURFOBJ *pso)
 {
@@ -380,7 +380,7 @@ BOOL bCopyMonoPointer(
 * FALSE if not.
 *
 \**************************************************************************/
-BOOL bCopyColorPointer(
+BOOL NTAPI bCopyColorPointer(
 PPDEV ppdev,
 SURFOBJ *psoMask,
 SURFOBJ *psoColor,
@@ -397,7 +397,7 @@ XLATEOBJ *pxlo)
 *
 \**************************************************************************/
 
-BOOL bInitPointer(PPDEV ppdev, DEVINFO *pdevinfo)
+BOOL NTAPI bInitPointer(PPDEV ppdev, DEVINFO *pdevinfo)
 {
     DWORD    returnedDataLength;
 
diff --git a/reactos/win32ss/drivers/displays/framebuf_new/screen.c b/reactos/win32ss/drivers/displays/framebuf_new/screen.c
index 7ea4443c323..a02a002930b 100644
--- a/reactos/win32ss/drivers/displays/framebuf_new/screen.c
+++ b/reactos/win32ss/drivers/displays/framebuf_new/screen.c
@@ -39,7 +39,7 @@ const DEVINFO gDevInfoFrameBuffer = {
 *
 \**************************************************************************/
 
-BOOL bInitSURF(PPDEV ppdev, BOOL bFirst)
+BOOL NTAPI bInitSURF(PPDEV ppdev, BOOL bFirst)
 {
     DWORD returnedDataLength;
     DWORD MaxWidth, MaxHeight;
@@ -168,7 +168,7 @@ BOOL bInitSURF(PPDEV ppdev, BOOL bFirst)
 *
 \**************************************************************************/
 
-VOID vDisableSURF(PPDEV ppdev)
+VOID NTAPI vDisableSURF(PPDEV ppdev)
 {
     DWORD returnedDataLength;
     VIDEO_MEMORY videoMemory;
@@ -197,7 +197,7 @@ VOID vDisableSURF(PPDEV ppdev)
 *
 \**************************************************************************/
 
-BOOL bInitPDEV(
+BOOL NTAPI bInitPDEV(
 PPDEV ppdev,
 DEVMODEW *pDevMode,
 GDIINFO *pGdiInfo,
@@ -503,7 +503,7 @@ DEVINFO *pDevInfo)
 *
 \**************************************************************************/
 
-DWORD getAvailableModes(
+DWORD NTAPI getAvailableModes(
 HANDLE hDriver,
 PVIDEO_MODE_INFORMATION *modeInformation,
 DWORD *cbModeSize)