wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Austin English : inetmib1/tests: Remove a dead assignment (LLVM/Clang).
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: 6d66446baf2723884075b8fac037a13310d722c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d66446baf2723884075b8fac… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 17:41:26 2011 -0800 inetmib1/tests: Remove a dead assignment (LLVM/Clang). --- dlls/inetmib1/tests/main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index cc0e56f..03c9b62 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -251,7 +251,6 @@ static void testQuery(void) vars2[0].value.asnType = 0; list.len = 1; list.list = vars2; - moreData = TRUE; noChange = FALSE; ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index);

1 0

Austin English : gdiplus/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: f817e547f9dee657951d7060d9822df78b40fe81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f817e547f9dee657951d7060d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 17:39:49 2011 -0800 gdiplus/tests: Make sure to use return values (LLVM/Clang). --- dlls/gdiplus/tests/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 040a714..9a746b1 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1416,7 +1416,6 @@ static void test_Get_Release_DC(void) expect(ObjectBusy, status); /* try all Graphics calls here */ - status = Ok; status = GdipDrawArc(graphics, pen, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0); expect(ObjectBusy, status); status = GdipDrawArcI(graphics, pen, 0, 0, 1, 1, 0.0, 0.0); @@ -1599,6 +1598,7 @@ static void test_Get_Release_DC(void) status = GdipGetDpiY(graphics, &r); expect(ObjectBusy, status); status = GdipMultiplyWorldTransform(graphics, m, MatrixOrderPrepend); + expect(ObjectBusy, status); status = GdipGetClip(graphics, region); expect(ObjectBusy, status); status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, 5);

1 0

Austin English : msi/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: 7de70a48046a8710f30a24c295016d6b5e68aa2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de70a48046a8710f30a24c29… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 17:37:59 2011 -0800 msi/tests: Make sure to use return values (LLVM/Clang). --- dlls/msi/tests/format.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 6ac1242..facd298 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1023,6 +1023,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "format failed\n"); r = MsiRecordSetString(hrec, 0, "[]"); + ok( r == ERROR_SUCCESS, "set string failed\n"); sz = sizeof buffer; r = MsiFormatRecord(0, hrec, buffer, &sz); ok( sz == 2, "size wrong\n"); @@ -1964,6 +1965,7 @@ static void test_formatrecord_package(void) r = MsiRecordSetString(hrec, 4, "[prop]"); ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiRecordSetString(hrec, 5, "[noprop]"); + ok( r == ERROR_SUCCESS, "set string failed\n"); sz = sizeof buffer; r = MsiFormatRecord(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed with empty buffer (%i)\n",r);

1 0

Austin English : msi/tests: Remove dead assignments.
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: b6bea541db741f515dcdb26b160fe78246fb1b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6bea541db741f515dcdb26b1… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 17:37:48 2011 -0800 msi/tests: Remove dead assignments. --- dlls/msi/tests/automation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index a6f1ddb..a85b29d 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -489,7 +489,7 @@ static DISPID get_dispid( IDispatch *disp, const char *name ) str = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR) ); if (str) { - len = MultiByteToWideChar(CP_ACP, 0, name, -1, str, len ); + MultiByteToWideChar(CP_ACP, 0, name, -1, str, len ); r = IDispatch_GetIDsOfNames( disp, &IID_NULL, &str, 1, 0, &id ); HeapFree(GetProcessHeap(), 0, str); if (r != S_OK) @@ -871,7 +871,7 @@ static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARA len = MultiByteToWideChar(CP_ACP, 0, szName, -1, NULL, 0 ); name = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR) ); if (!name) return E_FAIL; - len = MultiByteToWideChar(CP_ACP, 0, szName, -1, name, len ); + MultiByteToWideChar(CP_ACP, 0, szName, -1, name, len ); hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); HeapFree(GetProcessHeap(), 0, name); ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr);

1 0

