March 2015 - Wine-Commits - list.winehq.org

Bruno Jesus : ws2_32/test: Don't test unsupported IP_MULTICAST_TTL on NT4.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 9eaf92d62a73750733af13a139da166833ae33f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eaf92d62a73750733af13a13… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 8 01:05:59 2015 -0300 ws2_32/test: Don't test unsupported IP_MULTICAST_TTL on NT4. --- dlls/ws2_32/tests/sock.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d2c766b..7acc489 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1380,17 +1380,24 @@ todo_wine s = socket(AF_INET, SOCK_DGRAM, 0); ok(s != INVALID_SOCKET, "Failed to create socket\n"); size = sizeof(i); - for (i = 0; i < 4; i++) + i = 0x0000000a; + err = setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &i, size); + if (!err) { - int k, j; - const int tests[] = {0xffffff0a, 0xffff000b, 0xff00000c, 0x0000000d}; - err = setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &tests[i], i + 1); - ok(!err, "Test [%d] Expected 0, got %d\n", i, err); - err = getsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &k, &size); - ok(!err, "Test [%d] Expected 0, got %d\n", i, err); - j = i != 3 ? tests[i] & ((1 << (i + 1) * 8) - 1) : tests[i]; - ok(k == j, "Test [%d] Expected 0x%x, got 0x%x\n", i, j, k); + for (i = 0; i < 4; i++) + { + int k, j; + const int tests[] = {0xffffff0a, 0xffff000b, 0xff00000c, 0x0000000d}; + err = setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &tests[i], i + 1); + ok(!err, "Test [%d] Expected 0, got %d\n", i, err); + err = getsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &k, &size); + ok(!err, "Test [%d] Expected 0, got %d\n", i, err); + j = i != 3 ? tests[i] & ((1 << (i + 1) * 8) - 1) : tests[i]; + ok(k == j, "Test [%d] Expected 0x%x, got 0x%x\n", i, j, k); + } } + else + win_skip("IP_MULTICAST_TTL is unsupported\n"); closesocket(s); /* test SO_PROTOCOL_INFOA invalid parameters */

1 0

