diff --git a/reactos/apps/tests/SampleWindow/window.c b/reactos/apps/tests/SampleWindow/window.c
index c02b9c0e125..b264b1ed00e 100644
--- a/reactos/apps/tests/SampleWindow/window.c
+++ b/reactos/apps/tests/SampleWindow/window.c
@@ -152,9 +152,9 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
         wndclass.hInstance = hInst;
 
         /* Use standard application icon and arrow cursor provided by the OS */
-        wndclass.hIcon = LoadIcon (NULL, IDI_APPLICATION);
-        wndclass.hIconSm = LoadIcon (NULL, IDI_APPLICATION);
-        wndclass.hCursor = LoadCursor (NULL, IDC_ARROW);
+        wndclass.hIcon = LoadIcon (NULL, (LPCTSTR)IDI_APPLICATION);
+        wndclass.hIconSm = LoadIcon (NULL, (LPCTSTR)IDI_APPLICATION);
+        wndclass.hCursor = LoadCursor (NULL, (LPCTSTR)IDC_ARROW);
 
         /* Color the background white */
         wndclass.hbrBackground = (HBRUSH) GetStockObject (WHITE_BRUSH);
diff --git a/reactos/apps/tests/bitblt/bitblt.c b/reactos/apps/tests/bitblt/bitblt.c
index 90f4d2f6d46..704e8fa020c 100644
--- a/reactos/apps/tests/bitblt/bitblt.c
+++ b/reactos/apps/tests/bitblt/bitblt.c
@@ -32,7 +32,7 @@ int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance,
    wc.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS;
    wc.lpfnWndProc = MainWndProc;
    wc.hInstance = HInstance;
-   wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+   wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW);
   /* wc.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_BTNFACE + 1); */
    wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
    wc.lpszClassName = WndClassName;
