Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WININET] Sync with Wine Staging 1.9.4. CORE-10912

Browse source 
svn path=/trunk/; revision=70948
This commit is contained in:
Amine Khaldi 2016-03-05 10:58:26 +00:00
parent 44db21603f
commit 0dbcea8773
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/wininet/cookie.c
View file

@ -703,7 +703,7 @@ DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret)
} }
LeaveCriticalSection(&cookie_cs); LeaveCriticalSection(&cookie_cs);
return ERROR_SUCCESS; return res;
} }
/*********************************************************************** /***********************************************************************

4
reactos/dll/win32/wininet/dialogs.c
View file

@ -397,8 +397,6 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog(
case WM_COMMAND: case WM_COMMAND:
if( wParam == IDOK ) if( wParam == IDOK )
{ {
BOOL res = TRUE;
if( params->dwFlags & FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS ) if( params->dwFlags & FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS )
{ {
http_request_t *req = params->req; http_request_t *req = params->req;
@ -437,7 +435,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog(
req->netconn->security_flags |= flags; req->netconn->security_flags |= flags;
} }
EndDialog( hdlg, res ? ERROR_SUCCESS : ERROR_NOT_SUPPORTED ); EndDialog( hdlg, ERROR_SUCCESS );
return TRUE; return TRUE;
} }
if( wParam == IDCANCEL ) if( wParam == IDCANCEL )

4
reactos/dll/win32/wininet/ftp.c
View file

@ -2286,7 +2286,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags
strcat(cmd, szCRLF); strcat(cmd, szCRLF);
len--; len--;
TRACE("Sending (%s) len(%d)\n", cmd, len); TRACE("Sending (%s) len(%d)\n", debugstr_a(cmd), len);
while ((nBytesSent < len) && (nRC != -1)) while ((nBytesSent < len) && (nRC != -1))
{ {
nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0);
@ -2705,7 +2705,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam,
sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], dwParamLen ? " " : "", sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], dwParamLen ? " " : "",
dwParamLen ? lpszParam : "", szCRLF); dwParamLen ? lpszParam : "", szCRLF);
TRACE("Sending (%s) len(%d)\n", buf, len); TRACE("Sending (%s) len(%d)\n", debugstr_a(buf), len);
while((nBytesSent < len) && (nRC != -1)) while((nBytesSent < len) && (nRC != -1))
{ {
nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0); nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0);

2
reactos/media/doc/README.WINE
View file

@ -205,7 +205,7 @@ reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.55
reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.55
reactos/dll/win32/wing32 # Synced to WineStaging-1.7.55 reactos/dll/win32/wing32 # Synced to WineStaging-1.7.55
reactos/dll/win32/winhttp # Synced to WineStaging-1.9.4 reactos/dll/win32/winhttp # Synced to WineStaging-1.9.4
reactos/dll/win32/wininet # Synced to WineStaging-1.7.55 reactos/dll/win32/wininet # Synced to WineStaging-1.9.4
reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm # Forked at Wine-20050628
reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628
reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628