Author: akhaldi
Date: Sat Mar 5 10:58:26 2016
New Revision: 70948
URL: http://svn.reactos.org/svn/reactos?rev=70948&view=rev
Log:
[WININET] Sync with Wine Staging 1.9.4. CORE-10912
Modified:
trunk/reactos/dll/win32/wininet/cookie.c
trunk/reactos/dll/win32/wininet/dialogs.c
trunk/reactos/dll/win32/wininet/ftp.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/wininet/cookie.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c?rev=70948&r1=70947&r2=70948&view=diff
==============================================================================
--- trunk/reactos/dll/win32/wininet/cookie.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/cookie.c [iso-8859-1] Sat Mar 5
10:58:26 2016
@@ -703,7 +703,7 @@
}
LeaveCriticalSection(&cookie_cs);
- return ERROR_SUCCESS;
+ return res;
}
/***********************************************************************
Modified: trunk/reactos/dll/win32/wininet/dialogs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/dialogs.c?rev=70948&r1=70947&r2=70948&view=diff
==============================================================================
--- trunk/reactos/dll/win32/wininet/dialogs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/dialogs.c [iso-8859-1] Sat Mar 5
10:58:26 2016
@@ -397,8 +397,6 @@
case WM_COMMAND:
if( wParam == IDOK )
{
- BOOL res = TRUE;
-
if( params->dwFlags & FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS )
{
http_request_t *req = params->req;
@@ -437,7 +435,7 @@
req->netconn->security_flags |= flags;
}
- EndDialog( hdlg, res ? ERROR_SUCCESS : ERROR_NOT_SUPPORTED );
+ EndDialog( hdlg, ERROR_SUCCESS );
return TRUE;
}
if( wParam == IDCANCEL )
Modified: trunk/reactos/dll/win32/wininet/ftp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?rev=70948&r1=70947&r2=70948&view=diff
==============================================================================
--- trunk/reactos/dll/win32/wininet/ftp.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/ftp.c [iso-8859-1] Sat Mar 5
10:58:26 2016
@@ -2286,7 +2286,7 @@
strcat(cmd, szCRLF);
len--;
- TRACE("Sending (%s) len(%d)\n", cmd, len);
+ TRACE("Sending (%s) len(%d)\n", debugstr_a(cmd), len);
while ((nBytesSent < len) && (nRC != -1))
{
nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent,
0);
@@ -2705,7 +2705,7 @@
sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], dwParamLen ? " " : "",
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))
{
nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0);
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=70948&r1=70947&r2=70948&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Mar 5 10:58:26 2016
@@ -205,7 +205,7 @@
reactos/dll/win32/winemp3.acm # 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/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/midimap # Forked at Wine-20050628
reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628
