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

Bruno Jesus : usp10: Fix a memory leak in _ItemizeInternal (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 3c16044410cd60d2423bc1319117081e017a5020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c16044410cd60d2423bc1319… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri May 30 00:00:11 2014 -0300 usp10: Fix a memory leak in _ItemizeInternal (valgrind). --- dlls/usp10/usp10.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0493487..14feb6d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1280,6 +1280,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, WORD layoutRTL = 0; BOOL forceLevels = FALSE; INT consumed = 0; + HRESULT res = E_OUTOFMEMORY; TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); @@ -1374,10 +1375,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, { levels = heap_alloc_zero(cInChars * sizeof(WORD)); if (!levels) - { - heap_free(scripts); - return E_OUTOFMEMORY; - } + goto nomemory; BIDI_DetermineLevels(pwcInChars, cInChars, psState, psControl, levels); baselevel = levels[0]; @@ -1396,11 +1394,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, strength = heap_alloc_zero(cInChars * sizeof(WORD)); if (!strength) - { - heap_free(scripts); - heap_free(levels); - return E_OUTOFMEMORY; - } + goto nomemory; BIDI_GetStrengths(pwcInChars, cInChars, psControl, strength); /* We currently mis-level leading Diacriticals */ @@ -1580,7 +1574,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, index++; if (index+1 > cMaxItems) - return E_OUTOFMEMORY; + goto nomemory; if (strength) str = strength[cnt]; @@ -1616,7 +1610,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, * item is set up to prevent random behaviour if the caller erroneously * checks the n+1 structure */ index++; - if (index + 1 > cMaxItems) return E_OUTOFMEMORY; + if (index + 1 > cMaxItems) goto nomemory; memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); @@ -1626,10 +1620,12 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, /* Set SCRIPT_ITEM */ pItems[index].iCharPos = cnt; /* the last item contains the ptr to the lastchar */ + res = S_OK; +nomemory: heap_free(levels); heap_free(strength); heap_free(scripts); - return S_OK; + return res; } /***********************************************************************

1 0

Nicolas Le Cam : mshtml/tests: Remove unused variable.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: b57a88482940d5adb2b65d1c103364e9909deeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57a88482940d5adb2b65d1c1… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun Jun 1 17:40:23 2014 +0200 mshtml/tests: Remove unused variable. --- dlls/mshtml/tests/events.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 6755591..2f99699 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -88,7 +88,6 @@ DEFINE_EXPECT(iframe_onload); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; static IOleDocumentView *view; -static BOOL xy_todo; static BOOL is_ie9plus; typedef struct { @@ -1638,8 +1637,6 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(invoke_onclick); } - xy_todo = TRUE; - SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); @@ -2757,7 +2754,6 @@ static void run_test(const char *str, testfunc_t test) MSG msg; HRESULT hres; - xy_todo = FALSE; doc = create_document(); if (!doc) return;

1 0

Michael Stefaniuc : dmusic: Simplify the creation of a DirectMusic8 object.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 096bfbd2143b07ca68441a7d8f722d38ce2dc3b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096bfbd2143b07ca68441a7d8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:21:33 2014 +0200 dmusic: Simplify the creation of a DirectMusic8 object. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/dmusic.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 30f69cc..28be851 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -61,8 +61,6 @@ static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface) TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); - return ref; } @@ -78,10 +76,9 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) HeapFree(GetProcessHeap(), 0, This->system_ports); HeapFree(GetProcessHeap(), 0, This->ppPorts); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -417,7 +414,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU return E_OUTOFMEMORY; dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; - dmusic->ref = 0; /* Will be inited by QueryInterface */ + dmusic->ref = 1; dmusic->pMasterClock = NULL; dmusic->ppPorts = NULL; dmusic->nrofports = 0; @@ -427,14 +424,11 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU return ret; } - ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface); - if (FAILED(ret)) { - IReferenceClock_Release(&dmusic->pMasterClock->IReferenceClock_iface); - HeapFree(GetProcessHeap(), 0, dmusic); - return ret; - } - create_system_ports_list(dmusic); - return S_OK; + DMUSIC_LockModule(); + ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface); + IDirectMusic8Impl_Release(&dmusic->IDirectMusic8_iface); + + return ret; }

