October 2018 - Wine-commits

Louis Lenders : iphlpapi: Add stub for GetIpInterfaceTable.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 5a675ea44aa1f0ac06f55e52528fe8d8cb45499c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a675ea44aa1f0ac06f55e52… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Oct 28 18:58:03 2018 +0100 iphlpapi: Add stub for GetIpInterfaceTable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46015 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ include/netioapi.h | 7 +++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 30d9ed7..b4f77be 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -105,7 +105,7 @@ @ stdcall GetIpForwardTable2( long ptr ) @ stub GetIpForwardTableFromStack #@ stub GetIpInterfaceEntry -#@ stub GetIpInterfaceTable +@ stdcall GetIpInterfaceTable( long ptr ) #@ stub GetIpNetEntry2 @ stdcall GetIpNetTable( ptr ptr long ) @ stdcall GetIpNetTable2( long ptr ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6273949..5df4cd8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3304,3 +3304,12 @@ DWORD WINAPI GetIpNetTable2(ADDRESS_FAMILY family, PMIB_IPNET_TABLE2 *table) if (!once++) FIXME("(%u %p): stub\n", family, table); return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * GetIpInterfaceTable (IPHLPAPI.@) + */ +DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY family, PMIB_IPINTERFACE_TABLE *table) +{ + FIXME("(%u %p): stub\n", family, table); + return ERROR_NOT_SUPPORTED; +} diff --git a/include/netioapi.h b/include/netioapi.h index e9de7dd..a41bae0 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -140,6 +140,12 @@ typedef struct _MIB_IPINTERFACE_ROW BOOLEAN DisableDefaultRoutes; } MIB_IPINTERFACE_ROW, *PMIB_IPINTERFACE_ROW; +typedef struct _MIB_IPINTERFACE_TABLE +{ + ULONG NumEntries; + MIB_IPINTERFACE_ROW Table[ANY_SIZE]; +} MIB_IPINTERFACE_TABLE, *PMIB_IPINTERFACE_TABLE; + typedef struct _MIB_UNICASTIPADDRESS_ROW { SOCKADDR_INET Address; @@ -242,6 +248,7 @@ DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); +DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY,MIB_IPINTERFACE_TABLE**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); PCHAR WINAPI if_indextoname(NET_IFINDEX,PCHAR); NET_IFINDEX WINAPI if_nametoindex(PCSTR);

1 0

Jacek Caban : kernel32: Wait on pipe handle in ConnectNamedPipe if needed.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: b114bd07b1edb29b47251edf0b7ce136d455a8cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b114bd07b1edb29b47251edf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 16:08:22 2018 +0100 kernel32: Wait on pipe handle in ConnectNamedPipe if needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index fe70565..f3bd962 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1681,6 +1681,11 @@ BOOL WINAPI ConnectNamedPipe(HANDLE hPipe, LPOVERLAPPED overlapped) status = NtFsControlFile(hPipe, overlapped ? overlapped->hEvent : NULL, NULL, cvalue, overlapped ? (IO_STATUS_BLOCK *)overlapped : &status_block, FSCTL_PIPE_LISTEN, NULL, 0, NULL, 0); + if (status == STATUS_PENDING && !overlapped) + { + WaitForSingleObject(hPipe, INFINITE); + status = status_block.u.Status; + } if (status == STATUS_SUCCESS) return TRUE; SetLastError( RtlNtStatusToDosError(status) );

1 0

