[ros-diffs] [akhaldi] 71537: [WORDPAD] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Sun Jun  5 18:35:43 2016
New Revision: 71537

URL: http://svn.reactos.org/svn/reactos?rev=71537&view=rev
Log:
[WORDPAD] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/reactos/base/applications/wordpad/registry.c
    trunk/reactos/base/applications/wordpad/wordpad.c
    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] Sun Jun  5 18:35:43
2016
@@ -156,9 +156,9 @@
 {
     LPWSTR pos_basename;
     LPWSTR truncpos1, truncpos2;
-    WCHAR myDocs[MAX_STRING_LEN];
-
-    SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT,
(LPWSTR)&myDocs);
+    WCHAR myDocs[MAX_PATH];
+
+    SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, 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] Sun Jun  5 18:35:43
2016
@@ -1229,7 +1229,7 @@
         if (pFr->lpstrFindWhat != custom_data->findBuffer)
         {
             lstrcpynW(custom_data->findBuffer, pFr->lpstrFindWhat,
-                      _countof(custom_data->findBuffer));
+                      sizeof(custom_data->findBuffer) / sizeof(WCHAR));
             pFr->lpstrFindWhat = custom_data->findBuffer;
         }
 

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] Sun Jun  5 18:35:43 2016
@@ -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.9.11
-reactos/base/applications/wordpad           # Synced to WineStaging-1.9.4
+reactos/base/applications/wordpad           # Synced to WineStaging-1.9.11
 reactos/base/services/rpcss                 # Synced to WineStaging-1.9.4
 reactos/base/shell/progman                  # Forked at WineStaging-1.9.4
 reactos/base/system/expand                  # Synced to WineStaging-1.9.4