Austin English : crypt32/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: b1d4d2b215df99b8df171bbb3319a4438f8c4d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d4d2b215df99b8df171bbb3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 17:31:55 2011 -0800 crypt32/tests: Make sure to use return values (LLVM/Clang). --- dlls/crypt32/tests/store.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index db31190..67ebe11 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -200,6 +200,7 @@ static void testMemStore(void) if (buf) { ret = CertSerializeCertificateStoreElement(context, 0, buf, &size); + ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n", GetLastError()); ok(size == sizeof(serializedCert), "Wrong size %d\n", size); ok(!memcmp(serializedCert, buf, size), "Unexpected serialized cert\n"); @@ -1075,6 +1076,7 @@ static void testSystemRegStore(void) /* Now check whether deleting is allowed */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, BogusW); + ok(!store, "CertOpenStore failed: %08x\n", GetLastError()); RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, 0, NULL); @@ -2323,6 +2325,7 @@ static void testAddCertificateLink(void) /* The serialized linked certificate is identical to the serialized * original certificate. */ + ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n", GetLastError()); ok(size == sizeof(serializedCert), "Wrong size %d\n", size); ok(!memcmp(serializedCert, buf, size), "Unexpected serialized cert\n"); @@ -2345,6 +2348,7 @@ static void testAddCertificateLink(void) { ret = CertGetCertificateContextProperty(linked, CERT_FRIENDLY_NAME_PROP_ID, buf, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); ok(!lstrcmpW((LPCWSTR)buf, WineTestW), "unexpected friendly name\n"); HeapFree(GetProcessHeap(), 0, buf);

1 0

Austin English : advapi32/tests: Remove Win9x hacks.
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: b7c18d104b2d68a2a07574f01bb306df3fc138d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c18d104b2d68a2a07574f01… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 17:31:45 2011 -0800 advapi32/tests: Remove Win9x hacks. --- dlls/advapi32/tests/registry.c | 233 +++++++++++++++++----------------------- 1 files changed, 98 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7c18d104b2d68a2a0757…

1 0

Austin English : advapi32/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: 33db33d474e77eaa280dc763b4a0b3303c2e76f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33db33d474e77eaa280dc763b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 17:22:28 2011 -0800 advapi32/tests: Make sure to use return value (LLVM/Clang). --- dlls/advapi32/tests/service.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 5bacb1b..e86208f 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1561,6 +1561,7 @@ static void test_enum_svc(void) neededW = 0xdeadbeef; ret = pEnumServicesStatusExW(scm_handle, 0, SERVICE_WIN32, SERVICE_STATE_ALL, NULL, 0, &neededW, &returnedW, NULL, NULL); + ok(!ret, "Expected failure\n"); ok(neededW == needed, "Expected needed buffersize to be the same for A- and W-calls\n"); /* Store the needed bytes */

1 0

Austin English : advapi32/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: 68e1d5d78e9f6d29588b1b307507f262cf821d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e1d5d78e9f6d29588b1b307… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 17:22:17 2011 -0800 advapi32/tests: Make sure to use return value (LLVM/Clang). --- dlls/advapi32/tests/security.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e1f06c8..bfe9783 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1817,6 +1817,7 @@ static void check_wellknown_name(const char* name, WELL_KNOWN_SID_TYPE result) sid_size = 0; domain_size = 0; ret = LookupAccountNameA(NULL, name, NULL, &sid_size, NULL, &domain_size, &sid_use); + ok(!ret, " %s Should have failed to lookup account name\n", name); psid = HeapAlloc(GetProcessHeap(),0,sid_size); domain = HeapAlloc(GetProcessHeap(),0,domain_size); ret = LookupAccountNameA(NULL, name, psid, &sid_size, domain, &domain_size, &sid_use);

1 0

Austin English : d3dx9_36/tests: Free memory after use (Valgrind).
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: e8a2fa28ea78039248a9aa5f0223e8d37977db53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a2fa28ea78039248a9aa5f0… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 16:37:14 2011 -0800 d3dx9_36/tests: Free memory after use (Valgrind). --- dlls/d3dx9_36/tests/mesh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 5d1425b..05d68eb 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1417,6 +1417,7 @@ static void D3DXCreateBoxTest(void) end: IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); + ID3DXBuffer_Release(ppBuffer); DestroyWindow(wnd); }

1 0

