ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

opcservices: Fix argument handling in CreatePackageRootUri(). 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2018-09-07 13:56:13 +03:00 committed by Alexandre Julliard
parent 390847214b
commit 5a6cb3818d
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/opcservices/factory.c
View File

@ -312,6 +312,9 @@ static HRESULT WINAPI opc_factory_CreatePackageRootUri(IOpcFactory *iface, IOpcU
{ {
TRACE("iface %p, uri %p.\n", iface, uri); TRACE("iface %p, uri %p.\n", iface, uri);
if (!uri)
return E_POINTER;
return opc_root_uri_create(uri); return opc_root_uri_create(uri);
} }

21
dlls/opcservices/tests/opcservices.c
View File

@ -41,16 +41,18 @@ static void test_package(void)
static const WCHAR typeW[] = {'t','y','p','e','/','s','u','b','t','y','p','e',0}; static const WCHAR typeW[] = {'t','y','p','e','/','s','u','b','t','y','p','e',0};
static const WCHAR targetW[] = {'t','a','r','g','e','t',0}; static const WCHAR targetW[] = {'t','a','r','g','e','t',0};
static const WCHAR uriW[] = {'/','u','r','i',0}; static const WCHAR uriW[] = {'/','u','r','i',0};
static const WCHAR rootW[] = {'/',0};
IOpcRelationshipSet *relset, *relset2; IOpcRelationshipSet *relset, *relset2;
IOpcPartSet *partset, *partset2; IOpcPartSet *partset, *partset2;
IOpcRelationship *rel; IOpcRelationship *rel;
IOpcPartUri *part_uri; IOpcPartUri *part_uri;
IOpcFactory *factory; IOpcFactory *factory;
IOpcPackage *package; IOpcPackage *package;
IOpcUri *source_uri;
IUri *target_uri; IUri *target_uri;
IOpcPart *part; IOpcPart *part;
IOpcUri *uri;
HRESULT hr; HRESULT hr;
BSTR str;
BOOL ret; BOOL ret;
factory = create_factory(); factory = create_factory();
@ -93,11 +95,11 @@ static void test_package(void)
hr = IOpcRelationshipSet_CreateRelationship(relset, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); hr = IOpcRelationshipSet_CreateRelationship(relset, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel);
ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr);
hr = IOpcRelationship_GetSourceUri(rel, &source_uri); hr = IOpcRelationship_GetSourceUri(rel, &uri);
ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr);
ok(source_uri == (IOpcUri *)part_uri, "Unexpected source uri.\n"); ok(uri == (IOpcUri *)part_uri, "Unexpected source uri.\n");
IOpcUri_Release(source_uri); IOpcUri_Release(uri);
IOpcRelationship_Release(rel); IOpcRelationship_Release(rel);
IUri_Release(target_uri); IUri_Release(target_uri);
@ -126,6 +128,17 @@ todo_wine {
IOpcPackage_Release(package); IOpcPackage_Release(package);
/* Root uri */
hr = IOpcFactory_CreatePackageRootUri(factory, NULL);
ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);
hr = IOpcFactory_CreatePackageRootUri(factory, &uri);
ok(SUCCEEDED(hr), "Failed to create root uri, hr %#x.\n", hr);
hr = IOpcUri_GetRawUri(uri, &str);
ok(SUCCEEDED(hr), "Failed to get raw uri, hr %#x.\n", hr);
ok(!lstrcmpW(str, rootW), "Unexpected uri %s.\n", wine_dbgstr_w(str));
SysFreeString(str);
IOpcUri_Release(uri);
IOpcFactory_Release(factory); IOpcFactory_Release(factory);
} }

2
dlls/opcservices/uri.c
View File

@ -552,6 +552,8 @@ HRESULT opc_root_uri_create(IOpcUri **out)
HRESULT hr; HRESULT hr;
IUri *uri; IUri *uri;
*out = NULL;
if (!(obj = heap_alloc_zero(sizeof(*obj)))) if (!(obj = heap_alloc_zero(sizeof(*obj))))
return E_OUTOFMEMORY; return E_OUTOFMEMORY;