November 2010 - Wine-commits

Michael Stefaniuc : msvcrt: Add missing dereference of the time pointer.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 33c528188de8b229bccfcf945f2e1d9daf153842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c528188de8b229bccfcf945… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 24 00:37:32 2010 +0100 msvcrt: Add missing dereference of the time pointer. --- dlls/msvcrt/time.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 7ccdc7d..4150156 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -913,7 +913,7 @@ int CDECL MSVCRT__ctime64_s(char *res, MSVCRT_size_t len, const MSVCRT___time64_ return MSVCRT_EINVAL; } res[0] = '\0'; - if( !MSVCRT_CHECK_PMT( time != NULL ) || !MSVCRT_CHECK_PMT( time > 0 ) ) + if( !MSVCRT_CHECK_PMT( time != NULL ) || !MSVCRT_CHECK_PMT( *time > 0 ) ) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; @@ -946,7 +946,7 @@ int CDECL MSVCRT__ctime32_s(char *res, MSVCRT_size_t len, const MSVCRT___time32_ return MSVCRT_EINVAL; } res[0] = '\0'; - if( !MSVCRT_CHECK_PMT( time != NULL ) || !MSVCRT_CHECK_PMT( time > 0 ) ) + if( !MSVCRT_CHECK_PMT( time != NULL ) || !MSVCRT_CHECK_PMT( *time > 0 ) ) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL;

1 0

Alexander Morozov : crypt32/tests: Use pCryptAcquireContextA.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: d8cad3eb1be43c44b5d40dbe92559f4f6c746689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8cad3eb1be43c44b5d40dbe9… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Nov 23 13:50:22 2010 +0300 crypt32/tests: Use pCryptAcquireContextA. --- dlls/crypt32/tests/message.c | 23 +++++++++++++++++++++-- dlls/crypt32/tests/msg.c | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index b7114b7..392ec47 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -27,6 +27,23 @@ #include "wine/test.h" +static BOOL (WINAPI * pCryptAcquireContextA) + (HCRYPTPROV *, LPCSTR, LPCSTR, DWORD, DWORD); + +static void init_function_pointers(void) +{ + HMODULE hAdvapi32 = GetModuleHandleA("advapi32.dll"); + +#define GET_PROC(dll, func) \ + p ## func = (void *)GetProcAddress(dll, #func); \ + if(!p ## func) \ + trace("GetProcAddress(%s) failed\n", #func); + + GET_PROC(hAdvapi32, CryptAcquireContextA) + +#undef GET_PROC +} + static const BYTE dataEmptyBareContent[] = { 0x04,0x00 }; static const BYTE dataEmptyContent[] = { 0x30,0x0f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x02, @@ -1001,7 +1018,7 @@ static void test_sign_message(void) ok(signedBlobSize, "bad size\n"); SetLastError(0xdeadbeef); - ret = CryptAcquireContextA(&hCryptProv, NULL, NULL, PROV_RSA_FULL, + ret = pCryptAcquireContextA(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); @@ -1188,7 +1205,7 @@ static void test_encrypt_message(void) DWORD encryptedBlobSize; SetLastError(0xdeadbeef); - ret = CryptAcquireContextA(&hCryptProv, NULL, NULL, PROV_RSA_FULL, + ret = pCryptAcquireContextA(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); @@ -1343,6 +1360,8 @@ static void test_encrypt_message(void) START_TEST(message) { + init_function_pointers(); + test_msg_get_signer_count(); test_verify_detached_message_hash(); test_verify_message_hash(); diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 90dd783..898b10c 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -3100,7 +3100,7 @@ static void test_decode_msg_get_param(void) check_param("enveloped empty content", msg, CMSG_CONTENT_PARAM, NULL, 0); CryptMsgClose(msg); - CryptAcquireContextA(&hCryptProv, NULL, MS_ENHANCED_PROV_A, PROV_RSA_FULL, + pCryptAcquireContextA(&hCryptProv, NULL, MS_ENHANCED_PROV_A, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); SetLastError(0xdeadbeef); ret = CryptImportKey(hCryptProv, publicPrivateKeyPair,

1 0

