[ATL][ATL80][ATL100] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 9 Mar 2018 11:43:41 +0000 (12:43 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 9 Mar 2018 11:43:41 +0000 (12:43 +0100)
dll/win32/atl/atl.c
dll/win32/atl/atl30.c
dll/win32/atl/atl_ax.c
dll/win32/atl/precomp.h
dll/win32/atl/registrar.c
dll/win32/atl100/precomp.h
dll/win32/atl80/atl80.c
dll/win32/atl80/precomp.h
media/doc/README.WINE

index ce0d616..4acee5d 100644 (file)
  * 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;
 
 /***********************************************************************
index 99ed671..674c1aa 100644 (file)
  * 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;
 
index 6897669..1765dcc 100644 (file)
  * 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;
index def51b0..e38da86 100644 (file)
@@ -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_ */
index 704a21c..3d597ba 100644 (file)
  * 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
index 3242290..f4ec921 100644 (file)
@@ -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_ */
index 1a9019b..b524daf 100644 (file)
  * 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]
index 75f1e41..4e6c501 100644 (file)
@@ -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_ */
index e37d01d..6fe3e1d 100644 (file)
@@ -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