diff --git a/reactos/apps/tests/button/buttontst.c b/reactos/apps/tests/button/buttontst.c
index 9c7c74d352b..58ea4f66c04 100644
--- a/reactos/apps/tests/button/buttontst.c
+++ b/reactos/apps/tests/button/buttontst.c
@@ -68,7 +68,7 @@ int STDCALL WinMain(
    TestWndClass.cbSize = sizeof(WNDCLASSEX);
    TestWndClass.lpfnWndProc = &TestWndProc;
    TestWndClass.hInstance = AppInstance;
-   TestWndClass.hCursor = LoadCursor(0, IDC_ARROW);
+   TestWndClass.hCursor = LoadCursor(0, (LPCTSTR)IDC_ARROW);
    TestWndClass.hbrBackground = CreateSolidBrush(RGB(255,255,230));
    TestWndClass.lpszClassName = TEST_WND_CLASS;
    Result = RegisterClassEx(&TestWndClass);
diff --git a/reactos/apps/tests/button2/buttontst2.c b/reactos/apps/tests/button2/buttontst2.c
index 836d188adad..48bb5a2bc7b 100644
--- a/reactos/apps/tests/button2/buttontst2.c
+++ b/reactos/apps/tests/button2/buttontst2.c
@@ -19,8 +19,8 @@ WinMain(HINSTANCE hInstance,
   wc.lpfnWndProc = MainWndProc;
   wc.style = CS_VREDRAW | CS_HREDRAW;
   wc.hInstance = hInstance;
-  wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-  wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+  wc.hIcon = LoadIcon(NULL, (LPCTSTR)IDI_APPLICATION);
+  wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW);
   wc.hbrBackground = (HBRUSH)GetStockObject(GRAY_BRUSH);
   wc.lpszMenuName = NULL;
   wc.cbClsExtra = 0;
diff --git a/reactos/apps/tests/combo/combotst.c b/reactos/apps/tests/combo/combotst.c
index 614b42ed4ca..b8610d9edaf 100644
--- a/reactos/apps/tests/combo/combotst.c
+++ b/reactos/apps/tests/combo/combotst.c
@@ -632,7 +632,7 @@ RegisterAndCreateWindow (HINSTANCE hInst,
     wc.hInstance = hInst;       /* owner of the class */
 
     wc.lpszClassName = className;
-    wc.hCursor = LoadCursor ( 0, IDC_ARROW );
+    wc.hCursor = LoadCursor ( 0, (LPCTSTR)IDC_ARROW );
     wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
     wc.style = CS_HREDRAW | CS_VREDRAW;
     wc.cbClsExtra = 0;
diff --git a/reactos/apps/tests/dibtest/dibtest.c b/reactos/apps/tests/dibtest/dibtest.c
index 3ed2ebf8e4a..78880327986 100644
--- a/reactos/apps/tests/dibtest/dibtest.c
+++ b/reactos/apps/tests/dibtest/dibtest.c
@@ -40,8 +40,8 @@ WinMain(HINSTANCE hInstance,
   wc.lpfnWndProc = MainWndProc;
   wc.style = CS_VREDRAW | CS_HREDRAW;
   wc.hInstance = hInstance;
-  wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-  wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+  wc.hIcon = LoadIcon(NULL, (LPCTSTR)IDI_APPLICATION);
+  wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW);
   wc.hbrBackground = (HBRUSH)GetStockObject(GRAY_BRUSH);
   wc.lpszMenuName = NULL;
   wc.cbClsExtra = 0;
diff --git a/reactos/apps/tests/edit/edittest.c b/reactos/apps/tests/edit/edittest.c
index 2d55c28112d..9a792ebd46c 100644
--- a/reactos/apps/tests/edit/edittest.c
+++ b/reactos/apps/tests/edit/edittest.c
@@ -51,7 +51,7 @@ POINTL point={10,3};
 RECT  rect = {0,0,20,20},rect2;
 DWORD StartP,EndP;
 
-#define ReplaceText "->> Replaced!! <<-"
+#define ReplaceTextStr "->> Replaced!! <<-"
 
 char* AllocatedText;  /* Buffer in the heap to feed it to the edit control */
 char* NewText = "New text for the edit control";
@@ -211,7 +211,7 @@ Msg[] =
      "EM_LINELENGTH",EM_LINELENGTH,-1,0,&HandlePrintReturnHex,
 
      "EM_GETWORDBREAKPROC",EM_GETWORDBREAKPROC,0,0,&HandlePrintReturnHex,
-     "EM_REPLACESEL",EM_REPLACESEL,TRUE,(LPARAM)&ReplaceText,&HandlePrintReturnHex,
+     "EM_REPLACESEL",EM_REPLACESEL,TRUE,(LPARAM)&ReplaceTextStr,&HandlePrintReturnHex,
 
      "EM_LINESCROLL",EM_LINESCROLL,5,1,&HandlePrintReturnHex,
      "EM_SCROLL",EM_SCROLL,SB_LINEDOWN,0,&HandlePrintReturnHex,
@@ -592,7 +592,7 @@ RegisterAndCreateWindow (HINSTANCE hInst,
 	wc.hInstance = hInst;       /* owner of the class */
 
 	wc.lpszClassName = className; 
-	wc.hCursor = LoadCursor ( 0, IDC_ARROW );
+	wc.hCursor = LoadCursor ( 0, (LPCTSTR)IDC_ARROW );
 	wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
 	wc.style = CS_HREDRAW | CS_VREDRAW;
 	wc.cbClsExtra = 0;
diff --git a/reactos/apps/tests/enumwnd/enumwnd.c b/reactos/apps/tests/enumwnd/enumwnd.c
index 82c2cde25b5..0857d1bd72e 100644
--- a/reactos/apps/tests/enumwnd/enumwnd.c
+++ b/reactos/apps/tests/enumwnd/enumwnd.c
@@ -31,8 +31,8 @@ WinMain(HINSTANCE hInstance,
   wc.lpfnWndProc = MainWndProc;
   wc.style = CS_VREDRAW | CS_HREDRAW;
   wc.hInstance = hInstance;
-  wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-  wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+  wc.hIcon = LoadIcon(NULL, (LPCTSTR)IDI_APPLICATION);
+  wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW);
   wc.hbrBackground = (HBRUSH)GetStockObject(GRAY_BRUSH);
   wc.lpszMenuName = NULL;
   wc.cbClsExtra = 0;
diff --git a/reactos/apps/tests/icontest/icontest.c b/reactos/apps/tests/icontest/icontest.c
index 32ad1f74608..8537ff1a316 100644
--- a/reactos/apps/tests/icontest/icontest.c
+++ b/reactos/apps/tests/icontest/icontest.c
@@ -28,8 +28,8 @@ WinMain(HINSTANCE hInstance,
   wc.lpfnWndProc = MainWndProc;
   wc.style = CS_VREDRAW | CS_HREDRAW;
   wc.hInstance = hInstance;
-  wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-  wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+  wc.hIcon = LoadIcon(NULL, (LPCTSTR)IDI_APPLICATION);
+  wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW);
   wc.hbrBackground = (HBRUSH)GetStockObject(GRAY_BRUSH);
   wc.lpszMenuName = NULL;
   wc.cbClsExtra = 0;
diff --git a/reactos/apps/tests/lineclip/lineclip.c b/reactos/apps/tests/lineclip/lineclip.c
index b82809cb043..e1e862ecee2 100644
--- a/reactos/apps/tests/lineclip/lineclip.c
+++ b/reactos/apps/tests/lineclip/lineclip.c
@@ -17,8 +17,8 @@ WinMain(HINSTANCE hInstance,
   wc.lpfnWndProc = MainWndProc;
   wc.style = CS_VREDRAW | CS_HREDRAW;
   wc.hInstance = hInstance;
-  wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-  wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+  wc.hIcon = LoadIcon(NULL, (LPCTSTR)IDI_APPLICATION);
+  wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW);
   wc.hbrBackground = (HBRUSH)GetStockObject(GRAY_BRUSH);
   wc.lpszMenuName = NULL;
   wc.cbClsExtra = 0;
diff --git a/reactos/apps/tests/primitives/mk_font.cpp b/reactos/apps/tests/primitives/mk_font.cpp
index 618c22b5612..59e3cf8ca93 100644
--- a/reactos/apps/tests/primitives/mk_font.cpp
+++ b/reactos/apps/tests/primitives/mk_font.cpp
@@ -33,7 +33,7 @@ HFONT MakeFont(
    // supported.  For compatibility with these platforms you
    // should initialize the XFORM::eM22 data member to 1.0.
    //
-   XFORM xf = {0, 0, 0, 1.0};
+   XFORM xf = {0, 0, 0, 1.0, 0, 0};
    GetWorldTransform(hDestDC, &xf);
    int pixels_per_inch = GetDeviceCaps(hDestDC, LOGPIXELSY);
 
diff --git a/reactos/apps/tests/statst2/statst2.c b/reactos/apps/tests/statst2/statst2.c
index 5f09b57bded..6ac769ed38b 100644
--- a/reactos/apps/tests/statst2/statst2.c
+++ b/reactos/apps/tests/statst2/statst2.c
@@ -126,7 +126,7 @@ HWND RegisterAndCreateWindow (
 	wc.lpfnWndProc = WndProc;   // window procedure: mandatory
 	wc.hInstance = hInst;         // owner of the class: mandatory
 	wc.lpszClassName = className; // mandatory
-	wc.hCursor = LoadCursor ( 0, IDC_ARROW ); // optional
+	wc.hCursor = LoadCursor ( 0, (LPCTSTR)IDC_ARROW ); // optional
 	wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); // optional
 	wc.style = 0;
 	wc.cbClsExtra = 0;
diff --git a/reactos/apps/tests/suspend/suspend.c b/reactos/apps/tests/suspend/suspend.c
index 3f1e005ee43..048c771d916 100644
--- a/reactos/apps/tests/suspend/suspend.c
+++ b/reactos/apps/tests/suspend/suspend.c
@@ -41,7 +41,7 @@ main(int argc, char *argv[])
   z=0;
   thread=CreateThread(NULL,
                       0x1000,
-                      thread_1,
+                      (LPTHREAD_START_ROUTINE)thread_1,
                       NULL,
                       0,
                       &thread_id);
diff --git a/reactos/apps/tests/terminate/terminate.c b/reactos/apps/tests/terminate/terminate.c
index 5d0f224b3e4..a4cc7e49de2 100644
--- a/reactos/apps/tests/terminate/terminate.c
+++ b/reactos/apps/tests/terminate/terminate.c
@@ -44,7 +44,7 @@ main(int argc, char *argv[])
       z++;
       thread=CreateThread(NULL,
 			  0x1000,
-			  thread_1,
+			  (LPTHREAD_START_ROUTINE)thread_1,
 			  NULL,
 			  0,
 			  &thread_id);
diff --git a/reactos/apps/tests/txtscale/mk_font.cpp b/reactos/apps/tests/txtscale/mk_font.cpp
index 618c22b5612..59e3cf8ca93 100644
--- a/reactos/apps/tests/txtscale/mk_font.cpp
+++ b/reactos/apps/tests/txtscale/mk_font.cpp
@@ -33,7 +33,7 @@ HFONT MakeFont(
    // supported.  For compatibility with these platforms you
    // should initialize the XFORM::eM22 data member to 1.0.
    //
-   XFORM xf = {0, 0, 0, 1.0};
+   XFORM xf = {0, 0, 0, 1.0, 0, 0};
    GetWorldTransform(hDestDC, &xf);
    int pixels_per_inch = GetDeviceCaps(hDestDC, LOGPIXELSY);
 
diff --git a/reactos/apps/tests/winhello/winhello.c b/reactos/apps/tests/winhello/winhello.c
index d54f335d3f9..cbde33d2764 100644
--- a/reactos/apps/tests/winhello/winhello.c
+++ b/reactos/apps/tests/winhello/winhello.c
@@ -18,8 +18,8 @@ WinMain(HINSTANCE hInstance,
   wc.lpfnWndProc = MainWndProc;
   wc.style = CS_VREDRAW | CS_HREDRAW;
   wc.hInstance = hInstance;
-  wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-  wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+  wc.hIcon = LoadIcon(NULL, (LPCTSTR)IDI_APPLICATION);
+  wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW);
   wc.hbrBackground = (HBRUSH)GetStockObject(GRAY_BRUSH);
   wc.lpszMenuName = NULL;
   wc.cbClsExtra = 0;
diff --git a/reactos/apps/tests/wm_paint/wm_paint.c b/reactos/apps/tests/wm_paint/wm_paint.c
index 734784894b2..8d9174add9c 100644
--- a/reactos/apps/tests/wm_paint/wm_paint.c
+++ b/reactos/apps/tests/wm_paint/wm_paint.c
@@ -31,7 +31,7 @@ int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance,
    wc.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS;
    wc.lpfnWndProc = MainWndProc;
    wc.hInstance = HInstance;
-   wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+   wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW);
    wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
    wc.lpszClassName = WndClassName;
 
@@ -72,7 +72,7 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam,
          // determine the invalidated area of the window            
          RECT RUpdate;
          HDC Hdc;
-         GetUpdateRect(HWnd, &RUpdate, NULL);
+         GetUpdateRect(HWnd, &RUpdate, FALSE);
 
          // grab a handle to our window's
          // common display device context