[ros-diffs] [sserapion] 36279: Use build-in mechanisms(rbuild) to define UNICODE and friends. Fix a small warning about SetWindowText. Use correct definition of WinMain(not a CALLBACK by any means, somehow this caused real WIN64 to think this wasn't a valid application)

Author: sserapion
Date: Wed Sep 17 00:15:51 2008
New Revision: 36279

URL: http://svn.reactos.org/svn/reactos?rev=36279&view=rev
Log:
Use build-in mechanisms(rbuild) to define UNICODE and friends.
Fix a small warning about SetWindowText.
Use correct definition of WinMain(not a CALLBACK by any means, somehow this caused real
WIN64 to think this wasn't a valid application)

Modified:
    branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c
    branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild

Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c [iso-8859-1]
Wed Sep 17 00:15:51 2008
@@ -1948,7 +1948,7 @@
         sprintf( buf,"selection = %d..%d, line count=%ld",
                  pSC->chrg.cpMin, pSC->chrg.cpMax,
         SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0));
-        SetWindowText(GetDlgItem(hWnd, IDC_STATUSBAR), buf);
+        SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf);
         SendMessage(hWnd, WM_USER, 0, 0);
         return 1;
     }
@@ -2528,8 +2528,11 @@
 
     return 0;
 }
-
-int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph,
int nCmdShow)
+#if defined(__GNUC__) && !defined(__REACTOS__)
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int
nCmdShow)
+#else
+int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPTSTR szCmdParagraph,
int nCmdShow)
+#endif
 {
     INITCOMMONCONTROLSEX classes = {8,
ICC_BAR_CLASSES|ICC_COOL_CLASSES|ICC_USEREX_CLASSES};
     HACCEL hAccel;

Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild
[iso-8859-1] Wed Sep 17 00:15:51 2008
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="wordpad" type="win32gui"
installbase="system32" installname="wordpad.exe"
allowwarnings="true">
+<module name="wordpad" type="win32gui"
installbase="system32" installname="wordpad.exe"
allowwarnings="true" unicode="yes">
 	<include base="wordpad">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>comdlg32</library>