Author: akhaldi Date: Sat Sep 14 18:23:41 2013 New Revision: 60111
URL: http://svn.reactos.org/svn/reactos?rev=60111&view=rev Log: [ATL_WINETEST] * Sync with Wine 1.7.1.
Modified: trunk/rostests/winetests/atl/CMakeLists.txt trunk/rostests/winetests/atl/atl_ax.c trunk/rostests/winetests/atl/module.c trunk/rostests/winetests/atl/registrar.c trunk/rostests/winetests/atl/testlist.c
Modified: trunk/rostests/winetests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/CMakeLists.t... ============================================================================== --- trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE atl_ax.c @@ -8,9 +6,7 @@ testlist.c)
add_executable(atl_winetest ${SOURCE}) - target_link_libraries(atl_winetest wine uuid) - set_module_type(atl_winetest win32cui) add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll advapi32) add_cd_file(TARGET atl_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/atl_ax.c?rev... ============================================================================== --- trunk/rostests/winetests/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/atl_ax.c [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -18,22 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> -#include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> +//#include <stdio.h>
#define COBJMACROS
#include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> -#include <winnls.h> -#include <winerror.h> -#include <winnt.h> -#include <wtypes.h> -#include <olectl.h> -#include <ocidl.h> +//#include <windef.h> +//#include <winbase.h> +//#include <winuser.h> +//#include <wingdi.h> +//#include <winnls.h> +//#include <winerror.h> +//#include <winnt.h> +//#include <wtypes.h> +#include <objbase.h> +//#include <olectl.h> +//#include <ocidl.h> #include <exdisp.h>
static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **);
Modified: trunk/rostests/winetests/atl/module.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/module.c?rev... ============================================================================== --- trunk/rostests/winetests/atl/module.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/module.c [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -19,22 +19,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> -#include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> +//#include <stdio.h>
#define COBJMACROS
#include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> -#include <winnls.h> -#include <winerror.h> -#include <winnt.h> -#include <wtypes.h> -#include <olectl.h> -#include <ocidl.h> +//#include <windef.h> +//#include <winbase.h> +//#include <winuser.h> +//#include <wingdi.h> +//#include <winnls.h> +//#include <winerror.h> +//#include <winnt.h> +//#include <wtypes.h> +#include <objbase.h> +//#include <olectl.h> +//#include <ocidl.h>
struct _ATL_OBJMAP_ENTRYW; struct _AtlCreateWndData;
Modified: trunk/rostests/winetests/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/registrar.c?... ============================================================================== --- trunk/rostests/winetests/atl/registrar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/registrar.c [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -18,23 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> -#include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> +//#include <stdio.h>
#define COBJMACROS
#include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> +//#include <windef.h> +//#include <winbase.h> +//#include <winuser.h> +//#include <wingdi.h> #include <winnls.h> -#include <winerror.h> -#include <winnt.h> -#include <wtypes.h> -#include <olectl.h> -#include <ocidl.h> -#include <initguid.h> +#include <winreg.h> +//#include <winerror.h> +//#include <winnt.h> +//#include <wtypes.h> +#include <objbase.h> +//#include <olectl.h> +//#include <ocidl.h> +//#include <initguid.h> #include <atliface.h>
static const char textA[] =
Modified: trunk/rostests/winetests/atl/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/testlist.c?r... ============================================================================== --- trunk/rostests/winetests/atl/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/testlist.c [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */
-#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h>
extern void func_atl_ax(void); extern void func_module(void);