September 2020 - Wine-Devel

[PATCH v2 2/2] ntdll/tests: Raise an exception to check that EFlags.AC is cleared.
by Jefferson Carpenter Sept. 3, 2020

Sept. 3, 2020

1 0

[PATCH 1/2] ntdll/tests: Restore EFlags without re-loading.
by Jefferson Carpenter Sept. 3, 2020

Sept. 3, 2020

1 0

[PATCH 1/2] dxgi: Add DXGI_FORMAT_NV12 and DXGI_FORMAT_YUY2.
by Zebediah Figura Sept. 3, 2020

Sept. 3, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dxgi/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 6c49d4539c3..665413e4c62 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -147,6 +147,8 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_TYPELESS); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); + WINE_DXGI_TO_STR(DXGI_FORMAT_NV12); + WINE_DXGI_TO_STR(DXGI_FORMAT_YUY2); WINE_DXGI_TO_STR(DXGI_FORMAT_B4G4R4A4_UNORM); default: FIXME("Unrecognized DXGI_FORMAT %#x.\n", format); @@ -260,6 +262,8 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; + case WINED3DFMT_NV12: return DXGI_FORMAT_NV12; + case WINED3DFMT_YUY2: return DXGI_FORMAT_YUY2; case WINED3DFMT_B4G4R4A4_UNORM: return DXGI_FORMAT_B4G4R4A4_UNORM; default: FIXME("Unhandled wined3d format %#x.\n", format); @@ -371,6 +375,8 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; + case DXGI_FORMAT_NV12: return WINED3DFMT_NV12; + case DXGI_FORMAT_YUY2: return WINED3DFMT_YUY2; case DXGI_FORMAT_B4G4R4A4_UNORM: return WINED3DFMT_B4G4R4A4_UNORM; default: FIXME("Unhandled DXGI_FORMAT %#x.\n", format); -- 2.28.0

2 3

[PATCH 1/2] wined3d: Read the SM5 resource type instruction modifier.
by Zebediah Figura Sept. 3, 2020

