October 2007 - Wine-commits

Hans Leidekker : wininet: Use passive mode for the ftp tests.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 533aa4dcd5324cb865e5722e2fef6506c049373d URL: http://source.winehq.org/git/wine.git/?a=commit;h=533aa4dcd5324cb865e5722e2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Oct 20 21:15:43 2007 +0200 wininet: Use passive mode for the ftp tests. --- dlls/wininet/tests/ftp.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=533aa4dcd5324cb865e57…

1 0

Juan Lang : crypt32: Fail if MultiByteToWideChar converts 0 characters.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 7cf611ef3bae6340e6c7fce10e45ef9843f117fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf611ef3bae6340e6c7fce10… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Oct 20 14:22:04 2007 -0700 crypt32: Fail if MultiByteToWideChar converts 0 characters. --- dlls/crypt32/str.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 96430dc..9677897 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -455,7 +455,6 @@ BOOL WINAPI CertStrToNameA(DWORD dwCertEncodingType, LPCSTR pszX500, DWORD dwStrType, void *pvReserved, BYTE *pbEncoded, DWORD *pcbEncoded, LPCSTR *ppszError) { - LPWSTR x500, errorStr; BOOL ret; int len; @@ -464,24 +463,39 @@ BOOL WINAPI CertStrToNameA(DWORD dwCertEncodingType, LPCSTR pszX500, ppszError); len = MultiByteToWideChar(CP_ACP, 0, pszX500, -1, NULL, 0); - x500 = CryptMemAlloc(len * sizeof(WCHAR)); - if (x500) + if (len) { - MultiByteToWideChar(CP_ACP, 0, pszX500, -1, x500, len); - ret = CertStrToNameW(dwCertEncodingType, x500, dwStrType, pvReserved, - pbEncoded, pcbEncoded, ppszError ? (LPCWSTR *)&errorStr : NULL); - if (ppszError) + LPWSTR x500, errorStr; + + if ((x500 = CryptMemAlloc(len * sizeof(WCHAR)))) { - DWORD i; + MultiByteToWideChar(CP_ACP, 0, pszX500, -1, x500, len); + ret = CertStrToNameW(dwCertEncodingType, x500, dwStrType, + pvReserved, pbEncoded, pcbEncoded, + ppszError ? (LPCWSTR *)&errorStr : NULL); + if (ppszError) + { + DWORD i; - *ppszError = pszX500; - for (i = 0; i < errorStr - x500; i++) - *ppszError = CharNextA(*ppszError); + *ppszError = pszX500; + for (i = 0; i < errorStr - x500; i++) + *ppszError = CharNextA(*ppszError); + } + CryptMemFree(x500); + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; } - CryptMemFree(x500); } else + { + SetLastError(CRYPT_E_INVALID_X500_STRING); + if (ppszError) + *ppszError = pszX500; ret = FALSE; + } return ret; }

1 0