1 0

Michael Stefaniuc : dmusic: Release the clock when destroying the IDirectMusic8 object.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d82e2935e41da81bd9e5576046c362ea091d0fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82e2935e41da81bd9e557604… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:20:55 2014 +0200 dmusic: Release the clock when destroying the IDirectMusic8 object. --- dlls/dmusic/dmusic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 6c837f7..30f69cc 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -74,6 +74,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) TRACE("(%p)->(): new ref = %u\n", This, ref); if (!ref) { + IReferenceClock_Release(&This->pMasterClock->IReferenceClock_iface); HeapFree(GetProcessHeap(), 0, This->system_ports); HeapFree(GetProcessHeap(), 0, This->ppPorts); HeapFree(GetProcessHeap(), 0, This);

1 0

Michael Stefaniuc : dmime/tests: Test some IPersistStream methods of objects with DMObject.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 1a3a6d008408558ab17636c4669bee220aa8adff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3a6d008408558ab17636c46… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 23:08:01 2014 +0200 dmime/tests: Test some IPersistStream methods of objects with DMObject. --- dlls/dmime/tests/dmime.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index c1c2caa..1258d40 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -370,6 +370,99 @@ static void test_COM_track(void) } } +static void test_audiopathconfig(void) +{ + IDirectMusicObject *dmo; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "DirectMusicAudioPathConfig create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicAudioPathConfig), + "Expected class CLSID_DirectMusicAudioPathConfig got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicObject_Release(dmo)); +} + +static void test_graph(void) +{ + IDirectMusicGraph *dmg; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicGraph, (void**)&dmg); + ok(hr == S_OK, "DirectMusicGraph create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), + "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicGraph_Release(dmg)); +} + +static void test_segment(void) +{ + IDirectMusicSegment *dms; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment, (void**)&dms); + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicSegment_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment), + "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicSegment_Release(dms)); +} + START_TEST(dmime) { CoInitialize(NULL); @@ -386,6 +479,9 @@ START_TEST(dmime) test_COM_segment(); test_COM_segmentstate(); test_COM_track(); + test_audiopathconfig(); + test_graph(); + test_segment(); CoUninitialize(); }

1 0

