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

Francois Gouget : wrc: Remove an unused lexer definition.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 9cb557913077891d569cdbacc31c1b014f407643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb557913077891d569cdbacc… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 09:30:18 2015 +0100 wrc: Remove an unused lexer definition. --- tools/wrc/parser.l | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 16a487f..80072b2 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -90,7 +90,6 @@ /* Some shortcut definitions */ ws [ \f\t\r] -cident [a-zA-Z_][0-9a-zA-Z_]* %{

1 0

Nikolay Sivov : vbscript: Use CP_ACP instead of its numeric value.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 4b15e6fd094a496e7f4bae549253931562e62e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b15e6fd094a496e7f4bae549… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 8 13:51:37 2015 +0300 vbscript: Use CP_ACP instead of its numeric value. --- dlls/vbscript/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 448b886..74acff7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1303,7 +1303,7 @@ static HRESULT Global_Chr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA buf[len++] = c>>8; if(!len || IsDBCSLeadByteEx(cp, buf[0])) buf[len++] = c; - if(!MultiByteToWideChar(0, 0, buf, len, &ch, 1)) { + if(!MultiByteToWideChar(CP_ACP, 0, buf, len, &ch, 1)) { WARN("invalid arg %d, cp %d\n", c, cp); return E_FAIL; }

1 0

Nikolay Sivov : oleaut32: Use WdtpInterfacePointer_* functions in VARIANT marshalling.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 44360823b985918db874bf8b94c09dc2293813fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=44360823b985918db874bf8b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 8 11:04:29 2015 +0300 oleaut32: Use WdtpInterfacePointer_* functions in VARIANT marshalling. --- dlls/ole32/tests/usrmarshal.c | 29 +++++++-- dlls/oleaut32/tests/usrmarshal.c | 20 +++--- dlls/oleaut32/usrmarshal.c | 127 +++++++++------------------------------ 3 files changed, 62 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44360823b985918db874b…

1 0

Nikolay Sivov : oleaut32/tests: Hide details about VARIANT wire header in header testing helper.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 52d30cc301b1c4a7c40532ef5971abbb65a2eb84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d30cc301b1c4a7c40532ef5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 7 23:40:35 2015 +0300 oleaut32/tests: Hide details about VARIANT wire header in header testing helper. --- dlls/oleaut32/tests/usrmarshal.c | 103 +++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52d30cc301b1c4a7c4053…

1 0

Francois Gouget : activeds: Remove an unneeded NONAMELESSUNION directive.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 988a6d099f7fc8ea7959358a0ca6bab1ebe514e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988a6d099f7fc8ea7959358a0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 09:31:12 2015 +0100 activeds: Remove an unneeded NONAMELESSUNION directive. --- dlls/activeds/activeds_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index c249cf1..15a329e 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -24,7 +24,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Nikolay Sivov : rpcrt4: Handle memory allocation error when creating OLE stream instance.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: e7a608a4e317f28546c1f2c4d880113fdc33485c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a608a4e317f28546c1f2c4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 20:16:40 2015 +0300 rpcrt4: Handle memory allocation error when creating OLE stream instance. --- dlls/rpcrt4/ndr_ole.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index c3ab529..0ad4860 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -95,14 +95,15 @@ static HRESULT WINAPI RpcStream_QueryInterface(LPSTREAM iface, REFIID riid, LPVOID *obj) { - RpcStreamImpl *This = impl_from_IStream(iface); if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ISequentialStream, riid) || IsEqualGUID(&IID_IStream, riid)) { - *obj = This; - InterlockedIncrement( &This->RefCount ); + *obj = iface; + IStream_AddRef(iface); return S_OK; } + + *obj = NULL; return E_NOINTERFACE; } @@ -120,7 +121,6 @@ static ULONG WINAPI RpcStream_Release(LPSTREAM iface) TRACE("size=%d\n", *This->size); This->pMsg->Buffer = This->data + *This->size; HeapFree(GetProcessHeap(),0,This); - return 0; } return ref; } @@ -212,11 +212,13 @@ static const IStreamVtbl RpcStream_Vtbl = NULL /* Clone */ }; -static LPSTREAM RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init) +static HRESULT RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init, IStream **stream) { RpcStreamImpl *This; + + *stream = NULL; This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(RpcStreamImpl)); - if (!This) return NULL; + if (!This) return E_OUTOFMEMORY; This->IStream_iface.lpVtbl = &RpcStream_Vtbl; This->RefCount = 1; This->pMsg = pStubMsg; @@ -225,7 +227,8 @@ static LPSTREAM RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init) This->pos = 0; if (init) *This->size = 0; TRACE("init size=%d\n", *This->size); - return (LPSTREAM)This; + *stream = &This->IStream_iface; + return S_OK; } static const IID* get_ip_iid(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) @@ -260,19 +263,17 @@ unsigned char * WINAPI NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->MaxCount = 0; if (!LoadCOM()) return NULL; if (pStubMsg->Buffer + sizeof(DWORD) <= (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { - stream = RpcStream_Create(pStubMsg, TRUE); - if (stream) { + hr = RpcStream_Create(pStubMsg, TRUE, &stream); + if (hr == S_OK) { if (pMemory) hr = COM_MarshalInterface(stream, riid, (LPUNKNOWN)pMemory, pStubMsg->dwDestContext, pStubMsg->pvDestContext, MSHLFLAGS_NORMAL); - else - hr = S_OK; - IStream_Release(stream); - if (FAILED(hr)) - RpcRaiseException(hr); } + + if (FAILED(hr)) + RpcRaiseException(hr); } return NULL; } @@ -292,13 +293,14 @@ unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg if (!LoadCOM()) return NULL; *(LPVOID*)ppMemory = NULL; if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { - stream = RpcStream_Create(pStubMsg, FALSE); - if (!stream) RpcRaiseException(E_OUTOFMEMORY); - if (*((RpcStreamImpl *)stream)->size != 0) - hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); - else - hr = S_OK; - IStream_Release(stream); + hr = RpcStream_Create(pStubMsg, FALSE, &stream); + if (hr == S_OK) { + if (*((RpcStreamImpl *)stream)->size != 0) + hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); + + IStream_Release(stream); + } + if (FAILED(hr)) RpcRaiseException(hr); }

