atl/tests: Fix the cross-compilation.
Francois Gouget
fgouget at free.fr
Sun Mar 27 20:57:28 CDT 2016
Don't depend on libuuid to get the UUIDs.
Signed-off-by: Francois Gouget <fgouget at free.fr>
---
This fixes 'make crosstest' for me.
dlls/atl/tests/Makefile.in | 2 +-
dlls/atl/tests/atl_ax.c | 7 +++++--
dlls/atl/tests/registrar.c | 6 ++++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dlls/atl/tests/Makefile.in b/dlls/atl/tests/Makefile.in
index aee6cfd..6e2bc92 100644
--- a/dlls/atl/tests/Makefile.in
+++ b/dlls/atl/tests/Makefile.in
@@ -1,5 +1,5 @@
TESTDLL = atl.dll
-IMPORTS = uuid atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32
+IMPORTS = atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32
EXTRADEFS = -D_ATL_VER=_ATL_VER_30
C_SRCS = \
diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c
index 6b944d1..7597723 100644
--- a/dlls/atl/tests/atl_ax.c
+++ b/dlls/atl/tests/atl_ax.c
@@ -23,7 +23,6 @@
#define COBJMACROS
-#include <wine/test.h>
#include <windef.h>
#include <winbase.h>
#include <winuser.h>
@@ -34,9 +33,13 @@
#include <wtypes.h>
#include <olectl.h>
#include <ocidl.h>
-#include <exdisp.h>
#include <atlbase.h>
+#include <initguid.h>
+#include <exdisp.h>
+
+#include <wine/test.h>
+
static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **);
static void init_function_pointers(void)
diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c
index 4ecb092..b10361a 100644
--- a/dlls/atl/tests/registrar.c
+++ b/dlls/atl/tests/registrar.c
@@ -23,7 +23,6 @@
#define COBJMACROS
-#include <wine/test.h>
#include <windef.h>
#include <winbase.h>
#include <winuser.h>
@@ -31,12 +30,15 @@
#include <winnls.h>
#include <winerror.h>
#include <winnt.h>
+
+#include <initguid.h>
#include <wtypes.h>
#include <olectl.h>
#include <ocidl.h>
-#include <initguid.h>
#include <atliface.h>
+#include <wine/test.h>
+
static const char textA[] =
"HKCU \n"
"{ \n"
--
2.7.0
More information about the wine-patches
mailing list