diff --git a/reactos/base/applications/mspaint_new/CMakeLists.txt b/reactos/base/applications/mspaint_new/CMakeLists.txt
index e7b7df87e3a..c6674a64fb3 100644
--- a/reactos/base/applications/mspaint_new/CMakeLists.txt
+++ b/reactos/base/applications/mspaint_new/CMakeLists.txt
@@ -1,19 +1,24 @@
+project(MSPAINT_NEW)
+
+set_cpp(WITH_RUNTIME)
+
+include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
 
 list(APPEND SOURCE
-    dialogs.c
-    dib.c
-    drawing.c
-    history.c
-    main.c
-    mouse.c
-    palette.c
-    registry.c
-    scrollbox.c
-    selection.c
-    sizebox.c
-    textedit.c
-    toolsettings.c
-    winproc.c
+    dialogs.cpp
+    dib.cpp
+    drawing.cpp
+    history.cpp
+    main.cpp
+    mouse.cpp
+    palette.cpp
+    registry.cpp
+    scrollbox.cpp
+    selection.cpp
+    sizebox.cpp
+    textedit.cpp
+    toolsettings.cpp
+    winproc.cpp
     precomp.h)
 
 add_executable(mspaint_new ${SOURCE} rsrc.rc)
diff --git a/reactos/base/applications/mspaint_new/definitions.h b/reactos/base/applications/mspaint_new/definitions.h
index 6a0ed6c4fa6..f2dfc233c23 100644
--- a/reactos/base/applications/mspaint_new/definitions.h
+++ b/reactos/base/applications/mspaint_new/definitions.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/definitions.h
+ * FILE:        base/applications/mspaint_new/definitions.h
  * PURPOSE:     Defines the resource ids and other stuff
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/dialogs.c b/reactos/base/applications/mspaint_new/dialogs.cpp
similarity index 99%
rename from reactos/base/applications/mspaint_new/dialogs.c
rename to reactos/base/applications/mspaint_new/dialogs.cpp
index c0844dd8d9e..c26579e0153 100644
--- a/reactos/base/applications/mspaint_new/dialogs.c
+++ b/reactos/base/applications/mspaint_new/dialogs.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/dialogs.c
+ * FILE:        base/applications/mspaint_new/dialogs.cpp
  * PURPOSE:     Window procedures of the dialog windows plus launching functions
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/dialogs.h b/reactos/base/applications/mspaint_new/dialogs.h
index 377a3198d5e..29af501468c 100644
--- a/reactos/base/applications/mspaint_new/dialogs.h
+++ b/reactos/base/applications/mspaint_new/dialogs.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/dialogs.h
+ * FILE:        base/applications/mspaint_new/dialogs.h
  * PURPOSE:     Window procedures of the dialog windows plus launching functions
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/dib.c b/reactos/base/applications/mspaint_new/dib.cpp
similarity index 95%
rename from reactos/base/applications/mspaint_new/dib.c
rename to reactos/base/applications/mspaint_new/dib.cpp
index b9bcd59e451..0b7f4e16655 100644
--- a/reactos/base/applications/mspaint_new/dib.c
+++ b/reactos/base/applications/mspaint_new/dib.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/dib.c
+ * FILE:        base/applications/mspaint_new/dib.cpp
  * PURPOSE:     Some DIB related functions
  * PROGRAMMERS: Benedikt Freisen
  */
@@ -71,7 +71,7 @@ SaveDIBToFile(HBITMAP hBitmap, LPTSTR FileName, HDC hDC, LPSYSTEMTIME time, int
     bi.biXPelsPerMeter = hRes;
     bi.biYPelsPerMeter = vRes;
 
-    buffer = HeapAlloc(GetProcessHeap(), 0, imgDataSize);
+    buffer = (char*) HeapAlloc(GetProcessHeap(), 0, imgDataSize);
     if (!buffer)
         return;
 
@@ -153,7 +153,7 @@ LoadDIBFromFile(HBITMAP * hBitmap, LPTSTR name, LPSYSTEMTIME time, int *size, in
     if (size)
         *size = GetFileSize(hFile, NULL);
 
-    bi = HeapAlloc(GetProcessHeap(), 0, bfh.bfOffBits - sizeof(BITMAPFILEHEADER));
+    bi = (BITMAPINFO*) HeapAlloc(GetProcessHeap(), 0, bfh.bfOffBits - sizeof(BITMAPFILEHEADER));
     if (!bi)
     {
         CloseHandle(hFile);
diff --git a/reactos/base/applications/mspaint_new/dib.h b/reactos/base/applications/mspaint_new/dib.h
index 49fd7229971..c308aa81916 100644
--- a/reactos/base/applications/mspaint_new/dib.h
+++ b/reactos/base/applications/mspaint_new/dib.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/dib.h
+ * FILE:        base/applications/mspaint_new/dib.h
  * PURPOSE:     Some DIB related functions
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/drawing.c b/reactos/base/applications/mspaint_new/drawing.cpp
similarity index 83%
rename from reactos/base/applications/mspaint_new/drawing.c
rename to reactos/base/applications/mspaint_new/drawing.cpp
index 954591d0628..25c26e78d38 100644
--- a/reactos/base/applications/mspaint_new/drawing.c
+++ b/reactos/base/applications/mspaint_new/drawing.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/drawing.c
+ * FILE:        base/applications/mspaint_new/drawing.cpp
  * PURPOSE:     The drawing functions used by the tools
  * PROGRAMMERS: Benedikt Freisen
  */
@@ -15,7 +15,7 @@
 void
 Line(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, int thickness)
 {
-    HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, color));
+    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, thickness, color));
     MoveToEx(hdc, x1, y1, NULL);
     LineTo(hdc, x2, y2);
     DeleteObject(SelectObject(hdc, oldPen));
