September 2009 - Wine-commits

Andrew Eikum : mshtml: Reimplement IHTMLElement::{get, set}Attribute using IDispatchEx.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 98fcf442dc3b476998cd5ed8e7489e580161b661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98fcf442dc3b476998cd5ed8e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 21 12:29:55 2009 -0500 mshtml: Reimplement IHTMLElement::{get, set}Attribute using IDispatchEx. --- dlls/mshtml/htmlelem.c | 105 ++++++++++++---------------------------------- dlls/mshtml/tests/dom.c | 75 +++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 77 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ad4f370..1fde2e9 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -96,44 +96,26 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr VARIANT AttributeValue, LONG lFlags) { HTMLElement *This = HTMLELEM_THIS(iface); - nsAString attr_str; - nsAString value_str; - nsresult nsres; HRESULT hres; - VARIANT AttributeValueChanged; - - WARN("(%p)->(%s . %08x)\n", This, debugstr_w(strAttributeName), lFlags); - - if(!This->nselem) { - FIXME("NULL nselem\n"); - return E_NOTIMPL; - } + DISPID dispid, dispidNamed = DISPID_PROPERTYPUT; + DISPPARAMS dispParams; + EXCEPINFO excep; - VariantInit(&AttributeValueChanged); + TRACE("(%p)->(%s . %08x)\n", This, debugstr_w(strAttributeName), lFlags); - hres = VariantChangeType(&AttributeValueChanged, &AttributeValue, 0, VT_BSTR); - if (FAILED(hres)) { - WARN("couldn't convert input attribute value %d to VT_BSTR\n", V_VT(&AttributeValue)); + hres = IDispatchEx_GetDispID(DISPATCHEX(&This->node.dispex), strAttributeName, + fdexNameCaseInsensitive | fdexNameEnsure, &dispid); + if(FAILED(hres)) return hres; - } - - nsAString_Init(&attr_str, strAttributeName); - nsAString_Init(&value_str, V_BSTR(&AttributeValueChanged)); - - TRACE("setting %s to %s\n", debugstr_w(strAttributeName), - debugstr_w(V_BSTR(&AttributeValueChanged))); - - nsres = nsIDOMHTMLElement_SetAttribute(This->nselem, &attr_str, &value_str); - nsAString_Finish(&attr_str); - nsAString_Finish(&value_str); - if(NS_SUCCEEDED(nsres)) { - hres = S_OK; - }else { - ERR("SetAttribute failed: %08x\n", nsres); - hres = E_FAIL; - } + dispParams.cArgs = 1; + dispParams.cNamedArgs = 1; + dispParams.rgdispidNamedArgs = &dispidNamed; + dispParams.rgvarg = &AttributeValue; + hres = IDispatchEx_InvokeEx(DISPATCHEX(&This->node.dispex), dispid, + LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dispParams, + NULL, &excep, NULL); return hres; } @@ -141,59 +123,28 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr LONG lFlags, VARIANT *AttributeValue) { HTMLElement *This = HTMLELEM_THIS(iface); - nsAString attr_str; - nsAString value_str; - const PRUnichar *value; - nsresult nsres; - HRESULT hres = S_OK; + DISPID dispid; + HRESULT hres; + DISPPARAMS dispParams = {NULL, NULL, 0, 0}; + EXCEPINFO excep; - WARN("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue); + TRACE("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue); - if(!This->nselem) { - FIXME("NULL nselem\n"); + hres = IDispatchEx_GetDispID(DISPATCHEX(&This->node.dispex), strAttributeName, + fdexNameCaseInsensitive, &dispid); + if(hres == DISP_E_UNKNOWNNAME) { V_VT(AttributeValue) = VT_NULL; return S_OK; } - V_VT(AttributeValue) = VT_NULL; - - nsAString_Init(&attr_str, strAttributeName); - nsAString_Init(&value_str, NULL); - - nsres = nsIDOMHTMLElement_GetAttribute(This->nselem, &attr_str, &value_str); - nsAString_Finish(&attr_str); - - if(NS_SUCCEEDED(nsres)) { - static const WCHAR wszSRC[] = {'s','r','c',0}; - nsAString_GetData(&value_str, &value); - if(!strcmpiW(strAttributeName, wszSRC)) - { - WCHAR buffer[256]; - DWORD len; - BSTR bstrBaseUrl; - hres = IHTMLDocument2_get_URL(HTMLDOC(&This->node.doc->basedoc), &bstrBaseUrl); - if(SUCCEEDED(hres)) { - hres = CoInternetCombineUrl(bstrBaseUrl, value, - URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, - buffer, sizeof(buffer)/sizeof(WCHAR), &len, 0); - SysFreeString(bstrBaseUrl); - if(SUCCEEDED(hres)) { - V_VT(AttributeValue) = VT_BSTR; - V_BSTR(AttributeValue) = SysAllocString(buffer); - TRACE("attr_value=%s\n", debugstr_w(V_BSTR(AttributeValue))); - } - } - }else if(*value) { - V_VT(AttributeValue) = VT_BSTR; - V_BSTR(AttributeValue) = SysAllocString(value); - TRACE("attr_value=%s\n", debugstr_w(V_BSTR(AttributeValue))); - } - }else { - ERR("GetAttribute failed: %08x\n", nsres); - hres = E_FAIL; + if(FAILED(hres)) { + V_VT(AttributeValue) = VT_NULL; + return hres; } - nsAString_Finish(&value_str); + hres = IDispatchEx_InvokeEx(DISPATCHEX(&This->node.dispex), dispid, + LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, &dispParams, + AttributeValue, &excep, NULL); return hres; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 604ead5..b489ce0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -804,6 +804,80 @@ static void test_doc_elem(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } +static void test_get_set_attr(IHTMLDocument2 *doc) +{ + IHTMLElement *elem; + IHTMLDocument3 *doc3; + HRESULT hres; + BSTR bstr; + VARIANT val; + + /* grab an element to test with */ + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + + hres = IHTMLDocument3_get_documentElement(doc3, &elem); + IHTMLDocument3_Release(doc3); + ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); + + /* get a non-present attribute */ + bstr = a2bstr("notAnAttribute"); + hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&val) == VT_NULL, "variant type should have been VT_NULL (0x%x), was: 0x%x\n", VT_NULL, V_VT(&val)); + VariantClear(&val); + SysFreeString(bstr); + + /* get a present attribute */ + bstr = a2bstr("scrollHeight"); + hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&val) == VT_I4, "variant type should have been VT_I4 (0x%x), was: 0x%x\n", VT_I4, V_VT(&val)); + VariantClear(&val); + SysFreeString(bstr); + + /* create a new BSTR attribute */ + bstr = a2bstr("newAttribute"); + + V_VT(&val) = VT_BSTR; + V_BSTR(&val) = a2bstr("the value"); + hres = IHTMLElement_setAttribute(elem, bstr, val, 0); + ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + VariantClear(&val); + + hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&val) == VT_BSTR, "variant type should have been VT_BSTR (0x%x), was: 0x%x\n", VT_BSTR, V_VT(&val)); + ok(strcmp_wa(V_BSTR(&val), "the value") == 0, "variant value should have been L\"the value\", was %s\n", wine_dbgstr_w(V_BSTR(&val))); + VariantClear(&val); + + /* overwrite the attribute with a BOOL */ + V_VT(&val) = VT_BOOL; + V_BOOL(&val) = VARIANT_TRUE; + hres = IHTMLElement_setAttribute(elem, bstr, val, 0); + ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + VariantClear(&val); + + hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&val) == VT_BOOL, "variant type should have been VT_BOOL (0x%x), was: 0x%x\n", VT_BOOL, V_VT(&val)); + ok(V_BOOL(&val) == VARIANT_TRUE, "variant value should have been VARIANT_TRUE (0x%x), was %d\n", VARIANT_TRUE, V_BOOL(&val)); + VariantClear(&val); + + SysFreeString(bstr); + + /* case-insensitive */ + bstr = a2bstr("newattribute"); + hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + todo_wine ok(V_VT(&val) == VT_BOOL, "variant type should have been VT_BOOL (0x%x), was: 0x%x\n", VT_BOOL, V_VT(&val)); + todo_wine ok(V_BOOL(&val) == VARIANT_TRUE, "variant value should have been VARIANT_TRUE (0x%x), was %d\n", VARIANT_TRUE, V_BOOL(&val)); + VariantClear(&val); + SysFreeString(bstr); + + IHTMLElement_Release(elem); +} + #define get_doc_elem(d) _get_doc_elem(__LINE__,d) static IHTMLElement *_get_doc_elem(unsigned line, IHTMLDocument2 *doc) { @@ -5347,6 +5421,7 @@ START_TEST(dom) CoInitialize(NULL); run_domtest(doc_str1, test_doc_elem); + run_domtest(doc_str1, test_get_set_attr); run_domtest(range_test_str, test_txtrange); run_domtest(range_test2_str, test_txtrange2); if (winetest_interactive || ! is_ie_hardened()) {

