October 2018 - Wine-Commits

Piotr Caban : ole32/tests: Add free threaded marshaler GetUnmarshalClass tests.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: aa1cfbbcc82d19933c4d32cc96996a4d9fe78b0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa1cfbbcc82d19933c4d32cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 19:12:19 2018 +0200 ole32/tests: Add free threaded marshaler GetUnmarshalClass tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 50 +++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 3a3f9e7..c53acf2 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -3205,6 +3205,7 @@ static void test_freethreadedmarshaler(void) IStream *pStream; IUnknown *pProxy; static const LARGE_INTEGER llZero; + CLSID clsid; cLocks = 0; hr = CoCreateFreeThreadedMarshaler(NULL, &pFTUnknown); @@ -3218,6 +3219,12 @@ static void test_freethreadedmarshaler(void) /* inproc normal marshaling */ + hr = IMarshal_GetUnmarshalClass(pFTMarshal, &IID_IClassFactory, + &Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL, &clsid); + ok_ole_success(hr, IMarshal_GetUnmarshalClass); + ok(IsEqualIID(&clsid, &CLSID_InProcFreeMarshaler), "clsid = %s\n", + wine_dbgstr_guid(&clsid)); + hr = IMarshal_MarshalInterface(pFTMarshal, pStream, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok_ole_success(hr, IMarshal_MarshalInterface); @@ -3234,27 +3241,6 @@ static void test_freethreadedmarshaler(void) ok_no_locks(); -/* native doesn't allow us to unmarshal or release the stream data, - * presumably because it wants us to call CoMarshalInterface instead */ - if (0) - { - /* local normal marshaling */ - - IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); - hr = IMarshal_MarshalInterface(pFTMarshal, pStream, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); - ok_ole_success(hr, IMarshal_MarshalInterface); - - ok_more_than_one_lock(); - - test_freethreadedmarshaldata(pStream, MSHCTX_LOCAL, &Test_ClassFactory, MSHLFLAGS_NORMAL); - - IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); - hr = IMarshal_ReleaseMarshalData(pFTMarshal, pStream); - ok_ole_success(hr, IMarshal_ReleaseMarshalData); - - ok_no_locks(); - } - /* inproc table-strong marshaling */ IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); @@ -3332,6 +3318,28 @@ static void test_freethreadedmarshaler(void) ok_no_locks(); + /* local normal marshaling */ + + 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)); + + IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); + hr = IMarshal_MarshalInterface(pFTMarshal, pStream, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, IMarshal_MarshalInterface); + + ok_more_than_one_lock(); + + test_freethreadedmarshaldata(pStream, MSHCTX_LOCAL, &Test_ClassFactory, MSHLFLAGS_NORMAL); + + IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); + hr = CoReleaseMarshalData(pStream); + ok_ole_success(hr, CoReleaseMarshalData); + + ok_no_locks(); + IStream_Release(pStream); IMarshal_Release(pFTMarshal); }

1 0

Zebediah Figura : rpcrt4: Also clear base-type [out] pointers in client_do_args().
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: be25106503bc71f0dc82c50bc9c5a90651fbeebd URL: https://source.winehq.org/git/wine.git/?a=commit;h=be25106503bc71f0dc82c50b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 13 17:46:43 2018 -0500 rpcrt4: Also clear base-type [out] pointers in client_do_args(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 48 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 6a65a14..c2f260c 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -427,6 +427,45 @@ static inline BOOL param_needs_alloc( PARAM_ATTRIBUTES attr ) return attr.IsOut && !attr.IsIn && !attr.IsBasetype && !attr.IsByValue; } +static inline BOOL param_is_out_basetype( PARAM_ATTRIBUTES attr ) +{ + return attr.IsOut && !attr.IsIn && attr.IsBasetype && attr.IsSimpleRef; +} + +static size_t basetype_arg_size( unsigned char fc ) +{ + switch (fc) + { + case FC_BYTE: + case FC_CHAR: + case FC_SMALL: + case FC_USMALL: + return sizeof(char); + case FC_WCHAR: + case FC_SHORT: + case FC_USHORT: + return sizeof(short); + case FC_LONG: + case FC_ULONG: + case FC_ENUM16: + case FC_ENUM32: + case FC_ERROR_STATUS_T: + return sizeof(int); + case FC_FLOAT: + return sizeof(float); + case FC_HYPER: + return sizeof(LONGLONG); + case FC_DOUBLE: + return sizeof(double); + case FC_INT3264: + case FC_UINT3264: + return sizeof(INT_PTR); + default: + FIXME("Unhandled basetype %#x.\n", fc); + return 0; + } +} + void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum stubless_phase phase, void **fpu_args, unsigned short number_of_params, unsigned char *pRetVal ) { @@ -458,8 +497,13 @@ void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum s switch (phase) { case STUBLESS_INITOUT: - if (param_needs_alloc(params[i].attr) && *(unsigned char **)pArg) - memset( *(unsigned char **)pArg, 0, calc_arg_size( pStubMsg, pTypeFormat )); + if (*(unsigned char **)pArg) + { + if (param_needs_alloc(params[i].attr)) + memset( *(unsigned char **)pArg, 0, calc_arg_size( pStubMsg, pTypeFormat )); + else if (param_is_out_basetype(params[i].attr)) + memset( *(unsigned char **)pArg, 0, basetype_arg_size( params[i].u.type_format_char )); + } break; case STUBLESS_CALCSIZE: if (params[i].attr.IsSimpleRef && !*(unsigned char **)pArg)