@@ -26,11 +26,11 @@ Rect(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg,  COLORREF bg, int
 {
     HBRUSH oldBrush;
     LOGBRUSH logbrush;
-    HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg));
+    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg));
     logbrush.lbStyle = (style == 0) ? BS_HOLLOW : BS_SOLID;
     logbrush.lbColor = (style == 2) ? fg : bg;
     logbrush.lbHatch = 0;
-    oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush));
+    oldBrush = (HBRUSH) SelectObject(hdc, CreateBrushIndirect(&logbrush));
     Rectangle(hdc, x1, y1, x2, y2);
     DeleteObject(SelectObject(hdc, oldBrush));
     DeleteObject(SelectObject(hdc, oldPen));
@@ -41,11 +41,11 @@ Ellp(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg,  COLORREF bg, int
 {
     HBRUSH oldBrush;
     LOGBRUSH logbrush;
-    HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg));
+    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg));
     logbrush.lbStyle = (style == 0) ? BS_HOLLOW : BS_SOLID;
     logbrush.lbColor = (style == 2) ? fg : bg;
     logbrush.lbHatch = 0;
-    oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush));
+    oldBrush = (HBRUSH) SelectObject(hdc, CreateBrushIndirect(&logbrush));
     Ellipse(hdc, x1, y1, x2, y2);
     DeleteObject(SelectObject(hdc, oldBrush));
     DeleteObject(SelectObject(hdc, oldPen));
@@ -56,11 +56,11 @@ RRect(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg,  COLORREF bg, in
 {
     LOGBRUSH logbrush;
     HBRUSH oldBrush;
-    HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg));
+    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg));
     logbrush.lbStyle = (style == 0) ? BS_HOLLOW : BS_SOLID;
     logbrush.lbColor = (style == 2) ? fg : bg;
     logbrush.lbHatch = 0;
-    oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush));
+    oldBrush = (HBRUSH) SelectObject(hdc, CreateBrushIndirect(&logbrush));
     RoundRect(hdc, x1, y1, x2, y2, 16, 16);
     DeleteObject(SelectObject(hdc, oldBrush));
     DeleteObject(SelectObject(hdc, oldPen));
@@ -71,7 +71,7 @@ Poly(HDC hdc, POINT * lpPoints, int nCount,  COLORREF fg,  COLORREF bg, int thic
 {
     LOGBRUSH logbrush;
     HBRUSH oldBrush;
-    HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg));
+    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg));
     UINT oldRop = GetROP2(hdc);
 
     if (inverted)
@@ -80,7 +80,7 @@ Poly(HDC hdc, POINT * lpPoints, int nCount,  COLORREF fg,  COLORREF bg, int thic
     logbrush.lbStyle = (style == 0) ? BS_HOLLOW : BS_SOLID;
     logbrush.lbColor = (style == 2) ? fg : bg;
     logbrush.lbHatch = 0;
-    oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush));
+    oldBrush = (HBRUSH) SelectObject(hdc, CreateBrushIndirect(&logbrush));
     if (closed)
         Polygon(hdc, lpPoints, nCount);
     else
@@ -100,7 +100,7 @@ Bezier(HDC hdc, POINT p1, POINT p2, POINT p3, POINT p4, COLORREF color, int thic
     fourPoints[1] = p2;
     fourPoints[2] = p3;
     fourPoints[3] = p4;
-    oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, color));
+    oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, thickness, color));
     PolyBezier(hdc, fourPoints, 4);
     DeleteObject(SelectObject(hdc, oldPen));
 }
@@ -108,7 +108,7 @@ Bezier(HDC hdc, POINT p1, POINT p2, POINT p3, POINT p4, COLORREF color, int thic
 void
 Fill(HDC hdc, LONG x, LONG y, COLORREF color)
 {
-    HBRUSH oldBrush = SelectObject(hdc, CreateSolidBrush(color));
+    HBRUSH oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(color));
     ExtFloodFill(hdc, x, y, GetPixel(hdc, x, y), FLOODFILLSURFACE);
     DeleteObject(SelectObject(hdc, oldBrush));
 }
