[MLANG] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 17 Mar 2018 12:22:13 +0000 (13:22 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 17 Mar 2018 12:22:13 +0000 (13:22 +0100)
dll/win32/mlang/mlang.c
media/doc/README.WINE

index 9554c4d..bada104 100644 (file)
  * 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);
index f62668d..3a0bdb1 100644 (file)
@@ -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