February 2011 - Wine-Commits

Nikolay Sivov : msxml3: Initial implementation of transform() method.
by Alexandre Julliard Feb. 16, 2011

Feb. 16, 2011

Module: wine Branch: master Commit: 4e079d6b3d45e29c43189c33f493a463fbd605d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e079d6b3d45e29c43189c33f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 16 16:45:14 2011 +0300 msxml3: Initial implementation of transform() method. --- dlls/msxml3/stylesheet.c | 34 ++++++++++++++++++++++++++++------ dlls/msxml3/tests/domdoc.c | 11 +++++++++++ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index b1f7972..df29fc2 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -50,11 +50,12 @@ typedef struct _xslprocessor IXSLProcessor IXSLProcessor_iface; LONG ref; + xsltemplate *stylesheet; IXMLDOMNode *input; IStream *output; } xslprocessor; -static HRESULT XSLProcessor_create(IXSLProcessor**); +static HRESULT XSLProcessor_create(xsltemplate*, IXSLProcessor**); static inline xsltemplate *impl_from_IXSLTemplate( IXSLTemplate *iface ) { @@ -226,7 +227,7 @@ static HRESULT WINAPI xsltemplate_createProcessor( IXSLTemplate *iface, if (!processor) return E_INVALIDARG; - return XSLProcessor_create(processor); + return XSLProcessor_create(This, processor); } static const struct IXSLTemplateVtbl xsltemplate_vtbl = @@ -308,6 +309,7 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) { if (This->input) IXMLDOMNode_Release(This->input); if (This->output) IStream_Release(This->output); + IXSLTemplate_Release(&This->stylesheet->IXSLTemplate_iface); heap_free( This ); } @@ -516,12 +518,30 @@ static HRESULT WINAPI xslprocessor_get_output( static HRESULT WINAPI xslprocessor_transform( IXSLProcessor *iface, - VARIANT_BOOL *pbool) + VARIANT_BOOL *ret) { xslprocessor *This = impl_from_IXSLProcessor( iface ); + HRESULT hr; + BSTR p; - FIXME("(%p)->(%p): stub\n", This, pbool); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, ret); + + if (!ret) return E_INVALIDARG; + + hr = IXMLDOMNode_transformNode(This->input, This->stylesheet->node, &p); + if (hr == S_OK) + { + ULONG len = 0; + + /* output to stream */ + hr = IStream_Write(This->output, p, SysStringByteLen(p), &len); + *ret = len == SysStringByteLen(p) ? VARIANT_TRUE : VARIANT_FALSE; + SysFreeString(p); + } + else + *ret = VARIANT_FALSE; + + return hr; } static HRESULT WINAPI xslprocessor_reset( IXSLProcessor *iface ) @@ -601,7 +621,7 @@ static const struct IXSLProcessorVtbl xslprocessor_vtbl = xslprocessor_get_stylesheet }; -HRESULT XSLProcessor_create(IXSLProcessor **ppObj) +HRESULT XSLProcessor_create(xsltemplate *template, IXSLProcessor **ppObj) { xslprocessor *This; @@ -615,6 +635,8 @@ HRESULT XSLProcessor_create(IXSLProcessor **ppObj) This->ref = 1; This->input = NULL; This->output = NULL; + This->stylesheet = template; + IXSLTemplate_AddRef(&template->IXSLTemplate_iface); *ppObj = &This->IXSLProcessor_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d85c678..d34168e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7724,9 +7724,17 @@ static void test_xsltemplate(void) hr = IXSLTemplate_createProcessor(template, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ref = IXSLTemplate_AddRef(template); + IXSLTemplate_Release(template); + ok(ref == 2, "got %d\n", ref); + hr = IXSLTemplate_createProcessor(template, &processor); ok(hr == S_OK, "got 0x%08x\n", hr); + ref = IXSLTemplate_AddRef(template); + IXSLTemplate_Release(template); + ok(ref == 3, "got %d\n", ref); + /* input no set yet */ V_VT(&v) = VT_BSTR; V_BSTR(&v) = NULL; @@ -7756,6 +7764,9 @@ todo_wine { IStream_Release(stream); todo_wine ok(ref == 4, "got %d\n", ref); + hr = IXSLProcessor_transform(processor, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* reset and check stream refcount */ V_VT(&v) = VT_EMPTY; hr = IXSLProcessor_put_output(processor, v);

1 0

Nikolay Sivov : msxml3: Basic put_input() method for IXSLProcessor.
by Alexandre Julliard Feb. 16, 2011

Feb. 16, 2011

Module: wine Branch: master Commit: 392934af901223ae5f0a0d1e83d69c270721ddc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392934af901223ae5f0a0d1e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 16 16:44:04 2011 +0300 msxml3: Basic put_input() method for IXSLProcessor. --- dlls/msxml3/stylesheet.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 10 ++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 1add7db..6d7507e 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -49,6 +49,8 @@ typedef struct _xslprocessor { IXSLProcessor IXSLProcessor_iface; LONG ref; + + IXMLDOMNode *input; } xslprocessor; static HRESULT XSLProcessor_create(IXSLProcessor**); @@ -302,7 +304,10 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) + { + if (This->input) IXMLDOMNode_Release(This->input); heap_free( This ); + } return ref; } @@ -381,9 +386,39 @@ static HRESULT WINAPI xslprocessor_Invoke( static HRESULT WINAPI xslprocessor_put_input( IXSLProcessor *iface, VARIANT input ) { xslprocessor *This = impl_from_IXSLProcessor( iface ); + IXMLDOMNode *input_node; + HRESULT hr; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_variant(&input)); + + /* try IXMLDOMNode directly first */ + if (V_VT(&input) == VT_UNKNOWN) + hr = IUnknown_QueryInterface(V_UNKNOWN(&input), &IID_IXMLDOMNode, (void**)&input_node); + else if (V_VT(&input) == VT_DISPATCH) + hr = IDispatch_QueryInterface(V_DISPATCH(&input), &IID_IXMLDOMNode, (void**)&input_node); + else + { + IXMLDOMDocument *doc; + + hr = DOMDocument_create(&CLSID_DOMDocument, NULL, (void**)&doc); + if (hr == S_OK) + { + VARIANT_BOOL b; + + hr = IXMLDOMDocument_load(doc, input, &b); + if (hr == S_OK) + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMNode, (void**)&input_node); + IXMLDOMDocument_Release(doc); + } + } + + if (hr == S_OK) + { + if (This->input) IXMLDOMNode_Release(This->input); + This->input = input_node; + } + + return hr; } static HRESULT WINAPI xslprocessor_get_input( IXSLProcessor *iface, VARIANT *input ) @@ -554,6 +589,7 @@ HRESULT XSLProcessor_create(IXSLProcessor **ppObj) This->IXSLProcessor_iface.lpVtbl = &xslprocessor_vtbl; This->ref = 1; + This->input = NULL; *ppObj = &This->IXSLProcessor_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b4dc2e1..0c8fff2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7666,6 +7666,7 @@ static void test_xsltemplate(void) VARIANT_BOOL b; HRESULT hr; ULONG ref1, ref2; + VARIANT v; template = create_xsltemplate(&IID_IXSLTemplate); if (!template) return; @@ -7724,6 +7725,15 @@ static void test_xsltemplate(void) hr = IXSLTemplate_createProcessor(template, &processor); ok(hr == S_OK, "got 0x%08x\n", hr); + + /* input no set yet */ + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = NULL; + hr = IXSLProcessor_get_input(processor, &v); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v)); +} IXSLProcessor_Release(processor); /* drop reference */

