June 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : twain_32: Fix potentially uninitialized variable compiler warnings.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 4d60ab3744d08f487626427038a580e7c2669806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d60ab3744d08f4876264270… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 8 14:17:35 2020 +0200 twain_32: Fix potentially uninitialized variable compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/tests/dsm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 1e9764dccb..cf0f7b4270 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -72,7 +72,10 @@ static BOOL get_onevalue(TW_HANDLE hcontainer, TW_UINT32 *ret, TW_UINT16 *type) return TRUE; } else + { *ret = 0; + if (type) *type = 0; + } return FALSE; }

1 0

Alexandre Julliard : kernel32/tests: Avoid some more compiler warning for HeapAlloc() invalid parameter tests.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 20a9ec6c4f95be000766edf5e4b2f468ccbca5d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20a9ec6c4f95be000766edf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 8 14:17:56 2020 +0200 kernel32/tests: Avoid some more compiler warning for HeapAlloc() invalid parameter tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index bc57498bf9..fa372b14e2 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -38,6 +38,9 @@ #define HEAP_VALIDATE_ALL 0x20000000 #define HEAP_VALIDATE_PARAMS 0x40000000 +/* use function pointers to avoid warnings for invalid parameter tests */ +static LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); +static LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); static BOOL (WINAPI *pHeapQueryInformation)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T, PSIZE_T); static BOOL (WINAPI *pGetPhysicallyInstalledSystemMemory)(ULONGLONG *); static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); @@ -89,12 +92,6 @@ static void test_heap(void) HGLOBAL hsecond; SIZE_T size, size2; const SIZE_T max_size = 1024, init_size = 10; - /* use function pointers to avoid warnings for invalid parameter tests */ - LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); - LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); - - pHeapAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapAlloc" ); - pHeapReAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapReAlloc" ); /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); @@ -941,7 +938,7 @@ static void test_heap_checks( DWORD flags ) ret = HeapFree( GetProcessHeap(), 0, p ); ok( ret, "HeapFree failed\n" ); - p = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); + p = pHeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); ok( p != NULL, "HeapAlloc failed\n" ); old = p[17]; p[17] = 0xcc; @@ -1006,7 +1003,7 @@ static void test_heap_checks( DWORD flags ) /* now test large blocks */ - p = HeapAlloc( GetProcessHeap(), 0, large_size ); + p = pHeapAlloc( GetProcessHeap(), 0, large_size ); ok( p != NULL, "HeapAlloc failed\n" ); ret = HeapValidate( GetProcessHeap(), 0, p ); @@ -1221,6 +1218,9 @@ START_TEST(heap) int argc; char **argv; + pHeapAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapAlloc" ); + pHeapReAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapReAlloc" ); + pRtlGetNtGlobalFlags = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "RtlGetNtGlobalFlags" ); argc = winetest_get_mainargs( &argv );

1 0

Esme Povirk : mscoree: Update Wine Mono to 5.1.0.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: c96fa96c167808bf1c9a42b72c9e7ab6567eca75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c96fa96c167808bf1c9a42b7… Author: Esme Povirk <vincent(a)codeweavers.com> Date: Fri Jun 5 15:39:57 2020 -0500 mscoree: Update Wine Mono to 5.1.0. Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 0047278c73..dcade07c44 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "5.0.0" +#define MONO_VERSION "5.1.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "17da208645a82a5e45e84fc75c73a8440acda484411cb8fae8e9b72db9886cd5" +#define MONO_SHA "ae55439c7cd61d1a17f0c687967fad8ad12d9e2263972ffd5e9dde2685fd8ddd" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index cd032aefc0..096b20875b 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "5.0.0" +#define WINE_MONO_VERSION "5.1.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Zebediah Figura : ntdll: Avoid leaking "drive" on error paths from get_mountmgr_fs_info() (Valgrind).
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 19007cf31f42fc0c329e5a6f25e504e0a1fe21ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=19007cf31f42fc0c329e5a6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 6 15:35:32 2020 -0500 ntdll: Avoid leaking "drive" on error paths from get_mountmgr_fs_info() (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b5a48db176..1b70e47367 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2328,7 +2328,10 @@ static struct mountmgr_unix_drive *get_mountmgr_fs_info( HANDLE handle, int fd ) InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); if (NtOpenFile( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT )) + { + RtlFreeHeap( GetProcessHeap(), 0, drive ); return NULL; + } status = NtDeviceIoControlFile( mountmgr, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, drive, sizeof(*drive), drive, 1024 );

1 0