@@ -118,10 +118,10 @@ Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius)
 {
     LONG a, b;
     HPEN oldPen;
-    HBRUSH oldBrush = SelectObject(hdc, CreateSolidBrush(color));
+    HBRUSH oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(color));
 
     b = max(1, max(abs(x2 - x1), abs(y2 - y1)));
-    oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, color));
+    oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, color));
     for(a = 0; a <= b; a++)
         Rectangle(hdc, (x1 * (b - a) + x2 * a) / b - radius + 1,
                   (y1 * (b - a) + y2 * a) / b - radius + 1, (x1 * (b - a) + x2 * a) / b + radius + 1,
@@ -159,8 +159,8 @@ Airbrush(HDC hdc, LONG x, LONG y, COLORREF color, LONG r)
 void
 Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style)
 {
-    HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, color));
-    HBRUSH oldBrush = SelectObject(hdc, CreateSolidBrush(color));
+    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, color));
+    HBRUSH oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(color));
     LONG a, b;
     b = max(1, max(abs(x2 - x1), abs(y2 - y1)));
     switch (style)
@@ -229,7 +229,7 @@ RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2)
 {
     HBRUSH oldBrush;
     LOGBRUSH logbrush;
-    HPEN oldPen = SelectObject(hdc, CreatePen(PS_DOT, 1, 0x00000000));
+    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_DOT, 1, 0x00000000));
     UINT oldRop = GetROP2(hdc);
 
     SetROP2(hdc, R2_NOTXORPEN);
@@ -237,7 +237,7 @@ RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2)
     logbrush.lbStyle = BS_HOLLOW;
     logbrush.lbColor = 0;
     logbrush.lbHatch = 0;
-    oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush));
+    oldBrush = (HBRUSH) SelectObject(hdc, CreateBrushIndirect(&logbrush));
     Rectangle(hdc, x1, y1, x2, y2);
     DeleteObject(SelectObject(hdc, oldBrush));
     DeleteObject(SelectObject(hdc, oldPen));
@@ -250,17 +250,17 @@ SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, DWORD system_selecti
 {
     HBRUSH oldBrush;
     LOGBRUSH logbrush;
-    HPEN oldPen = SelectObject(hdc, CreatePen(PS_DOT, 1, system_selection_color));
+    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_DOT, 1, system_selection_color));
 
     logbrush.lbStyle = BS_HOLLOW;
     logbrush.lbColor = 0;
     logbrush.lbHatch = 0;
-    oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush));
+    oldBrush = (HBRUSH) SelectObject(hdc, CreateBrushIndirect(&logbrush));
     Rectangle(hdc, x1, y1, x2, y2); /* SEL BOX FRAME */
     DeleteObject(SelectObject(hdc, oldBrush));
     DeleteObject(SelectObject(hdc, oldPen));
-    oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, system_selection_color));
-    oldBrush = SelectObject(hdc, CreateSolidBrush(system_selection_color));
+    oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, system_selection_color));
+    oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(system_selection_color));
     Rectangle(hdc, x1 - 1, y1 - 1, x1 + 2, y1 + 2);
     Rectangle(hdc, x2 - 2, y1 - 1, x2 + 2, y1 + 2);
     Rectangle(hdc, x1 - 1, y2 - 2, x1 + 2, y2 + 1);
@@ -281,7 +281,7 @@ Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCT
     COLORREF oldColor;
     COLORREF oldBkColor;
     int oldBkMode;
-    oldFont = SelectObject(hdc, font);
+    oldFont = (HFONT) SelectObject(hdc, font);
     oldColor = SetTextColor(hdc, fg);
     oldBkColor = SetBkColor(hdc, bg);
     oldBkMode = SetBkMode(hdc, TRANSPARENT);
diff --git a/reactos/base/applications/mspaint_new/drawing.h b/reactos/base/applications/mspaint_new/drawing.h
index 91b513ee412..6684da2a1c3 100644
--- a/reactos/base/applications/mspaint_new/drawing.h
+++ b/reactos/base/applications/mspaint_new/drawing.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/drawing.h
+ * FILE:        base/applications/mspaint_new/drawing.h
  * PURPOSE:     The drawing functions used by the tools
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/globalvar.h b/reactos/base/applications/mspaint_new/globalvar.h
index 927d53ce5af..1400117acd4 100644
--- a/reactos/base/applications/mspaint_new/globalvar.h
+++ b/reactos/base/applications/mspaint_new/globalvar.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/globalvar.h
+ * FILE:        base/applications/mspaint_new/globalvar.h
  * PURPOSE:     Declaring global variables for later initialization
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/history.c b/reactos/base/applications/mspaint_new/history.cpp
similarity index 87%
rename from reactos/base/applications/mspaint_new/history.c
rename to reactos/base/applications/mspaint_new/history.cpp
index daf526c977d..6e57f676ba1 100644
--- a/reactos/base/applications/mspaint_new/history.c
+++ b/reactos/base/applications/mspaint_new/history.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/history.c
+ * FILE:        base/applications/mspaint_new/history.cpp
  * PURPOSE:     Undo and redo functionality
  * PROGRAMMERS: Benedikt Freisen
  */
