October 2010 - Wine-commits

Nikolay Sivov : msxml3: Store response data in a stream.
by Alexandre Julliard 07 Oct '10

07 Oct '10

Module: wine Branch: master Commit: 62656c57bf61d142f2529e21cb75a98cd955a1fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=62656c57bf61d142f2529e21c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 7 00:49:56 2010 +0400 msxml3: Store response data in a stream. --- dlls/msxml3/httprequest.c | 67 +++++++++++++++++++++++++++++++++------------ 1 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 7deae26..9cccd3a 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -2,7 +2,7 @@ * IXMLHTTPRequest implementation * * Copyright 2008 Alistair Leslie-Hughes - * Copyright 2010 Nikolay Sivov for Codeweavers + * Copyright 2010 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #define COBJMACROS +#define NONAMELESSUNION #include "config.h" @@ -84,6 +86,19 @@ static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) return (httprequest *)((char*)iface - FIELD_OFFSET(httprequest, lpVtbl)); } +static void httprequest_setreadystate(httprequest *This, READYSTATE state) +{ + This->state = state; + + if (This->sink) + { + DISPPARAMS params; + + memset(&params, 0, sizeof(params)); + IDispatch_Invoke(This->sink, 0, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, 0, 0, 0); + } +} + struct BindStatusCallback { const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; @@ -92,6 +107,9 @@ struct BindStatusCallback IBinding *binding; httprequest *request; + + /* response data */ + IStream *stream; }; static inline BindStatusCallback *impl_from_IBindStatusCallback( IBindStatusCallback *iface ) @@ -171,6 +189,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) if (!ref) { if (This->binding) IBinding_Release(This->binding); + if (This->stream) IStream_Release(This->stream); heap_free(This); } @@ -189,7 +208,9 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa This->binding = pbind; IBinding_AddRef(pbind); - return S_OK; + httprequest_setreadystate(This->request, READYSTATE_LOADED); + + return CreateStreamOnHGlobal(NULL, TRUE, &This->stream); } static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface, LONG *pPriority) @@ -228,6 +249,15 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac TRACE("(%p)->(0x%08x %s)\n", This, hr, debugstr_w(error)); + if (This->binding) + { + IBinding_Release(This->binding); + This->binding = NULL; + } + + if (hr == S_OK) + httprequest_setreadystate(This->request, READYSTATE_COMPLETE); + return S_OK; } @@ -253,13 +283,26 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, } static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, - DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed) + DWORD flags, DWORD size, FORMATETC *format, STGMEDIUM *stgmed) { BindStatusCallback *This = impl_from_IBindStatusCallback(iface); + DWORD read, written; + BYTE buf[4096]; + HRESULT hr; - FIXME("(%p)->(%08x %d %p %p): stub\n", This, grfBSCF, dwSize, pformatetc, pstgmed); + TRACE("(%p)->(%08x %d %p %p)\n", This, flags, size, format, stgmed); - return E_NOTIMPL; + do + { + hr = IStream_Read(stgmed->u.pstm, buf, sizeof(buf), &read); + if (hr != S_OK) break; + + hr = IStream_Write(This->stream, buf, read, &written); + } while((hr == S_OK) && written != 0 && read != 0); + + httprequest_setreadystate(This->request, READYSTATE_INTERACTIVE); + + return S_OK; } static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, @@ -388,6 +431,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * bsc->ref = 1; bsc->request = This; bsc->binding = NULL; + bsc->stream = NULL; hr = RegisterBindStatusCallback(pbc, (IBindStatusCallback*)bsc, NULL, 0); if (hr == S_OK) @@ -416,19 +460,6 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * return hr; } -static void httprequest_setreadystate(httprequest *This, READYSTATE state) -{ - This->state = state; - - if (This->sink) - { - DISPPARAMS params; - - memset(&params, 0, sizeof(params)); - IDispatch_Invoke(This->sink, 0, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, 0, 0, 0); - } -} - static HRESULT WINAPI httprequest_QueryInterface(IXMLHTTPRequest *iface, REFIID riid, void **ppvObject) { httprequest *This = impl_from_IXMLHTTPRequest( iface );

1 0

