March 2008 - Wine-Commits - list.winehq.org

Francois Gouget : wintrust/tests: Crypt(En,De)codeObjectEx() are not available on Win9x. So load them dynamically and skip some tests.
by Alexandre Julliard March 3, 2008

March 3, 2008

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

Francois Gouget : wininet/tests: FtpCommandA() is not available on Win9x. So load it dynamically and skip some tests.
by Alexandre Julliard March 3, 2008

March 3, 2008

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

Francois Gouget : gdi32/tests: Add the trailing '\n' to a couple of ok() calls.
by Alexandre Julliard March 3, 2008

March 3, 2008

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

Francois Gouget : gdiplus/tests: Add the trailing '\n' to a couple of ok() calls.
by Alexandre Julliard March 3, 2008

March 3, 2008

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

Roderick Colenbrander : wined3d: Add D32F_LOCKABLE to getDepthStencilBits.
by Alexandre Julliard March 3, 2008

March 3, 2008

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

Jacek Caban : wininet: Don't use INTERNET_ReadFile in HTTP_DrainContent.
by Alexandre Julliard March 3, 2008

March 3, 2008

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

Jacek Caban : wininet: Move FTP structs and functions declarations from internet.h.
by Alexandre Julliard March 3, 2008

March 3, 2008

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

Jacek Caban : wininet: Move InternetReadFile to vtbl.
by Alexandre Julliard March 3, 2008

March 3, 2008

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

Jacek Caban : wininet: Move INTERNET_STATUS_REQUEST_COMPLETE call from INTERNET_ReadFile.
by Alexandre Julliard March 3, 2008

March 3, 2008

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

Jacek Caban : mshtml.idl: Added IHTMLScriptElement declaration.
by Alexandre Julliard March 3, 2008

March 3, 2008

Module: wine Branch: master Commit: b8092fbadae8465b7b3ed0068cf56ed2092b0999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8092fbadae8465b7b3ed0068… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 2 19:53:01 2008 +0100 mshtml.idl: Added IHTMLScriptElement declaration. --- include/mshtmdid.h | 15 +++++++++- include/mshtml.idl | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 589b18f..72a3e47 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -315,7 +315,7 @@ #define DISPID_A_DIR (DISPID_A_FIRST+117) #define DISPID_A_UNICODEBIDI (DISPID_A_FIRST+118) #define DISPID_A_DIRECTION (DISPID_A_FIRST+119) -#define DISPID_A_IMEMODE (DISPID_A_FIRST+120) +#define DISPID_A_IMEMODE (DISPID_A_FIRST+120) #define DISPID_A_RUBYALIGN (DISPID_A_FIRST+121) #define DISPID_A_RUBYPOSITION (DISPID_A_FIRST+122) #define DISPID_A_RUBYOVERHANG (DISPID_A_FIRST+123) @@ -1993,6 +1993,19 @@ #define DISPID_IHTMLTABLESECTION_INSERTROW DISPID_TABLESECTION+1 #define DISPID_IHTMLTABLESECTION_DELETEROW DISPID_TABLESECTION+2 +/* IHTMLScriptElement */ +#define DISPID_IHTMLSCRIPTELEMENT_SRC DISPID_SCRIPT+1 +#define DISPID_IHTMLSCRIPTELEMENT_HTMLFOR DISPID_SCRIPT+4 +#define DISPID_IHTMLSCRIPTELEMENT_EVENT DISPID_SCRIPT+5 +#define DISPID_IHTMLSCRIPTELEMENT_TEXT DISPID_SCRIPT+6 +#define DISPID_IHTMLSCRIPTELEMENT_DEFER DISPID_SCRIPT+7 +#define DISPID_IHTMLSCRIPTELEMENT_READYSTATE DISPID_A_READYSTATE +#define DISPID_IHTMLSCRIPTELEMENT_ONERROR DISPID_EVPROP_ONERROR +#define DISPID_IHTMLSCRIPTELEMENT_TYPE DISPID_SCRIPT+9 + +/* IHTMLScriptElement2 */ +#define DISPID_IHTMLSCRIPTELEMENT2_CHARSET DISPID_SCRIPT+10 + /* IHTMLFrameBase2 */ #define DISPID_IHTMLFRAMEBASE2_CONTENTWINDOW DISPID_FRAMESITE+9 #define DISPID_IHTMLFRAMEBASE2_ONLOAD DISPID_EVPROP_ONLOAD diff --git a/include/mshtml.idl b/include/mshtml.idl index 067bf38..ecc9d9d 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -1771,7 +1771,7 @@ interface IHTMLElement : IDispatch [propput, id(DISPID_IHTMLELEMENT_ONKEYUP)] HRESULT onkeyup([in] VARIANT v); - + [propget, id(DISPID_IHTMLELEMENT_ONKEYUP)] HRESULT onkeyup([retval, out] VARIANT *p); @@ -5315,7 +5315,7 @@ interface IHTMLDocument3 : IDispatch [propget, id(DISPID_IHTMLDOCUMENT3_UNIQUEID), hidden] HRESULT uniqueID([retval, out] BSTR *p); - + [id(DISPID_IHTMLDOCUMENT3_ATTACHEVENT)] HRESULT attachEvent( [in] BSTR event, @@ -6663,6 +6663,81 @@ interface IHTMLTableSection : IDispatch } /***************************************************************************** + * IHTMLScriptElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f28b-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLScriptElement : IDispatch +{ + [propput, id(DISPID_IHTMLSCRIPTELEMENT_SRC), displaybind, bindable] + HRESULT src([in] BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_SRC), displaybind, bindable] + HRESULT src([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_HTMLFOR), displaybind, bindable] + HRESULT htmlFor([in] BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_HTMLFOR), displaybind, bindable] + HRESULT htmlFor([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_EVENT), displaybind, bindable] + HRESULT event([in] BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_EVENT), displaybind, bindable] + HRESULT event([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_TEXT), displaybind, bindable] + HRESULT text([in] BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_TEXT), displaybind, bindable] + HRESULT text([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_DEFER), displaybind, bindable] + HRESULT defer([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_DEFER), displaybind, bindable] + HRESULT defer([retval, out] VARIANT_BOOL *p); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_READYSTATE)] + HRESULT readyState([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_ONERROR), displaybind, bindable] + HRESULT onerror([in] VARIANT v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_ONERROR), displaybind, bindable] + HRESULT onerror([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_TYPE), displaybind, bindable] + HRESULT type([in] BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_TYPE), displaybind, bindable] + HRESULT type([retval, out] BSTR *p); +} + +/***************************************************************************** + * IHTMLScriptElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f828-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLScriptElement2 : IDispatch +{ + [propput, id(DISPID_IHTMLSCRIPTELEMENT2_CHARSET), displaybind, bindable] + HRESULT charset([in] BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT2_CHARSET), displaybind, bindable] + HRESULT charset([retval, out] BSTR *p); +} + +/***************************************************************************** * IHTMLFrameBase2 interface */ [

1 0