Bruno Jesus : ws2_32/tests: Move second WSACleanup test elsewhere.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 2522e205ec5349d7ca5c13254abc70f474720610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2522e205ec5349d7ca5c13254… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 8 01:05:45 2015 -0300 ws2_32/tests: Move second WSACleanup test elsewhere. --- dlls/ws2_32/tests/sock.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7155a09..6ad4265 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1124,7 +1124,14 @@ static void test_WithWSAStartup(void) closesocket(src); closesocket(dst); - WSACleanup(); + res = WSACleanup(); + ok(res == 0, "expected 0, got %d\n", res); + WSASetLastError(0xdeadbeef); + res = WSACleanup(); + error = WSAGetLastError(); + ok ( (res == SOCKET_ERROR && error == WSANOTINITIALISED) || + broken(res == 0), /* WinME */ + "WSACleanup returned %d WSAGetLastError is %d\n", res, error); } /**************** Main program utility functions ***************/ @@ -1156,11 +1163,6 @@ static void Exit (void) ret = WSACleanup(); err = WSAGetLastError(); ok ( ret == 0, "WSACleanup failed ret = %d GetLastError is %d\n", ret, err); - ret = WSACleanup(); - err = WSAGetLastError(); - ok ( (ret == SOCKET_ERROR && err == WSANOTINITIALISED) || - broken(ret == 0), /* WinME */ - "WSACleanup returned %d GetLastError is %d\n", ret, err); } static void StartServer (LPTHREAD_START_ROUTINE routine,

1 0

Nikolay Sivov : wshom.ocx: Added missing IWshShell3 methods.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 99afcdff2d453a4788d1e897bfc0226cb7fb3d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99afcdff2d453a4788d1e897b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 7 15:35:42 2015 +0300 wshom.ocx: Added missing IWshShell3 methods. --- dlls/wshom.ocx/shell.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 198531e..422f89b 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1321,6 +1321,24 @@ static HRESULT WINAPI WshShell3_SendKeys(IWshShell3 *iface, BSTR Keys, VARIANT * return E_NOTIMPL; } +static HRESULT WINAPI WshShell3_Exec(IWshShell3 *iface, BSTR command, IWshExec **ret) +{ + FIXME("(%s %p): stub\n", debugstr_w(command), ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_get_CurrentDirectory(IWshShell3 *iface, BSTR *dir) +{ + FIXME("(%p): stub\n", dir); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_put_CurrentDirectory(IWshShell3 *iface, BSTR dir) +{ + FIXME("(%s): stub\n", debugstr_w(dir)); + return E_NOTIMPL; +} + static const IWshShell3Vtbl WshShell3Vtbl = { WshShell3_QueryInterface, WshShell3_AddRef, @@ -1340,7 +1358,10 @@ static const IWshShell3Vtbl WshShell3Vtbl = { WshShell3_RegDelete, WshShell3_LogEvent, WshShell3_AppActivate, - WshShell3_SendKeys + WshShell3_SendKeys, + WshShell3_Exec, + WshShell3_get_CurrentDirectory, + WshShell3_put_CurrentDirectory }; static IWshShell3 WshShell3 = { &WshShell3Vtbl };

1 0

Bruno Jesus : ws2_32/tests: Fix a NT4 crash due to unsupported SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: a65ae0ea5746292fe9cd2fc0e209467054328504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65ae0ea5746292fe9cd2fc0e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 8 01:05:52 2015 -0300 ws2_32/tests: Fix a NT4 crash due to unsupported SIO_ADDRESS_LIST_QUERY. --- dlls/ws2_32/tests/sock.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6ad4265..d2c766b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7960,6 +7960,12 @@ static void test_address_list_query(void) bytes_returned = 0; ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, NULL, 0, &bytes_returned, NULL, NULL); ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + if(WSAGetLastError() == WSAEINVAL) + { + win_skip("Windows <= NT4 is not supported in this test\n"); + closesocket(s); + return; + } ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); ok(bytes_returned >= FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[0]), "Got unexpected bytes_returned %u.\n", bytes_returned);

1 0

Alexandre Julliard : ws2_32: Set the completion event on the server side also for AcceptEx.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 09cd7cf3e05015d1d940025963197bf4cadb3d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09cd7cf3e05015d1d94002596… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 7 15:17:05 2015 +0900 ws2_32: Set the completion event on the server side also for AcceptEx. --- dlls/ws2_32/socket.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 760e184..b4ed865 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2078,8 +2078,6 @@ static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, if (status == STATUS_PENDING) return status; - if (wsa->user_overlapped->hEvent) - NtSetEvent(wsa->user_overlapped->hEvent, NULL); if (wsa->cvalue) WS_AddCompletion( HANDLE2SOCKET(wsa->listen_socket), wsa->cvalue, iosb->u.Status, iosb->Information ); @@ -2146,6 +2144,7 @@ static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, { req->type = ASYNC_TYPE_READ; req->async.handle = wine_server_obj_handle( wsa->accept_socket ); + req->async.event = wine_server_obj_handle( wsa->user_overlapped->hEvent ); req->async.callback = wine_server_client_ptr( WS2_async_accept_recv ); req->async.iosb = wine_server_client_ptr( iosb ); req->async.arg = wine_server_client_ptr( wsa ); @@ -2164,9 +2163,6 @@ finish: iosb->u.Status = status; iosb->Information = 0; - if (wsa->user_overlapped->hEvent) - NtSetEvent(wsa->user_overlapped->hEvent, NULL); - if (wsa->read) release_async_io( &wsa->read->io ); release_async_io( &wsa->io ); return status; @@ -2434,7 +2430,6 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW DWORD status; struct ws2_accept_async *wsa; int fd; - ULONG_PTR cvalue = (overlapped && ((ULONG_PTR)overlapped->hEvent & 1) == 0) ? (ULONG_PTR)overlapped : 0; TRACE("(%lx, %lx, %p, %d, %d, %d, %p, %p)\n", listener, acceptor, dest, dest_len, local_addr_len, rem_addr_len, received, overlapped); @@ -2483,7 +2478,7 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW wsa->listen_socket = SOCKET2HANDLE(listener); wsa->accept_socket = SOCKET2HANDLE(acceptor); wsa->user_overlapped = overlapped; - wsa->cvalue = cvalue; + wsa->cvalue = !((ULONG_PTR)overlapped->hEvent & 1) ? (ULONG_PTR)overlapped : 0; wsa->buf = dest; wsa->data_len = dest_len; wsa->local_len = local_addr_len; @@ -2518,11 +2513,11 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW { req->type = ASYNC_TYPE_READ; req->async.handle = wine_server_obj_handle( SOCKET2HANDLE(listener) ); + req->async.event = wine_server_obj_handle( overlapped->hEvent ); req->async.callback = wine_server_client_ptr( WS2_async_accept ); req->async.iosb = wine_server_client_ptr( overlapped ); req->async.arg = wine_server_client_ptr( wsa ); - req->async.cvalue = cvalue; - /* We don't set event since we may also have to read */ + req->async.cvalue = wsa->cvalue; status = wine_server_call( req ); } SERVER_END_REQ;

1 0

Nikolay Sivov : rpcrt4: Add all stubs to OLE marshalling stream.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 15d7436a0d7f134b48d3b51d4638df50cfa669a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d7436a0d7f134b48d3b51d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 21:07:39 2015 +0300 rpcrt4: Add all stubs to OLE marshalling stream. --- dlls/rpcrt4/ndr_ole.c | 67 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 81d08b3..143bba7 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -19,7 +19,6 @@ * * TODO: * - fix the wire-protocol to match MS/RPC - * - finish RpcStream_Vtbl */ #include <stdarg.h> @@ -194,6 +193,58 @@ static HRESULT WINAPI RpcStream_SetSize(LPSTREAM iface, return S_OK; } +static HRESULT WINAPI RpcStream_CopyTo(IStream *iface, IStream *dest, + ULARGE_INTEGER len, ULARGE_INTEGER *read, ULARGE_INTEGER *written) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI RpcStream_Commit(IStream *iface, DWORD flags) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p)->(0x%08x): stub\n", This, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI RpcStream_Revert(IStream *iface) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI RpcStream_LockRegion(IStream *iface, + ULARGE_INTEGER offset, ULARGE_INTEGER len, DWORD locktype) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI RpcStream_UnlockRegion(IStream *iface, + ULARGE_INTEGER offset, ULARGE_INTEGER len, DWORD locktype) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI RpcStream_Stat(IStream *iface, STATSTG *stat, DWORD flag) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI RpcStream_Clone(IStream *iface, IStream **cloned) +{ + RpcStreamImpl *This = impl_from_IStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + static const IStreamVtbl RpcStream_Vtbl = { RpcStream_QueryInterface, @@ -203,13 +254,13 @@ static const IStreamVtbl RpcStream_Vtbl = RpcStream_Write, RpcStream_Seek, RpcStream_SetSize, - NULL, /* CopyTo */ - NULL, /* Commit */ - NULL, /* Revert */ - NULL, /* LockRegion */ - NULL, /* UnlockRegion */ - NULL, /* Stat */ - NULL /* Clone */ + RpcStream_CopyTo, + RpcStream_Commit, + RpcStream_Revert, + RpcStream_LockRegion, + RpcStream_UnlockRegion, + RpcStream_Stat, + RpcStream_Clone }; static HRESULT RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init, ULONG *size, IStream **stream)

1 0

Francois Gouget : actxprxy: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: f847b42994fa045ee810f766c051b967694f258a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f847b42994fa045ee810f766c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 09:31:20 2015 +0100 actxprxy: Remove unneeded NONAMELESSXXX directives. --- dlls/actxprxy/usrmarshal.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c index 1683f2c..54d885a 100644 --- a/dlls/actxprxy/usrmarshal.c +++ b/dlls/actxprxy/usrmarshal.c @@ -22,8 +22,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Michael Stefaniuc : kernel32: Don't free a NULL / not yet allocated pointer (PVS-Studio).
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: a7daccb674b10ff163b4b63d45634127e862f8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7daccb674b10ff163b4b63d4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 9 10:29:57 2015 +0100 kernel32: Don't free a NULL / not yet allocated pointer (PVS-Studio). --- dlls/kernel32/path.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 4cc8c1d..5dd221f 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -933,7 +933,6 @@ DWORD WINAPI SearchPathW( LPCWSTR path, LPCWSTR name, LPCWSTR ext, DWORD buflen, if (!search) { SetLastError( ERROR_OUTOFMEMORY ); - HeapFree( GetProcessHeap(), 0, dll_path ); return 0; } strcpyW( search, name );

1 0

Michael Stefaniuc : dbghelp: Remove no-op additions with 0 (PVS-Studio).
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 1328ec48546913671af3d83b0ebf37d2936bbb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1328ec48546913671af3d83b0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 9 10:26:19 2015 +0100 dbghelp: Remove no-op additions with 0 (PVS-Studio). --- dlls/dbghelp/coff.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index 9f01fd2..01c5826 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -296,7 +296,6 @@ DECLSPEC_HIDDEN BOOL coff_process_info(const struct msc_debug_info* msc_dbg) msc_dbg->module->module.BaseOfImage + base + coff_sym->Value, 0 /* FIXME */, NULL /* FIXME */)->symt); - i += naux; continue; } @@ -377,7 +376,6 @@ DECLSPEC_HIDDEN BOOL coff_process_info(const struct msc_debug_info* msc_dbg) * Ignore these. They don't have anything to do with * reality. */ - i += naux; continue; }

1 0

Michael Stefaniuc : mstml/tests: Merge two adjacent if blocks with identical condition (PVS-Studio).
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 533bb9f390d8026f6885e077b92d200a9b2c8a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533bb9f390d8026f6885e077b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 9 10:25:34 2015 +0100 mstml/tests: Merge two adjacent if blocks with identical condition (PVS-Studio). --- dlls/mshtml/tests/htmldoc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 08c31ad..f131563 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6509,11 +6509,10 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded) editmode = TRUE; - if(loaded) + if(loaded) { load_state = LD_DOLOAD; - - if(loaded) SET_EXPECT(GetClassID); + } SET_EXPECT(SetStatusText); SET_EXPECT(Exec_ShellDocView_37); SET_EXPECT(GetHostInfo);

1 0