January 2007 - Wine-commits

Rob Shearman : wininet: Change the HTTP code to not assume that the connection will be closed at the end of every request .
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 272954bd815338292a3f2c8dc916437838fa3afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=272954bd815338292a3f2c8dc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 4 18:23:17 2007 +0000 wininet: Change the HTTP code to not assume that the connection will be closed at the end of every request. --- dlls/wininet/http.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wininet/internet.c | 23 ++++++++++++++---- dlls/wininet/internet.h | 4 +++ 3 files changed, 81 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7fa0566..b98a3df 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -6,6 +6,7 @@ * Copyright 2002 TransGaming Technologies Inc. * Copyright 2004 Mike McCormack for CodeWeavers * Copyright 2005 Aric Stewart for CodeWeavers + * Copyright 2006 Robert Shearman for CodeWeavers * * Ulrich Czekalla * David Hammerton @@ -69,6 +70,7 @@ static const WCHAR g_szUserAgent[] = {'U static const WCHAR szHost[] = { 'H','o','s','t',0 }; static const WCHAR szProxy_Authorization[] = { 'P','r','o','x','y','-','A','u','t','h','o','r','i','z','a','t','i','o','n',0 }; static const WCHAR szStatus[] = { 'S','t','a','t','u','s',0 }; +static const WCHAR szKeepAlive[] = {'K','e','e','p','-','A','l','i','v','e',0}; #define MAXHOSTNAME 100 #define MAX_FIELD_VALUE_LEN 256 @@ -525,6 +527,20 @@ BOOL WINAPI HttpAddRequestHeadersA(HINTE return r; } +/* read any content returned by the server so that the connection can be + * resued */ +static void HTTP_DrainContent(LPWININETHTTPREQW lpwhr) +{ + DWORD bytes_read; + do + { + char buffer[2048]; + if (!INTERNET_ReadFile(&lpwhr->hdr, buffer, sizeof(buffer), &bytes_read, + TRUE, FALSE)) + return; + } while (bytes_read); +} + /*********************************************************************** * HttpEndRequestA (WININET.@) * @@ -639,6 +655,9 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hR &lpwhr->dwContentLength,&dwBufferSize,NULL)) lpwhr->dwContentLength = -1; + if (lpwhr->dwContentLength == 0) + HTTP_FinishedReading(lpwhr); + if(!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT)) { DWORD dwCode,dwCodeLength=sizeof(DWORD); @@ -653,6 +672,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hR /* redirects are always GETs */ HeapFree(GetProcessHeap(),0,lpwhr->lpszVerb); lpwhr->lpszVerb = WININET_strdupW(szGET); + HTTP_DrainContent(lpwhr); rc = HTTP_HandleRedirect(lpwhr, szNewLocation); if (rc) rc = HTTP_HttpSendRequestW(lpwhr, NULL, 0, NULL, 0, 0, TRUE); @@ -2260,6 +2280,10 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI char *ascii_req; loop_next = FALSE; + + /* like native, just in case the caller forgot to call InternetReadFile + * for all the data */ + HTTP_DrainContent(lpwhr); lpwhr->dwContentRead = 0; if (TRACE_ON(wininet)) @@ -2340,6 +2364,9 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI &lpwhr->dwContentLength,&dwBufferSize,NULL)) lpwhr->dwContentLength = -1; + if (lpwhr->dwContentLength == 0) + HTTP_FinishedReading(lpwhr); + if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && bSuccess) { DWORD dwCode,dwCodeLength=sizeof(DWORD); @@ -2349,6 +2376,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI (dwCode==HTTP_STATUS_REDIRECT || dwCode==HTTP_STATUS_MOVED) && HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) { + HTTP_DrainContent(lpwhr); INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_REDIRECT, szNewLocation, dwBufferSize); @@ -2505,6 +2533,12 @@ static BOOL HTTP_OpenConnection(LPWININE goto lend; } + if (NETCON_connected(&lpwhr->netConnection)) + { + bSuccess = TRUE; + goto lend; + } + lpwhs = lpwhr->lpHttpSession; hIC = lpwhs->lpAppInfo; @@ -2942,6 +2976,31 @@ static VOID HTTP_CloseConnection(LPWININ /*********************************************************************** + * HTTP_FinishedReading (internal) + * + * Called when all content from server has been read by client. + * + */ +BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr) +{ + WCHAR szConnectionResponse[20]; + DWORD dwBufferSize = sizeof(szConnectionResponse)/sizeof(szConnectionResponse[0]); + + TRACE("\n"); + + if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_CONNECTION, szConnectionResponse, + &dwBufferSize, NULL) || + strcmpiW(szConnectionResponse, szKeepAlive)) + { + HTTP_CloseConnection(lpwhr); + } + + /* FIXME: store data in the URL cache here */ + + return TRUE; +} + +/*********************************************************************** * HTTP_CloseHTTPRequestHandle (internal) * * Deallocate request handle diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a7568d4..e064ac1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1684,9 +1684,9 @@ BOOL WINAPI InternetWriteFile(HINTERNET } -static BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, - DWORD dwNumOfBytesToRead, LPDWORD pdwNumOfBytesRead, - BOOL bWait, BOOL bSendCompletionStatus) +BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, + DWORD dwNumOfBytesToRead, LPDWORD pdwNumOfBytesRead, + BOOL bWait, BOOL bSendCompletionStatus) { BOOL retval = FALSE; int nSocket = -1; @@ -1698,18 +1698,31 @@ static BOOL INTERNET_ReadFile(LPWININETH { case WH_HHTTPREQ: lpwhr = (LPWININETHTTPREQW)lpwh; + if (!NETCON_recv(&lpwhr->netConnection, lpBuffer, min(dwNumOfBytesToRead, lpwhr->dwContentLength - lpwhr->dwContentRead), bWait ? MSG_WAITALL : 0, &bytes_read)) { + + if (((lpwhr->dwContentLength != -1) && + (lpwhr->dwContentRead != lpwhr->dwContentLength))) + ERR("not all data received %d/%d\n", lpwhr->dwContentRead, + lpwhr->dwContentLength); + + /* always returns TRUE, even if the network layer returns an + * error */ *pdwNumOfBytesRead = 0; - retval = TRUE; /* Under windows, it seems to return 0 even if nothing was read... */ + HTTP_FinishedReading(lpwhr); + retval = TRUE; } else { lpwhr->dwContentRead += bytes_read; *pdwNumOfBytesRead = bytes_read; - retval = TRUE; + if (!bytes_read) + retval = HTTP_FinishedReading(lpwhr); + else + retval = TRUE; } break; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4af22ea..438654b 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -404,6 +404,9 @@ DWORD INTERNET_GetLastError(void); BOOL INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest); LPSTR INTERNET_GetResponseBuffer(void); LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen); +BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, + DWORD dwNumOfBytesToRead, LPDWORD pdwNumOfBytesRead, + BOOL bWait, BOOL bSendCompletionStatus); BOOLAPI FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile, LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext); @@ -431,6 +434,7 @@ INTERNETAPI HINTERNET WINAPI HTTP_HttpOp LPCWSTR lpszVerb, LPCWSTR lpszObjectName, LPCWSTR lpszVersion, LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes, DWORD dwFlags, DWORD dwContext); +BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr); VOID SendAsyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo,

1 0

Rob Shearman : wininet: Fix the releasing of the wrong reference count in HTTP_CloseHTTPRequestHandle .
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 06b19b018a28f7a9437995eb3e3fee8f4f614173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b19b018a28f7a9437995eb3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 4 18:22:19 2007 +0000 wininet: Fix the releasing of the wrong reference count in HTTP_CloseHTTPRequestHandle. lpwhr obviously already has a reference count of 0 because it is being destroyed. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b98a3df..438a284 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3013,7 +3013,7 @@ static void HTTP_CloseHTTPRequestHandle( TRACE("\n"); - WININET_Release(&lpwhr->hdr); + WININET_Release(&lpwhr->lpHttpSession->hdr); HTTP_CloseConnection(lpwhr);

1 0

H. Verbeet : wined3d: Don' t do WINED3DTSS_COLOROP texture operations for stages that aren' t mapped to a texture unit.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 8c530333cb4b5ad610676f4a3aa7607a154e410a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c530333cb4b5ad610676f4a3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 3 19:18:38 2007 +0100 wined3d: Don't do WINED3DTSS_COLOROP texture operations for stages that aren't mapped to a texture unit. --- dlls/wined3d/state.c | 51 +++++++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c99be0e..1e93787 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1363,6 +1363,7 @@ static void activate_dimensions(DWORD st static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; + DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; TRACE("Setting color op for stage %d\n", stage); @@ -1372,21 +1373,23 @@ static void tex_colorop(DWORD state, IWi return; } - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - /* TODO: register combiners! */ - if(stage != stateblock->wineD3DDevice->texUnitMap[stage]) ERR("Foo: %d is %d!\n", stage, stateblock->wineD3DDevice->texUnitMap[stage]); - if(stateblock->wineD3DDevice->texUnitMap[stage] >= GL_LIMITS(sampler_stages)) { - if(stateblock->textureState[stage][WINED3DTSS_COLOROP] != WINED3DTOP_DISABLE && - stateblock->textureState[stage][WINED3DTSS_COLOROP] != 0) { - FIXME("Attempt to enable unsupported stage!\n"); + if (stage != mapped_stage) WARN("Using non 1:1 mapping: %d -> %d!\n", stage, mapped_stage); + + if (mapped_stage != -1) { + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + if (mapped_stage >= GL_LIMITS(sampler_stages)) { + if (stateblock->textureState[stage][WINED3DTSS_COLOROP] != WINED3DTOP_DISABLE && + stateblock->textureState[stage][WINED3DTSS_COLOROP] != 0) { + FIXME("Attempt to enable unsupported stage!\n"); + } + return; } + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); + checkGLcall("glActiveTextureARB"); + } else if (stage > 0) { + WARN("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); return; } - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stateblock->wineD3DDevice->texUnitMap[stage])); - checkGLcall("glActiveTextureARB"); - } else if (stage > 0) { - WARN("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - return; } if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { @@ -1399,20 +1402,22 @@ static void tex_colorop(DWORD state, IWi } if(stage >= stateblock->lowest_disabled_stage) { TRACE("Stage disabled\n"); - /* Disable everything here */ - glDisable(GL_TEXTURE_1D); - checkGLcall("glDisable(GL_TEXTURE_1D)"); - glDisable(GL_TEXTURE_2D); - checkGLcall("glDisable(GL_TEXTURE_2D)"); - glDisable(GL_TEXTURE_3D); - checkGLcall("glDisable(GL_TEXTURE_3D)"); - glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + if (mapped_stage != -1) { + /* Disable everything here */ + glDisable(GL_TEXTURE_1D); + checkGLcall("glDisable(GL_TEXTURE_1D)"); + glDisable(GL_TEXTURE_2D); + checkGLcall("glDisable(GL_TEXTURE_2D)"); + glDisable(GL_TEXTURE_3D); + checkGLcall("glDisable(GL_TEXTURE_3D)"); + glDisable(GL_TEXTURE_CUBE_MAP_ARB); + checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + } /* All done */ return; } - activate_dimensions(stage, stateblock); + if (mapped_stage != -1) activate_dimensions(stage, stateblock); /* Set the texture combiners */ if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { @@ -1421,7 +1426,7 @@ static void tex_colorop(DWORD state, IWi stateblock->textureState[stage][WINED3DTSS_COLORARG1], stateblock->textureState[stage][WINED3DTSS_COLORARG2], stateblock->textureState[stage][WINED3DTSS_COLORARG0], - stateblock->wineD3DDevice->texUnitMap[stage]); + mapped_stage); } else { set_tex_op((IWineD3DDevice *)stateblock->wineD3DDevice, FALSE, stage, stateblock->textureState[stage][WINED3DTSS_COLOROP],

1 0

Rob Shearman : wininet: Always send a Connection header set to "close" because that is what we expect for the moment.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: cf43b160363f25fc53a25594c0c44151c9a49af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf43b160363f25fc53a25594c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 4 18:21:34 2007 +0000 wininet: Always send a Connection header set to "close" because that is what we expect for the moment. --- dlls/wininet/http.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c18e45e..336f1fb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2227,6 +2227,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI INT responseLen; BOOL loop_next; INTERNET_ASYNC_RESULT iar; + static const WCHAR szClose[] = { 'C','l','o','s','e',0 }; TRACE("--> %p\n", lpwhr); @@ -2270,6 +2271,9 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); } + HTTP_ProcessHeader(lpwhr, szConnection, szClose, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + /* if there's a proxy username and password, add it to the headers */ HTTP_AddProxyInfo(lpwhr); @@ -2786,17 +2790,10 @@ static BOOL HTTP_ProcessHeader(LPWININET LPHTTPHEADERW lphttpHdr = NULL; BOOL bSuccess = FALSE; INT index = -1; - static const WCHAR szConnection[] = { 'C','o','n','n','e','c','t','i','o','n',0 }; BOOL request_only = dwModifier & HTTP_ADDHDR_FLAG_REQ; TRACE("--> %s: %s - 0x%08x\n", debugstr_w(field), debugstr_w(value), dwModifier); - /* Don't let applications add Connection header to request */ - if (strcmpW(szConnection,field)==0 && (dwModifier & HTTP_ADDHDR_FLAG_REQ)) - { - return FALSE; - } - /* REPLACE wins out over ADD */ if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE) dwModifier &= ~HTTP_ADDHDR_FLAG_ADD;

1 0

Rob Shearman : wininet: Use the Content-Length header to work out how much HTTP data there is left to be read
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: ac1b527498a732f9c2a502af4278ad14c452d1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1b527498a732f9c2a502af4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 4 18:21:49 2007 +0000 wininet: Use the Content-Length header to work out how much HTTP data there is left to be read and don't try to read any more than what is available. --- dlls/wininet/http.c | 33 +++++++++++++++++++++++---------- dlls/wininet/internet.c | 15 ++++++++++++--- dlls/wininet/internet.h | 2 ++ 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 336f1fb..d7e1d33 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -605,6 +605,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hR BOOL rc = FALSE; LPWININETHTTPREQW lpwhr; INT responseLen; + DWORD dwBufferSize; TRACE("-->\n"); lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hRequest ); @@ -618,6 +619,8 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hR lpwhr->hdr.dwFlags |= dwFlags; lpwhr->hdr.dwContext = dwContext; + /* We appear to do nothing with lpBuffersOut.. is that correct? */ + SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); @@ -631,18 +634,20 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hR /* process headers here. Is this right? */ HTTP_ProcessHeaders(lpwhr); - /* We appear to do nothing with the buffer.. is that correct? */ + dwBufferSize = sizeof(lpwhr->dwContentLength); + if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &lpwhr->dwContentLength,&dwBufferSize,NULL)) + lpwhr->dwContentLength = -1; if(!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT)) { - DWORD dwCode,dwCodeLength=sizeof(DWORD),dwIndex=0; - if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,&dwIndex) && + DWORD dwCode,dwCodeLength=sizeof(DWORD); + if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,NULL) && (dwCode==302 || dwCode==301)) { WCHAR szNewLocation[2048]; - DWORD dwBufferSize=2048; - dwIndex=0; - if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,&dwIndex)) + dwBufferSize=2048; + if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) { static const WCHAR szGET[] = { 'G','E','T', 0 }; /* redirects are always GETs */ @@ -2255,6 +2260,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI char *ascii_req; loop_next = FALSE; + lpwhr->dwContentRead = 0; if (TRACE_ON(wininet)) { @@ -2311,6 +2317,8 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI if (bEndRequest) { + DWORD dwBufferSize; + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); @@ -2327,14 +2335,19 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI HTTP_ProcessHeaders(lpwhr); + dwBufferSize = sizeof(lpwhr->dwContentLength); + if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &lpwhr->dwContentLength,&dwBufferSize,NULL)) + lpwhr->dwContentLength = -1; + if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && bSuccess) { - DWORD dwCode,dwCodeLength=sizeof(DWORD),dwIndex=0; + DWORD dwCode,dwCodeLength=sizeof(DWORD); WCHAR szNewLocation[2048]; - DWORD dwBufferSize=2048; - if (HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,&dwIndex) && + dwBufferSize=2048; + if (HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,NULL) && (dwCode==HTTP_STATUS_REDIRECT || dwCode==HTTP_STATUS_MOVED) && - HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,&dwIndex)) + HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) { INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_REDIRECT, szNewLocation, diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cef4526..a7568d4 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1690,19 +1690,27 @@ static BOOL INTERNET_ReadFile(LPWININETH { BOOL retval = FALSE; int nSocket = -1; + int bytes_read; + LPWININETHTTPREQW lpwhr; /* FIXME: this should use NETCON functions! */ switch (lpwh->htype) { case WH_HHTTPREQ: - if (!NETCON_recv(&((LPWININETHTTPREQW)lpwh)->netConnection, lpBuffer, - dwNumOfBytesToRead, bWait ? MSG_WAITALL : 0, (int *)pdwNumOfBytesRead)) + lpwhr = (LPWININETHTTPREQW)lpwh; + if (!NETCON_recv(&lpwhr->netConnection, lpBuffer, + min(dwNumOfBytesToRead, lpwhr->dwContentLength - lpwhr->dwContentRead), + bWait ? MSG_WAITALL : 0, &bytes_read)) { *pdwNumOfBytesRead = 0; retval = TRUE; /* Under windows, it seems to return 0 even if nothing was read... */ } else + { + lpwhr->dwContentRead += bytes_read; + *pdwNumOfBytesRead = bytes_read; retval = TRUE; + } break; case WH_HFILE: @@ -3216,7 +3224,8 @@ BOOL WINAPI InternetQueryDataAvailable( { case WH_HHTTPREQ: if (!NETCON_recv(&lpwhr->netConnection, buffer, - 4048, MSG_PEEK, (int *)lpdwNumberOfBytesAvailble)) + min(sizeof(buffer), lpwhr->dwContentLength - lpwhr->dwContentRead), + MSG_PEEK, (int *)lpdwNumberOfBytesAvailble)) { SetLastError(ERROR_NO_MORE_FILES); retval = FALSE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 1524139..4af22ea 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -197,6 +197,8 @@ typedef struct WININET_NETCONNECTION netConnection; LPWSTR lpszVersion; LPWSTR lpszStatusText; + DWORD dwContentLength; /* total number of bytes to be read */ + DWORD dwContentRead; /* bytes of the content read so far */ HTTPHEADERW *pCustHeaders; DWORD nCustHeaders; } WININETHTTPREQW, *LPWININETHTTPREQW;

1 0

Rob Shearman : wininet: Don' t send callbacks in HTTP_CloseConnection if not connected.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: f0163ae7d604522c19159aa08aada50b99bae123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0163ae7d604522c19159aa08… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 4 18:21:42 2007 +0000 wininet: Don't send callbacks in HTTP_CloseConnection if not connected. --- dlls/wininet/http.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d7e1d33..7fa0566 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2925,16 +2925,16 @@ static VOID HTTP_CloseConnection(LPWININ TRACE("%p\n",lpwhr); + if (!NETCON_connected(&lpwhr->netConnection)) + return; + lpwhs = lpwhr->lpHttpSession; hIC = lpwhs->lpAppInfo; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0); - if (NETCON_connected(&lpwhr->netConnection)) - { - NETCON_close(&lpwhr->netConnection); - } + NETCON_close(&lpwhr->netConnection); INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); @@ -2956,8 +2956,7 @@ static void HTTP_CloseHTTPRequestHandle( WININET_Release(&lpwhr->hdr); - if (NETCON_connected(&lpwhr->netConnection)) - HTTP_CloseConnection(lpwhr); + HTTP_CloseConnection(lpwhr); HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath); HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb);

1 0

Rob Shearman : wininet: Fix HTTP redirects by reseting loop_next after one loop.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 14fb41894275337c33a4105a4f763540fd979d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14fb41894275337c33a4105a4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 4 18:21:13 2007 +0000 wininet: Fix HTTP redirects by reseting loop_next after one loop. --- dlls/wininet/http.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 813d99e..c18e45e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2225,7 +2225,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI BOOL bSuccess = FALSE; LPWSTR requestString = NULL; INT responseLen; - BOOL loop_next = FALSE; + BOOL loop_next; INTERNET_ASYNC_RESULT iar; TRACE("--> %p\n", lpwhr); @@ -2253,6 +2253,8 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI DWORD len; char *ascii_req; + loop_next = FALSE; + if (TRACE_ON(wininet)) { LPHTTPHEADERW Host = HTTP_GetHeader(lpwhr,szHost);

1 0

Rob Shearman : wininet: Use correct types for socket functions to avoid warnings when compiling on BSD-based systems .
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 09dbb1b5a03b83bba55c79a39427c59ece111270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dbb1b5a03b83bba55c79a39… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 4 18:21:24 2007 +0000 wininet: Use correct types for socket functions to avoid warnings when compiling on BSD-based systems. --- dlls/wininet/ftp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index e473b5b..7ae70c1 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2289,7 +2289,7 @@ lend: static BOOL FTP_InitListenSocket(LPWININETFTPSESSIONW lpwfs) { BOOL bSuccess = FALSE; - size_t namelen = sizeof(struct sockaddr_in); + socklen_t namelen = sizeof(struct sockaddr_in); TRACE("\n"); @@ -2579,7 +2579,7 @@ static BOOL FTP_SendPortOrPasv(LPWININET static BOOL FTP_GetDataSocket(LPWININETFTPSESSIONW lpwfs, LPINT nDataSocket) { struct sockaddr_in saddr; - size_t addrlen = sizeof(struct sockaddr); + socklen_t addrlen = sizeof(struct sockaddr); TRACE("\n"); if (lpwfs->hdr.dwFlags & INTERNET_FLAG_PASSIVE)

1 0

Andrew Talbot : widl: Fix memory leaks.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: d3972880c0170a0539db7ed0a5e6db41f4ea1b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3972880c0170a0539db7ed0a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 4 16:57:54 2007 +0000 widl: Fix memory leaks. --- tools/widl/write_msft.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index a624e6d..b2ec44a 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2525,7 +2525,11 @@ int create_msft_typelib(typelib_t *typel if (ctl2_alloc_segment(msft, MSFT_SEG_GUIDHASH, 0x80, 0x80)) { failed = 1; } if (ctl2_alloc_segment(msft, MSFT_SEG_NAMEHASH, 0x200, 0x200)) { failed = 1; } - if(failed) return 0; + if(failed) + { + free(msft); + return 0; + } msft->typelib_guidhash_segment = (int *)msft->typelib_segment_data[MSFT_SEG_GUIDHASH]; msft->typelib_namehash_segment = (int *)msft->typelib_segment_data[MSFT_SEG_NAMEHASH]; @@ -2557,5 +2561,6 @@ int create_msft_typelib(typelib_t *typel add_entry(msft, entry); save_all_changes(msft); + free(msft); return 1; }

1 0

Vitaliy Margolen : dinput: Fix cut and paste error.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 4c1e52e1237ddd8f667d48d43067d0e754f11a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1e52e1237ddd8f667d48d43… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Jan 4 10:15:39 2007 -0700 dinput: Fix cut and paste error. --- dlls/dinput/mouse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 91136b6..6465482 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -662,7 +662,7 @@ static HRESULT WINAPI SysMouseWImpl_GetO LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow) { static const WCHAR x_axisW[] = {'X','-','A','x','i','s',0}; - static const WCHAR y_axisW[] = {'X','-','A','x','i','s',0}; + static const WCHAR y_axisW[] = {'Y','-','A','x','i','s',0}; static const WCHAR wheelW[] = {'W','h','e','e','l',0}; static const WCHAR buttonW[] = {'B','u','t','t','o','n',' ','%','d',0}; HRESULT res;

1 0