From 46fe903e03119f67802b5484ceb57f2f064b5818 Mon Sep 17 00:00:00 2001 From: Samuel Serapion Date: Wed, 17 Sep 2008 05:15:51 +0000 Subject: [PATCH] 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) svn path=/branches/ros-amd64-bringup/; revision=36279 --- reactos/base/applications/wordpad/wordpad.c | 9 ++++++--- reactos/base/applications/wordpad/wordpad.rbuild | 4 +--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/reactos/base/applications/wordpad/wordpad.c b/reactos/base/applications/wordpad/wordpad.c index 0fb22b40847..9bdd33f1438 100644 --- a/reactos/base/applications/wordpad/wordpad.c +++ b/reactos/base/applications/wordpad/wordpad.c @@ -1948,7 +1948,7 @@ static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam) 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 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara 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; diff --git a/reactos/base/applications/wordpad/wordpad.rbuild b/reactos/base/applications/wordpad/wordpad.rbuild index 586227095c7..0663c07759b 100644 --- a/reactos/base/applications/wordpad/wordpad.rbuild +++ b/reactos/base/applications/wordpad/wordpad.rbuild @@ -1,9 +1,7 @@ - + . - - 0x0600 0x0501 comdlg32