@@ -29,7 +29,7 @@ void
 newReversible()
 {
     DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]);
-    hBms[(currInd + 1) % HISTORYSIZE] = CopyImage(hBms[currInd], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG);
+    hBms[(currInd + 1) % HISTORYSIZE] = (HBITMAP) CopyImage(hBms[currInd], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG);
     currInd = (currInd + 1) % HISTORYSIZE;
     if (undoSteps < HISTORYSIZE - 1)
         undoSteps++;
@@ -75,7 +75,7 @@ resetToU1()
 {
     DeleteObject(hBms[currInd]);
     hBms[currInd] =
-        CopyImage(hBms[(currInd + HISTORYSIZE - 1) % HISTORYSIZE], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG);
+        (HBITMAP) CopyImage(hBms[(currInd + HISTORYSIZE - 1) % HISTORYSIZE], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG);
     SelectObject(hDrawingDC, hBms[currInd]);
     imgXRes = GetDIBWidth(hBms[currInd]);
     imgYRes = GetDIBHeight(hBms[currInd]);
@@ -119,8 +119,8 @@ cropReversible(int width, int height, int xOffset, int yOffset)
     hdc = CreateCompatibleDC(hDrawingDC);
     SelectObject(hdc, hBms[currInd]);
 
-    oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, bgColor));
-    oldBrush = SelectObject(hdc, CreateSolidBrush(bgColor));
+    oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, bgColor));
+    oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(bgColor));
     Rectangle(hdc, 0, 0, width, height);
     BitBlt(hdc, -xOffset, -yOffset, imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY);
     DeleteObject(SelectObject(hdc, oldBrush));
diff --git a/reactos/base/applications/mspaint_new/history.h b/reactos/base/applications/mspaint_new/history.h
index a373ea5a102..c3b526c2e66 100644
--- a/reactos/base/applications/mspaint_new/history.h
+++ b/reactos/base/applications/mspaint_new/history.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        history.h
+ * FILE:        base/applications/mspaint_new/history.h
  * PURPOSE:     Undo and redo functionality
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/main.c b/reactos/base/applications/mspaint_new/main.cpp
similarity index 97%
rename from reactos/base/applications/mspaint_new/main.c
rename to reactos/base/applications/mspaint_new/main.cpp
index 18044e4916a..b7cd03425f9 100644
--- a/reactos/base/applications/mspaint_new/main.c
+++ b/reactos/base/applications/mspaint_new/main.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/main.c
+ * FILE:        base/applications/mspaint_new/main.cpp
  * PURPOSE:     Initializing everything
  * PROGRAMMERS: Benedikt Freisen
  */
@@ -221,9 +221,9 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument
 
     /* preloading the draw transparent/nontransparent icons for later use */
     hNontranspIcon =
-        LoadImage(hThisInstance, MAKEINTRESOURCE(IDI_NONTRANSPARENT), IMAGE_ICON, 40, 30, LR_DEFAULTCOLOR);
+        (HICON) LoadImage(hThisInstance, MAKEINTRESOURCE(IDI_NONTRANSPARENT), IMAGE_ICON, 40, 30, LR_DEFAULTCOLOR);
     hTranspIcon =
-        LoadImage(hThisInstance, MAKEINTRESOURCE(IDI_TRANSPARENT), IMAGE_ICON, 40, 30, LR_DEFAULTCOLOR);
+        (HICON) LoadImage(hThisInstance, MAKEINTRESOURCE(IDI_TRANSPARENT), IMAGE_ICON, 40, 30, LR_DEFAULTCOLOR);
 
     hCurFill     = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_FILL));
     hCurColor    = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_COLOR));
@@ -250,7 +250,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument
                        1, -2, 50, 205, hToolBoxContainer, NULL, hThisInstance, NULL);
     hImageList = ImageList_Create(16, 16, ILC_COLOR24 | ILC_MASK, 16, 0);
     SendMessage(hToolbar, TB_SETIMAGELIST, 0, (LPARAM) hImageList);