1 0

Bruno Jesus : ws2_32/tests: Add more select() tests.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 3e676b205da646dbe2b0408cbbe881e6857a4336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e676b205da646dbe2b0408cb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 8 01:06:19 2015 -0300 ws2_32/tests: Add more select() tests. --- dlls/ws2_32/tests/sock.c | 124 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 110 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d741ca5..f27d522 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3389,16 +3389,19 @@ static void test_listen(void) ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); } +#define FD_ZERO_ALL() { FD_ZERO(&readfds); FD_ZERO(&writefds); FD_ZERO(&exceptfds); } +#define FD_SET_ALL(s) { FD_SET(s, &readfds); FD_SET(s, &writefds); FD_SET(s, &exceptfds); } static void test_select(void) { - static const char tmp_buf[1024]; + static char tmp_buf[1024]; - SOCKET fdRead, fdWrite; + SOCKET fdListen, fdRead, fdWrite; fd_set readfds, writefds, exceptfds; unsigned int maxfd; - int ret; + int ret, len; char buffer; struct timeval select_timeout; + struct sockaddr_in address; select_thread_params thread_params; HANDLE thread_handle; DWORD id; @@ -3407,14 +3410,10 @@ static void test_select(void) ok( (fdRead != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); fdWrite = socket(AF_INET, SOCK_STREAM, 0); ok( (fdWrite != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); - - FD_ZERO(&readfds); - FD_ZERO(&writefds); - FD_ZERO(&exceptfds); - FD_SET(fdRead, &readfds); - FD_SET(fdWrite, &writefds); - FD_SET(fdRead, &exceptfds); - FD_SET(fdWrite, &exceptfds); + + FD_ZERO_ALL(); + FD_SET_ALL(fdRead); + FD_SET_ALL(fdWrite); select_timeout.tv_sec=0; select_timeout.tv_usec=500; @@ -3455,9 +3454,7 @@ static void test_select(void) ok( (ret == -1), "peek at closed socket expected -1 got %d\n", ret); /* Test selecting invalid handles */ - FD_ZERO(&readfds); - FD_ZERO(&writefds); - FD_ZERO(&exceptfds); + FD_ZERO_ALL(); SetLastError(0); ret = select(maxfd+1, 0, 0, 0, &select_timeout); @@ -3564,7 +3561,106 @@ static void test_select(void) closesocket(fdRead); closesocket(fdWrite); + + /* select() works in 3 distinct states: + * - to check if a connection attempt ended with success or error; + * - to check if a pending connection is waiting for acceptance; + * - to check for data to read, avaliability for write and OOB data + * + * The tests below ensure that all conditions are tested. + */ + memset(&address, 0, sizeof(address)); + address.sin_addr.s_addr = inet_addr("127.0.0.1"); + address.sin_family = AF_INET; + len = sizeof(address); + fdListen = setup_server_socket(&address, &len); + select_timeout.tv_sec = 1; + select_timeout.tv_usec = 250000; + + /* When a socket is attempting to connect the listening socket receives the read descriptor */ + fdWrite = setup_connector_socket(&address, len, TRUE); + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdListen, &readfds), "fdListen socket is not in the set\n"); + len = sizeof(address); + fdRead = accept(fdListen, (struct sockaddr*) &address, &len); + ok(fdRead != INVALID_SOCKET, "expected a valid socket\n"); + + /* The connector is signaled through the write descriptor */ + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + FD_SET_ALL(fdRead); + FD_SET_ALL(fdWrite); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 2, "expected 2, got %d\n", ret); + ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &writefds), "fdRead socket is not in the set\n"); + + /* When data is received the receiver gets the read descriptor */ + ret = send(fdWrite, "1234", 4, 0); + ok(ret == 4, "expected 4, got %d\n", ret); + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + FD_SET(fdRead, &readfds); + FD_SET(fdRead, &exceptfds); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); + ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0); + ok(ret == 4, "expected 4, got %d\n", ret); + ok(!strcmp(tmp_buf, "1234"), "data received differs from sent\n"); + + /* When OOB data is received the socket is set in the except descriptor */ + ret = send(fdWrite, "A", 1, MSG_OOB); + ok(ret == 1, "expected 4, got %d\n", ret); + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + FD_SET(fdRead, &readfds); + FD_SET(fdRead, &exceptfds); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); +todo_wine + ok(ret == 1, "expected 1, got %d\n", ret); +todo_wine + ok(FD_ISSET(fdRead, &exceptfds), "fdRead socket is not in the set\n"); + tmp_buf[0] = 0xAF; + ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), MSG_OOB); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]); + + /* When the connection is closed the socket is set in the read descriptor */ + ret = closesocket(fdRead); + ok(ret == 0, "expected 0, got %d\n", ret); + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + FD_SET(fdWrite, &readfds); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); + ok(ret == 0, "expected 0, got %d\n", ret); + + /* When a connection is attempted to a non-listening socket it will get to the except descriptor */ + ret = closesocket(fdWrite); + ok(ret == 0, "expected 0, got %d\n", ret); + ret = closesocket(fdListen); + ok(ret == 0, "expected 0, got %d\n", ret); + fdWrite = setup_connector_socket(&address, len, TRUE); + FD_ZERO_ALL(); + FD_SET(fdWrite, &writefds); + FD_SET(fdWrite, &exceptfds); + select_timeout.tv_sec = 2; /* requires more time to realize it will not connect */ + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); +todo_wine + ok(ret == 1, "expected 1, got %d\n", ret); +todo_wine + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); + closesocket(fdWrite); } +#undef FD_SET_ALL +#undef FD_ZERO_ALL static DWORD WINAPI AcceptKillThread(void *param) {

