winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
4 participants
1001 discussions
Start a n
N
ew thread
Francois Gouget : wininet/tests: FtpCommandA() is not available on Win9x. So load it dynamically and skip some tests.
by Alexandre Julliard
03 Mar '08
03 Mar '08
Module: wine Branch: master Commit: 89bdd639df5064c0ffe7a350e8027c19996b9904 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=89bdd639df5064c0ffe7a350e…
Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 1 21:13:55 2008 +0100 wininet/tests: FtpCommandA() is not available on Win9x. So load it dynamically and skip some tests. --- dlls/wininet/tests/ftp.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 985b23b..9832fce 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -42,6 +42,10 @@ #include "wine/test.h" + +static BOOL (WINAPI *pFtpCommandA)(HINTERNET,BOOL,DWORD,LPCSTR,DWORD_PTR,HINTERNET*); + + static void test_getfile_no_open(void) { BOOL bRet; @@ -680,10 +684,16 @@ static void test_command(HINTERNET hFtp, HINTERNET hConnect) { TRUE, ERROR_SUCCESS, "PWD\r\n" } }; + if (!pFtpCommandA) + { + skip("FtpCommandA() is not available. Skipping the Ftp command tests\n"); + return; + } + for (i = 0; i < sizeof(command_test) / sizeof(command_test[0]); i++) { SetLastError(0xdeadbeef); - ret = FtpCommandA(hFtp, FALSE, FTP_TRANSFER_TYPE_ASCII, command_test[i].cmd, 0, NULL); + ret = pFtpCommandA(hFtp, FALSE, FTP_TRANSFER_TYPE_ASCII, command_test[i].cmd, 0, NULL); error = GetLastError(); ok(ret == command_test[i].ret, "%d: expected FtpCommandA to %s\n", i, command_test[i].ret ? "succeed" : "fail"); @@ -697,8 +707,14 @@ static void test_get_current_dir(HINTERNET hFtp, HINTERNET hConnect) DWORD dwCurrentDirectoryLen = MAX_PATH; CHAR lpszCurrentDirectory[MAX_PATH]; + if (!pFtpCommandA) + { + skip("FtpCommandA() is not available. Skipping the Ftp get_current_dir tests\n"); + return; + } + /* change directories to get a more interesting pwd */ - bRet = FtpCommandA(hFtp, FALSE, FTP_TRANSFER_TYPE_ASCII, "CWD pub/", 0, NULL); + bRet = pFtpCommandA(hFtp, FALSE, FTP_TRANSFER_TYPE_ASCII, "CWD pub/", 0, NULL); if(bRet == FALSE) { skip("Failed to change directories in test_get_current_dir(HINTERNET hFtp).\n"); @@ -771,8 +787,12 @@ static void test_get_current_dir(HINTERNET hFtp, HINTERNET hConnect) START_TEST(ftp) { + HMODULE hWininet; HANDLE hInternet, hFtp, hHttp; + hWininet = GetModuleHandleA("wininet.dll"); + pFtpCommandA = (void*)GetProcAddress(hWininet, "FtpCommandA"); + SetLastError(0xdeadbeef); hInternet = InternetOpen("winetest", 0, NULL, NULL, 0); ok(hInternet != NULL, "InternetOpen failed: %u\n", GetLastError());
1
0
0
0
Francois Gouget : wintrust/tests: Crypt(En,De)codeObjectEx() are not available on Win9x. So load them dynamically and skip some tests.
by Alexandre Julliard
03 Mar '08
03 Mar '08
Module: wine Branch: master Commit: dd50ac4e150d25b584ca467e5114e22d7023647f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dd50ac4e150d25b584ca467e5…
Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 1 21:13:39 2008 +0100 wintrust/tests: Crypt(En,De)codeObjectEx() are not available on Win9x. So load them dynamically and skip some tests. --- dlls/wintrust/tests/asn.c | 82 +++++++++++++++++++++++++++++++-------------- 1 files changed, 57 insertions(+), 25 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd50ac4e150d25b584ca4…
1
0
0
0
Francois Gouget : gdiplus/tests: Add the trailing '\n' to a couple of ok() calls.
by Alexandre Julliard
03 Mar '08
03 Mar '08
Module: wine Branch: master Commit: a76473198321899bd28f237baa6d34d7d4608bb5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a76473198321899bd28f237ba…
Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 1 21:13:09 2008 +0100 gdiplus/tests: Add the trailing '\n' to a couple of ok() calls. --- dlls/gdiplus/tests/image.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index d0959e5..0918f9d 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -100,8 +100,8 @@ static void test_GetImageDimension(void) h = -1; stat = GdipGetImageDimension((GpImage*)bm,&w,&h); expect(Ok, stat); - ok(fabs(WIDTH - w) < 0.0001, "Width wrong"); - ok(fabs(HEIGHT - h) < 0.0001, "Height wrong"); + ok(fabs(WIDTH - w) < 0.0001, "Width wrong\n"); + ok(fabs(HEIGHT - h) < 0.0001, "Height wrong\n"); GdipDisposeImage((GpImage*)bm); }
1
0
0
0
Francois Gouget : gdi32/tests: Add the trailing '\n' to a couple of ok() calls.
by Alexandre Julliard
03 Mar '08
03 Mar '08
Module: wine Branch: master Commit: e637e83ec4083cefbcd31c39f4f3f72327ccba71 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e637e83ec4083cefbcd31c39f…
Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 1 21:13:04 2008 +0100 gdi32/tests: Add the trailing '\n' to a couple of ok() calls. --- dlls/gdi32/tests/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ebc3daf..ce34ab2 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1767,7 +1767,7 @@ static void test_GdiRealizationInfo(void) r = pGdiRealizationInfo(hdc, info); ok(r != 0, "ret 0\n"); ok(info[0] == 1, "info[0] = %x for the system font\n", info[0]); - ok(info[3] == 0xcccccccc, "structure longer than 3 dwords"); + ok(info[3] == 0xcccccccc, "structure longer than 3 dwords\n"); if (!is_truetype_font_installed("Arial")) { @@ -1786,7 +1786,7 @@ static void test_GdiRealizationInfo(void) r = pGdiRealizationInfo(hdc, info); ok(r != 0, "ret 0\n"); ok(info[0] == 3, "info[0] = %x for arial\n", info[0]); - ok(info[3] == 0xcccccccc, "structure longer than 3 dwords"); + ok(info[3] == 0xcccccccc, "structure longer than 3 dwords\n"); DeleteObject(SelectObject(hdc, hfont_old));
1
0
0
0
Roderick Colenbrander : wined3d: Add D32F_LOCKABLE to getDepthStencilBits.
by Alexandre Julliard
03 Mar '08
03 Mar '08
Module: wine Branch: master Commit: 2e0d35aa2fb7d4d2d53a1e7a72e353f253ff5a7a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2e0d35aa2fb7d4d2d53a1e7a7…
Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 2 23:53:26 2008 +0100 wined3d: Add D32F_LOCKABLE to getDepthStencilBits. --- dlls/wined3d/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 86e9c5e..8bcd042 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2710,6 +2710,7 @@ BOOL getDepthStencilBits(WINED3DFORMAT fmt, short *depthSize, short *stencilSize case WINED3DFMT_D24S8: case WINED3DFMT_D24FS8: case WINED3DFMT_D32: + case WINED3DFMT_D32F_LOCKABLE: break; default: FIXME("Unsupported stencil format: %s\n", debug_d3dformat(fmt));
1
0
0
0
Jacek Caban : wininet: Don't use INTERNET_ReadFile in HTTP_DrainContent.
by Alexandre Julliard
03 Mar '08
03 Mar '08
Module: wine Branch: master Commit: ca39a55e88bac180b573d1cfab21dc01e1d8626d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ca39a55e88bac180b573d1cfa…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 2 19:55:04 2008 +0100 wininet: Don't use INTERNET_ReadFile in HTTP_DrainContent. --- dlls/wininet/http.c | 42 +++++++++++++++++++++--------------------- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 3 --- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 40070fb..eafec2b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -117,7 +117,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl); static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin); static BOOL HTTP_VerifyValidHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field); - +static void HTTP_DrainContent(WININETHTTPREQW *req); LPHTTPHEADERW HTTP_GetHeader(LPWININETHTTPREQW req, LPCWSTR head) { @@ -715,25 +715,6 @@ BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest, return r; } -/* read any content returned by the server so that the connection can be - * reused */ -static void HTTP_DrainContent(LPWININETHTTPREQW lpwhr) -{ - DWORD bytes_read; - - if (!NETCON_connected(&lpwhr->netConnection)) return; - - if (lpwhr->dwContentLength == -1) - NETCON_close(&lpwhr->netConnection); - - do - { - char buffer[2048]; - if (!INTERNET_ReadFile(&lpwhr->hdr, buffer, sizeof(buffer), &bytes_read, TRUE)) - return; - } while (bytes_read); -} - /*********************************************************************** * HttpEndRequestA (WININET.@) * @@ -1410,7 +1391,7 @@ static DWORD HTTPREQ_SetOption(WININETHANDLEHEADER *hdr, DWORD option, void *buf return ERROR_INTERNET_INVALID_OPTION; } -DWORD HTTPREQ_Read(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD *read, BOOL sync) +static DWORD HTTPREQ_Read(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD *read, BOOL sync) { int bytes_read; @@ -1692,6 +1673,25 @@ lend: return handle; } +/* read any content returned by the server so that the connection can be + * reused */ +static void HTTP_DrainContent(WININETHTTPREQW *req) +{ + DWORD bytes_read; + + if (!NETCON_connected(&req->netConnection)) return; + + if (req->dwContentLength == -1) + NETCON_close(&req->netConnection); + + do + { + char buffer[2048]; + if (HTTPREQ_Read(req, buffer, sizeof(buffer), &bytes_read, TRUE) != ERROR_SUCCESS) + return; + } while (bytes_read); +} + static const WCHAR szAccept[] = { 'A','c','c','e','p','t',0 }; static const WCHAR szAccept_Charset[] = { 'A','c','c','e','p','t','-','C','h','a','r','s','e','t', 0 }; static const WCHAR szAccept_Encoding[] = { 'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g',0 }; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b60e175..c0709e6 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1700,7 +1700,7 @@ BOOL WINAPI InternetWriteFile(HINTERNET hFile, LPCVOID lpBuffer, } -BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, +static BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, DWORD dwNumOfBytesToRead, LPDWORD pdwNumOfBytesRead, BOOL bWait) { BOOL retval = FALSE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 509fd70..8f81c13 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -378,9 +378,6 @@ DWORD INTERNET_GetLastError(void); BOOL INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest); LPSTR INTERNET_GetResponseBuffer(void); LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen); -BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, - DWORD dwNumOfBytesToRead, LPDWORD pdwNumOfBytesRead, - BOOL bWait); BOOLAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength,
1
0
0
0
Jacek Caban : wininet: Move FTP structs and functions declarations from internet.h.
by Alexandre Julliard
03 Mar '08
03 Mar '08
Module: wine Branch: master Commit: 352b4212a134a9ff19ddae4e662d45d0ee589865 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=352b4212a134a9ff19ddae4e6…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 2 19:54:36 2008 +0100 wininet: Move FTP structs and functions declarations from internet.h. --- dlls/wininet/ftp.c | 57 ++++++++++++++++++++++++++++++++++++++++------ dlls/wininet/internet.h | 42 ---------------------------------- 2 files changed, 49 insertions(+), 50 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 101ba78..78c0cc1 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -61,6 +61,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); +typedef struct _WININETFTPSESSIONW WININETFTPSESSIONW; + +typedef struct +{ + WININETHANDLEHEADER hdr; + WININETFTPSESSIONW *lpFtpSession; + BOOL session_deleted; + int nDataSocket; +} WININETFTPFILE, *LPWININETFTPFILE; + +typedef struct _WININETFTPSESSIONW +{ + WININETHANDLEHEADER hdr; + WININETAPPINFOW *lpAppInfo; + int sndSocket; + int lstnSocket; + int pasvSocket; /* data socket connected by us in case of passive FTP */ + LPWININETFTPFILE download_in_progress; + struct sockaddr_in socketAddress; + struct sockaddr_in lstnSocketAddress; + LPWSTR lpszPassword; + LPWSTR lpszUserName; +} *LPWININETFTPSESSIONW; + typedef struct { BOOL bIsDirectory; @@ -159,11 +183,28 @@ static BOOL FTP_SendPortOrPasv(LPWININETFTPSESSIONW lpwfs); static BOOL FTP_ParsePermission(LPCSTR lpszPermission, LPFILEPROPERTIESW lpfp); static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERTIESW fileprop); static BOOL FTP_ParseDirectory(LPWININETFTPSESSIONW lpwfs, INT nSocket, LPCWSTR lpszSearchFile, - LPFILEPROPERTIESW *lpafp, LPDWORD dwfp); + LPFILEPROPERTIESW *lpafp, LPDWORD dwfp); static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LPCWSTR lpszSearchFile, - LPWIN32_FIND_DATAW lpFindFileData, DWORD_PTR dwContext); + LPWIN32_FIND_DATAW lpFindFileData, DWORD_PTR dwContext); static DWORD FTP_SetResponseError(DWORD dwResponse); static BOOL FTP_ConvertFileProp(LPFILEPROPERTIESW lpafp, LPWIN32_FIND_DATAW lpFindFileData); +static BOOL FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile, + LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD_PTR dwContext); +static BOOL FTP_FtpSetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); +static BOOL FTP_FtpCreateDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); +static HINTERNET FTP_FtpFindFirstFileW(LPWININETFTPSESSIONW lpwfs, + LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD_PTR dwContext); +static BOOL FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszCurrentDirectory, + LPDWORD lpdwCurrentDirectory); +static BOOL FTP_FtpRenameFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszSrc, LPCWSTR lpszDest); +static BOOL FTP_FtpRemoveDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); +static BOOL FTP_FtpDeleteFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName); +static HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName, + DWORD fdwAccess, DWORD dwFlags, DWORD_PTR dwContext); +static BOOL FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile, + BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, + DWORD_PTR dwContext); + /*********************************************************************** * FtpPutFileA (WININET.@) @@ -290,7 +331,7 @@ lend: * FALSE on failure * */ -BOOL WINAPI FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile, +static BOOL FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile, LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD_PTR dwContext) { HANDLE hFile; @@ -458,7 +499,7 @@ lend: * FALSE on failure * */ -BOOL WINAPI FTP_FtpSetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory) +static BOOL FTP_FtpSetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory) { INT nResCode; LPWININETAPPINFOW hIC = NULL; @@ -606,7 +647,7 @@ lend: * FALSE on failure * */ -BOOL WINAPI FTP_FtpCreateDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory) +static BOOL FTP_FtpCreateDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory) { INT nResCode; BOOL bSuccess = FALSE; @@ -756,7 +797,7 @@ lend: * NULL on failure * */ -HINTERNET WINAPI FTP_FtpFindFirstFileW(LPWININETFTPSESSIONW lpwfs, +static HINTERNET FTP_FtpFindFirstFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD_PTR dwContext) { INT nResCode; @@ -967,7 +1008,7 @@ lend: * FALSE on failure * */ -BOOL WINAPI FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszCurrentDirectory, +static BOOL FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszCurrentDirectory, LPDWORD lpdwCurrentDirectory) { INT nResCode; @@ -1434,7 +1475,7 @@ lend: * FALSE on failure * */ -BOOL WINAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile, +static BOOL FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile, BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, DWORD_PTR dwContext) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index ec81379..509fd70 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -222,31 +222,6 @@ typedef struct } WININETHTTPREQW, *LPWININETHTTPREQW; -struct _WININETFTPSESSIONW; - -typedef struct -{ - WININETHANDLEHEADER hdr; - struct _WININETFTPSESSIONW *lpFtpSession; - BOOL session_deleted; - int nDataSocket; -} WININETFTPFILE, *LPWININETFTPFILE; - - -typedef struct _WININETFTPSESSIONW -{ - WININETHANDLEHEADER hdr; - WININETAPPINFOW *lpAppInfo; - int sndSocket; - int lstnSocket; - int pasvSocket; /* data socket connected by us in case of passive FTP */ - LPWININETFTPFILE download_in_progress; - struct sockaddr_in socketAddress; - struct sockaddr_in lstnSocketAddress; - LPWSTR lpszPassword; - LPWSTR lpszUserName; -} WININETFTPSESSIONW, *LPWININETFTPSESSIONW; - struct WORKREQ_FTPPUTFILEW { @@ -407,23 +382,6 @@ BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, DWORD dwNumOfBytesToRead, LPDWORD pdwNumOfBytesRead, BOOL bWait); -BOOLAPI FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile, - LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD_PTR dwContext); -BOOLAPI FTP_FtpSetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); -BOOLAPI FTP_FtpCreateDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); -INTERNETAPI HINTERNET WINAPI FTP_FtpFindFirstFileW(LPWININETFTPSESSIONW lpwfs, - LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD_PTR dwContext); -BOOLAPI FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszCurrentDirectory, - LPDWORD lpdwCurrentDirectory); -BOOL FTP_FtpRenameFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszSrc, LPCWSTR lpszDest); -BOOL FTP_FtpRemoveDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); -BOOL FTP_FtpDeleteFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName); -HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName, - DWORD fdwAccess, DWORD dwFlags, DWORD_PTR dwContext); -BOOLAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile, - BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, - DWORD_PTR dwContext); - BOOLAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwContentLength, BOOL bEndRequest);
1
0
0
0
Jacek Caban : wininet: Move InternetReadFile to vtbl.
by Alexandre Julliard
03 Mar '08
03 Mar '08
Module: wine Branch: master Commit: 3b4ca69e18188ba2dcc48a8feb0bbe328ae3e67e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3b4ca69e18188ba2dcc48a8fe…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 2 19:35:11 2008 +0100 wininet: Move InternetReadFile to vtbl. --- dlls/wininet/ftp.c | 18 ++++++++++++++++++ dlls/wininet/http.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/wininet/internet.c | 39 ++++++++++++++++----------------------- dlls/wininet/internet.h | 1 + 4 files changed, 77 insertions(+), 23 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f92e545..101ba78 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1174,6 +1174,21 @@ static void FTPFILE_Destroy(WININETHANDLEHEADER *hdr) HeapFree(GetProcessHeap(), 0, lpwh); } +static DWORD FTPFILE_ReadFile(WININETHANDLEHEADER *hdr, void *buffer, DWORD size, DWORD *read) +{ + WININETFTPFILE *file = (WININETFTPFILE*)hdr; + int res; + + if (file->nDataSocket == -1) + return ERROR_INTERNET_DISCONNECTED; + + /* FIXME: FTP should use NETCON_ stuff */ + res = recv(file->nDataSocket, buffer, size, MSG_WAITALL); + *read = res>0 ? res : 0; + + return res>=0 ? ERROR_SUCCESS : INTERNET_ERROR_BASE; /* FIXME*/ +} + static BOOL FTPFILE_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWORD size, DWORD *written) { LPWININETFTPFILE lpwh = (LPWININETFTPFILE) hdr; @@ -1189,6 +1204,7 @@ static const HANDLEHEADERVtbl FTPFILEVtbl = { FTPFILE_Destroy, NULL, NULL, + FTPFILE_ReadFile, FTPFILE_WriteFile, NULL, NULL @@ -2111,6 +2127,7 @@ static const HANDLEHEADERVtbl FTPSESSIONVtbl = { NULL, NULL, NULL, + NULL, NULL }; @@ -3197,6 +3214,7 @@ static const HANDLEHEADERVtbl FTPFINDNEXTVtbl = { NULL, NULL, NULL, + NULL, FTPFINDNEXT_FindNextFileW }; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2558ea1..40070fb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1410,6 +1410,46 @@ static DWORD HTTPREQ_SetOption(WININETHANDLEHEADER *hdr, DWORD option, void *buf return ERROR_INTERNET_INVALID_OPTION; } +DWORD HTTPREQ_Read(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD *read, BOOL sync) +{ + int bytes_read; + + if(!NETCON_recv(&req->netConnection, buffer, min(size, req->dwContentLength - req->dwContentRead), + sync ? MSG_WAITALL : 0, &bytes_read)) { + if(req->dwContentLength != -1 && req->dwContentRead != req->dwContentLength) + ERR("not all data received %d/%d\n", req->dwContentRead, req->dwContentLength); + + /* always returns TRUE, even if the network layer returns an + * error */ + *read = 0; + HTTP_FinishedReading(req); + return ERROR_SUCCESS; + } + + req->dwContentRead += bytes_read; + *read = bytes_read; + + if(req->lpszCacheFile) { + BOOL res; + + res = WriteFile(req->hCacheFile, buffer, bytes_read, NULL, NULL); + if(!res) + WARN("WriteFile failed: %u\n", GetLastError()); + } + + if(!bytes_read && (req->dwContentRead == req->dwContentLength)) + HTTP_FinishedReading(req); + + return ERROR_SUCCESS; +} + +static DWORD HTTPREQ_ReadFile(WININETHANDLEHEADER *hdr, void *buffer, DWORD size, DWORD *read) +{ + WININETHTTPREQW *req = (WININETHTTPREQW*)hdr; + + return HTTPREQ_Read(req, buffer, size, read, TRUE); +} + static BOOL HTTPREQ_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWORD size, DWORD *written) { LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW)hdr; @@ -1471,6 +1511,7 @@ static const HANDLEHEADERVtbl HTTPREQVtbl = { HTTPREQ_Destroy, HTTPREQ_CloseConnection, HTTPREQ_SetOption, + HTTPREQ_ReadFile, HTTPREQ_WriteFile, HTTPREQ_QueryDataAvailable, NULL @@ -2999,6 +3040,7 @@ static const HANDLEHEADERVtbl HTTPSESSIONVtbl = { NULL, NULL, NULL, + NULL, NULL }; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0019bb9..b60e175 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -477,6 +477,7 @@ static const HANDLEHEADERVtbl APPINFOVtbl = { NULL, NULL, NULL, + NULL, NULL }; @@ -1703,11 +1704,9 @@ BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, DWORD dwNumOfBytesToRead, LPDWORD pdwNumOfBytesRead, BOOL bWait) { BOOL retval = FALSE; - int nSocket = -1; int bytes_read; LPWININETHTTPREQW lpwhr; - /* FIXME: this should use NETCON functions! */ switch (lpwh->htype) { case WH_HHTTPREQ: @@ -1749,17 +1748,6 @@ BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, } break; - case WH_HFILE: - /* FIXME: FTP should use NETCON_ stuff */ - nSocket = ((LPWININETFTPFILE)lpwh)->nDataSocket; - if (nSocket != -1) - { - int res = recv(nSocket, lpBuffer, dwNumOfBytesToRead, bWait ? MSG_WAITALL : 0); - retval = (res >= 0); - *pdwNumOfBytesRead = retval ? res : 0; - } - break; - default: break; } @@ -1778,25 +1766,30 @@ BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, * */ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, - DWORD dwNumOfBytesToRead, LPDWORD pdwNumOfBytesRead) + DWORD dwNumOfBytesToRead, LPDWORD pdwNumOfBytesRead) { - LPWININETHANDLEHEADER lpwh; - BOOL retval; + LPWININETHANDLEHEADER hdr; + DWORD res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; TRACE("%p %p %d %p\n", hFile, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead); - lpwh = WININET_GetObject( hFile ); - if (!lpwh) - { + hdr = WININET_GetObject(hFile); + if (!hdr) { INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - retval = INTERNET_ReadFile(lpwh, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead, TRUE); - WININET_Release( lpwh ); + if(hdr->vtbl->ReadFile) + res = hdr->vtbl->ReadFile(hdr, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead); - TRACE("-- %s (bytes read: %d)\n", retval ? "TRUE": "FALSE", pdwNumOfBytesRead ? *pdwNumOfBytesRead : -1); - return retval; + WININET_Release(hdr); + + TRACE("-- %s (%u) (bytes read: %d)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", res, + pdwNumOfBytesRead ? *pdwNumOfBytesRead : -1); + + if(res != ERROR_SUCCESS) + SetLastError(res); + return res == ERROR_SUCCESS; } /*********************************************************************** diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index fcf225d..ec81379 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -139,6 +139,7 @@ typedef struct { void (*Destroy)(WININETHANDLEHEADER*); void (*CloseConnection)(WININETHANDLEHEADER*); DWORD (*SetOption)(WININETHANDLEHEADER*,DWORD,void*,DWORD); + DWORD (*ReadFile)(WININETHANDLEHEADER*,void*,DWORD,DWORD*); BOOL (*WriteFile)(WININETHANDLEHEADER*,const void*,DWORD,DWORD*); DWORD (*QueryDataAvailable)(WININETHANDLEHEADER*,DWORD*,DWORD,DWORD_PTR); DWORD (*FindNextFileW)(WININETHANDLEHEADER*,void*);
1
0
0
0
Jacek Caban : wininet: Move INTERNET_STATUS_REQUEST_COMPLETE call from INTERNET_ReadFile.
by Alexandre Julliard
03 Mar '08
03 Mar '08
Module: wine Branch: master Commit: 9a5c04612920a67f4b67be9ab76c4535a6251310 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9a5c04612920a67f4b67be9ab…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 2 19:53:35 2008 +0100 wininet: Move INTERNET_STATUS_REQUEST_COMPLETE call from INTERNET_ReadFile. --- dlls/wininet/http.c | 3 +-- dlls/wininet/internet.c | 32 ++++++++++++++------------------ dlls/wininet/internet.h | 2 +- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b1a181d..2558ea1 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -729,8 +729,7 @@ static void HTTP_DrainContent(LPWININETHTTPREQW lpwhr) do { char buffer[2048]; - if (!INTERNET_ReadFile(&lpwhr->hdr, buffer, sizeof(buffer), &bytes_read, - TRUE, FALSE)) + if (!INTERNET_ReadFile(&lpwhr->hdr, buffer, sizeof(buffer), &bytes_read, TRUE)) return; } while (bytes_read); } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index dcddfd2..0019bb9 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1700,8 +1700,7 @@ BOOL WINAPI InternetWriteFile(HINTERNET hFile, LPCVOID lpBuffer, BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, - DWORD dwNumOfBytesToRead, LPDWORD pdwNumOfBytesRead, - BOOL bWait, BOOL bSendCompletionStatus) + DWORD dwNumOfBytesToRead, LPDWORD pdwNumOfBytesRead, BOOL bWait) { BOOL retval = FALSE; int nSocket = -1; @@ -1765,18 +1764,6 @@ BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, break; } - if (bSendCompletionStatus) - { - INTERNET_ASYNC_RESULT iar; - - iar.dwResult = retval; - iar.dwError = iar.dwError = retval ? ERROR_SUCCESS : - INTERNET_GetLastError(); - - INTERNET_SendCallback(lpwh, lpwh->dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); - } return retval; } @@ -1805,7 +1792,7 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, return FALSE; } - retval = INTERNET_ReadFile(lpwh, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead, TRUE, FALSE); + retval = INTERNET_ReadFile(lpwh, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead, TRUE); WININET_Release( lpwh ); TRACE("-- %s (bytes read: %d)\n", retval ? "TRUE": "FALSE", pdwNumOfBytesRead ? *pdwNumOfBytesRead : -1); @@ -1842,12 +1829,21 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, void AsyncInternetReadFileExProc(WORKREQUEST *workRequest) { struct WORKREQ_INTERNETREADFILEEXA const *req = &workRequest->u.InternetReadFileExA; + INTERNET_ASYNC_RESULT iar; + BOOL res; TRACE("INTERNETREADFILEEXA %p\n", workRequest->hdr); - INTERNET_ReadFile(workRequest->hdr, req->lpBuffersOut->lpvBuffer, + res = INTERNET_ReadFile(workRequest->hdr, req->lpBuffersOut->lpvBuffer, req->lpBuffersOut->dwBufferLength, - &req->lpBuffersOut->dwBufferLength, TRUE, TRUE); + &req->lpBuffersOut->dwBufferLength, TRUE); + + iar.dwResult = res; + iar.dwError = res ? ERROR_SUCCESS : INTERNET_GetLastError(); + + INTERNET_SendCallback(workRequest->hdr, workRequest->hdr->dwContext, + INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); } BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOut, @@ -1907,7 +1903,7 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu retval = INTERNET_ReadFile(lpwh, lpBuffersOut->lpvBuffer, lpBuffersOut->dwBufferLength, &lpBuffersOut->dwBufferLength, - !(dwFlags & IRF_NO_WAIT), FALSE); + !(dwFlags & IRF_NO_WAIT)); if (retval) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4cdab9f..fcf225d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -404,7 +404,7 @@ LPSTR INTERNET_GetResponseBuffer(void); LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen); BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, DWORD dwNumOfBytesToRead, LPDWORD pdwNumOfBytesRead, - BOOL bWait, BOOL bSendCompletionStatus); + BOOL bWait); BOOLAPI FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile, LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD_PTR dwContext);
1
0
0
0
Jacek Caban : wininet: Fixed some tests.
by Alexandre Julliard
03 Mar '08
03 Mar '08
Module: wine Branch: master Commit: d3682dd33f1299923deb344fa6a9ae2c930498a5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d3682dd33f1299923deb344fa…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 2 19:53:13 2008 +0100 wininet: Fixed some tests. --- dlls/wininet/tests/internet.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index d3adf91..15495db 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -289,7 +289,8 @@ static void test_null(void) sz = 0; r = InternetGetCookieW(NULL, NULL, NULL, &sz); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INTERNET_UNRECOGNIZED_SCHEME, + "wrong error %u\n", GetLastError()); ok( r == FALSE, "return wrong\n"); r = InternetGetCookieW(szServer, NULL, NULL, &sz); @@ -315,7 +316,7 @@ static void test_null(void) ok( r == TRUE, "return wrong\n"); /* sz == lstrlenW(buffer) only in XP SP1 */ - ok( sz == 1 + lstrlenW(buffer), "sz wrong\n"); + ok( sz == 1 + lstrlenW(buffer) || sz == lstrlenW(buffer), "sz wrong %d\n", sz); /* before XP SP2, buffer is "server; server" */ ok( !lstrcmpW(szExpect, buffer) || !lstrcmpW(szServer, buffer), "cookie data wrong\n");
1
0
0
0
← Newer
1
...
93
94
95
96
97
98
99
100
101
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
Results per page:
10
25
50
100
200