Module: wine Branch: master Commit: f9686b69d0b458431b2901a630add7711a8385e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9686b69d0b458431b2901a63...
Author: Piotr Caban piotr@codeweavers.com Date: Thu Oct 11 19:11:44 2018 +0200
ole32/tests: Import uuid.
Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ole32/tests/Makefile.in | 2 +- dlls/ole32/tests/compobj.c | 4 +--- dlls/ole32/tests/marshal.c | 4 ---- dlls/ole32/tests/moniker.c | 1 - dlls/ole32/tests/ole2.c | 6 ------ dlls/ole32/tests/ole_server.c | 3 --- dlls/ole32/tests/stg_prop.c | 6 ------ 7 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/dlls/ole32/tests/Makefile.in b/dlls/ole32/tests/Makefile.in index a011bb7..6bf57e3 100644 --- a/dlls/ole32/tests/Makefile.in +++ b/dlls/ole32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = ole32.dll -IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = oleaut32 ole32 user32 uuid gdi32 advapi32
C_SRCS = \ clipboard.c \ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 352cfbf..33a7585 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #define USE_COM_CONTEXT_DEF -#include "initguid.h" #include "objbase.h" #include "shlguid.h" #include "urlmon.h" /* for CLSID_FileProtocol */ @@ -37,6 +36,7 @@ #include "ctxtcall.h"
#include "wine/test.h" +#include "initguid.h"
#define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -95,9 +95,7 @@ static const GUID IID_Testiface5 = { 0x62222222, 0x1234, 0x1234, { 0x12, 0x34, 0 static const GUID IID_Testiface6 = { 0x72222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID IID_TestPS = { 0x66666666, 0x8888, 0x7777, { 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 } };
-DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_testclsid, 0xacd014c7,0x9535,0x4fac,0x8b,0x53,0xa4,0x8c,0xa7,0xf4,0xd7,0x26); -DEFINE_GUID(CLSID_GlobalOptions, 0x0000034b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
static const WCHAR stdfont[] = {'S','t','d','F','o','n','t',0}; static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0}; diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c1d5394..c0af232 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -31,7 +31,6 @@ #include "olectl.h" #include "shlguid.h" #include "shobjidl.h" -#include "initguid.h"
#include "wine/test.h" #include "wine/heap.h" @@ -60,9 +59,6 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0)
-DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); - static const GUID CLSID_WineTestPSFactoryBuffer = { 0x22222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } };
/* functions that are not present on all versions of Windows */ diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7302ab0..5bcc136 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -29,7 +29,6 @@ #include "winbase.h" #include "objbase.h" #include "ocidl.h" -#include "initguid.h" #include "comcat.h" #include "olectl.h"
diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 18cfb19..f0ff24b 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -33,12 +33,6 @@
#include "wine/test.h"
-#include "initguid.h" - -DEFINE_GUID(CLSID_Picture_Metafile,0x315,0,0,0xc0,0,0,0,0,0,0,0x46); -DEFINE_GUID(CLSID_Picture_Dib,0x316,0,0,0xc0,0,0,0,0,0,0,0x46); -DEFINE_GUID(CLSID_Picture_EnhMetafile,0x319,0,0,0xc0,0,0,0,0,0,0,0x46); - #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr)
#define DEFINE_EXPECT(func) \ diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index f5c845d..2f5a3ca 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -30,9 +30,6 @@
#include <initguid.h> DEFINE_GUID(CLSID_WineTestObject, 0xdeadbeef,0xdead,0xbeef,0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef); -#ifndef CLSID_IdentityUnmarshal -DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -#endif DEFINE_GUID(CLSID_UnknownUnmarshal,0x4c1e39e1,0xe3e3,0x4296,0xaa,0x86,0xec,0x93,0x8d,0x89,0x6e,0x92);
struct winetest_info diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index c6d7d3e..24ae03e 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -19,12 +19,6 @@ #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