-    tempBm = LoadImage(hThisInstance, MAKEINTRESOURCE(IDB_TOOLBARICONS), IMAGE_BITMAP, 256, 16, 0);
+    tempBm = (HBITMAP) LoadImage(hThisInstance, MAKEINTRESOURCE(IDB_TOOLBARICONS), IMAGE_BITMAP, 256, 16, 0);
     ImageList_AddMasked(hImageList, tempBm, 0xff00ff);
     DeleteObject(tempBm);
     SendMessage(hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
@@ -447,7 +447,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument
     /* Run the message loop. It will run until GetMessage() returns 0 */
     while (GetMessage(&messages, NULL, 0, 0))
     {
-        TranslateAccelerator(hwnd, haccel, &messages);
+        TranslateAccelerator(hwnd, (HACCEL) haccel, &messages);
 
         /* Translate virtual-key messages into character messages */
         TranslateMessage(&messages);
diff --git a/reactos/base/applications/mspaint_new/mouse.c b/reactos/base/applications/mspaint_new/mouse.cpp
similarity index 98%
rename from reactos/base/applications/mspaint_new/mouse.c
rename to reactos/base/applications/mspaint_new/mouse.cpp
index 384292d4c03..af593c4d40a 100644
--- a/reactos/base/applications/mspaint_new/mouse.c
+++ b/reactos/base/applications/mspaint_new/mouse.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/mouse.c
+ * FILE:        base/applications/mspaint_new/mouse.cpp
  * PURPOSE:     Things which should not be in the mouse event handler itself
  * PROGRAMMERS: Benedikt Freisen
  */
@@ -67,7 +67,7 @@ startPaintingL(HDC hdc, LONG x, LONG y, COLORREF fg, COLORREF bg)
             ShowWindow(hSelection, SW_HIDE);
             if (ptStack != NULL)
                 HeapFree(GetProcessHeap(), 0, ptStack);
-            ptStack = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(POINT) * 1024);
+            ptStack = (POINT*) HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(POINT) * 1024);
             ptSP = 0;
             ptStack[0].x = x;
             ptStack[0].y = y;
@@ -138,7 +138,7 @@ whilePaintingL(HDC hdc, LONG x, LONG y, COLORREF fg, COLORREF bg)
                 newReversible();
             ptSP++;
             if (ptSP % 1024 == 0)
-                ptStack = HeapReAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, ptStack, sizeof(POINT) * (ptSP + 1024));
+                ptStack = (POINT*) HeapReAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, ptStack, sizeof(POINT) * (ptSP + 1024));
             ptStack[ptSP].x = max(0, min(x, imgXRes));
             ptStack[ptSP].y = max(0, min(y, imgYRes));
             resetToU1();
@@ -261,7 +261,7 @@ endPaintingL(HDC hdc, LONG x, LONG y, COLORREF fg, COLORREF bg)
                 DeleteObject(hSelMask);
                 hSelMask = CreateBitmap(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), 1, 1, NULL);
                 DeleteObject(SelectObject(hSelDC, hSelMask));
-                ptStackCopy = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(POINT) * (ptSP + 1));
+                ptStackCopy = (POINT*) HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(POINT) * (ptSP + 1));
                 for (i = 0; i <= ptSP; i++)
                 {
                     ptStackCopy[i].x = ptStack[i].x - rectSel_src.left;
diff --git a/reactos/base/applications/mspaint_new/mouse.h b/reactos/base/applications/mspaint_new/mouse.h
index ea56ba8b6ba..7abb457e63f 100644
--- a/reactos/base/applications/mspaint_new/mouse.h
+++ b/reactos/base/applications/mspaint_new/mouse.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/mouse.h
+ * FILE:        base/applications/mspaint_new/mouse.h
  * PURPOSE:     Things which should not be in the mouse event handler itself
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/palette.c b/reactos/base/applications/mspaint_new/palette.cpp
similarity index 91%
rename from reactos/base/applications/mspaint_new/palette.c
rename to reactos/base/applications/mspaint_new/palette.cpp
index d119fa5fb3c..67b972bfcdf 100644
--- a/reactos/base/applications/mspaint_new/palette.c
+++ b/reactos/base/applications/mspaint_new/palette.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/palette.c
+ * FILE:        base/applications/mspaint_new/palette.cpp
  * PURPOSE:     Window procedure of the palette window
  * PROGRAMMERS: Benedikt Freisen
  */
@@ -57,13 +57,13 @@ PalWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             DrawEdge(hDC, &rc, BDR_SUNKENOUTER, BF_TOPLEFT | BF_BOTTOMRIGHT);
             SetRect(&rc, 11, 12, 26, 27);
             DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE);
-            oldPen = SelectObject(hDC, CreatePen(PS_NULL, 0, 0));
-            oldBrush = SelectObject(hDC, CreateSolidBrush(bgColor));
+            oldPen = (HPEN) SelectObject(hDC, CreatePen(PS_NULL, 0, 0));
+            oldBrush = (HBRUSH) SelectObject(hDC, CreateSolidBrush(bgColor));
             Rectangle(hDC, rc.left, rc.top + 2, rc.right - 1, rc.bottom - 1);
             DeleteObject(SelectObject(hDC, oldBrush));
             SetRect(&rc, 4, 5, 19, 20);
             DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE);
-            oldBrush = SelectObject(hDC, CreateSolidBrush(fgColor));
+            oldBrush = (HBRUSH) SelectObject(hDC, CreateSolidBrush(fgColor));
             Rectangle(hDC, rc.left + 2, rc.top + 2, rc.right - 1, rc.bottom - 1);
             DeleteObject(SelectObject(hDC, oldBrush));
             DeleteObject(SelectObject(hDC, oldPen));
@@ -74,8 +74,8 @@ PalWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                         0 + (i / 14) * 16, 16 + 31 + (i % 14) * 16, 16 + 0 + (i / 14) * 16);
                 DrawEdge(hDC, &rc, EDGE_RAISED, BF_TOPLEFT);
                 DrawEdge(hDC, &rc, BDR_SUNKENOUTER, BF_RECT);
-                oldPen = SelectObject(hDC, CreatePen(PS_NULL, 0, 0));
-                oldBrush = SelectObject(hDC, CreateSolidBrush(palColors[i]));
+                oldPen = (HPEN) SelectObject(hDC, CreatePen(PS_NULL, 0, 0));
+                oldBrush = (HBRUSH) SelectObject(hDC, CreateSolidBrush(palColors[i]));
                 Rectangle(hDC, rc.left + 2, rc.top + 2, rc.right - 1, rc.bottom - 1);
                 DeleteObject(SelectObject(hDC, oldBrush));
                 DeleteObject(SelectObject(hDC, oldPen));
diff --git a/reactos/base/applications/mspaint_new/palette.h b/reactos/base/applications/mspaint_new/palette.h
index 5bc0b10ef33..a36b6a95ed9 100644
--- a/reactos/base/applications/mspaint_new/palette.h
+++ b/reactos/base/applications/mspaint_new/palette.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/palette.h
+ * FILE:        base/applications/mspaint_new/palette.h
  * PURPOSE:     Window procedure of the palette window
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/registry.c b/reactos/base/applications/mspaint_new/registry.cpp
similarity index 95%
rename from reactos/base/applications/mspaint_new/registry.c
rename to reactos/base/applications/mspaint_new/registry.cpp
index fca10a04bfa..c7cee53bcc3 100644
--- a/reactos/base/applications/mspaint_new/registry.c
+++ b/reactos/base/applications/mspaint_new/registry.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/registry.c
+ * FILE:        base/applications/mspaint_new/registry.cpp
  * PURPOSE:     Offering functions dealing with registry values
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/registry.h b/reactos/base/applications/mspaint_new/registry.h
index 8527805df8e..9a4a9925a75 100644
--- a/reactos/base/applications/mspaint_new/registry.h
+++ b/reactos/base/applications/mspaint_new/registry.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/registry.h
+ * FILE:        base/applications/mspaint_new/registry.h
  * PURPOSE:     Offering functions dealing with registry values
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/rsrc.rc b/reactos/base/applications/mspaint_new/rsrc.rc
index 77e681972be..2e1a4cde2bf 100644
--- a/reactos/base/applications/mspaint_new/rsrc.rc
+++ b/reactos/base/applications/mspaint_new/rsrc.rc
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/mspaint/rsrc.rc
+ * FILE:        base/applications/mspaint_new/rsrc.rc
  * PURPOSE:     Managing the resources
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/scrollbox.c b/reactos/base/applications/mspaint_new/scrollbox.cpp
similarity index 98%
rename from reactos/base/applications/mspaint_new/scrollbox.c
rename to reactos/base/applications/mspaint_new/scrollbox.cpp
index 900aab2fa31..106585434d1 100644
--- a/reactos/base/applications/mspaint_new/scrollbox.c
+++ b/reactos/base/applications/mspaint_new/scrollbox.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        scrollbox.c
+ * FILE:        base/applications/mspaint_new/scrollbox.cpp
  * PURPOSE:     Functionality surrounding the scroll box window class
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/scrollbox.h b/reactos/base/applications/mspaint_new/scrollbox.h
index 83f05104b4e..0c1dde6a926 100644
--- a/reactos/base/applications/mspaint_new/scrollbox.h
+++ b/reactos/base/applications/mspaint_new/scrollbox.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        scrollbox.h
+ * FILE:        base/applications/mspaint_new/scrollbox.h
  * PURPOSE:     Functionality surrounding the scroll box window class
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/selection.c b/reactos/base/applications/mspaint_new/selection.cpp
similarity index 99%
rename from reactos/base/applications/mspaint_new/selection.c
rename to reactos/base/applications/mspaint_new/selection.cpp
index 204b697198d..500a9d45075 100644
--- a/reactos/base/applications/mspaint_new/selection.c
+++ b/reactos/base/applications/mspaint_new/selection.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/selection.c
+ * FILE:        base/applications/mspaint_new/selection.cpp
  * PURPOSE:     Window procedure of the selection window
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/selection.h b/reactos/base/applications/mspaint_new/selection.h
index c8a31199ed5..95bb324bbd1 100644
--- a/reactos/base/applications/mspaint_new/selection.h
+++ b/reactos/base/applications/mspaint_new/selection.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/selection.h
+ * FILE:        base/applications/mspaint_new/selection.h
  * PURPOSE:     Window procedure of the selection window
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/sizebox.c b/reactos/base/applications/mspaint_new/sizebox.cpp
similarity index 98%
rename from reactos/base/applications/mspaint_new/sizebox.c
rename to reactos/base/applications/mspaint_new/sizebox.cpp
index f821b7ebce9..b3d1f8f0f31 100644
--- a/reactos/base/applications/mspaint_new/sizebox.c
+++ b/reactos/base/applications/mspaint_new/sizebox.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        sizebox.c
+ * FILE:        base/applications/mspaint_new/sizebox.cpp
  * PURPOSE:     Window procedure of the size boxes
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/sizebox.h b/reactos/base/applications/mspaint_new/sizebox.h
index 0580a8665f0..8f662e2a930 100644
--- a/reactos/base/applications/mspaint_new/sizebox.h
+++ b/reactos/base/applications/mspaint_new/sizebox.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/sizebox.h
+ * FILE:        base/applications/mspaint_new/sizebox.h
  * PURPOSE:     Window procedure of the size boxes
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/textedit.c b/reactos/base/applications/mspaint_new/textedit.cpp
similarity index 92%
rename from reactos/base/applications/mspaint_new/textedit.c
rename to reactos/base/applications/mspaint_new/textedit.cpp
index 29c74ab24c8..c8d252f3859 100644
--- a/reactos/base/applications/mspaint_new/textedit.c
+++ b/reactos/base/applications/mspaint_new/textedit.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/textedit.c
+ * FILE:        base/applications/mspaint_new/textedit.cpp
  * PURPOSE:     Text editor and font chooser for the text tool
  * PROGRAMMERS: Benedikt Freisen
  */
@@ -55,7 +55,7 @@ TextEditWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 {
                     HeapFree(GetProcessHeap(), 0, textToolText);
                     textToolTextMaxLen = GetWindowTextLength(hwndEditCtl) + 1;
-                    textToolText = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(TCHAR) * textToolTextMaxLen);
+                    textToolText = (LPTSTR) HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(TCHAR) * textToolTextMaxLen);
                     GetWindowText(hwndEditCtl, textToolText, textToolTextMaxLen);
                     ForceRefreshSelectionContents();
                     break;
diff --git a/reactos/base/applications/mspaint_new/textedit.h b/reactos/base/applications/mspaint_new/textedit.h
index d7bc6673c1d..4ff6370ac57 100644
--- a/reactos/base/applications/mspaint_new/textedit.h
+++ b/reactos/base/applications/mspaint_new/textedit.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/textedit.h
+ * FILE:        base/applications/mspaint_new/textedit.h
  * PURPOSE:     Text editor and font chooser for the text tool
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/toolsettings.c b/reactos/base/applications/mspaint_new/toolsettings.cpp
similarity index 94%
rename from reactos/base/applications/mspaint_new/toolsettings.c
rename to reactos/base/applications/mspaint_new/toolsettings.cpp
index 484f0f2a41a..3ec53813caf 100644
--- a/reactos/base/applications/mspaint_new/toolsettings.c
+++ b/reactos/base/applications/mspaint_new/toolsettings.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/toolsettings.c
+ * FILE:        base/applications/mspaint_new/toolsettings.cpp
  * PURPOSE:     Window procedure of the tool settings window
  * PROGRAMMERS: Benedikt Freisen
  */
@@ -58,7 +58,7 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 case TOOL_RECTSEL:
                 case TOOL_TEXT:
                 {
-                    HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
+                    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
                     SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT));
                     Rectangle(hdc, 2, transpBg * 31 + 2, 41, transpBg * 31 + 33);
                     DeleteObject(SelectObject(hdc, oldPen));
@@ -69,7 +69,7 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 case TOOL_RUBBER:
                 {
                     int i;
-                    HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
+                    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
                     for(i = 0; i < 4; i++)
                     {
                         if (rubberRadius == i + 2)
@@ -88,7 +88,7 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 case TOOL_BRUSH:
                 {
                     int i;
-                    HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
+                    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
                     SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT));
                     Rectangle(hdc, brushStyle % 3 * 13 + 2, brushStyle / 3 * 15 + 2, brushStyle % 3 * 13 + 15,
                               brushStyle / 3 * 15 + 17);
@@ -100,7 +100,7 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 }
                 case TOOL_AIRBRUSH:
                 {
-                    HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
+                    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
                     SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT));
                     switch (airBrushWidth)
                     {
@@ -132,7 +132,7 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 case TOOL_BEZIER:
                 {
                     int i;
-                    HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
+                    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
                     for(i = 0; i < 5; i++)
                     {
                         if (lineWidth == i + 1)
@@ -154,7 +154,7 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 case TOOL_RRECT:
                 {
                     int i;
-                    HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
+                    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
                     for(i = 0; i < 3; i++)
                     {
                         if (shapeStyle == i)
diff --git a/reactos/base/applications/mspaint_new/toolsettings.h b/reactos/base/applications/mspaint_new/toolsettings.h
index bbe3fcf1078..b1a1a2c69c3 100644
--- a/reactos/base/applications/mspaint_new/toolsettings.h
+++ b/reactos/base/applications/mspaint_new/toolsettings.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/toolsettings.h
+ * FILE:        base/applications/mspaint_new/toolsettings.h
  * PURPOSE:     Window procedure of the tool settings window
  * PROGRAMMERS: Benedikt Freisen
  */
diff --git a/reactos/base/applications/mspaint_new/winproc.c b/reactos/base/applications/mspaint_new/winproc.cpp
similarity index 97%
rename from reactos/base/applications/mspaint_new/winproc.c
rename to reactos/base/applications/mspaint_new/winproc.cpp
index 6e299afc628..d990e0e7a56 100644
--- a/reactos/base/applications/mspaint_new/winproc.c
+++ b/reactos/base/applications/mspaint_new/winproc.cpp
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/winproc.c
+ * FILE:        base/applications/mspaint_new/winproc.cpp
  * PURPOSE:     Window procedure of the main window and all children apart from
  *              hPalWin, hToolSettings and hSelection
  * PROGRAMMERS: Benedikt Freisen
@@ -115,9 +115,9 @@ drawZoomFrame(int mouseX, int mouseY)
     y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2));
 
     hdc = GetDC(hImageArea);
-    oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 0, 0));
+    oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 0, 0));
     logbrush.lbStyle = BS_HOLLOW;
