January 2013 - Wine-commits

Andrew Talbot : cryptui: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: bb7ca4379e1808609df13206c407cc7337fbf051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb7ca4379e1808609df13206c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 1 15:48:27 2013 +0000 cryptui: Avoid signed-unsigned integer comparisons. --- dlls/cryptui/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 3835573..6481c1f 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -2836,7 +2836,7 @@ static const struct v1_field v1_fields[] = { static void add_v1_fields(HWND hwnd, struct detail_data *data) { - int i; + unsigned int i; PCCERT_CONTEXT cert = data->pCertViewInfo->pCertContext; /* The last item in v1_fields is the public key, which is not in the loop @@ -3768,7 +3768,7 @@ static void show_edit_cert_properties_dialog(HWND parent, static void free_detail_fields(struct detail_data *data) { - DWORD i; + int i; for (i = 0; i < data->cFields; i++) HeapFree(GetProcessHeap(), 0, data->fields[i].detailed_value);

1 0

Andrew Talbot : crypt32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 2d7595fd2a091cae495af2f4759bbf888c494d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7595fd2a091cae495af2f47… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 1 15:48:26 2013 +0000 crypt32: Avoid signed-unsigned integer comparisons. --- dlls/crypt32/object.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index cff96f9..5f45d81 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -842,7 +842,7 @@ static BOOL CRYPT_FormatBits(BYTE bits, const struct BitToString *map, DWORD mapEntries, void *pbFormat, DWORD *pcbFormat, BOOL *first) { DWORD bytesNeeded = sizeof(WCHAR); - int i; + unsigned int i; BOOL ret = TRUE, localFirst = *first; for (i = 0; i < mapEntries; i++) @@ -947,7 +947,7 @@ static BOOL WINAPI CRYPT_FormatKeyUsage(DWORD dwCertEncodingType, else { static BOOL stringsLoaded = FALSE; - int i; + unsigned int i; DWORD bitStringLen; BOOL first = TRUE; @@ -1866,7 +1866,7 @@ static BOOL CRYPT_FormatReason(DWORD dwFormatStrType, static const WCHAR sep[] = { ',',' ',0 }; static const WCHAR bitsFmt[] = { ' ','(','%','0','2','x',')',0 }; static BOOL stringsLoaded = FALSE; - int i, numReasons = 0; + unsigned int i, numReasons = 0; BOOL ret = TRUE; DWORD bytesNeeded = sizeof(WCHAR); WCHAR bits[6]; @@ -2317,7 +2317,7 @@ static BOOL WINAPI CRYPT_FormatNetscapeCertType(DWORD dwCertEncodingType, else { static BOOL stringsLoaded = FALSE; - int i; + unsigned int i; DWORD bitStringLen; BOOL first = TRUE;

1 0

Alexandre Julliard : Update copyright info for 2013.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 63a89f9be26de9050740cd50ec944080efed0d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a89f9be26de9050740cd50e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 13:22:39 2013 +0100 Update copyright info for 2013. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 1ec4844..2ef2654 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2012 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2013 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 0e755e6..77ca4a8 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -106,7 +106,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2012 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2013 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Hans Leidekker : wmiutils: Introduce memory allocation helpers.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 0ee1b888a2cb61b991f0abc7d8e73115d20c9a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee1b888a2cb61b991f0abc7d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:33:10 2013 +0100 wmiutils: Introduce memory allocation helpers. --- dlls/wmiutils/path.c | 9 ++++----- dlls/wmiutils/statuscode.c | 5 ++--- dlls/wmiutils/wmiutils_private.h | 11 +++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index b8c0f3e..a4f3870 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -61,8 +61,8 @@ static ULONG WINAPI path_Release( if (!refs) { TRACE("destroying %p\n", path); - HeapFree( GetProcessHeap(), 0, path->text ); - HeapFree( GetProcessHeap(), 0, path ); + heap_free( path->text ); + heap_free( path ); } return refs; } @@ -103,8 +103,7 @@ static HRESULT WINAPI path_SetText( if (uMode) FIXME("igoring mode %u\n", uMode); len = strlenW( pszPath ); - if (!(path->text = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) - return E_OUTOFMEMORY; + if (!(path->text = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; strcpyW( path->text, pszPath ); path->len = len; @@ -382,7 +381,7 @@ HRESULT WbemPath_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("%p, %p\n", pUnkOuter, ppObj); - if (!(path = HeapAlloc( GetProcessHeap(), 0, sizeof(*path) ))) return E_OUTOFMEMORY; + if (!(path = heap_alloc( sizeof(*path) ))) return E_OUTOFMEMORY; path->IWbemPath_iface.lpVtbl = &path_vtbl; path->refs = 1; diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c index 2d8a3f8..0718c17 100644 --- a/dlls/wmiutils/statuscode.c +++ b/dlls/wmiutils/statuscode.c @@ -59,7 +59,7 @@ static ULONG WINAPI status_code_Release( if (!refs) { TRACE("destroying %p\n", status_code); - HeapFree( GetProcessHeap(), 0, status_code ); + heap_free( status_code ); } return refs; } @@ -138,8 +138,7 @@ HRESULT WbemStatusCodeText_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("(%p,%p)\n", pUnkOuter, ppObj); - sc = HeapAlloc( GetProcessHeap(), 0, sizeof(*sc) ); - if (!sc) return E_OUTOFMEMORY; + if (!(sc = heap_alloc( sizeof(*sc) ))) return E_OUTOFMEMORY; sc->IWbemStatusCodeText_iface.lpVtbl = &status_code_vtbl; sc->refs = 1; diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index fdcd48f..fdfca13 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -18,3 +18,14 @@ HRESULT WbemPath_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; + +static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), 0, len ); +} + +static inline BOOL heap_free( void *mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +}

1 0

Hans Leidekker : wmiutils: Validate parameters in IWbemPath:: SetText and IWbemPath::GetText.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 7e936825e2368b148a38337e4994fab0ba12e50a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e936825e2368b148a38337e4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:33:31 2013 +0100 wmiutils: Validate parameters in IWbemPath::SetText and IWbemPath::GetText. --- dlls/wmiutils/path.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index a4f3870..e32c9b6 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -100,6 +100,8 @@ static HRESULT WINAPI path_SetText( TRACE("%p, %u, %s\n", iface, uMode, debugstr_w(pszPath)); + if (!pszPath) return WBEM_E_INVALID_PARAMETER; + if (uMode) FIXME("igoring mode %u\n", uMode); len = strlenW( pszPath ); @@ -120,6 +122,8 @@ static HRESULT WINAPI path_GetText( TRACE("%p, 0x%x, %p, %p\n", iface, lFlags, puBufferLength, pszText); + if (!puBufferLength || !pszText) return WBEM_E_INVALID_PARAMETER; + if (lFlags != WBEMPATH_GET_ORIGINAL) { FIXME("flags 0x%x not supported\n", lFlags);

1 0

Hans Leidekker : wmiutils: Register WbemDefPath.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: ee9c24229599893ad564fb99ae59d0aa940d4803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9c24229599893ad564fb99a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:33:49 2013 +0100 wmiutils: Register WbemDefPath. --- dlls/wmiutils/wmiutils_classes.idl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wmiutils/wmiutils_classes.idl b/dlls/wmiutils/wmiutils_classes.idl index c137e86..315a987 100644 --- a/dlls/wmiutils/wmiutils_classes.idl +++ b/dlls/wmiutils/wmiutils_classes.idl @@ -20,6 +20,12 @@ [ threading(both), + uuid(cf4cc405-e2c5-4ddd-b3ce-5e7582d8c9fa) +] +coclass WbemDefPath { interface IWbemPath; } + +[ + threading(both), uuid(eb87e1bd-3233-11d2-aec9-00c04fb68820) ] coclass WbemStatusCode { interface IWbemStatusCodeText; }

1 0

Hans Leidekker : wmiutils: Parse the path passed to IWbemPath::SetText.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 8059192e1203fbce97139c1602eafe9e34b80ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=8059192e1203fbce97139c160… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:34:03 2013 +0100 wmiutils: Parse the path passed to IWbemPath::SetText. --- dlls/wmiutils/path.c | 124 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 112 insertions(+), 12 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index e32c9b6..0d52544 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -36,11 +36,41 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); struct path { IWbemPath IWbemPath_iface; - LONG refs; - WCHAR *text; - int len; + LONG refs; + WCHAR *text; + int len_text; + WCHAR *server; + int len_server; + WCHAR **namespaces; + int *len_namespaces; + int num_namespaces; + WCHAR *class; + int len_class; }; +static void init_path( struct path *path ) +{ + path->text = NULL; + path->len_text = 0; + path->server = NULL; + path->len_server = 0; + path->namespaces = NULL; + path->len_namespaces = NULL; + path->num_namespaces = 0; + path->class = NULL; + path->len_class = 0; +} + +static void clear_path( struct path *path ) +{ + heap_free( path->text ); + heap_free( path->server ); + heap_free( path->namespaces ); + heap_free( path->len_namespaces ); + heap_free( path->class ); + init_path( path ); +} + static inline struct path *impl_from_IWbemPath( IWbemPath *iface ) { return CONTAINING_RECORD(iface, struct path, IWbemPath_iface); @@ -61,7 +91,7 @@ static ULONG WINAPI path_Release( if (!refs) { TRACE("destroying %p\n", path); - heap_free( path->text ); + clear_path( path ); heap_free( path ); } return refs; @@ -90,25 +120,94 @@ static HRESULT WINAPI path_QueryInterface( return S_OK; } +static HRESULT parse_text( struct path *path, ULONG mode, const WCHAR *text ) +{ + HRESULT hr = E_OUTOFMEMORY; + const WCHAR *p, *q; + unsigned int i, len; + + p = q = text; + if ((p[0] == '\\' && p[1] == '\\') || (p[0] == '/' && p[1] == '/')) + { + p += 2; + q = p; + while (*q && *q != '\\' && *q != '/') q++; + len = q - p; + if (!(path->server = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + memcpy( path->server, p, len * sizeof(WCHAR) ); + path->server[len] = 0; + path->len_server = len; + } + p = q; + while (*q && *q != ':') + { + if (*q == '\\' || *q == '/') path->num_namespaces++; + q++; + } + if (path->num_namespaces) + { + if (!(path->namespaces = heap_alloc( path->num_namespaces * sizeof(WCHAR *) ))) goto done; + if (!(path->len_namespaces = heap_alloc( path->num_namespaces * sizeof(int) ))) goto done; + + i = 0; + q = p; + while (*q && *q != ':') + { + if (*q == '\\' || *q == '/') + { + p = q + 1; + while (*p && *p != '\\' && *p != '/' && *p != ':') p++; + len = p - q - 1; + if (!(path->namespaces[i] = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + memcpy( path->namespaces[i], q + 1, len * sizeof(WCHAR) ); + path->namespaces[i][len] = 0; + path->len_namespaces[i] = len; + i++; + } + q++; + } + } + if (*q == ':') q++; + p = q; + while (*q && *q != '.') q++; + len = q - p; + if (!(path->class = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + memcpy( path->class, p, len * sizeof(WCHAR) ); + path->class[len] = 0; + path->len_class = len; + + if (*q == '.') FIXME("handle key list\n"); + hr = S_OK; + +done: + if (hr != S_OK) clear_path( path ); + return hr; +} + static HRESULT WINAPI path_SetText( IWbemPath *iface, ULONG uMode, LPCWSTR pszPath) { struct path *path = impl_from_IWbemPath( iface ); + HRESULT hr; int len; TRACE("%p, %u, %s\n", iface, uMode, debugstr_w(pszPath)); - if (!pszPath) return WBEM_E_INVALID_PARAMETER; + if (!uMode || !pszPath) return WBEM_E_INVALID_PARAMETER; - if (uMode) FIXME("igoring mode %u\n", uMode); + clear_path( path ); + if ((hr = parse_text( path, uMode, pszPath )) != S_OK) return hr; len = strlenW( pszPath ); - if (!(path->text = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; - + if (!(path->text = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + clear_path( path ); + return E_OUTOFMEMORY; + } strcpyW( path->text, pszPath ); - path->len = len; + path->len_text = len; return S_OK; } @@ -129,13 +228,13 @@ static HRESULT WINAPI path_GetText( FIXME("flags 0x%x not supported\n", lFlags); return WBEM_E_INVALID_PARAMETER; } - if (*puBufferLength < path->len + 1) + if (*puBufferLength < path->len_text + 1) { - *puBufferLength = path->len + 1; + *puBufferLength = path->len_text + 1; return S_OK; } if (pszText) strcpyW( pszText, path->text ); - *puBufferLength = path->len + 1; + *puBufferLength = path->len_text + 1; return S_OK; } @@ -389,6 +488,7 @@ HRESULT WbemPath_create( IUnknown *pUnkOuter, LPVOID *ppObj ) path->IWbemPath_iface.lpVtbl = &path_vtbl; path->refs = 1; + init_path( path ); *ppObj = &path->IWbemPath_iface;

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::GetNamespaceCount.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 38434826689e77193e826ea27e490fcadc5f152f URL: http://source.winehq.org/git/wine.git/?a=commit;h=38434826689e77193e826ea27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:34:17 2013 +0100 wmiutils: Implement IWbemPath::GetNamespaceCount. --- dlls/wmiutils/path.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 0d52544..0cb7170 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -268,8 +268,13 @@ static HRESULT WINAPI path_GetNamespaceCount( IWbemPath *iface, ULONG *puCount) { - FIXME("%p, %p\n", iface, puCount); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + + TRACE("%p, %p\n", iface, puCount); + + if (!puCount) return WBEM_E_INVALID_PARAMETER; + *puCount = path->num_namespaces; + return S_OK; } static HRESULT WINAPI path_SetNamespaceAt(

1 0

Hans Leidekker : wmiutils: Support more flags in IWbemPath::GetText.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 0199a94329c80208bab565c56d46cd12f604e951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0199a94329c80208bab565c56… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:34:32 2013 +0100 wmiutils: Support more flags in IWbemPath::GetText. --- dlls/wmiutils/path.c | 178 ++++++++++++++++++++++++++++++++++++-- dlls/wmiutils/wmiutils_private.h | 10 ++ 2 files changed, 179 insertions(+), 9 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 0cb7170..a26ade1 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -28,7 +28,6 @@ #include "wmiutils.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wmiutils_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); @@ -211,6 +210,163 @@ static HRESULT WINAPI path_SetText( return S_OK; } +static WCHAR *build_namespace( struct path *path, int *len ) +{ + WCHAR *ret, *p; + int i; + + *len = 0; + for (i = 0; i < path->num_namespaces; i++) + { + if (i > 0) *len += 1; + *len += path->len_namespaces[i]; + } + if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; + for (i = 0; i < path->num_namespaces; i++) + { + if (i > 0) *p++ = '\\'; + memcpy( p, path->namespaces[i], path->len_namespaces[i] * sizeof(WCHAR) ); + p += path->len_namespaces[i]; + } + *p = 0; + return ret; +} + +static WCHAR *build_server( struct path *path, int *len ) +{ + WCHAR *ret, *p; + + *len = 0; + if (path->server) *len += 2 + path->len_server; + else *len += 4; + if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; + if (path->server) + { + p[0] = p[1] = '\\'; + strcpyW( p + 2, path->server ); + } + else + { + p[0] = p[1] = p[3] = '\\'; + p[2] = '.'; + } + return ret; +} + +static WCHAR *build_path( struct path *path, LONG flags, int *len ) +{ + switch (flags) + { + case 0: + { + int len_namespace; + WCHAR *ret, *namespace = build_namespace( path, &len_namespace ); + + if (!namespace) return NULL; + + *len = len_namespace; + if (path->class) *len += 1 + path->len_class; + if (!(ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) + { + heap_free( namespace ); + return NULL; + } + strcpyW( ret, namespace ); + if (path->class) + { + ret[len_namespace] = ':'; + strcpyW( ret + len_namespace + 1, path->class ); + } + heap_free( namespace ); + return ret; + + } + case WBEMPATH_GET_RELATIVE_ONLY: + if (!path->class) + { + *len = 0; + return NULL; + } + *len = path->len_class; + return strdupW( path->class ); + + case WBEMPATH_GET_SERVER_TOO: + { + int len_namespace, len_server; + WCHAR *p, *ret, *namespace = build_namespace( path, &len_namespace ); + WCHAR *server = build_server( path, &len_server ); + + if (!namespace || !server) + { + heap_free( namespace ); + heap_free( server ); + return NULL; + } + *len = len_namespace + len_server; + if (path->class) *len += 1 + path->len_class; + if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) + { + heap_free( namespace ); + heap_free( server ); + return NULL; + } + strcpyW( p, server ); + p += len_server; + strcpyW( p, namespace ); + p += len_namespace; + if (path->class) + { + *p = ':'; + strcpyW( p + 1, path->class ); + } + heap_free( namespace ); + heap_free( server ); + return ret; + } + case WBEMPATH_GET_SERVER_AND_NAMESPACE_ONLY: + { + int len_namespace, len_server; + WCHAR *p, *ret, *namespace = build_namespace( path, &len_namespace ); + WCHAR *server = build_server( path, &len_server ); + + if (!namespace || !server) + { + heap_free( namespace ); + heap_free( server ); + return NULL; + } + *len = len_namespace + len_server; + if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) + { + heap_free( namespace ); + heap_free( server ); + return NULL; + } + strcpyW( p, server ); + p += len_server; + strcpyW( p, namespace ); + heap_free( namespace ); + heap_free( server ); + return ret; + } + case WBEMPATH_GET_NAMESPACE_ONLY: + return build_namespace( path, len ); + + case WBEMPATH_GET_ORIGINAL: + if (!path->text) + { + *len = 0; + return NULL; + } + *len = path->len_text; + return strdupW( path->text ); + + default: + ERR("unhandled flags 0x%x\n", flags); + return NULL; + } +} + static HRESULT WINAPI path_GetText( IWbemPath *iface, LONG lFlags, @@ -218,23 +374,27 @@ static HRESULT WINAPI path_GetText( LPWSTR pszText) { struct path *path = impl_from_IWbemPath( iface ); + WCHAR *str; + int len; TRACE("%p, 0x%x, %p, %p\n", iface, lFlags, puBufferLength, pszText); if (!puBufferLength || !pszText) return WBEM_E_INVALID_PARAMETER; - if (lFlags != WBEMPATH_GET_ORIGINAL) + str = build_path( path, lFlags, &len ); + + if (*puBufferLength < len + 1) { - FIXME("flags 0x%x not supported\n", lFlags); - return WBEM_E_INVALID_PARAMETER; + *puBufferLength = len + 1; + return S_OK; } - if (*puBufferLength < path->len_text + 1) + if (pszText) { - *puBufferLength = path->len_text + 1; - return S_OK; + if (str) strcpyW( pszText, str ); + else pszText[0] = 0; } - if (pszText) strcpyW( pszText, path->text ); - *puBufferLength = path->len_text + 1; + *puBufferLength = len + 1; + heap_free( str ); return S_OK; } diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index fdfca13..9837ce8 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" + HRESULT WbemPath_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; @@ -29,3 +31,11 @@ static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem ); } + +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); + return dst; +}

1 0

Hans Leidekker : wmiutils: Add tests.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 988ff087547349233554b182eb7f42b64e411173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988ff087547349233554b182e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:35:09 2013 +0100 wmiutils: Add tests. --- configure | 1 + configure.ac | 1 + dlls/wmiutils/tests/Makefile.in | 7 + dlls/wmiutils/tests/path.c | 249 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 258 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=988ff087547349233554b…

1 0