1 0

Nikolay Sivov : msxml3: Store output stream for processor.
by Alexandre Julliard Feb. 16, 2011

Feb. 16, 2011

Module: wine Branch: master Commit: bb47bab7ced49bc434de44cd7a6f91d7c581229d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb47bab7ced49bc434de44cd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 16 16:44:47 2011 +0300 msxml3: Store output stream for processor. --- dlls/msxml3/stylesheet.c | 29 +++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 6d7507e..b1f7972 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -51,6 +51,7 @@ typedef struct _xslprocessor LONG ref; IXMLDOMNode *input; + IStream *output; } xslprocessor; static HRESULT XSLProcessor_create(IXSLProcessor**); @@ -306,6 +307,7 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) if ( ref == 0 ) { if (This->input) IXMLDOMNode_Release(This->input); + if (This->output) IStream_Release(This->output); heap_free( This ); } @@ -475,9 +477,31 @@ static HRESULT WINAPI xslprocessor_put_output( VARIANT output) { xslprocessor *This = impl_from_IXSLProcessor( iface ); + IStream *stream; + HRESULT hr; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + FIXME("(%p)->(%s): semi-stub\n", This, debugstr_variant(&output)); + + switch (V_VT(&output)) + { + case VT_EMPTY: + stream = NULL; + hr = S_OK; + break; + case VT_UNKNOWN: + hr = IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IStream, (void**)&stream); + break; + default: + hr = E_FAIL; + } + + if (hr == S_OK) + { + if (This->output) IStream_Release(This->output); + This->output = stream; + } + + return hr; } static HRESULT WINAPI xslprocessor_get_output( @@ -590,6 +614,7 @@ HRESULT XSLProcessor_create(IXSLProcessor **ppObj) This->IXSLProcessor_iface.lpVtbl = &xslprocessor_vtbl; This->ref = 1; This->input = NULL; + This->output = NULL; *ppObj = &This->IXSLProcessor_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0c8fff2..d85c678 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7663,9 +7663,10 @@ static void test_xsltemplate(void) IXSLTemplate *template; IXSLProcessor *processor; IXMLDOMDocument *doc; + IStream *stream; VARIANT_BOOL b; HRESULT hr; - ULONG ref1, ref2; + ULONG ref1, ref2, ref; VARIANT v; template = create_xsltemplate(&IID_IXSLTemplate); @@ -7734,6 +7735,37 @@ todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v)); } + + /* reset before it was set */ + V_VT(&v) = VT_EMPTY; + hr = IXSLProcessor_put_output(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CreateStreamOnHGlobal(NULL, TRUE, &stream); + ref = IStream_AddRef(stream); + IStream_Release(stream); + ok(ref == 2, "got %d\n", ref); + + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)stream; + hr = IXSLProcessor_put_output(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* it seems processor grabs 2 references */ + ref = IStream_AddRef(stream); + IStream_Release(stream); + todo_wine ok(ref == 4, "got %d\n", ref); + + /* reset and check stream refcount */ + V_VT(&v) = VT_EMPTY; + hr = IXSLProcessor_put_output(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ref = IStream_AddRef(stream); + IStream_Release(stream); + ok(ref == 2, "got %d\n", ref); + + IStream_Release(stream); IXSLProcessor_Release(processor); /* drop reference */

1 0

Juan Lang : crypt32: Don't assume a function succeeded (clang).
by Alexandre Julliard Feb. 16, 2011

Feb. 16, 2011

Module: wine Branch: master Commit: b377f83453cf82d5274aeebc233702e72a100a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b377f83453cf82d5274aeebc2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 15 11:16:25 2011 -0800 crypt32: Don't assume a function succeeded (clang). --- dlls/crypt32/msg.c | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 97860e5..50c1bee 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1559,38 +1559,42 @@ static BOOL WINAPI CRYPT_ExportKeyTrans( X509_ASN_ENCODING, &keyInfo, &expKey); if (ret) { - BYTE *keyBlob; DWORD size; ret = CryptExportKey(pContentEncryptInfo->hContentEncryptKey, expKey, SIMPLEBLOB, 0, NULL, &size); - keyBlob = CryptMemAlloc(size); - if (keyBlob) + if (ret) { - ret = CryptExportKey(pContentEncryptInfo->hContentEncryptKey, - expKey, SIMPLEBLOB, 0, keyBlob, &size); - if (ret) - { - DWORD head = sizeof(BLOBHEADER) + sizeof(ALG_ID); + BYTE *keyBlob; - pKeyTransEncryptInfo->EncryptedKey.pbData = - CryptMemAlloc(size - head); - if (pKeyTransEncryptInfo->EncryptedKey.pbData) + keyBlob = CryptMemAlloc(size); + if (keyBlob) + { + ret = CryptExportKey(pContentEncryptInfo->hContentEncryptKey, + expKey, SIMPLEBLOB, 0, keyBlob, &size); + if (ret) { - DWORD i, k = 0; + DWORD head = sizeof(BLOBHEADER) + sizeof(ALG_ID); + + pKeyTransEncryptInfo->EncryptedKey.pbData = + CryptMemAlloc(size - head); + if (pKeyTransEncryptInfo->EncryptedKey.pbData) + { + DWORD i, k = 0; - pKeyTransEncryptInfo->EncryptedKey.cbData = size - head; - for (i = size - 1; i >= head; --i, ++k) - pKeyTransEncryptInfo->EncryptedKey.pbData[k] = - keyBlob[i]; + pKeyTransEncryptInfo->EncryptedKey.cbData = size - head; + for (i = size - 1; i >= head; --i, ++k) + pKeyTransEncryptInfo->EncryptedKey.pbData[k] = + keyBlob[i]; + } + else + ret = FALSE; } - else - ret = FALSE; + CryptMemFree(keyBlob); } - CryptMemFree(keyBlob); + else + ret = FALSE; } - else - ret = FALSE; CryptDestroyKey(expKey); }

1 0

André Hentschel : kernel32: Remove a useless error message.
by Alexandre Julliard Feb. 16, 2011

Feb. 16, 2011

Module: wine Branch: master Commit: fc38254fed5dbc07a2a61a2411bfaadcc977e40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc38254fed5dbc07a2a61a241… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 15 19:49:10 2011 +0100 kernel32: Remove a useless error message. --- dlls/kernel32/editline.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index a39fa8d..7664b55 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -97,7 +97,6 @@ static void WCEL_Dump(WCEL_Context* ctx, const char* pfx) static BOOL WCEL_Get(WCEL_Context* ctx, INPUT_RECORD* ir) { if (ReadConsoleInputW(ctx->hConIn, ir, 1, NULL)) return TRUE; - ERR("hmm bad situation\n"); ctx->error = 1; return FALSE; }

1 0

André Hentschel : rsaenh/tests: Test the reported length on success.
by Alexandre Julliard Feb. 16, 2011

Feb. 16, 2011

Module: wine Branch: master Commit: e0d712da619c9819861e105351ad40c5cd013df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d712da619c9819861e10535… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 15 19:49:14 2011 +0100 rsaenh/tests: Test the reported length on success. --- dlls/rsaenh/tests/rsaenh.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 6b0faeb..ccccb59 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -947,10 +947,12 @@ static void test_aes(int keylen) for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; - /* AES provider doesn't support salt */ + /* Does AES provider support salt? */ result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok((!result && GetLastError() == NTE_BAD_KEY) || result /* Win7 */, "expected NTE_BAD_KEY, got %08x\n", GetLastError()); + if (result) + ok(!dwLen, "unexpected salt length %d\n", dwLen); dwLen = 13; result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16);

1 0

Andrew Nguyen : usp10/tests: Avoid passing optional pointers to uninitialized structures in ScriptString tests .
by Alexandre Julliard Feb. 16, 2011

Feb. 16, 2011

Module: wine Branch: master Commit: 6d0983972e9213c54c722468ead6ea79f5bd8212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0983972e9213c54c722468e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 15 12:36:01 2011 -0600 usp10/tests: Avoid passing optional pointers to uninitialized structures in ScriptString tests. --- dlls/usp10/tests/usp10.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 8a06bd9..109b1db 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1229,10 +1229,7 @@ static void test_ScriptString(HDC hdc) int Charset; DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; - SCRIPT_CONTROL Control; - SCRIPT_STATE State; const int Dx[5] = {10, 10, 10, 10, 10}; - SCRIPT_TABDEF Tabdef; const BYTE InClass = 0; SCRIPT_STRING_ANALYSIS ssa = NULL; @@ -1251,20 +1248,20 @@ static void test_ScriptString(HDC hdc) Charset = -1; /* this flag indicates unicode input */ /* Test without hdc to get E_PENDING */ hr = ScriptStringAnalyse( NULL, teststr, len, Glyphs, Charset, Flags, - ReqWidth, &Control, &State, Dx, &Tabdef, - &InClass, &ssa); + ReqWidth, NULL, NULL, Dx, NULL, + &InClass, &ssa); ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", hr); /* test with hdc, this should be a valid test */ hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, - ReqWidth, &Control, &State, Dx, &Tabdef, + ReqWidth, NULL, NULL, Dx, NULL, &InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); ScriptStringFree(&ssa); /* test makes sure that a call with a valid pssa still works */ hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, - ReqWidth, &Control, &State, Dx, &Tabdef, + ReqWidth, NULL, NULL, Dx, NULL, &InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); ok(ssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n"); @@ -1309,9 +1306,6 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) int Charset = -1; /* unicode */ DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; - SCRIPT_CONTROL Control; - SCRIPT_STATE State; - SCRIPT_TABDEF Tabdef; const BYTE InClass = 0; SCRIPT_STRING_ANALYSIS ssa = NULL; @@ -1326,12 +1320,9 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) * Here we generate an SCRIPT_STRING_ANALYSIS that will be used as input to the * following character positions to X and X to character position functions. */ - memset(&Control, 0, sizeof(SCRIPT_CONTROL)); - memset(&State, 0, sizeof(SCRIPT_STATE)); - memset(&Tabdef, 0, sizeof(SCRIPT_TABDEF)); hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, - ReqWidth, &Control, &State, NULL, &Tabdef, + ReqWidth, NULL, NULL, NULL, NULL, &InClass, &ssa); ok(hr == S_OK || hr == E_INVALIDARG, /* NT */ @@ -1471,7 +1462,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) * generate an SSA for the subsequent tests. */ hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, - ReqWidth, &Control, &State, NULL, &Tabdef, + ReqWidth, NULL, NULL, NULL, NULL, &InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr);