Gerald Pfeifer : ntdll: Replicate InterlockedCompareExchange64 to the Unix library.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 0c14b1a962573ee125940f2008c646befe597226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c14b1a962573ee125940f20… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jun 7 00:38:02 2020 +0200 ntdll: Replicate InterlockedCompareExchange64 to the Unix library. This fixes the build on FreeBSD/i386 with GCC 9. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/unix_private.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 292c7f05c9..03b92f9e91 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -23,6 +23,10 @@ #include "unixlib.h" +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 +#define InterlockedCompareExchange64(dest,xchg,cmp) RtlInterlockedCompareExchange64(dest,xchg,cmp) +#endif + struct debug_info { unsigned int str_pos; /* current position in strings buffer */

1 0

Gijs Vermeulen : msado15: Ignore IRunnableObject interface in recordset/connection_QueryInterface.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 79228f64a04d12a611643d1a8c01e05f518a5a23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79228f64a04d12a611643d1a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Jun 7 15:51:19 2020 +0200 msado15: Ignore IRunnableObject interface in recordset/connection_QueryInterface. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 7 +++++++ dlls/msado15/recordset.c | 7 +++++++ dlls/msado15/tests/msado15.c | 6 ++++++ 3 files changed, 20 insertions(+) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 9e8c05522e..b9474e1b78 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -98,6 +98,8 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid struct connection *connection = impl_from_Connection( iface ); TRACE( "%p, %s, %p\n", connection, debugstr_guid(riid), obj ); + *obj = NULL; + if (IsEqualGUID( riid, &IID__Connection ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { @@ -111,6 +113,11 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->IConnectionPointContainer_iface; } + else if (IsEqualGUID( riid, &IID_IRunnableObject )) + { + TRACE("IID_IRunnableObject not supported returning NULL\n"); + return E_NOINTERFACE; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ffb3788531..a5096e5c4f 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -784,6 +784,8 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, struct recordset *recordset = impl_from_Recordset( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + *obj = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID__ADO) || IsEqualIID(riid, &IID_Recordset15) || IsEqualIID(riid, &IID_Recordset20) || IsEqualIID(riid, &IID_Recordset21) || @@ -795,6 +797,11 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { *obj = &recordset->ISupportErrorInfo_iface; } + else if (IsEqualGUID( riid, &IID_IRunnableObject )) + { + TRACE("IID_IRunnableObject not supported returning NULL\n"); + return E_NOINTERFACE; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index a8d2afdd41..1d457a703d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -61,6 +61,7 @@ static LONG get_refs_recordset( _Recordset *recordset ) static void test_Recordset(void) { _Recordset *recordset; + IRunnableObject *runtime; ISupportErrorInfo *errorinfo; Fields *fields, *fields2; Field *field; @@ -73,6 +74,10 @@ static void test_Recordset(void) hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Recordset_QueryInterface( recordset, &IID_IRunnableObject, (void**)&runtime); + ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + ok(runtime == NULL, "expected NULL\n"); + /* _Recordset object supports ISupportErrorInfo */ errorinfo = NULL; hr = _Recordset_QueryInterface( recordset, &IID_ISupportErrorInfo, (void **)&errorinfo ); @@ -676,6 +681,7 @@ static void test_Connection(void) hr = _Connection_QueryInterface(connection, &IID_IRunnableObject, (void**)&runtime); ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + ok(runtime == NULL, "expected NULL\n"); hr = _Connection_QueryInterface(connection, &IID_ISupportErrorInfo, (void**)&errorinfo); ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n");

1 0

Gijs Vermeulen : msado15: Improve _Connection_Open/Close stubs.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 44cc7bef76f3aff0d4dc993cb2176e90b9e87e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=44cc7bef76f3aff0d4dc993c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Jun 7 15:51:20 2020 +0200 msado15: Improve _Connection_Open/Close stubs. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 17 ++++++++++++++--- dlls/msado15/tests/msado15.c | 27 ++++++++++++++++++++++++++- include/msado15_backcompat.idl | 6 ++++++ 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index b9474e1b78..35202d14aa 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -221,8 +221,14 @@ static HRESULT WINAPI connection_get_Version( _Connection *iface, BSTR *str ) static HRESULT WINAPI connection_Close( _Connection *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p\n", connection ); + + if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + connection->state = adStateClosed; + return S_OK; } static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, @@ -253,9 +259,14 @@ static HRESULT WINAPI connection_RollbackTrans( _Connection *iface ) static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BSTR userid, BSTR password, LONG options ) { + struct connection *connection = impl_from_Connection( iface ); FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), password, options ); - return E_NOTIMPL; + + if (connection->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + + connection->state = adStateOpen; + return S_OK; } static HRESULT WINAPI connection_get_Errors( _Connection *iface, Errors **obj ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 1d457a703d..59c00948c8 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -674,7 +674,7 @@ static void test_Connection(void) ISupportErrorInfo *errorinfo; IConnectionPointContainer *pointcontainer; LONG state, timeout; - BSTR str, str2; + BSTR str, str2, str3; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -702,6 +702,9 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(state == adStateClosed, "Unexpected state value 0x%08x\n", state); + hr = _Connection_Close(connection); + ok(hr == MAKE_ADO_HRESULT(adErrObjectClosed), "got %08x\n", hr); + timeout = 0; hr = _Connection_get_CommandTimeout(connection, &timeout); ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); @@ -734,8 +737,30 @@ if (0) /* Crashes on windows */ hr = _Connection_get_ConnectionString(connection, &str2); ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); ok(!wcscmp(str, str2), "wrong string %s\n", wine_dbgstr_w(str2)); + + hr = _Connection_Open(connection, NULL, NULL, NULL, 0); + todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + + /* Open adds trailing ; if it's missing */ + str3 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test;"); + hr = _Connection_Open(connection, NULL, NULL, NULL, adConnectUnspecified); + todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + + str2 = NULL; + hr = _Connection_get_ConnectionString(connection, &str2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + todo_wine ok(!wcscmp(str3, str2) || broken(!wcscmp(str, str2)) /* XP */, "wrong string %s\n", wine_dbgstr_w(str2)); + + hr = _Connection_Open(connection, str, NULL, NULL, adConnectUnspecified); + todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); SysFreeString(str); + + str2 = NULL; + hr = _Connection_get_ConnectionString(connection, &str2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + todo_wine ok(!wcscmp(str3, str2) || broken(!wcscmp(str, str2)) /* XP */, "wrong string %s\n", wine_dbgstr_w(str2)); SysFreeString(str2); + SysFreeString(str3); hr = _Connection_put_ConnectionString(connection, NULL); ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index 68fda6ab21..5ea9f51c1f 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -512,6 +512,12 @@ typedef [uuid(00000531-0000-0010-8000-00aa006d2ea4)] enum EventReasonEnum adRsnMoveLast = 15 } EventReasonEnum; +typedef [uuid(00000541-0000-0010-8000-00aa006d2ea4)] enum ConnectOptionEnum +{ + adConnectUnspecified = -1, + adAsyncConnect = 0x10 +} ConnectOptionEnum; + [ uuid(00000503-0000-0010-8000-00aa006d2ea4), odl,

1 0

Jeff Smith : kernelbase: Output message ID as hex in debug messages.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 0e77260ae984dbb8010217aadf1f6aa893956cf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e77260ae984dbb8010217aa… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jun 7 23:29:17 2020 -0500 kernelbase: Output message ID as hex in debug messages. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 4f67a0d6d2..4e7bd9937b 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3689,7 +3689,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageA( DWORD flags, const void *source, WCHAR *result, *message = NULL; NTSTATUS status; - TRACE( "(0x%x,%p,%d,0x%x,%p,%d,%p)\n", flags, source, msgid, langid, buffer, size, args ); + TRACE( "(0x%x,%p,%#x,0x%x,%p,%u,%p)\n", flags, source, msgid, langid, buffer, size, args ); if (flags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { @@ -3771,7 +3771,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageW( DWORD flags, const void *source, WCHAR *message = NULL; NTSTATUS status; - TRACE( "(0x%x,%p,%d,0x%x,%p,%d,%p)\n", flags, source, msgid, langid, buffer, size, args ); + TRACE( "(0x%x,%p,%#x,0x%x,%p,%u,%p)\n", flags, source, msgid, langid, buffer, size, args ); if (!buffer) {

1 0

Dmitry Timoshkov : rpcrt4/tests: Fix compilation with MS VC.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: bd995ea87100a167b021c142d63d569b336be00e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd995ea87100a167b021c142… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 8 16:53:56 2020 +0800 rpcrt4/tests: Fix compilation with MS VC. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 2400143eef..6ac2f74227 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -141,7 +141,7 @@ static void (__cdecl *stop_autolisten)(void); static void (__cdecl *ip_test)(ipu_t *a); static int (__cdecl *sum_ptr_array)(int *a[2]); static int (__cdecl *sum_array_ptr)(int (*a)[2]); -static ctx_handle_t __cdecl (*get_handle)(void); +static ctx_handle_t (__cdecl *get_handle)(void); static void (__cdecl *get_handle_by_ptr)(ctx_handle_t *r); static void (__cdecl *test_handle)(ctx_handle_t ctx_handle);

1 0

Dmitry Timoshkov : rpcrt4/tests: Add some tests for marshalling embedded conformant arrays.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 59c0dbb642e788a8d28c2b653545566db6346cdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=59c0dbb642e788a8d28c2b65… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 8 16:54:05 2020 +0800 rpcrt4/tests: Add some tests for marshalling embedded conformant arrays. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 27 ++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 6ac2f74227..d665568831 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -94,6 +94,9 @@ static int (__cdecl *sum_cps)(cps_t *cps); static int (__cdecl *sum_cpsc)(cpsc_t *cpsc); static int (__cdecl *get_cpsc)(int n, cpsc_t *cpsc); static int (__cdecl *sum_complex_array)(int n, refpint_t pi[]); +static int (__cdecl *sum_blob)(cs_blob_t *blob); +static int (__cdecl *sum_data)(cs_data_t *data); +static int (__cdecl *sum_container)(cs_container_t *container); static int (__cdecl *square_puint)(puint_t p); static int (__cdecl *sum_puints)(puints_t *p); static int (__cdecl *sum_cpuints)(cpuints_t *p); @@ -185,6 +188,9 @@ static void (__cdecl *test_handle)(ctx_handle_t ctx_handle); X(sum_cpsc) \ X(get_cpsc) \ X(sum_complex_array) \ + X(sum_blob) \ + X(sum_data) \ + X(sum_container) \ X(square_puint) \ X(sum_puints) \ X(sum_cpuints) \ @@ -507,6 +513,36 @@ int __cdecl s_sum_complex_array(int n, refpint_t pi[]) return total; } +int __cdecl s_sum_blob(cs_blob_t *blob) +{ + int i, total = 0; + + for (i = 0; i < blob->n; i++) + total += blob->ca[i]; + + return total; +} + +int __cdecl s_sum_data(cs_data_t *data) +{ + int i, total = 0; + + for (i = 0; i < data->blob.n; i++) + total += data->blob.ca[i]; + + return total; +} + +int __cdecl s_sum_container(cs_container_t *container) +{ + int i, total = 0; + + for (i = 0; i < container->data.blob.n; i++) + total += container->data.blob.ca[i]; + + return total; +} + int __cdecl s_dot_two_vectors(vector_t vs[2]) { return vs[0].x * vs[1].x + vs[0].y * vs[1].y + vs[0].z * vs[1].z; @@ -1618,6 +1654,9 @@ array_tests(void) vector_t vs[2] = {{1, -2, 3}, {4, -5, -6}}; cps_t cps; cpsc_t cpsc; + cs_blob_t blob; + cs_data_t data; + cs_container_t container; cs_t *cs; int n; int ca[5] = {1, -2, 3, -4, 5}; @@ -1761,6 +1800,21 @@ array_tests(void) ok(sum_ptr_array(ptr_array) == 3, "RPC sum_ptr_array\n"); ok(sum_array_ptr(&array) == 7, "RPC sum_array_ptr\n"); + + blob.n = ARRAY_SIZE(c); + blob.ca = c; + n = sum_blob(&blob); + ok(n == 45, "RPC sum_blob = %d\n", n); + + data.blob.n = ARRAY_SIZE(c); + data.blob.ca = c; + n = sum_data(&data); + ok(n == 45, "RPC sum_data = %d\n", n); + + container.data.blob.n = ARRAY_SIZE(c); + container.data.blob.ca = c; + n = sum_container(&container); + ok(n == 45, "RPC sum_container = %d\n", n); } void __cdecl s_authinfo_test(unsigned int protseq, int secure) diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index afda2eddd0..4d945dcca3 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -169,6 +169,30 @@ cpp_quote("#ifndef SKIP_TYPE_DECLS") [size_is(n)] int ca[]; } cs_t; + typedef struct + { + int n; + [size_is(n)] int *ca; + } cs_blob_t; + + typedef struct + { +/* FIXME: widl generates incorrect correlation descriptor and the tests crash */ +#if 0 + int dummy[1]; /* to make offset to conformant array unique */ +#endif + cs_blob_t blob; + } cs_data_t; + + typedef struct + { +/* FIXME: widl generates incorrect correlation descriptor and the tests crash */ +#if 0 + int dummy[2]; /* to make offset to conformant array unique */ +#endif + cs_data_t data; + } cs_container_t; + typedef struct { int *pn; @@ -191,6 +215,9 @@ cpp_quote("#endif") int sum_cpsc(cpsc_t *cpsc); int get_cpsc(int n, [out] cpsc_t *cpsc ); int sum_complex_array(int n, [size_is(n)] refpint_t pi[]); + int sum_blob([in] cs_blob_t *blob); + int sum_data([in] cs_data_t *data); + int sum_container([in] cs_container_t *container); cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef [wire_marshal(int)] void *puint_t;

1 0