wine-devel March 2020

wine-devel@winehq.org

72 participants
969 discussions

Start a nNew thread

[PATCH] include: Add missing structs and defines for xact3wb.h
by Vijay Kiran Kamuju 20 Mar '20

20 Mar '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

(resend) [PATCH 2/2] ntdll/tests: Add tests for ProcessQuotaLimits class
by Vijay Kiran Kamuju 20 Mar '20

20 Mar '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 2/2] d3d9: Report d3d9 adapter ordinal in d3d9_device_GetCreationParameters().
by Zhiyi Zhang 20 Mar '20

20 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/device.c | 1 + dlls/d3d9/tests/device.c | 64 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4ac38c0e89..61cb505d77 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -778,6 +778,7 @@ static HRESULT WINAPI d3d9_device_GetCreationParameters(IDirect3DDevice9Ex *ifac (struct wined3d_device_creation_parameters *)parameters); wined3d_mutex_unlock(); + parameters->AdapterOrdinal = device->adapter_ordinal; return D3D_OK; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index afbd13a398..b4f378755a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13609,6 +13609,69 @@ static void test_shader_validator(void) todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); } +static void test_creation_parameters(void) +{ + D3DDEVICE_CREATION_PARAMETERS creation_params; + D3DPRESENT_PARAMETERS present_params = {0}; + unsigned int adapter_idx, adapter_count; + IDirect3DDevice9 *device; + DWORD behavior_flags; + IDirect3D9 *d3d; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + present_params.BackBufferWidth = 640; + present_params.BackBufferHeight = 480; + present_params.BackBufferFormat = D3DFMT_A8R8G8B8; + present_params.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_params.hDeviceWindow = window; + present_params.Windowed = TRUE; + present_params.EnableAutoDepthStencil = TRUE; + present_params.AutoDepthStencilFormat = D3DFMT_D24S8; + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + behavior_flags = D3DCREATE_HARDWARE_VERTEXPROCESSING; + if (FAILED(IDirect3D9_CreateDevice(d3d, adapter_idx, D3DDEVTYPE_HAL, window, + behavior_flags, &present_params, &device))) + { + behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; + if (FAILED(hr = IDirect3D9_CreateDevice(d3d, adapter_idx, D3DDEVTYPE_HAL, window, + behavior_flags, &present_params, &device))) + { + skip("Adapter %u: Failed to create a D3D device, hr %#x.\n", adapter_idx, hr); + break; + } + } + + memset(&creation_params, 0, sizeof(creation_params)); + hr = IDirect3DDevice9_GetCreationParameters(device, &creation_params); + ok(hr == D3D_OK, "Adapter %u: GetCreationParameters failed, hr %#x.\n", adapter_idx, hr); + ok(creation_params.AdapterOrdinal == adapter_idx, + "Adapter %u: Got unexpected adapter ordinal %u.\n", adapter_idx, + creation_params.AdapterOrdinal); + ok(creation_params.DeviceType == D3DDEVTYPE_HAL, + "Adapter %u: Expect device type %#x, got %#x.\n", adapter_idx, D3DDEVTYPE_HAL, + creation_params.DeviceType); + ok(creation_params.hFocusWindow == window, "Adapter %u: Expect focus window %p, got %p.\n", + adapter_idx, window, creation_params.hFocusWindow); + ok(creation_params.BehaviorFlags == behavior_flags, + "Adapter %u: Expect behavior flags %#x, got %#x.\n", adapter_idx, behavior_flags, + creation_params.BehaviorFlags); + + IDirect3DDevice9_Release(device); + } + + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll"); @@ -13741,6 +13804,7 @@ START_TEST(device) test_get_display_mode(); test_multi_adapter(); test_shader_validator(); + test_creation_parameters(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.20.1

1 0

[PATCH] include: Add some missing symbols to mftransform.idl
by Nikolay Sivov 20 Mar '20

