adsldp: Implement IADsADSystemInfo::get_ComputerName().
Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
8be0a5575f
commit
bc283fcf3d
|
@ -1,4 +1,5 @@
|
||||||
MODULE = adsldp.dll
|
MODULE = adsldp.dll
|
||||||
|
IMPORTS = oleaut32 secur32
|
||||||
|
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
adsldp.c
|
adsldp.c
|
||||||
|
|
|
@ -28,6 +28,8 @@
|
||||||
#include "objbase.h"
|
#include "objbase.h"
|
||||||
#include "rpcproxy.h"
|
#include "rpcproxy.h"
|
||||||
#include "iads.h"
|
#include "iads.h"
|
||||||
|
#define SECURITY_WIN32
|
||||||
|
#include "security.h"
|
||||||
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
@ -120,8 +122,27 @@ static HRESULT WINAPI sysinfo_get_UserName(IADsADSystemInfo *iface, BSTR *retval
|
||||||
|
|
||||||
static HRESULT WINAPI sysinfo_get_ComputerName(IADsADSystemInfo *iface, BSTR *retval)
|
static HRESULT WINAPI sysinfo_get_ComputerName(IADsADSystemInfo *iface, BSTR *retval)
|
||||||
{
|
{
|
||||||
FIXME("%p,%p: stub\n", iface, retval);
|
UINT size;
|
||||||
return E_NOTIMPL;
|
WCHAR *name;
|
||||||
|
|
||||||
|
TRACE("%p,%p\n", iface, retval);
|
||||||
|
|
||||||
|
size = 0;
|
||||||
|
GetComputerObjectNameW(NameFullyQualifiedDN, NULL, &size);
|
||||||
|
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
|
||||||
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
|
|
||||||
|
name = SysAllocStringLen(NULL, size);
|
||||||
|
if (!name) return E_OUTOFMEMORY;
|
||||||
|
|
||||||
|
if (!GetComputerObjectNameW(NameFullyQualifiedDN, name, &size))
|
||||||
|
{
|
||||||
|
SysFreeString(name);
|
||||||
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
|
}
|
||||||
|
|
||||||
|
*retval = name;
|
||||||
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI sysinfo_get_SiteName(IADsADSystemInfo *iface, BSTR *retval)
|
static HRESULT WINAPI sysinfo_get_SiteName(IADsADSystemInfo *iface, BSTR *retval)
|
||||||
|
|
|
@ -79,7 +79,6 @@ static void test_ComputerName(void)
|
||||||
ok(hr == S_OK, "got %#x\n", hr);
|
ok(hr == S_OK, "got %#x\n", hr);
|
||||||
|
|
||||||
hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr);
|
hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr);
|
||||||
todo_wine
|
|
||||||
ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_CANT_ACCESS_DOMAIN_INFO), "got %#x\n", hr);
|
ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_CANT_ACCESS_DOMAIN_INFO), "got %#x\n", hr);
|
||||||
if (hr == S_OK)
|
if (hr == S_OK)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue