* Sync with recent trunk (r52637).

[reactos.git] / base / applications / mspaint / main.c

diff --git a/base/applications/paint/main.c b/base/applications/mspaint/main.c
similarity index 99%
rename from base/applications/paint/main.c
rename to base/applications/mspaint/main.c
index 3c77cb2..a103af9 100644 (file)
--- a/base/applications/paint/main.c
+++ b/base/applications/mspaint/main.c
@@ -43,10 +43,10 @@ int undoSteps = 0;
 int redoSteps = 0;
 BOOL imageSaved = TRUE;
 
 int redoSteps = 0;
 BOOL imageSaved = TRUE;
 

-short startX;
-short startY;
-short lastX;
-short lastY;
+LONG startX;
+LONG startY;
+LONG lastX;
+LONG lastY;

 int lineWidth = 1;
 int shapeStyle = 0;
 int brushStyle = 0;
 int lineWidth = 1;
 int shapeStyle = 0;
 int brushStyle = 0;


@@ -168,8 +168,8 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument
     wincl.lpfnWndProc       = WindowProcedure;
     wincl.style             = CS_DBLCLKS;
     wincl.cbSize            = sizeof(WNDCLASSEX);
     wincl.lpfnWndProc       = WindowProcedure;
     wincl.style             = CS_DBLCLKS;
     wincl.cbSize            = sizeof(WNDCLASSEX);

-    wincl.hIcon             = LoadIcon(NULL, IDI_APPLICATION);
-    wincl.hIconSm           = LoadIcon(hThisInstance, MAKEINTRESOURCE(500));
+    wincl.hIcon             = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON));
+    wincl.hIconSm           = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON));

     wincl.hCursor           = LoadCursor(NULL, IDC_ARROW);
     wincl.lpszMenuName      = NULL;
     wincl.cbClsExtra        = 0;
     wincl.hCursor           = LoadCursor(NULL, IDC_ARROW);
     wincl.lpszMenuName      = NULL;
     wincl.cbClsExtra        = 0;