Sept. 3, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I have as yet been unable to determine a use for this information. dlls/wined3d/shader.c | 77 ++++++++++++++-------------------- dlls/wined3d/shader_sm4.c | 74 ++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 83 insertions(+), 69 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f4c4eb07d88..cfcb636346d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2042,6 +2042,29 @@ static void shader_dump_shader_input_sysval_semantic(struct wined3d_string_buffe shader_addline(buffer, "unknown_shader_input_sysval_semantic(%#x)", semantic); } +static void shader_dump_resource_type(struct wined3d_string_buffer *buffer, enum wined3d_shader_resource_type type) +{ + static const char *const resource_type_names[] = + { + /* WINED3D_SHADER_RESOURCE_NONE */ "none", + /* WINED3D_SHADER_RESOURCE_BUFFER */ "buffer", + /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ "texture1d", + /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ "texture2d", + /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ "texture2dms", + /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ "texture3d", + /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ "texturecube", + /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ "texture1darray", + /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ "texture2darray", + /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ "texture2dmsarray", + /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", + }; + + if (type <= ARRAY_SIZE(resource_type_names)) + shader_addline(buffer, resource_type_names[type]); + else + shader_addline(buffer, "unknown"); +} + static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, const struct wined3d_shader_semantic *semantic, unsigned int flags, const struct wined3d_shader_version *shader_version) @@ -2075,52 +2098,7 @@ static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, shader_addline(buffer, "_resource_"); else shader_addline(buffer, "_uav_"); - switch (semantic->resource_type) - { - case WINED3D_SHADER_RESOURCE_BUFFER: - shader_addline(buffer, "buffer"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_1D: - shader_addline(buffer, "texture1d"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_2D: - shader_addline(buffer, "texture2d"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_2DMS: - shader_addline(buffer, "texture2dms"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_3D: - shader_addline(buffer, "texture3d"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: - shader_addline(buffer, "texturecube"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY: - shader_addline(buffer, "texture1darray"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: - shader_addline(buffer, "texture2darray"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY: - shader_addline(buffer, "texture2dmsarray"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY: - shader_addline(buffer, "texturecubearray"); - break; - - default: - shader_addline(buffer, "unknown"); - break; - } + shader_dump_resource_type(buffer, semantic->resource_type); if (semantic->reg.reg.type == WINED3DSPR_UAV) shader_dump_uav_flags(buffer, flags); switch (semantic->resource_data_type) @@ -3116,6 +3094,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe if (wined3d_shader_instruction_has_texel_offset(&ins)) shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); + if (ins.resource_type != WINED3D_SHADER_RESOURCE_NONE) + { + shader_addline(&buffer, "("); + shader_dump_resource_type(&buffer, ins.resource_type); + shader_addline(&buffer, ")"); + } + for (i = 0; i < ins.dst_count; ++i) { shader_dump_ins_modifiers(&buffer, &ins.dst[i]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 443cfe7e4bd..54646174a29 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -26,7 +26,11 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) -#define WINED3D_SM4_MODIFIER_AOFFIMMI 0x1 +#define WINED3D_SM4_MODIFIER_MASK 0x3fu + +#define WINED3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT 6 +#define WINED3D_SM5_MODIFIER_RESOURCE_TYPE_MASK (0xfu << WINED3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT) + #define WINED3D_SM4_AOFFIMMI_U_SHIFT 9 #define WINED3D_SM4_AOFFIMMI_U_MASK (0xfu << WINED3D_SM4_AOFFIMMI_U_SHIFT) #define WINED3D_SM4_AOFFIMMI_V_SHIFT 13 @@ -304,6 +308,12 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; +enum wined3d_sm4_instruction_modifier +{ + WINED3D_SM4_MODIFIER_AOFFIMMI = 0x1, + WINED3D_SM5_MODIFIER_RESOURCE_TYPE = 0x2, +}; + enum wined3d_sm4_register_type { WINED3D_SM4_RT_TEMP = 0x00, @@ -1609,32 +1619,49 @@ static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD static void shader_sm4_read_instruction_modifier(DWORD modifier, struct wined3d_shader_instruction *ins) { - static const DWORD recognized_bits = WINED3D_SM4_INSTRUCTION_MODIFIER - | WINED3D_SM4_MODIFIER_AOFFIMMI - | WINED3D_SM4_AOFFIMMI_U_MASK - | WINED3D_SM4_AOFFIMMI_V_MASK - | WINED3D_SM4_AOFFIMMI_W_MASK; + enum wined3d_sm4_instruction_modifier modifier_type = modifier & WINED3D_SM4_MODIFIER_MASK; - if (modifier & ~recognized_bits) + switch (modifier_type) { - FIXME("Unhandled modifier 0x%08x.\n", modifier); - } - else - { - /* Bit fields are used for sign extension */ - struct + case WINED3D_SM4_MODIFIER_AOFFIMMI: { - int u : 4; - int v : 4; - int w : 4; + static const DWORD recognized_bits = WINED3D_SM4_INSTRUCTION_MODIFIER + | WINED3D_SM4_MODIFIER_MASK + | WINED3D_SM4_AOFFIMMI_U_MASK + | WINED3D_SM4_AOFFIMMI_V_MASK + | WINED3D_SM4_AOFFIMMI_W_MASK; + + /* Bit fields are used for sign extension. */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } aoffimmi; + + if (modifier & ~recognized_bits) + FIXME("Unhandled instruction modifier %#x.\n", modifier); + + aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; + aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; + aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; + ins->texel_offset.u = aoffimmi.u; + ins->texel_offset.v = aoffimmi.v; + ins->texel_offset.w = aoffimmi.w; + break; + } + + case WINED3D_SM5_MODIFIER_RESOURCE_TYPE: + { + enum wined3d_sm4_resource_type resource_type + = (modifier & WINED3D_SM5_MODIFIER_RESOURCE_TYPE_MASK) >> WINED3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT; + + ins->resource_type = resource_type_table[resource_type]; + break; } - aoffimmi; - aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; - aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; - aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; - ins->texel_offset.u = aoffimmi.u; - ins->texel_offset.v = aoffimmi.v; - ins->texel_offset.w = aoffimmi.w; + + default: + FIXME("Unhandled instruction modifier %#x.\n", modifier); } } @@ -1703,6 +1730,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->dst = priv->dst_param; ins->src_count = strlen(opcode_info->src_info); ins->src = priv->src_param; + ins->resource_type = WINED3D_SHADER_RESOURCE_NONE; memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); p = *ptr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 16b3d0325c5..6e905ca6a49 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1246,6 +1246,7 @@ struct wined3d_shader_instruction const struct wined3d_shader_dst_param *dst; const struct wined3d_shader_src_param *src; struct wined3d_shader_texel_offset texel_offset; + enum wined3d_shader_resource_type resource_type; BOOL coissue; const struct wined3d_shader_src_param *predicate; union -- 2.28.0

2 3

[PATCH 1/6] msscript.ocx/tests: Add tests for SitehWnd.
by Gabriel Ivăncescu Sept. 3, 2020

Sept. 3, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/tests/msscript.c | 161 +++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 2e7f14d..5a29c7e 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1905,6 +1905,166 @@ static void test_AllowUI(void) IScriptControl_Release(sc); } +static void test_SitehWnd(void) +{ + IScriptControl *sc; + LONG site_hwnd; + HRESULT hr; + HWND hwnd; + BSTR str; + + hwnd = CreateWindowA("static", NULL, WS_OVERLAPPEDWINDOW, 50, 50, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create window, error %08x\n", GetLastError()); + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_SitehWnd(sc, NULL); + todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + + site_hwnd = 0xdeadbeef; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + + hr = IScriptControl_put_SitehWnd(sc, 1); + todo_wine ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + + site_hwnd = 0xdeadbeef; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + + hr = IScriptControl_put_SitehWnd(sc, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"vbscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + site_hwnd = 0; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (have_custom_engine) + { + IActiveScriptSiteWindow *site_window; + HWND window; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + str = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + hr = IActiveScriptSite_QueryInterface(site, &IID_IActiveScriptSiteWindow, (void**)&site_window); + ok(hr == S_OK, "got 0x%08x\n", hr); + + site_hwnd = 0; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, NULL); + todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + hr = IActiveScriptSiteWindow_EnableModeless(site_window, FALSE); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IActiveScriptSiteWindow_EnableModeless(site_window, TRUE); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + site_hwnd = 0xdeadbeef; + hr = IScriptControl_put_SitehWnd(sc, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + + window = (HWND)0xdeadbeef; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!window, "got %p\n", window); + + site_hwnd = 0; + hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + hr = IScriptControl_put_AllowUI(sc, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(!window, "got %p\n", window); + + hr = IScriptControl_put_AllowUI(sc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + IActiveScriptSiteWindow_Release(site_window); + } + + DestroyWindow(hwnd); +} + static void test_UseSafeSubset(void) { IScriptControl *sc; @@ -4100,6 +4260,7 @@ START_TEST(msscript) test_Reset(); test_AddObject(); test_AllowUI(); + test_SitehWnd(); test_UseSafeSubset(); test_State(); test_IScriptControl_Eval(); -- 2.21.0

2 7

[PATCH 6/6] advapi32: Enumerate host credentials through mountmgr.
by Hans Leidekker Sept. 3, 2020

Sept. 3, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/Makefile.in | 1 - dlls/advapi32/cred.c | 405 ++++++++++---------------------------- 2 files changed, 109 insertions(+), 297 deletions(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index e70b1a7a07a..99bc26572ec 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -3,7 +3,6 @@ MODULE = advapi32.dll IMPORTLIB = advapi32 IMPORTS = kernelbase sechost DELAYIMPORTS = rpcrt4 -EXTRALIBS = $(SECURITY_LIBS) C_SRCS = \ advapi.c \ diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 24bcd284145..10bcf4acb26 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -22,12 +22,6 @@ #include <time.h> #include <limits.h> -#ifdef __APPLE__ -# include <Security/SecKeychain.h> -# include <Security/SecKeychainItem.h> -# include <Security/SecKeychainSearch.h> -#endif - #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -237,189 +231,6 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, return ret; } -#ifdef __APPLE__ -static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require_password, - PCREDENTIALW credential, char *buffer, - DWORD *len) -{ - int status; - UInt32 i, cred_blob_len; - void *cred_blob; - WCHAR *user = NULL; - BOOL user_name_present = FALSE; - SecKeychainAttributeInfo info; - SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServiceItemAttr, kSecAccountItemAttr, - kSecCommentItemAttr, kSecCreationDateItemAttr }; - info.count = ARRAY_SIZE(info_tags); - info.tag = info_tags; - info.format = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, &cred_blob_len, &cred_blob); - if (status == errSecAuthFailed && !require_password) - { - cred_blob_len = 0; - cred_blob = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, &cred_blob_len, NULL); - } - if (status != noErr) - { - WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); - return ERROR_NOT_FOUND; - } - - for (i = 0; i < attr_list->count; i++) - if (attr_list->attr[i].tag == kSecAccountItemAttr && attr_list->attr[i].data) - { - user_name_present = TRUE; - break; - } - if (!user_name_present) - { - WARN("no kSecAccountItemAttr for item\n"); - SecKeychainItemFreeAttributesAndData(attr_list, cred_blob); - return ERROR_NOT_FOUND; - } - - if (buffer) - { - credential->Flags = 0; - credential->Type = CRED_TYPE_DOMAIN_PASSWORD; - credential->TargetName = NULL; - credential->Comment = NULL; - memset(&credential->LastWritten, 0, sizeof(credential->LastWritten)); - credential->CredentialBlobSize = 0; - credential->CredentialBlob = NULL; - credential->Persist = CRED_PERSIST_LOCAL_MACHINE; - credential->AttributeCount = 0; - credential->Attributes = NULL; - credential->TargetAlias = NULL; - credential->UserName = NULL; - } - for (i = 0; i < attr_list->count; i++) - { - switch (attr_list->attr[i].tag) - { - case kSecServiceItemAttr: - TRACE("kSecServiceItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - if (buffer) - { - INT str_len; - credential->TargetName = (LPWSTR)buffer; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, (LPWSTR)buffer, 0xffff); - credential->TargetName[str_len] = '\0'; - buffer += (str_len + 1) * sizeof(WCHAR); - *len += (str_len + 1) * sizeof(WCHAR); - } - else - { - INT str_len; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, NULL, 0); - *len += (str_len + 1) * sizeof(WCHAR); - } - break; - case kSecAccountItemAttr: - { - INT str_len; - TRACE("kSecAccountItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, NULL, 0); - user = heap_alloc((str_len + 1) * sizeof(WCHAR)); - MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, user, str_len); - user[str_len] = '\0'; - break; - } - case kSecCommentItemAttr: - TRACE("kSecCommentItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - if (buffer) - { - INT str_len; - credential->Comment = (LPWSTR)buffer; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, (LPWSTR)buffer, 0xffff); - credential->Comment[str_len] = '\0'; - buffer += (str_len + 1) * sizeof(WCHAR); - *len += (str_len + 1) * sizeof(WCHAR); - } - else - { - INT str_len; - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[i].data, - attr_list->attr[i].length, NULL, 0); - *len += (str_len + 1) * sizeof(WCHAR); - } - break; - case kSecCreationDateItemAttr: - TRACE("kSecCreationDateItemAttr: %.*s\n", (int)attr_list->attr[i].length, - (char *)attr_list->attr[i].data); - if (!attr_list->attr[i].data) continue; - if (buffer) - { - LARGE_INTEGER win_time; - struct tm tm; - time_t time; - memset(&tm, 0, sizeof(tm)); - strptime(attr_list->attr[i].data, "%Y%m%d%H%M%SZ", &tm); - time = mktime(&tm); - RtlSecondsSince1970ToTime(time, &win_time); - credential->LastWritten.dwLowDateTime = win_time.u.LowPart; - credential->LastWritten.dwHighDateTime = win_time.u.HighPart; - } - break; - default: - FIXME("unhandled attribute %u\n", (unsigned)attr_list->attr[i].tag); - break; - } - } - - if (user) - { - INT str_len; - if (buffer) - credential->UserName = (LPWSTR)buffer; - str_len = strlenW(user); - *len += (str_len + 1) * sizeof(WCHAR); - if (buffer) - { - memcpy(buffer, user, (str_len + 1) * sizeof(WCHAR)); - buffer += (str_len + 1) * sizeof(WCHAR); - TRACE("UserName = %s\n", debugstr_w(credential->UserName)); - } - } - heap_free(user); - - if (cred_blob) - { - if (buffer) - { - INT str_len; - credential->CredentialBlob = (BYTE *)buffer; - str_len = MultiByteToWideChar(CP_UTF8, 0, cred_blob, cred_blob_len, - (LPWSTR)buffer, 0xffff); - credential->CredentialBlobSize = str_len * sizeof(WCHAR); - *len += str_len * sizeof(WCHAR); - } - else - { - INT str_len; - str_len = MultiByteToWideChar(CP_UTF8, 0, cred_blob, cred_blob_len, - NULL, 0); - *len += str_len * sizeof(WCHAR); - } - } - SecKeychainItemFreeAttributesAndData(attr_list, cred_blob); - return ERROR_SUCCESS; -} -#endif - static DWORD write_credential_blob(HKEY hkey, LPCWSTR target_name, DWORD type, const BYTE key_data[KEY_SIZE], const BYTE *credential_blob, DWORD credential_blob_size) @@ -736,98 +547,6 @@ static DWORD registry_enumerate_credentials(HKEY hkeyMgr, LPCWSTR filter, return ret; } -#ifdef __APPLE__ -static BOOL mac_credential_matches_filter(void *data, UInt32 data_len, const WCHAR *filter) -{ - int len; - WCHAR *target_name; - const WCHAR *p; - BOOL ret; - - if (!filter) return TRUE; - - len = MultiByteToWideChar(CP_UTF8, 0, data, data_len, NULL, 0); - if (!(target_name = heap_alloc((len + 1) * sizeof(WCHAR)))) return FALSE; - MultiByteToWideChar(CP_UTF8, 0, data, data_len, target_name, len); - target_name[len] = 0; - - TRACE("comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(target_name)); - - p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, - (p && !p[1] ? p - filter : -1), target_name, - (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; - heap_free(target_name); - return ret; -} - -static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials, - char *buffer, DWORD *len, DWORD *count) -{ - SecKeychainSearchRef search; - SecKeychainItemRef item; - int status; - Boolean saved_user_interaction_allowed; - DWORD ret; - - SecKeychainGetUserInteractionAllowed(&saved_user_interaction_allowed); - SecKeychainSetUserInteractionAllowed(false); - - status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, NULL, &search); - if (status == noErr) - { - while (SecKeychainSearchCopyNext(search, &item) == noErr) - { - SecKeychainAttributeInfo info; - SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServiceItemAttr }; - BOOL match; - - info.count = ARRAY_SIZE(info_tags); - info.tag = info_tags; - info.format = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); - if (status != noErr) - { - WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); - continue; - } - if (buffer) - { - *len = sizeof(CREDENTIALW); - credentials[*count] = (PCREDENTIALW)buffer; - } - else - *len += sizeof(CREDENTIALW); - if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) - { - SecKeychainItemFreeAttributesAndData(attr_list, NULL); - continue; - } - TRACE("service item: %.*s\n", (int)attr_list->attr[0].length, (char *)attr_list->attr[0].data); - match = mac_credential_matches_filter(attr_list->attr[0].data, attr_list->attr[0].length, filter); - SecKeychainItemFreeAttributesAndData(attr_list, NULL); - if (!match) continue; - ret = mac_read_credential_from_item(item, FALSE, - buffer ? credentials[*count] : NULL, - buffer ? buffer + sizeof(CREDENTIALW) : NULL, - len); - CFRelease(item); - if (ret == ERROR_SUCCESS) - { - (*count)++; - if (buffer) buffer += *len; - } - } - CFRelease(search); - } - else - ERR("SecKeychainSearchCreateFromAttributes returned status %d\n", status); - SecKeychainSetUserInteractionAllowed(saved_user_interaction_allowed); - return ERROR_SUCCESS; -} -#endif - /****************************************************************************** * convert_PCREDENTIALW_to_PCREDENTIALA [internal] * @@ -1194,11 +913,113 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count, return TRUE; } +#define CRED_LIST_COUNT 16 +#define CRED_DATA_SIZE 2048 +static DWORD host_enumerate_credentials( const WCHAR *filter, CREDENTIALW **credentials, char *buf, DWORD *len, DWORD *count ) +{ + static const WCHAR emptyW[] = {0}; + struct mountmgr_credential_list *list, *tmp; + DWORD i, j, ret, size, filter_size, offset = 0; + HANDLE mgr; + WCHAR *ptr; + + if (filter) filter_size = (strlenW( filter ) + 1) * sizeof(WCHAR); + else + { + filter = emptyW; + filter_size = sizeof(emptyW); + } + + mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); + + size = FIELD_OFFSET( struct mountmgr_credential_list, creds[CRED_LIST_COUNT] ) + filter_size + CRED_DATA_SIZE; + if (!(list = heap_alloc( size ))) + { + CloseHandle( mgr ); + return ERROR_OUTOFMEMORY; + } + + for (;;) + { + list->filter_offset = sizeof(*list); + list->filter_size = filter_size; + ptr = (WCHAR *)((char *)list + list->filter_offset); + strcpyW( ptr, filter ); + + if (DeviceIoControl( mgr, IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS, list, size, list, size, NULL, NULL )) break; + if ((ret = GetLastError()) != ERROR_MORE_DATA) goto done; + + size = list->size + filter_size; + if (!(tmp = heap_realloc( list, size ))) + { + ret = ERROR_OUTOFMEMORY; + goto done; + } + list = tmp; + } + + for (i = 0, j = *count; i < list->count; i++) + { + CREDENTIALW *cred = (CREDENTIALW *)(buf + offset); + + offset += sizeof(*cred) + list->creds[i].targetname_size + list->creds[i].comment_size + list->creds[i].blob_size + + list->creds[i].username_size; + if (!buf) continue; + + ptr = (WCHAR *)(cred + 1); + cred->Flags = 0; + cred->Type = CRED_TYPE_DOMAIN_PASSWORD; + cred->TargetName = ptr; + memcpy( cred->TargetName, (char *)&list->creds[i] + list->creds[i].targetname_offset, list->creds[i].targetname_size ); + ptr += list->creds[i].targetname_size / sizeof(WCHAR); + if (list->creds[i].comment_size) + { + cred->Comment = ptr; + memcpy( cred->Comment, (char *)&list->creds[i] + list->creds[i].comment_offset, list->creds[i].comment_size ); + ptr += list->creds[i].comment_size / sizeof(WCHAR); + } + else cred->Comment = NULL; + cred->LastWritten = list->creds[i].last_written; + if (list->creds[i].blob_size) + { + cred->CredentialBlobSize = list->creds[i].blob_size; + cred->CredentialBlob = (BYTE *)ptr; + memcpy( cred->CredentialBlob, (char *)&list->creds[i] + list->creds[i].blob_offset, list->creds[i].blob_size ); + ptr += list->creds[i].blob_size / sizeof(WCHAR); + } + else + { + cred->CredentialBlobSize = 0; + cred->CredentialBlob = NULL; + } + cred->Persist = CRED_PERSIST_LOCAL_MACHINE; + cred->AttributeCount = 0; + cred->Attributes = NULL; + cred->TargetAlias = NULL; + if (list->creds[i].username_size) + { + cred->UserName = ptr; + memcpy( cred->UserName, (char *)&list->creds[i] + list->creds[i].username_offset, list->creds[i].username_size ); + } + else cred->UserName = NULL; + if (credentials) credentials[j++] = cred; + } + + *len += offset; + *count += list->count; + ret = ERROR_SUCCESS; + +done: + heap_free( list ); + CloseHandle( mgr ); + return ret; +} + /****************************************************************************** * CredEnumerateW [ADVAPI32.@] */ -BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, - PCREDENTIALW **Credentials) +BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, PCREDENTIALW **Credentials) { HKEY hkeyMgr; DWORD ret; @@ -1252,10 +1073,8 @@ BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, len = 0; ret = registry_enumerate_credentials(hkeyMgr, Filter, target_name, target_name_len, key_data, NULL, NULL, &len, Count); -#ifdef __APPLE__ if (ret == ERROR_SUCCESS) - ret = mac_enumerate_credentials(Filter, NULL, NULL, &len, Count); -#endif + ret = host_enumerate_credentials(Filter, NULL, NULL, &len, Count); if (ret == ERROR_SUCCESS && *Count == 0) ret = ERROR_NOT_FOUND; if (ret != ERROR_SUCCESS) @@ -1275,18 +1094,12 @@ BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, { buffer += *Count * sizeof(PCREDENTIALW); *Count = 0; - ret = registry_enumerate_credentials(hkeyMgr, Filter, target_name, - target_name_len, key_data, - *Credentials, &buffer, &len, - Count); -#ifdef __APPLE__ + ret = registry_enumerate_credentials(hkeyMgr, Filter, target_name, target_name_len, key_data, + *Credentials, &buffer, &len, Count); if (ret == ERROR_SUCCESS) - ret = mac_enumerate_credentials(Filter, *Credentials, - buffer, &len, Count); -#endif + ret = host_enumerate_credentials(Filter, *Credentials, buffer, &len, Count); } - else - ret = ERROR_OUTOFMEMORY; + else ret = ERROR_OUTOFMEMORY; } heap_free(target_name); -- 2.20.1

2 2

[PATCH 5/6] mountmgr: Add ioctl to enumerate host credentials on macOS.
by Hans Leidekker Sept. 3, 2020

Sept. 3, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mountmgr.sys/device.c | 2 +- dlls/mountmgr.sys/mountmgr.c | 142 +++++++++++++++++++++++++++++++++++ dlls/mountmgr.sys/mountmgr.h | 2 + include/ddk/mountmgr.h | 10 +++ 4 files changed, 155 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 97208da4819..ccb0685cedd 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -159,7 +159,7 @@ static char *strdupA( const char *str ) return ret; } -static WCHAR *strdupW( const WCHAR *str ) +WCHAR *strdupW( const WCHAR *str ) { WCHAR *ret; diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 95b11d864ab..54ba2857e02 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -836,6 +836,137 @@ static NTSTATUS delete_credential( void *buff, SIZE_T insize, SIZE_T outsize, IO CFRelease( item ); return STATUS_SUCCESS; } + +static BOOL match_credential( void *data, UInt32 data_len, const WCHAR *filter ) +{ + int len; + WCHAR *targetname; + const WCHAR *p; + BOOL ret; + + if (!*filter) return TRUE; + + len = MultiByteToWideChar( CP_UTF8, 0, data, data_len, NULL, 0 ); + if (!(targetname = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return FALSE; + MultiByteToWideChar( CP_UTF8, 0, data, data_len, targetname, len ); + targetname[len] = 0; + + TRACE( "comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(targetname) ); + + p = strchrW( filter, '*' ); + ret = CompareStringW( GetThreadLocale(), NORM_IGNORECASE, filter, + (p && !p[1]) ? p - filter : -1, targetname, (p && !p[1]) ? p - filter : -1 ) == CSTR_EQUAL; + RtlFreeHeap( GetProcessHeap(), 0, targetname ); + return ret; +} + +static NTSTATUS search_credentials( const WCHAR *filter, struct mountmgr_credential_list *list, SIZE_T *ret_count, SIZE_T *ret_size ) +{ + SecKeychainSearchRef search; + SecKeychainItemRef item; + int status; + ULONG i = 0; + SIZE_T data_offset, data_size = 0, size; + NTSTATUS ret = STATUS_NOT_FOUND; + + status = SecKeychainSearchCreateFromAttributes( NULL, kSecGenericPasswordItemClass, NULL, &search ); + if (status != noErr) + { + ERR( "SecKeychainSearchCreateFromAttributes returned status %d\n", status ); + return STATUS_INTERNAL_ERROR; + } + + while (SecKeychainSearchCopyNext( search, &item ) == noErr) + { + SecKeychainAttributeInfo info; + SecKeychainAttributeList *attr_list; + UInt32 info_tags[] = { kSecServiceItemAttr }; + BOOL match; + + info.count = ARRAY_SIZE(info_tags); + info.tag = info_tags; + info.format = NULL; + status = SecKeychainItemCopyAttributesAndData( item, &info, NULL, &attr_list, NULL, NULL ); + if (status != noErr) + { + WARN( "SecKeychainItemCopyAttributesAndData returned status %d\n", status ); + CFRelease( item ); + continue; + } + if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) + { + SecKeychainItemFreeAttributesAndData( attr_list, NULL ); + CFRelease( item ); + continue; + } + TRACE( "service item: %.*s\n", (int)attr_list->attr[0].length, (char *)attr_list->attr[0].data ); + + match = match_credential( attr_list->attr[0].data, attr_list->attr[0].length, filter ); + SecKeychainItemFreeAttributesAndData( attr_list, NULL ); + if (!match) + { + CFRelease( item ); + continue; + } + + if (!list) ret = fill_credential( item, FALSE, NULL, 0, 0, &size ); + else + { + data_offset = FIELD_OFFSET( struct mountmgr_credential_list, creds[list->count] ) - + FIELD_OFFSET( struct mountmgr_credential_list, creds[i] ) + data_size; + ret = fill_credential( item, FALSE, &list->creds[i], data_offset, list->size - data_offset, &size ); + } + + CFRelease( item ); + if (ret == STATUS_NOT_FOUND) continue; + if (ret != STATUS_SUCCESS) break; + data_size += size - sizeof(struct mountmgr_credential); + i++; + } + + if (ret_count) *ret_count = i; + if (ret_size) *ret_size = FIELD_OFFSET( struct mountmgr_credential_list, creds[i] ) + data_size; + + CFRelease( search ); + return ret; +} + +static NTSTATUS enumerate_credentials( void *buff, SIZE_T insize, SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +{ + struct mountmgr_credential_list *list = buff; + WCHAR *filter; + SIZE_T size, count; + Boolean saved_user_interaction_allowed; + NTSTATUS status; + + if (!check_credential_string( buff, insize, list->filter_size, list->filter_offset )) return STATUS_INVALID_PARAMETER; + if (!(filter = strdupW( (const WCHAR *)((const char *)list + list->filter_offset) ))) return STATUS_NO_MEMORY; + + SecKeychainGetUserInteractionAllowed( &saved_user_interaction_allowed ); + SecKeychainSetUserInteractionAllowed( false ); + + if ((status = search_credentials( filter, NULL, &count, &size )) == STATUS_SUCCESS) + { + + if (size > outsize) + { + if (size >= sizeof(list->size)) list->size = size; + iosb->Information = sizeof(list->size); + status = STATUS_MORE_ENTRIES; + } + else + { + list->size = size; + list->count = count; + iosb->Information = size; + status = search_credentials( filter, list, NULL, NULL ); + } + } + + SecKeychainSetUserInteractionAllowed( saved_user_interaction_allowed ); + RtlFreeHeap( GetProcessHeap(), 0, filter ); + return status; +} #endif /* __APPLE__ */ /* handler for ioctls on the mount manager device */ @@ -937,6 +1068,17 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) irpsp->Parameters.DeviceIoControl.OutputBufferLength, &irp->IoStatus ); break; + case IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS: + if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential_list)) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } + irp->IoStatus.u.Status = enumerate_credentials( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); + break; #endif default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 5fb43119c6a..3e4554c4768 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -36,6 +36,8 @@ extern void initialize_dbus(void) DECLSPEC_HIDDEN; extern void initialize_diskarbitration(void) DECLSPEC_HIDDEN; +extern WCHAR *strdupW( const WCHAR * ) DECLSPEC_HIDDEN; + /* device functions */ enum device_type diff --git a/include/ddk/mountmgr.h b/include/ddk/mountmgr.h index a5aae2a0851..3e4bacbb827 100644 --- a/include/ddk/mountmgr.h +++ b/include/ddk/mountmgr.h @@ -77,6 +77,7 @@ struct mountmgr_unix_drive #define IOCTL_MOUNTMGR_READ_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 48, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_MOUNTMGR_WRITE_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 49, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_MOUNTMGR_DELETE_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 50, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS CTL_CODE(MOUNTMGRCONTROLTYPE, 51, METHOD_BUFFERED, FILE_READ_ACCESS) struct mountmgr_credential { @@ -92,6 +93,15 @@ struct mountmgr_credential FILETIME last_written; }; +struct mountmgr_credential_list +{ + ULONG size; + ULONG count; + ULONG filter_offset; + ULONG filter_size; + struct mountmgr_credential creds[1]; +}; + #define IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS CTL_CODE(MOUNTMGRCONTROLTYPE, 64, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) struct mountmgr_dhcp_request_param -- 2.20.1

1 0

[PATCH 4/6] advapi32: Delete host credentials through mountmgr.
by Hans Leidekker Sept. 3, 2020

Sept. 3, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/cred.c | 87 ++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 56 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index c17023959fc..24bcd284145 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -826,59 +826,6 @@ static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials SecKeychainSetUserInteractionAllowed(saved_user_interaction_allowed); return ERROR_SUCCESS; } - -static DWORD mac_delete_credential(LPCWSTR TargetName) -{ - int status; - SecKeychainSearchRef search; - status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, NULL, &search); - if (status == noErr) - { - SecKeychainItemRef item; - while (SecKeychainSearchCopyNext(search, &item) == noErr) - { - SecKeychainAttributeInfo info; - SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServiceItemAttr }; - LPWSTR target_name; - INT str_len; - info.count = ARRAY_SIZE(info_tags); - info.tag = info_tags; - info.format = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); - if (status != noErr) - { - WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); - continue; - } - if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) - { - CFRelease(item); - continue; - } - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, NULL, 0); - target_name = heap_alloc((str_len + 1) * sizeof(WCHAR)); - MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, target_name, str_len); - /* nul terminate */ - target_name[str_len] = '\0'; - if (strcmpiW(TargetName, target_name)) - { - CFRelease(item); - heap_free(target_name); - continue; - } - heap_free(target_name); - SecKeychainItemFreeAttributesAndData(attr_list, NULL); - SecKeychainItemDelete(item); - CFRelease(item); - CFRelease(search); - - return ERROR_SUCCESS; - } - CFRelease(search); - } - return ERROR_NOT_FOUND; -} #endif /****************************************************************************** @@ -1095,6 +1042,36 @@ BOOL WINAPI CredDeleteA(LPCSTR TargetName, DWORD Type, DWORD Flags) return ret; } +static DWORD host_delete_credential( const WCHAR *targetname ) +{ + struct mountmgr_credential *cred; + DWORD size, name_size = (strlenW( targetname ) + 1) * sizeof(WCHAR); + HANDLE mgr; + WCHAR *ptr; + BOOL ret; + + mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); + + size = sizeof(*cred) + name_size; + if (!(cred = heap_alloc( size ))) + { + CloseHandle( mgr ); + return ERROR_OUTOFMEMORY; + } + cred->targetname_offset = sizeof(*cred); + cred->targetname_size = name_size; + ptr = (WCHAR *)(cred + 1); + strcpyW( ptr, targetname ); + + ret = DeviceIoControl( mgr, IOCTL_MOUNTMGR_DELETE_CREDENTIAL, cred, size, NULL, 0, NULL, NULL ); + heap_free( cred ); + CloseHandle( mgr ); + + return ret ? ERROR_SUCCESS : GetLastError(); +} + /****************************************************************************** * CredDeleteW [ADVAPI32.@] */ @@ -1126,14 +1103,12 @@ BOOL WINAPI CredDeleteW(LPCWSTR TargetName, DWORD Type, DWORD Flags) return FALSE; } -#ifdef __APPLE__ if (Type == CRED_TYPE_DOMAIN_PASSWORD) { - ret = mac_delete_credential(TargetName); + ret = host_delete_credential(TargetName); if (ret == ERROR_SUCCESS) return TRUE; } -#endif ret = open_cred_mgr_key(&hkeyMgr, TRUE); if (ret != ERROR_SUCCESS) -- 2.20.1

1 0

[PATCH 3/6] mountmgr: Add ioctl to delete host credentials on macOS.
by Hans Leidekker Sept. 3, 2020

Sept. 3, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mountmgr.sys/mountmgr.c | 28 ++++++++++++++++++++++++++++ include/ddk/mountmgr.h | 1 + 2 files changed, 29 insertions(+) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index c3b9135ce10..95b11d864ab 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -819,6 +819,23 @@ error: RtlFreeHeap( GetProcessHeap(), 0, password ); return ret; } + +static NTSTATUS delete_credential( void *buff, SIZE_T insize, SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +{ + const struct mountmgr_credential *cred = buff; + const WCHAR *targetname; + SecKeychainItemRef item; + + if (!check_credential_string( buff, insize, cred->targetname_size, cred->targetname_offset )) + return STATUS_INVALID_PARAMETER; + targetname = (const WCHAR *)((const char *)cred + cred->targetname_offset); + + if (!(item = find_credential( targetname ))) return STATUS_NOT_FOUND; + + SecKeychainItemDelete( item ); + CFRelease( item ); + return STATUS_SUCCESS; +} #endif /* __APPLE__ */ /* handler for ioctls on the mount manager device */ @@ -909,6 +926,17 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) irpsp->Parameters.DeviceIoControl.OutputBufferLength, &irp->IoStatus ); break; + case IOCTL_MOUNTMGR_DELETE_CREDENTIAL: + if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential)) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } + irp->IoStatus.u.Status = delete_credential( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); + break; #endif default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); diff --git a/include/ddk/mountmgr.h b/include/ddk/mountmgr.h index 162bbf71076..a5aae2a0851 100644 --- a/include/ddk/mountmgr.h +++ b/include/ddk/mountmgr.h @@ -76,6 +76,7 @@ struct mountmgr_unix_drive #define IOCTL_MOUNTMGR_READ_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 48, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_MOUNTMGR_WRITE_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 49, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_DELETE_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 50, METHOD_BUFFERED, FILE_WRITE_ACCESS) struct mountmgr_credential { -- 2.20.1

1 0

[PATCH 2/6] advapi32: Write host credentials through mountmgr.
by Hans Leidekker Sept. 3, 2020

Sept. 3, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/cred.c | 126 +++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 70 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 07f4b9b03a0..c17023959fc 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -497,85 +497,73 @@ static DWORD registry_write_credential(HKEY hkey, const CREDENTIALW *credential, return ret; } -#ifdef __APPLE__ -static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_blob) +static DWORD host_write_credential( const CREDENTIALW *credential, BOOL preserve_blob ) { - int status; - SecKeychainItemRef keychain_item; - char *username, *password, *servername; - UInt32 userlen, pwlen, serverlen; - SecKeychainAttribute attrs[1]; - SecKeychainAttributeList attr_list; + struct mountmgr_credential *cred; + HANDLE mgr; + DWORD size; + WCHAR *ptr; + BOOL ret; if (credential->Flags) - FIXME("Flags 0x%x not written\n", credential->Flags); + FIXME( "flags 0x%x not written\n", credential->Flags ); if (credential->Type != CRED_TYPE_DOMAIN_PASSWORD) - FIXME("credential type of %d not supported\n", credential->Type); + FIXME( "credential type of %d not supported\n", credential->Type ); if (credential->Persist != CRED_PERSIST_LOCAL_MACHINE) - FIXME("persist value of %d not supported\n", credential->Persist); + FIXME( "persist value of %d not supported\n", credential->Persist ); if (credential->AttributeCount) - FIXME("custom attributes not supported\n"); - - userlen = WideCharToMultiByte(CP_UTF8, 0, credential->UserName, -1, NULL, 0, NULL, NULL); - username = heap_alloc(userlen * sizeof(*username)); - WideCharToMultiByte(CP_UTF8, 0, credential->UserName, -1, username, userlen, NULL, NULL); - - serverlen = WideCharToMultiByte(CP_UTF8, 0, credential->TargetName, -1, NULL, 0, NULL, NULL); - servername = heap_alloc(serverlen * sizeof(*servername)); - WideCharToMultiByte(CP_UTF8, 0, credential->TargetName, -1, servername, serverlen, NULL, NULL); - pwlen = WideCharToMultiByte(CP_UTF8, 0, (LPCWSTR)credential->CredentialBlob, - credential->CredentialBlobSize / sizeof(WCHAR), NULL, 0, NULL, NULL); - password = heap_alloc(pwlen * sizeof(*password)); - WideCharToMultiByte(CP_UTF8, 0, (LPCWSTR)credential->CredentialBlob, - credential->CredentialBlobSize / sizeof(WCHAR), password, pwlen, NULL, NULL); - - TRACE("adding server %s, username %s using Keychain\n", servername, username); - status = SecKeychainAddGenericPassword(NULL, strlen(servername), servername, strlen(username), - username, strlen(password), password, &keychain_item); - if (status != noErr) - ERR("SecKeychainAddGenericPassword returned %d\n", status); - if (status == errSecDuplicateItem) + FIXME( "custom attributes not supported\n" ); + + if (credential->CredentialBlobSize % sizeof(WCHAR)) return ERROR_NOT_SUPPORTED; + + mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); + + size = sizeof(*cred) + (strlenW( credential->TargetName ) + strlenW( credential->UserName ) + 2) * sizeof(WCHAR); + size += credential->CredentialBlobSize; + if (credential->Comment) size += (strlenW( credential->Comment ) + 1) * sizeof(WCHAR); + if (!(cred = heap_alloc( size ))) { - status = SecKeychainFindGenericPassword(NULL, strlen(servername), servername, strlen(username), - username, NULL, NULL, &keychain_item); - if (status != noErr) - ERR("SecKeychainFindGenericPassword returned %d\n", status); + CloseHandle( mgr ); + return ERROR_OUTOFMEMORY; } - heap_free(username); - heap_free(servername); - if (status != noErr) + ptr = (WCHAR *)(cred + 1); + + cred->targetname_offset = sizeof(*cred); + cred->targetname_size = (strlenW( credential->TargetName ) + 1) * sizeof(WCHAR); + strcpyW( ptr, credential->TargetName ); + ptr += cred->targetname_size / sizeof(WCHAR); + + cred->username_offset = cred->targetname_offset + cred->targetname_size; + cred->username_size = (strlenW( credential->UserName ) + 1) * sizeof(WCHAR); + strcpyW( ptr, credential->UserName ); + ptr += cred->username_size / sizeof(WCHAR); + + cred->blob_offset = cred->username_offset + cred->username_size; + if (credential->CredentialBlob) { - heap_free(password); - return ERROR_GEN_FAILURE; + cred->blob_size = credential->CredentialBlobSize; + memcpy( ptr, credential->CredentialBlob, credential->CredentialBlobSize ); + ptr += cred->blob_size / sizeof(WCHAR); } + else cred->blob_size = 0; + cred->blob_preserve = preserve_blob; + + cred->comment_offset = cred->blob_offset + cred->blob_size; if (credential->Comment) { - attr_list.count = 1; - attr_list.attr = attrs; - attrs[0].tag = kSecCommentItemAttr; - attrs[0].length = WideCharToMultiByte(CP_UTF8, 0, credential->Comment, -1, NULL, 0, NULL, NULL); - if (attrs[0].length) attrs[0].length--; - attrs[0].data = heap_alloc(attrs[0].length); - WideCharToMultiByte(CP_UTF8, 0, credential->Comment, -1, attrs[0].data, attrs[0].length, NULL, NULL); - } - else - { - attr_list.count = 0; - attr_list.attr = NULL; + cred->comment_size = (strlenW( credential->Comment ) + 1) * sizeof(WCHAR); + strcpyW( ptr, credential->Comment ); } - status = SecKeychainItemModifyAttributesAndData(keychain_item, &attr_list, - preserve_blob ? 0 : strlen(password), - preserve_blob ? NULL : password); - if (credential->Comment) - heap_free(attrs[0].data); - heap_free(password); - /* FIXME: set TargetAlias attribute */ - CFRelease(keychain_item); - if (status != noErr) - return ERROR_GEN_FAILURE; - return ERROR_SUCCESS; + else cred->comment_size = 0; + + ret = DeviceIoControl( mgr, IOCTL_MOUNTMGR_WRITE_CREDENTIAL, cred, size, NULL, 0, NULL, NULL ); + heap_free( cred ); + CloseHandle( mgr ); + + return ret ? ERROR_SUCCESS : GetLastError(); } -#endif static DWORD open_cred_mgr_key(HKEY *hkey, BOOL open_for_write) { @@ -1823,20 +1811,18 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags) } } -#ifdef __APPLE__ if (!Credential->AttributeCount && Credential->Type == CRED_TYPE_DOMAIN_PASSWORD && (Credential->Persist == CRED_PERSIST_LOCAL_MACHINE || Credential->Persist == CRED_PERSIST_ENTERPRISE)) { - ret = mac_write_credential(Credential, Flags & CRED_PRESERVE_CREDENTIAL_BLOB); - if (ret != ERROR_SUCCESS) + ret = host_write_credential(Credential, Flags & CRED_PRESERVE_CREDENTIAL_BLOB); + if (ret != ERROR_SUCCESS && ret != ERROR_NOT_SUPPORTED) { SetLastError(ret); return FALSE; } - return TRUE; + if (ret == ERROR_SUCCESS) return TRUE; } -#endif ret = open_cred_mgr_key(&hkeyMgr, FALSE); if (ret != ERROR_SUCCESS) -- 2.20.1

1 0