November 2009 - Wine-Commits

Juan Lang : crypt32: Fix a typo.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 9e1d31e5e52449cf4dcf6409dc4e71cf8b2a4383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1d31e5e52449cf4dcf6409d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 10:45:46 2009 -0800 crypt32: Fix a typo. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 89c8e90..d320111 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2379,7 +2379,7 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, if (cContext) { PCCERT_CONTEXT *contexts = - CryptMemAlloc(cContext * sizeof(PCCERT_CONTEXT *)); + CryptMemAlloc(cContext * sizeof(PCCERT_CONTEXT)); if (contexts) {

1 0

Piotr Caban : msxml3: Implemented more data types handling xmlnode_get_nodeTypedValue.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 2a9eb6e3bb452333c7a5750478bb8a88f8d1232c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a9eb6e3bb452333c7a575047… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Nov 19 20:50:22 2009 +0100 msxml3: Implemented more data types handling xmlnode_get_nodeTypedValue. --- dlls/msxml3/node.c | 16 +++++- dlls/msxml3/tests/domdoc.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1ddbc07..485a108 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -949,7 +949,7 @@ static HRESULT WINAPI xmlnode_get_dataType(IXMLDOMNode*, VARIANT*); inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) { if(!type || !lstrcmpiW(type, szString) || - !lstrcmpiW(type, szNumber)) + !lstrcmpiW(type, szNumber) || !lstrcmpiW(type, szUUID)) { V_VT(v) = VT_BSTR; V_BSTR(v) = bstr_from_xmlChar(str); @@ -1020,7 +1020,7 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) VARIANT src; HRESULT hres; - if(!lstrcmpiW(type, szInt)) + if(!lstrcmpiW(type, szInt) || !lstrcmpiW(type, szI4)) V_VT(v) = VT_I4; else if(!lstrcmpiW(type, szFixed)) V_VT(v) = VT_CY; @@ -1028,6 +1028,18 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) V_VT(v) = VT_BOOL; else if(!lstrcmpiW(type, szI1)) V_VT(v) = VT_I1; + else if(!lstrcmpiW(type, szI2)) + V_VT(v) = VT_I2; + else if(!lstrcmpiW(type, szIU1)) + V_VT(v) = VT_UI1; + else if(!lstrcmpiW(type, szIU2)) + V_VT(v) = VT_UI2; + else if(!lstrcmpiW(type, szIU4)) + V_VT(v) = VT_UI4; + else if(!lstrcmpiW(type, szR4)) + V_VT(v) = VT_R4; + else if(!lstrcmpiW(type, szR8) || !lstrcmpiW(type, szFloat)) + V_VT(v) = VT_R8; else { FIXME("Type handling not yet implemented\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 20c6a9f..3f02ff5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -162,6 +162,15 @@ static const CHAR szTypeValueXML[] = " <time dt:dt=\"time\">13:57:12.31321</time>\n" " <timetz dt:dt=\"time.tz\">23:21:01.13+03:21</timetz>\n" " <i1 dt:dt=\"i1\">-13</i1>\n" +" <i2 dt:dt=\"i2\">31915</i2>\n" +" <i4 dt:dt=\"i4\">-312232</i4>\n" +" <ui1 dt:dt=\"ui1\">123</ui1>\n" +" <ui2 dt:dt=\"ui2\">48282</ui2>\n" +" <ui4 dt:dt=\"ui4\">949281</ui4>\n" +" <r4 dt:dt=\"r4\">213124.0</r4>\n" +" <r8 dt:dt=\"r8\">0.412</r8>\n" +" <float dt:dt=\"float\">41221.421</float>\n" +" <uuid dt:dt=\"uuid\">333C7BC4-460F-11D0-BC04-0080C7055a83</uuid>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4164,6 +4173,123 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/i2"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_I2, "incorrect type\n"); + ok(V_I2(&v) == 31915, "incorrect value\n"); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/i4"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_I4, "incorrect type\n"); + ok(V_I4(&v) == -312232, "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/ui1"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_UI1, "incorrect type\n"); + ok(V_UI1(&v) == 123, "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/ui2"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_UI2, "incorrect type\n"); + ok(V_UI2(&v) == 48282, "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/ui4"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_UI4, "incorrect type\n"); + ok(V_UI4(&v) == 949281, "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/r4"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_R4, "incorrect type\n"); + double_eq(213124.0, V_R4(&v)); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/r8"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_R8, "incorrect type\n"); + double_eq(0.412, V_R8(&v)); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/float"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_R8, "incorrect type\n"); + double_eq(41221.421, V_R8(&v)); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/uuid"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_BSTR, "incorrect type\n"); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("333C7BC4-460F-11D0-BC04-0080C7055a83")), "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue 'bin.hex' data type handling.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 3c58b1c418bdf4f8c5f4266860c7f26fe717b228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c58b1c418bdf4f8c5f426686… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Nov 19 20:50:33 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue 'bin.hex' data type handling. --- dlls/msxml3/node.c | 26 ++++++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 18 ++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 485a108..47f5401 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -946,6 +946,13 @@ static HRESULT WINAPI xmlnode_get_definition( static HRESULT WINAPI xmlnode_get_dataType(IXMLDOMNode*, VARIANT*); +inline BYTE hex_to_byte(xmlChar c) +{ + if(c <= '9') return c-'0'; + if(c <= 'F') return c-'A'+10; + return c-'a'+10; +} + inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) { if(!type || !lstrcmpiW(type, szString) || @@ -1015,6 +1022,25 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) VariantClear(&src); } + else if(!lstrcmpiW(type, szBinHex)) + { + SAFEARRAYBOUND sab; + int i, len; + + len = xmlStrlen(str)/2; + sab.lLbound = 0; + sab.cElements = len; + + V_VT(v) = (VT_ARRAY|VT_UI1); + V_ARRAY(v) = SafeArrayCreate(VT_UI1, 1, &sab); + + if(!V_ARRAY(v)) + return E_OUTOFMEMORY; + + for(i=0; i<len; i++) + ((BYTE*)V_ARRAY(v)->pvData)[i] = (hex_to_byte(str[2*i])<<4) + + hex_to_byte(str[2*i+1]); + } else { VARIANT src; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3f02ff5..d220356 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -171,6 +171,7 @@ static const CHAR szTypeValueXML[] = " <r8 dt:dt=\"r8\">0.412</r8>\n" " <float dt:dt=\"float\">41221.421</float>\n" " <uuid dt:dt=\"uuid\">333C7BC4-460F-11D0-BC04-0080C7055a83</uuid>\n" +" <binhex dt:dt=\"bin.hex\">fffca012003c</binhex>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4290,6 +4291,23 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/binhex"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + BYTE bytes[] = {0xff,0xfc,0xa0,0x12,0x00,0x3c}; + + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == (VT_ARRAY|VT_UI1), "incorrect type\n"); + ok(V_ARRAY(&v)->rgsabound[0].cElements == 6, "incorrect array size\n"); + if(V_ARRAY(&v)->rgsabound[0].cElements == 6) + ok(!memcmp(bytes, V_ARRAY(&v)->pvData, sizeof(bytes)), "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue 'bin.base64' data type handling.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 8700253775d52ec1e6cb32217756e17f12aad717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8700253775d52ec1e6cb32217… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Nov 19 20:50:41 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue 'bin.base64' data type handling. --- dlls/msxml3/node.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 18 ++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 47f5401..eadd4e9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -953,6 +953,15 @@ inline BYTE hex_to_byte(xmlChar c) return c-'a'+10; } +inline BYTE base64_to_byte(xmlChar c) +{ + if(c == '+') return 62; + if(c == '/') return 63; + if(c <= '9') return c-'0'+52; + if(c <= 'Z') return c-'A'; + return c-'a'+26; +} + inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) { if(!type || !lstrcmpiW(type, szString) || @@ -1041,6 +1050,37 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) ((BYTE*)V_ARRAY(v)->pvData)[i] = (hex_to_byte(str[2*i])<<4) + hex_to_byte(str[2*i+1]); } + else if(!lstrcmpiW(type, szBinBase64)) + { + SAFEARRAYBOUND sab; + int i, len; + + len = xmlStrlen(str); + if(str[len-2] == '=') i = 2; + else if(str[len-1] == '=') i = 1; + else i = 0; + + sab.lLbound = 0; + sab.cElements = len/4*3-i; + + V_VT(v) = (VT_ARRAY|VT_UI1); + V_ARRAY(v) = SafeArrayCreate(VT_UI1, 1, &sab); + + if(!V_ARRAY(v)) + return E_OUTOFMEMORY; + + for(i=0; i<len/4; i++) + { + ((BYTE*)V_ARRAY(v)->pvData)[3*i] = (base64_to_byte(str[4*i])<<2) + + (base64_to_byte(str[4*i+1])>>4); + if(3*i+1 < sab.cElements) + ((BYTE*)V_ARRAY(v)->pvData)[3*i+1] = (base64_to_byte(str[4*i+1])<<4) + + (base64_to_byte(str[4*i+2])>>2); + if(3*i+2 < sab.cElements) + ((BYTE*)V_ARRAY(v)->pvData)[3*i+2] = (base64_to_byte(str[4*i+2])<<6) + + base64_to_byte(str[4*i+3]); + } + } else { VARIANT src; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d220356..d72452d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -172,6 +172,7 @@ static const CHAR szTypeValueXML[] = " <float dt:dt=\"float\">41221.421</float>\n" " <uuid dt:dt=\"uuid\">333C7BC4-460F-11D0-BC04-0080C7055a83</uuid>\n" " <binhex dt:dt=\"bin.hex\">fffca012003c</binhex>\n" +" <binbase64 dt:dt=\"bin.base64\">YmFzZTY0IHRlc3Q=</binbase64>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4308,6 +4309,23 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/binbase64"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + BYTE bytes[] = {0x62,0x61,0x73,0x65,0x36,0x34,0x20,0x74,0x65,0x73,0x74}; + + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == (VT_ARRAY|VT_UI1), "incorrect type\n"); + ok(V_ARRAY(&v)->rgsabound[0].cElements == 11, "incorrect array size\n"); + if(V_ARRAY(&v)->rgsabound[0].cElements == 11) + ok(!memcmp(bytes, V_ARRAY(&v)->pvData, sizeof(bytes)), "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Juan Lang : cryptnet: Test CertDllVerifyRevocation.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: be1fd9b3f12737320f5deacff12c3705e8ac172a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1fd9b3f12737320f5deacff… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 11:54:24 2009 -0800 cryptnet: Test CertDllVerifyRevocation. --- dlls/cryptnet/tests/cryptnet.c | 205 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 205 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be1fd9b3f12737320f5de…

1 0

Juan Lang : crypt32: Test revocation checking with CertGetCertificateChain.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 8ed5a777de6c9797a285829e07d7a27b3ed01257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed5a777de6c9797a285829e0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 10:36:55 2009 -0800 crypt32: Test revocation checking with CertGetCertificateChain. --- dlls/crypt32/tests/chain.c | 352 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 352 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ed5a777de6c9797a2858…

1 0

Juan Lang : cryptnet: Fix memory leaks querying an object.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 35dbc201ae3e2540127c0efd01ac64931cbcac18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35dbc201ae3e2540127c0efd0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 10:11:12 2009 -0800 cryptnet: Fix memory leaks querying an object. --- dlls/cryptnet/cryptnet_main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 9301a56..8a803eb 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1246,20 +1246,24 @@ static BOOL WINAPI CRYPT_CreateAny(LPCSTR pszObjectOid, if (!CertAddCertificateContextToStore(store, context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; + CertFreeCertificateContext(context); break; case CERT_QUERY_CONTENT_CRL: if (!CertAddCRLContextToStore(store, context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; + CertFreeCRLContext(context); break; case CERT_QUERY_CONTENT_CTL: if (!CertAddCTLContextToStore(store, context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; + CertFreeCTLContext(context); break; default: CertAddStoreToCollection(store, contextStore, 0, 0); } + CertCloseStore(contextStore, 0); } else ret = FALSE;

1 0

Alexandre Julliard : winebuild: Fix the definition of the CPU mask flag to take ARM into account.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 7782ebea0102171be203a341a4e9154a17c0ad18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7782ebea0102171be203a341a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 16:44:08 2009 +0100 winebuild: Fix the definition of the CPU mask flag to take ARM into account. --- tools/winebuild/build.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 65163f3..e47278a 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -119,7 +119,7 @@ typedef struct enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_ALPHA, CPU_POWERPC, CPU_ARM + CPU_x86, CPU_x86_64, CPU_SPARC, CPU_ALPHA, CPU_POWERPC, CPU_ARM, CPU_LAST = CPU_ARM }; enum target_platform @@ -148,7 +148,7 @@ extern enum target_platform target_platform; #define FLAG_EXT_LINK 0x200 /* function links to an external symbol */ #define FLAG_CPU(cpu) (0x01000 << (cpu)) -#define FLAG_CPU_MASK 0x1f000 +#define FLAG_CPU_MASK (FLAG_CPU(CPU_LAST + 1) - FLAG_CPU(0)) #define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64)) #define FLAG_CPU_WIN32 (FLAG_CPU_MASK & ~FLAG_CPU_WIN64)

1 0

Rob Shearman : oleaut32: Fix a reference count leak in NonOleAutomation_GetTypeInfo.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 87c47219ae944d8ea4ff104fefc897f9de401ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c47219ae944d8ea4ff104fe… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Nov 19 11:54:41 2009 +0000 oleaut32: Fix a reference count leak in NonOleAutomation_GetTypeInfo. Also enable a test which now works in Wine. --- dlls/oleaut32/tests/tmarshal.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 7a6c49e..46f1cdc 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -915,6 +915,7 @@ static ITypeInfo *NonOleAutomation_GetTypeInfo(void) ITypeInfo *pTypeInfo; hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_INonOleAutomation, &pTypeInfo); ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); + ITypeLib_Release(pTypeLib); return pTypeInfo; } return NULL; @@ -1260,10 +1261,8 @@ static void test_typelibmarshal(void) dispparams.cArgs = 1; dispparams.rgvarg = vararg; VariantInit(&varresult); -#if 0 /* NULL unknown not currently marshaled correctly */ hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); ok(hr == DISP_E_TYPEMISMATCH, "IDispatch_Invoke should have returned DISP_E_TYPEMISMATCH instead of 0x%08x\n", hr); -#endif VariantClear(&varresult); /* tests bad param type */

1 0

Rob Shearman : oleaut32: Fix memory leak of name in ITypeLib2_Constructor_MSFT.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 2a42f4295174122f6cc1df68d62836c1250a50fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a42f4295174122f6cc1df68d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Nov 19 11:54:32 2009 +0000 oleaut32: Fix memory leak of name in ITypeLib2_Constructor_MSFT. --- dlls/oleaut32/typelib.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ee715b6..8f552dc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2992,6 +2992,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) name = TLB_Alloc(size+1); MSFT_Read(name, size, &cx, DO_NOT_SEEK); (*ppImpLib)->name = TLB_MultiByteToBSTR(name); + TLB_Free(name); MSFT_ReadGuid(&(*ppImpLib)->guid, oGuid, &cx); offset = (offset + sizeof(INT) + sizeof(DWORD) + sizeof(LCID) + sizeof(UINT16) + size + 3) & ~3;

1 0