June 2014 - Wine-Commits - list.winehq.org

Felix Janda : server: Add missing includes of poll.h.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: e3faab267ca5f2ff78d42b20e5fce7e8b0681163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3faab267ca5f2ff78d42b20e… Author: Felix Janda <felix.janda(a)posteo.de> Date: Sun Jun 1 11:00:29 2014 +0200 server: Add missing includes of poll.h. --- server/change.c | 3 +++ server/queue.c | 3 +++ server/sock.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/server/change.c b/server/change.c index f6d56b0..3ac70a4 100644 --- a/server/change.c +++ b/server/change.c @@ -32,6 +32,9 @@ #include <limits.h> #include <dirent.h> #include <errno.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/queue.c b/server/queue.c index 57603e1..601629e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -25,6 +25,9 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/sock.c b/server/sock.c index 5ffb1fe..4adad0f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -30,6 +30,9 @@ #include <string.h> #include <stdlib.h> #include <errno.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #include <sys/time.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H

1 0

Michael Stefaniuc : dmloader: COM cleanup for IDirectMusicContainer.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 9ab1cfb5e0bf943d9533adc2bb4247e3dfe17f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab1cfb5e0bf943d9533adc2b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 4 23:34:20 2014 +0200 dmloader: COM cleanup for IDirectMusicContainer. --- dlls/dmloader/container.c | 139 ++++++++++++++++++++++---------------- dlls/dmloader/dmloader_private.h | 21 ------ 2 files changed, 80 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ab1cfb5e0bf943d9533a…

1 0