20 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mftransform.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/mftransform.idl b/include/mftransform.idl index 59e40f95f7..6b9c79572a 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -59,6 +59,11 @@ enum _MFT_INPUT_STATUS_FLAGS MFT_INPUT_STATUS_ACCEPT_DATA = 0x00000001, }; +enum _MFT_INPUT_DATA_BUFFER_FLAGS +{ + MFT_INPUT_DATA_BUFFER_PLACEHOLDER = 0xffffffff, +}; + enum _MFT_OUTPUT_STREAM_INFO_FLAGS { MFT_OUTPUT_STREAM_WHOLE_SAMPLES = 0x00000001, @@ -185,6 +190,7 @@ interface IMFTransform : IUnknown cpp_quote("HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate);") cpp_quote("EXTERN_GUID(MF_SA_D3D_AWARE, 0xeaa35c29, 0x775e, 0x488e, 0x9b, 0x61, 0xb3, 0x28, 0x3e, 0x49, 0x58, 0x3b);") +cpp_quote("EXTERN_GUID(MF_SA_REQUIRED_SAMPLE_COUNT, 0x18802c61, 0x324b, 0x4952, 0xab, 0xd0, 0x17, 0x6f, 0xf5, 0xc6, 0x96, 0xff);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC, 0xf81a699a, 0x649a, 0x497d, 0x8c, 0x73, 0x29, 0xf8, 0xfe, 0xd6, 0xad, 0x7a);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC_UNLOCK, 0xe5666d6b, 0x3422, 0x4eb6, 0xa4, 0x21, 0xda, 0x7d, 0xb1, 0xf8, 0xe2, 0x07);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_CATEGORY_Attribute, 0xceabba49, 0x506d, 0x4757, 0xa6, 0xff, 0x66, 0xc1, 0x84, 0x98, 0x7e, 0x4e);") @@ -208,3 +214,8 @@ cpp_quote("EXTERN_GUID(MFT_PROCESS_LOCAL_Attribute, 0x543186e4, 0x46 cpp_quote("EXTERN_GUID(MFT_REMUX_MARK_I_PICTURE_AS_CLEAN_POINT, 0x364e8f85, 0x3f2e, 0x436c, 0xb2, 0xa2, 0x44, 0x40, 0xa0, 0x12, 0xa9, 0xe8);") cpp_quote("EXTERN_GUID(MFT_SUPPORT_3DVIDEO, 0x093f81b1, 0x4f2e, 0x4631, 0x81, 0x68, 0x79, 0x34, 0x03, 0x2a, 0x01, 0xd3);") cpp_quote("EXTERN_GUID(MFT_TRANSFORM_CLSID_Attribute, 0x6821c42b, 0x65a4, 0x4e82, 0x99, 0xbc, 0x9a, 0x88, 0x20, 0x5e, 0xcd, 0x0c);") + +cpp_quote("DEFINE_PROPERTYKEY(MFPKEY_CLSID, 0xc57a84c0, 0x1a80, 0x40a3, 0x97, 0xb5, 0x92, 0x72, 0xa4, 0x03, 0xc8, 0xae, 1);") +cpp_quote("DEFINE_PROPERTYKEY(MFPKEY_CATEGORY, 0xc57a84c0, 0x1a80, 0x40a3, 0x97, 0xb5, 0x92, 0x72, 0xa4, 0x03, 0xc8, 0xae, 2);") +cpp_quote("DEFINE_PROPERTYKEY(MFPKEY_EXATTRIBUTE_SUPPORTED, 0x456fe843, 0x3c87, 0x40c0, 0x94, 0x9d, 0x14, 0x09, 0xc9, 0x7d, 0xab, 0x2c, 1);") +cpp_quote("DEFINE_PROPERTYKEY(MFPKEY_MULTICHANNEL_CHANNEL_MASK, 0x58bdaf8c, 0x3224, 0x4692, 0x86, 0xd0, 0x44, 0xd6, 0x5c, 0x5b, 0xf8, 0x2b, 1);") -- 2.25.1

1 0

[PATCH v2 4/8] activeds: Implement ADsBuildVarArrayStr.
by Dmitry Timoshkov 20 Mar '20

20 Mar '20

v2: Fix test failure under XP. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 40 ++++++++++- dlls/activeds/tests/Makefile.in | 5 ++ dlls/activeds/tests/activeds.c | 85 ++++++++++++++++++++++ include/adshlp.h | 1 + 6 files changed, 174 insertions(+), 82 deletions(-) create mode 100644 dlls/activeds/tests/Makefile.in create mode 100644 dlls/activeds/tests/activeds.c diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 6a825f0913..1b22da6765 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -101,10 +101,44 @@ HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements, VAR /***************************************************** * ADsBuildVarArrayStr [ACTIVEDS.7] */ -HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR *lppPathNames, DWORD dwPathNames, VARIANT* pvar) +HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR *str, DWORD count, VARIANT *var) { - FIXME("(%p, %d, %p)!stub\n",*lppPathNames, dwPathNames, pvar); - return E_NOTIMPL; + HRESULT hr; + SAFEARRAY *sa; + LONG idx, end = count; + + TRACE("(%p, %u, %p)\n", str, count, var); + + if (!var) return E_ADS_BAD_PARAMETER; + + sa = SafeArrayCreateVector(VT_VARIANT, 0, count); + if (!sa) return E_OUTOFMEMORY; + + VariantInit(var); + for (idx = 0; idx < end; idx++) + { + VARIANT item; + + V_VT(&item) = VT_BSTR; + V_BSTR(&item) = SysAllocString(str[idx]); + if (!V_BSTR(&item)) + { + hr = E_OUTOFMEMORY; + goto fail; + } + + hr = SafeArrayPutElement(sa, &idx, &item); + SysFreeString(V_BSTR(&item)); + if (hr != S_OK) goto fail; + } + + V_VT(var) = VT_ARRAY | VT_VARIANT; + V_ARRAY(var) = sa; + return S_OK; + +fail: + SafeArrayDestroy(sa); + return hr; } /***************************************************** diff --git a/dlls/activeds/tests/Makefile.in b/dlls/activeds/tests/Makefile.in new file mode 100644 index 0000000000..25ae2a9bfd --- /dev/null +++ b/dlls/activeds/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = activeds.dll +IMPORTS = ole32 oleaut32 activeds + +C_SRCS = \ + activeds.c diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c new file mode 100644 index 0000000000..6f469f9dc1 --- /dev/null +++ b/dlls/activeds/tests/activeds.c @@ -0,0 +1,85 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "iads.h" +#include "adshlp.h" +#include "adserr.h" + +#include "wine/test.h" + +static void test_ADsBuildVarArrayStr(void) +{ + const WCHAR *props[] = { L"prop1", L"prop2" }; + HRESULT hr; + VARIANT var, item, *data; + LONG start, end, idx; + + hr = ADsBuildVarArrayStr(NULL, 0, NULL); + ok(hr == E_ADS_BAD_PARAMETER || hr == E_FAIL /* XP */, "got %#x\n", hr); + + hr = ADsBuildVarArrayStr(NULL, 0, &var); + ok(hr == S_OK, "got %#x\n", hr); + ok(V_VT(&var) == (VT_ARRAY | VT_VARIANT), "got %d\n", V_VT(&var)); + start = 0xdeadbeef; + hr = SafeArrayGetLBound(V_ARRAY(&var), 1, &start); + ok(hr == S_OK, "got %#x\n", hr); + ok(start == 0, "got %d\n", start); + end = 0xdeadbeef; + hr = SafeArrayGetUBound(V_ARRAY(&var), 1, &end); + ok(hr == S_OK, "got %#x\n", hr); + ok(end == -1, "got %d\n", end); + VariantClear(&var); + + hr = ADsBuildVarArrayStr((LPWSTR *)props, ARRAY_SIZE(props), &var); + ok(hr == S_OK, "got %#x\n", hr); + ok(V_VT(&var) == (VT_ARRAY | VT_VARIANT), "got %d\n", V_VT(&var)); + start = 0xdeadbeef; + hr = SafeArrayGetLBound(V_ARRAY(&var), 1, &start); + ok(hr == S_OK, "got %#x\n", hr); + ok(start == 0, "got %d\n", start); + end = 0xdeadbeef; + hr = SafeArrayGetUBound(V_ARRAY(&var), 1, &end); + ok(hr == S_OK, "got %#x\n", hr); + ok(end == 1, "got %d\n", end); + idx = 0; + hr = SafeArrayGetElement(V_ARRAY(&var), &idx, &item); + ok(hr == S_OK, "got %#x\n", hr); + ok(V_VT(&item) == VT_BSTR, "got %d\n", V_VT(&item)); + ok(!lstrcmpW(V_BSTR(&item), L"prop1"), "got %s\n", wine_dbgstr_w(V_BSTR(&item))); + VariantClear(&item); + hr = SafeArrayAccessData(V_ARRAY(&var), (void *)&data); + ok(hr == S_OK, "got %#x\n", hr); + ok(V_VT(&data[0]) == VT_BSTR, "got %d\n", V_VT(&data[0])); + ok(!lstrcmpW(V_BSTR(&data[0]), L"prop1"), "got %s\n", wine_dbgstr_w(V_BSTR(&data[0]))); + ok(V_VT(&data[0]) == VT_BSTR, "got %d\n", V_VT(&data[0])); + ok(!lstrcmpW(V_BSTR(&data[1]), L"prop2"), "got %s\n", wine_dbgstr_w(V_BSTR(&data[1]))); + hr = SafeArrayUnaccessData(V_ARRAY(&var)); + ok(hr == S_OK, "got %#x\n", hr); + VariantClear(&var); +} + +START_TEST(activeds) +{ + test_ADsBuildVarArrayStr(); +} diff --git a/include/adshlp.h b/include/adshlp.h index a574e5061f..0b08c1a99c 100644 --- a/include/adshlp.h +++ b/include/adshlp.h @@ -24,6 +24,7 @@ extern "C" { #endif HRESULT WINAPI ADsBuildEnumerator(IADsContainer*,IEnumVARIANT**); +HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR*,DWORD,VARIANT*); HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT*,ULONG,VARIANT*,ULONG*); HRESULT WINAPI ADsGetObject(LPCWSTR,REFIID,VOID**); HRESULT WINAPI ADsOpenObject(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,REFIID,VOID**); -- 2.25.1

1 0

[PATCH 4/8] activeds: Implement ADsBuildVarArrayStr.
by Dmitry Timoshkov 20 Mar '20

20 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 40 ++++++++++++++-- dlls/activeds/tests/Makefile.in | 5 ++ dlls/activeds/tests/activeds.c | 85 +++++++++++++++++++++++++++++++++ include/adshlp.h | 1 + 4 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 dlls/activeds/tests/Makefile.in create mode 100644 dlls/activeds/tests/activeds.c diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 6a825f0913..1b22da6765 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -101,10 +101,44 @@ HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements, VAR /***************************************************** * ADsBuildVarArrayStr [ACTIVEDS.7] */ -HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR *lppPathNames, DWORD dwPathNames, VARIANT* pvar) +HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR *str, DWORD count, VARIANT *var) { - FIXME("(%p, %d, %p)!stub\n",*lppPathNames, dwPathNames, pvar); - return E_NOTIMPL; + HRESULT hr; + SAFEARRAY *sa; + LONG idx, end = count; + + TRACE("(%p, %u, %p)\n", str, count, var); + + if (!var) return E_ADS_BAD_PARAMETER; + + sa = SafeArrayCreateVector(VT_VARIANT, 0, count); + if (!sa) return E_OUTOFMEMORY; + + VariantInit(var); + for (idx = 0; idx < end; idx++) + { + VARIANT item; + + V_VT(&item) = VT_BSTR; + V_BSTR(&item) = SysAllocString(str[idx]); + if (!V_BSTR(&item)) + { + hr = E_OUTOFMEMORY; + goto fail; + } + + hr = SafeArrayPutElement(sa, &idx, &item); + SysFreeString(V_BSTR(&item)); + if (hr != S_OK) goto fail; + } + + V_VT(var) = VT_ARRAY | VT_VARIANT; + V_ARRAY(var) = sa; + return S_OK; + +fail: + SafeArrayDestroy(sa); + return hr; } /***************************************************** diff --git a/dlls/activeds/tests/Makefile.in b/dlls/activeds/tests/Makefile.in new file mode 100644 index 0000000000..25ae2a9bfd --- /dev/null +++ b/dlls/activeds/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = activeds.dll +IMPORTS = ole32 oleaut32 activeds + +C_SRCS = \ + activeds.c diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c new file mode 100644 index 0000000000..d3b4fdf15f --- /dev/null +++ b/dlls/activeds/tests/activeds.c @@ -0,0 +1,85 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "iads.h" +#include "adshlp.h" +#include "adserr.h" + +#include "wine/test.h" + +static void test_ADsBuildVarArrayStr(void) +{ + const WCHAR *props[] = { L"prop1", L"prop2" }; + HRESULT hr; + VARIANT var, item, *data; + LONG start, end, idx; + + hr = ADsBuildVarArrayStr(NULL, 0, NULL); + ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); + + hr = ADsBuildVarArrayStr(NULL, 0, &var); + ok(hr == S_OK, "got %#x\n", hr); + ok(V_VT(&var) == (VT_ARRAY | VT_VARIANT), "got %d\n", V_VT(&var)); + start = 0xdeadbeef; + hr = SafeArrayGetLBound(V_ARRAY(&var), 1, &start); + ok(hr == S_OK, "got %#x\n", hr); + ok(start == 0, "got %d\n", start); + end = 0xdeadbeef; + hr = SafeArrayGetUBound(V_ARRAY(&var), 1, &end); + ok(hr == S_OK, "got %#x\n", hr); + ok(end == -1, "got %d\n", end); + VariantClear(&var); + + hr = ADsBuildVarArrayStr((LPWSTR *)props, ARRAY_SIZE(props), &var); + ok(hr == S_OK, "got %#x\n", hr); + ok(V_VT(&var) == (VT_ARRAY | VT_VARIANT), "got %d\n", V_VT(&var)); + start = 0xdeadbeef; + hr = SafeArrayGetLBound(V_ARRAY(&var), 1, &start); + ok(hr == S_OK, "got %#x\n", hr); + ok(start == 0, "got %d\n", start); + end = 0xdeadbeef; + hr = SafeArrayGetUBound(V_ARRAY(&var), 1, &end); + ok(hr == S_OK, "got %#x\n", hr); + ok(end == 1, "got %d\n", end); + idx = 0; + hr = SafeArrayGetElement(V_ARRAY(&var), &idx, &item); + ok(hr == S_OK, "got %#x\n", hr); + ok(V_VT(&item) == VT_BSTR, "got %d\n", V_VT(&item)); + ok(!lstrcmpW(V_BSTR(&item), L"prop1"), "got %s\n", wine_dbgstr_w(V_BSTR(&item))); + VariantClear(&item); + hr = SafeArrayAccessData(V_ARRAY(&var), (void *)&data); + ok(hr == S_OK, "got %#x\n", hr); + ok(V_VT(&data[0]) == VT_BSTR, "got %d\n", V_VT(&data[0])); + ok(!lstrcmpW(V_BSTR(&data[0]), L"prop1"), "got %s\n", wine_dbgstr_w(V_BSTR(&data[0]))); + ok(V_VT(&data[0]) == VT_BSTR, "got %d\n", V_VT(&data[0])); + ok(!lstrcmpW(V_BSTR(&data[1]), L"prop2"), "got %s\n", wine_dbgstr_w(V_BSTR(&data[1]))); + hr = SafeArrayUnaccessData(V_ARRAY(&var)); + ok(hr == S_OK, "got %#x\n", hr); + VariantClear(&var); +} + +START_TEST(activeds) +{ + test_ADsBuildVarArrayStr(); +} diff --git a/include/adshlp.h b/include/adshlp.h index a574e5061f..0b08c1a99c 100644 --- a/include/adshlp.h +++ b/include/adshlp.h @@ -24,6 +24,7 @@ extern "C" { #endif HRESULT WINAPI ADsBuildEnumerator(IADsContainer*,IEnumVARIANT**); +HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR*,DWORD,VARIANT*); HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT*,ULONG,VARIANT*,ULONG*); HRESULT WINAPI ADsGetObject(LPCWSTR,REFIID,VOID**); HRESULT WINAPI ADsOpenObject(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,REFIID,VOID**); -- 2.25.1

2 1

[PATCH 8/8] adsldp: Add support for multi-valued attributes to IADs::Get().
by Dmitry Timoshkov 20 Mar '20

20 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 47 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index b12d03262c..e299257d4b 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -569,7 +569,7 @@ static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) { if (!wcsicmp(name, ldap->attrs[i].name)) { - ULONG count = ldap_count_valuesW(ldap->attrs[i].values); + LONG count = ldap_count_valuesW(ldap->attrs[i].values); if (!count) { V_BSTR(prop) = NULL; @@ -578,12 +578,45 @@ static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) } if (count > 1) - FIXME("attr %s has %u values\n", debugstr_w(ldap->attrs[i].name), count); - - V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]); - if (!V_BSTR(prop)) return E_OUTOFMEMORY; - V_VT(prop) = VT_BSTR; - return S_OK; + { + SAFEARRAY *sa; + VARIANT item; + LONG idx; + + TRACE("attr %s has %u values\n", debugstr_w(ldap->attrs[i].name), count); + + sa = SafeArrayCreateVector(VT_VARIANT, 0, count); + if (!sa) return E_OUTOFMEMORY; + + for (idx = 0; idx < count; idx++) + { + V_VT(&item) = VT_BSTR; + V_BSTR(&item) = SysAllocString(ldap->attrs[i].values[idx]); + if (!V_BSTR(&item)) + { + hr = E_OUTOFMEMORY; + goto fail; + } + + hr = SafeArrayPutElement(sa, &idx, &item); + SysFreeString(V_BSTR(&item)); + if (hr != S_OK) goto fail; + } + + V_VT(prop) = VT_ARRAY | VT_VARIANT; + V_ARRAY(prop) = sa; + return S_OK; +fail: + SafeArrayDestroy(sa); + return hr; + } + else + { + V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]); + if (!V_BSTR(prop)) return E_OUTOFMEMORY; + V_VT(prop) = VT_BSTR; + return S_OK; + } } } -- 2.25.1

1 0

[PATCH 7/8] adsldp: Implement IADs::Get().
by Dmitry Timoshkov 20 Mar '20

20 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 59ccdb740c..b12d03262c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -551,8 +551,43 @@ static HRESULT WINAPI ldapns_SetInfo(IADs *iface) static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) { - FIXME("%p,%s,%p: stub\n", iface, debugstr_w(name), prop); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IADs(iface); + HRESULT hr; + ULONG i; + + TRACE("%p,%s,%p\n", iface, debugstr_w(name), prop); + + if (!name || !prop) return E_ADS_BAD_PARAMETER; + + if (!ldap->attrs_count) + { + hr = IADs_GetInfo(iface); + if (hr != S_OK) return hr; + } + + for (i = 0; i < ldap->attrs_count; i++) + { + if (!wcsicmp(name, ldap->attrs[i].name)) + { + ULONG count = ldap_count_valuesW(ldap->attrs[i].values); + if (!count) + { + V_BSTR(prop) = NULL; + V_VT(prop) = VT_BSTR; + return S_OK; + } + + if (count > 1) + FIXME("attr %s has %u values\n", debugstr_w(ldap->attrs[i].name), count); + + V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]); + if (!V_BSTR(prop)) return E_OUTOFMEMORY; + V_VT(prop) = VT_BSTR; + return S_OK; + } + } + + return E_ADS_PROPERTY_NOT_FOUND; } static HRESULT WINAPI ldapns_Put(IADs *iface, BSTR name, VARIANT prop) -- 2.25.1

1 0

[PATCH 6/8] adsldp: Implement IADs::GetInfoEx().
by Dmitry Timoshkov 20 Mar '20

20 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 142 ++++++++++++++++++++++++++++++++++- dlls/adsldp/adsldp_private.h | 10 +++ 2 files changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 19edcde06f..59ccdb740c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -40,7 +40,6 @@ #include "adsldp_private.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(adsldp); @@ -372,6 +371,12 @@ static HRESULT ADSystemInfo_create(REFIID riid, void **obj) return hr; } +struct ldap_attribute +{ + WCHAR *name; + WCHAR **values; +}; + typedef struct { IADs IADs_iface; @@ -381,6 +386,8 @@ typedef struct BSTR host; BSTR object; ULONG port; + ULONG attrs_count, attrs_count_allocated; + struct ldap_attribute *attrs; } LDAP_namespace; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -422,6 +429,23 @@ static ULONG WINAPI ldapns_AddRef(IADs *iface) return InterlockedIncrement(&ldap->ref); } +static void free_attributes(LDAP_namespace *ldap) +{ + ULONG i; + + if (!ldap->attrs) return; + + for (i = 0; i < ldap->attrs_count; i++) + { + ldap_memfreeW(ldap->attrs[i].name); + ldap_value_freeW(ldap->attrs[i].values); + } + + heap_free(ldap->attrs); + ldap->attrs = NULL; + ldap->attrs_count = 0; +} + static ULONG WINAPI ldapns_Release(IADs *iface) { LDAP_namespace *ldap = impl_from_IADs(iface); @@ -433,6 +457,7 @@ static ULONG WINAPI ldapns_Release(IADs *iface) if (ldap->ld) ldap_unbind(ldap->ld); SysFreeString(ldap->host); SysFreeString(ldap->object); + free_attributes(ldap); heap_free(ldap); } @@ -548,10 +573,118 @@ static HRESULT WINAPI ldapns_PutEx(IADs *iface, LONG code, BSTR name, VARIANT pr return E_NOTIMPL; } +static HRESULT add_attribute(LDAP_namespace *ldap, WCHAR *name, WCHAR **values) +{ + struct ldap_attribute *new_attrs; + + if (!ldap->attrs) + { + ldap->attrs = heap_alloc(256 * sizeof(ldap->attrs[0])); + if (!ldap->attrs) return E_OUTOFMEMORY; + ldap->attrs_count_allocated = 256; + } + else if (ldap->attrs_count_allocated < ldap->attrs_count + 1) + { + new_attrs = heap_realloc(ldap->attrs, (ldap->attrs_count_allocated * 2) * sizeof(*new_attrs)); + if (!new_attrs) return E_OUTOFMEMORY; + + ldap->attrs_count_allocated *= 2; + ldap->attrs = new_attrs; + } + + ldap->attrs[ldap->attrs_count].name = name; + ldap->attrs[ldap->attrs_count].values = values; + ldap->attrs_count++; + + return S_OK; +} + static HRESULT WINAPI ldapns_GetInfoEx(IADs *iface, VARIANT prop, LONG reserved) { - FIXME("%p,%s,%d: stub\n", iface, wine_dbgstr_variant(&prop), reserved); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IADs(iface); + HRESULT hr; + SAFEARRAY *sa; + VARIANT *item; + WCHAR **props = NULL, *attr, **values; + DWORD i, count, err; + LDAPMessage *res = NULL, *entry; + BerElement *ber; + + TRACE("%p,%s,%d\n", iface, wine_dbgstr_variant(&prop), reserved); + + free_attributes(ldap); + + if (!ldap->ld) return E_NOTIMPL; + + if (V_VT(&prop) != (VT_ARRAY | VT_VARIANT)) + return E_ADS_BAD_PARAMETER; + + sa = V_ARRAY(&prop); + if (sa->cDims != 1) + return E_ADS_BAD_PARAMETER; + + hr = SafeArrayAccessData(sa, (void *)&item); + if (hr != S_OK) return hr; + + count = sa->rgsabound[0].cElements; + if (count) + { + props = heap_alloc((count + 1) * sizeof(props[0])); + if (!props) + { + hr = E_OUTOFMEMORY; + goto exit; + } + + for (i = 0; i < count; i++) + { + if (V_VT(&item[i]) != VT_BSTR) + { + hr = E_ADS_BAD_PARAMETER; + goto exit; + } + props[i] = V_BSTR(&item[i]); + } + props[sa->rgsabound[0].cElements] = NULL; + } + + err = ldap_search_sW(ldap->ld, NULL, LDAP_SCOPE_BASE, (WCHAR *)L"(objectClass=*)", props, FALSE, &res); + if (err != LDAP_SUCCESS) + { + TRACE("ldap_search_sW error %#x\n", err); + hr = HRESULT_FROM_WIN32(map_ldap_error(err)); + goto exit; + } + + entry = ldap_first_entry(ldap->ld, res); + while (entry) + { + attr = ldap_first_attributeW(ldap->ld, entry, &ber); + while (attr) + { + TRACE("attr: %s\n", debugstr_w(attr)); + + values = ldap_get_valuesW(ldap->ld, entry, attr); + + hr = add_attribute(ldap, attr, values); + if (hr != S_OK) + { + ldap_value_freeW(values); + ldap_memfreeW(attr); + goto exit; + } + + attr = ldap_next_attributeW(ldap->ld, entry, ber); + } + + entry = ldap_next_entry(ldap->ld, res); + } + +exit: + if (res) ldap_msgfree(res); + heap_free(props); + SafeArrayUnaccessData(sa); + return hr; } static const IADsVtbl IADs_vtbl = @@ -867,6 +1000,9 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->ld = NULL; ldap->host = NULL; ldap->object = NULL; + ldap->attrs_count = 0; + ldap->attrs_count_allocated = 0; + ldap->attrs = NULL; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); IADs_Release(&ldap->IADs_iface); diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h index 8748d0496d..0443ffbf6e 100644 --- a/dlls/adsldp/adsldp_private.h +++ b/dlls/adsldp/adsldp_private.h @@ -19,6 +19,16 @@ #ifndef _ADSLDP_PRIVATE_H #define _ADSLDP_PRIVATE_H +#include "wine/heap.h" + +static inline WCHAR *strdupW(const WCHAR *src) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = heap_alloc((wcslen(src) + 1) * sizeof(WCHAR)))) wcscpy(dst, src); + return dst; +} + DWORD map_ldap_error(DWORD) DECLSPEC_HIDDEN; #endif -- 2.25.1

1 0

[PATCH 5/8] adsldp: Implement IADs::GetInfo().
by Dmitry Timoshkov 20 Mar '20

20 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/Makefile.in | 2 +- dlls/adsldp/adsldp.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index 3e5a5e310e..07f79a9993 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,5 +1,5 @@ MODULE = adsldp.dll -IMPORTS = ole32 oleaut32 secur32 uuid +IMPORTS = ole32 oleaut32 secur32 activeds uuid DELAYIMPORTS = netapi32 wldap32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 4a9e2ba2de..19edcde06f 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -29,6 +29,7 @@ #include "rpcproxy.h" #include "rpc.h" #include "iads.h" +#include "adshlp.h" #include "adserr.h" #define SECURITY_WIN32 #include "security.h" @@ -503,8 +504,18 @@ static HRESULT WINAPI ldapns_get_Schema(IADs *iface, BSTR *retval) static HRESULT WINAPI ldapns_GetInfo(IADs *iface) { - FIXME("%p: stub\n", iface); - return E_NOTIMPL; + HRESULT hr; + VARIANT var; + + TRACE("%p\n", iface); + + hr = ADsBuildVarArrayStr(NULL, 0, &var); + if (hr == S_OK) + { + hr = IADs_GetInfoEx(iface, var, 0); + VariantClear(&var); + } + return hr; } static HRESULT WINAPI ldapns_SetInfo(IADs *iface) -- 2.25.1

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
97
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel March 2020