- Synced to Wine-1.7.9.
authorJames Tabor <james.tabor@reactos.org>
Thu, 26 Dec 2013 06:34:56 +0000 (06:34 +0000)
committerJames Tabor <james.tabor@reactos.org>
Thu, 26 Dec 2013 06:34:56 +0000 (06:34 +0000)
svn path=/trunk/; revision=61422

reactos/base/applications/wordpad/print.c
reactos/base/applications/wordpad/wordpad.c
reactos/media/doc/README.WINE

index 77e1f60..b2b6769 100644 (file)
@@ -1146,7 +1146,7 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
         {
             POINT pt;
             RECT rc;
-            int bHittest = FALSE;
+            int bHittest = 0;
             DWORD messagePos = GetMessagePos();
             pt.x = (short)LOWORD(messagePos);
             pt.y = (short)HIWORD(messagePos);
index bc5aba2..3e0e7f3 100644 (file)
@@ -573,7 +573,7 @@ static void dialog_choose_font(void)
     cf.lStructSize = sizeof(cf);
     cf.hwndOwner = hMainWnd;
     cf.lpLogFont = &lf;
-    cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_EFFECTS;
+    cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_EFFECTS | CF_NOVERTFONTS;
 
     ZeroMemory(&fmt, sizeof(fmt));
     fmt.cbSize = sizeof(fmt);
@@ -616,6 +616,8 @@ static int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lp
 {
     HWND hListWnd = (HWND) lParam;
 
+    if (lpelfe->lfFaceName[0] == '@') return 1;  /* ignore vertical fonts */
+
     if(SendMessageW(hListWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)lpelfe->lfFaceName) == CB_ERR)
     {
 
@@ -1149,7 +1151,7 @@ static void dialog_viewproperties(void)
 static void HandleCommandLine(LPWSTR cmdline)
 {
     WCHAR delimiter;
-    int opt_print = 0;
+    BOOL opt_print = FALSE;
 
     /* skip white space */
     while (*cmdline == ' ') cmdline++;
@@ -1173,7 +1175,7 @@ static void HandleCommandLine(LPWSTR cmdline)
                 {
                 case 'P':
                 case 'p':
-                    opt_print = 1;
+                    opt_print = TRUE;
                     cmdline += 2;
                     continue;
                 }
@@ -2011,7 +2013,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam)
                 on_fontlist_modified(endEdit->szText);
             } else if (pHdr->hwndFrom == hwndSizeList)
             {
-                on_sizelist_modified(hwndFontList,endEdit->szText);
+                on_sizelist_modified(hwndSizeList,endEdit->szText);
             }
         }
         return 0;
index c097afb..3fede64 100644 (file)
@@ -236,7 +236,7 @@ reactos/base/applications/iexplore          # Synced to Wine-1.7.1
 reactos/base/applications/notepad           # Forked at Wine-20041201
 reactos/base/applications/regedit           # Out of sync
 reactos/base/applications/winhlp32          # Synced to Wine-1.5.26
-reactos/base/applications/wordpad           # Synced to Wine-1.5.26
+reactos/base/applications/wordpad           # Synced to Wine-1.7.9
 reactos/base/services/rpcss                 # Synced to Wine-1.7.1
 reactos/base/system/expand                  # Synced to Wine-1.7.1
 reactos/base/system/msiexec                 # Synced to Wine-1.7.1