1 0

Piotr Caban : ole32/tests: Add initial CoGetStandardMarshal tests.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 11eb273c288c1d3db847260c2e70b30ddc09736b URL: https://source.winehq.org/git/wine.git/?a=commit;h=11eb273c288c1d3db847260c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 19:11:50 2018 +0200 ole32/tests: Add initial CoGetStandardMarshal tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c0af232..4f4b2b0 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1308,6 +1308,60 @@ todo_wine end_host_object(tid, thread); } +static void test_CoGetStandardMarshal(void) +{ + IMarshal *marshal; + DWORD size, read; + IStream *stream; + IUnknown *unk; + CLSID clsid; + HRESULT hr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok_ole_success(hr, CreateStreamOnHGlobal); + + hr = CoGetStandardMarshal(&IID_IUnknown, &Test_Unknown, + MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL, &marshal); + ok_ole_success(hr, CoGetStandardMarshal); + + hr = IMarshal_GetUnmarshalClass(marshal, &IID_IUnknown, &Test_Unknown, + MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL, &clsid); + ok_ole_success(hr, IMarshal_GetUnmarshalClass); + ok(IsEqualGUID(&clsid, &CLSID_StdMarshal), "clsid = %s\n", wine_dbgstr_guid(&clsid)); + + hr = IMarshal_GetMarshalSizeMax(marshal, &IID_IUnknown, &Test_Unknown, + MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL, &size); + ok_ole_success(hr, IMarshal_GetMarshalSizeMax); + hr = CoGetMarshalSizeMax(&read, &IID_IUnknown, &Test_Unknown, + MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoGetMarshalSizeMax); + ok(size == read, "IMarshal_GetMarshalSizeMax size = %d, expected %d\n", size, read); + + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUnknown, + &Test_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, IMarshal_MarshalInterface); + + hr = IStream_Seek(stream, ullZero, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, IStream_Seek); + hr = IMarshal_UnmarshalInterface(marshal, stream, &IID_IUnknown, (void**)&unk); + ok_ole_success(hr, IMarshal_UnmarshalInterface); + IUnknown_Release(unk); + + hr = IStream_Seek(stream, ullZero, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, IStream_Seek); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUnknown, + &Test_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, IMarshal_MarshalInterface); + + hr = IStream_Seek(stream, ullZero, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, IStream_Seek); + hr = IMarshal_ReleaseMarshalData(marshal, stream); + ok_ole_success(hr, IMarshal_ReleaseMarshalData); + IStream_Release(stream); + + IMarshal_Release(marshal); +} + struct ncu_params { LPSTREAM stream; @@ -4317,6 +4371,7 @@ START_TEST(marshal) } while (with_external_conn); test_marshal_channel_buffer(); + test_CoGetStandardMarshal(); test_hresult_marshaling(); test_proxy_used_in_wrong_thread(); test_message_filter();

1 0

