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

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c523eef19d9565c9eee2…

commit 2c523eef19d9565c9eee245c3ee3b72c55a8d8ef
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Mar 17 13:22:13 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sat Mar 17 13:22:13 2018 +0100

    [MLANG] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/mlang/mlang.c | 33 +++++++++++++++------------------
 media/doc/README.WINE   |  2 +-
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/dll/win32/mlang/mlang.c b/dll/win32/mlang/mlang.c
index 9554c4de33..bada104a36 100644
--- a/dll/win32/mlang/mlang.c
+++ b/dll/win32/mlang/mlang.c
@@ -21,33 +21,30 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
+#include "config.h"
 
 #include <stdarg.h>
-//#include <stdio.h>
+#include <stdio.h>
 
 #define COBJMACROS
 
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-#include <ole2.h>
-//#include "objbase.h"
-#include <rpcproxy.h>
-#include <mlang.h>
-#include <mimeole.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "objbase.h"
+#include "rpcproxy.h"
+#include "mlang.h"
+#include "mimeole.h"
 
-#include <wine/list.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "wine/list.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(mlang);
 
-//#include "initguid.h"
+#include "initguid.h"
 
 static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj);
 static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj);
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index f62668d904..3a0bdb184f 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -96,7 +96,7 @@ reactos/dll/win32/mciqtz32            # Synced to WineStaging-3.3
 reactos/dll/win32/mciseq              # Synced to WineStaging-3.3
 reactos/dll/win32/mciwave             # Synced to WineStaging-3.3
 reactos/dll/win32/mgmtapi             # Synced to WineStaging-3.3
-reactos/dll/win32/mlang               # Synced to Wine-3.0
+reactos/dll/win32/mlang               # Synced to WineStaging-3.3
 reactos/dll/win32/mmdevapi            # Synced to Wine-3.0
 reactos/dll/win32/mpr                 # Synced to Wine-3.0
 reactos/dll/win32/mprapi              # Synced to WineStaging-2.9