October 2007 - Wine-commits

Rob Shearman : urlmon: Add tests for BindToObject for URL monikers based on the existing tests for BindToStorage .
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: cfb349c4f2d8643f920c1f8c9ab97c631d073c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb349c4f2d8643f920c1f8c9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 26 17:16:31 2007 +0100 urlmon: Add tests for BindToObject for URL monikers based on the existing tests for BindToStorage. --- dlls/urlmon/tests/url.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 196 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfb349c4f2d8643f920c1…

1 0

Detlef Riekenberg : kernel32: Fix description for SetDefaultCommConfig.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: f2e7c43d3c211b40d352d86f72656df92fe5b488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e7c43d3c211b40d352d86f7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 26 20:15:14 2007 +0200 kernel32: Fix description for SetDefaultCommConfig. --- dlls/kernel32/comm.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 076b761..ea71a26 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -1301,19 +1301,21 @@ BOOL WINAPI SetCommConfig( } /*********************************************************************** - * SetDefaultCommConfigA (KERNEL32.@) + * SetDefaultCommConfigW (KERNEL32.@) * - * Initializes the default configuration for the specified communication - * device. (ascii) + * Initializes the default configuration for a communication device. + * + * PARAMS + * lpszDevice [I] Name of the device targeted for configuration + * lpCommConfig [I] PTR to a buffer with the configuration for the device + * dwSize [I] Number of bytes in the buffer * * RETURNS + * Failure: FALSE + * Success: TRUE, and default configuration saved * - * True if the device was found and the defaults set, false otherwise */ -BOOL WINAPI SetDefaultCommConfigW( - LPCWSTR lpszDevice, /* [in] The ascii name of the device targeted for configuration. */ - LPCOMMCONFIG lpCommConfig, /* [in] The default configuration for the device. */ - DWORD dwSize) /* [in] The number of bytes in the configuration structure. */ +BOOL WINAPI SetDefaultCommConfigW(LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig, DWORD dwSize) { FARPROC lpfnSetDefaultCommConfig; HMODULE hConfigModule; @@ -1336,18 +1338,14 @@ BOOL WINAPI SetDefaultCommConfigW( /*********************************************************************** - * SetDefaultCommConfigW (KERNEL32.@) + * SetDefaultCommConfigA (KERNEL32.@) * - * Initializes the default configuration for the specified - * communication device. (unicode) + * Initializes the default configuration for a communication device. * - * RETURNS + * See SetDefaultCommConfigW. * */ -BOOL WINAPI SetDefaultCommConfigA( - LPCSTR lpszDevice, /* [in] The unicode name of the device targeted for configuration. */ - LPCOMMCONFIG lpCommConfig, /* [in] The default configuration for the device. */ - DWORD dwSize) /* [in] The number of bytes in the configuration structure. */ +BOOL WINAPI SetDefaultCommConfigA(LPCSTR lpszDevice, LPCOMMCONFIG lpCommConfig, DWORD dwSize) { BOOL r; LPWSTR lpDeviceW = NULL;

1 0

Mikolaj Zalewski : msvcrt/tests: Loosen the mbctype test to pass under Windows 9x and NT 4.0.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 1f632a29ce221a476655ee605d3340f046efd375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f632a29ce221a476655ee605… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Oct 26 13:50:37 2007 -0700 msvcrt/tests: Loosen the mbctype test to pass under Windows 9x and NT 4.0. --- dlls/msvcrt/tests/string.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 66b018a..876415c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -127,14 +127,6 @@ static void test_codepage(int cp) #else /* RLE-encoded mbctype tables for given codepages */ -static int result_cp_1252_mbctype[] = { 0x0,66, 0x10,26, 0x0,6, 0x20,26, 0x0,8, 0x20,1, - 0x0,6, 0x10,1, 0x0,1, 0x10,1, 0x0,1, 0x10,1, 0x0,11, 0x20,1, 0x0,1, 0x20,1, 0x0,1, - 0x20,1, 0x10,1, 0x0,10, 0x20,1, 0x0,10, 0x20,1, 0x0,4, 0x20,1, 0x0,5, 0x10,23, 0x0,1, - 0x10,7, 0x20,24, 0x0,1, 32,8 }; -static int result_cp_1250_mbctype[] = { 0x0,66, 0x10,26, 0x0,6, 0x20,26, 0x0,15, 0x10,1, - 0x0,1, 0x10,4, 0x0,10, 0x20,1, 0x0,1, 0x20,4, 0x0,3, 0x10,1, 0x0,1, 0x10,1, 0x0,4, - 0x10,1, 0x0,4, 0x10,1, 0x0,3, 0x20,1, 0x0,1, 0x20,1, 0x0,3, 0x20,2, 0x0,1, 0x10,1, - 0x0,1, 0x20,2, 0x10,23, 0x0,1, 0x10,7, 0x20,24, 0x0,1, 0x20,7, 0,1 }; static int result_cp_932_mbctype[] = { 0x0,65, 0x8,1, 0x18,26, 0x8,6, 0x28,26, 0x8,4, 0x0,1, 0x8,1, 0xc,31, 0x8,1, 0xa,5, 0x9,58, 0xc,29, 0,3 }; static int result_cp_936_mbctype[] = { 0x0,65, 0x8,1, 0x18,26, 0x8,6, 0x28,26, 0x8,6, @@ -187,9 +179,24 @@ static void test_mbcp(void) unsigned char buf[16]; int step; - /* some two single-byte code pages*/ - test_codepage(1252); - test_codepage(1250); + /* _mbtype tests */ + + /* An SBCS codepage test. The ctype of characters on e.g. CP1252 or CP1250 differs slightly + * between versions of Windows. Also Windows 9x seems to ignore the codepage and always uses + * CP1252 (or the ACP?) so we test only a few ASCII characters */ + _setmbcp(1252); + expect_eq(_mbctype[10], 0, char, "%x"); + expect_eq(_mbctype[50], 0, char, "%x"); + expect_eq(_mbctype[66], _SBUP, char, "%x"); + expect_eq(_mbctype[100], _SBLOW, char, "%x"); + expect_eq(_mbctype[128], 0, char, "%x"); + _setmbcp(1250); + expect_eq(_mbctype[10], 0, char, "%x"); + expect_eq(_mbctype[50], 0, char, "%x"); + expect_eq(_mbctype[66], _SBUP, char, "%x"); + expect_eq(_mbctype[100], _SBLOW, char, "%x"); + expect_eq(_mbctype[128], 0, char, "%x"); + /* double byte code pages */ test_codepage_todo(932, todo_cp_932); test_codepage(936);

1 0

Hans Leidekker : snmpapi: Fix memory allocation in SnmpUtilVarBindListCpy.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: a5fba22a79e7a1f5429e0c973c7ff1941d392f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fba22a79e7a1f5429e0c973… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Oct 26 23:18:38 2007 +0200 snmpapi: Fix memory allocation in SnmpUtilVarBindListCpy. --- dlls/snmpapi/main.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 34073c3..3686ed9 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -431,12 +431,10 @@ INT WINAPI SnmpUtilVarBindListCpy(SnmpVarBindList *dst, SnmpVarBindList *src) dst->len = 0; return SNMPAPI_NOERROR; } - size = src->len * sizeof(SnmpVarBind *); + size = src->len * sizeof(SnmpVarBind); if (!(dst->list = HeapAlloc(GetProcessHeap(), 0, size))) - { - HeapFree(GetProcessHeap(), 0, dst); return SNMPAPI_ERROR; - } + src_entry = src->list; dst_entry = dst->list; for (i = 0; i < src->len; i++)

1 0

Hans Leidekker : wininet: Always return an error when a transfer is in progress.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: e55531d694290975fad9f270cd6d8284d64e158e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55531d694290975fad9f270c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Oct 26 23:19:05 2007 +0200 wininet: Always return an error when a transfer is in progress. --- dlls/wininet/ftp.c | 61 ++++++++++++++++++++++++++++++++++++++++++---- dlls/wininet/tests/ftp.c | 5 ---- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index bbaef8a..1fce6ea 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -225,6 +225,12 @@ BOOL WINAPI FtpPutFileW(HINTERNET hConnect, LPCWSTR lpszLocalFile, goto lend; } + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; + } + if ((dwFlags & FTP_CONDITION_MASK) > FTP_TRANSFER_TYPE_BINARY) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); @@ -392,6 +398,12 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) goto lend; } + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; + } + TRACE("lpszDirectory(%s)\n", debugstr_w(lpszDirectory)); hIC = lpwfs->lpAppInfo; @@ -532,6 +544,12 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) goto lend; } + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; + } + if (!lpszDirectory) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); @@ -676,6 +694,12 @@ HINTERNET WINAPI FtpFindFirstFileW(HINTERNET hConnect, goto lend; } + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; + } + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { @@ -866,6 +890,12 @@ BOOL WINAPI FtpGetCurrentDirectoryW(HINTERNET hFtpSession, LPWSTR lpszCurrentDir goto lend; } + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; + } + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { @@ -1044,10 +1074,12 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, goto lend; } - if (lpwfs->download_in_progress != NULL) { - INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); - goto lend; + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; } + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { @@ -1255,8 +1287,9 @@ BOOL WINAPI FtpGetFileW(HINTERNET hInternet, LPCWSTR lpszRemoteFile, LPCWSTR lps goto lend; } - if (lpwfs->download_in_progress != NULL) { - INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); goto lend; } @@ -1437,6 +1470,12 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFtpSession, LPCWSTR lpszFileName) goto lend; } + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; + } + if (!lpszFileName) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); @@ -1576,6 +1615,12 @@ BOOL WINAPI FtpRemoveDirectoryW(HINTERNET hFtpSession, LPCWSTR lpszDirectory) goto lend; } + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; + } + if (!lpszDirectory) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); @@ -1720,6 +1765,12 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszD goto lend; } + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; + } + if (!lpszSrc || !lpszDest) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 7aa42db..25367c1 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -496,14 +496,12 @@ static void test_openfile(void) SetLastError(0xdeadbeef); bRet = FtpCreateDirectoryA(hFtp, "new_directory_deadbeef"); ok ( bRet == FALSE, "Expected FtpCreateDirectoryA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); SetLastError(0xdeadbeef); bRet = FtpDeleteFileA(hFtp, "non_existent_file_deadbeef"); ok ( bRet == FALSE, "Expected FtpDeleteFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); @@ -529,7 +527,6 @@ static void test_openfile(void) SetLastError(0xdeadbeef); bRet = FtpPutFileA(hFtp, "now_existing_local", "non_existing_remote", FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); DeleteFileA("now_existing_local"); @@ -537,14 +534,12 @@ static void test_openfile(void) SetLastError(0xdeadbeef); bRet = FtpRemoveDirectoryA(hFtp, "should_be_non_existing_deadbeef_dir"); ok ( bRet == FALSE, "Expected FtpRemoveDirectoryA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); SetLastError(0xdeadbeef); bRet = FtpRenameFileA(hFtp , "should_be_non_existing_deadbeef", "new"); ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); }

1 0

Hans Leidekker : wininet: Always close the data connection before receiving a server response.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: e8eaee4f6a4c76c7ebdda07d61064e923982e717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8eaee4f6a4c76c7ebdda07d6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Oct 26 23:19:38 2007 +0200 wininet: Always close the data connection before receiving a server response. --- dlls/wininet/ftp.c | 19 ++++++-------- dlls/wininet/tests/ftp.c | 59 +++++++++++++++++++-------------------------- 2 files changed, 33 insertions(+), 45 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 1fce6ea..88d97ff 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1365,15 +1365,16 @@ BOOL WINAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, /* Receive data */ FTP_RetrieveFileData(lpwfs, nDataSocket, hFile); + closesocket(nDataSocket); + nResCode = FTP_ReceiveResponse(lpwfs, dwContext); if (nResCode) { if (nResCode == 226) bSuccess = TRUE; - else + else FTP_SetResponseError(nResCode); } - closesocket(nDataSocket); } } @@ -3008,7 +3009,7 @@ static void FTP_CloseFindNextHandle(LPWININETHANDLEHEADER hdr) * FTP_CloseFileTransferHandle (internal) * * Closes the file transfer handle. This also 'cleans' the data queue of - * the 'transfer conplete' message (this is a bit of a hack though :-/ ) + * the 'transfer complete' message (this is a bit of a hack though :-/ ) * */ static void FTP_CloseFileTransferHandle(LPWININETHANDLEHEADER hdr) @@ -3022,18 +3023,14 @@ static void FTP_CloseFileTransferHandle(LPWININETHANDLEHEADER hdr) WININET_Release(&lpwh->lpFtpSession->hdr); if (!lpwh->session_deleted) - lpwfs->download_in_progress = NULL; - - /* This just serves to flush the control socket of any spurrious lines written - to it (like '226 Transfer complete.'). + lpwfs->download_in_progress = NULL; - Wonder what to do if the server sends us an error code though... - */ - nResCode = FTP_ReceiveResponse(lpwfs, lpwfs->hdr.dwContext); - if (lpwh->nDataSocket != -1) closesocket(lpwh->nDataSocket); + nResCode = FTP_ReceiveResponse(lpwfs, lpwfs->hdr.dwContext); + if (nResCode > 0 && nResCode != 226) WARN("server reports failed transfer\n"); + HeapFree(GetProcessHeap(), 0, lpwh); } diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 25367c1..9eab05d 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -301,16 +301,12 @@ static void test_getfile(void) /* 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 ( 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"); - } - DeleteFileA("should_be_non_existing_deadbeef"); + bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_existing_non_deadbeef", FALSE, 0, FTP_TRANSFER_TYPE_UNKNOWN, 0); + ok ( bRet == TRUE, "Expected FtpGetFileA to succeed\n"); + ok (GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok (GetFileAttributesA("should_be_existing_non_deadbeef") != INVALID_FILE_ATTRIBUTES, + "Local file should have been created\n"); + DeleteFileA("should_be_existing_non_deadbeef"); /* Illegal condition flags */ SetLastError(0xdeadbeef); @@ -326,12 +322,14 @@ 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 @@ -346,32 +344,30 @@ 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 fail */ + /* This one should succeed */ SetLastError(0xdeadbeef); - bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); - ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, - "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); + bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_existing_non_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); + ok ( bRet == TRUE, "Expected FtpGetFileA to fail\n"); + ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - if (GetFileAttributesA("should_be_non_existing_deadbeef") != INVALID_FILE_ATTRIBUTES) + if (GetFileAttributesA("should_be_existing_non_deadbeef") != INVALID_FILE_ATTRIBUTES) { /* Should succeed as fFailIfExists is set to FALSE (meaning don't fail if local file exists) */ 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()); - } /* Should fail as fFailIfExists is set to TRUE */ SetLastError(0xdeadbeef); @@ -387,7 +383,7 @@ static void test_getfile(void) ok ( GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %d\n", GetLastError()); - DeleteFileA("should_be_non_existing_deadbeef"); + DeleteFileA("should_be_existing_non_deadbeef"); } InternetCloseHandle(hFtp); @@ -478,13 +474,8 @@ static void test_openfile(void) SetLastError(0xdeadbeef); hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); - todo_wine - { - ok ( hOpenFile == NULL, "Expected FtpOpenFileA to fail\n"); - /* For some strange/unknown reason, win98 returns ERROR_FILE_NOT_FOUND */ - 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()); - } + ok ( hOpenFile != NULL, "Expected FtpOpenFileA to succeed\n"); + ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", GetLastError()); if (hOpenFile) { @@ -840,14 +831,14 @@ static void test_multiple(void) } /* A correct call */ - 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"); + bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_existing_non_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); + ok(bRet, "Expected FtpGetFileA to succeed\n"); + DeleteFileA("should_be_existing_non_deadbeef"); SetLastError(0xdeadbeef); hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); - 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()); + ok(hOpenFile != NULL, "Expected FtpOpenFileA to succeed\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", GetLastError()); InternetCloseHandle(hOpenFile); InternetCloseHandle(hFtp);

