ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Don't depend on the static uuid libraries in the tests. 

This avoids trouble with the broken MingW libraries when
cross-compiling the tests.
This commit is contained in:
Alexandre Julliard 2008-07-08 16:17:17 +02:00
parent d753c6eb0f
commit 79c64acc7b
63 changed files with 94 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/advapi32/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = advapi32.dll
IMPORTS = uuid ole32 advapi32 kernel32
IMPORTS = ole32 advapi32 kernel32
CTESTS = \
cred.c \

5
dlls/advapi32/tests/lsa.c
View File

@ -30,10 +30,11 @@
#include "sddl.h"
#include "winnls.h"
#include "objbase.h"
#define INITGUID
#include "guiddef.h"
#include "initguid.h"
#include "wine/test.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
static HMODULE hadvapi32;
static NTSTATUS (WINAPI *pLsaClose)(LSA_HANDLE);
static NTSTATUS (WINAPI *pLsaFreeMemory)(PVOID);

2
dlls/browseui/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = browseui.dll
IMPORTS = uuid ole32 kernel32
IMPORTS = ole32 kernel32
CTESTS = \
autocomplete.c

1
dlls/browseui/tests/autocomplete.c
View File

@ -20,6 +20,7 @@
#include <assert.h>
#include <stdarg.h>
#include <initguid.h>
#include <windows.h>
#include <shlobj.h>
#include <shlwapi.h>

2
dlls/comcat/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = comcat.dll
IMPORTS = uuid ole32 advapi32 kernel32
IMPORTS = ole32 advapi32 kernel32
CTESTS = \
comcat.c

1
dlls/comcat/tests/comcat.c
View File

@ -21,6 +21,7 @@
#define COBJMACROS
#include <stdio.h>
#include <initguid.h>
#include <windows.h>
#include "objbase.h"

2
dlls/d3d8/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = d3d8.dll
IMPORTS = dxerr8 uuid dxguid user32 kernel32
IMPORTS = dxerr8 user32 kernel32
CTESTS = \
d3d8_main.c \

1
dlls/d3d8/tests/device.c
View File

@ -18,6 +18,7 @@
*/
#define COBJMACROS
#include <initguid.h>
#include <d3d8.h>
#include <dxerr8.h>
#include "wine/test.h"

2
dlls/d3d9/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = d3d9.dll
IMPORTS = dxerr9 uuid dxguid user32 kernel32
IMPORTS = dxerr9 user32 kernel32
CTESTS = \
d3d9ex.c \

1
dlls/d3d9/tests/d3d9ex.c
View File

@ -21,6 +21,7 @@
*/
#define COBJMACROS
#include <initguid.h>
#include <d3d9.h>
#include <dxerr9.h>
#include "wine/test.h"

2
dlls/d3drm/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = d3drm.dll
IMPORTS = dxguid kernel32
IMPORTS = kernel32
CTESTS = vector.c

2
dlls/d3dx8/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = d3dx8.dll
IMPORTS = dxguid d3dx8 kernel32
IMPORTS = d3dx8 kernel32
CTESTS = math.c

2
dlls/ddraw/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = ddraw.dll
IMPORTS = dxguid ddraw user32 gdi32 kernel32
IMPORTS = ddraw user32 gdi32 kernel32
CTESTS = \
d3d.c \

1
dlls/ddraw/tests/d3d.c
View File

@ -22,6 +22,7 @@
#include <assert.h>
#include "wine/test.h"
#include "initguid.h"
#include "ddraw.h"
#include "d3d.h"

2
dlls/dinput/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = dinput.dll
IMPORTS = dxguid uuid dxerr8 dinput ole32 version user32 kernel32
IMPORTS = dxerr8 dinput ole32 version user32 kernel32
CTESTS = \
device.c \

1
dlls/dinput/tests/device.c
View File

@ -23,6 +23,7 @@
#include "wine/test.h"
#include "windef.h"
#include "initguid.h"
#include "dinput.h"
#include "dxerr8.h"

2
dlls/dplayx/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = dplayx.dll
IMPORTS = dxguid ole32 kernel32
IMPORTS = ole32 kernel32
CTESTS = \
dplayx.c

2
dlls/dsound/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = dsound.dll
IMPORTS = dxguid uuid dxerr8 ole32 version user32 kernel32
IMPORTS = dxerr8 ole32 version user32 kernel32
CTESTS = \
capture.c \

5
dlls/dsound/tests/capture.c
View File

@ -19,10 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <windows.h>
#include <stdio.h>
#include "initguid.h"
#include "windows.h"
#include "wine/test.h"
#include "dsound.h"
#include "mmreg.h"

3
dlls/dsound/tests/dsound.c
View File

