Byeong-Sik Jeon : comdlg32: Show better font style information in fontdlg.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Sep 25 09:46:50 CDT 2006


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

Author: Byeong-Sik Jeon <wjsqudtlr at gmail.com>
Date:   Thu Sep 14 21:10:19 2006 +0900

comdlg32: Show better font style information in fontdlg.

---

 dlls/comdlg32/fontdlg.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c
index 4db8d22..9d4c27b 100644
--- a/dlls/comdlg32/fontdlg.c
+++ b/dlls/comdlg32/fontdlg.c
@@ -386,13 +386,14 @@ #define FSTYLES 4
         hf=SelectObject(hdc,hf);
         DeleteObject(hf);
                 /* font successful created ? */
-        if (tm.tmWeight==fontstyles[i].weight &&
+        if (((fontstyles[i].weight == FW_NORMAL && tm.tmWeight <= FW_MEDIUM) ||
+             (fontstyles[i].weight == FW_BOLD && tm.tmWeight > FW_MEDIUM)) &&
             ((tm.tmItalic != 0)==fontstyles[i].italic))
         {
             j=SendMessageW(hwnd,CB_ADDSTRING,0,(LPARAM)fontstyles[i].stname );
             if (j==CB_ERR) return 1;
             j=SendMessageW(hwnd, CB_SETITEMDATA, j,
-                           MAKELONG(fontstyles[i].weight,fontstyles[i].italic));
+                           MAKELONG(tm.tmWeight,fontstyles[i].italic));
             if (j==CB_ERR) return 1;
         }
     }




More information about the wine-cvs mailing list