Nikolay Sivov : comctl32/listview: Simplify iterator helpers that can' t fail.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 332062963fc4cfc092e5359cde6bd724d0a57a43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=332062963fc4cfc092e5359c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 15 12:39:02 2018 +0300 comctl32/listview: Simplify iterator helpers that can't fail. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7915ece..c5978b3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1315,21 +1315,19 @@ static inline void iterator_destroy(const ITERATOR *i) /*** * Create an empty iterator. */ -static inline BOOL iterator_empty(ITERATOR* i) +static inline void iterator_empty(ITERATOR* i) { ZeroMemory(i, sizeof(*i)); i->nItem = i->nSpecial = i->range.lower = i->range.upper = -1; - return TRUE; } /*** * Create an iterator over a range. */ -static inline BOOL iterator_rangeitems(ITERATOR* i, RANGE range) +static inline void iterator_rangeitems(ITERATOR* i, RANGE range) { iterator_empty(i); i->range = range; - return TRUE; } /*** @@ -1337,11 +1335,10 @@ static inline BOOL iterator_rangeitems(ITERATOR* i, RANGE range) * Please note that the iterator will take ownership of the ranges, * and will free them upon destruction. */ -static inline BOOL iterator_rangesitems(ITERATOR* i, RANGES ranges) +static inline void iterator_rangesitems(ITERATOR* i, RANGES ranges) { iterator_empty(i); i->ranges = ranges; - return TRUE; } /*** @@ -1351,11 +1348,12 @@ static inline BOOL iterator_rangesitems(ITERATOR* i, RANGES ranges) static BOOL iterator_frameditems_absolute(ITERATOR* i, const LISTVIEW_INFO* infoPtr, const RECT *frame) { RECT rcItem, rcTemp; + RANGES ranges; TRACE("(frame=%s)\n", wine_dbgstr_rect(frame)); /* in case we fail, we want to return an empty iterator */ - if (!iterator_empty(i)) return FALSE; + iterator_empty(i); if (infoPtr->nItemCount == 0) return TRUE; @@ -1370,7 +1368,8 @@ static BOOL iterator_frameditems_absolute(ITERATOR* i, const LISTVIEW_INFO* info if (IntersectRect(&rcTemp, &rcItem, frame)) i->nSpecial = infoPtr->nFocusedItem; } - if (!(iterator_rangesitems(i, ranges_create(50)))) return FALSE; + if (!(ranges = ranges_create(50))) return FALSE; + iterator_rangesitems(i, ranges); /* to do better here, we need to have PosX, and PosY sorted */ TRACE("building icon ranges:\n"); for (nItem = 0; nItem < infoPtr->nItemCount; nItem++) @@ -1394,7 +1393,7 @@ static BOOL iterator_frameditems_absolute(ITERATOR* i, const LISTVIEW_INFO* info range.lower = max(frame->top / infoPtr->nItemHeight, 0); range.upper = min((frame->bottom - 1) / infoPtr->nItemHeight, infoPtr->nItemCount - 1) + 1; if (range.upper <= range.lower) return TRUE; - if (!iterator_rangeitems(i, range)) return FALSE; + iterator_rangeitems(i, range); TRACE(" report=%s\n", debugrange(&i->range)); } else @@ -1426,7 +1425,8 @@ static BOOL iterator_frameditems_absolute(ITERATOR* i, const LISTVIEW_INFO* info if (nLastCol < nFirstCol || nLastRow < nFirstRow) return TRUE; - if (!(iterator_rangesitems(i, ranges_create(nLastCol - nFirstCol + 1)))) return FALSE; + if (!(ranges = ranges_create(nLastCol - nFirstCol + 1))) return FALSE; + iterator_rangesitems(i, ranges); TRACE("building list ranges:\n"); for (nCol = nFirstCol; nCol <= nLastCol; nCol++) { @@ -1467,7 +1467,11 @@ static BOOL iterator_visibleitems(ITERATOR *i, const LISTVIEW_INFO *infoPtr, HDC INT rgntype; rgntype = GetClipBox(hdc, &rcClip); - if (rgntype == NULLREGION) return iterator_empty(i); + if (rgntype == NULLREGION) + { + iterator_empty(i); + return TRUE; + } if (!iterator_frameditems(i, infoPtr, &rcClip)) return FALSE; if (rgntype == SIMPLEREGION) return TRUE;

1 0

Nikolay Sivov : comctl32/listview: Fix crashing in LVM_GETCOUNTPERPAGE for partially initialize lists.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: fae75d7961319f62a36b63fd2182ef9db8f11dfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=fae75d7961319f62a36b63fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 15 12:39:01 2018 +0300 comctl32/listview: Fix crashing in LVM_GETCOUNTPERPAGE for partially initialize lists. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6b32167..7915ece 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1808,7 +1808,7 @@ static inline INT LISTVIEW_GetCountPerColumn(const LISTVIEW_INFO *infoPtr) { INT nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top; - return max(nListHeight / infoPtr->nItemHeight, 1); + return infoPtr->nItemHeight ? max(nListHeight / infoPtr->nItemHeight, 1) : 0; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6a7842b..5c2b3b7 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6398,6 +6398,76 @@ static void test_LVN_ENDLABELEDIT(void) DestroyWindow(hwnd); } +static LRESULT CALLBACK create_item_height_wndproc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_CREATE) + return 0; + + return CallWindowProcA(listviewWndProc, hwnd, msg, wParam, lParam); +} + +static void test_LVM_GETCOUNTPERPAGE(void) +{ + static const DWORD styles[] = { LVS_ICON, LVS_LIST, LVS_REPORT, LVS_SMALLICON }; + unsigned int i, j; + WNDCLASSEXA cls; + ATOM class; + HWND hwnd; + BOOL ret; + + cls.cbSize = sizeof(WNDCLASSEXA); + ret = GetClassInfoExA(GetModuleHandleA(NULL), WC_LISTVIEWA, &cls); + ok(ret, "Failed to get class info.\n"); + listviewWndProc = cls.lpfnWndProc; + cls.lpfnWndProc = create_item_height_wndproc; + cls.lpszClassName = "CountPerPageClass"; + class = RegisterClassExA(&cls); + ok(class, "Failed to register class.\n"); + + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + static char text[] = "item text"; + LVITEMA item = { 0 }; + UINT count, count2; + + hwnd = create_listview_control(styles[i]); + ok(hwnd != NULL, "Failed to create listview window.\n"); + + count = SendMessageA(hwnd, LVM_GETCOUNTPERPAGE, 0, 0); + if (styles[i] == LVS_LIST || styles[i] == LVS_REPORT) + ok(count > 0 || broken(styles[i] == LVS_LIST && count == 0), "%u: unexpected count %u.\n", i, count); + else + ok(count == 0, "%u: unexpected count %u.\n", i, count); + + for (j = 0; j < 10; j++) + { + item.mask = LVIF_TEXT; + item.pszText = text; + SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + } + + count2 = SendMessageA(hwnd, LVM_GETCOUNTPERPAGE, 0, 0); + if (styles[i] == LVS_LIST || styles[i] == LVS_REPORT) + ok(count == count2, "%u: unexpected count %u.\n", i, count2); + else + ok(count2 == 10, "%u: unexpected count %u.\n", i, count2); + + DestroyWindow(hwnd); + + hwnd = CreateWindowA("CountPerPageClass", "Test", WS_VISIBLE | styles[i], 0, 0, 100, 100, NULL, NULL, + GetModuleHandleA(NULL), 0); + ok(hwnd != NULL, "Failed to create a window.\n"); + + count = SendMessageA(hwnd, LVM_GETCOUNTPERPAGE, 0, 0); + ok(count == 0, "%u: unexpected count %u.\n", i, count); + + DestroyWindow(hwnd); + } + + ret = UnregisterClassA("CountPerPageClass", NULL); + ok(ret, "Failed to unregister test class.\n"); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6460,6 +6530,7 @@ START_TEST(listview) test_state_image(); test_LVSCW_AUTOSIZE(); test_LVN_ENDLABELEDIT(); + test_LVM_GETCOUNTPERPAGE(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -6503,6 +6574,7 @@ START_TEST(listview) test_state_image(); test_LVSCW_AUTOSIZE(); test_LVN_ENDLABELEDIT(); + test_LVM_GETCOUNTPERPAGE(); unload_v6_module(ctx_cookie, hCtx);

1 0

Michael Stefaniuc : dinput: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 6710a0485dea05e389510c59cb3d17c35dfbcb17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6710a0485dea05e389510c59… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 14 23:56:43 2018 +0200 dinput: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/config.c | 4 ++-- dlls/dinput/device.c | 15 +++++++-------- dlls/dinput/dinput_main.c | 10 +++++----- dlls/dinput/joystick.c | 8 ++++---- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/keyboard.c | 2 +- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 708f406..bb36db0 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -95,7 +95,7 @@ static void init_listview_columns(HWND dialog) GetClientRect(GetDlgItem(dialog, IDC_DEVICEOBJECTSLIST), &viewRect); width = (viewRect.right - viewRect.left)/2; - LoadStringW(hinstance, IDS_OBJECTCOLUMN, column, sizeof(column)/sizeof(column[0])); + LoadStringW(hinstance, IDS_OBJECTCOLUMN, column, ARRAY_SIZE(column)); listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW(listColumn.pszText); @@ -103,7 +103,7 @@ static void init_listview_columns(HWND dialog) SendDlgItemMessageW (dialog, IDC_DEVICEOBJECTSLIST, LVM_INSERTCOLUMNW, 0, (LPARAM) &listColumn); - LoadStringW(hinstance, IDS_ACTIONCOLUMN, column, sizeof(column)/sizeof(column[0])); + LoadStringW(hinstance, IDS_ACTIONCOLUMN, column, ARRAY_SIZE(column)); listColumn.cx = width; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW(listColumn.pszText); diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index f99dc20..322c8ac 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -80,7 +80,7 @@ static void _dump_cooperativelevel_DI(DWORD dwFlags) { #undef FE }; TRACE(" cooperative level : "); - for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) if (flags[i].mask & dwFlags) TRACE("%s ",flags[i].name); TRACE("\n"); @@ -106,7 +106,7 @@ static void _dump_ObjectDataFormat_flags(DWORD dwFlags) { TRACE("Flags:"); /* First the flags */ - for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) { + for (i = 0; i < ARRAY_SIZE(flags); i++) { if (flags[i].mask & dwFlags) TRACE(" %s",flags[i].name); } @@ -153,7 +153,7 @@ static void _dump_EnumObjects_flags(DWORD dwFlags) { if (type == DIDFT_ALL) { TRACE(" DIDFT_ALL"); } else { - for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) { + for (i = 0; i < ARRAY_SIZE(flags); i++) { if (flags[i].mask & type) { type &= ~flags[i].mask; TRACE(" %s",flags[i].name); @@ -230,7 +230,7 @@ const char *_dump_dinput_GUID(const GUID *guid) { }; if (guid == NULL) return "null GUID"; - for (i = 0; i < (sizeof(guids) / sizeof(guids[0])); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(guids[i].guid, guid)) { return guids[i].name; } @@ -916,7 +916,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L if (dwFlags & DIDSAM_NOUSER) dps.wsz[0] = '\0'; else - lstrcpynW(dps.wsz, username, sizeof(dps.wsz)/sizeof(WCHAR)); + lstrcpynW(dps.wsz, username, ARRAY_SIZE(dps.wsz)); IDirectInputDevice8_SetProperty(iface, DIPROP_USERNAME, &dps.diph); /* Save the settings to disk */ @@ -1323,7 +1323,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, { if (*device_player->username) { - lstrcpynW(ps->wsz, device_player->username, sizeof(ps->wsz)/sizeof(WCHAR)); + lstrcpynW(ps->wsz, device_player->username, ARRAY_SIZE(ps->wsz)); return DI_OK; } else break; @@ -1428,8 +1428,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( device_player->instance_guid = This->guid; } if (device_player) - lstrcpynW(device_player->username, ps->wsz, - sizeof(device_player->username)/sizeof(WCHAR)); + lstrcpynW(device_player->username, ps->wsz, ARRAY_SIZE(device_player->username)); break; } default: diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 32eedf1..28e192a 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -282,7 +282,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) TRACE("DIEDFL_ALLDEVICES\n"); return; } - for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) if (flags[i].mask & dwFlags) TRACE("%s ",flags[i].name); } @@ -1090,7 +1090,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( /* Add keyboard and mouse to remaining device count */ if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) { - for (i = 0; i < sizeof(guids) / sizeof(guids[0]); i++) + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (should_enumerate_device(username_w, dwFlags, &This->device_players, guids[i])) remain++; @@ -1119,7 +1119,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( } /* Enumerate keyboard and mouse */ - for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (should_enumerate_device(username_w, dwFlags, &This->device_players, guids[i])) { @@ -1191,7 +1191,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( /* Add keyboard and mouse to remaining device count */ if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) { - for (i = 0; i < sizeof(guids) / sizeof(guids[0]); i++) + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (should_enumerate_device(ptszUserName, dwFlags, &This->device_players, guids[i])) remain++; @@ -1215,7 +1215,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; /* Enumerate keyboard and mouse */ - for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (should_enumerate_device(ptszUserName, dwFlags, &This->device_players, guids[i])) { diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 45c3618..9f426f3 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -92,7 +92,7 @@ static void _dump_DIEFFECT_flags(DWORD dwFlags) FE(DIEFF_SPHERICAL) #undef FE }; - for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) if (flags[i].mask & dwFlags) TRACE("%s ", flags[i].name); TRACE("\n"); @@ -786,7 +786,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, /* Only consider actions of the right genre */ if (lpdiaf->dwGenre != genre && genre != DIGENRE_ANY) continue; - for (j=0; j < sizeof(object_types)/sizeof(object_types[0]); j++) + for (j = 0; j < ARRAY_SIZE(object_types); j++) { if (type & object_types[j]) { @@ -979,7 +979,7 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ { int i; - for (i = 0; i < sizeof(axis_names) / sizeof(axis_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(axis_names); i++) { if (!strcmp(ptr, axis_names[i])) { @@ -1011,7 +1011,7 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ } } - if (i == sizeof(axis_names) / sizeof(axis_names[0])) + if (i == ARRAY_SIZE(axis_names)) { ERR("invalid joystick axis type: \"%s\"\n", ptr); i = -1; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 2b2aade..0701b9f 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -279,7 +279,7 @@ static const char* debugstr_cf(CFTypeRef t) if (!ret) { UniChar buf[200]; - int len = min(CFStringGetLength(s), sizeof(buf)/sizeof(buf[0])); + int len = min(CFStringGetLength(s), ARRAY_SIZE(buf)); CFStringGetCharacters(s, CFRangeMake(0, len), buf); ret = debugstr_wn(buf, len); } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 6c7b535..a64c59c 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -508,7 +508,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface scan = map_dik_to_scan(DIDFT_GETINSTANCE(pdidoi->dwType), This->subtype); if (!GetKeyNameTextW((scan & 0x80) << 17 | (scan & 0x7f) << 16, - pdidoi->tszName, sizeof(pdidoi->tszName)/sizeof(pdidoi->tszName[0]))) + pdidoi->tszName, ARRAY_SIZE(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; _dump_OBJECTINSTANCEW(pdidoi);

1 0

Piotr Caban : ole32: Make standard marshaler responsible for marshaling OBJREF header.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 475b2d6b5fd63d4a1bb298682fad86eb7a6325d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=475b2d6b5fd63d4a1bb29868… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 19:11:34 2018 +0200 ole32: Make standard marshaler responsible for marshaling OBJREF header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/marshal.c | 222 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 157 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=475b2d6b5fd63d4a1bb2…

1 0

Akihiro Sagawa : gdi32: Adjust destination coordinates in some special cases.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 9f458df88c719f095deb859e163f3c2296df3f43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f458df88c719f095deb859e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Oct 13 22:31:02 2018 +0900 gdi32: Adjust destination coordinates in some special cases. When the source rectangle needs to flip and it doesn't fit in the source device area, the destination image is flipped but the destination area isn't flipped. GdiAlphaBlend doesn't support mirroring, the above isn't applicable. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 26 ++++++++++++++++++++++---- dlls/gdi32/tests/bitmap.c | 6 +++--- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 6f5af64..abca822 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -60,12 +60,30 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * offset_rect( &rect, -src->x - (src->width < 0 ? 1 : 0), -src->y - (src->height < 0 ? 1 : 0)); - rect.left = dst->x + rect.left * dst->width / src->width; - rect.top = dst->y + rect.top * dst->height / src->height; - rect.right = dst->x + rect.right * dst->width / src->width; - rect.bottom = dst->y + rect.bottom * dst->height / src->height; + rect.left = rect.left * dst->width / src->width; + rect.top = rect.top * dst->height / src->height; + rect.right = rect.right * dst->width / src->width; + rect.bottom = rect.bottom * dst->height / src->height; order_rect( &rect ); + /* when the source rectangle needs to flip and it doesn't fit in the source device + area, the destination area isn't flipped. So, adjust destination coordinates */ + if (src->width < 0 && dst->width > 0 && + (src->x + src->width + 1 < src->visrect.left || src->x > src->visrect.right)) + dst->x += (dst->width - rect.right) - rect.left; + else if (src->width > 0 && dst->width < 0 && + (src->x < src->visrect.left || src->x + src->width > src->visrect.right)) + dst->x -= rect.right - (dst->width - rect.left); + + if (src->height < 0 && dst->height > 0 && + (src->y + src->height + 1 < src->visrect.top || src->y > src->visrect.bottom)) + dst->y += (dst->height - rect.bottom) - rect.top; + else if (src->height > 0 && dst->height < 0 && + (src->y < src->visrect.top || src->y + src->height > src->visrect.bottom)) + dst->y -= rect.bottom - (dst->height - rect.top); + + offset_rect( &rect, dst->x, dst->y ); + /* avoid rounding errors */ rect.left--; rect.top--; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a902edc..4622de9 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3263,13 +3263,13 @@ static void test_StretchBlt(void) memset( expected, 0, get_dib_image_size( &biDst ) ); expected[102] = 0x76543210, expected[103] = 0xfedcba98; expected[117] = 0x0000cccc, expected[118] = 0x0000f0f0, expected[119] = 0x0000ff00; - todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 8, 8, 2, 2, -8, -8, expected, __LINE__); memset( expected, 0, get_dib_image_size( &biDst ) ); expected[85] = 0x76543210, expected[86] = 0xfedcba98; expected[99] = 0x0000aaaa, expected[100] = 0x0000cccc, expected[101] = 0x0000f0f0, expected[102] = 0x0000ff00; - todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 8, 8, -18, -18, 0, 0, 18, 18, expected, __LINE__); SelectObject(hdcDst, oldDst); @@ -3595,7 +3595,7 @@ static void test_StretchDIBits(void) expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0xFEEDFACE, expected[3] = 0x00000000; - todo_wine ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 1, 1, -2, -2, 1, 1, 2, 2, expected, __LINE__); ok( ret == 2, "got ret %d\n", ret );

