[ros-diffs] [akhaldi] 70123: [WORDPAD] Sync with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Thu Nov 26 22:46:03 2015
New Revision: 70123

URL: http://svn.reactos.org/svn/reactos?rev=70123&view=rev
Log:
[WORDPAD] Sync with Wine Staging 1.7.55. CORE-10536

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

Modified: trunk/reactos/base/applications/wordpad/registry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/registry.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/registry.c	[iso-8859-1] Thu Nov 26 22:46:03
2015
@@ -156,9 +156,9 @@
 {
     LPWSTR pos_basename;
     LPWSTR truncpos1, truncpos2;
-    WCHAR myDocs[MAX_PATH];
-
-    SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, myDocs);
+    WCHAR myDocs[MAX_STRING_LEN];
+
+    SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT,
(LPWSTR)&myDocs);
     pos_basename = file_basename(file);
     truncpos1 = NULL;
     truncpos2 = NULL;

Modified: trunk/reactos/base/applications/wordpad/wordpad.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.c	[iso-8859-1] Thu Nov 26 22:46:03
2015
@@ -2479,55 +2479,50 @@
     MENUITEMINFOW mi;
 
     SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&selFrom, (LPARAM)&selTo);
-    EnableMenuItem(hMenu, ID_EDIT_COPY, MF_BYCOMMAND|(selFrom == selTo) ? MF_GRAYED :
MF_ENABLED);
-    EnableMenuItem(hMenu, ID_EDIT_CUT, MF_BYCOMMAND|(selFrom == selTo) ? MF_GRAYED :
MF_ENABLED);
+    EnableMenuItem(hMenu, ID_EDIT_COPY, (selFrom == selTo) ? MF_GRAYED : MF_ENABLED);
+    EnableMenuItem(hMenu, ID_EDIT_CUT, (selFrom == selTo) ? MF_GRAYED : MF_ENABLED);
 
     pf.cbSize = sizeof(PARAFORMAT);
     SendMessageW(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf);
     CheckMenuItem(hMenu, ID_EDIT_READONLY,
-      MF_BYCOMMAND|(GetWindowLongW(hwndEditor, GWL_STYLE)&ES_READONLY ? MF_CHECKED :
MF_UNCHECKED));
+      (GetWindowLongW(hwndEditor, GWL_STYLE) & ES_READONLY) ? MF_CHECKED :
MF_UNCHECKED);
     CheckMenuItem(hMenu, ID_EDIT_MODIFIED,
-      MF_BYCOMMAND|(SendMessageW(hwndEditor, EM_GETMODIFY, 0, 0) ? MF_CHECKED :
MF_UNCHECKED));
+      SendMessageW(hwndEditor, EM_GETMODIFY, 0, 0) ? MF_CHECKED : MF_UNCHECKED);
     if (pf.dwMask & PFM_ALIGNMENT)
         nAlignment = pf.wAlignment;