1 0

Stefan Ginsberg : msctf: Define function calling convention compatibly for MSVC.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 32648d48022721cf6ce2538cd5ac06b7559b7df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32648d48022721cf6ce2538cd… Author: Stefan Ginsberg <stefan__100__(a)hotmail.com> Date: Sat Sep 19 23:33:29 2009 +0200 msctf: Define function calling convention compatibly for MSVC. --- dlls/msctf/compartmentmgr.c | 4 ++-- dlls/msctf/context.c | 12 ++++++------ dlls/msctf/documentmgr.c | 4 ++-- dlls/msctf/inputprocessor.c | 4 ++-- dlls/msctf/threadmgr.c | 18 +++++++++--------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 06a691d..4f6408d 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -572,7 +572,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) return Compartment_Release((ITfCompartment *)This); } -static WINAPI HRESULT CompartmentSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI CompartmentSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { CompartmentSink *cs; @@ -607,7 +607,7 @@ static WINAPI HRESULT CompartmentSource_AdviseSink(ITfSource *iface, return S_OK; } -static WINAPI HRESULT CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { CompartmentSink *sink; Compartment *This = impl_from_ITfSourceVtbl(iface); diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index c13235c..1b4e3cf 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -599,7 +599,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) /***************************************************** * ITfSource functions *****************************************************/ -static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI ContextSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { ContextSink *es; @@ -632,7 +632,7 @@ static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, return S_OK; } -static WINAPI HRESULT ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { ContextSink *sink; Context *This = impl_from_ITfSourceVtbl(iface); @@ -683,7 +683,7 @@ static ULONG WINAPI InsertAtSelection_Release(ITfInsertAtSelection *iface) return Context_Release((ITfContext *)This); } -static WINAPI HRESULT InsertAtSelection_InsertTextAtSelection( +static HRESULT WINAPI InsertAtSelection_InsertTextAtSelection( ITfInsertAtSelection *iface, TfEditCookie ec, DWORD dwFlags, const WCHAR *pchText, LONG cch, ITfRange **ppRange) { @@ -719,7 +719,7 @@ static WINAPI HRESULT InsertAtSelection_InsertTextAtSelection( return hr; } -static WINAPI HRESULT InsertAtSelection_InsertEmbeddedAtSelection( +static HRESULT WINAPI InsertAtSelection_InsertEmbeddedAtSelection( ITfInsertAtSelection *iface, TfEditCookie ec, DWORD dwFlags, IDataObject *pDataObject, ITfRange **ppRange) { @@ -759,7 +759,7 @@ static ULONG WINAPI SourceSingle_Release(ITfSourceSingle *iface) return Context_Release((ITfContext *)This); } -static WINAPI HRESULT SourceSingle_AdviseSingleSink( ITfSourceSingle *iface, +static HRESULT WINAPI SourceSingle_AdviseSingleSink( ITfSourceSingle *iface, TfClientId tid, REFIID riid, IUnknown *punk) { Context *This = impl_from_ITfSourceSingleVtbl(iface); @@ -767,7 +767,7 @@ static WINAPI HRESULT SourceSingle_AdviseSingleSink( ITfSourceSingle *iface, return E_NOTIMPL; } -static WINAPI HRESULT SourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, +static HRESULT WINAPI SourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, TfClientId tid, REFIID riid) { Context *This = impl_from_ITfSourceSingleVtbl(iface); diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 0a25b3d..fec3de3 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -288,7 +288,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) /***************************************************** * ITfSource functions *****************************************************/ -static WINAPI HRESULT DocumentMgrSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI DocumentMgrSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { DocumentMgr *This = impl_from_ITfSourceVtbl(iface); @@ -296,7 +296,7 @@ static WINAPI HRESULT DocumentMgrSource_AdviseSink(ITfSource *iface, return E_NOTIMPL; } -static WINAPI HRESULT DocumentMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI DocumentMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { DocumentMgr *This = impl_from_ITfSourceVtbl(iface); FIXME("STUB:(%p)\n",This); diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 0935c44..ba4a76d 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -694,7 +694,7 @@ static ULONG WINAPI IPPSource_Release(ITfSource *iface) return InputProcessorProfiles_Release((ITfInputProcessorProfiles *)This); } -static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI IPPSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { InputProcessorProfilesSink *ipps; @@ -729,7 +729,7 @@ static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface, return S_OK; } -static WINAPI HRESULT IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { InputProcessorProfilesSink *sink; InputProcessorProfiles *This = impl_from_ITfSourceVtbl(iface); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 85b11a1..56f1c36 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -617,7 +617,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) /***************************************************** * ITfSource functions *****************************************************/ -static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { ThreadMgrSink *tms; @@ -652,7 +652,7 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, return S_OK; } -static WINAPI HRESULT ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { ThreadMgrSink *sink; ThreadMgr *This = impl_from_ITfSourceVtbl(iface); @@ -1118,7 +1118,7 @@ static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface) } -static WINAPI HRESULT ThreadMgrEventSink_OnInitDocumentMgr( +static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr( ITfThreadMgrEventSink *iface,ITfDocumentMgr *pdim) { struct list *cursor; @@ -1135,7 +1135,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnInitDocumentMgr( return S_OK; } -static WINAPI HRESULT ThreadMgrEventSink_OnUninitDocumentMgr( +static HRESULT WINAPI ThreadMgrEventSink_OnUninitDocumentMgr( ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdim) { struct list *cursor; @@ -1152,7 +1152,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnUninitDocumentMgr( return S_OK; } -static WINAPI HRESULT ThreadMgrEventSink_OnSetFocus( +static HRESULT WINAPI ThreadMgrEventSink_OnSetFocus( ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) { @@ -1170,7 +1170,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnSetFocus( return S_OK; } -static WINAPI HRESULT ThreadMgrEventSink_OnPushContext( +static HRESULT WINAPI ThreadMgrEventSink_OnPushContext( ITfThreadMgrEventSink *iface, ITfContext *pic) { struct list *cursor; @@ -1187,7 +1187,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnPushContext( return S_OK; } -static WINAPI HRESULT ThreadMgrEventSink_OnPopContext( +static HRESULT WINAPI ThreadMgrEventSink_OnPopContext( ITfThreadMgrEventSink *iface, ITfContext *pic) { struct list *cursor; @@ -1238,7 +1238,7 @@ static ULONG WINAPI ThreadMgrSourceSingle_Release(ITfSourceSingle *iface) return ThreadMgr_Release((ITfThreadMgr *)This); } -static WINAPI HRESULT ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *iface, +static HRESULT WINAPI ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *iface, TfClientId tid, REFIID riid, IUnknown *punk) { ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); @@ -1246,7 +1246,7 @@ static WINAPI HRESULT ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *i return E_NOTIMPL; } -static WINAPI HRESULT ThreadMgrSourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, +static HRESULT WINAPI ThreadMgrSourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, TfClientId tid, REFIID riid) { ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface);

1 0

Rico Schüller : opengl32/tests: Improve test for wglMakeCurrent.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 9bd2ce97f58a31f385f30eec9f0b6e2b867cbeb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd2ce97f58a31f385f30eec9… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Sep 19 15:52:47 2009 +0200 opengl32/tests: Improve test for wglMakeCurrent. --- dlls/opengl32/tests/opengl.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 2ced97d..96df784 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -346,6 +346,7 @@ static void test_makecurrent(HDC winhdc) { BOOL ret; HGLRC hglrc; + DWORD error; hglrc = wglCreateContext(winhdc); ok( hglrc != 0, "wglCreateContext failed\n" ); @@ -354,6 +355,41 @@ static void test_makecurrent(HDC winhdc) ok( ret, "wglMakeCurrent failed\n" ); ok( wglGetCurrentContext() == hglrc, "wrong context\n" ); + + /* set the same context again */ + ret = wglMakeCurrent( winhdc, hglrc ); + ok( ret, "wglMakeCurrent failed\n" ); + + /* check wglMakeCurrent(x, y) after another call to wglMakeCurrent(x, y) */ + ret = wglMakeCurrent( winhdc, NULL ); + ok( ret, "wglMakeCurrent failed\n" ); + + ret = wglMakeCurrent( winhdc, NULL ); + ok( ret, "wglMakeCurrent failed\n" ); + + SetLastError( 0xdeadbeef ); + ret = wglMakeCurrent( NULL, NULL ); + ok( !ret, "wglMakeCurrent succeeded\n" ); + error = GetLastError(); + ok( error == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got error=%x\n", error); + + ret = wglMakeCurrent( winhdc, NULL ); + ok( ret, "wglMakeCurrent failed\n" ); + + ret = wglMakeCurrent( winhdc, hglrc ); + ok( ret, "wglMakeCurrent failed\n" ); + + ret = wglMakeCurrent( NULL, NULL ); + ok( ret, "wglMakeCurrent failed\n" ); + + SetLastError( 0xdeadbeef ); + ret = wglMakeCurrent( NULL, NULL ); + ok( !ret, "wglMakeCurrent succeeded\n" ); + error = GetLastError(); + ok( error == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got error=%x\n", error); + + ret = wglMakeCurrent( winhdc, hglrc ); + ok( ret, "wglMakeCurrent failed\n" ); } static void test_colorbits(HDC hdc)

1 0

Rico Schüller : gdi32: Check the current context in wglMakeCurrent().
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 43ce10d168997929a0639e6ab02f556458ef9b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ce10d168997929a0639e6ab… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Sep 19 15:52:36 2009 +0200 gdi32: Check the current context in wglMakeCurrent(). --- dlls/gdi32/opengl.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 204fc2b..63ba433 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -193,7 +193,15 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) /* When the context hglrc is NULL, the HDC is ignored and can be NULL. * In that case use the global hDC to get access to the driver. */ if(hglrc == NULL) + { + if( hdc == NULL && !wglGetCurrentContext() ) + { + WARN( "Current context is NULL\n"); + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } dc = OPENGL_GetDefaultDC(); + } else dc = get_dc_ptr( hdc );

1 0

Rico Schüller : wined3d: Don't call wglMakeCurrent( NULL, NULL) in context_set_current() if the current context is NULL.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 8c414df17f57840e0687db1ece53857e4e791d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c414df17f57840e0687db1ec… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Sep 19 15:52:18 2009 +0200 wined3d: Don't call wglMakeCurrent(NULL, NULL) in context_set_current() if the current context is NULL. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c4cd436..28cd4a0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -762,7 +762,7 @@ BOOL context_set_current(struct wined3d_context *ctx) } ctx->current = 1; } - else + else if(pwglGetCurrentContext()) { TRACE("Clearing current D3D context.\n"); if (!pwglMakeCurrent(NULL, NULL))

1 0

Eric Pouech : winhelp: Added support for hotspot links in graphical objects .
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 3d0475eb4d267d95f5f922cbc229723ce39d34b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d0475eb4d267d95f5f922cbc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Sep 19 12:53:01 2009 +0200 winhelp: Added support for hotspot links in graphical objects. --- programs/winhlp32/hlpfile.c | 113 +++++++++++++++++++++++++++++++++++-------- programs/winhlp32/hlpfile.h | 10 ++++ programs/winhlp32/winhelp.c | 10 ++++ 3 files changed, 112 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d0475eb4d267d95f5f92…

1 0

André Hentschel : include: Add ARM endianess.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 14d51867fe7cc8daea9f804237e276f4ea063761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d51867fe7cc8daea9f80423… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 22 16:31:17 2009 +0200 include: Add ARM endianess. --- include/basetsd.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index e106e24..308a65d 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -271,6 +271,10 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; # undef WORDS_BIGENDIAN # undef BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS +#elif defined(__arm__) +# undef WORDS_BIGENDIAN +# undef BITFIELDS_BIGENDIAN +# undef ALLOW_UNALIGNED_ACCESS #elif !defined(RC_INVOKED) && !defined(__WIDL__) && !defined(__midl) # error Unknown CPU architecture! #endif

1 0

Alexandre Julliard : ntdll: Only create the CPU registry keys on first run.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 1cf1a3f211f9dbbcfff2ef92f53181f540e9ac32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf1a3f211f9dbbcfff2ef92f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 22 17:05:02 2009 +0200 ntdll: Only create the CPU registry keys on first run. --- dlls/ntdll/nt.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index d8bc0b9..21fefef 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -857,7 +857,7 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) } } -static void create_system_registry_keys( void ) +static BOOL create_system_registry_keys( void ) { static const WCHAR SystemW[] = {'M','a','c','h','i','n','e','\\', 'H','a','r','d','w','a','r','e','\\', @@ -878,6 +878,7 @@ static void create_system_registry_keys( void ) HANDLE hkey, system_key, cpu_key; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW, valueW; + ULONG dispos; attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -887,17 +888,23 @@ static void create_system_registry_keys( void ) attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &nameW, SystemW ); - if (NtCreateKey( &system_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) return; + if (NtCreateKey( &system_key, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, &dispos )) + return FALSE; + if (dispos == REG_OPENED_EXISTING_KEY) + { + NtClose( system_key ); + return FALSE; + } RtlInitUnicodeString( &valueW, IdentifierW ); NtSetValueKey( system_key, &valueW, 0, REG_SZ, SysidW, sizeof(SysidW) ); attr.RootDirectory = system_key; RtlInitUnicodeString( &nameW, fpuW ); - if (!NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) NtClose( hkey ); + if (!NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, NULL )) NtClose( hkey ); RtlInitUnicodeString( &nameW, cpuW ); - if (!NtCreateKey( &cpu_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) + if (!NtCreateKey( &cpu_key, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, NULL )) { for (i = 0; i < NtCurrentTeb()->Peb->NumberOfProcessors; i++) { @@ -906,7 +913,7 @@ static void create_system_registry_keys( void ) attr.RootDirectory = cpu_key; sprintfW( numW, PercentDW, i ); RtlInitUnicodeString( &nameW, numW ); - if (!NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) + if (!NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, NULL )) { PROCESSOR_POWER_INFORMATION power_info; DWORD cpuMHz; @@ -935,6 +942,7 @@ static void create_system_registry_keys( void ) NtClose( cpu_key ); } NtClose( system_key ); + return TRUE; } static void create_env_registry_keys( void ) @@ -1377,8 +1385,7 @@ void fill_cpu_info(void) TRACE("<- CPU arch %d, level %d, rev %d, features 0x%x\n", cached_sci.Architecture, cached_sci.Level, cached_sci.Revision, cached_sci.FeatureSet); - create_env_registry_keys(); - create_system_registry_keys(); + if (create_system_registry_keys()) create_env_registry_keys(); } /******************************************************************************

1 0

Eric Pouech : kernel32: Rewrite GetSystemInfo() purely on ntdll calls.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: e1e9f5993f045ee6b774f09c528c917517b376ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e9f5993f045ee6b774f09c5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Sep 15 21:38:31 2009 +0200 kernel32: Rewrite GetSystemInfo() purely on ntdll calls. --- dlls/kernel32/cpu.c | 585 ++++----------------------------------------------- 1 files changed, 44 insertions(+), 541 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1e9f5993f045ee6b774f…

1 0

Eric Pouech : ntdll: Moved CPU related registry key creation from kernel32 to ntdll.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 004fdc7a9769c33b86c8f7ff92ffdb668c77f705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=004fdc7a9769c33b86c8f7ff9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Sep 15 21:38:23 2009 +0200 ntdll: Moved CPU related registry key creation from kernel32 to ntdll. --- dlls/kernel32/cpu.c | 147 ---------------------------------------- dlls/kernel32/kernel_main.c | 5 -- dlls/ntdll/nt.c | 157 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 3 +- 4 files changed, 159 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=004fdc7a9769c33b86c8f…

1 0