Bruno Jesus : shlwapi: Avoid reading past the pointer in PathCreateFromUrlW (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 9dacce1b4e58ebfe33d317ecb7ac7719552a9894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dacce1b4e58ebfe33d317ecb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 23:57:51 2014 -0300 shlwapi: Avoid reading past the pointer in PathCreateFromUrlW (valgrind). --- dlls/shlwapi/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 080c243..01e3ae7 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3377,7 +3377,7 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, len = src - pszUrl; StrCpyNW(dst, pszUrl, len + 1); dst += len; - if (isalphaW(src[1]) && (src[2] == ':' || src[2] == '|')) + if (*src && isalphaW(src[1]) && (src[2] == ':' || src[2] == '|')) { /* 'Forget' to add a trailing '/', just like Windows */ src++;

1 0

Bruno Jesus : wininet/tests: Fix a memory leak (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 1f713cc56723cf3fbd520bf1c62b59bfd029204c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f713cc56723cf3fbd520bf1c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 23:44:03 2014 -0300 wininet/tests: Fix a memory leak (valgrind). --- dlls/wininet/tests/urlcache.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 07800e0..35ef77d 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -99,6 +99,7 @@ static void test_find_url_cache_entriesA(void) ret = FindCloseUrlCache(hEnumHandle); ok(ret, "FindCloseUrlCache failed with error %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); } static void test_GetUrlCacheEntryInfoExA(void)

1 0

Bruno Jesus : userenv/tests: Fix a memory leak (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 55f8233390a926b316c4a945436bc9296a5a090e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f8233390a926b316c4a9454… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 23:16:09 2014 -0300 userenv/tests: Fix a memory leak (valgrind). --- dlls/userenv/tests/userenv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index b085d17..5647cf3 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -154,6 +154,7 @@ static void test_create_env(void) r = get_env(env[i], "SystemRoot", &st); ok(!strcmp(st, "SystemRoot=overwrite"), "%s\n", st); expect(TRUE, r); + HeapFree(GetProcessHeap(), 0, st); } /* Test for common environment variables (NT4 and higher) */

1 0

Nikolay Sivov : wbemprox/tests: Fix some test failures on older XP versions.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: ba111c79e492f4c5cb3f071d6f4a25761c8de794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba111c79e492f4c5cb3f071d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 1 21:23:21 2014 +0400 wbemprox/tests: Fix some test failures on older XP versions. --- dlls/wbemprox/tests/services.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index b36748e..8ab6e83 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -131,7 +131,7 @@ static void test_IWbemLocator(void) { path8W, WBEM_E_INVALID_NAMESPACE }, { path9W, S_OK }, { path10W, WBEM_E_INVALID_PARAMETER }, - { path11W, S_OK }, + { path11W, S_OK, FALSE, WBEM_E_INVALID_PARAMETER }, { path12W, S_OK }, { path13W, S_OK }, { path14W, S_OK }, @@ -139,8 +139,8 @@ static void test_IWbemLocator(void) { path16W, S_OK }, { path17W, WBEM_E_INVALID_NAMESPACE }, { path18W, S_OK }, - { path19W, WBEM_E_INVALID_NAMESPACE }, - { path20W, WBEM_E_INVALID_NAMESPACE }, + { path19W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, + { path20W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, { path21W, S_OK }, { path22W, S_OK }, { path23W, WBEM_E_INVALID_NAMESPACE },

1 0

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

June 11, 2014

Module: wine Branch: master Commit: 1b8d8ef372cbb6b77e8c381ce4e08ac2025f768c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8d8ef372cbb6b77e8c381ce… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 21:20:14 2014 -0300 wininet: Use a helper to send data and take care of EINTR. --- dlls/wininet/ftp.c | 8 ++++---- dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 17 ++++++++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 837fcad..5576de9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1220,7 +1220,7 @@ static DWORD FTPFILE_WriteFile(object_header_t *hdr, const void *buffer, DWORD s ftp_file_t *lpwh = (ftp_file_t*) hdr; int res; - res = send(lpwh->nDataSocket, buffer, size, 0); + res = sock_send(lpwh->nDataSocket, buffer, size, 0); *written = res>0 ? res : 0; return res >= 0 ? ERROR_SUCCESS : sock_get_error(errno); @@ -2316,7 +2316,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags TRACE("Sending (%s) len(%d)\n", cmd, len); while ((nBytesSent < len) && (nRC != -1)) { - nRC = send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); + nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); if (nRC != -1) { nBytesSent += nRC; @@ -2683,7 +2683,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam, TRACE("Sending (%s) len(%d)\n", buf, len); while((nBytesSent < len) && (nRC != -1)) { - nRC = send(nSocket, buf+nBytesSent, len - nBytesSent, 0); + nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0); nBytesSent += nRC; } heap_free(buf); @@ -3263,7 +3263,7 @@ static BOOL FTP_SendData(ftp_session_t *lpwfs, INT nDataSocket, HANDLE hFile) nLen = DATA_PACKET_SIZE < nBytesToSend ? DATA_PACKET_SIZE : nBytesToSend; - nRC = send(nDataSocket, lpszBuffer, nLen, 0); + nRC = sock_send(nDataSocket, lpszBuffer, nLen, 0); if (nRC != -1) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index a641340..87369c6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -457,6 +457,7 @@ LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; 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; server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 074229e..595dd71 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -496,6 +496,17 @@ int sock_get_error( int err ) return err; } +int sock_send(int fd, const void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = send(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) @@ -546,7 +557,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode TRACE("sending %u bytes\n", out_buf.cbBuffer); - size = send(connection->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); + size = sock_send(connection->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); if(size != out_buf.cbBuffer) { ERR("send failed\n"); status = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; @@ -718,7 +729,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) return FALSE; } - if(send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { + if(sock_send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { WARN("send failed\n"); return FALSE; } @@ -736,7 +747,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, { if(!connection->secure) { - *sent = send(connection->socket, msg, len, flags); + *sent = sock_send(connection->socket, msg, len, flags); if (*sent == -1) return sock_get_error(errno); return ERROR_SUCCESS;

1 0