March 2020 - Wine-Commits - list.winehq.org

Paul Gofman : ucrtbase: Add test for _strnicmp() count parameter.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: d912460ae046c48d6b5f65f03df84df9ae4d5a56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d912460ae046c48d6b5f65f0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 25 21:15:24 2020 +0300 ucrtbase: Add test for _strnicmp() count parameter. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/string.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index dde139755c..74f0f56be0 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -430,6 +430,29 @@ static void test_wcstok(void) ok(!token, "expected NULL, got %p\n", token); } +static void test__strnicmp(void) +{ + static const char str1[] = "TEST"; + static const char str2[] = "test"; + int ret; + + ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + ret = _strnicmp(str1, str2, -1); + todo_wine CHECK_CALLED(invalid_parameter_handler); + todo_wine ok(ret == _NLSCMPERROR, "got %d.\n", ret); + todo_wine ok(errno == EINVAL, "Unexpected errno %d.\n", errno); + + ret = _strnicmp(str1, str2, 0x7fffffff); + ok(!ret, "got %d.\n", ret); + + ok(_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); +} + START_TEST(string) { test_strtod(); @@ -439,4 +462,5 @@ START_TEST(string) test_C_locale(); test_mbsspn(); test_wcstok(); + test__strnicmp(); }

1 0