Nikolay Sivov : msxml3: Null pointer for schema uri should be treated as empty.
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: edeff310b12072b957baf4a049408d28a22b4ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=edeff310b12072b957baf4a04… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 17 01:42:15 2011 +0300 msxml3: Null pointer for schema uri should be treated as empty. --- dlls/msxml3/schema.c | 18 ++++++++++-------- dlls/msxml3/tests/schema.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index fa4208d..9239326 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -63,11 +63,13 @@ static const xmlChar XDR_schema[] = "Schema"; static const xmlChar XDR_nsURI[] = "urn:schemas-microsoft-com:xml-data"; static const xmlChar DT_nsURI[] = "urn:schemas-microsoft-com:datatypes"; -static xmlChar const* datatypes_src = NULL; -static int datatypes_len = 0; -static HGLOBAL datatypes_handle = NULL; -static HRSRC datatypes_rsrc = NULL; -static xmlSchemaPtr datatypes_schema = NULL; +static xmlChar const* datatypes_src; +static int datatypes_len; +static HGLOBAL datatypes_handle; +static HRSRC datatypes_rsrc; +static xmlSchemaPtr datatypes_schema; + +static const WCHAR emptyW[] = {0}; /* Supported Types: * msxml3 - XDR only @@ -1057,7 +1059,7 @@ static HRESULT WINAPI schema_cache_Invoke(IXMLDOMSchemaCollection2* iface, static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri, VARIANT var) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - xmlChar* name = xmlChar_from_wchar(uri); + xmlChar* name = uri ? xmlChar_from_wchar(uri) : xmlChar_from_wchar(emptyW); TRACE("(%p)->(%s, var(vt %x))\n", This, debugstr_w(uri), V_VT(&var)); switch (V_VT(&var)) @@ -1158,7 +1160,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri if (!node) return E_POINTER; - name = xmlChar_from_wchar(uri); + name = uri ? xmlChar_from_wchar(uri) : xmlChar_from_wchar(emptyW); entry = (cache_entry*) xmlHashLookup(This->cache, name); heap_free(name); @@ -1173,7 +1175,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection2* iface, BSTR uri) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - xmlChar* name = xmlChar_from_wchar(uri); + xmlChar* name = uri ? xmlChar_from_wchar(uri) : xmlChar_from_wchar(emptyW); TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(uri)); xmlHashRemoveEntry(This->cache, name, cache_free); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 2b20603..56a77e6 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -493,11 +493,14 @@ static void* _create_object(const GUID *clsid, const char *name, const IID *iid, static void test_schema_refs(void) { + static const WCHAR emptyW[] = {0}; IXMLDOMDocument2 *doc; + IXMLDOMNode *node; IXMLDOMSchemaCollection *cache; VARIANT v; VARIANT_BOOL b; BSTR str; + LONG len; doc = create_document(&IID_IXMLDOMDocument2); if (!doc) @@ -516,6 +519,39 @@ static void test_schema_refs(void) ok(b == VARIANT_TRUE, "b %04x\n", b); SysFreeString(str); + node = (void*)0xdeadbeef; + ole_check(IXMLDOMSchemaCollection_get(cache, NULL, &node)); + ok(node == NULL, "%p\n", node); + + /* NULL uri pointer, still adds a document */ + ole_check(IXMLDOMSchemaCollection_add(cache, NULL, _variantdoc_(doc))); + len = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache, &len)); + ok(len == 1, "got %d\n", len); + /* read back - empty valid BSTR */ + str = NULL; + ole_check(IXMLDOMSchemaCollection_get_namespaceURI(cache, 0, &str)); + ok(str && *str == 0, "got %p\n", str); + SysFreeString(str); + + node = NULL; + ole_check(IXMLDOMSchemaCollection_get(cache, NULL, &node)); + ok(node != NULL, "%p\n", node); + IXMLDOMNode_Release(node); + + node = NULL; + str = SysAllocString(emptyW); + ole_check(IXMLDOMSchemaCollection_get(cache, str, &node)); + ok(node != NULL, "%p\n", node); + IXMLDOMNode_Release(node); + SysFreeString(str); + + /* remove with NULL uri */ + ole_check(IXMLDOMSchemaCollection_remove(cache, NULL)); + len = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache, &len)); + ok(len == 0, "got %d\n", len); + str = SysAllocString(xdr_schema_uri); ole_check(IXMLDOMSchemaCollection_add(cache, str, _variantdoc_(doc)));

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
68
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 February 2011