Sync to Wine-0_9_4:
authorGé van Geldorp <ge@gse.nl>
Mon, 26 Dec 2005 22:57:56 +0000 (22:57 +0000)
committerGé van Geldorp <ge@gse.nl>
Mon, 26 Dec 2005 22:57:56 +0000 (22:57 +0000)
Eric Pouech <eric.pouech@wanadoo.fr>
- Const correctness fixes.
- Removed some dead-code.

svn path=/trunk/; revision=20346

reactos/lib/comdlg32/finddlg32.c
reactos/lib/comdlg32/fontdlg.c

index 20f9e34..6225773 100644 (file)
@@ -385,7 +385,7 @@ static HWND COMDLG32_FR_DoFindReplace(
                        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
                         {
index 1f9980b..b6ad99c 100644 (file)
@@ -1076,7 +1076,6 @@ LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcf)
         HDC hdc;
         HPEN hOrigPen;
         HFONT hOrigFont;
-        COLORREF rgbPrev;
         LOGFONTW lf = *(lpcf->lpLogFont);
 
         MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2);
@@ -1104,7 +1103,7 @@ LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcf)
         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]],