Sync to Wine-0_9_4: Eric Pouech eric.pouech@wanadoo.fr - Const correctness fixes. - Removed some dead-code. Modified: trunk/reactos/lib/comdlg32/finddlg32.c Modified: trunk/reactos/lib/comdlg32/fontdlg.c _____
Modified: trunk/reactos/lib/comdlg32/finddlg32.c --- trunk/reactos/lib/comdlg32/finddlg32.c 2005-12-26 22:56:31 UTC (rev 20345) +++ trunk/reactos/lib/comdlg32/finddlg32.c 2005-12-26 22:57:56 UTC (rev 20346) @@ -385,7 +385,7 @@
hmod = (HMODULE)pdata->fr.hInstance; if(pdata->fr.Flags & FR_WINE_UNICODE) { - htemplate = FindResourceW(hmod, (LPWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOG); + htemplate = FindResourceW(hmod, (LPCWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOG); } else { _____
Modified: trunk/reactos/lib/comdlg32/fontdlg.c --- trunk/reactos/lib/comdlg32/fontdlg.c 2005-12-26 22:56:31 UTC (rev 20345) +++ trunk/reactos/lib/comdlg32/fontdlg.c 2005-12-26 22:57:56 UTC (rev 20346) @@ -1076,7 +1076,6 @@
HDC hdc; HPEN hOrigPen; HFONT hOrigFont; - COLORREF rgbPrev; LOGFONTW lf = *(lpcf->lpLogFont);
MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2); @@ -1104,7 +1103,7 @@ info.rcWindow.top++; info.rcWindow.left++; hOrigFont = SelectObject( hdc, CreateFontIndirectW( &lf ) ); - rgbPrev=SetTextColor( hdc, lpcf->rgbColors ); + SetTextColor( hdc, lpcf->rgbColors );
DrawTextW( hdc,
sample_lang_text[CHARSET_ORDER[lpcf->lpLogFont->lfCharSet]],