1 0

Alexandre Julliard : server: Don' t report completion at all in the MORE_PROCESSING_REQUIRED case.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 8364351b9917e699c1654bab6eec98c2aec5bf41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8364351b9917e699c1654bab6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 7 14:26:51 2015 +0900 server: Don't report completion at all in the MORE_PROCESSING_REQUIRED case. --- server/async.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/async.c b/server/async.c index e403955..a8f3b05 100644 --- a/server/async.c +++ b/server/async.c @@ -243,9 +243,6 @@ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int sta static void add_async_completion( struct async_queue *queue, apc_param_t cvalue, unsigned int status, apc_param_t information ) { - if (status == STATUS_MORE_PROCESSING_REQUIRED) - return; /* The async callback has successfully finished but no completion should be reported */ - if (queue->fd) { apc_param_t ckey; @@ -287,6 +284,8 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (async->timeout) remove_timeout_user( async->timeout ); async->timeout = NULL; async->status = status; + if (status == STATUS_MORE_PROCESSING_REQUIRED) return; /* don't report the completion */ + if (async->data.cvalue) add_async_completion( async->queue, async->data.cvalue, status, total ); if (apc) {

1 0

Alexandre Julliard : announce.php: Escape html special characters.
by Alexandre Julliard March 7, 2015

March 7, 2015

Module: website Branch: master Commit: a564b911a57276b88c05f33b3c56f5b4f3b35503 URL: http://source.winehq.org/git/website.git/?a=commit;h=a564b911a57276b88c05f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 7 15:13:14 2015 +0900 announce.php: Escape html special characters. --- include/plugins/announce.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index 6c61baa..fb707a0 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -26,7 +26,7 @@ if ($arr = file($announce)) if ($c == 0) $title = $html->encode(trim($arr[$c])); - $arr[$c] = $html->urlify($arr[$c]); + $arr[$c] = $html->urlify($html->encode($arr[$c])); if (preg_match("/^--------------------/", $arr[$c])) $in_header = 0; else if (preg_match("/^Bugs fixed/", $arr[$c])) $in_bugs = 1;

1 0

Alexandre Julliard : Wine release 1.7.38
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: website Branch: master Commit: bd593e3d4b6e9e0c952a709645b9dc20cc48d9a6 URL: http://source.winehq.org/git/website.git/?a=commit;h=bd593e3d4b6e9e0c952a70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 6 22:29:26 2015 +0900 Wine release 1.7.38 --- news/en/2015030601.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2015030601.xml b/news/en/2015030601.xml new file mode 100644 index 0000000..2305afd --- /dev/null +++ b/news/en/2015030601.xml @@ -0,0 +1,18 @@ +<news> +<date>March 6, 2015</date> +<title>Wine 1.7.38 Released</title> +<body> + The Wine development release 1.7.38 is now available. + <a href="{$root}/announce/1.7.38">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 36.</li> + <li>Support for themed scrollbars.</li> + <li>Updated version of the Mono engine.</li> + <li>More compatible RPC interface for service control.</li> + <li>Support for X Drag & Drop version 5.</li> + <li>Threading fixes in IME support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.38.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0