Adam Martinson : msxml3: Use the associated schema for domelem_get_dataType ().
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: c19fa9b04b03b78778d48e88f80d9253168c7edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19fa9b04b03b78778d48e88f… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:55:54 2010 -0600 msxml3: Use the associated schema for domelem_get_dataType(). --- dlls/msxml3/element.c | 345 +++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 25 ++-- dlls/msxml3/tests/domdoc.c | 321 +++++++++++++++++++++++++++++++++------- 4 files changed, 619 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c19fa9b04b03b78778d48…

1 0

Adam Martinson : msxml3: Add BSTR versions of the XDR_DT <-> string functions.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: f090ddfe13eefe3e271e2ab6ca41f6640f114010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f090ddfe13eefe3e271e2ab6c… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:56:31 2010 -0600 msxml3: Add BSTR versions of the XDR_DT <-> string functions. --- dlls/msxml3/element.c | 10 +- dlls/msxml3/msxml_private.h | 6 +- dlls/msxml3/schema.c | 233 ++++++++++++++++++++++++++++++++++-------- 3 files changed, 197 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f090ddfe13eefe3e271e2…

1 0

Adam Martinson : msxml3: Validate node content in domelem_put_dataType().
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 643cbafabc0535fece63ef0a9f51de164df8e5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=643cbafabc0535fece63ef0a9… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:57:29 2010 -0600 msxml3: Validate node content in domelem_put_dataType(). --- dlls/msxml3/element.c | 89 +++++++++++++++++++++++++++++++++++++++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 71 +++----------------------------- dlls/msxml3/schema.c | 94 ++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 182 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=643cbafabc0535fece63e…

1 0

