diff --git a/rostests/tests/polytest/polytest.cpp b/rostests/tests/polytest/polytest.cpp
index 352711450bd..53567c6a6d2 100644
--- a/rostests/tests/polytest/polytest.cpp
+++ b/rostests/tests/polytest/polytest.cpp
@@ -794,7 +794,7 @@ Polygon ( CONST PPOINT UnsafePoints, int Count, int polyFillMode )
 	  To = Points[CurrentPoint + 1];
 	}
 
-      DPRINT1("Polygon Making line from (%d,%d) to (%d,%d)\n", From.x, From.y, To.x, To.y );
+      DPRINT1("Polygon Making line from (%ld,%ld) to (%ld,%ld)\n", From.x, From.y, To.x, To.y );
       IntEngLineTo(SurfObj,
 	           dc.CombinedClip,
 	           OutBrushObj,
@@ -863,6 +863,6 @@ int main()
     printf("\n");
   }
   DPRINT1("Done!\n");
-  (void)getch();
+  (void)_getch();
 }
 /* EOF */
diff --git a/rostests/tests/vmtest/vmtest.c b/rostests/tests/vmtest/vmtest.c
index 95a8aa01399..d9559282b6b 100644
--- a/rostests/tests/vmtest/vmtest.c
+++ b/rostests/tests/vmtest/vmtest.c
@@ -3,7 +3,7 @@
 
 int main()
 {
-   PVOID Base;
+   PBYTE Base;
    PVOID Ret;
 
    Base = VirtualAlloc(NULL,
diff --git a/rostests/winetests/GUI/GUI.rbuild b/rostests/winetests/GUI/GUI.rbuild
index 746cecc78bd..f73c7cbc46a 100644
--- a/rostests/winetests/GUI/GUI.rbuild
+++ b/rostests/winetests/GUI/GUI.rbuild
@@ -4,6 +4,7 @@
 	<include base="GUI">.</include>
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
+    <define name="__ROS_LONG64__" />
 	<library>gdi32</library>
 	<library>kernel32</library>
 	<library>user32</library>
diff --git a/rostests/winetests/advapi32/advapi32.rbuild b/rostests/winetests/advapi32/advapi32.rbuild
index fa55ab3bd4b..651e745cd35 100644
--- a/rostests/winetests/advapi32/advapi32.rbuild
+++ b/rostests/winetests/advapi32/advapi32.rbuild
@@ -5,6 +5,7 @@
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="advapi32_winetest">.</include>
     <define name="__USE_W32API" />
+    <define name="__ROS_LONG64__" />
     <library>advapi32</library>
     <library>kernel32</library>
     <library>ntdll</library>
diff --git a/rostests/winetests/advpack/advpack.rbuild b/rostests/winetests/advpack/advpack.rbuild
index 7154a57acda..5518c3898d8 100644
--- a/rostests/winetests/advpack/advpack.rbuild
+++ b/rostests/winetests/advpack/advpack.rbuild
@@ -4,6 +4,7 @@
 <module name="advpack_winetest" type="win32cui" installbase="bin" installname="advpack_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="advpack_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>advpack.c</file>
 	<file>files.c</file>
 	<file>install.c</file>
diff --git a/rostests/winetests/browseui/browseui.rbuild b/rostests/winetests/browseui/browseui.rbuild
index eaf75e972b2..6cb96deae17 100644
--- a/rostests/winetests/browseui/browseui.rbuild
+++ b/rostests/winetests/browseui/browseui.rbuild
@@ -4,6 +4,7 @@
 <module name="browseui_winetest" type="win32cui" installbase="bin" installname="browseui_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="browseui_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<library>wine</library>
 	<library>ole32</library>
 	<library>user32</library>
diff --git a/rostests/winetests/cabinet/cabinet.rbuild b/rostests/winetests/cabinet/cabinet.rbuild
index 8bc659c18d6..50b2e276c9d 100644
--- a/rostests/winetests/cabinet/cabinet.rbuild
+++ b/rostests/winetests/cabinet/cabinet.rbuild
@@ -4,6 +4,7 @@
 <module name="cabinet_winetest" type="win32cui" installbase="bin" installname="cabinet_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="cabinet_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>extract.c</file>
 	<file>fdi.c</file>
 	<file>testlist.c</file>
diff --git a/rostests/winetests/comcat/comcat.rbuild b/rostests/winetests/comcat/comcat.rbuild
index 526261ce148..56fad49b60c 100644
--- a/rostests/winetests/comcat/comcat.rbuild
+++ b/rostests/winetests/comcat/comcat.rbuild
@@ -4,6 +4,7 @@
 <module name="comcat_winetest" type="win32cui" installbase="bin" installname="comcat_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="comcat_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>comcat.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
diff --git a/rostests/winetests/comctl32/comctl32.rbuild b/rostests/winetests/comctl32/comctl32.rbuild
index 69dc3ba36da..10a8b863d02 100644
--- a/rostests/winetests/comctl32/comctl32.rbuild
+++ b/rostests/winetests/comctl32/comctl32.rbuild
@@ -4,6 +4,7 @@
 <module name="comctl32_winetest" type="win32cui" installbase="bin" installname="comctl32_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="comctl32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>comboex.c</file>
 	<file>datetime.c</file>
 	<file>dpa.c</file>
diff --git a/rostests/winetests/comdlg32/comdlg32.rbuild b/rostests/winetests/comdlg32/comdlg32.rbuild
index a4afd27d11c..1462064b750 100644
--- a/rostests/winetests/comdlg32/comdlg32.rbuild
+++ b/rostests/winetests/comdlg32/comdlg32.rbuild
@@ -4,6 +4,7 @@
 <module name="comdlg32_winetest" type="win32cui" installbase="bin" installname="comdlg32_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="comdlg32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>filedlg.c</file>
 	<file>printdlg.c</file>
 	<file>testlist.c</file>
diff --git a/rostests/winetests/gdi32/gdi32.rbuild b/rostests/winetests/gdi32/gdi32.rbuild
index c26374a5bea..cc55487c431 100644
--- a/rostests/winetests/gdi32/gdi32.rbuild
+++ b/rostests/winetests/gdi32/gdi32.rbuild
@@ -4,6 +4,7 @@
 <module name="gdi32_winetest" type="win32cui" installbase="bin" installname="gdi32_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="gdi32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
     <define name="__USE_W32API" />
     <library>ntdll</library>
     <library>gdi32</library>
diff --git a/rostests/winetests/gdiplus/gdiplus.rbuild b/rostests/winetests/gdiplus/gdiplus.rbuild
index bea6f099c0c..8966c181b0a 100644
--- a/rostests/winetests/gdiplus/gdiplus.rbuild
+++ b/rostests/winetests/gdiplus/gdiplus.rbuild
@@ -4,6 +4,7 @@
 <module name="gdiplus_winetest" type="win32cui" installbase="bin" installname="gdiplus_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="gdiplus_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>brush.c</file>
 	<file>customlinecap.c</file>
 	<file>font.c</file>
diff --git a/rostests/winetests/hlink/hlink.rbuild b/rostests/winetests/hlink/hlink.rbuild
index 61078731546..f4bf710e094 100644
--- a/rostests/winetests/hlink/hlink.rbuild
+++ b/rostests/winetests/hlink/hlink.rbuild
@@ -4,6 +4,7 @@
 <module name="hlink_winetest" type="win32cui" installbase="bin" installname="hlink_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="hlink_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>hlink.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
diff --git a/rostests/winetests/icmp/icmp.rbuild b/rostests/winetests/icmp/icmp.rbuild
index 2cd6f7f6c18..7363a2fb488 100644
--- a/rostests/winetests/icmp/icmp.rbuild
+++ b/rostests/winetests/icmp/icmp.rbuild
@@ -5,6 +5,7 @@
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="icmp_winetest">.</include>
     <define name="__USE_W32API" />
+    <define name="__ROS_LONG64__" />
     <library>kernel32</library>
     <library>ntdll</library>
     <library>icmp</library>
diff --git a/rostests/winetests/imm32/imm32.rbuild b/rostests/winetests/imm32/imm32.rbuild
index 8556e4a4717..6b1434b0c37 100644
--- a/rostests/winetests/imm32/imm32.rbuild
+++ b/rostests/winetests/imm32/imm32.rbuild
@@ -4,6 +4,7 @@
 <module name="imm32_winetest" type="win32cui" installbase="bin" installname="imm32_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="imm32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>imm32.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
diff --git a/rostests/winetests/kernel32/kernel32.rbuild b/rostests/winetests/kernel32/kernel32.rbuild
index 98ba2542558..3ad6677dbea 100644
--- a/rostests/winetests/kernel32/kernel32.rbuild
+++ b/rostests/winetests/kernel32/kernel32.rbuild
@@ -5,6 +5,7 @@
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="kernel32_winetest">.</include>
     <define name="__USE_W32API" />
+    <define name="__ROS_LONG64__" />
     <library>ntdll</library>
     <library>kernel32</library>
     <library>advapi32</library>
diff --git a/rostests/winetests/lz32/lz32.rbuild b/rostests/winetests/lz32/lz32.rbuild
index 74671786034..d46524bcdda 100644
--- a/rostests/winetests/lz32/lz32.rbuild
+++ b/rostests/winetests/lz32/lz32.rbuild
@@ -4,6 +4,7 @@
 <module name="lz32_winetest" type="win32cui" installbase="bin" installname="lz32_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="lz32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>lzexpand_main.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
diff --git a/rostests/winetests/mapi32/mapi32.rbuild b/rostests/winetests/mapi32/mapi32.rbuild
index bf7526da50c..1debf2ee6a0 100644
--- a/rostests/winetests/mapi32/mapi32.rbuild
+++ b/rostests/winetests/mapi32/mapi32.rbuild
@@ -4,6 +4,7 @@
 <module name="mapi32_winetest" type="win32cui" installbase="bin" installname="mapi32_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="mapi32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>imalloc.c</file>
 	<file>prop.c</file>
 	<file>util.c</file>
diff --git a/rostests/winetests/mlang/mlang.rbuild b/rostests/winetests/mlang/mlang.rbuild
index 26ebbab0ea5..0cd4a4eef58 100644
--- a/rostests/winetests/mlang/mlang.rbuild
+++ b/rostests/winetests/mlang/mlang.rbuild
@@ -4,6 +4,7 @@
 <module name="mlang_winetest" type="win32cui" installbase="bin" installname="mlang_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="mlang_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>mlang.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
diff --git a/rostests/winetests/msacm32/msacm32.rbuild b/rostests/winetests/msacm32/msacm32.rbuild
index 647f45bcab0..c2fe5162306 100644
--- a/rostests/winetests/msacm32/msacm32.rbuild
+++ b/rostests/winetests/msacm32/msacm32.rbuild
@@ -4,6 +4,7 @@
 <module name="msacm32_winetest" type="win32cui" installbase="bin" installname="msacm32_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="msacm32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<library>wine</library>
 	<library>kernel32</library>
 	<library>msacm32</library>
diff --git a/rostests/winetests/mshtml/mshtml.rbuild b/rostests/winetests/mshtml/mshtml.rbuild
index b7aeb69880d..118c843b96c 100644
--- a/rostests/winetests/mshtml/mshtml.rbuild
+++ b/rostests/winetests/mshtml/mshtml.rbuild
@@ -4,6 +4,7 @@
 <module name="mshtml_winetest" type="win32cui" installbase="bin" installname="mshtml_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="mshtml_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>dom.c</file>
 	<file>htmldoc.c</file>
 	<file>misc.c</file>
diff --git a/rostests/winetests/msi/msi.rbuild b/rostests/winetests/msi/msi.rbuild
index e3a12b60171..45524def2d2 100644
--- a/rostests/winetests/msi/msi.rbuild
+++ b/rostests/winetests/msi/msi.rbuild
@@ -4,6 +4,7 @@
 <module name="msi_winetest" type="win32cui" installbase="bin" installname="msi_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="msi_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>automation.c</file>
 	<file>db.c</file>
 	<file>format.c</file>
diff --git a/rostests/winetests/mstask/mstask.rbuild b/rostests/winetests/mstask/mstask.rbuild
index 3d910b334f9..8a4a1e798f2 100644
--- a/rostests/winetests/mstask/mstask.rbuild
+++ b/rostests/winetests/mstask/mstask.rbuild
@@ -4,6 +4,7 @@
 <module name="mstask_winetest" type="win32cui" installbase="bin" installname="mstask_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="mstask_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>task.c</file>
 	<file>task_scheduler.c</file>
 	<file>task_trigger.c</file>
diff --git a/rostests/winetests/msvcrt/msvcrt.rbuild b/rostests/winetests/msvcrt/msvcrt.rbuild
index f720b9a9bf3..89cd15a3ac2 100644
--- a/rostests/winetests/msvcrt/msvcrt.rbuild
+++ b/rostests/winetests/msvcrt/msvcrt.rbuild
@@ -6,6 +6,7 @@
 	<include base="msvcrt_winetest">.</include>
 	<include base="msvcrt">include/reactos/wine/msvcrt</include>
 	<define name="__USE_W32API" />
+    <define name="__ROS_LONG64__" />
 	<library>kernel32</library>
 	<library>msvcrt</library>
 	<file>cpp.c</file>
diff --git a/rostests/winetests/netapi32/netapi32.rbuild b/rostests/winetests/netapi32/netapi32.rbuild
index a19cfb5c394..a0c35b05cdd 100644
--- a/rostests/winetests/netapi32/netapi32.rbuild
+++ b/rostests/winetests/netapi32/netapi32.rbuild
@@ -4,6 +4,7 @@
 <module name="netapi32_winetest" type="win32cui" installbase="bin" installname="netapi32_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="netapi32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>access.c</file>
 	<file>apibuf.c</file>
 	<file>ds.c</file>
diff --git a/rostests/winetests/ntdll/ntdll.rbuild b/rostests/winetests/ntdll/ntdll.rbuild
index 3019ce011be..9be19d047c8 100644
--- a/rostests/winetests/ntdll/ntdll.rbuild
+++ b/rostests/winetests/ntdll/ntdll.rbuild
@@ -5,6 +5,7 @@
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="ntdll_winetest">.</include>
     <define name="__USE_W32API" />
+    <define name="__ROS_LONG64__" />
     <library>kernel32</library>
     <library>ntdll</library>
     <file>atom.c</file>
diff --git a/rostests/winetests/odbccp32/odbccp32.rbuild b/rostests/winetests/odbccp32/odbccp32.rbuild
index cc19be35c89..7851118ef32 100644
--- a/rostests/winetests/odbccp32/odbccp32.rbuild
+++ b/rostests/winetests/odbccp32/odbccp32.rbuild
@@ -4,6 +4,7 @@
 <module name="odbccp32_winetest" type="win32cui" installbase="bin" installname="odbccp32_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="odbccp32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>misc.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
diff --git a/rostests/winetests/ole32/ole32.rbuild b/rostests/winetests/ole32/ole32.rbuild
index 2ed9a5f1b50..8817952ba8a 100644
--- a/rostests/winetests/ole32/ole32.rbuild
+++ b/rostests/winetests/ole32/ole32.rbuild
@@ -4,6 +4,7 @@
 <module name="ole32_winetest" type="win32cui" installbase="bin" installname="ole32_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="ole32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>clipboard.c</file>
 	<file>compobj.c</file>
 	<file>defaulthandler.c</file>
diff --git a/rostests/winetests/oleaut32/oleaut32.rbuild b/rostests/winetests/oleaut32/oleaut32.rbuild
index e41b828af1c..3cb615cc909 100644
--- a/rostests/winetests/oleaut32/oleaut32.rbuild
+++ b/rostests/winetests/oleaut32/oleaut32.rbuild
@@ -2,10 +2,10 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="oleaut32_winetest" type="win32cui" installbase="bin" installname="oleaut32_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="oleaut32_winetest">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="oleaut32_winetest" root="intermediate">.</include>
+    <define name="__ROS_LONG64__" />
 	<library>wine</library>
 	<library>oleaut32</library>
 	<library>ole32</library>
diff --git a/rostests/winetests/powrprof/powrprof.rbuild b/rostests/winetests/powrprof/powrprof.rbuild
index 1e9060352ff..6d21cec1197 100644
--- a/rostests/winetests/powrprof/powrprof.rbuild
+++ b/rostests/winetests/powrprof/powrprof.rbuild
@@ -1,6 +1,7 @@
 <module name="powrprof_winetest" type="win32cui" installbase="bin" installname="powrprof_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="powrprof_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
diff --git a/rostests/winetests/psapi/psapi.rbuild b/rostests/winetests/psapi/psapi.rbuild
index 8864361f1de..3e7df36f9ba 100644
--- a/rostests/winetests/psapi/psapi.rbuild
+++ b/rostests/winetests/psapi/psapi.rbuild
@@ -4,6 +4,7 @@
 <module name="psapi_winetest" type="win32cui" installbase="bin" installname="psapi_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="psapi_winetest">.</include>
+    <define name="__ROS_LONG64__" />
     <define name="__USE_W32API" />
     <library>kernel32</library>
     <library>ntdll</library>
diff --git a/rostests/winetests/riched20/riched20.rbuild b/rostests/winetests/riched20/riched20.rbuild
index 7d864355646..050e1510c6c 100644
--- a/rostests/winetests/riched20/riched20.rbuild
+++ b/rostests/winetests/riched20/riched20.rbuild
@@ -4,6 +4,7 @@
 <module name="riched20_winetest" type="win32cui" installbase="bin" installname="riched20_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="riched20_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>editor.c</file>
 	<file>richole.c</file>
 	<file>testlist.c</file>
diff --git a/rostests/winetests/riched32/riched32.rbuild b/rostests/winetests/riched32/riched32.rbuild
index 15e15eb4012..25d22ce1e19 100644
--- a/rostests/winetests/riched32/riched32.rbuild
+++ b/rostests/winetests/riched32/riched32.rbuild
@@ -4,6 +4,7 @@
 <module name="riched32_winetest" type="win32cui" installbase="bin" installname="riched32_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="riched32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>editor.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
diff --git a/rostests/winetests/rpcrt4/rpcrt4.rbuild b/rostests/winetests/rpcrt4/rpcrt4.rbuild
index e7c72f4e891..efb526898fc 100644
--- a/rostests/winetests/rpcrt4/rpcrt4.rbuild
+++ b/rostests/winetests/rpcrt4/rpcrt4.rbuild
@@ -12,6 +12,7 @@
 		<include base="rpcrt4_winetest">.</include>
 		<include root="intermediate" base="rpcrt4_winetest">.</include>
 		<define name="__USE_W32API" />
+		<define name="__ROS_LONG64__" />
 		<library>wine</library>
 		<library>pseh</library>
 		<library>ole32</library>
diff --git a/rostests/winetests/rsabase/rsabase.rbuild b/rostests/winetests/rsabase/rsabase.rbuild
index 32febdf03b0..2decf107c64 100644
--- a/rostests/winetests/rsabase/rsabase.rbuild
+++ b/rostests/winetests/rsabase/rsabase.rbuild
@@ -3,6 +3,7 @@
 <module name="rsabase_winetest" type="win32cui" installbase="bin" installname="rsabase_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="rsabase_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<library>wine</library>
 	<library>advapi32</library>
 	<library>kernel32</library>
diff --git a/rostests/winetests/rsaenh/rsaenh.rbuild b/rostests/winetests/rsaenh/rsaenh.rbuild
index a3ad467c625..2142dedefa7 100644
--- a/rostests/winetests/rsaenh/rsaenh.rbuild
+++ b/rostests/winetests/rsaenh/rsaenh.rbuild
@@ -4,6 +4,7 @@
 <module name="rsaenh_winetest" type="win32cui" installbase="bin" installname="rsaenh_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="rsaenh_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>rsaenh.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
diff --git a/rostests/winetests/schannel/schannel.rbuild b/rostests/winetests/schannel/schannel.rbuild
index d5d3b874ff8..82cce22c9ca 100644
--- a/rostests/winetests/schannel/schannel.rbuild
+++ b/rostests/winetests/schannel/schannel.rbuild
@@ -4,6 +4,7 @@
 <module name="schannel_winetest" type="win32cui" installbase="bin" installname="schannel_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="schannel_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<library>wine</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
diff --git a/rostests/winetests/setupapi/setupapi.rbuild b/rostests/winetests/setupapi/setupapi.rbuild
index fb36692e461..4da0549e039 100644
--- a/rostests/winetests/setupapi/setupapi.rbuild
+++ b/rostests/winetests/setupapi/setupapi.rbuild
@@ -5,6 +5,7 @@
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="setupapi_winetest">.</include>
     <define name="__USE_W32API" />
+    <define name="__ROS_LONG64__" />
     <library>ntdll</library>
     <library>kernel32</library>
     <library>advapi32</library>
diff --git a/rostests/winetests/shell32/shell32.rbuild b/rostests/winetests/shell32/shell32.rbuild
index 73e4388fa56..c1dd598bc46 100644
--- a/rostests/winetests/shell32/shell32.rbuild
+++ b/rostests/winetests/shell32/shell32.rbuild
@@ -4,6 +4,7 @@
 <module name="shell32_winetest" type="win32cui" installbase="bin" installname="shell32_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="shell32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<library>wine</library>
 	<library>shell32</library>
 	<library>ole32</library>
diff --git a/rostests/winetests/shlwapi/shlwapi.rbuild b/rostests/winetests/shlwapi/shlwapi.rbuild
index e49b9abe4c4..1f235f71599 100644
--- a/rostests/winetests/shlwapi/shlwapi.rbuild
+++ b/rostests/winetests/shlwapi/shlwapi.rbuild
@@ -4,6 +4,7 @@
 <module name="shlwapi_winetest" type="win32cui" installbase="bin" installname="shlwapi_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="shlwapi_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>clist.c</file>
 	<file>clsid.c</file>
 	<file>generated.c</file>
diff --git a/rostests/winetests/urlmon/urlmon.rbuild b/rostests/winetests/urlmon/urlmon.rbuild
index d2534cfd210..54635ebbaca 100644
--- a/rostests/winetests/urlmon/urlmon.rbuild
+++ b/rostests/winetests/urlmon/urlmon.rbuild
@@ -4,6 +4,7 @@
 <module name="urlmon_winetest" type="win32cui" installbase="bin" installname="urlmon_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="urlmon_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>generated.c</file>
 	<file>misc.c</file>
 	<file>protocol.c</file>
diff --git a/rostests/winetests/user32/user32.rbuild b/rostests/winetests/user32/user32.rbuild
index a25209171ec..c2d46991abf 100644
--- a/rostests/winetests/user32/user32.rbuild
+++ b/rostests/winetests/user32/user32.rbuild
@@ -6,6 +6,7 @@
     <include base="user32_winetest">.</include>
     <include base="ReactOS">include/reactos/wine</include>
     <define name="__USE_W32API" />
+    <define name="__ROS_LONG64__" />
     <library>ntdll</library>
     <library>user32</library>
     <library>gdi32</library>
diff --git a/rostests/winetests/usp10/usp10.rbuild b/rostests/winetests/usp10/usp10.rbuild
index 3ac2e06573d..8708c2c1ecd 100644
--- a/rostests/winetests/usp10/usp10.rbuild
+++ b/rostests/winetests/usp10/usp10.rbuild
@@ -4,6 +4,7 @@
 <module name="usp10_winetest" type="win32cui" installbase="bin" installname="usp10_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="usp10_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>usp10.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
diff --git a/rostests/winetests/uxtheme/uxtheme.rbuild b/rostests/winetests/uxtheme/uxtheme.rbuild
index 48228c0da08..805c38e4a44 100644
--- a/rostests/winetests/uxtheme/uxtheme.rbuild
+++ b/rostests/winetests/uxtheme/uxtheme.rbuild
@@ -4,6 +4,7 @@
 <module name="uxtheme_winetest" type="win32cui" installbase="bin" installname="uxtheme_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="uxtheme_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>system.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>
diff --git a/rostests/winetests/version/version.rbuild b/rostests/winetests/version/version.rbuild
index 648002cec81..b6bd1191269 100644
--- a/rostests/winetests/version/version.rbuild
+++ b/rostests/winetests/version/version.rbuild
@@ -4,6 +4,7 @@
 <module name="version_winetest" type="win32cui" installbase="bin" installname="version_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="version_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>info.c</file>
 	<file>install.c</file>
 	<file>version.rc</file>
diff --git a/rostests/winetests/winetest/winetest.rbuild b/rostests/winetests/winetest/winetest.rbuild
index 64cc0da8311..291b30f5713 100644
--- a/rostests/winetests/winetest/winetest.rbuild
+++ b/rostests/winetests/winetest/winetest.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="winetest" type="win32gui" installbase="system32" allowwarnings="true">
 	<include base="winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<library>comctl32</library>
 	<library>version</library>
 	<library>user32</library>
diff --git a/rostests/winetests/winhttp/winhttp.rbuild b/rostests/winetests/winhttp/winhttp.rbuild
index 5420891a0f9..a49b528e5c2 100644
--- a/rostests/winetests/winhttp/winhttp.rbuild
+++ b/rostests/winetests/winhttp/winhttp.rbuild
@@ -4,6 +4,7 @@
 <module name="winhttp_winetest" type="win32cui" installbase="bin" installname="winhttp_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="winhttp_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>notification.c</file>
 	<file>testlist.c</file>
 	<file>winhttp.c</file>
diff --git a/rostests/winetests/wininet/wininet.rbuild b/rostests/winetests/wininet/wininet.rbuild
index 140fd813e95..2ff720f4dfa 100644
--- a/rostests/winetests/wininet/wininet.rbuild
+++ b/rostests/winetests/wininet/wininet.rbuild
@@ -4,6 +4,7 @@
 <module name="wininet_winetest" type="win32cui" installbase="bin" installname="wininet_winetest.exe" allowwarnings="true">
 	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="wininet_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<library>wine</library>
 	<library>wininet</library>
 	<library>ws2_32</library>