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

svn path=/trunk/; revision=70948

diff --git a/reactos/dll/win32/wininet/cookie.c b/reactos/dll/win32/wininet/cookie.c
index 447be60..96f212b 100644 (file)
--- a/reactos/dll/win32/wininet/cookie.c
+++ b/reactos/dll/win32/wininet/cookie.c
@@ -703,7 +703,7 @@ DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret)
     }
 
     LeaveCriticalSection(&cookie_cs);
-    return ERROR_SUCCESS;
+    return res;
 }
 
 /***********************************************************************

diff --git a/reactos/dll/win32/wininet/dialogs.c b/reactos/dll/win32/wininet/dialogs.c
index f0a9466..6f2ff82 100644 (file)
--- a/reactos/dll/win32/wininet/dialogs.c
+++ b/reactos/dll/win32/wininet/dialogs.c
@@ -397,8 +397,6 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog(
     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 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog(
                     req->netconn->security_flags |= flags;
             }
 
-            EndDialog( hdlg, res ? ERROR_SUCCESS : ERROR_NOT_SUPPORTED );
+            EndDialog( hdlg, ERROR_SUCCESS );
             return TRUE;
         }
         if( wParam == IDCANCEL )

diff --git a/reactos/dll/win32/wininet/ftp.c b/reactos/dll/win32/wininet/ftp.c
index 55e7473..d62f87e 100644 (file)
--- a/reactos/dll/win32/wininet/ftp.c
+++ b/reactos/dll/win32/wininet/ftp.c
@@ -2286,7 +2286,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags
     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 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam,
        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);

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 85d4fc0..2939482 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -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/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