Adam Martinson : msxml3: Implement domtext dt-related functions.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 6f537c4df11b70d2cb8338035557e694ac8f8cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f537c4df11b70d2cb8338035… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:57:58 2010 -0600 msxml3: Implement domtext dt-related functions. These should always be handled by the parent node. --- dlls/msxml3/node.c | 2 +- dlls/msxml3/text.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index c135f20..2db7115 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -852,7 +852,7 @@ static HRESULT WINAPI xmlnode_get_nodeTypedValue( V_VT(typedValue) = VT_NULL; - if (This->node->type == XML_TEXT_NODE || This->node->type == XML_ENTITY_REF_NODE) + if (This->node->type == XML_ENTITY_REF_NODE) { VariantInit(&type); hres = IXMLDOMNode_get_dataType(This->iface, &type); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 9b25008..76d81c2 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -435,7 +435,29 @@ static HRESULT WINAPI domtext_get_nodeTypedValue( VARIANT* var1) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); + IXMLDOMNode* parent = NULL; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, var1); + + if (!var1) + return E_INVALIDARG; + + hr = domtext_get_parentNode(iface, &parent); + + if (hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(parent, var1); + IXMLDOMNode_Release(parent); + } + else + { + V_VT(var1) = VT_NULL; + V_BSTR(var1) = NULL; + hr = S_FALSE; + } + + return hr; } static HRESULT WINAPI domtext_put_nodeTypedValue( @@ -443,24 +465,82 @@ static HRESULT WINAPI domtext_put_nodeTypedValue( VARIANT var1) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); + IXMLDOMNode* parent = NULL; + HRESULT hr; + + TRACE("(%p)->(VARIANT)\n", This); + + hr = domtext_get_parentNode(iface, &parent); + + if (hr == S_OK) + { + hr = IXMLDOMNode_put_nodeTypedValue(parent, var1); + IXMLDOMNode_Release(parent); + } + else + { + hr = S_FALSE; + } + + return hr; } static HRESULT WINAPI domtext_get_dataType( IXMLDOMText *iface, - VARIANT* typename) + VARIANT* dtName) { domtext *This = impl_from_IXMLDOMText( iface ); - TRACE("(%p)->(%p)\n", This, typename); - return return_null_var( typename ); + IXMLDOMNode* parent = NULL; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, dtName); + + if (!dtName) + return E_INVALIDARG; + + hr = domtext_get_parentNode(iface, &parent); + + if (hr == S_OK) + { + hr = IXMLDOMNode_get_dataType(parent, dtName); + IXMLDOMNode_Release(parent); + } + else + { + V_VT(dtName) = VT_NULL; + V_BSTR(dtName) = NULL; + hr = S_FALSE; + } + + return hr; } static HRESULT WINAPI domtext_put_dataType( IXMLDOMText *iface, - BSTR p) + BSTR dtName) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p ); + IXMLDOMNode* parent = NULL; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, dtName); + + if (!dtName) + return E_INVALIDARG; + + hr = domtext_get_parentNode(iface, &parent); + + if (hr == S_OK) + { + hr = IXMLDOMNode_put_dataType(parent, dtName); + IXMLDOMNode_Release(parent); + } + else + { + hr = S_FALSE; + } + + return hr; } static HRESULT WINAPI domtext_get_xml(

1 0

Adam Martinson : msxml3: Fix domdoc_getElementsByTagName()/ domelem_getElementsByTagName().
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: f3678ec193edec1911c0dfecc1e0cd44339368ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3678ec193edec1911c0dfecc… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:59:20 2010 -0600 msxml3: Fix domdoc_getElementsByTagName()/domelem_getElementsByTagName(). --- dlls/msxml3/domdoc.c | 85 ++++++++++++++++++++++++++++--------------- dlls/msxml3/element.c | 42 +++++----------------- dlls/msxml3/msxml_private.h | 6 +++- dlls/msxml3/node.c | 8 ++++- dlls/msxml3/queryresult.c | 22 ++++------- dlls/msxml3/tests/domdoc.c | 7 ++-- 6 files changed, 87 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3678ec193edec1911c0d…

1 0

André Hentschel : patches: Mention that there must be the full name.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: tools Branch: master Commit: 9526152b008ddba4825904d9cf1d6dae9912ed82 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9526152b008ddba4825904d9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 23 21:17:13 2010 +0100 patches: Mention that there must be the full name. --- patches/update | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/patches/update b/patches/update index ef24a7f..70d05e3 100755 --- a/patches/update +++ b/patches/update @@ -64,7 +64,7 @@ my @legend = [ "buildfail", "<ul><li>Syntax error or other compile problem.</li>" . "<li>You forgot to include some changes or new files required for compilation.</li>" . "<li>The patch causes compiler warnings (maintainer mode implies -Werror).</li></ul>" ], - [ "formatting", "<ul><li>The patch author's name or email address are incorrect or missing.</li>" . + [ "formatting", "<ul><li>The patch author's full name or email address are incorrect or missing.</li>" . "<li>Whitespace got mangled in transit.</li>" . "<li>Indentation is messed up (usually from editing with a non-standard tab size).</li>" . "<li>8-bit chars got mangled in transit (usually when sending patches to resource files).</li>" .

1 0

Alexandre Julliard : winetest: Properly format the new URL field.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: tools Branch: master Commit: f675b2738fb9a0d215d02d9cfd035cb8e83f13ff URL: http://source.winehq.org/git/tools.git/?a=commit;h=f675b2738fb9a0d215d02d9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 23 17:46:07 2010 +0100 winetest: Properly format the new URL field. --- winetest/dissect | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 83254fe..00edcc5 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -129,7 +129,11 @@ my ($wine, $wine_build, $version, $major, $minor, $plid, $product); $box->{data} .= "<h2>Operating system version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { - $box->{data} .= sprintf "<tr><td>$1</td><td>%s</td></tr>\n", escapeHTML($2); + if ($1 eq "URL") { + $box->{data} .= sprintf "<tr><td>$1</td><td><a href=\"%s\">%s</a></td></tr>\n", escapeHTML($2), escapeHTML($2); + } else { + $box->{data} .= sprintf "<tr><td>$1</td><td>%s</td></tr>\n", escapeHTML($2); + } if ($1 eq "bRunningUnderWine") { $wine = $2; } elsif ($1 eq "dwMajorVersion") {

1 0

Michael Stefaniuc : d3dx9_36: Move 'static' to the beginning of the declaration.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: b6a19519250e17d07738935ebb0ccc344d143250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a19519250e17d07738935eb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 23 14:22:15 2010 +0100 d3dx9_36: Move 'static' to the beginning of the declaration. --- dlls/d3dx9_36/texture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index c6e2273..f107bbf 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1075,7 +1075,7 @@ HRESULT WINAPI D3DXFillCubeTexture(LPDIRECT3DCUBETEXTURE9 texture, BYTE *data, *pos; BYTE byte, mask; float comp_value; - const static enum cube_coord coordmap[6][3] = + static const enum cube_coord coordmap[6][3] = { {ONE, YCOORDINV, XCOORDINV}, {ZERO, YCOORDINV, XCOORD},

1 0