-    CheckMenuItem(hMenu, ID_ALIGN_LEFT, MF_BYCOMMAND|(nAlignment == PFA_LEFT) ?
+    CheckMenuItem(hMenu, ID_ALIGN_LEFT, (nAlignment == PFA_LEFT) ?  MF_CHECKED :
MF_UNCHECKED);
+    CheckMenuItem(hMenu, ID_ALIGN_CENTER, (nAlignment == PFA_CENTER) ?  MF_CHECKED :
MF_UNCHECKED);
+    CheckMenuItem(hMenu, ID_ALIGN_RIGHT, (nAlignment == PFA_RIGHT) ?  MF_CHECKED :
MF_UNCHECKED);
+    CheckMenuItem(hMenu, ID_BULLET, ((pf.wNumbering == PFN_BULLET) ?  MF_CHECKED :
MF_UNCHECKED));
+    EnableMenuItem(hMenu, ID_EDIT_UNDO, SendMessageW(hwndEditor, EM_CANUNDO, 0, 0) ?
+            MF_ENABLED : MF_GRAYED);
+    EnableMenuItem(hMenu, ID_EDIT_REDO, SendMessageW(hwndEditor, EM_CANREDO, 0, 0) ?
+            MF_ENABLED : MF_GRAYED);
+
+    CheckMenuItem(hMenu, ID_TOGGLE_TOOLBAR, is_bar_visible(BANDID_TOOLBAR) ?
             MF_CHECKED : MF_UNCHECKED);
-    CheckMenuItem(hMenu, ID_ALIGN_CENTER, MF_BYCOMMAND|(nAlignment == PFA_CENTER) ?
+
+    CheckMenuItem(hMenu, ID_TOGGLE_FORMATBAR, is_bar_visible(BANDID_FORMATBAR) ?
             MF_CHECKED : MF_UNCHECKED);
-    CheckMenuItem(hMenu, ID_ALIGN_RIGHT, MF_BYCOMMAND|(nAlignment == PFA_RIGHT) ?
+
+    CheckMenuItem(hMenu, ID_TOGGLE_STATUSBAR, IsWindowVisible(hwndStatus) ?
             MF_CHECKED : MF_UNCHECKED);
-    CheckMenuItem(hMenu, ID_BULLET, MF_BYCOMMAND | ((pf.wNumbering == PFN_BULLET) ?
-            MF_CHECKED : MF_UNCHECKED));
-    EnableMenuItem(hMenu, ID_EDIT_UNDO, MF_BYCOMMAND|(SendMessageW(hwndEditor,
EM_CANUNDO, 0, 0)) ?
-            MF_ENABLED : MF_GRAYED);
-    EnableMenuItem(hMenu, ID_EDIT_REDO, MF_BYCOMMAND|(SendMessageW(hwndEditor,
EM_CANREDO, 0, 0)) ?
-            MF_ENABLED : MF_GRAYED);
-
-    CheckMenuItem(hMenu, ID_TOGGLE_TOOLBAR, MF_BYCOMMAND|(is_bar_visible(BANDID_TOOLBAR))
?
-            MF_CHECKED : MF_UNCHECKED);
-
-    CheckMenuItem(hMenu, ID_TOGGLE_FORMATBAR,
MF_BYCOMMAND|(is_bar_visible(BANDID_FORMATBAR)) ?
-            MF_CHECKED : MF_UNCHECKED);
-
-    CheckMenuItem(hMenu, ID_TOGGLE_STATUSBAR, MF_BYCOMMAND|IsWindowVisible(hwndStatus) ?
-            MF_CHECKED : MF_UNCHECKED);
-
-    CheckMenuItem(hMenu, ID_TOGGLE_RULER, MF_BYCOMMAND|(is_bar_visible(BANDID_RULER)) ?
MF_CHECKED : MF_UNCHECKED);
+
+    CheckMenuItem(hMenu, ID_TOGGLE_RULER, is_bar_visible(BANDID_RULER) ? MF_CHECKED :
MF_UNCHECKED);
 
     gt.flags = GTL_NUMCHARS;
     gt.codepage = 1200;
     textLength = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0);
-    EnableMenuItem(hMenu, ID_FIND, MF_BYCOMMAND|(textLength ? MF_ENABLED : MF_GRAYED));
+    EnableMenuItem(hMenu, ID_FIND, textLength ? MF_ENABLED : MF_GRAYED);
 
     mi.cbSize = sizeof(mi);
     mi.fMask = MIIM_DATA;
 
     GetMenuItemInfoW(hMenu, ID_FIND_NEXT, FALSE, &mi);
 
-    EnableMenuItem(hMenu, ID_FIND_NEXT, MF_BYCOMMAND|((textLength &&
mi.dwItemData) ?
-                   MF_ENABLED : MF_GRAYED));
-
-    EnableMenuItem(hMenu, ID_REPLACE, MF_BYCOMMAND|(textLength ? MF_ENABLED :
MF_GRAYED));
+    EnableMenuItem(hMenu, ID_FIND_NEXT, (textLength && mi.dwItemData) ? 
MF_ENABLED : MF_GRAYED);
+
+    EnableMenuItem(hMenu, ID_REPLACE, textLength ? MF_ENABLED : MF_GRAYED);
 
     return 0;
 }

Modified: trunk/reactos/base/applications/wordpad/wordpad.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.h	[iso-8859-1] Thu Nov 26 22:46:03
2015
@@ -184,9 +184,8 @@
 #define IDB_FORMATBAR 101
 
 #define IDI_WORDPAD 102
-#define IDI_RTFDOC  103
-
-#define IDC_ZOOM 104
+
+#define IDC_ZOOM 103
 
 #define STRING_ALL_FILES 1400
 #define STRING_TEXT_FILES_TXT 1401

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Thu Nov 26 22:46:03 2015
@@ -240,7 +240,7 @@
 reactos/base/applications/notepad           # Forked at Wine-20041201
 reactos/base/applications/regedit           # Out of sync
 reactos/base/applications/winhlp32          # Synced to WineStaging-1.7.55
-reactos/base/applications/wordpad           # Synced to WineStaging-1.7.37
+reactos/base/applications/wordpad           # Synced to WineStaging-1.7.55
 reactos/base/services/rpcss                 # Synced to WineStaging-1.7.37
 reactos/base/system/expand                  # Synced to WineStaging-1.7.47
 reactos/base/system/msiexec                 # Synced to WineStaging-1.7.47