1 0

Juan Lang : crypt32: Fix return value (clang).
by Alexandre Julliard Feb. 16, 2011

Feb. 16, 2011

Module: wine Branch: master Commit: a7534610a39eb1049c958a30af7cf88e3a328150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7534610a39eb1049c958a30a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 15 11:10:52 2011 -0800 crypt32: Fix return value (clang). --- dlls/crypt32/crl.c | 4 +++- dlls/crypt32/ctl.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 72180c5..cafe564 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -472,8 +472,10 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext, ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, pvData, pcbData); else + { *(DWORD *)pvData = 0; - ret = TRUE; + ret = TRUE; + } } break; default: diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 40895fa..09ebf26 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -605,8 +605,10 @@ BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext, ret = CertGetStoreProperty(pCTLContext->hCertStore, dwPropId, pvData, pcbData); else + { *(DWORD *)pvData = 0; - ret = TRUE; + ret = TRUE; + } } break; default:

1 0

Thomas Mullaly : mshtml: Fixed a few typos.
by Alexandre Julliard Feb. 16, 2011

Feb. 16, 2011

Module: wine Branch: master Commit: 5624ece30df5cdb42922b5dd6eb4e507415a4504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5624ece30df5cdb42922b5dd6… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Tue Feb 15 20:22:58 2011 -0500 mshtml: Fixed a few typos. --- dlls/mshtml/persist.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index d10b353..43d7e3c 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -203,9 +203,9 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel hres = get_client_disp_property(This->doc_obj->client, DISPID_AMBIENT_OFFLINEIFNOTCONNECTED, &offline); if(SUCCEEDED(hres)) { - if(V_VT(&silent) != VT_BOOL) - WARN("V_VT(offline) = %d\n", V_VT(&silent)); - else if(V_BOOL(&silent)) + if(V_VT(&offline) != VT_BOOL) + WARN("V_VT(offline) = %d\n", V_VT(&offline)); + else if(V_BOOL(&offline)) FIXME("offline == true\n"); } }

