[MLANG] Sync with Wine Staging 3.3. CORE-14434

This commit is contained in:
Amine Khaldi 2018-03-17 13:22:13 +01:00
parent 03435e171d
commit 2c523eef19
2 changed files with 16 additions and 19 deletions

View file

@ -21,33 +21,30 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "config.h"
#define _INC_WINDOWS
#include <config.h>
#include <stdarg.h> #include <stdarg.h>
//#include <stdio.h> #include <stdio.h>
#define COBJMACROS #define COBJMACROS
#include <windef.h> #include "windef.h"
#include <winbase.h> #include "winbase.h"
#include <wingdi.h> #include "wingdi.h"
//#include "winuser.h" #include "winuser.h"
#include <ole2.h> #include "ole2.h"
//#include "objbase.h" #include "objbase.h"
#include <rpcproxy.h> #include "rpcproxy.h"
#include <mlang.h> #include "mlang.h"
#include <mimeole.h> #include "mimeole.h"
#include <wine/list.h> #include "wine/unicode.h"
#include <wine/unicode.h> #include "wine/debug.h"
#include <wine/debug.h> #include "wine/list.h"
WINE_DEFAULT_DEBUG_CHANNEL(mlang); WINE_DEFAULT_DEBUG_CHANNEL(mlang);
//#include "initguid.h" #include "initguid.h"
static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj);
static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj);

View 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/mciseq # Synced to WineStaging-3.3
reactos/dll/win32/mciwave # 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/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/mmdevapi # Synced to Wine-3.0
reactos/dll/win32/mpr # Synced to Wine-3.0 reactos/dll/win32/mpr # Synced to Wine-3.0
reactos/dll/win32/mprapi # Synced to WineStaging-2.9 reactos/dll/win32/mprapi # Synced to WineStaging-2.9