Nikolay Sivov : msxml3: Implement ::get_responseText() for UTF-8 and UTF-16 (little endian) response encoding.
by Alexandre Julliard 07 Oct '10

07 Oct '10

Module: wine Branch: master Commit: eebf331e892353921947c039cfbffa18e7824c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebf331e892353921947c039c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 7 03:20:35 2010 +0400 msxml3: Implement ::get_responseText() for UTF-8 and UTF-16 (little endian) response encoding. --- dlls/msxml3/httprequest.c | 48 +++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 14 ++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 9cccd3a..3a3e0d6 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +#include <libxml/encoding.h> + static const WCHAR MethodGetW[] = {'G','E','T',0}; static const WCHAR MethodPutW[] = {'P','U','T',0}; static const WCHAR MethodPostW[] = {'P','O','S','T',0}; @@ -770,13 +772,53 @@ static HRESULT WINAPI httprequest_get_responseXML(IXMLHTTPRequest *iface, IDispa return E_NOTIMPL; } -static HRESULT WINAPI httprequest_get_responseText(IXMLHTTPRequest *iface, BSTR *pbstrBody) +static HRESULT WINAPI httprequest_get_responseText(IXMLHTTPRequest *iface, BSTR *body) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); + HGLOBAL hglobal; + HRESULT hr; - FIXME("stub %p %p\n", This, pbstrBody); + TRACE("(%p)->(%p)\n", This, body); - return E_NOTIMPL; + if (!body) return E_INVALIDARG; + if (This->state != READYSTATE_COMPLETE) return E_FAIL; + + hr = GetHGlobalFromStream(This->bsc->stream, &hglobal); + if (hr == S_OK) + { + xmlChar *ptr = GlobalLock(hglobal); + DWORD size = GlobalSize(hglobal); + xmlCharEncoding encoding = XML_CHAR_ENCODING_UTF8; + + /* try to determine data encoding */ + if (size >= 4) + { + encoding = xmlDetectCharEncoding(ptr, 4); + TRACE("detected encoding: %s\n", xmlGetCharEncodingName(encoding)); + if ( encoding != XML_CHAR_ENCODING_UTF8 && + encoding != XML_CHAR_ENCODING_UTF16LE && + encoding != XML_CHAR_ENCODING_NONE ) + { + FIXME("unsupported encoding: %s\n", xmlGetCharEncodingName(encoding)); + GlobalUnlock(hglobal); + return E_FAIL; + } + } + + /* without BOM assume UTF-8 */ + if (encoding == XML_CHAR_ENCODING_UTF8 || + encoding == XML_CHAR_ENCODING_NONE ) + { + *body = bstr_from_xmlChar(ptr); + } + else + *body = SysAllocStringByteLen((LPCSTR)ptr, size); + + if (!*body) hr = E_OUTOFMEMORY; + GlobalUnlock(hglobal); + } + + return hr; } static HRESULT WINAPI httprequest_get_responseBody(IXMLHTTPRequest *iface, VARIANT *pvarBody) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bcc9842..6035d2b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3188,6 +3188,8 @@ static void test_XMLHTTP(void) 'c','r','o','s','s','o','v','e','r','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', 'x','m','l','t','e','s','t','.','x','m','l',0}; static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0}; + static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; + IXMLHttpRequest *pXMLHttpRequest; BSTR bstrResponse, method, url; VARIANT dummy; @@ -3359,6 +3361,18 @@ todo_wine { } ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLHttpRequest_get_responseText(pXMLHttpRequest, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_get_responseText(pXMLHttpRequest, &bstrResponse); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + { + ok(!memcmp(bstrResponse, _bstr_(xmltestbodyA), sizeof(xmltestbodyA)*sizeof(WCHAR)), + "expected %s, got %s\n", xmltestbodyA, wine_dbgstr_w(bstrResponse)); + SysFreeString(bstrResponse); + } + SysFreeString(url); IDispatch_Release(event);

1 0

Andrew Nguyen : msvcrt/tests: Add tests for the __p__(w)environ accessors.
by Alexandre Julliard 07 Oct '10

07 Oct '10