1 0

Rico Schüller : d3dcompiler/tests: Add reflection test .
by Alexandre Julliard Feb. 16, 2011

Feb. 16, 2011

Module: wine Branch: master Commit: d790be79d70e44d1860985b4f0d81547d222c358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d790be79d70e44d1860985b4f… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Feb 15 19:07:54 2011 +0100 d3dcompiler/tests: Add reflection test. --- dlls/d3dcompiler_43/tests/Makefile.in | 3 +- dlls/d3dcompiler_43/tests/reflection.c | 130 ++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 268c067..5c2bed8 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = d3dcompiler d3d9 d3dx9 user32 C_SRCS = \ asm.c \ blob.c \ - hlsl.c + hlsl.c \ + reflection.c @MAKE_TEST_RULES@ diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c new file mode 100644 index 0000000..b48f3c8 --- /dev/null +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -0,0 +1,130 @@ +/* + * Copyright 2010 Rico Schüller + * + * 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 + */ + +/* + * Nearly all compiler functions need the shader blob and the size. The size + * is always located at DWORD #6 in the shader blob (blob[6]). + * The functions are e.g.: D3DGet*SignatureBlob, D3DReflect + */ + +#define COBJMACROS +#include "initguid.h" +#include "d3dcompiler.h" +#include "wine/test.h" + +/* includes for older reflection interfaces */ +#include "d3d10.h" +#include "d3d10_1shader.h" + +/* + * This doesn't belong here, but for some functions it is possible to return that value, + * see http://msdn.microsoft.com/en-us/library/bb205278%28v=VS.85%29.aspx + * The original definition is in D3DX10core.h. + */ +#define D3DERR_INVALIDCALL 0x8876086c + +/* + * fxc.exe /E VS /Tvs_4_0 /Fx + */ +#if 0 +float4 VS(float4 position : POSITION, float4 pos : SV_POSITION) : SV_POSITION +{ + return position; +} +#endif +static DWORD test_reflection_blob[] = { +0x43425844, 0x77c6324f, 0xfd27948a, 0xe6958d31, 0x53361cba, 0x00000001, 0x000001d8, 0x00000005, +0x00000034, 0x0000008c, 0x000000e4, 0x00000118, 0x0000015c, 0x46454452, 0x00000050, 0x00000000, +0x00000000, 0x00000000, 0x0000001c, 0xfffe0400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, +0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, +0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x00000050, 0x00000002, 0x00000008, 0x00000038, +0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000, +0x00000003, 0x00000001, 0x0000000f, 0x49534f50, 0x4e4f4954, 0x5f565300, 0x49534f50, 0x4e4f4954, +0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, +0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, +0x00010040, 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, +0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x54415453, +0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, +0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +static void test_reflection_references(void) +{ + HRESULT hr; + ULONG count; + ID3D11ShaderReflection *ref11, *ref11_test; + ID3D10ShaderReflection *ref10; + ID3D10ShaderReflection1 *ref10_1; + + hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == S_OK, "D3DReflect failed, got %x, expected %x\n", hr, S_OK); + + hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D11ShaderReflection, (void **)&ref11_test); + ok(hr == S_OK, "QueryInterface failed, got %x, expected %x\n", hr, S_OK); + + count = ref11_test->lpVtbl->Release(ref11_test); + ok(count == 1, "Release failed %u\n", count); + + hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection, (void **)&ref10); + ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x\n", hr, E_NOINTERFACE); + + hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); + ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x\n", hr, E_NOINTERFACE); + + count = ref11->lpVtbl->Release(ref11); + ok(count == 0, "Release failed %u\n", count); + + /* check invalid cases */ + hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection, (void **)&ref10); + ok(hr == E_NOINTERFACE, "D3DReflect failed, got %x, expected %x\n", hr, E_NOINTERFACE); + + hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); + ok(hr == E_NOINTERFACE, "D3DReflect failed, got %x, expected %x\n", hr, E_NOINTERFACE); + + hr = D3DReflect(NULL, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); + ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DReflect(NULL, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + + /* returns different errors with different sizes */ + hr = D3DReflect(test_reflection_blob, 31, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); + ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DReflect(test_reflection_blob, 32, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); + ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL); + + hr = D3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); + ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL); + + hr = D3DReflect(test_reflection_blob, 31, &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DReflect(test_reflection_blob, 32, &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL); + + hr = D3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL); +} + +START_TEST(reflection) +{ + test_reflection_references(); +}

1 0