From: Zebediah Figura z.figura12@gmail.com
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Huw Davies huw@codeweavers.com --- dlls/ole32/tests/marshal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 2aaa34e51b..582b63f484 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -61,6 +61,7 @@
static const GUID CLSID_WineTestPSFactoryBuffer = { 0x22222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID CLSID_DfMarshal = { 0x0000030b, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; +static const GUID CLSID_ft_unmarshaler_1809 = {0x00000359, 0x0000, 0x0000, {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}};
/* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); @@ -1392,7 +1393,7 @@ static ULONG WINAPI CustomMarshal_Release(IMarshal *iface) static HRESULT WINAPI CustomMarshal_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { - CHECK_EXPECT(CustomMarshal_GetUnmarshalClass); + CHECK_EXPECT2(CustomMarshal_GetUnmarshalClass); *clsid = *unmarshal_class; return S_OK; } @@ -3329,8 +3330,8 @@ static void test_freethreadedmarshaler(void) hr = IMarshal_GetUnmarshalClass(pFTMarshal, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL, &clsid); ok_ole_success(hr, IMarshal_GetUnmarshalClass); - ok(IsEqualIID(&clsid, &CLSID_StdMarshal), "clsid = %s\n", - wine_dbgstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &CLSID_StdMarshal) || IsEqualGUID(&clsid, &CLSID_ft_unmarshaler_1809) /* Win10 1809 */, + "clsid = %s\n", wine_dbgstr_guid(&clsid));
IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); hr = IMarshal_MarshalInterface(pFTMarshal, pStream, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL);
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=62747
Your paranoid android.
=== w1064v1809 (32 bit report) ===
ole32: marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1924 marshal.c:4369: Test failed: server tid was 0x3 instead of 0x1bf8 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1924 marshal.c:4406: Test failed: server tid was 0x3 instead of 0x1bf8 marshal.c:4476: Test failed: server pid was 0x1bf8 instead of 0x1924 marshal.c:4478: Test failed: server tid was 0x3 instead of 0x1bf8 marshal.c:4510: Test failed: server pid was 0x1bf8 instead of 0x1924 marshal.c:4512: Test failed: server tid was 0x3 instead of 0x1bf8 marshal.c:4443: Test failed: server pid was 0x1bf8 instead of 0x1924 marshal.c:4445: Test failed: server tid was 0x3 instead of 0x1bf8 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1924 marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1bf8 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1924 marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1bf8 marshal.c:4476: Test failed: server pid was 0x1bf8 instead of 0x1924 marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1bf8 marshal.c:4510: Test failed: server pid was 0x1bf8 instead of 0x1924 marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1bf8 marshal.c:4443: Test failed: server pid was 0x1bf8 instead of 0x1924 marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1bf8 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1924 marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1bf8 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1924 marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1bf8 marshal.c:4476: Test failed: server pid was 0x1bf8 instead of 0x1924 marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1bf8 marshal.c:4510: Test failed: server pid was 0x1bf8 instead of 0x1924 marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1bf8 marshal.c:4443: Test failed: server pid was 0x1bf8 instead of 0x1924 marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1bf8
=== w1064v1809_2scr (32 bit report) ===
ole32: marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1a68 marshal.c:4369: Test failed: server tid was 0x8d0003 instead of 0x1954 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1a68 marshal.c:4406: Test failed: server tid was 0x8d0003 instead of 0x1954 marshal.c:4476: Test failed: server pid was 0x1954 instead of 0x1a68 marshal.c:4478: Test failed: server tid was 0x8d0003 instead of 0x1954 marshal.c:4510: Test failed: server pid was 0x1954 instead of 0x1a68 marshal.c:4512: Test failed: server tid was 0x8d0003 instead of 0x1954 marshal.c:4443: Test failed: server pid was 0x1954 instead of 0x1a68 marshal.c:4445: Test failed: server tid was 0x8d0003 instead of 0x1954 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1a68 marshal.c:4369: Test failed: server tid was 0x8d0005 instead of 0x1954 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1a68 marshal.c:4406: Test failed: server tid was 0x8d0005 instead of 0x1954 marshal.c:4476: Test failed: server pid was 0x1954 instead of 0x1a68 marshal.c:4478: Test failed: server tid was 0x8d0005 instead of 0x1954 marshal.c:4510: Test failed: server pid was 0x1954 instead of 0x1a68 marshal.c:4512: Test failed: server tid was 0x8d0005 instead of 0x1954 marshal.c:4443: Test failed: server pid was 0x1954 instead of 0x1a68 marshal.c:4445: Test failed: server tid was 0x8d0005 instead of 0x1954 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1a68 marshal.c:4369: Test failed: server tid was 0x8d0005 instead of 0x1954 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1a68 marshal.c:4406: Test failed: server tid was 0x8d0005 instead of 0x1954 marshal.c:4476: Test failed: server pid was 0x1954 instead of 0x1a68 marshal.c:4478: Test failed: server tid was 0x8d0005 instead of 0x1954 marshal.c:4510: Test failed: server pid was 0x1954 instead of 0x1a68 marshal.c:4512: Test failed: server tid was 0x8d0005 instead of 0x1954 marshal.c:4443: Test failed: server pid was 0x1954 instead of 0x1a68 marshal.c:4445: Test failed: server tid was 0x8d0005 instead of 0x1954
=== w1064v1809_ar (32 bit report) ===
ole32: marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1128 marshal.c:4369: Test failed: server tid was 0x1770003 instead of 0x1858 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1128 marshal.c:4406: Test failed: server tid was 0x1770003 instead of 0x1858 marshal.c:4476: Test failed: server pid was 0x1858 instead of 0x1128 marshal.c:4478: Test failed: server tid was 0x1770003 instead of 0x1858 marshal.c:4510: Test failed: server pid was 0x1858 instead of 0x1128 marshal.c:4512: Test failed: server tid was 0x1770003 instead of 0x1858 marshal.c:4443: Test failed: server pid was 0x1858 instead of 0x1128 marshal.c:4445: Test failed: server tid was 0x1770003 instead of 0x1858 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1128 marshal.c:4369: Test failed: server tid was 0x1770005 instead of 0x1858 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1128 marshal.c:4406: Test failed: server tid was 0x1770005 instead of 0x1858 marshal.c:4476: Test failed: server pid was 0x1858 instead of 0x1128 marshal.c:4478: Test failed: server tid was 0x1770005 instead of 0x1858 marshal.c:4510: Test failed: server pid was 0x1858 instead of 0x1128 marshal.c:4512: Test failed: server tid was 0x1770005 instead of 0x1858 marshal.c:4443: Test failed: server pid was 0x1858 instead of 0x1128 marshal.c:4445: Test failed: server tid was 0x1770005 instead of 0x1858 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1128 marshal.c:4369: Test failed: server tid was 0x1770005 instead of 0x1858 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1128 marshal.c:4406: Test failed: server tid was 0x1770005 instead of 0x1858 marshal.c:4476: Test failed: server pid was 0x1858 instead of 0x1128 marshal.c:4478: Test failed: server tid was 0x1770005 instead of 0x1858 marshal.c:4510: Test failed: server pid was 0x1858 instead of 0x1128 marshal.c:4512: Test failed: server tid was 0x1770005 instead of 0x1858 marshal.c:4443: Test failed: server pid was 0x1858 instead of 0x1128 marshal.c:4445: Test failed: server tid was 0x1770005 instead of 0x1858
=== w1064v1809_he (32 bit report) ===
ole32: marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1ab8 marshal.c:4369: Test failed: server tid was 0x3 instead of 0x7fc marshal.c:4371: Test failed: method was 0 instead of 3 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1ab8 marshal.c:4406: Test failed: server tid was 0x3 instead of 0x7fc marshal.c:4408: Test failed: method was 0 instead of 3 marshal.c:4476: Test failed: server pid was 0x7fc instead of 0x1ab8 marshal.c:4478: Test failed: server tid was 0x3 instead of 0x7fc marshal.c:4480: Test failed: method was 0 instead of 3 marshal.c:4510: Test failed: server pid was 0x7fc instead of 0x1ab8 marshal.c:4512: Test failed: server tid was 0x3 instead of 0x7fc marshal.c:4514: Test failed: method was 0 instead of 3 marshal.c:4443: Test failed: server pid was 0x7fc instead of 0x1ab8 marshal.c:4445: Test failed: server tid was 0x3 instead of 0x7fc marshal.c:4447: Test failed: method was 0 instead of 3 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1ab8 marshal.c:4369: Test failed: server tid was 0x5 instead of 0x7fc marshal.c:4371: Test failed: method was 0 instead of 5 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1ab8 marshal.c:4406: Test failed: server tid was 0x5 instead of 0x7fc marshal.c:4408: Test failed: method was 0 instead of 5 marshal.c:4476: Test failed: server pid was 0x7fc instead of 0x1ab8 marshal.c:4478: Test failed: server tid was 0x5 instead of 0x7fc marshal.c:4480: Test failed: method was 0 instead of 5 marshal.c:4510: Test failed: server pid was 0x7fc instead of 0x1ab8 marshal.c:4512: Test failed: server tid was 0x5 instead of 0x7fc marshal.c:4514: Test failed: method was 0 instead of 5 marshal.c:4443: Test failed: server pid was 0x7fc instead of 0x1ab8 marshal.c:4445: Test failed: server tid was 0x5 instead of 0x7fc marshal.c:4447: Test failed: method was 0 instead of 5 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1ab8 marshal.c:4369: Test failed: server tid was 0x5 instead of 0x7fc marshal.c:4371: Test failed: method was 0 instead of 5 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1ab8 marshal.c:4406: Test failed: server tid was 0x5 instead of 0x7fc marshal.c:4408: Test failed: method was 0 instead of 5 marshal.c:4476: Test failed: server pid was 0x7fc instead of 0x1ab8 marshal.c:4478: Test failed: server tid was 0x5 instead of 0x7fc marshal.c:4480: Test failed: method was 0 instead of 5 marshal.c:4510: Test failed: server pid was 0x7fc instead of 0x1ab8 marshal.c:4512: Test failed: server tid was 0x5 instead of 0x7fc marshal.c:4514: Test failed: method was 0 instead of 5 marshal.c:4443: Test failed: server pid was 0x7fc instead of 0x1ab8 marshal.c:4445: Test failed: server tid was 0x5 instead of 0x7fc marshal.c:4447: Test failed: method was 0 instead of 5
=== w1064v1809_ja (32 bit report) ===
ole32: marshal.c:1841: Test failed: wait timed out marshal.c:1843: Test failed: Crash thread failed marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1b7c marshal.c:4369: Test failed: server tid was 0x430003 instead of 0x1bd0 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1b7c marshal.c:4406: Test failed: server tid was 0x430003 instead of 0x1bd0 marshal.c:4476: Test failed: server pid was 0x1bd0 instead of 0x1b7c marshal.c:4478: Test failed: server tid was 0x430003 instead of 0x1bd0 marshal.c:4510: Test failed: server pid was 0x1bd0 instead of 0x1b7c marshal.c:4512: Test failed: server tid was 0x430003 instead of 0x1bd0 marshal.c:4443: Test failed: server pid was 0x1bd0 instead of 0x1b7c marshal.c:4445: Test failed: server tid was 0x430003 instead of 0x1bd0 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1b7c marshal.c:4369: Test failed: server tid was 0x430005 instead of 0x1bd0 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1b7c marshal.c:4406: Test failed: server tid was 0x430005 instead of 0x1bd0 marshal.c:4476: Test failed: server pid was 0x1bd0 instead of 0x1b7c marshal.c:4478: Test failed: server tid was 0x430005 instead of 0x1bd0 marshal.c:4510: Test failed: server pid was 0x1bd0 instead of 0x1b7c marshal.c:4512: Test failed: server tid was 0x430005 instead of 0x1bd0 marshal.c:4443: Test failed: server pid was 0x1bd0 instead of 0x1b7c marshal.c:4445: Test failed: server tid was 0x430005 instead of 0x1bd0 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1b7c marshal.c:4369: Test failed: server tid was 0x430005 instead of 0x1bd0 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1b7c marshal.c:4406: Test failed: server tid was 0x430005 instead of 0x1bd0 marshal.c:4476: Test failed: server pid was 0x1bd0 instead of 0x1b7c marshal.c:4478: Test failed: server tid was 0x430005 instead of 0x1bd0 marshal.c:4510: Test failed: server pid was 0x1bd0 instead of 0x1b7c marshal.c:4512: Test failed: server tid was 0x430005 instead of 0x1bd0 marshal.c:4443: Test failed: server pid was 0x1bd0 instead of 0x1b7c marshal.c:4445: Test failed: server tid was 0x430005 instead of 0x1bd0
=== w1064v1809_zh_CN (32 bit report) ===
ole32: marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1b18 marshal.c:4369: Test failed: server tid was 0x3 instead of 0x1be4 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1b18 marshal.c:4406: Test failed: server tid was 0x3 instead of 0x1be4 marshal.c:4476: Test failed: server pid was 0x1be4 instead of 0x1b18 marshal.c:4478: Test failed: server tid was 0x3 instead of 0x1be4 marshal.c:4510: Test failed: server pid was 0x1be4 instead of 0x1b18 marshal.c:4512: Test failed: server tid was 0x3 instead of 0x1be4 marshal.c:4443: Test failed: server pid was 0x1be4 instead of 0x1b18 marshal.c:4445: Test failed: server tid was 0x3 instead of 0x1be4 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1b18 marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1be4 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1b18 marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1be4 marshal.c:4476: Test failed: server pid was 0x1be4 instead of 0x1b18 marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1be4 marshal.c:4510: Test failed: server pid was 0x1be4 instead of 0x1b18 marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1be4 marshal.c:4443: Test failed: server pid was 0x1be4 instead of 0x1b18 marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1be4 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x1b18 marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1be4 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x1b18 marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1be4 marshal.c:4476: Test failed: server pid was 0x1be4 instead of 0x1b18 marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1be4 marshal.c:4510: Test failed: server pid was 0x1be4 instead of 0x1b18 marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1be4 marshal.c:4443: Test failed: server pid was 0x1be4 instead of 0x1b18 marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1be4
=== w1064v1809 (64 bit report) ===
ole32: marshal.c:4367: Test failed: server pid was 0x0 instead of 0x19b0 marshal.c:4369: Test failed: server tid was 0x3 instead of 0x1240 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x19b0 marshal.c:4406: Test failed: server tid was 0x3 instead of 0x1240 marshal.c:4476: Test failed: server pid was 0x1240 instead of 0x19b0 marshal.c:4478: Test failed: server tid was 0x3 instead of 0x1240 marshal.c:4510: Test failed: server pid was 0x1240 instead of 0x19b0 marshal.c:4512: Test failed: server tid was 0x3 instead of 0x1240 marshal.c:4443: Test failed: server pid was 0x1240 instead of 0x19b0 marshal.c:4445: Test failed: server tid was 0x3 instead of 0x1240 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x19b0 marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1240 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x19b0 marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1240 marshal.c:4476: Test failed: server pid was 0x1240 instead of 0x19b0 marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1240 marshal.c:4510: Test failed: server pid was 0x1240 instead of 0x19b0 marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1240 marshal.c:4443: Test failed: server pid was 0x1240 instead of 0x19b0 marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1240 marshal.c:4367: Test failed: server pid was 0x0 instead of 0x19b0 marshal.c:4369: Test failed: server tid was 0x5 instead of 0x1240 marshal.c:4404: Test failed: server pid was 0x0 instead of 0x19b0 marshal.c:4406: Test failed: server tid was 0x5 instead of 0x1240 marshal.c:4476: Test failed: server pid was 0x1240 instead of 0x19b0 marshal.c:4478: Test failed: server tid was 0x5 instead of 0x1240 marshal.c:4510: Test failed: server pid was 0x1240 instead of 0x19b0 marshal.c:4512: Test failed: server tid was 0x5 instead of 0x1240 marshal.c:4443: Test failed: server pid was 0x1240 instead of 0x19b0 marshal.c:4445: Test failed: server tid was 0x5 instead of 0x1240
-
Huw Davies -
Marvin