wine-commits February 2007

wine-commits@winehq.org

4 participants
839 discussions

Kanit Therdsteerasukdi : comctl32: datetime: Initial tests for date and time picker.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: 9928c494f9455cc962125725dd09ed6ead4271d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9928c494f9455cc962125725d… Author: Kanit Therdsteerasukdi <therdste(a)ucla.edu> Date: Thu Feb 15 22:31:48 2007 -0800 comctl32: datetime: Initial tests for date and time picker. --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/datetime.c | 389 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 390 insertions(+), 0 deletions(-… [View More]

1 0

Paul Vriens : wininet/ftp.c: Fix some returned error codes.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: 5b04d3d67d6d839a7b20e07fa7bc25bc28e19e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b04d3d67d6d839a7b20e07fa… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Feb 16 17:48:39 2007 +0100 wininet/ftp.c: Fix some returned error codes. --- dlls/wininet/ftp.c | 46 ++++++++++++++++++++++++++++------------------ dlls/wininet/tests/ftp.c | 33 ++++++++++++++++++++++++++------- 2 files changed, 54 insertions(+), 25 … [View More]deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index e8a31b4..6bc21ff 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -64,6 +64,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define szCRLF "\r\n" #define MAX_BACKLOG 5 +/* Testing shows that Windows only accepts dwFlags where the last + * 3 (yes 3) bits define FTP_TRANSFER_TYPE_UNKNOWN, FTP_TRANSFER_TYPE_ASCII or FTP_TRANSFER_TYPE_BINARY. + */ +#define FTP_CONDITION_MASK 0x0007 + typedef enum { /* FTP commands with arguments. */ FTP_CMD_ACCT, @@ -201,13 +206,31 @@ BOOL WINAPI FtpPutFileW(HINTERNET hConnect, LPCWSTR lpszLocalFile, LPWININETAPPINFOW hIC = NULL; BOOL r = FALSE; + if (!lpszLocalFile || !lpszNewRemoteFile) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hConnect ); - if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype) + if (!lpwfs) + { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (WH_HFTPSESSION != lpwfs->hdr.htype) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); goto lend; } + if ((dwFlags & FTP_CONDITION_MASK) > FTP_TRANSFER_TYPE_BINARY) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { @@ -230,8 +253,7 @@ BOOL WINAPI FtpPutFileW(HINTERNET hConnect, LPCWSTR lpszLocalFile, } lend: - if( lpwfs ) - WININET_Release( &lpwfs->hdr ); + WININET_Release( &lpwfs->hdr ); return r; } @@ -256,24 +278,19 @@ BOOL WINAPI FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile, TRACE(" lpszLocalFile(%s) lpszNewRemoteFile(%s)\n", debugstr_w(lpszLocalFile), debugstr_w(lpszNewRemoteFile)); - if (!lpszLocalFile || !lpszNewRemoteFile) - { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - /* Clear any error information */ INTERNET_SetLastError(0); - hIC = lpwfs->lpAppInfo; /* Open file to be uploaded */ if (INVALID_HANDLE_VALUE == (hFile = CreateFileW(lpszLocalFile, GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0))) { INTERNET_SetLastError(ERROR_FILE_NOT_FOUND); - goto lend; + return FALSE; } + hIC = lpwfs->lpAppInfo; + SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, INTERNET_STATUS_SENDING_REQUEST, NULL, 0); if (FTP_SendStore(lpwfs, lpszNewRemoteFile, dwFlags)) @@ -296,7 +313,6 @@ BOOL WINAPI FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile, } } -lend: if (lpwfs->lstnSocket != -1) closesocket(lpwfs->lstnSocket); @@ -1193,8 +1209,6 @@ static void AsyncFtpGetFileProc(WORKREQUEST *workRequest) HeapFree(GetProcessHeap(), 0, req->lpszNewFile); } -#define FTP_CONDITION_MASK 0x0007 - BOOL WINAPI FtpGetFileW(HINTERNET hInternet, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile, BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, DWORD dwContext) @@ -1222,10 +1236,6 @@ BOOL WINAPI FtpGetFileW(HINTERNET hInternet, LPCWSTR lpszRemoteFile, LPCWSTR lps goto lend; } - /* Testing shows that Windows only accepts dwInternetFlags where the last - * 3 (yes 3) bits define FTP_TRANSFER_TYPE_UNKNOWN, FTP_TRANSFER_TYPE_ASCII or FTP_TRANSFER_TYPE_BINARY. - */ - if ((dwInternetFlags & FTP_CONDITION_MASK) > FTP_TRANSFER_TYPE_BINARY) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 43be942..840d91b 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -245,7 +245,7 @@ static void test_getfile(void) * Condition flags */ - /* Test to show existence of local file is tested first (together with 'remote file') */ + /* Test to show validity of 'local file' parameter is tested first (together with 'remote file') */ SetLastError(0xdeadbeef); bRet = FtpGetFileA(NULL, NULL, "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); @@ -519,11 +519,25 @@ static void test_putfile(void) HINTERNET hInternet, hFtp, hConnect; HANDLE hFile; - /* Invalid internet handle, the rest are valid parameters */ + /* The order of checking is: + * + * All parameters except 'session handle' and 'condition flags' + * Session handle + * Session handle type + * Condition flags + */ + + /* Test to show validity of 'local file' parameter is tested first (together with 'remote file') */ SetLastError(0xdeadbeef); - bRet = FtpPutFileA(NULL, "non_existing_local", "non_existing_remote", FTP_TRANSFER_TYPE_UNKNOWN, 0); + bRet = FtpPutFileA(NULL, NULL, "non_existing_remote", FTP_TRANSFER_TYPE_UNKNOWN, 0); + ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); + ok ( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Test to show session handle is checked before 'condition flags' */ + SetLastError(0xdeadbeef); + bRet = FtpPutFileA(NULL, "non_existing_local", "non_existing_remote", 5, 0); ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); @@ -556,7 +570,6 @@ 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"); - todo_wine ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -564,7 +577,6 @@ static void test_putfile(void) SetLastError(0xdeadbeef); bRet = FtpPutFileA(hFtp, "non_existing_local", "non_existing_remote", FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); @@ -590,7 +602,14 @@ static void test_putfile(void) hConnect = InternetConnect(hInternet, "www.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - /* One small test to show that handle type is checked before parameters */ + /* Test to show validity of 'local file' parameter is tested a before 'session handle type' */ + SetLastError(0xdeadbeef); + bRet = FtpPutFileA(hConnect, NULL, "non_existing_remote", FTP_TRANSFER_TYPE_UNKNOWN, 0); + ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); + ok ( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Test to show that 'session handle type' is checked before 'condition flags' */ SetLastError(0xdeadbeef); bRet = FtpPutFileA(hConnect, "non_existing_local", "non_existing_remote", 5, 0); ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); [View Less]

1 0

Andrew Talbot : msg711.acm: Constify some variables.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: bb7bc013b3cd5efa27197466352b736d1487e0a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb7bc013b3cd5efa271974663… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Feb 17 19:23:36 2007 +0000 msg711.acm: Constify some variables. --- dlls/msg711.acm/msg711.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index ed54f75.… [View More].1b94134 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -67,7 +67,7 @@ typedef struct int rate; } Format; -static Format PCM_Formats[] = +static const Format PCM_Formats[] = { /*{1, 8, 8000}, {2, 8, 8000}, */{1, 16, 8000}, {2, 16, 8000}, /*{1, 8, 11025}, {2, 8, 11025}, */{1, 16, 11025}, {2, 16, 11025}, @@ -75,13 +75,13 @@ static Format PCM_Formats[] = /*{1, 8, 44100}, {2, 8, 44100}, */{1, 16, 44100}, {2, 16, 44100}, }; -static Format ALaw_Formats[] = +static const Format ALaw_Formats[] = { {1, 8, 8000}, {2, 8, 8000}, {1, 8, 11025}, {2, 8, 11025}, {1, 8, 22050}, {2, 8, 22050}, {1, 8, 44100}, {2, 8, 44100}, }; -static Format ULaw_Formats[] = +static const Format ULaw_Formats[] = { {1, 8, 8000}, {2, 8, 8000}, {1, 8, 11025}, {2, 8, 11025}, {1, 8, 22050}, {2, 8, 22050}, {1, 8, 44100}, {2, 8, 44100}, @@ -96,8 +96,8 @@ static Format ULaw_Formats[] = */ static DWORD G711_GetFormatIndex(LPWAVEFORMATEX wfx) { - int i, hi; - Format* fmts; + int i, hi; + const Format* fmts; switch (wfx->wFormatTag) { @@ -208,13 +208,11 @@ static inline void W16(unsigned char* dst, short s) #define SEG_SHIFT (4) /* Left shift for segment number. */ #define SEG_MASK (0x70) /* Segment field mask. */ -static short seg_aend[8] = {0x1F, 0x3F, 0x7F, 0xFF, - 0x1FF, 0x3FF, 0x7FF, 0xFFF}; -static short seg_uend[8] = {0x3F, 0x7F, 0xFF, 0x1FF, - 0x3FF, 0x7FF, 0xFFF, 0x1FFF}; +static const short seg_aend[8] = {0x1F, 0x3F, 0x7F, 0x0FF, 0x1FF, 0x3FF, 0x7FF, 0x0FFF}; +static const short seg_uend[8] = {0x3F, 0x7F, 0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF}; /* copy from CCITT G.711 specifications */ -static unsigned char _u2a[128] = { /* u- to A-law conversions */ +static const unsigned char _u2a[128] = { /* u- to A-law conversions */ 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 10, 11, 12, 13, 14, 15, 16, @@ -235,7 +233,7 @@ static unsigned char _u2a[128] = { /* u- to A-law conversions */ 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128}; -static unsigned char _a2u[128] = { /* A- to u-law conversions */ +static const unsigned char _a2u[128] = { /* A- to u-law conversions */ 1, 3, 5, 7, 9, 11, 13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, @@ -260,7 +258,7 @@ static unsigned char _a2u[128] = { /* A- to u-law conversions */ static short search( int val, /* changed from "short" *drago* */ - short *table, + const short *table, int size) /* changed from "short" *drago* */ { int i; /* changed from "short" *drago* */ @@ -357,7 +355,7 @@ alaw2linear(unsigned char a_val) /* EPP (for Wine): * this array has been statically generated from the above routine */ -static unsigned short _a2l[] = { +static const unsigned short _a2l[] = { 0xEA80, 0xEB80, 0xE880, 0xE980, 0xEE80, 0xEF80, 0xEC80, 0xED80, 0xE280, 0xE380, 0xE080, 0xE180, 0xE680, 0xE780, 0xE480, 0xE580, 0xF540, 0xF5C0, 0xF440, 0xF4C0, 0xF740, 0xF7C0, 0xF640, 0xF6C0, @@ -494,7 +492,7 @@ ulaw2linear(unsigned char u_val) /* EPP (for Wine): * this array has been statically generated from the above routine */ -static unsigned short _u2l[] = { +static const unsigned short _u2l[] = { 0x8284, 0x8684, 0x8A84, 0x8E84, 0x9284, 0x9684, 0x9A84, 0x9E84, 0xA284, 0xA684, 0xAA84, 0xAE84, 0xB284, 0xB684, 0xBA84, 0xBE84, 0xC184, 0xC384, 0xC584, 0xC784, 0xC984, 0xCB84, 0xCD84, 0xCF84, [View Less]

1 0

Andrew Talbot : msi: Constify some variables.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: 5346ba392d15bff10aeb95a90dd41b86792a9c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5346ba392d15bff10aeb95a90… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Feb 17 19:24:20 2007 +0000 msi: Constify some variables. --- dlls/msi/appsearch.c | 2 +- dlls/msi/msi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 4b65f65..4c5847e … [View More]

1 0

Andrew Talbot : msadp32.acm: Constify some variables.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: 4bd4e5d39f1b274b8b08b98cc9f339910fcf7419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd4e5d39f1b274b8b08b98cc… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Feb 17 19:22:23 2007 +0000 msadp32.acm: Constify some variables. --- dlls/msadp32.acm/msadp32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 3849c04..0336582 … [View More]

1 0

Andrew Talbot : mciseq: Constify a variable.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: d076f55e8115b63fd898ed41164e0ee2437b5a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d076f55e8115b63fd898ed411… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Feb 16 16:40:58 2007 +0000 mciseq: Constify a variable. --- dlls/mciseq/mcimidi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 5533814..2da1fda 100644 --- a/dlls/mciseq/… [View More]

1 0

lostwages/wwn wn20070216_321.xml
by WineHQ 17 Feb '07

17 Feb '07

ChangeSet ID: 30932 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/02/16 18:35:54 Modified files: wwn : wn20070216_321.xml Log message: fix tags in #321 Patch: http://cvs.winehq.org/patch.py?id=30932 Old revision New revision Changes Path 1.1 1.2 +20 -20 lostwages/wwn/wn20070216_321.xml Index: lostwages/wwn/wn20070216_321.xml diff -u -p lostwages/wwn/wn20070216_321.xml:1.1 lostwages/wwn/wn20070216_321.xml:… [View More]

1 0

lostwages/ news/2006081001.xml news/2007021602 ...
by WineHQ 17 Feb '07

17 Feb '07

ChangeSet ID: 30931 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/02/16 18:13:29 Modified files: news : 2006081001.xml Added files: news : 2007021602.xml wwn : wn20070216_321.xml Log message: An old issue masquerading as a new one. WWN #321 Patch: http://cvs.winehq.org/patch.py?id=30931 Old revision New revision Changes Path 1.1 1.2 +3 -3 lostwages/news/2006081001.xml Added … [View More]

1 0

lostwages/ include/winehq.conf news/2007021601.xml
by Alexandre Julliard 16 Feb '07

16 Feb '07

ChangeSet ID: 30930 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/02/16 09:28:28 Modified files: include : winehq.conf Added files: news : 2007021601.xml Log message: Release 0.9.31 Patch: http://cvs.winehq.org/patch.py?id=30930 Old revision New revision Changes Path 1.53 1.54 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007021601.xml Index: … [View More]

1 0

Tag wine-0.9.31 : Alexandre Julliard : Release 0.9.31
by Alexandre Julliard 16 Feb '07

16 Feb '07

Module: wine Branch: refs/tags/wine-0.9.31 Tag: e32999486545cef908b20c749a468ec0db5632d2 URL: http://source.winehq.org/git/wine.git/?a=tag;h=e32999486545cef908b20c749a46… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 15:48:14 2007 +0100 Release 0.9.31

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2007