1 0

Piotr Caban : ole32: Change returned size in CoGetMarshalSizeMax if object implements IMarshal.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 0725276f0f4907a0a1f33b39aba0d413014fc9d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0725276f0f4907a0a1f33b39… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 19:11:40 2018 +0200 ole32: Change returned size in CoGetMarshalSizeMax if object implements IMarshal. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/marshal.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 21d0e6f..b12082c 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1804,24 +1804,24 @@ HRESULT WINAPI CoGetMarshalSizeMax(ULONG *pulSize, REFIID riid, IUnknown *pUnk, { HRESULT hr; LPMARSHAL pMarshal; - CLSID marshaler_clsid; + BOOL std_marshal = FALSE; - hr = get_marshaler(riid, pUnk, dwDestContext, pvDestContext, mshlFlags, &pMarshal); - if (hr != S_OK) - return hr; + if(!pUnk) + return E_POINTER; - hr = IMarshal_GetUnmarshalClass(pMarshal, riid, pUnk, dwDestContext, - pvDestContext, mshlFlags, &marshaler_clsid); + hr = IUnknown_QueryInterface(pUnk, &IID_IMarshal, (void**)&pMarshal); if (hr != S_OK) { - ERR("IMarshal::GetUnmarshalClass failed, 0x%08x\n", hr); - IMarshal_Release(pMarshal); - return hr; + std_marshal = TRUE; + hr = CoGetStandardMarshal(riid, pUnk, dwDestContext, pvDestContext, + mshlFlags, &pMarshal); } + if (hr != S_OK) + return hr; hr = IMarshal_GetMarshalSizeMax(pMarshal, riid, pUnk, dwDestContext, pvDestContext, mshlFlags, pulSize); - if (!IsEqualCLSID(&marshaler_clsid, &CLSID_StdMarshal)) + if (!std_marshal) /* add on the size of the whole OBJREF structure like native does */ *pulSize += sizeof(OBJREF);

1 0

Piotr Caban : ole32/tests: Add DfMarshal custom marshaling tests.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 4e58d594c1852f34830c5279b840c5dce325e7ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e58d594c1852f34830c5279… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 19:12:10 2018 +0200 ole32/tests: Add DfMarshal custom marshaling tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 59 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 45ddc40..3a3f9e7 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -60,6 +60,7 @@ }while(0) 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 } }; /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); @@ -75,6 +76,7 @@ static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID,REFIID,LPVOID); #define OBJREF_SIGNATURE (0x574f454d) #define OBJREF_STANDARD (0x1) +#define OBJREF_CUSTOM (0x4) typedef struct tagDUALSTRINGARRAY { unsigned short wNumEntries; @@ -1352,6 +1354,7 @@ todo_wine end_host_object(tid, thread); } +static const CLSID *unmarshal_class; DEFINE_EXPECT(CustomMarshal_GetUnmarshalClass); DEFINE_EXPECT(CustomMarshal_GetMarshalSizeMax); DEFINE_EXPECT(CustomMarshal_MarshalInterface); @@ -1384,7 +1387,7 @@ static HRESULT WINAPI CustomMarshal_GetUnmarshalClass(IMarshal *iface, REFIID ri void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { CHECK_EXPECT(CustomMarshal_GetUnmarshalClass); - *clsid = CLSID_StdMarshal; + *clsid = *unmarshal_class; return S_OK; } @@ -1407,6 +1410,9 @@ static HRESULT WINAPI CustomMarshal_MarshalInterface(IMarshal *iface, IStream *s CHECK_EXPECT(CustomMarshal_MarshalInterface); + if(unmarshal_class != &CLSID_StdMarshal) + return S_OK; + hr = IStream_Stat(stream, &stat, STATFLAG_DEFAULT); ok_ole_success(hr, IStream_Stat); ok(U(stat.cbSize).LowPart == 0, "stream is not empty (%d)\n", U(stat.cbSize).LowPart); @@ -1467,6 +1473,7 @@ static void test_StdMarshal_custom_marshaling(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok_ole_success(hr, CreateStreamOnHGlobal); + unmarshal_class = &CLSID_StdMarshal; SET_EXPECT(CustomMarshal_GetUnmarshalClass); SET_EXPECT(CustomMarshal_MarshalInterface); hr = CoMarshalInterface(stream, &IID_IUnknown, (IUnknown*)&CustomMarshal, @@ -1508,6 +1515,55 @@ static void test_StdMarshal_custom_marshaling(void) ok(size == sizeof(OBJREF), "size = %d, expected %d\n", size, (int)sizeof(OBJREF)); } +static void test_DfMarshal_custom_marshaling(void) +{ + DWORD size, read; + IStream *stream; + OBJREF objref; + HRESULT hr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok_ole_success(hr, CreateStreamOnHGlobal); + + unmarshal_class = &CLSID_DfMarshal; + SET_EXPECT(CustomMarshal_GetUnmarshalClass); + SET_EXPECT(CustomMarshal_GetMarshalSizeMax); + SET_EXPECT(CustomMarshal_MarshalInterface); + hr = CoMarshalInterface(stream, &IID_IUnknown, (IUnknown*)&CustomMarshal, + MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoMarshalInterface); + CHECK_CALLED(CustomMarshal_GetUnmarshalClass); + CHECK_CALLED(CustomMarshal_GetMarshalSizeMax); + CHECK_CALLED(CustomMarshal_MarshalInterface); + + hr = IStream_Seek(stream, ullZero, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, IStream_Seek); + size = FIELD_OFFSET(OBJREF, u_objref.u_custom.pData); + hr = IStream_Read(stream, &objref, size, &read); + ok_ole_success(hr, IStream_Read); + ok(read == size, "read = %d, expected %d\n", read, size); + ok(objref.signature == OBJREF_SIGNATURE, "objref.signature = %x\n", + objref.signature); + ok(objref.flags == OBJREF_CUSTOM, "objref.flags = %x\n", objref.flags); + ok(IsEqualIID(&objref.iid, &IID_IUnknown), "objref.iid = %s\n", + wine_dbgstr_guid(&objref.iid)); + ok(IsEqualIID(&objref.u_objref.u_custom.clsid, &CLSID_DfMarshal), + "custom.clsid = %s\n", wine_dbgstr_guid(&objref.u_objref.u_custom.clsid)); + ok(!objref.u_objref.u_custom.cbExtension, "custom.cbExtension = %d\n", + objref.u_objref.u_custom.cbExtension); + ok(!objref.u_objref.u_custom.size, "custom.size = %d\n", + objref.u_objref.u_custom.size); + + IStream_Release(stream); + + SET_EXPECT(CustomMarshal_GetMarshalSizeMax); + hr = CoGetMarshalSizeMax(&size, &IID_IUnknown, (IUnknown*)&CustomMarshal, + MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoGetMarshalSizeMax); + CHECK_CALLED(CustomMarshal_GetMarshalSizeMax); + ok(size == sizeof(OBJREF), "size = %d, expected %d\n", size, (int)sizeof(OBJREF)); +} + static void test_CoGetStandardMarshal(void) { DUALSTRINGARRAY *dualstringarr; @@ -4595,6 +4651,7 @@ START_TEST(marshal) test_marshal_channel_buffer(); test_StdMarshal_custom_marshaling(); + test_DfMarshal_custom_marshaling(); test_CoGetStandardMarshal(); test_hresult_marshaling(); test_proxy_used_in_wrong_thread();

1 0