Module: wine Branch: master Commit: 797d6cb4e24b90f93cc8efaa854b7758a36ea15e URL: http://source.winehq.org/git/wine.git/?a=commit;h=797d6cb4e24b90f93cc8efaa8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Oct 6 21:58:39 2010 -0500 msvcrt/tests: Add tests for the __p__(w)environ accessors. --- dlls/msvcrt/tests/environ.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 3169503..2e3e7f8 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -45,6 +45,9 @@ static const char *a_very_long_env_string = void __cdecl __getmainargs(int *, char ***, char ***, int, int *); void __cdecl __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *); +static char ***(__cdecl *p__p__environ)(void); +static WCHAR ***(__cdecl *p__p__wenviron)(void); + static char ***p_environ; static WCHAR ***p_wenviron; @@ -52,6 +55,8 @@ static void init(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + p__p__environ = (void *)GetProcAddress(hmod, "__p__environ"); + p__p__wenviron = (void *)GetProcAddress(hmod, "__p__wenviron"); p_environ = (void *)GetProcAddress(hmod, "_environ"); p_wenviron = (void *)GetProcAddress(hmod, "_wenviron"); } @@ -81,6 +86,15 @@ static void test__environ(void) return; } + /* Examine the returned pointer from __p__environ(), if available. */ + if (p__p__environ) + { + ok( *p__p__environ() == *p_environ, + "Expected _environ pointers to be identical\n" ); + } + else + skip( "__p__environ() is not available\n" ); + /* Note that msvcrt from Windows versions older than Vista * expects the mode pointer parameter to be valid.*/ __getmainargs(&argc, &argv, &envp, 0, &mode); @@ -125,6 +139,15 @@ static void test__wenviron(void) return; } + /* Examine the returned pointer from __p__wenviron(), if available. */ + if (p__p__wenviron) + { + ok( *p__p__wenviron() == NULL, + "Expected _wenviron pointers to be NULL\n" ); + } + else + skip( "__p__wenviron() is not available\n" ); + /* __getmainargs doesn't initialize _wenviron. */ __getmainargs(&argc, &argv, &envp, 0, &mode); @@ -153,6 +176,14 @@ static void test__wenviron(void) return; } + /* Examine the returned pointer from __p__wenviron(), + * if available, after _wenviron is initialized. */ + if (p__p__wenviron) + { + ok( *p__p__wenviron() == *p_wenviron, + "Expected _wenviron pointers to be identical\n" ); + } + for (i = 0; ; i++) { if ((*p_wenviron)[i])

1 0

Andrew Nguyen : msvcrt: Initialize _wenviron in Unicode environment getter function.
by Alexandre Julliard 07 Oct '10

07 Oct '10

