From 0dbcea8773792774593189925d63e85ae681933d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 5 Mar 2016 10:58:26 +0000 Subject: [PATCH] [WININET] Sync with Wine Staging 1.9.4. CORE-10912 svn path=/trunk/; revision=70948 --- reactos/dll/win32/wininet/cookie.c | 2 +- reactos/dll/win32/wininet/dialogs.c | 4 +--- reactos/dll/win32/wininet/ftp.c | 4 ++-- reactos/media/doc/README.WINE | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/reactos/dll/win32/wininet/cookie.c b/reactos/dll/win32/wininet/cookie.c index 447be60a2ea..96f212b3de0 100644 --- 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 f0a946669c2..6f2ff8261da 100644 --- 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 55e74731376..d62f87ed0b7 100644 --- 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 85d4fc04960..29394822c68 100644 --- 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 -- 2.17.1