[ros-diffs] 01/01: [ATL][ATL80][ATL100] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

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

commit ecb7521101494eaf05de0fffc2c135815f0f3651
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Fri Mar 9 12:43:41 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Fri Mar 9 12:43:41 2018 +0100

    [ATL][ATL80][ATL100] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/atl/atl.c        | 24 ++++++++++++------------
 dll/win32/atl/atl30.c      | 15 ++++++++++++---
 dll/win32/atl/atl_ax.c     | 28 ++++++++++++++++++++++------
 dll/win32/atl/precomp.h    |  5 ++---
 dll/win32/atl/registrar.c  |  8 +++++++-
 dll/win32/atl100/precomp.h |  3 +--
 dll/win32/atl80/atl80.c    | 18 ++++++++++++++----
 dll/win32/atl80/precomp.h  |  5 ++---
 media/doc/README.WINE      |  6 +++---
 9 files changed, 75 insertions(+), 37 deletions(-)

diff --git a/dll/win32/atl/atl.c b/dll/win32/atl/atl.c
index ce0d616c9a..4acee5de3c 100644
--- a/dll/win32/atl/atl.c
+++ b/dll/win32/atl/atl.c
@@ -17,10 +17,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <precomp.h>
+#define COBJMACROS
 
-#include <wine/atlcom.h>
+#include "wine/atlbase.h"
+#include "wine/atlcom.h"
+
+#include "wine/debug.h"
+#include "wine/heap.h"
+#include "wine/unicode.h"
+
+#ifdef __REACTOS__
 #include <wingdi.h>
+#endif
+
+WINE_DEFAULT_DEBUG_CHANNEL(atl);
 
 #define ATLVer1Size FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer)
 
@@ -28,16 +38,6 @@ HINSTANCE atl_instance;
 
 typedef unsigned char cpp_bool;
 
-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);
-}
-
 static ICatRegister *catreg;
 
 /***********************************************************************
diff --git a/dll/win32/atl/atl30.c b/dll/win32/atl/atl30.c
index 99ed6711d8..674c1aac8d 100644
--- a/dll/win32/atl/atl30.c
+++ b/dll/win32/atl/atl30.c
@@ -19,10 +19,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <precomp.h>
-
 #include <stdio.h>
-#include <rpcproxy.h>
+
+#define COBJMACROS
+
+#include "objidl.h"
+#include "rpcproxy.h"
+#include "wine/atlbase.h"
+#include "wine/atlwin.h"
+
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(atl);
 
 extern HINSTANCE atl_instance;
 
diff --git a/dll/win32/atl/atl_ax.c b/dll/win32/atl/atl_ax.c
index 6897669ab0..1765dcc689 100644
--- a/dll/win32/atl/atl_ax.c
+++ b/dll/win32/atl/atl_ax.c
@@ -18,12 +18,28 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <precomp.h>
-
-#include <ole2.h>
-#include <exdisp.h>
-#include <shlwapi.h>
-#include <wine/atlwin.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winuser.h"
+#include "wine/debug.h"
+#include "objbase.h"
+#include "objidl.h"
+#include "ole2.h"
+#include "exdisp.h"
+#include "wine/atlbase.h"
+#include "atliface.h"
+#include "wine/atlwin.h"
+#include "shlwapi.h"
+
+#include "wine/unicode.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(atl);
 
 typedef struct IOCS {
     IOleClientSite            IOleClientSite_iface;
diff --git a/dll/win32/atl/precomp.h b/dll/win32/atl/precomp.h
index def51b04e8..e38da863bb 100644
--- a/dll/win32/atl/precomp.h
+++ b/dll/win32/atl/precomp.h
@@ -1,3 +1,4 @@
+
 #ifndef _ATL_PCH_
 #define _ATL_PCH_
 
@@ -20,6 +21,4 @@
 #include <wine/debug.h>
 #include <wine/unicode.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(atl);
-
-#endif /* _ATL_PCH_ */
+#endif /* !_ATL_PCH_ */
diff --git a/dll/win32/atl/registrar.c b/dll/win32/atl/registrar.c
index 704a21c005..3d597ba217 100644
--- a/dll/win32/atl/registrar.c
+++ b/dll/win32/atl/registrar.c
@@ -16,8 +16,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <precomp.h>
+#define COBJMACROS
 
+#include "wine/atlbase.h"
+
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(atl);
 
 /**************************************************************
  * ATLRegistrar implementation
diff --git a/dll/win32/atl100/precomp.h b/dll/win32/atl100/precomp.h
index 324229015e..f4ec9214d7 100644
--- a/dll/win32/atl100/precomp.h
+++ b/dll/win32/atl100/precomp.h
@@ -1,3 +1,4 @@
+
 #ifndef _ATL100_PCH_
 #define _ATL100_PCH_
 
@@ -19,6 +20,4 @@
 #include <wine/debug.h>
 #include <wine/unicode.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(atl);
-
 #endif /* _ATL100_PCH_ */
diff --git a/dll/win32/atl80/atl80.c b/dll/win32/atl80/atl80.c
index 1a9019b150..b524daf8d9 100644
--- a/dll/win32/atl80/atl80.c
+++ b/dll/win32/atl80/atl80.c
@@ -16,11 +16,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <precomp.h>
-
+#include <stdarg.h>
 #include <stdio.h>
-#include <winerror.h>
-#include <winuser.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winuser.h"
+#include "wine/atlbase.h"
+
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(atl);
 
 /***********************************************************************
  *           AtlRegisterTypeLib         [atl80.18]
diff --git a/dll/win32/atl80/precomp.h b/dll/win32/atl80/precomp.h
index 75f1e4159e..4e6c501d94 100644
--- a/dll/win32/atl80/precomp.h
+++ b/dll/win32/atl80/precomp.h
@@ -1,3 +1,4 @@
+
 #ifndef _ATL80_PCH_
 #define _ATL80_PCH_
 
@@ -19,6 +20,4 @@
 #include <wine/debug.h>
 #include <wine/unicode.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(atl);
-
-#endif /* _ATL80_PCH_ */
+#endif /* !_ATL80_PCH_ */
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index e37d01ddab..6fe3e1d210 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -45,9 +45,9 @@ reactos/dll/directx/wine/wined3d        # Synced to WineStaging-3.3
 reactos/dll/win32/activeds            # Synced to WineStaging-3.3
 reactos/dll/win32/actxprxy            # Synced to WineStaging-3.3
 reactos/dll/win32/advpack             # Synced to WineStaging-3.3
-reactos/dll/win32/atl                 # Synced to Wine-3.0
-reactos/dll/win32/atl80               # Synced to Wine-3.0
-reactos/dll/win32/atl100              # Synced to Wine-3.0
+reactos/dll/win32/atl                 # Synced to WineStaging-3.3
+reactos/dll/win32/atl80               # Synced to WineStaging-3.3
+reactos/dll/win32/atl100              # Synced to WineStaging-3.3
 reactos/dll/win32/avifil32            # Synced to Wine-3.0
 reactos/dll/win32/bcrypt              # Synced to WineStaging-1.9.23
 reactos/dll/win32/browseui            # Out of sync