Author: dreimer Date: Mon Mar 24 11:43:34 2008 New Revision: 32762
URL: http://svn.reactos.org/svn/reactos?rev=3D32762&view=3Drev Log: Update WordPad to recent Wine CVS. Fixes some strange behavior for me.
Modified: trunk/reactos/base/applications/wordpad/wordpad.c
Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wor= dpad/wordpad.c?rev=3D32762&r1=3D32761&r2=3D32762&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/applications/wordpad/wordpad.c (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c Mon Mar 24 11:43:34 2= 008 @@ -350,7 +350,7 @@ fmt.cbSize =3D sizeof(fmt); =
SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt= ); - SendMessageW(hFontListEdit, WM_GETTEXT, MAX_PATH, (LPARAM)fontName); + if (!SendMessageW(hFontListEdit, WM_GETTEXT, MAX_PATH, (LPARAM)fontNam= e)) return; =
if(lstrcmpW(fontName, fmt.szFaceName)) { @@ -1212,7 +1212,7 @@ MultiByteToWideChar(CP_ACP, 0, string, -1, buffer, MAX_STRING_LEN); } =
-BOOL CALLBACK datetime_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM= lParam) +static INT_PTR CALLBACK datetime_proc(HWND hWnd, UINT message, WPARAM wPar= am, LPARAM lParam) { switch(message) { @@ -1263,7 +1263,7 @@ return FALSE; } =
-BOOL CALLBACK newfile_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM = lParam) +static INT_PTR CALLBACK newfile_proc(HWND hWnd, UINT message, WPARAM wPara= m, LPARAM lParam) { switch(message) { @@ -1844,7 +1844,7 @@ { HINSTANCE hInstance =3D (HINSTANCE)GetWindowLongPtr(hWnd, GWLP= _HINSTANCE); int ret =3D DialogBox(hInstance, MAKEINTRESOURCE(IDD_NEWFILE),= hWnd, - (DLGPROC)newfile_proc); + newfile_proc); =
if(ret !=3D ID_NEWFILE_ABORT) { @@ -2160,7 +2160,7 @@ case ID_DATETIME: { HINSTANCE hInstance =3D (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HIN= STANCE); - DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_DATETIME), hWnd, (DLGPR= OC)datetime_proc); + DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_DATETIME), hWnd, dateti= me_proc); break; } =
@@ -2269,7 +2269,6 @@ HWND hwndReBar =3D GetDlgItem(hWnd, IDC_REBAR); HWND hRulerWnd =3D GetDlgItem(hWnd, IDC_RULER); int rebarHeight =3D 0; - int rebarRows =3D 2; =
if (hwndStatusBar) { @@ -2285,13 +2284,7 @@ } if (hwndReBar) { - if(!is_bar_visible(BANDID_TOOLBAR)) - rebarRows--; - - if(!is_bar_visible(BANDID_FORMATBAR)) - rebarRows--; - - rebarHeight =3D rebarRows ? SendMessageW(hwndReBar, RB_GETBARHEIGH= T, 0, 0) : 0; + rebarHeight =3D SendMessageW(hwndReBar, RB_GETBARHEIGHT, 0, 0); =
MoveWindow(hwndReBar, 0, 0, LOWORD(lParam), rebarHeight, TRUE); }