Jacek Caban : kernel32: Wait on pipe handle in TransactNamedPipe if needed.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 4fc5aff50981687a7cb7c3599a47da7cbb44d4e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc5aff50981687a7cb7c359… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 16:08:27 2018 +0100 kernel32: Wait on pipe handle in TransactNamedPipe if needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index f3bd962..6d47d70 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1746,6 +1746,11 @@ BOOL WINAPI TransactNamedPipe( status = NtFsControlFile(handle, event, NULL, cvalue, iosb, FSCTL_PIPE_TRANSCEIVE, write_buf, write_size, read_buf, read_size); + if (status == STATUS_PENDING && !overlapped) + { + WaitForSingleObject(handle, INFINITE); + status = iosb->u.Status; + } if (bytes_read) *bytes_read = overlapped && status ? 0 : iosb->Information;

1 0

Jacek Caban : ntdll: Correctly return result of blocking NtFlushBuffersFile.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 9050b58f0769fca75c4cebed7be3cce51989814e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9050b58f0769fca75c4cebed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 16:08:48 2018 +0100 ntdll: Correctly return result of blocking NtFlushBuffersFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- dlls/ntdll/file.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 7f77df1..05e23bf 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2852,7 +2852,7 @@ static DWORD CALLBACK flush_proc(HANDLE pipe) if (expected_flush_error == ERROR_SUCCESS) ok(res, "FlushFileBuffers failed: %u\n", GetLastError()); else - todo_wine ok(!res && GetLastError() == expected_flush_error, "FlushFileBuffers failed: %u\n", GetLastError()); + ok(!res && GetLastError() == expected_flush_error, "FlushFileBuffers failed: %u\n", GetLastError()); return 0; } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d3b3698..870ad06 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3317,9 +3317,17 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) } else if (ret != STATUS_ACCESS_DENIED) { + struct async_irp *async; + + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, hFile ))) + return STATUS_NO_MEMORY; + async->event = NULL; + async->buffer = NULL; + async->size = 0; + SERVER_START_REQ( flush ) { - req->async = server_async( hFile, NULL, NULL, NULL, NULL, io ); + req->async = server_async( hFile, &async->io, NULL, NULL, NULL, io ); ret = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->event ); if (wait_handle && ret != STATUS_PENDING) @@ -3330,6 +3338,8 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) } SERVER_END_REQ; + if (ret != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + if (wait_handle) { NtWaitForSingleObject( wait_handle, FALSE, NULL );

1 0

Jacek Caban : ntdll: Use correct size when checking iosb in NtFlushBuffersFile (Coverity).
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 3d5a2567977455d04e4896368a71db74e7b9074b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d5a2567977455d04e489636… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 13:43:38 2018 +0100 ntdll: Use correct size when checking iosb in NtFlushBuffersFile (Coverity). Spotted by Nikolay. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 870ad06..622b5de 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3305,7 +3305,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) enum server_fd_type type; int fd, needs_close; - if (!io || !virtual_check_buffer_for_write( io, sizeof(io) )) return STATUS_ACCESS_VIOLATION; + if (!io || !virtual_check_buffer_for_write( io, sizeof(*io) )) return STATUS_ACCESS_VIOLATION; ret = server_get_unix_fd( hFile, FILE_WRITE_DATA, &fd, &needs_close, &type, NULL ); if (ret == STATUS_ACCESS_DENIED)

1 0

Alex Henrie : version: Simplify null check in VerQueryValueW.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 15e9bbe13ab17340d8b2c50a749dee7a9e0c089a URL: https://source.winehq.org/git/wine.git/?a=commit;h=15e9bbe13ab17340d8b2c50a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 29 22:41:53 2018 -0600 version: Simplify null check in VerQueryValueW. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 5299ecd..bd03b2b 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1054,7 +1054,6 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, LPVOID *lplpBuffer, PUINT puLen ) { - static const WCHAR nullW[] = { 0 }; static const WCHAR rootW[] = { '\\', 0 }; static const WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; @@ -1067,7 +1066,7 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, if (!pBlock) return FALSE; - if (lpSubBlock == NULL || lpSubBlock[0] == nullW[0]) + if (!lpSubBlock || !lpSubBlock[0]) lpSubBlock = rootW; if ( VersionInfoIs16( info ) )

1 0

Zebediah Figura : oleaut32/tests: Abort earlier if we fail to create a proxy.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 71f2839e52d04623b389f5ef6c0ee0fec929fd5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=71f2839e52d04623b389f5ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 29 23:20:20 2018 -0500 oleaut32/tests: Abort earlier if we fail to create a proxy. We are not testing anything meaningful in this case. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 51 +++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71f2839e52d04623b389…

1 0

Zebediah Figura : oleaut32/tests: Add some tests for marshalling pointers.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 5c8329d3fde664689515db271924125a949a4bfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c8329d3fde664689515db27… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 29 23:20:21 2018 -0500 oleaut32/tests: Add some tests for marshalling pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 178 +++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 8 ++ 2 files changed, 186 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index aab8f2c..b21b021 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -370,6 +370,8 @@ static ItestDualVtbl TestDualVtbl = { static ItestDual TestDual = { &TestDualVtbl }; static ItestDual TestDualDisp = { &TestDualVtbl }; +static int testmode; + typedef struct Widget { IWidget IWidget_iface; @@ -956,6 +958,59 @@ static HRESULT WINAPI Widget_basetypes_out(IWidget *iface, signed char *c, short return S_OK; } +static HRESULT WINAPI Widget_int_ptr(IWidget *iface, int *in, int *out, int *in_out) +{ + ok(*in == 123, "Got [in] %d.\n", *in); + if (testmode == 0) /* Invoke() */ + ok(*out == 456, "Got [out] %d.\n", *out); + else if (testmode == 1) + ok(!*out, "Got [out] %d.\n", *out); + ok(*in_out == 789, "Got [in, out] %d.\n", *in_out); + + *in = 987; + *out = 654; + *in_out = 321; + + return S_OK; +} + +static HRESULT WINAPI Widget_int_ptr_ptr(IWidget *iface, int **in, int **out, int **in_out) +{ +todo_wine_if(testmode == 2) + ok(!*out, "Got [out] %p.\n", *out); + if (testmode == 0) + { + ok(!*in, "Got [in] %p.\n", *in); + ok(!*in_out, "Got [in, out] %p.\n", *in_out); + } + else if (testmode == 1) + { + ok(!*in, "Got [in] %p.\n", *in); + ok(!*in_out, "Got [in, out] %p.\n", *in_out); + + *out = CoTaskMemAlloc(sizeof(int)); + **out = 654; + *in_out = CoTaskMemAlloc(sizeof(int)); + **in_out = 321; + } + else if (testmode == 2) + { + ok(**in == 123, "Got [in] %d.\n", **in); + ok(**in_out == 789, "Got [in, out] %d.\n", **in_out); + + *out = CoTaskMemAlloc(sizeof(int)); + **out = 654; + **in_out = 321; + } + else if (testmode == 3) + { + ok(**in_out == 789, "Got [in, out] %d.\n", **in_out); + *in_out = NULL; + } + + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -999,6 +1054,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_Coclass, Widget_basetypes_in, Widget_basetypes_out, + Widget_int_ptr, + Widget_int_ptr_ptr, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1396,6 +1453,126 @@ static void test_marshal_basetypes(IWidget *widget, IDispatch *disp) ok(st == STATE_UNWIDGETIFIED, "Got state %u.\n", st); } +static void test_marshal_pointer(IWidget *widget, IDispatch *disp) +{ + VARIANTARG arg[3]; + DISPPARAMS dispparams = {arg, NULL, ARRAY_SIZE(arg), 0}; + int in, out, in_out, *in_ptr, *out_ptr, *in_out_ptr; + HRESULT hr; + + testmode = 0; + + in = 123; + out = 456; + in_out = 789; + V_VT(&arg[2]) = VT_BYREF|VT_I4; V_I4REF(&arg[2]) = &in; + V_VT(&arg[1]) = VT_BYREF|VT_I4; V_I4REF(&arg[1]) = &out; + V_VT(&arg[0]) = VT_BYREF|VT_I4; V_I4REF(&arg[0]) = &in_out; + hr = IDispatch_Invoke(disp, DISPID_TM_INT_PTR, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(in == 987, "Got [in] %d.\n", in); + ok(out == 654, "Got [out] %d.\n", out); + ok(in_out == 321, "Got [in, out] %d.\n", in_out); + + testmode = 1; + + in = 123; + out = 456; + in_out = 789; + hr = IWidget_int_ptr(widget, &in, &out, &in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(in == 123, "Got [in] %d.\n", in); + ok(out == 654, "Got [out] %d.\n", out); + ok(in_out == 321, "Got [in, out] %d.\n", in_out); + +if (0) { + out = in_out = -1; + hr = IWidget_int_ptr(widget, NULL, &out, &in_out); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(!out, "[out] parameter should have been cleared.\n"); + ok(in_out == -1, "[in, out] parameter should not have been cleared.\n"); + + in = in_out = -1; + hr = IWidget_int_ptr(widget, &in, NULL, &in_out); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(in == -1, "[in] parameter should not have been cleared.\n"); + ok(in_out == -1, "[in, out] parameter should not have been cleared.\n"); + + in = out = -1; + hr = IWidget_int_ptr(widget, &in, &out, NULL); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(in == -1, "[in] parameter should not have been cleared.\n"); + ok(!out, "[out] parameter should have been cleared.\n"); +} + + /* We can't test Invoke() with double pointers, as it is not possible to fit + * more than one level of indirection into a VARIANTARG. */ + + testmode = 0; + in_ptr = out_ptr = in_out_ptr = NULL; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr); + ok(hr == S_OK, "Got hr %#x\n", hr); + ok(!in_ptr, "Got [in] %p.\n", in_ptr); + ok(!out_ptr, "Got [out] %p.\n", out_ptr); + ok(!in_out_ptr, "Got [in, out] %p.\n", in_out_ptr); + +if (0) { + testmode = 1; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr); + ok(hr == S_OK, "Got hr %#x\n", hr); + ok(*out_ptr == 654, "Got [out] %d.\n", *out_ptr); + ok(*in_out_ptr == 321, "Got [in, out] %d.\n", *in_out_ptr); + CoTaskMemFree(out_ptr); + CoTaskMemFree(in_out_ptr); + + testmode = 2; + in = 123; + out = 456; + in_out = 789; + in_ptr = &in; + out_ptr = &out; + in_out_ptr = &in_out; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(out_ptr != &out, "[out] ptr should have changed.\n"); + ok(in_out_ptr == &in_out, "[in, out] ptr should not have changed.\n"); + ok(*out_ptr == 654, "Got [out] %d.\n", *out_ptr); + ok(*in_out_ptr == 321, "Got [in, out] %d.\n", *in_out_ptr); +} + + testmode = 3; + in_ptr = out_ptr = NULL; + in_out = 789; + in_out_ptr = &in_out; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!in_out_ptr, "Got [in, out] %p.\n", in_out_ptr); + +if (0) { + out_ptr = &out; + in_out_ptr = &in_out; + hr = IWidget_int_ptr_ptr(widget, NULL, &out_ptr, &in_out_ptr); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(!out_ptr, "[out] parameter should have been cleared.\n"); + ok(in_out_ptr == &in_out, "[in, out] parameter should not have been cleared.\n"); + + in_ptr = &in; + in_out_ptr = &in_out; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, NULL, &in_out_ptr); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(in_ptr == &in, "[in] parameter should not have been cleared.\n"); + ok(in_out_ptr == &in_out, "[in, out] parameter should not have been cleared.\n"); + + in_ptr = &in; + out_ptr = &out; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, NULL); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(in_ptr == &in, "[in] parameter should not have been cleared.\n"); + ok(!out_ptr, "[out] parameter should have been cleared.\n"); +} +} + static void test_typelibmarshal(void) { static const WCHAR szCat[] = { 'C','a','t',0 }; @@ -2006,6 +2183,7 @@ todo_wine VariantClear(&varresult); test_marshal_basetypes(pWidget, pDispatch); + test_marshal_pointer(pWidget, pDispatch); IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 2452f2d..3cbad57 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -57,6 +57,8 @@ enum IWidget_dispids DISPID_TM_BASETYPES_IN, DISPID_TM_BASETYPES_OUT, + DISPID_TM_INT_PTR, + DISPID_TM_INT_PTR_PTR, }; static const int DISPID_TM_NEG_RESTRICTED = -26; @@ -242,6 +244,12 @@ library TestTypelib HRESULT basetypes_out([out] signed char *c, [out] short *s, [out] int *i, [out] hyper *h, [out] unsigned char *uc, [out] unsigned short *us, [out] unsigned int *ui, [out] unsigned hyper *uh, [out] float *f, [out] double *d, [out] STATE *st); + + [id(DISPID_TM_INT_PTR)] + HRESULT int_ptr([in] int *in, [out] int *out, [in, out] int *in_out); + + [id(DISPID_TM_INT_PTR_PTR)] + HRESULT int_ptr_ptr([in] int **in, [out] int **out, [in, out] int **in_out); } [

1 0

Zebediah Figura : oleaut32: Don' t release a NULL interface in VARIANT_UserFree().
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 96b0bdc38ce0455a83d2277b400c6212824a3dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b0bdc38ce0455a83d2277b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 29 23:20:22 2018 -0500 oleaut32: Don't release a NULL interface in VARIANT_UserFree(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 27 +++++++++++++++++++++++++++ dlls/oleaut32/usrmarshal.c | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 0185b6d..97c0502 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -777,6 +777,7 @@ static void test_marshal_VARIANT(void) HRESULT hr; LONG bound, bound2; VARTYPE vt, vt2; + IUnknown *unk; stubMsg.RpcMsg = &rpcMsg; @@ -1579,6 +1580,32 @@ todo_wine ok(heap_unknown->refs == 1, "%d refcounts of IUnknown leaked\n", heap_unknown->refs - 1); IUnknown_Release(&heap_unknown->IUnknown_iface); HeapFree(GetProcessHeap(), 0, oldbuffer); + + unk = NULL; + VariantInit(&v); + V_VT(&v) = VT_UNKNOWN | VT_BYREF; + V_UNKNOWNREF(&v) = &unk; + + rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 0, &v); + ok(stubMsg.BufferLength >= 28, "size %d\n", stubMsg.BufferLength); + buffer = rpcMsg.Buffer = stubMsg.Buffer = stubMsg.BufferStart = alloc_aligned(stubMsg.BufferLength, &oldbuffer); + stubMsg.BufferEnd = stubMsg.Buffer + stubMsg.BufferLength; + memset(buffer, 0xcc, stubMsg.BufferLength); + next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v); + ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); + wirev = (DWORD*)buffer; + wirev = check_variant_header(wirev, &v, stubMsg.BufferLength); + + ok(*wirev == 4, "wv[5] %08x\n", *wirev); + + VariantInit(&v2); + stubMsg.Buffer = buffer; + next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); + ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); + ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v2), V_VT(&v)); + ok(!*V_UNKNOWNREF(&v2), "got %p expect NULL\n", *V_UNKNOWNREF(&v2)); + VARIANT_UserFree(&umcb.Flags, &v2); + HeapFree(GetProcessHeap(), 0, oldbuffer); } diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index d3dc93a..163b48f 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -647,7 +647,8 @@ void WINAPI VARIANT_UserFree(ULONG *pFlags, VARIANT *pvar) break; case VT_UNKNOWN | VT_BYREF: case VT_DISPATCH | VT_BYREF: - IUnknown_Release(*V_UNKNOWNREF(pvar)); + if (*V_UNKNOWNREF(pvar)) + IUnknown_Release(*V_UNKNOWNREF(pvar)); break; } }

1 0

Zebediah Figura : oleaut32/tests: Add some tests for marshalling interfaces.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 09076372eb62f56b90ba6b2f6984883816d9ef67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09076372eb62f56b90ba6b2f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 29 23:20:23 2018 -0500 oleaut32/tests: Add some tests for marshalling interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 428 +++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 13 ++ 2 files changed, 441 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09076372eb62f56b90ba…

1 0