[ros-diffs] [jimtabor] 61422: - Synced to Wine-1.7.9.

Author: jimtabor
Date: Thu Dec 26 06:34:56 2013
New Revision: 61422

URL: http://svn.reactos.org/svn/reactos?rev=61422&view=rev
Log:
- Synced to Wine-1.7.9.

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

Modified: trunk/reactos/base/applications/wordpad/print.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/p...
==============================================================================
--- trunk/reactos/base/applications/wordpad/print.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/print.c	[iso-8859-1] Thu Dec 26 06:34:56 2013
@@ -1146,7 +1146,7 @@
         {
             POINT pt;
             RECT rc;
-            int bHittest = FALSE;
+            int bHittest = 0;
             DWORD messagePos = GetMessagePos();
             pt.x = (short)LOWORD(messagePos);
             pt.y = (short)HIWORD(messagePos);

Modified: trunk/reactos/base/applications/wordpad/wordpad.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/w...
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.c	[iso-8859-1] Thu Dec 26 06:34:56 2013
@@ -573,7 +573,7 @@
     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);
@@ -615,6 +615,8 @@
                             DWORD FontType, LPARAM lParam)
 {
     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 HandleCommandLine(LPWSTR cmdline)
 {
     WCHAR delimiter;
-    int opt_print = 0;
+    BOOL opt_print = FALSE;

/* skip white space */
     while (*cmdline == ' ') cmdline++;
@@ -1173,7 +1175,7 @@
                 {
                 case 'P':
                 case 'p':
-                    opt_print = 1;
+                    opt_print = TRUE;
                     cmdline += 2;
                     continue;
                 }
@@ -2011,7 +2013,7 @@
                 on_fontlist_modified(endEdit->szText);
             } else if (pHdr->hwndFrom == hwndSizeList)
             {
-                on_sizelist_modified(hwndFontList,endEdit->szText);
+                on_sizelist_modified(hwndSizeList,endEdit->szText);
             }
         }
         return 0;

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Thu Dec 26 06:34:56 2013
@@ -236,7 +236,7 @@
 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