May 2019 - Wine-commits - list.winehq.org

Zebediah Figura : setupapi: Add an initial implementation of SetupDiBuildDriverInfoList().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 8369f60c5b0871d8c7e8601eb1c68fb2eb3db027 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8369f60c5b0871d8c7e8601e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 23:55:43 2019 -0500 setupapi: Add an initial implementation of SetupDiBuildDriverInfoList(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 12 ----- 2 files changed, 120 insertions(+), 12 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5a49247..d46aa82 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -103,6 +103,13 @@ static const WCHAR Control[] = {'C','o','n','t','r','o','l',0}; static const WCHAR Linked[] = {'L','i','n','k','e','d',0}; static const WCHAR emptyW[] = {0}; +struct driver +{ + WCHAR inf_path[MAX_PATH]; + WCHAR manufacturer[LINE_LEN]; + WCHAR description[LINE_LEN]; +}; + /* is used to identify if a DeviceInfoSet pointer is valid or not */ #define SETUP_DEVICE_INFO_SET_MAGIC 0xd00ff056 @@ -127,6 +134,9 @@ struct device struct list entry; BOOL removed; SP_DEVINSTALL_PARAMS_W params; + struct driver *drivers; + unsigned int driver_count; + struct driver *selected_driver; }; struct device_iface @@ -4072,3 +4082,113 @@ BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO dev, PSP_DEVINFO_DATA inf SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/* Check whether the given hardware or compatible ID matches any of the device's + * own hardware or compatible IDs. */ +static BOOL device_matches_id(const struct device *device, const WCHAR *id_type, const WCHAR *id) +{ + WCHAR *device_ids; + const WCHAR *p; + DWORD size; + + if (!RegGetValueW(device->key, NULL, id_type, RRF_RT_REG_MULTI_SZ, NULL, NULL, &size)) + { + device_ids = heap_alloc(size); + if (!RegGetValueW(device->key, NULL, id_type, RRF_RT_REG_MULTI_SZ, NULL, device_ids, &size)) + { + for (p = device_ids; *p; p += strlenW(p) + 1) + { + if (!strcmpiW(p, id)) + { + heap_free(device_ids); + return TRUE; + } + } + } + heap_free(device_ids); + } + + return FALSE; +} + +static void enum_compat_drivers_from_file(struct device *device, const WCHAR *path) +{ + static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; + WCHAR mfg_name[LINE_LEN], mfg_key[LINE_LEN], mfg_key_ext[LINE_LEN], id[MAX_DEVICE_ID_LEN]; + INFCONTEXT ctx; + DWORD i, j, k; + HINF hinf; + + TRACE("Enumerating drivers from %s.\n", debugstr_w(path)); + + if ((hinf = SetupOpenInfFileW(path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return; + + for (i = 0; SetupGetLineByIndexW(hinf, manufacturerW, i, &ctx); ++i) + { + SetupGetStringFieldW(&ctx, 0, mfg_name, ARRAY_SIZE(mfg_name), NULL); + if (!SetupGetStringFieldW(&ctx, 1, mfg_key, ARRAY_SIZE(mfg_key), NULL)) + strcpyW(mfg_key, mfg_name); + + if (!SetupDiGetActualSectionToInstallW(hinf, mfg_key, mfg_key_ext, ARRAY_SIZE(mfg_key_ext), NULL, NULL)) + { + WARN("Failed to find section for %s, skipping.\n", debugstr_w(mfg_key)); + continue; + } + + for (j = 0; SetupGetLineByIndexW(hinf, mfg_key_ext, j, &ctx); ++j) + { + for (k = 2; SetupGetStringFieldW(&ctx, k, id, ARRAY_SIZE(id), NULL); ++k) + { + if (device_matches_id(device, HardwareId, id) || device_matches_id(device, CompatibleIDs, id)) + { + unsigned int count = ++device->driver_count; + + device->drivers = heap_realloc(device->drivers, count * sizeof(*device->drivers)); + strcpyW(device->drivers[count - 1].inf_path, path); + strcpyW(device->drivers[count - 1].manufacturer, mfg_name); + SetupGetStringFieldW(&ctx, 0, device->drivers[count - 1].description, + ARRAY_SIZE(device->drivers[count - 1].description), NULL); + + TRACE("Found compatible driver: manufacturer %s, desc %s.\n", + debugstr_w(mfg_name), debugstr_w(device->drivers[count - 1].description)); + } + } + } + } + + SetupCloseInfFile(hinf); +} + +/*********************************************************************** + * SetupDiBuildDriverInfoList (SETUPAPI.@) + */ +BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD type) +{ + struct device *device; + + TRACE("devinfo %p, device_data %p, type %#x.\n", devinfo, device_data, type); + + if (type != SPDIT_COMPATDRIVER) + { + FIXME("Unhandled type %#x.\n", type); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (device->params.Flags & DI_ENUMSINGLEINF) + { + enum_compat_drivers_from_file(device, device->params.DriverPath); + } + else + { + FIXME("Searching in a directory is not yet implemented.\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + return TRUE; +} diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index ede878f..1be10ce 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -576,18 +576,6 @@ BOOL WINAPI SetupLogFileA( } /*********************************************************************** - * SetupDiBuildDriverInfoList (SETUPAPI.@) - */ - -BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType) - { - FIXME(": stub %p, %p, %d\n", DeviceInfoSet, DeviceInfoData, DriverType); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - -/*********************************************************************** * SetupDiDestroyDriverInfoList (SETUPAPI.@) */

1 0

Zebediah Figura : setupapi: Check for compatible platforms in SetupDiBuildDriverInfoList().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: d22e7d6a4e56f2e1331f3a327e38275924a32990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d22e7d6a4e56f2e1331f3a32… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 23:55:44 2019 -0500 setupapi: Check for compatible platforms in SetupDiBuildDriverInfoList(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index d46aa82..c979f51 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4111,10 +4111,37 @@ static BOOL device_matches_id(const struct device *device, const WCHAR *id_type, return FALSE; } +static BOOL version_is_compatible(const WCHAR *version) +{ + const WCHAR *machine_ext = NtPlatformExtension + 1, *p; + size_t len = strlenW(version); + BOOL wow64; + + /* We are only concerned with architecture. */ + if ((p = strchrW(version, '.'))) + len = p - version; + + if (!strncmpiW(version, NtExtension + 1, len)) + return TRUE; + + if (IsWow64Process(GetCurrentProcess(), &wow64) && wow64) + { +#ifdef __i386__ + static const WCHAR wow_ext[] = {'N','T','a','m','d','6','4',0}; + machine_ext = wow_ext; +#elif defined(__arm__) + static const WCHAR wow_ext[] = {'N','T','a','r','m','6','4',0}; + machine_ext = wow_ext; +#endif + } + + return !strncmpiW(version, machine_ext, len); +} + static void enum_compat_drivers_from_file(struct device *device, const WCHAR *path) { static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; - WCHAR mfg_name[LINE_LEN], mfg_key[LINE_LEN], mfg_key_ext[LINE_LEN], id[MAX_DEVICE_ID_LEN]; + WCHAR mfg_name[LINE_LEN], mfg_key[LINE_LEN], mfg_key_ext[LINE_LEN], id[MAX_DEVICE_ID_LEN], version[MAX_DEVICE_ID_LEN]; INFCONTEXT ctx; DWORD i, j, k; HINF hinf; @@ -4130,6 +4157,21 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa if (!SetupGetStringFieldW(&ctx, 1, mfg_key, ARRAY_SIZE(mfg_key), NULL)) strcpyW(mfg_key, mfg_name); + if (SetupGetFieldCount(&ctx) >= 2) + { + BOOL compatible = FALSE; + for (j = 2; SetupGetStringFieldW(&ctx, j, version, ARRAY_SIZE(version), NULL); ++j) + { + if (version_is_compatible(version)) + { + compatible = TRUE; + break; + } + } + if (!compatible) + continue; + } + if (!SetupDiGetActualSectionToInstallW(hinf, mfg_key, mfg_key_ext, ARRAY_SIZE(mfg_key_ext), NULL, NULL)) { WARN("Failed to find section for %s, skipping.\n", debugstr_w(mfg_key));

1 0

Zebediah Figura : setupapi: Implement directory search in SetupDiBuildDriverInfoList().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: ec02dde9d226d9351355b1cca9437f13847bfb38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec02dde9d226d9351355b1cc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 23:55:45 2019 -0500 setupapi: Implement directory search in SetupDiBuildDriverInfoList(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index c979f51..5ab8b0a 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -101,6 +101,7 @@ static const WCHAR Phantom[] = {'P','h','a','n','t','o','m',0}; static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; static const WCHAR Control[] = {'C','o','n','t','r','o','l',0}; static const WCHAR Linked[] = {'L','i','n','k','e','d',0}; +static const WCHAR backslashW[] = {'\\',0}; static const WCHAR emptyW[] = {0}; struct driver @@ -4227,9 +4228,32 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device } else { - FIXME("Searching in a directory is not yet implemented.\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + static const WCHAR default_path[] = {'C',':','/','w','i','n','d','o','w','s','/','i','n','f',0}; + static const WCHAR wildcardW[] = {'*',0}; + WCHAR dir[MAX_PATH], file[MAX_PATH]; + WIN32_FIND_DATAW find_data; + HANDLE find_handle; + + if (device->params.DriverPath[0]) + strcpyW(dir, device->params.DriverPath); + else + strcpyW(dir, default_path); + strcatW(dir, backslashW); + strcatW(dir, wildcardW); + + TRACE("Searching for drivers in %s.\n", debugstr_w(dir)); + + if ((find_handle = FindFirstFileW(dir, &find_data)) != INVALID_HANDLE_VALUE) + { + do + { + strcpyW(file, dir); + strcpyW(file + strlenW(file) - 1, find_data.cFileName); + enum_compat_drivers_from_file(device, file); + } while (FindNextFileW(find_handle, &find_data)); + + FindClose(find_handle); + } } return TRUE;

1 0

Zebediah Figura : setupapi: Implement SetupDiEnumDriverInfo().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 23be8593e95f36052ce4aa7407fd34854a024110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23be8593e95f36052ce4aa74… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 23:55:46 2019 -0500 setupapi: Implement SetupDiEnumDriverInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 22 ---------------- 2 files changed, 67 insertions(+), 22 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5ab8b0a..2152ffd 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4258,3 +4258,70 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } + +/*********************************************************************** + * SetupDiEnumDriverInfoW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + DWORD type, DWORD index, SP_DRVINFO_DATA_W *driver_data) +{ + static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; + struct device *device; + INFCONTEXT ctx; + HINF hinf; + + TRACE("devinfo %p, device_data %p, type %#x, index %u, driver_data %p.\n", + devinfo, device_data, type, index, driver_data); + + if (type != SPDIT_COMPATDRIVER) + { + FIXME("Unhandled type %#x.\n", type); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (index >= device->driver_count) + { + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; + } + + if ((hinf = SetupOpenInfFileW(device->drivers[index].inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + driver_data->ProviderName[0] = 0; + if (SetupFindFirstLineW(hinf, Version, providerW, &ctx)) + SetupGetStringFieldW(&ctx, 1, driver_data->ProviderName, ARRAY_SIZE(driver_data->ProviderName), NULL); + strcpyW(driver_data->Description, device->drivers[index].description); + strcpyW(driver_data->MfgName, device->drivers[index].manufacturer); + driver_data->DriverType = SPDIT_COMPATDRIVER; + + SetupCloseInfFile(hinf); + + return TRUE; +} + +/*********************************************************************** + * SetupDiEnumDriverInfoA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + DWORD type, DWORD index, SP_DRVINFO_DATA_A *driver_data) +{ + SP_DRVINFO_DATA_W driver_dataW; + BOOL ret; + + driver_dataW.cbSize = sizeof(driver_dataW); + ret = SetupDiEnumDriverInfoW(devinfo, device_data, type, index, &driver_dataW); + driver_data->DriverType = driver_dataW.DriverType; + driver_data->Reserved = driver_dataW.Reserved; + WideCharToMultiByte(CP_ACP, 0, driver_dataW.Description, -1, driver_data->Description, + sizeof(driver_data->Description), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, driver_dataW.MfgName, -1, driver_data->MfgName, + sizeof(driver_data->MfgName), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, driver_dataW.ProviderName, -1, driver_data->ProviderName, + sizeof(driver_data->ProviderName), NULL, NULL); + return ret; +} diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 1be10ce..c2ac2a4 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -642,28 +642,6 @@ BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO SetupDiSetSelectedDevice, PSP_DEVI } /*********************************************************************** - * SetupDiEnumDriverInfoA (SETUPAPI.@) - */ -BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType, DWORD MemberIndex, PSP_DRVINFO_DATA_A DriverInfoData) -{ - FIXME("(%p, %p, 0x%x, %u, %p stub\n", DeviceInfoSet, DeviceInfoData, DriverType, MemberIndex, DriverInfoData); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/*********************************************************************** - * SetupDiEnumDriverInfoW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType, DWORD MemberIndex, PSP_DRVINFO_DATA_W DriverInfoData) -{ - FIXME("(%p, %p, 0x%x, %u, %p stub\n", DeviceInfoSet, DeviceInfoData, DriverType, MemberIndex, DriverInfoData); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/*********************************************************************** * CM_Request_Device_EjectA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags)

1 0

Zebediah Figura : setupapi/tests: Add tests for building and enumerating driver lists.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 57c3ebec7c803857f39a6cb1033f8a67e3949190 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c3ebec7c803857f39a6cb1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 23:55:47 2019 -0500 setupapi/tests: Add tests for building and enumerating driver lists. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 234 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57c3ebec7c803857f39a…

1 0

Zebediah Figura : setupapi: Add a semi-stub implementation of SetupDiSelectBestCompatDrv().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 9fa4a2af1cb1b17c78f46e7d571620bc310faf4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa4a2af1cb1b17c78f46e7d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 23:55:49 2019 -0500 setupapi: Add a semi-stub implementation of SetupDiSelectBestCompatDrv(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 26 ++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 11 ----------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2152ffd..9b83c35 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4325,3 +4325,29 @@ BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat sizeof(driver_data->ProviderName), NULL, NULL); return ret; } + +/*********************************************************************** + * SetupDiSelectBestCompatDrv (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) +{ + struct device *device; + + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!device->driver_count) + { + ERR("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); + SetLastError(ERROR_NO_COMPAT_DRIVERS); + return FALSE; + } + + WARN("Semi-stub, selecting the first available driver.\n"); + + device->selected_driver = &device->drivers[0]; + + return TRUE; +} diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index c2ac2a4..e6d1f1a 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -621,17 +621,6 @@ BOOL WINAPI SetupDiLoadClassIcon(const GUID *ClassGuid, HICON *LargeIcon, PINT M } /*********************************************************************** - * SetupDiSelectBestCompatDrv (SETUPAPI.@) - */ -BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData) -{ - FIXME(": stub %p, %p\n", DeviceInfoSet, DeviceInfoData); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/*********************************************************************** * SetupDiSetSelectedDevice (SETUPAPI.@) */ BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO SetupDiSetSelectedDevice, PSP_DEVINFO_DATA DeviceInfoData)

1 0

Zebediah Figura : widl: Fix proxy vtbl generation in -Oi mode.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: ead21a1bdd15a27ef08c8feb5d5adbbedd688cee URL: https://source.winehq.org/git/wine.git/?a=commit;h=ead21a1bdd15a27ef08c8feb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 23:30:52 2019 -0500 widl: Fix proxy vtbl generation in -Oi mode. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/proxy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 8d0e8b2..ef52e35 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -526,6 +526,7 @@ static int write_proxy_methods(type_t *iface, int skip) if (skip || (is_local(func->attrs) && !get_callas_source(iface, func))) print_proxy( "0, /* %s::%s */\n", iface->name, get_name(func)); else if (is_interpreted_func( iface, func ) && + get_stub_mode() == MODE_Oif && !is_local( func->attrs ) && type_iface_get_inherit(iface)) print_proxy( "(void *)-1, /* %s::%s */\n", iface->name, get_name(func));

1 0

Zebediah Figura : rpcrt4: Fail with CO_E_OBJNOTCONNECTED when trying to call methods on a disconnected proxy.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 8f690d5125c6e8df63b3a9b6993d22718510b81f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f690d5125c6e8df63b3a9b6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 23:30:53 2019 -0500 rpcrt4: Fail with CO_E_OBJNOTCONNECTED when trying to call methods on a disconnected proxy. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 12 +++++++++--- dlls/rpcrt4/cproxy.c | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 33b155d..2aaa34e 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1203,7 +1203,9 @@ static void test_marshal_proxy_apartment_shutdown(void) { HRESULT hr; IStream *pStream = NULL; - IUnknown *pProxy = NULL; + IClassFactory *proxy; + IUnknown *unk; + ULONG ref; DWORD tid; HANDLE thread; @@ -1218,7 +1220,7 @@ static void test_marshal_proxy_apartment_shutdown(void) ok_non_zero_external_conn(); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&pProxy); + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&proxy); ok_ole_success(hr, CoUnmarshalInterface); IStream_Release(pStream); @@ -1231,7 +1233,11 @@ static void test_marshal_proxy_apartment_shutdown(void) ok_zero_external_conn(); ok_last_release_closes(TRUE); - IUnknown_Release(pProxy); + hr = IClassFactory_CreateInstance(proxy, NULL, &IID_IUnknown, (void **)&unk); + ok(hr == CO_E_OBJNOTCONNECTED, "got %#x\n", hr); + + ref = IClassFactory_Release(proxy); + ok(!ref, "got %d refs\n", ref); ok_no_locks(); diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index ddbd58c..a56a04b 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -458,6 +458,8 @@ void WINAPI NdrProxyInitialize(void *This, TRACE("(%p,%p,%p,%p,%d)\n", This, pRpcMsg, pStubMsg, pStubDescriptor, ProcNum); NdrClientInitializeNew(pRpcMsg, pStubMsg, pStubDescriptor, ProcNum); StdProxy_GetChannel(This, &pStubMsg->pRpcChannelBuffer); + if (!pStubMsg->pRpcChannelBuffer) + RpcRaiseException(CO_E_OBJNOTCONNECTED); IRpcChannelBuffer_GetDestCtx(pStubMsg->pRpcChannelBuffer, &pStubMsg->dwDestContext, &pStubMsg->pvDestContext);

1 0

Zebediah Figura : rpcrt4: Factor out get_handle_desc_size().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 40b6adf8f08927d1ce77d87efc00e62a967ef961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40b6adf8f08927d1ce77d87e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 23:30:54 2019 -0500 rpcrt4: Factor out get_handle_desc_size(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 51 +++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index c912d93..816af4b 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -273,9 +273,22 @@ static const char *debugstr_INTERPRETER_OPT_FLAGS(INTERPRETER_OPT_FLAGS Oi2Flags #define ARG_FROM_OFFSET(args, offset) ((args) + (offset)) -static PFORMAT_STRING client_get_handle( - PMIDL_STUB_MESSAGE pStubMsg, const NDR_PROC_HEADER *pProcHeader, - PFORMAT_STRING pFormat, handle_t *phBinding) +static size_t get_handle_desc_size(const NDR_PROC_HEADER *proc_header, PFORMAT_STRING format) +{ + if (!proc_header->handle_type) + { + if (*format == FC_BIND_PRIMITIVE) + return sizeof(NDR_EHD_PRIMITIVE); + else if (*format == FC_BIND_GENERIC) + return sizeof(NDR_EHD_GENERIC); + else if (*format == FC_BIND_CONTEXT) + return sizeof(NDR_EHD_CONTEXT); + } + return 0; +} + +static handle_t client_get_handle(const MIDL_STUB_MESSAGE *pStubMsg, + const NDR_PROC_HEADER *pProcHeader, const PFORMAT_STRING pFormat) { /* binding */ switch (pProcHeader->handle_type) @@ -291,10 +304,9 @@ static PFORMAT_STRING client_get_handle( TRACE("Explicit primitive handle @ %d\n", pDesc->offset); if (pDesc->flag) /* pointer to binding */ - *phBinding = **(handle_t **)ARG_FROM_OFFSET(pStubMsg->StackTop, pDesc->offset); + return **(handle_t **)ARG_FROM_OFFSET(pStubMsg->StackTop, pDesc->offset); else - *phBinding = *(handle_t *)ARG_FROM_OFFSET(pStubMsg->StackTop, pDesc->offset); - return pFormat + sizeof(NDR_EHD_PRIMITIVE); + return *(handle_t *)ARG_FROM_OFFSET(pStubMsg->StackTop, pDesc->offset); } case FC_BIND_GENERIC: /* explicit generic */ { @@ -311,8 +323,7 @@ static PFORMAT_STRING client_get_handle( pArg = ARG_FROM_OFFSET(pStubMsg->StackTop, pDesc->offset); memcpy(&pObject, pArg, pDesc->flag_and_size & 0xf); pGenPair = &pStubMsg->StubDesc->aGenericBindingRoutinePairs[pDesc->binding_routine_pair_index]; - *phBinding = pGenPair->pfnBind(pObject); - return pFormat + sizeof(NDR_EHD_GENERIC); + return pGenPair->pfnBind(pObject); } case FC_BIND_CONTEXT: /* explicit context */ { @@ -327,7 +338,7 @@ static PFORMAT_STRING client_get_handle( else context_handle = *(NDR_CCONTEXT *)ARG_FROM_OFFSET(pStubMsg->StackTop, pDesc->offset); - if (context_handle) *phBinding = NDRCContextBinding(context_handle); + if (context_handle) return NDRCContextBinding(context_handle); else if (pDesc->flags & NDR_CONTEXT_HANDLE_CANNOT_BE_NULL) { ERR("null context handle isn't allowed\n"); @@ -335,7 +346,6 @@ static PFORMAT_STRING client_get_handle( return NULL; } /* FIXME: should we store this structure in stubMsg.pContext? */ - return pFormat + sizeof(NDR_EHD_CONTEXT); } default: ERR("bad explicit binding handle type (0x%02x)\n", pProcHeader->handle_type); @@ -348,28 +358,25 @@ static PFORMAT_STRING client_get_handle( break; case FC_BIND_PRIMITIVE: /* implicit primitive */ TRACE("Implicit primitive handle\n"); - *phBinding = *pStubMsg->StubDesc->IMPLICIT_HANDLE_INFO.pPrimitiveHandle; - break; + return *pStubMsg->StubDesc->IMPLICIT_HANDLE_INFO.pPrimitiveHandle; case FC_CALLBACK_HANDLE: /* implicit callback */ TRACE("FC_CALLBACK_HANDLE\n"); /* server calls callback procedures only in response to remote call, and most recent binding handle is used. Calling back to a client can potentially result in another callback with different current handle. */ - *phBinding = I_RpcGetCurrentCallHandle(); - break; + return I_RpcGetCurrentCallHandle(); case FC_AUTO_HANDLE: /* implicit auto handle */ /* strictly speaking, it isn't necessary to set hBinding here * since it isn't actually used (hence the automatic in its name), * but then why does MIDL generate a valid entry in the * MIDL_STUB_DESC for it? */ TRACE("Implicit auto handle\n"); - *phBinding = *pStubMsg->StubDesc->IMPLICIT_HANDLE_INFO.pAutoHandle; - break; + return *pStubMsg->StubDesc->IMPLICIT_HANDLE_INFO.pAutoHandle; default: ERR("bad implicit binding handle type (0x%02x)\n", pProcHeader->handle_type); RpcRaiseException(RPC_X_BAD_STUB_DATA); } - return pFormat; + return NULL; } static void client_free_handle( @@ -719,8 +726,9 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORM /* we only need a handle if this isn't an object method */ if (!(pProcHeader->Oi_flags & Oi_OBJECT_PROC)) { - pFormat = client_get_handle(&stubMsg, pProcHeader, pHandleFormat, &hBinding); - if (!pFormat) goto done; + pFormat += get_handle_desc_size(pProcHeader, pFormat); + hBinding = client_get_handle(&stubMsg, pProcHeader, pHandleFormat); + if (!hBinding) goto done; } if (is_oicf_stubdesc(pStubDesc)) /* -Oicf format */ @@ -1655,8 +1663,9 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, pAsync->StubInfo = async_call_data; async_call_data->pHandleFormat = pFormat; - pFormat = client_get_handle(pStubMsg, pProcHeader, async_call_data->pHandleFormat, &async_call_data->hBinding); - if (!pFormat) goto done; + pFormat += get_handle_desc_size(pProcHeader, pFormat); + async_call_data->hBinding = client_get_handle(pStubMsg, pProcHeader, async_call_data->pHandleFormat); + if (!async_call_data->hBinding) goto done; if (is_oicf_stubdesc(pStubDesc)) {

1 0

Zebediah Figura : rpcrt4: Handle exceptions in a larger portion of NdrClientCall().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: ae5f2a8f841118ae43b452f30eb438cc0a17a6aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae5f2a8f841118ae43b452f3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 23:30:55 2019 -0500 rpcrt4: Handle exceptions in a larger portion of NdrClientCall(). Most notably in NdrProxyInitialize(). This patch and the next bring the scope of exception handling roughly in line with -Os stubs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36981 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 445 ++++++++++++++++++++------------------------- 1 file changed, 199 insertions(+), 246 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae5f2a8f841118ae43b4…

1 0