Ulrich Czekalla : commdlg: Properly set and retrieve colour value from combo box .

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: a6431c3868f798fcf1d1f75d0e019e2cd5facefd
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=a6431c3868f798fcf1d1f75d...

Author: Ulrich Czekalla <ulrich(a)codeweavers.com>
Date:   Mon Mar 27 11:33:56 2006 -0500

commdlg: Properly set and retrieve colour value from combo box .

---

 dlls/commdlg/fontdlg.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c
index b85bcae..a80e3c1 100644
--- a/dlls/commdlg/fontdlg.c
+++ b/dlls/commdlg/fontdlg.c
@@ -632,9 +632,9 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPAR
                 memcpy(name, strColorName, sizeof(strColorName));
             }
             j=SendDlgItemMessageW(hDlg, cmb4, CB_ADDSTRING, 0, (LPARAM)name);
-            SendDlgItemMessageW(hDlg, cmb4, CB_SETITEMDATA, j, textcolors[j]);
+            SendDlgItemMessageW(hDlg, cmb4, CB_SETITEMDATA, j, textcolors[i]);
             /* look for a fitting value in color combobox */
-            if (textcolors[j]==lpcf->rgbColors)
+            if (textcolors[i]==lpcf->rgbColors)
                 SendDlgItemMessageW(hDlg,cmb4, CB_SETCURSEL,j,0);
         }
     }
@@ -994,7 +994,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM 
         {
             WINDOWINFO wininfo;
 
-            lpcf->rgbColors=textcolors[i];
+            lpcf->rgbColors = SendDlgItemMessageW(hDlg, cmb4, CB_GETITEMDATA, i, 0);
             wininfo.cbSize=sizeof(wininfo);
 
             if( GetWindowInfo( GetDlgItem( hDlg, stc5), &wininfo ) )