[ATL_WINETEST]

* Sync with Wine 1.7.1.

svn path=/trunk/; revision=60111
This commit is contained in:
Amine Khaldi 2013-09-14 18:23:41 +00:00
parent aa8a46b180
commit 5cf16e25ad
5 changed files with 53 additions and 44 deletions

View file

@ -1,6 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE list(APPEND SOURCE
atl_ax.c atl_ax.c
module.c module.c
@ -8,9 +6,7 @@ list(APPEND SOURCE
testlist.c) testlist.c)
add_executable(atl_winetest ${SOURCE}) add_executable(atl_winetest ${SOURCE})
target_link_libraries(atl_winetest wine uuid) target_link_libraries(atl_winetest wine uuid)
set_module_type(atl_winetest win32cui) set_module_type(atl_winetest win32cui)
add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll advapi32) add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll advapi32)
add_cd_file(TARGET atl_winetest DESTINATION reactos/bin FOR all) add_cd_file(TARGET atl_winetest DESTINATION reactos/bin FOR all)

View file

@ -18,22 +18,27 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <stdarg.h> #define WIN32_NO_STATUS
#include <stdio.h> #define _INC_WINDOWS
#define COM_NO_WINDOWS_H
//#include <stdarg.h>
//#include <stdio.h>
#define COBJMACROS #define COBJMACROS
#include <wine/test.h> #include <wine/test.h>
#include <windef.h> //#include <windef.h>
#include <winbase.h> //#include <winbase.h>
#include <winuser.h> //#include <winuser.h>
#include <wingdi.h> //#include <wingdi.h>
#include <winnls.h> //#include <winnls.h>
#include <winerror.h> //#include <winerror.h>
#include <winnt.h> //#include <winnt.h>
#include <wtypes.h> //#include <wtypes.h>
#include <olectl.h> #include <objbase.h>
#include <ocidl.h> //#include <olectl.h>
//#include <ocidl.h>
#include <exdisp.h> #include <exdisp.h>
static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **); static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **);

View file

@ -19,22 +19,27 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <stdarg.h> #define WIN32_NO_STATUS
#include <stdio.h> #define _INC_WINDOWS
#define COM_NO_WINDOWS_H
//#include <stdarg.h>
//#include <stdio.h>
#define COBJMACROS #define COBJMACROS
#include <wine/test.h> #include <wine/test.h>
#include <windef.h> //#include <windef.h>
#include <winbase.h> //#include <winbase.h>
#include <winuser.h> //#include <winuser.h>
#include <wingdi.h> //#include <wingdi.h>
#include <winnls.h> //#include <winnls.h>
#include <winerror.h> //#include <winerror.h>
#include <winnt.h> //#include <winnt.h>
#include <wtypes.h> //#include <wtypes.h>
#include <olectl.h> #include <objbase.h>
#include <ocidl.h> //#include <olectl.h>
//#include <ocidl.h>
struct _ATL_OBJMAP_ENTRYW; struct _ATL_OBJMAP_ENTRYW;
struct _AtlCreateWndData; struct _AtlCreateWndData;

View file

@ -18,23 +18,29 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <stdarg.h> #define WIN32_NO_STATUS
#include <stdio.h> #define _INC_WINDOWS
#define COM_NO_WINDOWS_H
//#include <stdarg.h>
//#include <stdio.h>
#define COBJMACROS #define COBJMACROS
#include <wine/test.h> #include <wine/test.h>
#include <windef.h> //#include <windef.h>
#include <winbase.h> //#include <winbase.h>
#include <winuser.h> //#include <winuser.h>
#include <wingdi.h> //#include <wingdi.h>
#include <winnls.h> #include <winnls.h>
#include <winerror.h> #include <winreg.h>
#include <winnt.h> //#include <winerror.h>
#include <wtypes.h> //#include <winnt.h>
#include <olectl.h> //#include <wtypes.h>
#include <ocidl.h> #include <objbase.h>
#include <initguid.h> //#include <olectl.h>
//#include <ocidl.h>
//#include <initguid.h>
#include <atliface.h> #include <atliface.h>
static const char textA[] = static const char textA[] =

View file

@ -1,10 +1,7 @@
/* Automatically generated file; DO NOT EDIT!! */ /* Automatically generated file; DO NOT EDIT!! */
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#define STANDALONE #define STANDALONE
#include "wine/test.h" #include <wine/test.h>
extern void func_atl_ax(void); extern void func_atl_ax(void);
extern void func_module(void); extern void func_module(void);