01/01: [WMVCORE] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b5e74cbab6b88c28cb9c…

commit 6b5e74cbab6b88c28cb9cf2b2aea8ea047e05d4c
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Mar 24 13:22:32 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sat Mar 24 13:22:32 2018 +0100

    [WMVCORE] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/wmvcore/CMakeLists.txt            |  2 +-
 dll/win32/wmvcore/{wmvcore.h => 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, 12 insertions(+), 30 deletions(-)

diff --git a/dll/win32/wmvcore/CMakeLists.txt b/dll/win32/wmvcore/CMakeLists.txt
index 094ded5ecb..d22c8c42b7 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/wmvcore.h b/dll/win32/wmvcore/version.rc
similarity index 66%
copy from dll/win32/wmvcore/wmvcore.h
copy to dll/win32/wmvcore/version.rc
index ca06e0a4a6..445a399099 100644
--- a/dll/win32/wmvcore/wmvcore.h
+++ b/dll/win32/wmvcore/version.rc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Jacek Caban for CodeWeavers
+ * 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
@@ -16,21 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#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"
 
-#define COBJMACROS
-
-#define EXTERN_GUID DEFINE_GUID
-
-#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);
-}
+#include "wine/wine_common_ver.rc"
diff --git a/dll/win32/wmvcore/wmvcore.h b/dll/win32/wmvcore/wmvcore.h
index ca06e0a4a6..e17547052d 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 ae8b486532..1b452884f1 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 c1c30be895..717984db1a 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 a91fb1aaca..650765d74f 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