Module: wine Branch: master Commit: eb094728709b08f42a3db13074a6105120da24cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb094728709b08f42a3db1307… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Oct 6 21:59:57 2010 -0500 msvcrt: Initialize _wenviron in Unicode environment getter function. --- dlls/msvcrt/environ.c | 8 ++++++-- dlls/msvcrt/tests/environ.c | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 6ceeebb..add5905 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -34,7 +34,7 @@ char * CDECL MSVCRT_getenv(const char *name) char **environ; unsigned int length=strlen(name); - for (environ = *__p__environ(); *environ; environ++) + for (environ = MSVCRT__environ; *environ; environ++) { char *str = *environ; char *pos = strchr(str,'='); @@ -55,7 +55,11 @@ MSVCRT_wchar_t * CDECL _wgetenv(const MSVCRT_wchar_t *name) MSVCRT_wchar_t **environ; unsigned int length=strlenW(name); - for (environ = *__p__wenviron(); *environ; environ++) + /* Initialize the _wenviron array if it's not already created. */ + if (!MSVCRT__wenviron) + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(NULL); + + for (environ = MSVCRT__wenviron; *environ; environ++) { MSVCRT_wchar_t *str = *environ; MSVCRT_wchar_t *pos = strchrW(str,'='); diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 2e3e7f8..9e1263a 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -125,6 +125,9 @@ static void test__environ(void) static void test__wenviron(void) { + static const WCHAR cat_eq_dogW[] = {'c','a','t','=','d','o','g',0}; + static const WCHAR cat_eqW[] = {'c','a','t','=',0}; + int argc; char **argv, **envp = NULL; WCHAR **wargv, **wenvp = NULL; @@ -166,6 +169,10 @@ static void test__wenviron(void) /* _wenviron isn't initialized until __wgetmainargs is called or * one of the Unicode environment manipulation functions is called. */ + ok( _wputenv(cat_eq_dogW) == 0, "failed setting cat=dog\n" ); + ok( *p_wenviron != NULL, "Expected _wenviron to be non-NULL\n" ); + ok( _wputenv(cat_eqW) == 0, "failed deleting cat\n" ); + __wgetmainargs(&argc, &wargv, &wenvp, 0, &mode); ok( *p_wenviron != NULL, "Expected _wenviron to be non-NULL\n" );

1 0

Jeremy Drake : oleaut32/tests: Test conversion of ambiguous DATE values.
by Alexandre Julliard 07 Oct '10

07 Oct '10

Module: wine Branch: master Commit: 25118e53835dd19aad9a8a27e07e3b6344609a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25118e53835dd19aad9a8a27e… Author: Jeremy Drake <wine(a)jdrake.com> Date: Wed Oct 6 23:26:54 2010 -0700 oleaut32/tests: Test conversion of ambiguous DATE values. For 0.0 < x < 1.0, DATE values x and -x represent the same date/time: 30-Dec-1899 at some time determined by x. When converting from DATE, either value is accepted. When converting to DATE, the positive value is produced. --- dlls/oleaut32/tests/vartest.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 1d02b3b..962a415 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1615,6 +1615,9 @@ static void test_VarUdateFromDate(void) } /* This just demostrates the non-linear nature of values prior to the epoch */ DT2UD(-4.0,0,S_OK,26,12,1899,0,0,0,0,2,360); + /* Numerical oddity: for 0.0 < x < 1.0, x and -x represent the same datetime */ + todo_wine DT2UD(-0.25,0,S_OK,30,12,1899,6,0,0,0,6,364); + DT2UD(0.25,0,S_OK,30,12,1899,6,0,0,0,6,364); } @@ -1686,6 +1689,9 @@ static void test_VarDateFromUdate(void) } /* This just demostrates the non-linear nature of values prior to the epoch */ UD2T(26,12,1899,0,0,0,0,2,360,0,S_OK,-4.0); + /* for DATE values 0.0 < x < 1.0, x and -x represent the same datetime */ + /* but when converting to DATE, prefer the positive versions */ + UD2T(30,12,1899,6,0,0,0,6,364,0,S_OK,0.25); } static void test_st2dt(int line, WORD d, WORD m, WORD y, WORD h, WORD mn,

1 0

Jeremy Drake : oleaut32: Fix handling of negative fractional variant dates.
by Alexandre Julliard 07 Oct '10

07 Oct '10

Module: wine Branch: master Commit: c8a4983ed98ccda52849bcc1121cb1da674aac7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a4983ed98ccda52849bcc11… Author: Jeremy Drake <wine(a)jdrake.com> Date: Wed Oct 6 23:27:23 2010 -0700 oleaut32: Fix handling of negative fractional variant dates. The integer part is the number of days to be added to the epoch (1899-12-30), and the fractional part (disregarding sign) represents the fraction of that day that has elapsed. --- dlls/oleaut32/tests/vartest.c | 14 +++++--------- dlls/oleaut32/variant.c | 13 ++++++++----- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 962a415..ee56c16 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1609,14 +1609,12 @@ static void test_VarUdateFromDate(void) DT2UD(29221.7508765432,0,S_OK,1,1,1980,18,1,16,0,2,1); /* 6:18:02 PM */ /* Test handling of times on dates prior to the epoch */ - todo_wine { - DT2UD(-5.25,0,S_OK,25,12,1899,6,0,0,0,1,359); - DT2UD(-5.9999884259259,0,S_OK,25,12,1899,23,59,59,0,1,359); - } + DT2UD(-5.25,0,S_OK,25,12,1899,6,0,0,0,1,359); + DT2UD(-5.9999884259259,0,S_OK,25,12,1899,23,59,59,0,1,359); /* This just demostrates the non-linear nature of values prior to the epoch */ DT2UD(-4.0,0,S_OK,26,12,1899,0,0,0,0,2,360); /* Numerical oddity: for 0.0 < x < 1.0, x and -x represent the same datetime */ - todo_wine DT2UD(-0.25,0,S_OK,30,12,1899,6,0,0,0,6,364); + DT2UD(-0.25,0,S_OK,30,12,1899,6,0,0,0,6,364); DT2UD(0.25,0,S_OK,30,12,1899,6,0,0,0,6,364); } @@ -1683,10 +1681,8 @@ static void test_VarDateFromUdate(void) UD2T(1,13,1980,0,0,0,0,2,1,0,S_OK,29587.0); /* Rolls fwd to 1/1/1981 */ /* Test handling of times on dates prior to the epoch */ - todo_wine { - UD2T(25,12,1899,6,0,0,0,1,359,0,S_OK,-5.25); - UD2T(25,12,1899,23,59,59,0,1,359,0,S_OK,-5.9999884259259); - } + UD2T(25,12,1899,6,0,0,0,1,359,0,S_OK,-5.25); + UD2T(25,12,1899,23,59,59,0,1,359,0,S_OK,-5.9999884259259); /* This just demostrates the non-linear nature of values prior to the epoch */ UD2T(26,12,1899,0,0,0,0,2,360,0,S_OK,-4.0); /* for DATE values 0.0 < x < 1.0, x and -x represent the same datetime */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 3d8e528..92a86fd 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1359,7 +1359,7 @@ INT WINAPI VariantTimeToSystemTime(double dateIn, LPSYSTEMTIME lpSt) HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DATE *pDateOut) { UDATE ud; - double dateVal; + double dateVal, dateSign; TRACE("(%p->%d/%d/%d %d:%d:%d:%d %d %d,0x%08x,0x%08x,%p)\n", pUdateIn, pUdateIn->st.wMonth, pUdateIn->st.wDay, pUdateIn->st.wYear, @@ -1381,10 +1381,13 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT /* Date */ dateVal = VARIANT_DateFromJulian(VARIANT_JulianFromDMY(ud.st.wYear, ud.st.wMonth, ud.st.wDay)); + /* Sign */ + dateSign = (dateVal < 0.0) ? -1.0 : 1.0; + /* Time */ - dateVal += ud.st.wHour / 24.0; - dateVal += ud.st.wMinute / 1440.0; - dateVal += ud.st.wSecond / 86400.0; + dateVal += ud.st.wHour / 24.0 * dateSign; + dateVal += ud.st.wMinute / 1440.0 * dateSign; + dateVal += ud.st.wSecond / 86400.0 * dateSign; TRACE("Returning %g\n", dateVal); *pDateOut = dateVal; @@ -1447,7 +1450,7 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) datePart = dateIn < 0.0 ? ceil(dateIn) : floor(dateIn); /* Compensate for int truncation (always downwards) */ - timePart = dateIn - datePart + 0.00000000001; + timePart = fabs(dateIn - datePart) + 0.00000000001; if (timePart >= 1.0) timePart -= 0.00000000001;

1 0

Alexandre Goujon : mshtml: Update the Gecko find procedure comment to reflect the latest behavior.
by Alexandre Julliard 07 Oct '10

07 Oct '10

Module: wine Branch: master Commit: 8a64ba7ee8db50dc99024545f0905c96b5f41a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a64ba7ee8db50dc99024545f… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Wed Oct 6 21:33:26 2010 +0200 mshtml: Update the Gecko find procedure comment to reflect the latest behavior. --- dlls/mshtml/install.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index ee6959d..8261615 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -476,9 +476,11 @@ BOOL install_wine_gecko(BOOL silent) }else { /* * Try to find Gecko .cab file in following order: - * - directory stored in GeckoCabDir value of HKCU/Software/MSHTML key - * - $datadir/gecko - * - download from URL stored in GeckoUrl value of HKCU/Software/MSHTML key + * - directory stored in GeckoCabDir value of HKCU/Wine/Software/MSHTML key + * - $datadir/gecko/ + * - $GECKO_DATADIR/wine/gecko/ + * - /usr/share/wine/gecko/ + * - download from URL stored in GeckoUrl value of HKCU/Wine/Software/MSHTML key */ if(!install_from_registered_dir() && !install_from_default_dir()

1 0

Juan Lang : cryptui: Don' t crash displaying a certificate hierarchy when the certificate' s signer isn't found.
by Alexandre Julliard 07 Oct '10

07 Oct '10

Module: wine Branch: master Commit: d48a56db5cc99358fd181eb14083a4189370150c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48a56db5cc99358fd181eb14… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 6 11:39:58 2010 -0700 cryptui: Don't crash displaying a certificate hierarchy when the certificate's signer isn't found. Spotted by André Hentschel. --- dlls/cryptui/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 339ad61..3a8f8f8 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -4040,8 +4040,8 @@ static void show_cert_chain(HWND hwnd, struct hierarchy_data *data) tvis.u.item.pszText = name; tvis.u.item.state = TVIS_EXPANDED; tvis.u.item.stateMask = TVIS_EXPANDED; - if (i == 1 && - (provSigner->pChainContext->TrustStatus.dwErrorStatus & + if (i == 1 && (!provSigner->pChainContext || + provSigner->pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_PARTIAL_CHAIN)) { /* The root of the chain has a special case: if the chain is

1 0

Jacek Caban : mshtml: Moved more code to handle_docobj_load.
by Alexandre Julliard 07 Oct '10

07 Oct '10

Module: wine Branch: master Commit: f7910c930400c4f9bcb99ed9914cb2438c5afd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7910c930400c4f9bcb99ed99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 21:35:39 2010 +0200 mshtml: Moved more code to handle_docobj_load. --- dlls/mshtml/nsevents.c | 66 ++++++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 8dda1e5..85d6e56 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -178,65 +178,67 @@ static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, static void handle_docobj_load(HTMLDocumentObj *doc) { - IOleCommandTarget *olecmd = NULL; HRESULT hres; - if(!doc->client) - return; + if(doc->nscontainer->editor_controller) { + nsIController_Release(doc->nscontainer->editor_controller); + doc->nscontainer->editor_controller = NULL; + } - hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); - if(SUCCEEDED(hres)) { - if(doc->download_state) { - VARIANT state, progress; + if(doc->usermode == EDITMODE) + handle_edit_load(&doc->basedoc); - V_VT(&progress) = VT_I4; - V_I4(&progress) = 0; - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETPROGRESSPOS, - OLECMDEXECOPT_DONTPROMPTUSER, &progress, NULL); + if(doc->client) { + IOleCommandTarget *olecmd = NULL; - V_VT(&state) = VT_I4; - V_I4(&state) = 0; - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETDOWNLOADSTATE, - OLECMDEXECOPT_DONTPROMPTUSER, &state, NULL); - } + hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(SUCCEEDED(hres)) { + if(doc->download_state) { + VARIANT state, progress; + + V_VT(&progress) = VT_I4; + V_I4(&progress) = 0; + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETPROGRESSPOS, + OLECMDEXECOPT_DONTPROMPTUSER, &progress, NULL); - IOleCommandTarget_Exec(olecmd, &CGID_ShellDocView, 103, 0, NULL, NULL); - IOleCommandTarget_Exec(olecmd, &CGID_MSHTML, IDM_PARSECOMPLETE, 0, NULL, NULL); - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_HTTPEQUIV_DONE, 0, NULL, NULL); + V_VT(&state) = VT_I4; + V_I4(&state) = 0; + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETDOWNLOADSTATE, + OLECMDEXECOPT_DONTPROMPTUSER, &state, NULL); + } - IOleCommandTarget_Release(olecmd); + IOleCommandTarget_Exec(olecmd, &CGID_ShellDocView, 103, 0, NULL, NULL); + IOleCommandTarget_Exec(olecmd, &CGID_MSHTML, IDM_PARSECOMPLETE, 0, NULL, NULL); + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_HTTPEQUIV_DONE, 0, NULL, NULL); + + IOleCommandTarget_Release(olecmd); + } } + doc->download_state = 0; } static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event) { HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; - HTMLDocumentObj *doc_obj; nsIDOMHTMLElement *nsbody = NULL; + HTMLDocumentObj *doc_obj = NULL; TRACE("(%p)\n", doc); if(!doc || !doc->basedoc.window) return NS_ERROR_FAILURE; - doc_obj = doc->basedoc.doc_obj; + if(doc->basedoc.doc_obj && doc->basedoc.doc_obj->basedoc.doc_node == doc) + doc_obj = doc->basedoc.doc_obj; connect_scripts(doc->basedoc.window); - if(doc_obj->nscontainer->editor_controller) { - nsIController_Release(doc_obj->nscontainer->editor_controller); - doc_obj->nscontainer->editor_controller = NULL; - } - - if(doc_obj->usermode == EDITMODE) - handle_edit_load(&doc_obj->basedoc); - - if(doc == doc_obj->basedoc.doc_node) + if(doc_obj) handle_docobj_load(doc_obj); set_ready_state(doc->basedoc.window, READYSTATE_COMPLETE); - if(doc == doc_obj->basedoc.doc_node) { + if(doc_obj) { if(doc_obj->view_sink) IAdviseSink_OnViewChange(doc_obj->view_sink, DVASPECT_CONTENT, -1);

1 0

Jacek Caban : mshtml: Report better status in on_stop_nsrequest.
by Alexandre Julliard 07 Oct '10

07 Oct '10

Module: wine Branch: master Commit: 6fff7e7c05c124955db69722c13731a9e3d537c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fff7e7c05c124955db69722c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 21:35:22 2010 +0200 mshtml: Report better status in on_stop_nsrequest. --- dlls/mshtml/mshtml_private.h | 9 ++++++++- dlls/mshtml/navigate.c | 18 ++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e4e074a..6888f00 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -34,6 +34,9 @@ #include "nsiface.h" +#define NS_ERROR_GENERATE_FAILURE(module,code) \ + ((nsresult) (((PRUint32)(1<<31)) | ((PRUint32)(module+0x45)<<16) | ((PRUint32)(code)))) + #define NS_OK ((nsresult)0x00000000L) #define NS_ERROR_FAILURE ((nsresult)0x80004005L) #define NS_ERROR_OUT_OF_MEMORY ((nsresult)0x8007000EL) @@ -42,7 +45,11 @@ #define NS_ERROR_NOT_AVAILABLE ((nsresult)0x80040111L) #define NS_ERROR_INVALID_ARG ((nsresult)0x80070057L) #define NS_ERROR_UNEXPECTED ((nsresult)0x8000ffffL) -#define NS_ERROR_UNKNOWN_PROTOCOL ((nsresult)0x804b0012L) + +#define NS_ERROR_MODULE_NETWORK 6 + +#define NS_BINDING_ABORTED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 2) +#define NS_ERROR_UNKNOWN_PROTOCOL NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 18) #define NS_FAILED(res) ((res) & 0x80000000) #define NS_SUCCEEDED(res) (!NS_FAILED(res)) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 2ddadae..fc13a3e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -992,7 +992,18 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) { - nsresult nsres; + nsresult nsres, request_result; + + switch(result) { + case S_OK: + request_result = NS_OK; + break; + case E_ABORT: + request_result = NS_BINDING_ABORTED; + break; + default: + request_result = NS_ERROR_FAILURE; + } if(!This->bsc.readed && SUCCEEDED(result)) { TRACE("No data read! Calling OnStartRequest\n"); @@ -1001,15 +1012,14 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) if(This->nslistener) { nsres = nsIStreamListener_OnStopRequest(This->nslistener, - (nsIRequest*)NSCHANNEL(This->nschannel), - This->nscontext, SUCCEEDED(result) ? NS_OK : NS_ERROR_FAILURE); + (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext, request_result); if(NS_FAILED(nsres)) WARN("OnStopRequet failed: %08x\n", nsres); } if(This->nschannel->load_group) { nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, - (nsIRequest*)NSCHANNEL(This->nschannel), NULL, NS_OK); + (nsIRequest*)NSCHANNEL(This->nschannel), NULL, request_result); if(NS_FAILED(nsres)) ERR("RemoveRequest failed: %08x\n", nsres); }

1 0