Gijs Vermeulen : wmp: Return E_POINTER when p is NULL in return_bstr.
Alexandre Julliard
julliard at winehq.org
Thu Aug 1 17:16:47 CDT 2019
Module: wine
Branch: master
Commit: bf3d719d08c38e1c9e215f37ac03fe53b88380b9
URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf3d719d08c38e1c9e215f37ac03fe53b88380b9
Author: Gijs Vermeulen <gijsvrm at codeweavers.com>
Date: Thu Aug 1 15:07:56 2019 +0200
wmp: Return E_POINTER when p is NULL in return_bstr.
Signed-off-by: Gijs Vermeulen <gijsvrm at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wmp/tests/media.c | 1 -
dlls/wmp/wmp_private.h | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c
index 3d750e1..7e76aee 100644
--- a/dlls/wmp/tests/media.c
+++ b/dlls/wmp/tests/media.c
@@ -535,7 +535,6 @@ static void test_media_item(void)
hr = IWMPPlayer4_newMedia(player, NULL, &media);
ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr);
hr = IWMPMedia_get_name(media, NULL);
-todo_wine
ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);
hr = IWMPMedia_get_name(media, &str);
ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr);
diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h
index 5149d73..0b1b023 100644
--- a/dlls/wmp/wmp_private.h
+++ b/dlls/wmp/wmp_private.h
@@ -135,7 +135,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *str)
static inline HRESULT return_bstr(const WCHAR *value, BSTR *p)
{
if(!p)
- return E_INVALIDARG;
+ return E_POINTER;
if(value) {
*p = SysAllocString(value);
More information about the wine-cvs
mailing list