1 0

Detlef Riekenberg : include/winbase: Fix a typo.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 3fb513deb4390a1baeb39b3295df8c18db5c9c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb513deb4390a1baeb39b329… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 26 17:18:45 2007 +0200 include/winbase: Fix a typo. --- include/winbase.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 7ca6e84..c2fab88 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1085,7 +1085,7 @@ typedef struct tagCOMMPROP { #define PST_LAT ((DWORD)0x101) #define PST_MODEM ((DWORD)0x06) #define PST_NETWORK_BRIDGE ((DWORD)0x100) -#define PST_PARALLEL_PORT ((DWORD)0x02) +#define PST_PARALLELPORT ((DWORD)0x02) #define PST_RS232 ((DWORD)0x01) #define PST_RS442 ((DWORD)0x03) #define PST_RS423 ((DWORD)0x04)

1 0

Chris Morgan : Pass database link handle to database error retrieval functions so we retrieve the error from the correct database connection . Add explicit link handle to query_error() and remove the option to not specify an error.
by Chris Morgan 28 Oct '07

28 Oct '07

Module: appdb Branch: master Commit: c3f47364ae098a81afcec346a53d99136a4a54fa URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c3f47364ae098a81afcec346… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Sun Oct 28 22:05:26 2007 -0400 Pass database link handle to database error retrieval functions so we retrieve the error from the correct database connection. Add explicit link handle to query_error() and remove the option to not specify an error. --- include/query.php | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/query.php b/include/query.php index bc1ab63..a5e7c71 100644 --- a/include/query.php +++ b/include/query.php @@ -28,10 +28,10 @@ function query_appdb($sQuery, $sComment="") { /* if this error isn't a deadlock OR if it is a deadlock and we've */ /* run out of retries, report the error */ - $iErrno = mysql_errno(); + $iErrno = mysql_errno($hAppdbLink); if(($iErrno != MYSQL_DEADLOCK_ERRNO) || (($iErrno == MYSQL_DEADLOCK_ERRNO) && ($iRetries <= 0))) { - query_error($sQuery, $sComment); + query_error($sQuery, $sComment, $hAppdbLink); return $hResult; } @@ -133,12 +133,12 @@ function query_bugzilladb($sQuery,$sComment="") } $hResult = mysql_query($sQuery, $hBugzillaLink); - if(!$hResult) query_error($sQuery, $sComment); + if(!$hResult) query_error($sQuery, $sComment, $hBugzillaLink); return $hResult; } -function query_error($sQuery, $sComment="") +function query_error($sQuery, $sComment, $hLink) { static $bInQueryError = false; @@ -151,8 +151,8 @@ function query_error($sQuery, $sComment="") $bInQueryError = true; error_log::log_error(ERROR_SQL, "Query: '".$sQuery."' ". - "mysql_errno(): '".mysql_errno()."' ". - "mysql_error(): '".mysql_error()."' ". + "mysql_errno(): '".mysql_errno($hLink)."' ". + "mysql_error(): '".mysql_error($hLink)."' ". "comment: '".$sComment."'"); $sStatusMessage = "An internal error has occurred and has been logged and reported to appdb admins";

1 0

Alexandre Julliard : Wine release 0.9.48
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: website Branch: master Commit: f72fc42bb71e5ed37121812338208a65cade6be5 URL: http://source.winehq.org/git/website.git/?a=commit;h=f72fc42bb71e5ed3712181… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 26 19:32:45 2007 +0200 Wine release 0.9.48 --- include/winehq.conf | 2 +- news/2007102601.xml | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/include/winehq.conf b/include/winehq.conf index 7461043..95651c6 100644 --- a/include/winehq.conf +++ b/include/winehq.conf @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.47 +snapshot_date: 0.9.48 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 diff --git a/news/2007102601.xml b/news/2007102601.xml new file mode 100644 index 0000000..271577b --- /dev/null +++ b/news/2007102601.xml @@ -0,0 +1,24 @@ +<news> +<date>October 26, 2007</date> +<title>Wine 0.9.48 Released</title> +<body> +Wine 0.9.48 was released today, with the following main changes: + +<ul> +<li>Still more fixes for regression test failures.</li> +<li>Much more complete cryptnet implementation.</li> +<li>WIDL is now able to generate the oleaut32 proxy code.</li> +<li>Lots of bug fixes.</li> +</ul> + + +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.48.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.48">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. + +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.48.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: 444b3c7a58951d3fa54f5817b477b4c8f5c99552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444b3c7a58951d3fa54f5817b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 26 19:21:15 2007 +0200 Release 0.9.48. --- ANNOUNCE | 989 ++++++++++++++++++------------ ChangeLog | 2025 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2625 insertions(+), 409 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=444b3c7a58951d3fa54f5…

1 0