ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use build-in mechanisms(rbuild) to define UNICODE and friends.

Browse Source 
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
This commit is contained in:
Samuel Serapion
2008-09-17 05:15:51 +00:00
parent dbf0f4225c
commit 46fe903e03
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/applications/wordpad/wordpad.c
+6 -3
View File
@@ -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;
reactos/base/applications/wordpad/wordpad.rbuild
+1 -3
View File
@@ -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>