From 6b5e74cbab6b88c28cb9cf2b2aea8ea047e05d4c Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 24 Mar 2018 13:22:32 +0100
Subject: [PATCH] [WMVCORE] Sync with Wine Staging 3.3. CORE-14434

---
 dll/win32/wmvcore/CMakeLists.txt |  2 +-
 dll/win32/wmvcore/version.rc     | 26 ++++++++++++++++++++++++++
 dll/win32/wmvcore/wmvcore.h      | 10 ----------
 dll/win32/wmvcore/wmvcore_main.c |  1 +
 dll/win32/wmvcore/writer.c       |  1 +
 media/doc/README.WINE            |  2 +-
 6 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 dll/win32/wmvcore/version.rc

diff --git a/dll/win32/wmvcore/CMakeLists.txt b/dll/win32/wmvcore/CMakeLists.txt
index 094ded5ecbe..d22c8c42b75 100644
--- a/dll/win32/wmvcore/CMakeLists.txt
+++ b/dll/win32/wmvcore/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/wmvcore_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/wmvcore.def)
 
-add_library(wmvcore SHARED ${SOURCE})
+add_library(wmvcore SHARED ${SOURCE} version.rc)
 set_module_type(wmvcore win32dll)
 target_link_libraries(wmvcore wine)
 add_importlibs(wmvcore msvcrt kernel32 ntdll)
diff --git a/dll/win32/wmvcore/version.rc b/dll/win32/wmvcore/version.rc
new file mode 100644
index 00000000000..445a3990991
--- /dev/null
+++ b/dll/win32/wmvcore/version.rc
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2017 Louis Lenders
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define WINE_FILEDESCRIPTION_STR "Wine Media Playback dll"
+#define WINE_FILENAME_STR "wmvcore.dll"
+#define WINE_FILEVERSION 12,0,7601,17514
+#define WINE_FILEVERSION_STR "12.0.7601.17514"
+#define WINE_PRODUCTVERSION 12,0,7601,17514
+#define WINE_PRODUCTVERSION_STR "12.0.7601.17514"
+
+#include "wine/wine_common_ver.rc"
diff --git a/dll/win32/wmvcore/wmvcore.h b/dll/win32/wmvcore/wmvcore.h
index ca06e0a4a6f..e17547052de 100644
--- a/dll/win32/wmvcore/wmvcore.h
+++ b/dll/win32/wmvcore/wmvcore.h
@@ -24,13 +24,3 @@
 
 #include "windef.h"
 #include "winbase.h"
-
-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
-{
-    return HeapAlloc(GetProcessHeap(), 0, size);
-}
-
-static inline BOOL heap_free(void *mem)
-{
-    return HeapFree(GetProcessHeap(), 0, mem);
-}
diff --git a/dll/win32/wmvcore/wmvcore_main.c b/dll/win32/wmvcore/wmvcore_main.c
index ae8b486532e..1b452884f15 100644
--- a/dll/win32/wmvcore/wmvcore_main.c
+++ b/dll/win32/wmvcore/wmvcore_main.c
@@ -21,6 +21,7 @@
 #include "initguid.h"
 #include "wmsdk.h"
 #include "wine/debug.h"
+#include "wine/heap.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
 
diff --git a/dll/win32/wmvcore/writer.c b/dll/win32/wmvcore/writer.c
index c1c30be8952..717984db1af 100644
--- a/dll/win32/wmvcore/writer.c
+++ b/dll/win32/wmvcore/writer.c
@@ -20,6 +20,7 @@
 #include "wmsdkidl.h"
 
 #include "wine/debug.h"
+#include "wine/heap.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
 
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index a91fb1aaca2..650765d74fa 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -210,7 +210,7 @@ reactos/dll/win32/wintrust            # Synced to WineStaging-3.3
 reactos/dll/win32/wldap32             # Synced to WineStaging-3.3
 reactos/dll/win32/wmi                 # Synced to WineStaging-2.9
 reactos/dll/win32/wmiutils            # Synced to WineStaging-3.3
-reactos/dll/win32/wmvcore             # Synced to Wine-3.0
+reactos/dll/win32/wmvcore             # Synced to WineStaging-3.3
 reactos/dll/win32/wshom.ocx           # Synced to Wine-3.0
 reactos/dll/win32/wtsapi32            # Synced to Wine-3.0
 reactos/dll/win32/wuapi               # Synced to WineStaging-2.9