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

Jacek Caban : widl: Removed unused idfile_token.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: af2eba24b7650fe9459749f76bb3c38b499ee5b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2eba24b7650fe9459749f76… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 14:52:10 2012 +0100 widl: Removed unused idfile_token. --- tools/widl/widl.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 88d2d78..1c9a94b 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -128,7 +128,6 @@ char *server_token; char *regscript_name; char *regscript_token; static char *idfile_name; -static char *idfile_token; char *temp_name; const char *prefix_client = ""; const char *prefix_server = ""; @@ -465,8 +464,6 @@ void write_id_data(const statement_list_t *stmts) { if (!do_idfile) return; - idfile_token = make_token(idfile_name); - idfile = fopen(idfile_name, "w"); if (! idfile) { error("Could not open %s for output\n", idfile_name);

1 0

Jacek Caban : wininet: Added INTERNET_OPTION_MAX_CONNS_PER_SERVER and INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER options setting implementation .
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: 35587e5608322630fd9c2f2e27959a61d515f1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35587e5608322630fd9c2f2e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 12:20:53 2012 +0100 wininet: Added INTERNET_OPTION_MAX_CONNS_PER_SERVER and INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER options setting implementation. --- dlls/wininet/internet.c | 44 ++++++++++++++++++++++++++++++-------------- 1 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a360835..a40d566 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -108,6 +108,8 @@ typedef struct LPWSTR proxyBypass; } proxyinfo_t; +static ULONG max_conns = 2, max_1_0_conns = 4; + static const WCHAR szInternetSettings[] = { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', @@ -2336,7 +2338,7 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * if (*size < sizeof(ULONG)) return ERROR_INSUFFICIENT_BUFFER; - *(ULONG*)buffer = 2; + *(ULONG*)buffer = max_conns; *size = sizeof(ULONG); return ERROR_SUCCESS; @@ -2347,7 +2349,7 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * if (*size < sizeof(ULONG)) return ERROR_INSUFFICIENT_BUFFER; - *(ULONG*)buffer = 4; + *(ULONG*)buffer = max_1_0_conns; *size = sizeof(ULONG); return ERROR_SUCCESS; @@ -2535,6 +2537,10 @@ DWORD INET_SetOption(object_header_t *hdr, DWORD option, void *buf, DWORD size) case INTERNET_OPTION_CALLBACK: WARN("Not settable option %u\n", option); return ERROR_INTERNET_OPTION_NOT_SETTABLE; + case INTERNET_OPTION_MAX_CONNS_PER_SERVER: + case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: + WARN("Called on global option %u\n", option); + return ERROR_INTERNET_INVALID_OPERATION; } return ERROR_INTERNET_INVALID_OPTION; @@ -2546,6 +2552,28 @@ static DWORD set_global_option(DWORD option, void *buf, DWORD size) case INTERNET_OPTION_CALLBACK: WARN("Not global option %u\n", option); return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; + + case INTERNET_OPTION_MAX_CONNS_PER_SERVER: + TRACE("INTERNET_OPTION_MAX_CONNS_PER_SERVER\n"); + + if(size != sizeof(max_conns)) + return ERROR_INTERNET_BAD_OPTION_LENGTH; + if(!*(ULONG*)buf) + return ERROR_BAD_ARGUMENTS; + + max_conns = *(ULONG*)buf; + return ERROR_SUCCESS; + + case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: + TRACE("INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER\n"); + + if(size != sizeof(max_1_0_conns)) + return ERROR_INTERNET_BAD_OPTION_LENGTH; + if(!*(ULONG*)buf) + return ERROR_BAD_ARGUMENTS; + + max_1_0_conns = *(ULONG*)buf; + return ERROR_SUCCESS; } return ERROR_INTERNET_INVALID_OPTION; @@ -2677,18 +2705,6 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, FIXME("Option INTERNET_OPTION_DATA_RECEIVE_TIMEOUT (%d): STUB\n", receivetimeout); } break; - case INTERNET_OPTION_MAX_CONNS_PER_SERVER: - { - ULONG conns = *(ULONG *)lpBuffer; - FIXME("Option INTERNET_OPTION_MAX_CONNS_PER_SERVER (%d): STUB\n", conns); - } - break; - case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: - { - ULONG conns = *(ULONG *)lpBuffer; - FIXME("Option INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER (%d): STUB\n", conns); - } - break; case INTERNET_OPTION_RESET_URLCACHE_SESSION: FIXME("Option INTERNET_OPTION_RESET_URLCACHE_SESSION: STUB\n"); break;

1 0

Jacek Caban : wininet: Use separate function for setting global options.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: a59204a4663f957e31c451c29a245a121ec1a1d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59204a4663f957e31c451c29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 12:19:37 2012 +0100 wininet: Use separate function for setting global options. --- dlls/wininet/internet.c | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index bd954a2..a360835 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2540,6 +2540,17 @@ DWORD INET_SetOption(object_header_t *hdr, DWORD option, void *buf, DWORD size) return ERROR_INTERNET_INVALID_OPTION; } +static DWORD set_global_option(DWORD option, void *buf, DWORD size) +{ + switch(option) { + case INTERNET_OPTION_CALLBACK: + WARN("Not global option %u\n", option); + return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; + } + + return ERROR_INTERNET_INVALID_OPTION; +} + /*********************************************************************** * InternetSetOptionW (WININET.@) * @@ -2555,37 +2566,28 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, { object_header_t *lpwhh; BOOL ret = TRUE; + DWORD res; TRACE("(%p %d %p %d)\n", hInternet, dwOption, lpBuffer, dwBufferLength); lpwhh = (object_header_t*) get_handle_object( hInternet ); - if(lpwhh) { - DWORD res; - + if(lpwhh) res = lpwhh->vtbl->SetOption(lpwhh, dwOption, lpBuffer, dwBufferLength); - if(res != ERROR_INTERNET_INVALID_OPTION) { - WININET_Release( lpwhh ); + else + res = set_global_option(dwOption, lpBuffer, dwBufferLength); - if(res != ERROR_SUCCESS) - SetLastError(res); + if(res != ERROR_INTERNET_INVALID_OPTION) { + if(lpwhh) + WININET_Release(lpwhh); - return res == ERROR_SUCCESS; - } + if(res != ERROR_SUCCESS) + SetLastError(res); + + return res == ERROR_SUCCESS; } switch (dwOption) { - case INTERNET_OPTION_CALLBACK: - { - if (!lpwhh) - { - SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - return FALSE; - } - WININET_Release(lpwhh); - SetLastError(ERROR_INTERNET_OPTION_NOT_SETTABLE); - return FALSE; - } case INTERNET_OPTION_HTTP_VERSION: { HTTP_VERSION_INFO* pVersion=(HTTP_VERSION_INFO*)lpBuffer;

1 0

Jacek Caban : wininet: Added default fallback for setting handle options and use it for INTERNET_OPTION_CALLBACK .
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: 4863257e3090404c1feb443ed4418fa8040a1b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4863257e3090404c1feb443ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 12:19:14 2012 +0100 wininet: Added default fallback for setting handle options and use it for INTERNET_OPTION_CALLBACK. --- dlls/wininet/ftp.c | 6 +++--- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 27 ++++++++++++--------------- dlls/wininet/internet.h | 3 ++- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index dc5bc12..0c7ca12 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1297,7 +1297,7 @@ static const object_vtbl_t FTPFILEVtbl = { FTPFILE_Destroy, NULL, FTPFILE_QueryOption, - NULL, + INET_SetOption, FTPFILE_ReadFile, FTPFILE_ReadFileExA, FTPFILE_ReadFileExW, @@ -2389,7 +2389,7 @@ static const object_vtbl_t FTPSESSIONVtbl = { FTPSESSION_Destroy, FTPSESSION_CloseConnection, FTPSESSION_QueryOption, - NULL, + INET_SetOption, NULL, NULL, NULL, @@ -3474,7 +3474,7 @@ static const object_vtbl_t FTPFINDNEXTVtbl = { FTPFINDNEXT_Destroy, NULL, FTPFINDNEXT_QueryOption, - NULL, + INET_SetOption, NULL, NULL, NULL, diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3c5ed9c..69068bf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2212,7 +2212,7 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, return ERROR_SUCCESS; } - return ERROR_INTERNET_INVALID_OPTION; + return INET_SetOption(hdr, option, buffer, size); } /* read some more data into the read buffer (the read section must be held) */ @@ -5515,7 +5515,7 @@ static DWORD HTTPSESSION_SetOption(object_header_t *hdr, DWORD option, void *buf default: break; } - return ERROR_INTERNET_INVALID_OPTION; + return INET_SetOption(hdr, option, buffer, size); } static const object_vtbl_t HTTPSESSIONVtbl = { diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 391a525..bd954a2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -881,7 +881,7 @@ static const object_vtbl_t APPINFOVtbl = { APPINFO_Destroy, NULL, APPINFO_QueryOption, - NULL, + INET_SetOption, NULL, NULL, NULL, @@ -2529,6 +2529,16 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption, return res == ERROR_SUCCESS; } +DWORD INET_SetOption(object_header_t *hdr, DWORD option, void *buf, DWORD size) +{ + switch(option) { + case INTERNET_OPTION_CALLBACK: + WARN("Not settable option %u\n", option); + return ERROR_INTERNET_OPTION_NOT_SETTABLE; + } + + return ERROR_INTERNET_INVALID_OPTION; +} /*********************************************************************** * InternetSetOptionW (WININET.@) @@ -2549,7 +2559,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, TRACE("(%p %d %p %d)\n", hInternet, dwOption, lpBuffer, dwBufferLength); lpwhh = (object_header_t*) get_handle_object( hInternet ); - if(lpwhh && lpwhh->vtbl->SetOption) { + if(lpwhh) { DWORD res; res = lpwhh->vtbl->SetOption(lpwhh, dwOption, lpBuffer, dwBufferLength); @@ -2845,19 +2855,6 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, switch( dwOption ) { - case INTERNET_OPTION_CALLBACK: - { - object_header_t *lpwh; - - if (!(lpwh = get_handle_object(hInternet))) - { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - return FALSE; - } - WININET_Release(lpwh); - INTERNET_SetLastError(ERROR_INTERNET_OPTION_NOT_SETTABLE); - return FALSE; - } case INTERNET_OPTION_PROXY: { LPINTERNET_PROXY_INFOA pi = (LPINTERNET_PROXY_INFOA) lpBuffer; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 3af93db..720b330 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -486,7 +486,8 @@ object_header_t *get_handle_object( HINTERNET hinternet ) DECLSPEC_HIDDEN; object_header_t *WININET_AddRef( object_header_t *info ) DECLSPEC_HIDDEN; BOOL WININET_Release( object_header_t *info ) DECLSPEC_HIDDEN; -DWORD INET_QueryOption( object_header_t *, DWORD, void *, DWORD *, BOOL ) DECLSPEC_HIDDEN; +DWORD INET_QueryOption(object_header_t*,DWORD,void*,DWORD*,BOOL) DECLSPEC_HIDDEN; +DWORD INET_SetOption(object_header_t*,DWORD,void*,DWORD) DECLSPEC_HIDDEN; time_t ConvertTimeString(LPCWSTR asctime) DECLSPEC_HIDDEN;

1 0

Jacek Caban : include: Added msident.idl.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: e3bf5a1daa51295abc2f1423e3b7962601ae0b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3bf5a1daa51295abc2f1423e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 12:25:56 2012 +0100 include: Added msident.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/msident.idl | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index f0fcf66..d96c954 100644 --- a/.gitignore +++ b/.gitignore @@ -192,6 +192,7 @@ include/msctf.h include/msdadc.h include/mshtmhst.h include/mshtml.h +include/msident.h include/msinkaut.h include/mstask.h include/msxml.h diff --git a/include/Makefile.in b/include/Makefile.in index 5ffc5e8..fa6f837 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -60,6 +60,7 @@ PUBLIC_IDL_H_SRCS = \ msdadc.idl \ mshtmhst.idl \ mshtml.idl \ + msident.idl \ msinkaut.idl \ mstask.idl \ msxml.idl \ diff --git a/include/msident.idl b/include/msident.idl new file mode 100644 index 0000000..fad8bd5 --- /dev/null +++ b/include/msident.idl @@ -0,0 +1,94 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef DO_NO_IMPORTS +import "unknwn.idl"; +import "ocidl.idl"; +import "oleidl.idl"; +import "oaidl.idl"; +#endif + +cpp_quote("#define E_IDENTITIES_DISABLED _HRESULT_TYPEDEF_(0x80007110)") +cpp_quote("#define S_IDENTITIES_DISABLED _HRESULT_TYPEDEF_(0x00007110)") +cpp_quote("#define E_NO_CURRENT_IDENTITY _HRESULT_TYPEDEF_(0x80007111)") +cpp_quote("#define E_USER_CANCELLED _HRESULT_TYPEDEF_(0x80007112)") +cpp_quote("#define E_PROCESS_CANCELLED_SWITCH _HRESULT_TYPEDEF_(0x80007113)") +cpp_quote("#define E_IDENTITY_NOT_FOUND _HRESULT_TYPEDEF_(0x80007114)") +cpp_quote("#define E_IDENTITY_EXISTS _HRESULT_TYPEDEF_(0x80007115)") +cpp_quote("#define E_IDENTITY_CHANGING _HRESULT_TYPEDEF_(0x80007116)") + +[ + uuid(a9ae6c8e-1d1b-11d2-b21a-00c04fa357fa), +] +interface IUserIdentity : IUnknown +{ + HRESULT GetCookie([out] GUID *puidCookie); + + HRESULT GetName( + [in] WCHAR *pszName, + [in] ULONG ulBuffSize); + + [local] + HRESULT OpenIdentityRegKey( + [in]DWORD dwDesiredAccess, + [out] HKEY *phKey); + + HRESULT GetIdentityFolder( + [in] DWORD dwFlags, + [in] WCHAR *pszPath, + [in] ULONG ulBuffSize); + +cpp_quote("#define GIF_ROAMING_FOLDER 0x0001") +cpp_quote("#define GIF_NON_ROAMING_FOLDER 0x0002") +} + +[ + uuid(a9ae6c8f-1d1b-11d2-b21a-00c04fa357fa), + odl +] +interface IEnumUserIdentity : IUnknown +{ + HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] IUnknown **rgelt, + [out] ULONG *pceltFetched); + + HRESULT Skip([in] ULONG celt); + HRESULT Reset(); + HRESULT Clone([out] IEnumUserIdentity **ppenum); + HRESULT GetCount([out] ULONG *pnCount); +} + +[ + uuid(a9ae6c90-1d1b-11d2-b21a-00c04fa357fa) +] +interface IUserIdentityManager : IUnknown +{ + HRESULT EnumIdentities([out] IEnumUserIdentity **ppEnumUser); + HRESULT ManageIdentities([in] HWND hwndParent, [in] DWORD dwFlags); + +cpp_quote("#define UIMI_CREATE_NEW_IDENTITY 0x0001") + HRESULT Logon([in] HWND hwndParent, [in] DWORD dwFlags, [out] IUserIdentity **ppIdentity); + +cpp_quote("#define UIL_FORCE_UI 0x80000001") + HRESULT Logoff([in] HWND hwndParent); + + HRESULT GetIdentityByCookie([in] GUID *uidCookie, [out] IUserIdentity **ppIdentity); +} + +cpp_quote("DEFINE_GUID(CLSID_UserIdentityManager, 0xa9ae6c91,0x1d1b,0x11d2,0xb2,0x1a,0x00,0xc0,0x4f,0xa3,0x57,0xfa);")

1 0

Piotr Caban : include: Added IXMLGenericParse interface definition.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: e62a8ee0d29cf4093d27d6fd0ae330b2efa9a925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62a8ee0d29cf4093d27d6fd0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 8 13:01:06 2012 +0100 include: Added IXMLGenericParse interface definition. --- include/mshtml.idl | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 71d49e1..d80400e 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -16711,6 +16711,20 @@ interface IMarkupPointer : IUnknown } /***************************************************************************** + * IXMLGenericParse interface + */ +[ + object, + pointer_default(unique), + uuid(E4E23071-4D07-11d2-AE76-0080C73BC199) +] +interface IXMLGenericParse : IUnknown +{ + HRESULT SetGenericParse( + [in] VARIANT_BOOL fDoGeneric); +} + +/***************************************************************************** * ISegment interface */ [

1 0

Piotr Caban : mshtml: Set proposed MIME to text/html on main document.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: e4e86a7c0b5673110754cbc0a681d9e51a355ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e86a7c0b5673110754cbc0a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 8 13:02:05 2012 +0100 mshtml: Set proposed MIME to text/html on main document. --- dlls/mshtml/navigate.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e5262ef..69329c4 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1058,6 +1058,8 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) { + static const WCHAR mimeTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; + DWORD read; nsresult nsres; HRESULT hres; @@ -1094,7 +1096,8 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) if(!This->nschannel->content_type) { WCHAR *mime; - hres = FindMimeFromData(NULL, NULL, This->nsstream->buf, This->nsstream->buf_size, NULL, 0, &mime, 0); + hres = FindMimeFromData(NULL, NULL, This->nsstream->buf, This->nsstream->buf_size, + This->window ? mimeTextHtml : NULL, 0, &mime, 0); if(FAILED(hres)) return hres;

1 0

Piotr Caban : mshtml/tests: Test HTMLDocument without MIME type reported.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: 3d5db7a7f5a811c4cbbfce1e637d5b6fb2c7b3f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5db7a7f5a811c4cbbfce1e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 8 13:02:24 2012 +0100 mshtml/tests: Test HTMLDocument without MIME type reported. --- dlls/mshtml/tests/htmldoc.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 53e463a..417d952 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -204,6 +204,7 @@ static BOOL complete, loading_js, loading_hash; static DWORD status_code = HTTP_STATUS_OK; static BOOL asynchronous_binding = FALSE; static BOOL support_wbapp, allow_new_window; +static BOOL report_mime; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -590,10 +591,12 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, BINDSTATUS_CACHEFILENAMEAVAILABLE, &empty_str); ok(hres == S_OK, "ReportProgress(BINDSTATUS_CACHEFILENAMEAVAILABLE) failed: %08x\n", hres); - hres = IInternetProtocolSink_ReportProgress(pOIProtSink, - BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, wszTextCss); - ok(hres == S_OK, - "ReportProgress(BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE) failed: %08x\n", hres); + if(report_mime) { + hres = IInternetProtocolSink_ReportProgress(pOIProtSink, + BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, wszTextCss); + ok(hres == S_OK, + "ReportProgress(BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE) failed: %08x\n", hres); + } hres = IInternetProtocolSink_ReportData(pOIProtSink, BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION, 13, 13); @@ -645,7 +648,7 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, ok(pv != NULL, "pv == NULL\n"); ok(cb > sizeof(css_data), "cb < sizeof(css_data)\n"); ok(pcbRead != NULL, "pcbRead == NULL\n"); - ok(!*pcbRead, "*pcbRead=%d\n", *pcbRead); + ok(!*pcbRead || *pcbRead==sizeof(css_data)-1, "*pcbRead=%d\n", *pcbRead); if(protocol_read) return S_FALSE; @@ -1298,9 +1301,11 @@ static void continue_binding(IBindStatusCallback *callback) static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; - hres = IBindStatusCallback_OnProgress(callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, - wszTextHtml); - ok(hres == S_OK, "OnProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); + if(report_mime) { + hres = IBindStatusCallback_OnProgress(callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, + wszTextHtml); + ok(hres == S_OK, "OnProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); + } hres = IBindStatusCallback_OnProgress(callback, sizeof(html_page)-1, sizeof(html_page)-1, BINDSTATUS_BEGINDOWNLOADDATA, doc_url); @@ -6575,13 +6580,15 @@ static void init_test(enum load_state_t ls) { expect_uihandler_iface = &DocHostUIHandler; } -static void test_HTMLDocument(BOOL do_load) +static void test_HTMLDocument(BOOL do_load, BOOL mime) { IHTMLDocument2 *doc; - trace("Testing HTMLDocument (%s)...\n", (do_load ? "load" : "no load")); + trace("Testing HTMLDocument (%s, %s)...\n", (do_load ? "load" : "no load"), + (report_mime ? "mime" : "no mime")); init_test(do_load ? LD_DOLOAD : LD_NO); + report_mime = mime; doc = create_document(); doc_unk = (IUnknown*)doc; @@ -7387,8 +7394,9 @@ START_TEST(htmldoc) asynchronous_binding = FALSE; test_HTMLDocument_hlink(HTTP_STATUS_OK); - test_HTMLDocument(FALSE); - test_HTMLDocument(TRUE); + test_HTMLDocument(FALSE, TRUE); + test_HTMLDocument(TRUE, FALSE); + test_HTMLDocument(TRUE, TRUE); test_HTMLDocument_StreamLoad(); test_HTMLDocument_StreamInitNew(); test_editing_mode(FALSE);

1 0

Jacek Caban : wininet: Added separated function for querying global options .
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: 9641515bc0c7ec5d58048632af8719c88c3b19b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9641515bc0c7ec5d58048632a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 12:21:12 2012 +0100 wininet: Added separated function for querying global options. --- dlls/wininet/internet.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a40d566..f631469 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2277,10 +2277,10 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return res == ERROR_SUCCESS; } -DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) +static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode) { - static BOOL warn = TRUE; - + /* FIXME: This function currently handles more options than it should. Options requiring + * proper handles should be moved to proper functions */ switch(option) { case INTERNET_OPTION_REQUEST_FLAGS: TRACE("INTERNET_OPTION_REQUEST_FLAGS\n"); @@ -2307,10 +2307,8 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * return ERROR_SUCCESS; case INTERNET_OPTION_CONNECTED_STATE: - if (warn) { - FIXME("INTERNET_OPTION_CONNECTED_STATE: semi-stub\n"); - warn = FALSE; - } + FIXME("INTERNET_OPTION_CONNECTED_STATE: semi-stub\n"); + if (*size < sizeof(ULONG)) return ERROR_INSUFFICIENT_BUFFER; @@ -2440,15 +2438,20 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; case INTERNET_OPTION_POLICY: return ERROR_INVALID_PARAMETER; + } + + FIXME("Stub for %d\n", option); + return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; +} + +DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) +{ + switch(option) { case INTERNET_OPTION_CONTEXT_VALUE: - { - if (!hdr) - return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; if (!size) return ERROR_INVALID_PARAMETER; - if (*size < sizeof(DWORD_PTR)) - { + if (*size < sizeof(DWORD_PTR)) { *size = sizeof(DWORD_PTR); return ERROR_INSUFFICIENT_BUFFER; } @@ -2458,11 +2461,15 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * *(DWORD_PTR *)buffer = hdr->dwContext; *size = sizeof(DWORD_PTR); return ERROR_SUCCESS; - } + + case INTERNET_OPTION_MAX_CONNS_PER_SERVER: + case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: + WARN("Called on global option %u\n", option); + return ERROR_INTERNET_INVALID_OPERATION; } - FIXME("Stub for %d\n", option); - return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; + /* FIXME: we shouldn't call it here */ + return query_global_option(option, buffer, size, unicode); } /*********************************************************************** @@ -2490,7 +2497,7 @@ BOOL WINAPI InternetQueryOptionW(HINTERNET hInternet, DWORD dwOption, WININET_Release(hdr); } }else { - res = INET_QueryOption(NULL, dwOption, lpBuffer, lpdwBufferLength, TRUE); + res = query_global_option(dwOption, lpBuffer, lpdwBufferLength, TRUE); } if(res != ERROR_SUCCESS) @@ -2523,7 +2530,7 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption, WININET_Release(hdr); } }else { - res = INET_QueryOption(NULL, dwOption, lpBuffer, lpdwBufferLength, FALSE); + res = query_global_option(dwOption, lpBuffer, lpdwBufferLength, FALSE); } if(res != ERROR_SUCCESS)

1 0

Jacek Caban : wininet: Added more connection limit options tests.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: a3709badab8e528c962588f073c088cf1d1e3bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3709badab8e528c962588f07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 12:21:24 2012 +0100 wininet: Added more connection limit options tests. --- dlls/wininet/tests/internet.c | 68 ++++++++++++++++++++++++++++++++++------ 1 files changed, 57 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 3b801f3..fc15b2a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -159,6 +159,7 @@ static void test_InternetQueryOptionA(void) static const char useragent[] = {"Wininet Test"}; char *buffer; int retval; + BOOL res; hinet = InternetOpenA(useragent,INTERNET_OPEN_TYPE_DIRECT,NULL,NULL, 0); ok((hinet != 0x0),"InternetOpen Failed\n"); @@ -237,20 +238,64 @@ static void test_InternetQueryOptionA(void) ok(retval == 0,"Got wrong return value %d\n",retval); ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code%d\n",err); - InternetCloseHandle(hinet); - len = sizeof(val); - retval = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); - ok(retval == TRUE,"Got wrong return value %d\n", retval); - ok(len == sizeof(val), "got %d\n", len); - ok(val == 2, "got %d\n", val); + val = 0xdeadbeef; + res = InternetQueryOptionA(hinet, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); + ok(!res, "InternetQueryOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER) succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_INVALID_OPERATION, "GetLastError() = %u\n", GetLastError()); - len = sizeof(val); - retval = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER, &val, &len); - ok(retval == TRUE,"Got wrong return value %d\n", retval); - ok(len == sizeof(val), "got %d\n", len); - ok(val == 4, "got %d\n", val); + val = 2; + res = InternetSetOptionA(hinet, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)); + ok(!res, "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER) succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_INVALID_OPERATION, "GetLastError() = %u\n", GetLastError()); + + InternetCloseHandle(hinet); +} + +static void test_max_conns(void) +{ + DWORD len, val; + BOOL res; + len = sizeof(val); + val = 0xdeadbeef; + res = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); + ok(res,"Got wrong return value %x\n", res); + ok(len == sizeof(val), "got %d\n", len); + ok(val == 2, "got %d\n", val); + + len = sizeof(val); + val = 0xdeadbeef; + res = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER, &val, &len); + ok(res,"Got wrong return value %x\n", res); + ok(len == sizeof(val), "got %d\n", len); + ok(val == 4, "got %d\n", val); + + val = 3; + res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)); + ok(res, "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER) failed: %x\n", res); + + len = sizeof(val); + val = 0xdeadbeef; + res = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); + ok(res,"Got wrong return value %x\n", res); + ok(len == sizeof(val), "got %d\n", len); + ok(val == 3, "got %d\n", val); + + val = 0; + res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)); + ok(!res, "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER, 0) succeeded\n"); + ok(GetLastError() == ERROR_BAD_ARGUMENTS, "GetLastError() = %u\n", GetLastError()); + + val = 2; + res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)-1); + ok(!res, "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER) succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_BAD_OPTION_LENGTH, "GetLastError() = %u\n", GetLastError()); + + val = 2; + res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)+1); + ok(!res, "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER) succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_BAD_OPTION_LENGTH, "GetLastError() = %u\n", GetLastError()); } static void test_get_cookie(void) @@ -1311,6 +1356,7 @@ START_TEST(internet) test_Option_PerConnectionOption(); test_Option_PerConnectionOptionA(); test_InternetErrorDlg(); + test_max_conns(); if (!pInternetTimeFromSystemTimeA) win_skip("skipping the InternetTime tests\n");

1 0