Jacek Caban : dbghelp: Use loader_ops for load_debug_info.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: a676c5785ea56fede37370cd6d5e4508e9d8c62a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a676c5785ea56fede37370cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 17:41:16 2020 +0100 dbghelp: Use loader_ops for load_debug_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 3 +-- dlls/dbghelp/elf_module.c | 10 +++------- dlls/dbghelp/macho_module.c | 7 ++----- dlls/dbghelp/module.c | 21 +++++++++------------ 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 9751cfbb6c..f67a2c22a8 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -393,6 +393,7 @@ struct loader_ops { BOOL (*synchronize_module_list)(struct process* process); struct module* (*load_module)(struct process* process, const WCHAR* name, ULONG_PTR addr); + BOOL (*load_debug_info)(struct process *process, struct module* module); BOOL (*enum_modules)(struct process* process, enum_modules_cb callback, void* user); BOOL (*fetch_file_info)(struct process* process, const WCHAR* name, ULONG_PTR load_addr, DWORD_PTR* base, DWORD* size, DWORD* checksum); }; @@ -603,13 +604,11 @@ extern struct cpu* cpu_find(DWORD) DECLSPEC_HIDDEN; extern DWORD calc_crc32(HANDLE handle) DECLSPEC_HIDDEN; /* elf_module.c */ -extern BOOL elf_load_debug_info(struct module* module) DECLSPEC_HIDDEN; extern BOOL elf_read_wine_loader_dbg_info(struct process* pcs) DECLSPEC_HIDDEN; struct elf_thunk_area; extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_thunk_area* thunks) DECLSPEC_HIDDEN; /* macho_module.c */ -extern BOOL macho_load_debug_info(struct process *pcs, struct module* module) DECLSPEC_HIDDEN; extern BOOL macho_read_wine_loader_dbg_info(struct process* pcs) DECLSPEC_HIDDEN; /* minidump.c */ diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 038a552e42..20c68dc1ab 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1041,7 +1041,7 @@ static BOOL elf_load_debug_info_from_map(struct module* module, * * Loads ELF debugging information from the module image file. */ -BOOL elf_load_debug_info(struct module* module) +static BOOL elf_load_debug_info(struct process* process, struct module* module) { BOOL ret = TRUE; struct pool pool; @@ -1198,7 +1198,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, elf_info->module->module.SymType = SymDeferred; ret = TRUE; } - else ret = elf_load_debug_info(elf_info->module); + else ret = elf_load_debug_info(pcs, elf_info->module); elf_module_info->elf_mark = 1; elf_module_info->elf_loader = 0; @@ -1707,6 +1707,7 @@ static const struct loader_ops elf_loader_ops = { elf_synchronize_module_list, elf_load_module, + elf_load_debug_info, elf_enum_modules, elf_fetch_file_info, }; @@ -1741,11 +1742,6 @@ BOOL elf_read_wine_loader_dbg_info(struct process* pcs) return FALSE; } -BOOL elf_load_debug_info(struct module* module) -{ - return FALSE; -} - int elf_is_in_thunk_area(unsigned long addr, const struct elf_thunk_area* thunks) { diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index c55443905b..8e2fa796e0 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1281,7 +1281,7 @@ static BOOL image_uses_split_segs(struct process* process, unsigned long load_ad * * Loads Mach-O debugging information from the module image file. */ -BOOL macho_load_debug_info(struct process *pcs, struct module* module) +static BOOL macho_load_debug_info(struct process *pcs, struct module* module) { BOOL ret = FALSE; struct macho_debug_info mdi; @@ -1907,6 +1907,7 @@ static const struct loader_ops macho_loader_ops = { macho_synchronize_module_list, macho_load_module, + macho_load_debug_info, macho_enum_modules, macho_fetch_file_info, }; @@ -1937,8 +1938,4 @@ BOOL macho_read_wine_loader_dbg_info(struct process* pcs) return FALSE; } -BOOL macho_load_debug_info(struct process *pcs, struct module* module) -{ - return FALSE; -} #endif /* HAVE_MACH_O_LOADER_H */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index feba96d53e..536a230f4d 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -374,12 +374,8 @@ BOOL module_get_debug(struct module_pair* pair) BOOL ret; if (pair->effective->is_virtual) ret = FALSE; - else switch (pair->effective->type) + else if (pair->effective->type == DMT_PE) { - case DMT_ELF: - ret = elf_load_debug_info(pair->effective); - break; - case DMT_PE: idslW64.SizeOfStruct = sizeof(idslW64); idslW64.BaseOfImage = pair->effective->module.BaseOfImage; idslW64.CheckSum = pair->effective->module.CheckSum; @@ -394,14 +390,9 @@ BOOL module_get_debug(struct module_pair* pair) pcs_callback(pair->pcs, ret ? CBA_DEFERRED_SYMBOL_LOAD_COMPLETE : CBA_DEFERRED_SYMBOL_LOAD_FAILURE, &idslW64); - break; - case DMT_MACHO: - ret = macho_load_debug_info(pair->pcs, pair->effective); - break; - default: - ret = FALSE; - break; } + else ret = pair->pcs->loader->load_debug_info(pair->pcs, pair->effective); + if (!ret) pair->effective->module.SymType = SymNone; assert(pair->effective->module.SymType != SymDeferred); pair->effective->module.NumSyms = pair->effective->ht_symbols.num_elts; @@ -1425,6 +1416,11 @@ static struct module* native_load_module(struct process* pcs, const WCHAR* name, return NULL; } +static BOOL native_load_debug_info(struct process* process, struct module* module) +{ + return FALSE; +} + static BOOL native_enum_modules(struct process *process, enum_modules_cb cb, void* user) { return FALSE; @@ -1440,6 +1436,7 @@ const struct loader_ops no_loader_ops = { native_synchronize_module_list, native_load_module, + native_load_debug_info, native_enum_modules, native_fetch_file_info, };

1 0

Zhiyi Zhang : wined3d: Remove device_name and device_name_size from struct wined3d_adapter_identifier.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: b07e8b3edbaab4b2818926abb65702450b1447ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=b07e8b3edbaab4b2818926ab… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 25 17:51:09 2020 +0800 wined3d: Remove device_name and device_name_size from struct wined3d_adapter_identifier. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 2 -- dlls/d3d9/directx.c | 15 ++++++++++++--- dlls/ddraw/ddraw.c | 1 - dlls/ddraw/main.c | 12 ++++++------ dlls/dxgi/adapter.c | 3 --- dlls/wined3d/directx.c | 15 --------------- include/wine/wined3d.h | 2 -- 7 files changed, 18 insertions(+), 32 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 509a76239d..874f9ea047 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -120,8 +120,6 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.driver_size = sizeof(identifier->Driver); adapter_id.description = identifier->Description; adapter_id.description_size = sizeof(identifier->Description); - adapter_id.device_name = NULL; /* d3d9 only */ - adapter_id.device_name_size = 0; /* d3d9 only */ wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 070387dde3..6c67be31b4 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -121,6 +121,7 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); struct wined3d_adapter_identifier adapter_id; struct wined3d_adapter *wined3d_adapter; + struct wined3d_output_desc output_desc; unsigned int output_idx; HRESULT hr; @@ -131,12 +132,20 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte if (output_idx >= d3d9->wined3d_output_count) return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_output_get_desc(d3d9->wined3d_outputs[output_idx], &output_desc))) + { + wined3d_mutex_unlock(); + WARN("Failed to get output description, hr %#x.\n", hr); + return hr; + } + WideCharToMultiByte(CP_ACP, 0, output_desc.device_name, -1, identifier->DeviceName, + sizeof(identifier->DeviceName), NULL, NULL); + adapter_id.driver = identifier->Driver; adapter_id.driver_size = sizeof(identifier->Driver); adapter_id.description = identifier->Description; adapter_id.description_size = sizeof(identifier->Description); - adapter_id.device_name = identifier->DeviceName; - adapter_id.device_name_size = sizeof(identifier->DeviceName); wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) @@ -149,6 +158,7 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); identifier->WHQLLevel = adapter_id.whql_level; } + wined3d_mutex_unlock(); return hr; } @@ -636,7 +646,6 @@ static HRESULT WINAPI d3d9_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUI adapter_id.driver_size = 0; adapter_id.description_size = 0; - adapter_id.device_name_size = 0; wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, 0, &adapter_id))) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 050f625f71..db7fc2c948 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2607,7 +2607,6 @@ static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface, adapter_id.driver_size = sizeof(DDDI->szDriver); adapter_id.description = DDDI->szDescription; adapter_id.description_size = sizeof(DDDI->szDescription); - adapter_id.device_name_size = 0; wined3d_mutex_lock(); hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, 0x0, &adapter_id); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index b9fe6b1e4b..4b00c016ed 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -68,15 +68,13 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC while (cont_enum && (wined3d_adapter = wined3d_get_adapter(wined3d, adapter_idx))) { - char DriverName[512] = "", DriverDescription[512] = ""; + char device_name[512] = "", description[512] = ""; /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the * Driver Name, so obtain the DeviceName and GUID from D3D. */ memset(&adapter_id, 0x0, sizeof(adapter_id)); - adapter_id.device_name = DriverName; - adapter_id.device_name_size = sizeof(DriverName); - adapter_id.description = DriverDescription; - adapter_id.description_size = sizeof(DriverDescription); + adapter_id.description = description; + adapter_id.description_size = sizeof(description); wined3d_mutex_lock(); if (FAILED(hr = wined3d_adapter_get_identifier(wined3d_adapter, 0x0, &adapter_id))) @@ -101,8 +99,10 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC TRACE("Interface %u: %s\n", interface_count++, wine_dbgstr_guid(&adapter_id.device_identifier)); + WideCharToMultiByte(CP_ACP, 0, output_desc.device_name, -1, device_name, + sizeof(device_name), NULL, NULL); cont_enum = callback(&adapter_id.device_identifier, adapter_id.description, - adapter_id.device_name, context, output_desc.monitor); + device_name, context, output_desc.monitor); } if (FAILED(hr)) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d48d4755d0..ad4e4b1305 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -161,7 +161,6 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_ adapter_id.driver_size = 0; adapter_id.description = description; adapter_id.description_size = sizeof(description); - adapter_id.device_name_size = 0; if (FAILED(hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id))) return hr; @@ -226,7 +225,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda adapter_id.driver_size = 0; adapter_id.description_size = 0; - adapter_id.device_name_size = 0; wined3d_mutex_lock(); hr = wined3d_get_device_caps(adapter->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, &caps); @@ -312,7 +310,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdap adapter_id.driver_size = 0; adapter_id.description_size = 0; - adapter_id.device_name_size = 0; if (FAILED(hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id))) return hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a50f594854..3dc3043bce 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1357,17 +1357,6 @@ HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapt wined3d_copy_name(identifier->driver, adapter->driver_info.name, identifier->driver_size); wined3d_copy_name(identifier->description, adapter->driver_info.description, identifier->description_size); - /* Note that d3d8 doesn't supply a device name. */ - if (identifier->device_name_size) - { - if (!WideCharToMultiByte(CP_ACP, 0, adapter->device_name, -1, identifier->device_name, - identifier->device_name_size, NULL, NULL)) - { - ERR("Failed to convert device name, last error %#x.\n", GetLastError()); - goto fail; - } - } - identifier->driver_version.u.HighPart = adapter->driver_info.version_high; identifier->driver_version.u.LowPart = adapter->driver_info.version_low; identifier->vendor_id = adapter->driver_info.vendor; @@ -1385,10 +1374,6 @@ HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapt wined3d_mutex_unlock(); return WINED3D_OK; - -fail: - wined3d_mutex_unlock(); - return WINED3DERR_INVALIDCALL; } HRESULT CDECL wined3d_output_get_raster_status(const struct wined3d_output *output, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 30b6f9a7e8..0b3b41896e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1742,8 +1742,6 @@ struct wined3d_adapter_identifier unsigned int driver_size; char *description; unsigned int description_size; - char *device_name; - unsigned int device_name_size; LARGE_INTEGER driver_version; DWORD vendor_id; DWORD device_id;

1 0

Jacek Caban : dbghelp: Use PE type for virtual modules.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 635506921a28c65bfc9b339d59c63d96092d97d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=635506921a28c65bfc9b339d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 17:41:38 2020 +0100 dbghelp: Use PE type for virtual modules. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 59 +-------------------------------------------------- 1 file changed, 1 insertion(+), 58 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 536a230f4d..ce671220dd 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -37,9 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'}; const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'}; static const WCHAR S_DotSoW[] = {'.','s','o','\0'}; -static const WCHAR S_DotDylibW[] = {'.','d','y','l','i','b','\0'}; -static const WCHAR S_DotPdbW[] = {'.','p','d','b','\0'}; -static const WCHAR S_DotDbgW[] = {'.','d','b','g','\0'}; const WCHAR S_SlashW[] = {'/','\0'}; static const WCHAR S_AcmW[] = {'.','a','c','m','\0'}; @@ -467,59 +464,6 @@ static BOOL module_is_container_loaded(const struct process* pcs, return FALSE; } -/****************************************************************** - * module_get_type_by_name - * - * Guesses a filename type from its extension - */ -enum module_type module_get_type_by_name(const WCHAR* name) -{ - int len = strlenW(name); - - /* Skip all version extensions (.[digits]) regex: "(\.\d+)*$" */ - do - { - int i = len; - - while (i && name[i - 1] >= '0' && name[i - 1] <= '9') i--; - - if (i && name[i - 1] == '.') - len = i - 1; - else - break; - } while (len); - - /* check for terminating .so or .so.[digit] */ - /* FIXME: Can't rely solely on extension; have to check magic or - * stop using .so on Mac OS X. For now, base on platform. */ - if (len > 3 && !memcmp(name + len - 3, S_DotSoW, 3)) -#ifdef __APPLE__ - return DMT_MACHO; -#else - return DMT_ELF; -#endif - - if (len > 6 && !strncmpiW(name + len - 6, S_DotDylibW, 6)) - return DMT_MACHO; - - if (len > 4 && !strncmpiW(name + len - 4, S_DotPdbW, 4)) - return DMT_PDB; - - if (len > 4 && !strncmpiW(name + len - 4, S_DotDbgW, 4)) - return DMT_DBG; - - /* wine is also a native module (Mach-O on Mac OS X, ELF elsewhere) */ - if (is_wine_loader(name)) - { -#ifdef __APPLE__ - return DMT_MACHO; -#else - return DMT_ELF; -#endif - } - return DMT_PE; -} - static BOOL image_check_debug_link(const WCHAR* file, struct image_file_map* fmap, DWORD link_crc) { DWORD read_bytes; @@ -846,8 +790,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & SLMFLAG_VIRTUAL) { if (!wImageName) return FALSE; - module = module_new(pcs, wImageName, module_get_type_by_name(wImageName), - TRUE, BaseOfDll, SizeOfDll, 0, 0); + module = module_new(pcs, wImageName, DMT_PE, TRUE, BaseOfDll, SizeOfDll, 0, 0); if (!module) return FALSE; if (wModuleName) module_set_module(module, wModuleName); module->module.SymType = SymVirtual;

1 0

Dmitry Timoshkov : adsldp: Implement IDirectorySearch::CloseSearchHandle().
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 17be7f3dad8e782fedbab201289ffe3a515162fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=17be7f3dad8e782fedbab201… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 25 11:18:06 2020 +0800 adsldp: Implement IDirectorySearch::CloseSearchHandle(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 9787102b17..53f766565c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1234,8 +1234,15 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) { - FIXME("%p,%p: stub\n", iface, res); - return E_NOTIMPL; + struct ldap_search_context *ldap_ctx = res; + + TRACE("%p,%p\n", iface, res); + + if (!res) return E_ADS_BAD_PARAMETER; + + ldap_msgfree(ldap_ctx->res); + + return S_OK; } static const IDirectorySearchVtbl IDirectorySearch_vtbl =

1 0

Dmitry Timoshkov : adsldp: Implement IDirectorySearch::ExecuteSearch().
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: a083fdab1095682f116f39e7fdfad64d95a9465e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a083fdab1095682f116f39e7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 25 11:18:00 2020 +0800 adsldp: Implement IDirectorySearch::ExecuteSearch(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 6330ba2d9c..9787102b17 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -396,6 +396,11 @@ typedef struct } search; } LDAP_namespace; +struct ldap_search_context +{ + LDAPMessage *res; +}; + static inline LDAP_namespace *impl_from_IADs(IADs *iface) { return CONTAINING_RECORD(iface, LDAP_namespace, IADs_iface); @@ -1141,8 +1146,47 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filter, LPWSTR *names, DWORD count, PADS_SEARCH_HANDLE res) { - FIXME("%p,%s,%p,%u,%p: stub\n", iface, debugstr_w(filter), names, count, res); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + ULONG err, i; + WCHAR **props; + struct ldap_search_context *ldap_ctx; + + TRACE("%p,%s,%p,%u,%p\n", iface, debugstr_w(filter), names, count, res); + + if (!ldap->ld) return E_NOTIMPL; + + if (!res) return E_ADS_BAD_PARAMETER; + + ldap_ctx = heap_alloc_zero(sizeof(*ldap_ctx)); + if (!ldap_ctx) return E_OUTOFMEMORY; + + if (count == 0xffffffff) + props = NULL; + else + { + if (count && !names) return E_ADS_BAD_PARAMETER; + + props = heap_alloc((count + 1) * sizeof(props[0])); + if (!props) + return E_OUTOFMEMORY; + + for (i = 0; i < count; i++) + props[i] = names[i]; + + props[count] = NULL; + } + + err = ldap_search_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, FALSE, &ldap_ctx->res); + heap_free(props); + if (err != LDAP_SUCCESS) + { + TRACE("ldap_search_sW error %#x\n", err); + heap_free(ldap_ctx); + return HRESULT_FROM_WIN32(map_ldap_error(err)); + } + + *res = ldap_ctx; + return S_OK; } static HRESULT WINAPI search_AbandonSearch(IDirectorySearch *iface, ADS_SEARCH_HANDLE res)

