01/01: [MSFTEDIT] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e99b3f17cdf97abea8afb...

commit 7e99b3f17cdf97abea8afbe1388dd8fc1b9e3ced
Author:     Amine Khaldi [e-mail]
AuthorDate: Sun Mar 18 12:29:15 2018 +0100
Commit:     Amine Khaldi [e-mail]
CommitDate: Sun Mar 18 12:29:15 2018 +0100

[MSFTEDIT] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/msftedit/msftedit_main.c | 32 ++++++++++++++------------------
 media/doc/README.WINE              |  2 +-
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/dll/win32/msftedit/msftedit_main.c b/dll/win32/msftedit/msftedit_main.c
index f5ce8a970a..b505999cda 100644
--- a/dll/win32/msftedit/msftedit_main.c
+++ b/dll/win32/msftedit/msftedit_main.c
@@ -19,28 +19,24 @@
  *
  */

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
+#include "config.h"
+#include "wine/port.h"

#include <stdarg.h>

-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <richedit.h>
-#include <imm.h>
-#include <shlwapi.h>
-#include <oleidl.h>
-#include <initguid.h>
-#include <textserv.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "richedit.h"
+#include "imm.h"
+#include "shlwapi.h"
+#include "oleidl.h"
+#include "initguid.h"
+#include "textserv.h"

-#include <wine/debug.h>
+#include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(msftedit);

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 1b709e7ab7..60b2a875a1 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -107,7 +107,7 @@ reactos/dll/win32/mscat32             # Synced to WineStaging-3.3
 reactos/dll/win32/mscms               # Synced to WineStaging-3.3
 reactos/dll/win32/mscoree             # Synced to Wine-1.5.4
 reactos/dll/win32/msctf               # Synced to WineStaging-3.3
-reactos/dll/win32/msftedit            # Synced to WineStaging-2.9
+reactos/dll/win32/msftedit            # Synced to WineStaging-3.3
 reactos/dll/win32/msg711.acm          # Synced to WineStaging-2.9
 reactos/dll/win32/msgsm32.acm         # Synced to WineStaging-2.9
 reactos/dll/win32/mshtml              # Synced to WineStaging-1.7.55