Juan Lang : crypt32: Don' t assume string pointer has been set if length is 0.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: d34b3bf63c4c4b74c2ee9683e73a5b37e3b0b2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d34b3bf63c4c4b74c2ee9683e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Oct 20 14:24:10 2007 -0700 crypt32: Don't assume string pointer has been set if length is 0. --- dlls/crypt32/encode.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 5c2b9be..c3d7209 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -913,8 +913,12 @@ static BOOL CRYPT_AsnEncodeBMPString(const CERT_NAME_VALUE *value, LPCWSTR str = (LPCWSTR)value->Value.pbData; DWORD bytesNeeded, lenBytes, strLen; - strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - lstrlenW(str); + if (value->Value.cbData) + strLen = value->Value.cbData / sizeof(WCHAR); + else if (value->Value.pbData) + strLen = lstrlenW(str); + else + strLen = 0; CRYPT_EncodeLen(strLen * 2, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + strLen * 2; if (!pbEncoded)

1 0

Hans Leidekker : wininet: Properly clean up ftp sessions.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: dd5347ee6af6335e311624aa565837c873097d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5347ee6af6335e311624aa5… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Oct 20 21:15:18 2007 +0200 wininet: Properly clean up ftp sessions. --- dlls/wininet/ftp.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 26b319e..637d193 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2006,22 +2006,20 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, } lerror: - if (!bSuccess && nsocket != -1) - closesocket(nsocket); + if (lpwfs) WININET_Release( &lpwfs->hdr ); - if (!bSuccess && lpwfs) + if (!bSuccess && handle) { - HeapFree(GetProcessHeap(), 0, lpwfs); + WININET_Release( &hIC->hdr ); WININET_FreeHandle( handle ); handle = NULL; - lpwfs = NULL; } if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { INTERNET_ASYNC_RESULT iar; - iar.dwResult = (DWORD)lpwfs; + iar.dwResult = bSuccess ? (DWORD_PTR)lpwfs : 0; iar.dwError = bSuccess ? ERROR_SUCCESS : INTERNET_GetLastError(); SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, sizeof(INTERNET_ASYNC_RESULT));

1 0

Hans Leidekker : wininet: Fix some failing ftp tests on Windows and Wine.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: cc54dfe1e285d85322ebc32d3ae55d5e8bfc67ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc54dfe1e285d85322ebc32d3… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Oct 20 21:15:31 2007 +0200 wininet: Fix some failing ftp tests on Windows and Wine. --- dlls/wininet/ftp.c | 4 +- dlls/wininet/tests/ftp.c | 68 +++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 41 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 637d193..bbaef8a 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -3391,7 +3391,7 @@ static DWORD FTP_SetResponseError(DWORD dwResponse) switch(dwResponse) { case 421: /* Service not available - Server may be shutting down. */ - dwCode = ERROR_INTERNET_TIMEOUT; + dwCode = ERROR_INTERNET_EXTENDED_ERROR; break; case 425: /* Cannot open data connection. */ @@ -3427,7 +3427,7 @@ static DWORD FTP_SetResponseError(DWORD dwResponse) case 553: /* Action not taken. File name not allowed. */ default: - dwCode = ERROR_INTERNET_INTERNAL_ERROR; + dwCode = ERROR_INTERNET_EXTENDED_ERROR; break; } diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 6d27cb1..668c6ac 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -299,26 +299,25 @@ static void test_getfile(void) ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - /* Zero attributes, but call succeeds (as would CreateFile with zero attributes) */ + /* Zero attributes */ SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, 0, FTP_TRANSFER_TYPE_UNKNOWN, 0); + ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); todo_wine { - ok ( bRet == TRUE, "Expected FtpGetFileA to succeed\n"); - ok ( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, + "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); + ok (GetFileAttributesA("should_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, + "Local file should not have been created\n"); } - /* Wine passes this test but for the wrong reason */ - ok (GetFileAttributesA("should_be_non_existing_deadbeef") != INVALID_FILE_ATTRIBUTES, - "Local file should have been created\n"); DeleteFileA("should_be_non_existing_deadbeef"); /* Illegal condition flags */ SetLastError(0xdeadbeef); - bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, 5, 0); + bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, 0xffffffff, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - ok ( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR || GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INTERNET_EXTENDED_ERROR or ERROR_INVALID_PARAMETER (win98), got %d\n", GetLastError()); ok (GetFileAttributesA("should_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, "Local file should not have been created\n"); DeleteFileA("should_be_non_existing_deadbeef"); @@ -327,14 +326,12 @@ static void test_getfile(void) SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "should_be_non_existing_deadbeef", "should_also_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - todo_wine - { ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); /* Currently Wine always creates the local file (even on failure) which is not correct, hence the test */ + todo_wine ok (GetFileAttributesA("should_also_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, "Local file should not have been created\n"); - } DeleteFileA("should_also_be_non_existing_deadbeef"); /* Same call as the previous but now the local file does exists. Windows just removes the file if the call fails @@ -349,25 +346,20 @@ static void test_getfile(void) SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "should_be_non_existing_deadbeef", "should_also_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - todo_wine - { ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); /* Currently Wine always creates the local file (even on failure) which is not correct, hence the test */ + todo_wine ok (GetFileAttributesA("should_also_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, "Local file should not have been created\n"); - } DeleteFileA("should_also_be_non_existing_deadbeef"); - /* This one should succeed and give us a copy of the 'welcome.msg' file */ + /* This one should fail */ SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); - todo_wine - { - ok ( bRet == TRUE, "Expected FtpGetFileA to succeed\n"); - ok ( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - } + ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); + ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, + "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); if (GetFileAttributesA("should_be_non_existing_deadbeef") != INVALID_FILE_ATTRIBUTES) { @@ -478,19 +470,21 @@ static void test_openfile(void) /* Illegal condition flags */ SetLastError(0xdeadbeef); - hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, 5, 0); + hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, 0xffffffff, 0); ok ( !hOpenFile, "Expected FtpOpenFileA to fail\n"); - ok ( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR || GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INTERNET_EXTENDED_ERROR or ERROR_INVALID_PARAMETER (win98), got %d\n", GetLastError()); InternetCloseHandle(hOpenFile); /* Just in case */ - /* All OK */ SetLastError(0xdeadbeef); hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); - ok ( hOpenFile != NULL, "Expected FtpOpenFileA to succeed\n"); + todo_wine + { + ok ( hOpenFile == NULL, "Expected FtpOpenFileA to fail\n"); /* For some strange/unknown reason, win98 returns ERROR_FILE_NOT_FOUND */ - ok ( GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_SUCCESS or ERROR_FILE_NOT_FOUND (win98), got %d\n", GetLastError()); + ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR || GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_INTERNET_EXTENDED_ERROR or ERROR_FILE_NOT_FOUND (win98), got %d\n", GetLastError()); + } if (hOpenFile) { @@ -642,8 +636,8 @@ static void test_putfile(void) SetLastError(0xdeadbeef); bRet = FtpPutFileA(hFtp, "non_existing_local", "non_existing_remote", 5, 0); ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); - ok ( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok ( GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_FILE_NOT_FOUND or ERROR_INVALID_PARAMETER (win98), got %d\n", GetLastError()); /* Parameters are OK but local file doesn't exist */ SetLastError(0xdeadbeef); @@ -854,15 +848,11 @@ static void test_multiple(void) bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); DeleteFileA("should_be_non_existing_deadbeef"); - /* This call by itself succeeds in Wine for the test_openfile test */ SetLastError(0xdeadbeef); hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); - todo_wine - { - ok ( hOpenFile != NULL, "Expected FtpOpenFileA to succeed\n"); - ok ( GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_SUCCESS or ERROR_FILE_NOT_FOUND (win98), got %d\n", GetLastError()); - } + ok ( hOpenFile == NULL, "Expected FtpOpenFileA to fail\n"); + ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR || GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_INTERNET_EXTENDED_ERROR or ERROR_FILE_NOT_FOUND (win98), got %d\n", GetLastError()); InternetCloseHandle(hOpenFile); InternetCloseHandle(hFtp);

1 0

Vitaliy Margolen : wine.man: Document OSS environment variables.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: b7addaab6a81a322f52ae80c75e0928a197f53d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7addaab6a81a322f52ae80c7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Oct 20 11:49:02 2007 -0600 wine.man: Document OSS environment variables. --- loader/wine.man.in | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/loader/wine.man.in b/loader/wine.man.in index efc344b..cc82b08 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -206,6 +206,20 @@ always as native. .TP .I DISPLAY Specifies the X11 display to use. +.TP +OSS sound driver configuration variables +.TP +.I AUDIODEV +Set the device for audio input / output. Default +.B /dev/dsp. +.TP +.I MIXERDEV +Set the device for mixer controls. Default +.B /dev/mixer. +.TP +.I MIDIDEV +Set the MIDI (sequencer) device. Default +.B /dev/sequencer. .SH FILES .TP .I @bindir@/wine

1 0

Alex Villacís Lasso : riched20: 2. 0 and higher inserts CRCRLF as space (with tests).
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 469669e629dbb37836df1da503946b1b13f06a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=469669e629dbb37836df1da50… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Oct 20 20:23:27 2007 -0500 riched20: 2.0 and higher inserts CRCRLF as space (with tests). --- dlls/riched20/caret.c | 17 ++- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 316 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 292 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=469669e629dbb37836df1…

1 0

Andrew Talbot : taskmgr: Fix a memory leak.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: e76fe016e432bc18f4850e5ee72e11f2d1cfdefa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e76fe016e432bc18f4850e5ee… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 20 16:24:56 2007 +0100 taskmgr: Fix a memory leak. --- programs/taskmgr/perfdata.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 85001b3..611990f 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -124,8 +124,10 @@ void PerfDataRefresh(void) /* Get processor time information */ SysProcessorTimeInfo = (PSYSTEM_PROCESSORTIME_INFO)malloc(sizeof(SYSTEM_PROCESSORTIME_INFO) * SystemBasicInfo.bKeNumberProcessors); status = NtQuerySystemInformation(SystemProcessorTimeInformation, SysProcessorTimeInfo, sizeof(SYSTEM_PROCESSORTIME_INFO) * SystemBasicInfo.bKeNumberProcessors, &ulSize); - if (status != NO_ERROR) + if (status != NO_ERROR) { + free(SysProcessorTimeInfo); return; + } /* Get handle information * We don't know how much data there is so just keep

1 0

Andrew Talbot : wineboot: Fix some memory leaks.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: add663fdd2426cd2c18a89fd9fb0bc3f9bdedb19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=add663fdd2426cd2c18a89fd9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 20 17:03:18 2007 +0100 wineboot: Fix some memory leaks. --- programs/wineboot/wineboot.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 7172c89..97c8bf5 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -530,6 +530,9 @@ static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, res=ERROR_SUCCESS; end: + HeapFree( GetProcessHeap(), 0, szValue ); + HeapFree( GetProcessHeap(), 0, szCmdLine ); + if( hkRun!=NULL ) RegCloseKey( hkRun ); if( hkWin!=NULL )

1 0

Hans Leidekker : wininet: Separate ftp session destruction from closing connections.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: c33a51eaf2f81a4420017f4bbd6233e50dac796c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c33a51eaf2f81a4420017f4bb… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Oct 20 21:14:59 2007 +0200 wininet: Separate ftp session destruction from closing connections. --- dlls/wininet/ftp.c | 50 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 805ab44..26b319e 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -123,6 +123,7 @@ static const WCHAR szNoAccount[] = {'n','o','a','c','c','o','u','n','t','\0'}; static void FTP_CloseFileTransferHandle(LPWININETHANDLEHEADER hdr); static void FTP_CloseSessionHandle(LPWININETHANDLEHEADER hdr); +static void FTP_CloseConnection(LPWININETHANDLEHEADER hdr); static void FTP_CloseFindNextHandle(LPWININETHANDLEHEADER hdr); static BOOL FTP_SendCommand(INT nSocket, FTP_COMMAND ftpCmd, LPCWSTR lpszParam, INTERNET_STATUS_CALLBACK lpfnStatusCB, LPWININETHANDLEHEADER hdr, DWORD_PTR dwContext); @@ -1895,10 +1896,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, lpwfs->hdr.dwContext = dwContext; lpwfs->hdr.dwInternalFlags = dwInternalFlags; lpwfs->hdr.dwRefCount = 1; - /* FIXME: Native sends INTERNET_STATUS_CLOSING_CONNECTION and - * INTERNET_STATUS_CONNECTION_CLOSED, need an equivalent FTP_CloseConnection - * function */ - lpwfs->hdr.close_connection = NULL; + lpwfs->hdr.close_connection = FTP_CloseConnection; lpwfs->hdr.destroy = FTP_CloseSessionHandle; lpwfs->hdr.lpfnStatusCB = hIC->hdr.lpfnStatusCB; lpwfs->download_in_progress = NULL; @@ -2823,16 +2821,41 @@ recv_end: return (nRC != -1); } +/*********************************************************************** + * FTP_CloseConnection (internal) + * + * Close connections + */ +static void FTP_CloseConnection(LPWININETHANDLEHEADER hdr) +{ + LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) hdr; + + TRACE("\n"); + + SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, + INTERNET_STATUS_CLOSING_CONNECTION, 0, 0); + + if (lpwfs->download_in_progress != NULL) + lpwfs->download_in_progress->session_deleted = TRUE; + + if (lpwfs->sndSocket != -1) + closesocket(lpwfs->sndSocket); + + if (lpwfs->lstnSocket != -1) + closesocket(lpwfs->lstnSocket); + + if (lpwfs->pasvSocket != -1) + closesocket(lpwfs->pasvSocket); + + SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, + INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); +} + /*********************************************************************** * FTP_CloseSessionHandle (internal) * * Deallocate session handle - * - * RETURNS - * TRUE on success - * FALSE on failure - * */ static void FTP_CloseSessionHandle(LPWININETHANDLEHEADER hdr) { @@ -2842,15 +2865,6 @@ static void FTP_CloseSessionHandle(LPWININETHANDLEHEADER hdr) WININET_Release(&lpwfs->lpAppInfo->hdr); - if (lpwfs->download_in_progress != NULL) - lpwfs->download_in_progress->session_deleted = TRUE; - - if (lpwfs->sndSocket != -1) - closesocket(lpwfs->sndSocket); - - if (lpwfs->lstnSocket != -1) - closesocket(lpwfs->lstnSocket); - HeapFree(GetProcessHeap(), 0, lpwfs->lpszPassword); HeapFree(GetProcessHeap(), 0, lpwfs->lpszUserName); HeapFree(GetProcessHeap(), 0, lpwfs);

1 0