1 0

Dmitry Timoshkov : adsldp: Add support for ADS_SEARCHPREF_SEARCH_SCOPE to IDirectorySearch::SetSearchPreference().
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 88678882aaf06cae71305cf43351d2982a6598d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88678882aaf06cae71305cf4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 25 11:17:48 2020 +0800 adsldp: Add support for ADS_SEARCHPREF_SEARCH_SCOPE to IDirectorySearch::SetSearchPreference(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- include/iads.idl | 9 ++++++++- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index caf404c3c6..6330ba2d9c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -21,6 +21,7 @@ #include <stdarg.h> #define COBJMACROS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" @@ -389,6 +390,10 @@ typedef struct ULONG port; ULONG attrs_count, attrs_count_allocated; struct ldap_attribute *attrs; + struct + { + ADS_SCOPEENUM scope; + } search; } LDAP_namespace; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -1091,8 +1096,46 @@ static ULONG WINAPI search_Release(IDirectorySearch *iface) static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_SEARCHPREF_INFO prefs, DWORD count) { - FIXME("%p,%p,%u: stub\n", iface, prefs, count); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + DWORD i; + + TRACE("%p,%p,%u\n", iface, prefs, count); + + for (i = 0; i < count; i++) + { + switch (prefs[i].dwSearchPref) + { + case ADS_SEARCHPREF_SEARCH_SCOPE: + if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) + { + FIXME("ADS_SEARCHPREF_SEACH_SCOPE: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + switch (prefs[i].vValue.u.Integer) + { + case ADS_SCOPE_BASE: + case ADS_SCOPE_ONELEVEL: + case ADS_SCOPE_SUBTREE: + ldap->search.scope = prefs[i].vValue.u.Integer; + prefs[i].dwStatus = ADS_STATUS_S_OK; + break; + + default: + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + break; + + default: + FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; + break; + } + } + + return S_OK; } static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filter, LPWSTR *names, @@ -1186,6 +1229,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->attrs_count = 0; ldap->attrs_count_allocated = 0; ldap->attrs = NULL; + ldap->search.scope = ADS_SCOPE_SUBTREE; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); IADs_Release(&ldap->IADs_iface); diff --git a/include/iads.idl b/include/iads.idl index fdee17859d..6bb63afafb 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -139,6 +139,13 @@ typedef enum ADSTYPE_DN_WITH_STRING } ADSTYPEENUM; +typedef enum +{ + ADS_SCOPE_BASE, + ADS_SCOPE_ONELEVEL, + ADS_SCOPE_SUBTREE +} ADS_SCOPEENUM; + typedef enum { ADS_PASSWORD_ENCODE_REQUIRE_SSL, @@ -318,7 +325,7 @@ typedef struct _adsvalue ADS_NT_SECURITY_DESCRIPTOR SecurityDescriptor; PADS_DN_WITH_BINARY pDNWithBinary; PADS_DN_WITH_STRING pDNWithString; - }; + } DUMMYUNIONNAME; } ADSVALUE, *PADSVALUE; typedef struct ads_searchpref_info

1 0

Dmitry Timoshkov : adsldp: Add IDirectorySearch stubs.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 66897b455ca9d3f4bdbf8afcb847f91b2578eca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66897b455ca9d3f4bdbf8afc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 25 11:17:42 2020 +0800 adsldp: Add IDirectorySearch stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/iads.idl | 4 +- 2 files changed, 124 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c49f9ef70b..caf404c3c6 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -381,6 +381,7 @@ typedef struct { IADs IADs_iface; IADsOpenDSObject IADsOpenDSObject_iface; + IDirectorySearch IDirectorySearch_iface; LONG ref; LDAP *ld; BSTR host; @@ -419,6 +420,13 @@ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj return S_OK; } + if (IsEqualGUID(riid, &IID_IDirectorySearch)) + { + IADs_AddRef(iface); + *obj = &ldap->IDirectorySearch_iface; + return S_OK; + } + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1046,6 +1054,120 @@ static const IADsOpenDSObjectVtbl IADsOpenDSObject_vtbl = openobj_OpenDSObject }; +static inline LDAP_namespace *impl_from_IDirectorySearch(IDirectorySearch *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IDirectorySearch_iface); +} + +static HRESULT WINAPI search_QueryInterface(IDirectorySearch *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IDirectorySearch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IDirectorySearch_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI search_AddRef(IDirectorySearch *iface) +{ + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + return IADs_AddRef(&ldap->IADs_iface); +} + +static ULONG WINAPI search_Release(IDirectorySearch *iface) +{ + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + return IADs_Release(&ldap->IADs_iface); +} + +static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_SEARCHPREF_INFO prefs, DWORD count) +{ + FIXME("%p,%p,%u: stub\n", iface, prefs, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filter, LPWSTR *names, + DWORD count, PADS_SEARCH_HANDLE res) +{ + FIXME("%p,%s,%p,%u,%p: stub\n", iface, debugstr_w(filter), names, count, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_AbandonSearch(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetFirstRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetPreviousRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, LPWSTR *names) +{ + FIXME("%p,%p,%p: stub\n", iface, res, names); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, + LPWSTR name, PADS_SEARCH_COLUMN col) +{ + FIXME("%p,%p,%s,%p: stub\n", iface, res, debugstr_w(name), col); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COLUMN col) +{ + FIXME("%p,%p: stub\n", iface, col); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static const IDirectorySearchVtbl IDirectorySearch_vtbl = +{ + search_QueryInterface, + search_AddRef, + search_Release, + search_SetSearchPreference, + search_ExecuteSearch, + search_AbandonSearch, + search_GetFirstRow, + search_GetNextRow, + search_GetPreviousRow, + search_GetNextColumnName, + search_GetColumn, + search_FreeColumn, + search_CloseSearchHandle +}; + static HRESULT LDAPNamespace_create(REFIID riid, void **obj) { LDAP_namespace *ldap; @@ -1056,6 +1178,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->IADs_iface.lpVtbl = &IADs_vtbl; ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; + ldap->IDirectorySearch_iface.lpVtbl = &IDirectorySearch_vtbl; ldap->ref = 1; ldap->ld = NULL; ldap->host = NULL; diff --git a/include/iads.idl b/include/iads.idl index 8553a03d8c..fdee17859d 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -99,8 +99,6 @@ typedef enum ADS_SEARCHPREF_EXTENDED_DN } ADS_SEARCHPREF_ENUM; -typedef ADS_SEARCHPREF_ENUM *PADS_SEARCHPREF_INFO; - typedef enum { ADS_STATUS_S_OK, @@ -328,7 +326,7 @@ typedef struct ads_searchpref_info ADS_SEARCHPREF dwSearchPref; ADSVALUE vValue; ADS_STATUS dwStatus; -} ADS_SEARCHPREF_INFO; +} ADS_SEARCHPREF_INFO, *PADS_SEARCHPREF_INFO; typedef struct ads_search_column {

1 0

Rémi Bernon : kernel32/tests: Add tests for ContinueDebugEvent with DBG_REPLY_LATER.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: a96393fe260a7c67f3ab7a176bc80a4a5ba61d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a96393fe260a7c67f3ab7a17… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 24 16:05:49 2020 +0100 kernel32/tests: Add tests for ContinueDebugEvent with DBG_REPLY_LATER. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 237 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 236 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a96393fe260a7c67f3ab…

1 0

Alexandre Julliard : krnl386: Get rid of DOS DMA support.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 14091b19ae21be2f22fb651b5b10c6edafa0a1de URL: https://source.winehq.org/git/wine.git/?a=commit;h=14091b19ae21be2f22fb651b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 19:23:20 2020 +0100 krnl386: Get rid of DOS DMA support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dma.c | 385 ----------------------------------------- dlls/krnl386.exe16/dosexe.h | 5 - dlls/krnl386.exe16/ioports.c | 84 --------- 4 files changed, 475 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=14091b19ae21be2f22fb…

1 0