-    oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush));
+    oldBrush = (HBRUSH) SelectObject(hdc, CreateBrushIndirect(&logbrush));
     rop = SetROP2(hdc, R2_NOT);
     Rectangle(hdc, x, y, x + w, y + h);
     SetROP2(hdc, rop);
@@ -209,9 +209,9 @@ InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window)
     SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELONG(TRUE, 0));
     SendMessage(window, WM_COMMAND, ID_RECTSEL, 0);
 
-    DeleteObject(SelectObject(hSelDC, hSelBm = CopyImage(bitmap,
-                                                         IMAGE_BITMAP, 0, 0,
-                                                         LR_COPYRETURNORG)));
+    DeleteObject(SelectObject(hSelDC, hSelBm = (HBITMAP) CopyImage(bitmap,
+                                                                   IMAGE_BITMAP, 0, 0,
+                                                                   LR_COPYRETURNORG)));
     newReversible();
     SetRectEmpty(&rectSel_src);
     rectSel_dest.left = rectSel_dest.top = 0;
@@ -411,7 +411,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                            imgYRes, SRCCOPY);
                 if (showGrid && (zoom >= 4000))
                 {
-                    HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, 0x00a0a0a0));
+                    HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, 0x00a0a0a0));
                     int counter;
                     for(counter = 0; counter <= imgYRes; counter++)
                     {
@@ -522,7 +522,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 InvalidateRect(hImageArea, NULL, FALSE);
                 if (activeTool == TOOL_COLOR)
                 {
-                    int tempColor =
+                    COLORREF tempColor =
                         GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom);
                     if (tempColor != CLR_INVALID)
                         fgColor = tempColor;
@@ -542,7 +542,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 InvalidateRect(hImageArea, NULL, FALSE);
                 if (activeTool == TOOL_COLOR)
                 {
-                    int tempColor =
+                    COLORREF tempColor =
                         GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / zoom, GET_Y_LPARAM(lParam) * 1000 / zoom);
                     if (tempColor != CLR_INVALID)
                         bgColor = tempColor;
@@ -788,7 +788,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                     OpenClipboard(hMainWnd);
                     if (GetClipboardData(CF_BITMAP) != NULL)
                     {
-                        InsertSelectionFromHBITMAP(GetClipboardData(CF_BITMAP), hwnd);
+                        InsertSelectionFromHBITMAP((HBITMAP) GetClipboardData(CF_BITMAP), hwnd);
                     }
                     CloseClipboard();
                     break;
@@ -946,9 +946,9 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 {
                     if (changeSizeDlg())
                     {
-                        insertReversible(CopyImage(hBms[currInd], IMAGE_BITMAP,
-                                                   imgXRes * stretchSkew.percentage.x / 100,
-                                                   imgYRes * stretchSkew.percentage.y / 100, 0));
+                        insertReversible((HBITMAP) CopyImage(hBms[currInd], IMAGE_BITMAP,
+                                                             imgXRes * stretchSkew.percentage.x / 100,
+                                                             imgYRes * stretchSkew.percentage.y / 100, 0));
                         updateCanvasAndScrollbars();
                     }
                     break;
@@ -958,7 +958,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                     InvalidateRect(hToolSettings, NULL, TRUE);
                     break;
                 case IDM_IMAGECROP:
-                    insertReversible(CopyImage(hSelBm, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG));
+                    insertReversible((HBITMAP) CopyImage(hSelBm, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG));
                     updateCanvasAndScrollbars();
                     break;
 
diff --git a/reactos/base/applications/mspaint_new/winproc.h b/reactos/base/applications/mspaint_new/winproc.h
index 0c316148821..523b835baac 100644
--- a/reactos/base/applications/mspaint_new/winproc.h
+++ b/reactos/base/applications/mspaint_new/winproc.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        base/applications/paint/winproc.h
+ * FILE:        base/applications/mspaint_new/winproc.h
  * PURPOSE:     Window procedure of the main window and all children apart from
  *              hPalWin, hToolSettings and hSelection
  * PROGRAMMERS: Benedikt Freisen