Signed-off-by: Hans Leidekker hans@codeweavers.com --- dlls/wmiutils/Makefile.in | 1 - dlls/wmiutils/path.c | 46 ++--- dlls/wmiutils/statuscode.c | 4 +- dlls/wmiutils/tests/Makefile.in | 1 - dlls/wmiutils/tests/path.c | 323 ++++++++++++++++---------------- 5 files changed, 185 insertions(+), 190 deletions(-)
diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in index 8086851e047..22d756c1f5a 100644 --- a/dlls/wmiutils/Makefile.in +++ b/dlls/wmiutils/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmiutils.dll IMPORTS = oleaut32 ole32 advapi32
diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 6a7587ad23f..ce2fc90ba1f 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -145,7 +145,7 @@ static HRESULT WINAPI keylist_SetKey( ULONG uCimType, LPVOID pKeyVal ) { - FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + FIXME("%p, %s, %#lx, %lu, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); return E_NOTIMPL; }
@@ -156,7 +156,7 @@ static HRESULT WINAPI keylist_SetKey2( ULONG uCimType, VARIANT *pKeyVal ) { - FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + FIXME("%p, %s, %#lx, %lu, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); return E_NOTIMPL; }
@@ -170,7 +170,7 @@ static HRESULT WINAPI keylist_GetKey( LPVOID pKeyVal, ULONG *puApparentCimType ) { - FIXME("%p, %u, 0x%x, %p, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + FIXME("%p, %lu, %#lx, %p, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, pszKeyName, puKeyValBufSize, pKeyVal, puApparentCimType); return E_NOTIMPL; } @@ -184,7 +184,7 @@ static HRESULT WINAPI keylist_GetKey2( VARIANT *pKeyValue, ULONG *puApparentCimType ) { - FIXME("%p, %u, 0x%x, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + FIXME("%p, %lu, %#lx, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, pszKeyName, pKeyValue, puApparentCimType); return E_NOTIMPL; } @@ -194,7 +194,7 @@ static HRESULT WINAPI keylist_RemoveKey( LPCWSTR wszName, ULONG uFlags ) { - FIXME("%p, %s, 0x%x\n", iface, debugstr_w(wszName), uFlags); + FIXME("%p, %s, %#lx\n", iface, debugstr_w(wszName), uFlags); return E_NOTIMPL; }
@@ -217,7 +217,7 @@ static HRESULT WINAPI keylist_RemoveAllKeys( struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); struct path *parent = impl_from_IWbemPath( keylist->parent );
- TRACE("%p, 0x%x\n", iface, uFlags); + TRACE("%p, %#lx\n", iface, uFlags);
if (uFlags) return WBEM_E_INVALID_PARAMETER;
@@ -244,7 +244,7 @@ static HRESULT WINAPI keylist_GetInfo( ULONG uRequestedInfo, ULONGLONG *puResponse ) { - FIXME("%p, %u, %p\n", iface, uRequestedInfo, puResponse); + FIXME("%p, %lu, %p\n", iface, uRequestedInfo, puResponse); return E_NOTIMPL; }
@@ -254,7 +254,7 @@ static HRESULT WINAPI keylist_GetText( ULONG *puBuffLength, LPWSTR pszText ) { - FIXME("%p, 0x%x, %p, %p\n", iface, lFlags, puBuffLength, pszText); + FIXME("%p, %#lx, %p, %p\n", iface, lFlags, puBuffLength, pszText); return E_NOTIMPL; }
@@ -517,7 +517,7 @@ static HRESULT WINAPI path_SetText( HRESULT hr = S_OK; int len;
- TRACE("%p, %u, %s\n", iface, uMode, debugstr_w(pszPath)); + TRACE("%p, %lu, %s\n", iface, uMode, debugstr_w(pszPath));
if (!uMode || !pszPath) return WBEM_E_INVALID_PARAMETER;
@@ -761,7 +761,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) return strdupW( path->text );
default: - ERR("unhandled flags 0x%x\n", flags); + ERR( "unhandled flags %#lx\n", flags ); return NULL; } } @@ -777,7 +777,7 @@ static HRESULT WINAPI path_GetText( WCHAR *str; int len;
- TRACE("%p, 0x%x, %p, %p\n", iface, lFlags, puBufferLength, pszText); + TRACE("%p, %#lx, %p, %p\n", iface, lFlags, puBufferLength, pszText);
if (!puBufferLength) return WBEM_E_INVALID_PARAMETER;
@@ -813,7 +813,7 @@ static HRESULT WINAPI path_GetInfo( { struct path *path = impl_from_IWbemPath( iface );
- TRACE("%p, %u, %p\n", iface, info, response); + TRACE("%p, %lu, %p\n", iface, info, response);
if (info || !response) return WBEM_E_INVALID_PARAMETER;
@@ -934,7 +934,7 @@ static HRESULT WINAPI path_SetNamespaceAt( WCHAR **tmp, *new; DWORD size;
- TRACE("%p, %u, %s\n", iface, idx, debugstr_w(name)); + TRACE( "%p, %lu, %s\n", iface, idx, debugstr_w(name) );
EnterCriticalSection( &path->cs );
@@ -990,7 +990,7 @@ static HRESULT WINAPI path_GetNamespaceAt( { struct path *path = impl_from_IWbemPath( iface );
- TRACE("%p, %u, %p, %p\n", iface, idx, len, name); + TRACE( "%p, %lu, %p, %p\n", iface, idx, len, name );
EnterCriticalSection( &path->cs );
@@ -1012,7 +1012,7 @@ static HRESULT WINAPI path_RemoveNamespaceAt( { struct path *path = impl_from_IWbemPath( iface );
- TRACE("%p, %u\n", iface, idx); + TRACE( "%p, %lu\n", iface, idx );
EnterCriticalSection( &path->cs );
@@ -1068,7 +1068,7 @@ static HRESULT WINAPI path_SetScope( ULONG uIndex, LPWSTR pszClass) { - FIXME("%p, %u, %s\n", iface, uIndex, debugstr_w(pszClass)); + FIXME("%p, %lu, %s\n", iface, uIndex, debugstr_w(pszClass)); return E_NOTIMPL; }
@@ -1077,7 +1077,7 @@ static HRESULT WINAPI path_SetScopeFromText( ULONG uIndex, LPWSTR pszText) { - FIXME("%p, %u, %s\n", iface, uIndex, debugstr_w(pszText)); + FIXME("%p, %lu, %s\n", iface, uIndex, debugstr_w(pszText)); return E_NOTIMPL; }
@@ -1088,7 +1088,7 @@ static HRESULT WINAPI path_GetScope( LPWSTR pszClass, IWbemPathKeyList **pKeyList) { - FIXME("%p, %u, %p, %p, %p\n", iface, uIndex, puClassNameBufSize, pszClass, pKeyList); + FIXME("%p, %lu, %p, %p, %p\n", iface, uIndex, puClassNameBufSize, pszClass, pKeyList); return E_NOTIMPL; }
@@ -1098,7 +1098,7 @@ static HRESULT WINAPI path_GetScopeAsText( ULONG *puTextBufSize, LPWSTR pszText) { - FIXME("%p, %u, %p, %p\n", iface, uIndex, puTextBufSize, pszText); + FIXME("%p, %lu, %p, %p\n", iface, uIndex, puTextBufSize, pszText); return E_NOTIMPL; }
@@ -1106,7 +1106,7 @@ static HRESULT WINAPI path_RemoveScope( IWbemPath *iface, ULONG uIndex) { - FIXME("%p, %u\n", iface, uIndex); + FIXME("%p, %lu\n", iface, uIndex); return E_NOTIMPL; }
@@ -1192,7 +1192,7 @@ static HRESULT WINAPI path_CreateClassPart( LONG lFlags, LPCWSTR Name) { - FIXME("%p, 0x%x, %s\n", iface, lFlags, debugstr_w(Name)); + FIXME("%p, %#lx, %s\n", iface, lFlags, debugstr_w(Name)); return E_NOTIMPL; }
@@ -1200,7 +1200,7 @@ static HRESULT WINAPI path_DeleteClassPart( IWbemPath *iface, LONG lFlags) { - FIXME("%p, 0x%x\n", iface, lFlags); + FIXME("%p, %#lx\n", iface, lFlags); return E_NOTIMPL; }
@@ -1219,7 +1219,7 @@ static BOOL WINAPI path_IsRelativeOrChild( LPWSTR wszNamespace, LONG lFlags) { - FIXME("%p, %s, %s, 0x%x\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace), lFlags); + FIXME("%p, %s, %s, %#lx\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace), lFlags); return FALSE; }
diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c index 7137bf1c699..b9a3e71eb68 100644 --- a/dlls/wmiutils/statuscode.c +++ b/dlls/wmiutils/statuscode.c @@ -94,7 +94,7 @@ static HRESULT WINAPI status_code_GetErrorCodeText( { WCHAR msg[32];
- FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); + FIXME("%p, %#lx, %#lx, %#lx, %p\n", iface, res, lcid, flags, text);
swprintf(msg, ARRAY_SIZE(msg), L"Error code: 0x%08x", res); *text = SysAllocString(msg); @@ -110,7 +110,7 @@ static HRESULT WINAPI status_code_GetFacilityCodeText( { WCHAR msg[32];
- FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); + FIXME("%p, %#lx, %#lx, %#lx, %p\n", iface, res, lcid, flags, text);
swprintf(msg, ARRAY_SIZE(msg), L"Facility code: 0x%08x", res); *text = SysAllocString(msg); diff --git a/dlls/wmiutils/tests/Makefile.in b/dlls/wmiutils/tests/Makefile.in index 60135dcc0a1..3099d506bed 100644 --- a/dlls/wmiutils/tests/Makefile.in +++ b/dlls/wmiutils/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wmiutils.dll IMPORTS = ole32
diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 0b5473c4d0d..879d86af32e 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -105,16 +105,16 @@ static void test_IWbemPath_SetText(void) if (!(path = create_path())) return;
hr = IWbemPath_SetText( path, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
for (i = 0; i < ARRAY_SIZE(test); i++) { hr = IWbemPath_SetText( path, test[i].mode, test[i].path ); todo_wine_if (test[i].todo) - ok( hr == test[i].ret, "%u got %08x\n", i, hr ); + ok( hr == test[i].ret, "%u got %#lx\n", i, hr );
if (test[i].ret == S_OK) { @@ -124,9 +124,9 @@ static void test_IWbemPath_SetText(void) memset( buf, 0x55, sizeof(buf) ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, &len, buf ); - ok( hr == S_OK, "%u got %08x\n", i, hr ); + ok( hr == S_OK, "%u got %#lx\n", i, hr ); ok( !lstrcmpW( buf, test[i].path ), "%u unexpected path %s\n", i, wine_dbgstr_w(buf) ); - ok( len == lstrlenW( test[i].path ) + 1, "%u unexpected length %u\n", i, len ); + ok( len == lstrlenW( test[i].path ) + 1, "%u unexpected length %lu\n", i, len ); } } IWbemPath_Release( path ); @@ -147,181 +147,181 @@ static void test_IWbemPath_GetText(void) if (!(path = create_path())) return;
hr = IWbemPath_GetText( path, 0, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetText( path, 0, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !buf[0], "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == 1, "unexpected length %u\n", len ); + ok( len == 1, "unexpected length %lu\n", len );
hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !buf[0], "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == 1, "unexpected length %u\n", len ); + ok( len == 1, "unexpected length %lu\n", len );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); todo_wine ok( !buf[0], "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - todo_wine ok( len == 1, "unexpected length %u\n", len ); + todo_wine ok( len == 1, "unexpected length %lu\n", len );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path8 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path9 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path9 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path9 ) + 1, "unexpected length %lu\n", len );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_AND_NAMESPACE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path13 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path13 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path13 ) + 1, "unexpected length %lu\n", len );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path14 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path14 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path14 ) + 1, "unexpected length %lu\n", len );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_NAMESPACE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path15 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path15 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path15 ) + 1, "unexpected length %lu\n", len );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path12 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path12 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path12 ) + 1, "unexpected length %lu\n", len );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path6 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count );
len = 0; hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( len == lstrlenW( path16 ) + 1, "unexpected length %u\n", len ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( len == lstrlenW( path16 ) + 1, "unexpected length %lu\n", len );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path16 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path16 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path16 ) + 1, "unexpected length %lu\n", len );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path17 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path17 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path17 ) + 1, "unexpected length %lu\n", len );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, expected1W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( expected1W ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( expected1W ) + 1, "unexpected length %lu\n", len );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, expected2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( expected2W ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( expected2W ) + 1, "unexpected length %lu\n", len );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path15 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, expected3W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( expected3W ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( expected3W ) + 1, "unexpected length %lu\n", len );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path18 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path19 ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path20 ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
IWbemPath_Release( path ); if (!(path = create_path())) return;
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, serviceW ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, serviceW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( serviceW ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( serviceW ) + 1, "unexpected length %lu\n", len );
IWbemPath_Release( path ); if (!(path = create_path())) return;
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, classW ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( classW ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( classW ) + 1, "unexpected length %lu\n", len );
IWbemPath_Release( path ); } @@ -337,39 +337,39 @@ static void test_IWbemPath_GetClassName(void) if (!(path = create_path())) return;
hr = IWbemPath_GetClassName( path, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
len = 0; hr = IWbemPath_GetClassName( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, buf ); - ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
len = 0; hr = IWbemPath_GetClassName( path, &len, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len );
buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( classW ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( classW ) + 1, "unexpected length %lu\n", len );
IWbemPath_Release( path ); } @@ -386,23 +386,23 @@ static void test_IWbemPath_SetClassName(void) if (!(path = create_path())) return;
hr = IWbemPath_SetClassName( path, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
hr = IWbemPath_SetClassName( path, L"" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
hr = IWbemPath_SetClassName( path, classW ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) );
flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT), @@ -421,39 +421,39 @@ static void test_IWbemPath_GetServer(void) if (!(path = create_path())) return;
hr = IWbemPath_GetServer( path, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
len = 0; hr = IWbemPath_GetServer( path, &len, NULL ); - ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
len = 0; hr = IWbemPath_GetServer( path, &len, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len );
buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"." ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW(L"." ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW(L"." ) + 1, "unexpected length %lu\n", len );
IWbemPath_Release( path ); } @@ -467,29 +467,29 @@ static void test_IWbemPath_GetInfo(void) if (!(path = create_path())) return;
hr = IWbemPath_GetInfo( path, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
hr = IWbemPath_GetInfo( path, 1, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
resp = 0xdeadbeef; hr = IWbemPath_GetInfo( path, 0, &resp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), "got %s\n", wine_dbgstr_longlong(resp) );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
hr = IWbemPath_GetInfo( path, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
hr = IWbemPath_GetInfo( path, 1, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
resp = 0xdeadbeef; hr = IWbemPath_GetInfo( path, 0, &resp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), @@ -499,22 +499,22 @@ static void test_IWbemPath_GetInfo(void) if (!(path = create_path())) return;
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path12 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
resp = 0xdeadbeef; hr = IWbemPath_GetInfo( path, 0, &resp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT), "got %s\n", wine_dbgstr_longlong(resp) );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
resp = 0xdeadbeef; hr = IWbemPath_GetInfo( path, 0, &resp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), "got %s\n", wine_dbgstr_longlong(resp) );
@@ -532,42 +532,42 @@ static void test_IWbemPath_SetServer(void) if (!(path = create_path())) return;
hr = IWbemPath_SetServer( path, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %#lx\n", hr );
hr = IWbemPath_SetServer( path, L"" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
hr = IWbemPath_SetServer( path, L"server" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"server" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) );
flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == (WBEMPATH_INFO_HAS_MACHINE_NAME | WBEMPATH_INFO_V1_COMPLIANT | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY | WBEMPATH_INFO_PATH_HAD_SERVER), "got %s\n", wine_dbgstr_longlong(flags) );
hr = IWbemPath_SetServer( path, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %#lx\n", hr );
flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), "got %s\n", wine_dbgstr_longlong(flags) );
@@ -584,46 +584,46 @@ static void test_IWbemPath_GetNamespaceAt(void) if (!(path = create_path())) return;
hr = IWbemPath_GetNamespaceAt( path, 0, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
len = 0; hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
len = 0; hr = IWbemPath_GetNamespaceAt( path, 2, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len );
buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"root" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"root" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"root" ) + 1, "unexpected length %lu\n", len );
buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %lu\n", len );
IWbemPath_Release( path ); } @@ -643,30 +643,30 @@ static void test_IWbemPath_RemoveAllNamespaces(void) if (!(path = create_path())) return;
hr = IWbemPath_RemoveAllNamespaces( path ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) );
hr = IWbemPath_RemoveAllNamespaces( path ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) );
buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
IWbemPath_Release( path ); } @@ -686,61 +686,60 @@ static void test_IWbemPath_RemoveNamespaceAt(void) if (!(path = create_path())) return;
hr = IWbemPath_RemoveNamespaceAt( path, 0 ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) );
count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count );
hr = IWbemPath_RemoveNamespaceAt( path, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) );
count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 1, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 1, "got %lu\n", count );
buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %lu\n", len );
hr = IWbemPath_RemoveNamespaceAt( path, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == expected_flags, - "got %s\n", wine_dbgstr_longlong(flags) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) );
count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count );
buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
IWbemPath_Release( path ); } @@ -760,59 +759,57 @@ static void test_IWbemPath_SetNamespaceAt(void) if (!(path = create_path())) return;
hr = IWbemPath_SetNamespaceAt( path, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
hr = IWbemPath_SetNamespaceAt( path, 1, L"cimv2" ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr );
hr = IWbemPath_SetNamespaceAt( path, 0, L"cimv2" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 1, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 1, "got %lu\n", count );
flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == expected_flags, - "got %s\n", wine_dbgstr_longlong(flags) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) );
buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %lu\n", len );
hr = IWbemPath_SetNamespaceAt( path, 0, L"root" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr );
flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == expected_flags, - "got %s\n", wine_dbgstr_longlong(flags) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) );
count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count );
buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"root" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"root" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"root" ) + 1, "unexpected length %lu\n", len );
buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %lu\n", len );
IWbemPath_Release( path ); }
-
Hans Leidekker