@ -33,13 +33,14 @@
#include "dxerr8.h"
#include "dsconf.h"
#include "mmreg.h"
/* MinGW doesn't have ksguid, needed for make crosstest to work. */
#include "initguid.h"
#include "ks.h"
#include "ksmedia.h"
#include "dsound_test.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL;
static HRESULT (WINAPI *pDirectSoundCreate)(LPCGUID,LPDIRECTSOUND*,
LPUNKNOWN)=NULL;

2
dlls/hlink/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = hlink.dll
IMPORTS = uuid hlink ole32 kernel32
IMPORTS = hlink ole32 kernel32
CTESTS = \
hlink.c

1
dlls/hlink/tests/hlink.c
View File

@ -23,6 +23,7 @@
#include <stdio.h>
#include <initguid.h>
#include <hlink.h>
#include <hlguids.h>

2
dlls/inetcomm/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = inetcomm.dll
IMPORTS = uuid inetcomm ole32 kernel32
IMPORTS = inetcomm ole32 kernel32
CTESTS = \
mimeole.c

1
dlls/inetcomm/tests/mimeole.c
View File

@ -21,6 +21,7 @@
#define COBJMACROS
#define NONAMELESSUNION
#include "initguid.h"
#include "windows.h"
#include "ole2.h"
#include "ocidl.h"

2
dlls/itss/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = itss.dll
IMPORTS = uuid ole32 kernel32
IMPORTS = ole32 kernel32
CTESTS = \
protocol.c

3
dlls/itss/tests/protocol.c
View File

@ -23,12 +23,11 @@
#include "windef.h"
#include "winbase.h"
#include "initguid.h"
#include "ole2.h"
#include "urlmon.h"
#include "shlwapi.h"
#include "initguid.h"
#define DEFINE_EXPECT(func) \
static BOOL expect_ ## func = FALSE, called_ ## func = FALSE

2
dlls/jscript/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = jscript.dll
IMPORTS = uuid ole32 kernel32
IMPORTS = ole32 kernel32
CTESTS = \
jscript.c

3
dlls/jscript/tests/jscript.c
View File

@ -18,12 +18,15 @@
#define COBJMACROS
#include <initguid.h>
#include <ole2.h>
#include <activscp.h>
#include <objsafe.h>
#include "wine/test.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
static const CLSID CLSID_JScript =
{0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}};

2
dlls/mapi32/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = mapi32.dll
IMPORTS = uuid kernel32
IMPORTS = kernel32
CTESTS = \
imalloc.c \

2
dlls/mlang/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = mlang.dll
IMPORTS = uuid oleaut32 ole32 gdi32 kernel32
IMPORTS = oleaut32 ole32 gdi32 kernel32
CTESTS = \
mlang.c

1
dlls/mlang/tests/mlang.c
View File

@ -25,6 +25,7 @@
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "initguid.h"
#include "mlang.h"
#include "wine/test.h"

2
dlls/mshtml/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = mshtml.dll
IMPORTS = uuid ole32 oleaut32 user32 urlmon advapi32 kernel32
IMPORTS = ole32 oleaut32 user32 urlmon advapi32 kernel32
CTESTS = \
dom.c \

4
dlls/mshtml/tests/htmldoc.c
View File

@ -25,6 +25,7 @@
#include "windef.h"
#include "winbase.h"
#include "initguid.h"
#include "ole2.h"
#include "mshtml.h"
#include "docobj.h"
@ -36,7 +37,8 @@
#include "idispids.h"
#include "shlguid.h"
#include "initguid.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
DEFINE_GUID(IID_IProxyManager,0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0);
#define DEFINE_EXPECT(func) \

3
dlls/mshtml/tests/misc.c
View File

