https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1215b3f1da4f34ebe9553fb8d5f077af20a10b63
commit 1215b3f1da4f34ebe9553fb8d5f077af20a10b63 Author: Amine Khaldi <[email protected]> AuthorDate: Fri Mar 9 12:44:38 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Fri Mar 9 12:44:38 2018 +0100 [ATL_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/atl/atl_ax.c | 29 ++++++++++++----------------- modules/rostests/winetests/atl/module.c | 14 ++++---------- modules/rostests/winetests/atl/registrar.c | 30 ++++++++++++------------------ 3 files changed, 28 insertions(+), 45 deletions(-) diff --git a/modules/rostests/winetests/atl/atl_ax.c b/modules/rostests/winetests/atl/atl_ax.c index 93f16a75c5..00c7914320 100644 --- a/modules/rostests/winetests/atl/atl_ax.c +++ b/modules/rostests/winetests/atl/atl_ax.c @@ -18,27 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -//#include <stdio.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 <objbase.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 <olectl.h> +#include <ocidl.h> #include <exdisp.h> #include <wine/atlbase.h> diff --git a/modules/rostests/winetests/atl/module.c b/modules/rostests/winetests/atl/module.c index 37a982dd04..44aecf0457 100644 --- a/modules/rostests/winetests/atl/module.c +++ b/modules/rostests/winetests/atl/module.c @@ -19,21 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -//#include <stdio.h> +#include <stdarg.h> +#include <stdio.h> #define COBJMACROS -#include <wine/test.h> - -#include <objbase.h> - #include <wine/atlbase.h> +#include <wine/test.h> + #define MAXSIZE 512 static void test_StructSize(void) { diff --git a/modules/rostests/winetests/atl/registrar.c b/modules/rostests/winetests/atl/registrar.c index 9a2a28532a..4ecb092fd6 100644 --- a/modules/rostests/winetests/atl/registrar.c +++ b/modules/rostests/winetests/atl/registrar.c @@ -18,29 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -//#include <stdio.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 <winreg.h> -//#include <winerror.h> -//#include <winnt.h> -//#include <wtypes.h> -#include <objbase.h> -//#include <olectl.h> -//#include <ocidl.h> -//#include <initguid.h> +#include <winerror.h> +#include <winnt.h> +#include <wtypes.h> +#include <olectl.h> +#include <ocidl.h> +#include <initguid.h> #include <atliface.h> static const char textA[] =
