wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Nikolay Sivov : msxml3: Some put_dataType() tests for nodes without typed data.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: ebf91350cdac3e9f3fdb8b1ae26473221f0fe5e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf91350cdac3e9f3fdb8b1ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 9 00:21:53 2012 +0300 msxml3: Some put_dataType() tests for nodes without typed data. --- dlls/msxml3/cdata.c | 4 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/pi.c | 2 +- dlls/msxml3/tests/domdoc.c | 77 ++++++++++++++++++++++++++++---------------- 6 files changed, 55 insertions(+), 34 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 0058314..c6d1f8c 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 -typedef struct _domcdata +typedef struct { xmlnode node; IXMLDOMCDATASection IXMLDOMCDATASection_iface; @@ -436,7 +436,7 @@ static HRESULT WINAPI domcdata_put_dataType( { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 5663632..f1f94c6 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -435,7 +435,7 @@ static HRESULT WINAPI domcomment_put_dataType( { domcomment *This = impl_from_IXMLDOMComment( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 435712c..cedd258 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -433,7 +433,7 @@ static HRESULT WINAPI domfrag_put_dataType( { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index b6b0ae4..313fc2e 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -428,7 +428,7 @@ static HRESULT WINAPI entityref_put_dataType( { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 23027a1..332d97c 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -506,7 +506,7 @@ static HRESULT WINAPI dom_pi_put_dataType( { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d737d7f..5ed8715 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6777,10 +6777,26 @@ static put_datatype_t put_datatype_data[] = { { NULL } }; -static void test_nodeTypeTests( void ) +typedef struct { + DOMNodeType type; + HRESULT hr; +} put_datatype_notype_t; + +static put_datatype_notype_t put_dt_notype[] = { + { NODE_PROCESSING_INSTRUCTION, E_FAIL }, + { NODE_DOCUMENT_FRAGMENT, E_FAIL }, + { NODE_ENTITY_REFERENCE, E_FAIL }, + { NODE_CDATA_SECTION, E_FAIL }, + { NODE_COMMENT, E_FAIL }, + { NODE_INVALID } +}; + +static void test_put_dataType( void ) { + const put_datatype_notype_t *ptr2 = put_dt_notype; const put_datatype_t *ptr = put_datatype_data; IXMLDOMElement *root, *element; + BSTR nameW, type1W, type2W; IXMLDOMDocument *doc; HRESULT hr; @@ -6831,6 +6847,38 @@ static void test_nodeTypeTests( void ) IXMLDOMElement_Release(element); + /* try to set type for node without a type */ + nameW = _bstr_("testname"); + type1W = _bstr_("string"); + type2W = _bstr_("number"); + while (ptr2->type != NODE_INVALID) + { + IXMLDOMNode *node; + VARIANT type; + + V_VT(&type) = VT_I2; + V_I2(&type) = ptr2->type; + + hr = IXMLDOMDocument_createNode(doc, type, nameW, NULL, &node); + EXPECT_HR(hr, S_OK); + if(hr == S_OK) + { + hr = IXMLDOMElement_appendChild(root, node, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_put_dataType(node, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = IXMLDOMNode_put_dataType(node, type1W); + ok(hr == ptr2->hr, "failed for type %d, 0x%08x\n", ptr2->type, ptr->hr); + hr = IXMLDOMNode_put_dataType(node, type2W); + ok(hr == ptr2->hr, "failed for type %d, 0x%08x\n", ptr2->type, ptr->hr); + + IXMLDOMNode_Release(node); + } + ptr2++; + } + IXMLDOMElement_Release(root); IXMLDOMDocument_Release(doc); free_bstrs(); @@ -8490,32 +8538,6 @@ static void test_setAttributeNode(void) free_bstrs(); } -static void test_put_dataType(void) -{ - IXMLDOMCDATASection *cdata; - IXMLDOMDocument *doc; - VARIANT_BOOL b; - HRESULT hr; - - doc = create_document(&IID_IXMLDOMDocument); - if (!doc) return; - - hr = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b ); - ok( hr == S_OK, "loadXML failed\n"); - ok( b == VARIANT_TRUE, "failed to load XML string\n"); - - hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("test"), &cdata); - ok( hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMCDATASection_put_dataType(cdata, _bstr_("number")); - ok( hr == E_FAIL, "got 0x%08x\n", hr); - hr = IXMLDOMCDATASection_put_dataType(cdata, _bstr_("string")); - ok( hr == E_FAIL, "got 0x%08x\n", hr); - IXMLDOMCDATASection_Release(cdata); - - IXMLDOMDocument_Release(doc); - free_bstrs(); -} - static void test_createNode(void) { IXMLDOMDocument *doc; @@ -11062,7 +11084,6 @@ START_TEST(domdoc) test_XSLPattern(); test_cloneNode(); test_xmlTypes(); - test_nodeTypeTests(); test_save(); test_testTransforms(); test_namespaces();

1 0

Nikolay Sivov : msxml3: Move put_dataType() test data to a table.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: d51dd8e405f22b8ca678e35111dee820ae4e538c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51dd8e405f22b8ca678e3511… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 19:12:33 2012 +0300 msxml3: Move put_dataType() test data to a table. --- dlls/msxml3/tests/domdoc.c | 391 ++++++++------------------------------------ 1 files changed, 71 insertions(+), 320 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d51dd8e405f22b8ca678e…

1 0

Nikolay Sivov : msxml3: Remove wrong ERR(), some renames.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: ce61d9b86265d846a58e87ac3cbcffb8693fcf5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce61d9b86265d846a58e87ac3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 9 00:58:06 2012 +0300 msxml3: Remove wrong ERR(), some renames. --- dlls/msxml3/nodemap.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index c075ac6..6fac505 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -245,7 +245,7 @@ static HRESULT WINAPI xmlnodemap_removeQualifiedItem( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - ERR("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), item); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), item); return This->funcs->remove_qualified_item(This->node, baseName, namespaceURI, item); } @@ -266,7 +266,7 @@ static HRESULT WINAPI xmlnodemap_reset( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - TRACE("(%p: %d)\n", This, This->iterator); + TRACE("(%p)->(%d)\n", This, This->iterator); This->iterator = 0; @@ -282,7 +282,7 @@ static HRESULT WINAPI xmlnodemap__newEnum( return E_NOTIMPL; } -static const struct IXMLDOMNamedNodeMapVtbl xmlnodemap_vtbl = +static const struct IXMLDOMNamedNodeMapVtbl XMLDOMNamedNodeMapVtbl = { xmlnodemap_QueryInterface, xmlnodemap_AddRef, @@ -335,7 +335,7 @@ static HRESULT WINAPI support_error_InterfaceSupportsErrorInfo( return IsEqualGUID(riid, &IID_IXMLDOMNamedNodeMap) ? S_OK : S_FALSE; } -static const struct ISupportErrorInfoVtbl support_error_vtbl = +static const struct ISupportErrorInfoVtbl SupportErrorInfoVtbl = { support_error_QueryInterface, support_error_AddRef, @@ -418,8 +418,8 @@ IXMLDOMNamedNodeMap *create_nodemap(xmlNodePtr node, const struct nodemap_funcs if ( !This ) return NULL; - This->IXMLDOMNamedNodeMap_iface.lpVtbl = &xmlnodemap_vtbl; - This->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; + This->IXMLDOMNamedNodeMap_iface.lpVtbl = &XMLDOMNamedNodeMapVtbl; + This->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; This->node = node; This->ref = 1; This->iterator = 0;

1 0

Nikolay Sivov : msxml3: Add a stub for IAuthenticate.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: da8618f3a9c14ad51d8587648057d87b2ae0929e URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8618f3a9c14ad51d8587648… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 21:14:23 2012 +0300 msxml3: Add a stub for IAuthenticate. --- dlls/msxml3/httprequest.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index c3d5df9..79bf34d 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-2012 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 @@ -149,6 +149,7 @@ struct BindStatusCallback { IBindStatusCallback IBindStatusCallback_iface; IHttpNegotiate IHttpNegotiate_iface; + IAuthenticate IAuthenticate_iface; LONG ref; IBinding *binding; @@ -171,6 +172,11 @@ static inline BindStatusCallback *impl_from_IHttpNegotiate( IHttpNegotiate *ifac return CONTAINING_RECORD(iface, BindStatusCallback, IHttpNegotiate_iface); } +static inline BindStatusCallback *impl_from_IAuthenticate( IAuthenticate *iface ) +{ + return CONTAINING_RECORD(iface, BindStatusCallback, IAuthenticate_iface); +} + static void BindStatusCallback_Detach(BindStatusCallback *bsc) { if (bsc) @@ -199,6 +205,10 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa { *ppv = &This->IHttpNegotiate_iface; } + else if (IsEqualGUID(&IID_IAuthenticate, riid)) + { + *ppv = &This->IAuthenticate_iface; + } else if (IsEqualGUID(&IID_IServiceProvider, riid) || IsEqualGUID(&IID_IBindStatusCallbackEx, riid) || IsEqualGUID(&IID_IInternetProtocol, riid) || @@ -534,6 +544,40 @@ static const IHttpNegotiateVtbl BSCHttpNegotiateVtbl = { BSCHttpNegotiate_OnResponse }; +static HRESULT WINAPI Authenticate_QueryInterface(IAuthenticate *iface, + REFIID riid, void **ppv) +{ + BindStatusCallback *This = impl_from_IAuthenticate(iface); + return IBindStatusCallback_QueryInterface(&This->IBindStatusCallback_iface, riid, ppv); +} + +static ULONG WINAPI Authenticate_AddRef(IAuthenticate *iface) +{ + BindStatusCallback *This = impl_from_IAuthenticate(iface); + return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); +} + +static ULONG WINAPI Authenticate_Release(IAuthenticate *iface) +{ + BindStatusCallback *This = impl_from_IAuthenticate(iface); + return IBindStatusCallback_Release(&This->IBindStatusCallback_iface); +} + +static HRESULT WINAPI Authenticate_Authenticate(IAuthenticate *iface, + HWND *hwnd, LPWSTR *username, LPWSTR *password) +{ + BindStatusCallback *This = impl_from_IAuthenticate(iface); + FIXME("(%p)->(%p %p %p)\n", This, hwnd, username, password); + return E_NOTIMPL; +} + +static const IAuthenticateVtbl AuthenticateVtbl = { + Authenticate_QueryInterface, + Authenticate_AddRef, + Authenticate_Release, + Authenticate_Authenticate +}; + static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback **obj, const VARIANT *body) { BindStatusCallback *bsc; @@ -553,6 +597,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * bsc->IBindStatusCallback_iface.lpVtbl = &BindStatusCallbackVtbl; bsc->IHttpNegotiate_iface.lpVtbl = &BSCHttpNegotiateVtbl; + bsc->IAuthenticate_iface.lpVtbl = &AuthenticateVtbl; bsc->ref = 1; bsc->request = This; bsc->binding = NULL;

1 0

Francois Gouget : oleaut32/tests: Dynamically load some functions that are missing on early NT4 releases.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 8375c8e0036bea487f8835ed9d5c893a958bba7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8375c8e0036bea487f8835ed9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 10:03:06 2012 +0100 oleaut32/tests: Dynamically load some functions that are missing on early NT4 releases. --- dlls/oleaut32/tests/tmarshal.c | 41 ++++++++++------ dlls/oleaut32/tests/usrmarshal.c | 76 +++++++++++++++++++++-------- dlls/oleaut32/tests/varformat.c | 39 ++++++++------- dlls/oleaut32/tests/vartest.c | 98 ++++++++++++++++++++++--------------- 4 files changed, 161 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8375c8e0036bea487f883…

1 0

Francois Gouget : oleaut32/tests: Skip the VarBstrCat() tests when that API is not available.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: af3114a5c4c9d69fa34a7dec80fe4e6c3d05e9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3114a5c4c9d69fa34a7dec8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 10:02:58 2012 +0100 oleaut32/tests: Skip the VarBstrCat() tests when that API is not available. For the early NT4 releases. --- dlls/oleaut32/tests/vartype.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index dd32f8a..58b30b1 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -504,6 +504,7 @@ static HRESULT (WINAPI *pVarBstrFromDate)(DATE,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrFromCy)(CY,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrFromDec)(DECIMAL*,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrCmp)(BSTR,BSTR,LCID,ULONG); +static HRESULT (WINAPI *pVarBstrCat)(BSTR,BSTR,BSTR*); static INT (WINAPI *pSystemTimeToVariantTime)(LPSYSTEMTIME,double*); static void (WINAPI *pClearCustData)(LPCUSTDATA); @@ -5493,14 +5494,16 @@ static void test_VarBstrCat(void) BSTR str1, str2, res; UINT len; + CHECKPTR(VarBstrCat); + if (0) { /* Crash */ - VarBstrCat(NULL, NULL, NULL); + pVarBstrCat(NULL, NULL, NULL); } /* Concatenation of two NULL strings works */ - ret = VarBstrCat(NULL, NULL, &res); + ret = pVarBstrCat(NULL, NULL, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == 0, "Expected a 0-length string\n"); @@ -5509,13 +5512,13 @@ if (0) str1 = SysAllocString(sz1); /* Concatenation with one NULL arg */ - ret = VarBstrCat(NULL, str1, &res); + ret = pVarBstrCat(NULL, str1, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == SysStringLen(str1), "Unexpected length\n"); ok(!memcmp(res, sz1, SysStringLen(str1)), "Unexpected value\n"); SysFreeString(res); - ret = VarBstrCat(str1, NULL, &res); + ret = pVarBstrCat(str1, NULL, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == SysStringLen(str1), "Unexpected length\n"); @@ -5524,7 +5527,7 @@ if (0) /* Concatenation of two zero-terminated strings */ str2 = SysAllocString(sz2); - ret = VarBstrCat(str1, str2, &res); + ret = pVarBstrCat(str1, str2, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == sizeof(sz1sz2) / sizeof(WCHAR) - 1, @@ -5539,7 +5542,7 @@ if (0) str1 = SysAllocStringLen(s1, sizeof(s1) / sizeof(WCHAR)); str2 = SysAllocStringLen(s2, sizeof(s2) / sizeof(WCHAR)); - ret = VarBstrCat(str1, str2, &res); + ret = pVarBstrCat(str1, str2, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == sizeof(s1s2) / sizeof(WCHAR), @@ -5558,7 +5561,7 @@ if (0) len = SysStringLen(str2); ok(len == (sizeof(str2A)-1)/sizeof(WCHAR), "got length %u\n", len); - ret = VarBstrCat(str1, str2, &res); + ret = pVarBstrCat(str1, str2, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); len = (sizeof(str1A) + sizeof(str2A) - 2)/sizeof(WCHAR); @@ -5577,7 +5580,7 @@ if (0) len = SysStringLen(str2); ok(len == 0, "got length %u\n", len); - ret = VarBstrCat(str1, str2, &res); + ret = pVarBstrCat(str1, str2, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == 1, "got %d, expected 1\n", SysStringLen(res));

1 0

Francois Gouget : oleaut32/tests: Once we have a function pointer, use it consistently.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 4f0104f8879d6493266861e0daec42cd825d7047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0104f8879d6493266861e0d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 10:02:29 2012 +0100 oleaut32/tests: Once we have a function pointer, use it consistently. --- dlls/oleaut32/tests/vartest.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 393caf5..3ff54f8 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2312,7 +2312,7 @@ static void test_VarSub(void) V_BSTR(&left) = lbstr; V_VT(&right) = VT_BSTR; V_BSTR(&right) = rbstr; - hres = VarSub(&left, &right, &result); + hres = pVarSub(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_R8, "VarSub: expected coerced type VT_R8, got %s!\n", vtstr(V_VT(&result))); ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 0), @@ -2332,14 +2332,14 @@ static void test_VarSub(void) V_VT(&right) = VT_UI1; V_UI1(&right) = 9; - hres = VarSub(&cy, &right, &result); + hres = pVarSub(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarSub: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, 4702), "VarSub: CY value %f, expected %f\n", r, (double)4720); - hres = VarSub(&left, &dec, &result); + hres = pVarSub(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarSub: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); @@ -5120,12 +5120,12 @@ static void test_VarMul(void) V_VT(&right) = VT_UI1; V_UI1(&right) = 9; - hres = VarMul(&cy, &right, &result); + hres = pVarMul(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarMul: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, 42399), "VarMul: CY value %f, expected %f\n", r, (double)42399); - hres = VarMul(&left, &dec, &result); + hres = pVarMul(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarMul: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, 46.2), "VarMul: DECIMAL value %f, expected %f\n", r, (double)46.2); @@ -5291,7 +5291,7 @@ static void test_VarAdd(void) V_BSTR(&left) = lbstr; V_VT(&right) = VT_BSTR; V_BSTR(&right) = rbstr; - hres = VarAdd(&left, &right, &result); + hres = pVarAdd(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromStr(V_BSTR(&result), 0, 0, &r); ok(hres == S_OK && EQ_DOUBLE(r, 1212), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212); @@ -5311,12 +5311,12 @@ static void test_VarAdd(void) V_VT(&right) = VT_UI1; V_UI1(&right) = 9; - hres = VarAdd(&cy, &right, &result); + hres = pVarAdd(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarAdd: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, 4720), "VarAdd: CY value %f, expected %f\n", r, (double)4720); - hres = VarAdd(&left, &dec, &result); + hres = pVarAdd(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, -15.2), "VarAdd: DECIMAL value %f, expected %f\n", r, (double)-15.2); @@ -8036,7 +8036,7 @@ static void test_VarIdiv(void) V_VT(&right) = VT_I8; V_UI1(&right) = 2; - hres = VarIdiv(&cy, &cy, &result); + hres = pVarIdiv(&cy, &cy, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, "VARIDIV: expected coerced hres 0x%X type VT_I4, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); @@ -8045,7 +8045,7 @@ static void test_VarIdiv(void) if (HAVE_OLEAUT32_I8) { - hres = VarIdiv(&cy, &right, &result); + hres = pVarIdiv(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_I8, "VARIDIV: expected coerced hres 0x%X type VT_I8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); @@ -8054,21 +8054,21 @@ static void test_VarIdiv(void) (DWORD)(V_I8(&result) >>32), (DWORD)V_I8(&result), 5000); } - hres = VarIdiv(&left, &cy, &result); + hres = pVarIdiv(&left, &cy, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, "VARIDIV: expected coerced hres 0x%X type VT_I4, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I4(&result) == 0, "VARIDIV: CY value %d, expected %d\n", V_I4(&result), 0); - hres = VarIdiv(&left, &dec, &result); + hres = pVarIdiv(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, "VARIDIV: expected coerced hres 0x%X type VT_I4, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I4(&result) == 50, "VARIDIV: DECIMAL value %d, expected %d\n", V_I4(&result), 50); - hres = VarIdiv(&dec, &dec, &result); + hres = pVarIdiv(&dec, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, "VARIDIV: expected coerced hres 0x%X type VT_I4, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); @@ -8077,7 +8077,7 @@ static void test_VarIdiv(void) if (HAVE_OLEAUT32_I8) { - hres = VarIdiv(&dec, &right, &result); + hres = pVarIdiv(&dec, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_I8, "VARIDIV: expected coerced hres 0x%X type VT_I8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result)));

1 0

Francois Gouget : oleaut32/tests: Skip some tests when OleLoadPictureEx() is not available.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 6717f5445c71838646d03ac0f57906da40b3bb48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6717f5445c71838646d03ac0f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 10:01:37 2012 +0100 oleaut32/tests: Skip some tests when OleLoadPictureEx() is not available. For the early NT4 releases. --- dlls/oleaut32/tests/olepicture.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 9471da6..7f4d647 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -54,6 +54,7 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pOleLoadPicture)(LPSTREAM,LONG,BOOL,REFIID,LPVOID*); +static HRESULT (WINAPI *pOleLoadPictureEx)(LPSTREAM,LONG,BOOL,REFIID,DWORD,DWORD,DWORD,LPVOID*); static HRESULT (WINAPI *pOleCreatePictureIndirect)(PICTDESC*,REFIID,BOOL,LPVOID*); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -531,7 +532,7 @@ static void test_apm(void) memcpy(data, apmdata, sizeof(apmdata)); ole_check(CreateStreamOnHGlobal(hglob, TRUE, &stream)); - ole_check(OleLoadPictureEx(stream, sizeof(apmdata), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict)); + ole_check(pOleLoadPictureEx(stream, sizeof(apmdata), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict)); ole_check(IPicture_get_Handle(pict, &handle)); ok(handle != 0, "handle is null\n"); @@ -566,7 +567,7 @@ static void test_metafile(void) ole_check(CreateStreamOnHGlobal(hglob, TRUE, &stream)); /* Windows does not load simple metafiles */ - ole_expect(OleLoadPictureEx(stream, sizeof(metafile), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict), E_FAIL); + ole_expect(pOleLoadPictureEx(stream, sizeof(metafile), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict), E_FAIL); IStream_Release(stream); } @@ -587,7 +588,7 @@ static void test_enhmetafile(void) memcpy(data, enhmetafile, sizeof(enhmetafile)); ole_check(CreateStreamOnHGlobal(hglob, TRUE, &stream)); - ole_check(OleLoadPictureEx(stream, sizeof(enhmetafile), TRUE, &IID_IPicture, 10, 10, 0, (LPVOID *)&pict)); + ole_check(pOleLoadPictureEx(stream, sizeof(enhmetafile), TRUE, &IID_IPicture, 10, 10, 0, (LPVOID *)&pict)); ole_check(IPicture_get_Handle(pict, &handle)); ok(handle != 0, "handle is null\n"); @@ -969,6 +970,7 @@ START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); pOleLoadPicture = (void*)GetProcAddress(hOleaut32, "OleLoadPicture"); + pOleLoadPictureEx = (void*)GetProcAddress(hOleaut32, "OleLoadPictureEx"); pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect"); if (!pOleLoadPicture) { @@ -985,10 +987,14 @@ START_TEST(olepicture) if (0) test_pic(pngimage, sizeof(pngimage)); test_empty_image(); test_empty_image_2(); - test_apm(); - test_metafile(); - test_enhmetafile(); - + if (pOleLoadPictureEx) + { + test_apm(); + test_metafile(); + test_enhmetafile(); + } + else + win_skip("OleLoadPictureEx is not available\n"); test_Invoke(); test_OleCreatePictureIndirect(); test_Render();

1 0

Francois Gouget : oleaut32/tests: Fix the olepicture START_TEST() indentation.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: b682e3b965d70a87fc15c187bc011201ac1be140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b682e3b965d70a87fc15c187b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:59:55 2012 +0100 oleaut32/tests: Fix the olepicture START_TEST() indentation. --- dlls/oleaut32/tests/olepicture.c | 40 +++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 54de1cb..9471da6 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -967,27 +967,27 @@ static void test_himetric(void) START_TEST(olepicture) { - hOleaut32 = GetModuleHandleA("oleaut32.dll"); - pOleLoadPicture = (void*)GetProcAddress(hOleaut32, "OleLoadPicture"); - pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect"); - if (!pOleLoadPicture) - { - win_skip("OleLoadPicture is not available\n"); - return; - } + hOleaut32 = GetModuleHandleA("oleaut32.dll"); + pOleLoadPicture = (void*)GetProcAddress(hOleaut32, "OleLoadPicture"); + pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect"); + if (!pOleLoadPicture) + { + win_skip("OleLoadPicture is not available\n"); + return; + } - /* Test regular 1x1 pixel images of gif, jpg, bmp type */ - test_pic(gifimage, sizeof(gifimage)); - test_pic(jpgimage, sizeof(jpgimage)); - test_pic(bmpimage, sizeof(bmpimage)); - test_pic(gif4pixel, sizeof(gif4pixel)); - /* FIXME: No PNG support in Windows... */ - if (0) test_pic(pngimage, sizeof(pngimage)); - test_empty_image(); - test_empty_image_2(); - test_apm(); - test_metafile(); - test_enhmetafile(); + /* Test regular 1x1 pixel images of gif, jpg, bmp type */ + test_pic(gifimage, sizeof(gifimage)); + test_pic(jpgimage, sizeof(jpgimage)); + test_pic(bmpimage, sizeof(bmpimage)); + test_pic(gif4pixel, sizeof(gif4pixel)); + /* FIXME: No PNG support in Windows... */ + if (0) test_pic(pngimage, sizeof(pngimage)); + test_empty_image(); + test_empty_image_2(); + test_apm(); + test_metafile(); + test_enhmetafile(); test_Invoke(); test_OleCreatePictureIndirect();

1 0

Francois Gouget : oleaut32/tests: Use win_skip() when detecting an API is missing.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 559cdbfc7c8b1a88771d7e2149446086b5c60e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=559cdbfc7c8b1a88771d7e214… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:57:30 2012 +0100 oleaut32/tests: Use win_skip() when detecting an API is missing. --- dlls/oleaut32/tests/varformat.c | 2 +- dlls/oleaut32/tests/vartest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index d520137..398bcf5 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -51,7 +51,7 @@ static HRESULT (WINAPI *pVarWeekdayName)(int,int,int,ULONG,BSTR*); /* Get a conversion function ptr, return if function not available */ #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ - if (!p##func) { trace("function " # func " not available, not testing it\n"); return; } + if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; } static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) { diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 7a6394a..393caf5 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -55,7 +55,7 @@ static WCHAR sz12_true[32]; /* Get a conversion function ptr, return if function not available */ #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ - if (!p##func) { trace("function " # func " not available, not testing it\n"); return; } + if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; } /* Have IRecordInfo data type? */ static int HAVE_OLEAUT32_RECORD = 0;

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012