@ -24,9 +24,8 @@
#include "windef.h"
#include "winbase.h"
#include "ole2.h"
#include "optary.h"
#include "initguid.h"
#include "optary.h"
static void test_HTMLLoadOptions(void)
{

3
dlls/mshtml/tests/script.c
View File

@ -28,11 +28,14 @@
#include "ole2.h"
#include "dispex.h"
#include "mshtml.h"
#include "initguid.h"
#include "activscp.h"
#include "activdbg.h"
#include "objsafe.h"
#include "mshtmdid.h"
DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
#define DEFINE_EXPECT(func) \
static BOOL expect_ ## func = FALSE, called_ ## func = FALSE

2
dlls/msi/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = msi.dll
IMPORTS = uuid cabinet msi shell32 ole32 oleaut32 user32 advapi32 kernel32 version
IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 kernel32 version
CTESTS = \
automation.c \

3
dlls/msi/tests/automation.c
View File

@ -23,6 +23,7 @@
#include <stdio.h>
#include <initguid.h>
#include <windows.h>
#include <msiquery.h>
#include <msidefs.h>
@ -31,6 +32,8 @@
#include "wine/test.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
static const char *msifile = "winetest.msi";
static const WCHAR szMsifile[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0};
static const WCHAR szMSITEST[] = { 'M','S','I','T','E','S','T',0 };

2
dlls/msxml3/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = msxml3.dll
IMPORTS = uuid oleaut32 ole32 user32 kernel32
IMPORTS = oleaut32 ole32 user32 kernel32
CTESTS = \
domdoc.c \

3
dlls/msxml3/tests/domdoc.c
View File

@ -31,9 +31,6 @@
#include "wine/test.h"
const CLSID CLSID_DOMDocument2 = {0xf6d90f11, 0x9c73, 0x11d3, {0xb3, 0x2e, 0x00, 0xc0, 0x4f, 0x99, 0x0b, 0xb4}};
const IID IID_IXMLDOMDocument2 = {0x2933bf95, 0x7b36, 0x11d2, {0xb2, 0x0e, 0x00, 0xc0, 0x4f, 0x98, 0x3e, 0x60}};
static const WCHAR szEmpty[] = { 0 };
static const WCHAR szIncomplete[] = {
'<','?','x','m','l',' ',

6
dlls/msxml3/tests/schema.c
View File

@ -18,19 +18,17 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdio.h>
#define COBJMACROS
#include "initguid.h"
#include "windows.h"
#include "ole2.h"
#include "xmldom.h"
#include "msxml2.h"
#include <stdio.h>
#include "wine/test.h"
const CLSID CLSID_XMLSchemaCache = {0x373984c9, 0xb845, 0x449b, {0x91, 0xe7, 0x45, 0xac, 0x83, 0x03, 0x6a, 0xde}};
const IID IID_IXMLDOMSchemaCollection = {0x373984c8, 0xb845, 0x449b, {0x91, 0xe7, 0x45, 0xac, 0x83, 0x03, 0x6a, 0xde}};
static const WCHAR schema_uri[] = {'x','-','s','c','h','e','m','a',':','t','e','s','t','.','x','m','l',0};
static const WCHAR schema_xml[] = {

2
dlls/ole32/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = ole32.dll
IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 kernel32
IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 kernel32
CTESTS = \
clipboard.c \

4
dlls/ole32/tests/marshal.c
View File

@ -27,12 +27,16 @@
#include "windef.h"
#include "winbase.h"
#include "initguid.h"
#include "objbase.h"
#include "olectl.h"
#include "shlguid.h"
#include "shobjidl.h"
#include "wine/test.h"
DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
/* functions that are not present on all versions of Windows */
HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit);

6
dlls/ole32/tests/stg_prop.c
View File

@ -19,6 +19,12 @@
#define COBJMACROS
#include "objbase.h"
#include "wine/test.h"
#include "initguid.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9);
DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE);
DEFINE_GUID(FMTID_UserDefinedProperties,0xD5CDD505,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE);
#ifndef PID_BEHAVIOR
#define PID_BEHAVIOR 0x80000003

2
dlls/oleaut32/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = oleaut32.dll
IMPORTS = uuid oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32
IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32
CTESTS = \
olefont.c \

3
dlls/oleaut32/tests/olefont.c
View File

@ -36,10 +36,13 @@
#include <winnls.h>
#include <winerror.h>
#include <winnt.h>
#include <initguid.h>
#include <wtypes.h>
#include <olectl.h>
#include <ocidl.h>
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
static WCHAR MSSansSerif_font[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f',0};
static WCHAR system_font[] = { 'S','y','s','t','e','m',0 };
static WCHAR arial_font[] = { 'A','r','i','a','l',0 };

2
dlls/qedit/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = qedit.dll
IMPORTS = strmiids uuid oleaut32 ole32 kernel32
IMPORTS = oleaut32 ole32 kernel32
CTESTS = \
mediadet.c

1
dlls/qedit/tests/mediadet.c
View File

@ -22,6 +22,7 @@
#define COBJMACROS
#include "initguid.h"
#include "ole2.h"
#include "vfwmsgs.h"
#include "uuids.h"

2
dlls/quartz/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = quartz.dll
IMPORTS = strmiids uuid oleaut32 ole32 advapi32 kernel32
IMPORTS = oleaut32 ole32 advapi32 kernel32
CTESTS = \
filtergraph.c \

1
dlls/quartz/tests/filtergraph.c
View File

@ -23,7 +23,6 @@
#define COBJMACROS
#include "wine/test.h"
#include "uuids.h"
#include "dshow.h"
#include "control.h"

3
dlls/quartz/tests/filtermapper.c
View File

@ -22,8 +22,11 @@
#include "wine/test.h"
#include "winbase.h"
#include "initguid.h"
#include "dshow.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
/* Helper function, checks if filter with given name was enumerated. */
static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum)
{

2
dlls/riched20/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = riched20.dll
IMPORTS = uuid ole32 user32 gdi32 kernel32
IMPORTS = ole32 user32 gdi32 kernel32
CTESTS = \
editor.c \

6
dlls/riched20/tests/richole.c
View File

@ -26,17 +26,13 @@
#include <winbase.h>
#include <wingdi.h>
#include <winuser.h>
#include <initguid.h>
#include <ole2.h>
#include <richedit.h>
#include <richole.h>
#include <tom.h>
#include <wine/test.h>
#include <initguid.h>
DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
static HMODULE hmoduleRichEdit;
static HWND new_window(LPCTSTR lpClassName, DWORD dwStyle, HWND parent)

2
dlls/rpcrt4/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = rpcrt4.dll
IMPORTS = uuid ole32 rpcrt4 kernel32
IMPORTS = ole32 rpcrt4 kernel32
EXTRAIDLFLAGS = --prefix-server=s_
IDL_C_SRCS = server.idl

1
dlls/rpcrt4/tests/cstub.c
View File

@ -30,6 +30,7 @@
#include <winerror.h>
#include "initguid.h"
#include "rpc.h"
#include "rpcdce.h"
#include "rpcproxy.h"

2
dlls/shdocvw/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = shdocvw.dll
IMPORTS = uuid shell32 ole32 oleaut32 user32 advapi32 kernel32
IMPORTS = shell32 ole32 oleaut32 user32 advapi32 kernel32
CTESTS = \
shortcut.c \

4
dlls/shdocvw/tests/webbrowser.c
View File

@ -25,6 +25,7 @@
#include "windef.h"
#include "winbase.h"
#include "initguid.h"
#include "ole2.h"
#include "exdisp.h"
#include "htiframe.h"
@ -32,9 +33,12 @@
#include "idispids.h"
#include "olectl.h"
#include "mshtmdid.h"
#include "shobjidl.h"
#include "shlguid.h"
#include "exdispid.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
#define DEFINE_EXPECT(func) \
static BOOL expect_ ## func = FALSE, called_ ## func = FALSE

2
dlls/shell32/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = shell32.dll
IMPORTS = uuid shell32 ole32 oleaut32 user32 advapi32 kernel32
IMPORTS = shell32 ole32 oleaut32 user32 advapi32 kernel32
CTESTS = \
generated.c \

3
dlls/shell32/tests/shelllink.c
View File

@ -24,7 +24,8 @@
#define COBJMACROS
#include <windows.h>
#include "initguid.h"
#include "windows.h"
#include "shlguid.h"
#include "shobjidl.h"
#include "shlobj.h"

2
dlls/shlwapi/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = shlwapi.dll
IMPORTS = uuid shlwapi advapi32 ole32 oleaut32 kernel32
IMPORTS = shlwapi advapi32 ole32 oleaut32 kernel32
CTESTS = \
clist.c \

4
dlls/shlwapi/tests/clsid.c
View File

@ -24,12 +24,12 @@
#include "winerror.h"
#include "winnls.h"
#include "winuser.h"
#include "initguid.h"
#include "shlguid.h"
#include "shobjidl.h"
#include "olectl.h"
#define INITGUID
#include "initguid.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
/* This GUID has been removed from the PSDK */
DEFINE_OLEGUID(WINE_IID_IDelayedRelease, 0x000214EDL, 0, 0);

2
dlls/urlmon/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = urlmon.dll
IMPORTS = uuid urlmon ole32 user32 advapi32 kernel32
IMPORTS = urlmon ole32 user32 advapi32 kernel32
CTESTS = \
generated.c \

2
dlls/urlmon/tests/protocol.c
View File

@ -29,8 +29,6 @@
#include "urlmon.h"
#include "wininet.h"
#include "initguid.h"
#define DEFINE_EXPECT(func) \
static BOOL expect_ ## func = FALSE, called_ ## func = FALSE

7
dlls/urlmon/tests/url.c
View File

@ -28,12 +28,17 @@
#include "windef.h"
#include "winbase.h"
#include "initguid.h"
#include "urlmon.h"
#include "wininet.h"
#include "mshtml.h"
#include "wine/test.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b);
#define DEFINE_EXPECT(func) \
static BOOL expect_ ## func = FALSE, called_ ## func = FALSE
@ -155,8 +160,6 @@ static IInternetProtocolSink *protocol_sink = NULL;
static HANDLE complete_event, complete_event2;
static HRESULT binding_hres;
extern IID IID_IBindStatusCallbackHolder;
static LPCWSTR urls[] = {
WINE_ABOUT_URL,
ABOUT_BLANK,