[PATCH v2 3/4] wshom/network: Implement ComputerName() property.

[Nikolay Sivov]

From: Nikolay Sivov

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56434
Signed-off-by: Nikolay Sivov 
---
 dlls/wshom.ocx/network.c     | 27 ++++++++++++++++++++++++---
 dlls/wshom.ocx/tests/wshom.c | 29 ++++++++++++++++++++++++-----
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c
index 86c68ff8830..ef7f5e52808 100644
--- a/dlls/wshom.ocx/network.c
+++ b/dlls/wshom.ocx/network.c
@@ -124,7 +124,7 @@ static HRESULT WINAPI WshNetwork2_get_UserName(IWshNetwork2 *iface, BSTR *user_n
     BOOL ret;
     DWORD len = 0;

-    TRACE("%p\n", user_name);
+    TRACE("%p, %p.\n", iface, user_name);

GetUserNameW(NULL, &len);
     *user_name = SysAllocStringLen(NULL, len-1);
@@ -151,9 +151,30 @@ static HRESULT WINAPI WshNetwork2_get_UserProfile(IWshNetwork2 *iface, BSTR *use

static HRESULT WINAPI WshNetwork2_get_ComputerName(IWshNetwork2 *iface, BSTR *name)
 {
-    FIXME("%p stub\n", name);
+    HRESULT hr = S_OK;
+    DWORD len = 0;
+    BOOL ret;

-    return E_NOTIMPL;
+    TRACE("%p, %p.\n", iface, name);
+
+    if (!name)
+        return E_POINTER;
+
+    GetComputerNameW(NULL, &len);
+    *name = SysAllocStringLen(NULL, len - 1);
+    if (!*name)
+        return E_OUTOFMEMORY;
+
+    ret = GetComputerNameW(*name, &len);
+    if (!ret)
+    {
+        hr = HRESULT_FROM_WIN32(GetLastError());
+        SysFreeString(*name);
+        *name = NULL;
+        return hr;
+    }
+
+    return S_OK;
 }

static HRESULT WINAPI WshNetwork2_get_Organization(IWshNetwork2 *iface, BSTR *name)
diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c
index 5212dd83b5c..3e124b218c6 100644
--- a/dlls/wshom.ocx/tests/wshom.c
+++ b/dlls/wshom.ocx/tests/wshom.c
@@ -693,7 +693,7 @@ static void test_wshnetwork(void)
 {
     IDispatch *disp;
     IWshNetwork2 *nw2;
-    BSTR str,username;
+    BSTR str, name;
     HRESULT hr;
     DWORD len = 0;
     BOOL ret;
@@ -717,13 +717,32 @@ static void test_wshnetwork(void)
     CHECK_BSTR_LENGTH(str);
     GetUserNameW(NULL, &len);
     ok(len > 0, "Unexpected len %ld.\n", len);
-    username = SysAllocStringLen(NULL, len-1);
-    ret = GetUserNameW(username, &len);
+    name = SysAllocStringLen(NULL, len-1);
+    ret = GetUserNameW(name, &len);
     ok(ret == TRUE, "GetUserNameW returned %d.\n", ret);
-    ok(!wcscmp(str,username), "user names do not match %s %s.\n", debugstr_w(str), debugstr_w(username));
-    SysFreeString(username);
+    ok(!wcscmp(str, name), "User names do not match %s, %s.\n", debugstr_w(str), debugstr_w(name));
+    SysFreeString(name);
+    SysFreeString(str);
+
+    hr = IWshNetwork2_get_ComputerName(nw2, NULL);
+    ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
+
+    str = NULL;
+    hr = IWshNetwork2_get_ComputerName(nw2, &str);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(str && str[0] != 0, "Got empty string.\n");
+    CHECK_BSTR_LENGTH(str);
+    len = 0;
+    GetComputerNameW(NULL, &len);
+    ok(len > 0, "Unexpected length %ld.\n", len);
+    name = SysAllocStringLen(NULL, len - 1);
+    ret = GetComputerNameW(name, &len);
+    ok(ret, "GetComputerName() failed %ld.\n", GetLastError());
+    ok(!wcscmp(str, name), "Computer names do not match %s, %s.\n", debugstr_w(str), debugstr_w(name));
+    SysFreeString(name);
     SysFreeString(str);

+    IWshNetwork2_Release(nw2);
     IDispatch_Release(disp);
 }