[ros-diffs] 01/01: [WRITE] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=905c9ea7b1aac186e5b5a…

commit 905c9ea7b1aac186e5b5a1a2242f55e31b703aab
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun Apr 1 13:10:37 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun Apr 1 13:10:37 2018 +0100

    [WRITE] Sync with Wine Staging 3.3. CORE-14434
---
 base/applications/write/resources.h | 5 ++++-
 base/applications/write/rsrc.rc     | 3 ---
 base/applications/write/write.c     | 6 +++---
 media/doc/README.WINE               | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/base/applications/write/resources.h b/base/applications/write/resources.h
index 0aac99e176..bcf716f7d3 100644
--- a/base/applications/write/resources.h
+++ b/base/applications/write/resources.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#pragma once
+#include <windef.h>
+#ifdef __REACTOS__
+#include <winuser.h>
+#endif
 
 #define IDS_FAILED 101
diff --git a/base/applications/write/rsrc.rc b/base/applications/write/rsrc.rc
index 362ce94ea6..c5f4fd92c9 100644
--- a/base/applications/write/rsrc.rc
+++ b/base/applications/write/rsrc.rc
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-#include <winuser.h>
-
 #include "resources.h"
 
 #include <reactos/manifest_exe.rc>
diff --git a/base/applications/write/write.c b/base/applications/write/write.c
index 5326db605a..9bf9361142 100644
--- a/base/applications/write/write.c
+++ b/base/applications/write/write.c
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
 
+#include <windows.h>
 #include "resources.h"
 
 static const WCHAR SZ_WORDPAD[]   =
{'\\','w','o','r','d','p','a','d','.','e','x','e',0};
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 6b4613069f..d6d104ec63 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -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-3.3
 reactos/base/applications/wordpad           # Synced to WineStaging-1.9.16
-reactos/base/applications/write             # Synced to WineStaging-2.9
+reactos/base/applications/write             # Synced to WineStaging-3.3
 reactos/base/services/rpcss                 # Synced to WineStaging-1.9.16
 reactos/base/system/expand                  # Synced to WineStaging-2.9
 reactos/base/system/msiexec                 # Synced to WineStaging-2.16