Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ATL][ATL80][ATL100] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-09 12:43:41 +01:00
parent 59eab41aba
commit ecb7521101
9 changed files with 74 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dll/win32/atl/atl.c
View file

@ -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;
/***********************************************************************

15
dll/win32/atl/atl30.c
View file

@ -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;

26
dll/win32/atl/atl_ax.c
View file

@ -18,12 +18,28 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <precomp.h>
#include <stdarg.h>
#include <stdio.h>
#include <ole2.h>
#include <exdisp.h>
#include <shlwapi.h>
#include <wine/atlwin.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;

5
dll/win32/atl/precomp.h
View 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_ */

8
dll/win32/atl/registrar.c
View file

@ -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

3
dll/win32/atl100/precomp.h
View 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_ */

18
dll/win32/atl80/atl80.c
View file

@ -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]

5
dll/win32/atl80/precomp.h
View 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_ */

6
media/doc/README.WINE
View 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