Bruno Jesus : wininet: Use a helper to receive data and take care of EINTR.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 8a15ea1190e898accf851c7a7ef2bb3d033e7925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a15ea1190e898accf851c7a7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 12 02:24:45 2014 -0300 wininet: Use a helper to receive data and take care of EINTR. --- dlls/wininet/ftp.c | 8 ++++---- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 23 +++++++++++++++++------ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 5576de9..855aee0 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1195,7 +1195,7 @@ static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW return ERROR_INTERNET_DISCONNECTED; /* FIXME: FTP should use NETCON_ stuff */ - res = recv(file->nDataSocket, buffer, size, MSG_WAITALL); + res = sock_recv(file->nDataSocket, buffer, size, MSG_WAITALL); *read = res>0 ? res : 0; error = res >= 0 ? ERROR_SUCCESS : INTERNET_ERROR_BASE; /* FIXME */ @@ -1234,7 +1234,7 @@ static void FTP_ReceiveRequestData(ftp_file_t *file, BOOL first_notif) TRACE("%p\n", file); - available = recv(file->nDataSocket, buffer, sizeof(buffer), MSG_PEEK); + available = sock_recv(file->nDataSocket, buffer, sizeof(buffer), MSG_PEEK); if(available != -1) { iar.dwResult = (DWORD_PTR)file->hdr.hInternet; @@ -1277,7 +1277,7 @@ static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available, *available = 0; - retval = recv(file->nDataSocket, &byte, 1, MSG_PEEK); + retval = sock_recv(file->nDataSocket, &byte, 1, MSG_PEEK); if(retval > 0) { task_header_t *task; @@ -3368,7 +3368,7 @@ static BOOL FTP_RetrieveFileData(ftp_session_t *lpwfs, INT nDataSocket, HANDLE h while (nRC != -1) { - nRC = recv(nDataSocket, lpszBuffer, DATA_PACKET_SIZE, 0); + nRC = sock_recv(nDataSocket, lpszBuffer, DATA_PACKET_SIZE, 0); if (nRC != -1) { /* other side closed socket. */ diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4389c98..bb46a43 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3928,7 +3928,7 @@ LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) { if (poll(&pfd,1, RESPONSE_TIMEOUT * 1000) > 0) { - if (recv(nSocket, &lpszBuffer[nRecv], 1, 0) <= 0) + if (sock_recv(nSocket, &lpszBuffer[nRecv], 1, 0) <= 0) { INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); goto lend; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 87369c6..b823e43 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -458,6 +458,7 @@ int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; int sock_get_error(int) DECLSPEC_HIDDEN; int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; +int sock_recv(int fd, void *msg, size_t len, int flags) DECLSPEC_HIDDEN; server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 595dd71..483dba4 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -507,6 +507,17 @@ int sock_send(int fd, const void *msg, size_t len, int flags) return ret; } +int sock_recv(int fd, void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = recv(fd, msg, len, flags); + } + while(ret == -1 && errno == EINTR); + return ret; +} + static void set_socket_blocking(int socket, blocking_mode_t mode) { #if defined(__MINGW32__) || defined (_MSC_VER) @@ -596,7 +607,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode read_buf_size += 1024; } - size = recv(connection->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); + size = sock_recv(connection->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); if(size < 1) { WARN("recv error\n"); res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; @@ -799,7 +810,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking tmp_mode = buf_len ? BLOCKING_DISALLOW : mode; set_socket_blocking(conn->socket, tmp_mode); - size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, tmp_mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); + size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, tmp_mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); if(size < 0) { if(!buf_len) { if(errno == EAGAIN || errno == EWOULDBLOCK) { @@ -840,7 +851,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking assert(buf_len < ssl_buf_size); set_socket_blocking(conn->socket, mode); - size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); + size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); if(size < 1) { if(size < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) { TRACE("would block\n"); @@ -924,7 +935,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t } set_socket_blocking(connection->socket, mode); - *recvd = recv(connection->socket, buf, len, flags); + *recvd = sock_recv(connection->socket, buf, len, flags); return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; } else @@ -1012,7 +1023,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) ssize_t len; BYTE b; - len = recv(netconn->socket, &b, 1, MSG_PEEK|MSG_DONTWAIT); + len = sock_recv(netconn->socket, &b, 1, MSG_PEEK|MSG_DONTWAIT); return len == 1 || (len == -1 && errno == EWOULDBLOCK); #elif defined(__MINGW32__) || defined(_MSC_VER) ULONG mode; @@ -1023,7 +1034,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) return FALSE; - len = recv(netconn->socket, &b, 1, MSG_PEEK); + len = sock_recv(netconn->socket, &b, 1, MSG_PEEK); mode = 0; if(!ioctlsocket(netconn->socket, FIONBIO, &mode))

1 0

Nikolay Sivov : explorerframe: Internally make calls with interface wrappers.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: ad4ccd18216e74cb18f30eed13e2a348fe5046f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4ccd18216e74cb18f30eed1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 11 08:58:40 2014 +0400 explorerframe: Internally make calls with interface wrappers. --- dlls/explorerframe/nstc.c | 34 +++++++++++++++------------------- dlls/explorerframe/tests/nstc.c | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 04f4ec8..9daee8b 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -1056,7 +1056,7 @@ static HRESULT WINAPI NSTC2_fnAppendRoot(INameSpaceTreeControl2* iface, root_count = list_count(&This->roots); - return NSTC2_fnInsertRoot(iface, root_count, psiRoot, grfEnumFlags, grfRootStyle, pif); + return INameSpaceTreeControl2_InsertRoot(iface, root_count, psiRoot, grfEnumFlags, grfRootStyle, pif); } static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, @@ -1101,19 +1101,16 @@ static HRESULT WINAPI NSTC2_fnRemoveAllRoots(INameSpaceTreeControl2* iface) { NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); nstc_root *cur1, *cur2; - UINT removed = 0; + TRACE("%p\n", This); + if (list_empty(&This->roots)) + return E_INVALIDARG; + LIST_FOR_EACH_ENTRY_SAFE(cur1, cur2, &This->roots, nstc_root, entry) - { - NSTC2_fnRemoveRoot(iface, cur1->psi); - removed++; - } + INameSpaceTreeControl2_RemoveRoot(iface, cur1->psi); - if(removed) - return S_OK; - else - return E_INVALIDARG; + return S_OK; } static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, @@ -1253,7 +1250,7 @@ static HRESULT WINAPI NSTC2_fnGetSelectedItems(INameSpaceTreeControl2* iface, { NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); IShellItem *psiselected; - HRESULT hr; + TRACE("%p (%p)\n", This, psiaItems); psiselected = get_selected_shellitem(This); @@ -1263,9 +1260,8 @@ static HRESULT WINAPI NSTC2_fnGetSelectedItems(INameSpaceTreeControl2* iface, return E_FAIL; } - hr = SHCreateShellItemArrayFromShellItem(psiselected, &IID_IShellItemArray, + return SHCreateShellItemArrayFromShellItem(psiselected, &IID_IShellItemArray, (void**)psiaItems); - return hr; } static HRESULT WINAPI NSTC2_fnGetItemCustomState(INameSpaceTreeControl2* iface, @@ -1553,22 +1549,19 @@ static const INameSpaceTreeControl2Vtbl vt_INameSpaceTreeControl2 = { static HRESULT WINAPI IOW_fnQueryInterface(IOleWindow *iface, REFIID riid, void **ppvObject) { NSTC2Impl *This = impl_from_IOleWindow(iface); - TRACE("%p\n", This); - return NSTC2_fnQueryInterface(&This->INameSpaceTreeControl2_iface, riid, ppvObject); + return INameSpaceTreeControl2_QueryInterface(&This->INameSpaceTreeControl2_iface, riid, ppvObject); } static ULONG WINAPI IOW_fnAddRef(IOleWindow *iface) { NSTC2Impl *This = impl_from_IOleWindow(iface); - TRACE("%p\n", This); - return NSTC2_fnAddRef(&This->INameSpaceTreeControl2_iface); + return INameSpaceTreeControl2_AddRef(&This->INameSpaceTreeControl2_iface); } static ULONG WINAPI IOW_fnRelease(IOleWindow *iface) { NSTC2Impl *This = impl_from_IOleWindow(iface); - TRACE("%p\n", This); - return NSTC2_fnRelease(&This->INameSpaceTreeControl2_iface); + return INameSpaceTreeControl2_Release(&This->INameSpaceTreeControl2_iface); } static HRESULT WINAPI IOW_fnGetWindow(IOleWindow *iface, HWND *phwnd) @@ -1612,6 +1605,9 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void EFRAME_LockModule(); nstc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NSTC2Impl)); + if (!nstc) + return E_OUTOFMEMORY; + nstc->ref = 1; nstc->INameSpaceTreeControl2_iface.lpVtbl = &vt_INameSpaceTreeControl2; nstc->IOleWindow_iface.lpVtbl = &vt_IOleWindow; diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 1d0c14c..f8c44b6 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1170,6 +1170,11 @@ static void test_basics(void) hr = INameSpaceTreeControl_InsertRoot(pnstc, 5, psidesktop, 0, 0, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); + roots[0] = psitestdir2; + roots[1] = psidesktop; + roots[2] = psidesktop2; + roots[3] = psitestdir; + roots[4] = psitestdir2; roots[5] = psidesktop; roots[6] = NULL; verify_root_order(pnstc, roots); @@ -1177,6 +1182,9 @@ static void test_basics(void) hr = INameSpaceTreeControl_InsertRoot(pnstc, 3, psitestdir2, 0, 0, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); + roots[0] = psitestdir2; + roots[1] = psidesktop; + roots[2] = psidesktop2; roots[3] = psitestdir2; roots[4] = psitestdir; roots[5] = psitestdir2; @@ -1187,6 +1195,13 @@ static void test_basics(void) hr = INameSpaceTreeControl_AppendRoot(pnstc, psitestdir2, 0, 0, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); + roots[0] = psitestdir2; + roots[1] = psidesktop; + roots[2] = psidesktop2; + roots[3] = psitestdir2; + roots[4] = psitestdir; + roots[5] = psitestdir2; + roots[6] = psidesktop; roots[7] = psitestdir2; roots[8] = NULL; verify_root_order(pnstc, roots);

1 0

Nikolay Sivov : explorerframe/tests: Mark some results as broken.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 3d691afd9732269e8d9e4cd5e59c59a679092c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d691afd9732269e8d9e4cd5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 11 08:28:17 2014 +0400 explorerframe/tests: Mark some results as broken. --- dlls/explorerframe/tests/nstc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 6eefa93..1d0c14c 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -690,14 +690,16 @@ static BOOL test_initialization(void) } /* Some "random" interfaces */ + + /* Next three are supported on Vista/2k8, but not on newer versions */ hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceObject, (void**)&punk); - ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + ok(hr == E_NOINTERFACE || broken(hr == S_OK) /* vista, w2k8 */, "Got (0x%08x)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceActiveObject, (void**)&punk); - ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + ok(hr == E_NOINTERFACE || broken(hr == S_OK) /* vista, w2k8 */, "Got (0x%08x)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceObjectWindowless, (void**)&punk); - ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + ok(hr == E_NOINTERFACE || broken(hr == S_OK) /* vista, w2k8 */, "Got (0x%08x)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceUIWindow, (void**)&punk); @@ -2223,7 +2225,7 @@ static void test_events(void) itemstate = 0xDEADBEEF; hr = INameSpaceTreeControl_GetItemState(pnstc, psidesktop, 0xffff, &itemstate); ok(hr == S_OK, "Got (0x%08x)\n", hr); - ok(itemstate == (NSTCIS_BOLD), "itemstate is 0x%08x\n", itemstate); + ok(itemstate == NSTCIS_BOLD, "itemstate is 0x%08x\n", itemstate); ok_no_events(pnstceimpl); hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); @@ -2406,9 +2408,7 @@ START_TEST(nstc) test_events(); } else - { win_skip("No NamespaceTreeControl (or instantiation failed).\n"); - } destroy_window(); OleUninitialize();

1 0

Nikolay Sivov : explorerframe: Query for more notification callbacks.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 586c3f2b4678c7e576c9459cc5aba9f72a327561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=586c3f2b4678c7e576c9459cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 11 08:03:37 2014 +0400 explorerframe: Query for more notification callbacks. --- dlls/explorerframe/nstc.c | 87 ++++++++++++++++++++++----------------- dlls/explorerframe/tests/nstc.c | 32 ++++---------- 2 files changed, 59 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=586c3f2b4678c7e576c94…

1 0

Nikolay Sivov : comctl32/imagelist: Update to IImageList2.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: f109a084e8ec4f0be6704b9128656086ef48a531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f109a084e8ec4f0be6704b912… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 10 08:21:32 2014 +0400 comctl32/imagelist: Update to IImageList2. --- dlls/comctl32/imagelist.c | 286 ++++++++++++++++++++++++++------------- dlls/comctl32/tests/imagelist.c | 11 ++ 2 files changed, 202 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f109a084e8ec4f0be6704…

1 0

Alexandre Julliard : comctl32/tests: Output message sequences only on failure.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 6ad2cf9b5350adff859d36e3438be6a4a54c9fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad2cf9b5350adff859d36e34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 12 10:18:23 2014 +0200 comctl32/tests: Output message sequences only on failure. --- dlls/comctl32/tests/msg.h | 97 +++++++++++++++++++++++++++++++++++++--- dlls/comctl32/tests/syslink.c | 4 -- dlls/comctl32/tests/tab.c | 4 -- dlls/comctl32/tests/toolbar.c | 1 - dlls/comctl32/tests/trackbar.c | 4 -- dlls/comctl32/tests/treeview.c | 1 - dlls/comctl32/tests/updown.c | 6 --- 7 files changed, 91 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ad2cf9b5350adff859d3…

1 0

Bruno Jesus : rpcrt4: Take care of EINTR on send/recv.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: d4278ce0ed61160fa8941ae825668cfe7a1be503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4278ce0ed61160fa8941ae82… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 12 01:52:28 2014 -0300 rpcrt4: Take care of EINTR on send/recv. --- dlls/rpcrt4/rpc_transport.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c073a95..b283301 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -29,6 +29,7 @@ #include <stdio.h> #include <string.h> #include <assert.h> +#include <errno.h> #include <stdlib.h> #include <sys/types.h> @@ -1464,6 +1465,8 @@ static int rpcrt4_conn_tcp_read(RpcConnection *Connection, return -1; else if (r > 0) bytes_read += r; + else if (errno == EINTR) + continue; else if (errno != EAGAIN) { WARN("recv() failed: %s\n", strerror(errno)); @@ -1489,6 +1492,8 @@ static int rpcrt4_conn_tcp_write(RpcConnection *Connection, int r = send(tcpc->sock, (const char *)buffer + bytes_written, count - bytes_written, 0); if (r >= 0) bytes_written += r; + else if (errno == EINTR) + continue; else if (errno != EAGAIN) return -1; else

1 0

Zhenbo Li : mshtml: Added IHTMLDocument2:toString method.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 4719c438a9cd16c56ed2854de317bc7008aadc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4719c438a9cd16c56ed2854de… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat May 31 19:51:07 2014 +0800 mshtml: Added IHTMLDocument2:toString method. --- dlls/mshtml/htmldoc.c | 13 +++++++++++-- dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a9db920..6992c93 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1578,8 +1578,17 @@ static HRESULT WINAPI HTMLDocument_get_onerrorupdate(IHTMLDocument2 *iface, VARI static HRESULT WINAPI HTMLDocument_toString(IHTMLDocument2 *iface, BSTR *String) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, String); - return E_NOTIMPL; + + static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; + + TRACE("(%p)->(%p)\n", This, String); + + if(!String) + return E_INVALIDARG; + + *String = SysAllocString(objectW); + return *String ? S_OK : E_OUTOFMEMORY; + } static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR bstrHref, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cb1e7be..c16e073 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5243,10 +5243,17 @@ static void test_doc_elem(IHTMLDocument2 *doc) IHTMLElement *elem; IHTMLDocument3 *doc3; HRESULT hres; + BSTR bstr; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + hres = IHTMLDocument2_toString(doc, &bstr); + ok(hres == S_OK, "toString failed: %08x\n", hres); + ok(!strcmp_wa(bstr, "[object]"), + "toString returned %s, expected [object]\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hres = IHTMLDocument3_get_documentElement(doc3, &elem); IHTMLDocument3_Release(doc3); ok(hres == S_OK, "get_documentElement failed: %08x\n", hres);

1 0