https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a88fe697907db569aff403...
commit a88fe697907db569aff4037fe8a77e7fe8bbb0bd Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Tue Mar 20 12:31:01 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Tue Mar 20 12:31:01 2018 +0100
[MSXML6] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msxml6/main.c | 11 ++++------- media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/dll/win32/msxml6/main.c b/dll/win32/msxml6/main.c index 32ff3108b5..9c6f9876de 100644 --- a/dll/win32/msxml6/main.c +++ b/dll/win32/msxml6/main.c @@ -18,14 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <rpcproxy.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h"
static HINSTANCE instance;
diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 9a49b75036..ec230821e3 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -131,7 +131,7 @@ reactos/dll/win32/msxml # Synced to WineStaging-3.3 reactos/dll/win32/msxml2 # Synced to WineStaging-3.3 reactos/dll/win32/msxml3 # Synced to WineStaging-3.3 reactos/dll/win32/msxml4 # Synced to WineStaging-3.3 -reactos/dll/win32/msxml6 # Synced to WineStaging-2.9 +reactos/dll/win32/msxml6 # Synced to WineStaging-3.3 reactos/dll/win32/nddeapi # Synced to WineStaging-2.9 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 reactos/dll/win32/npptools # Synced to WineStaging-2.9