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

Jacek Caban : kernelbase/tests: Add test of assembly path of manifest embedded in exe module.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: eb49e43506e964c53fdd2c67b71db694b9a4b598 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb49e43506e964c53fdd2c67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 6 14:49:15 2020 +0100 kernelbase/tests: Add test of assembly path of manifest embedded in exe module. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/Makefile.in | 3 +++ dlls/kernelbase/tests/path.c | 21 +++++++++++++++++++++ dlls/kernelbase/tests/rsrc.rc | 22 ++++++++++++++++++++++ dlls/kernelbase/tests/test.manifest | 6 ++++++ 4 files changed, 52 insertions(+) diff --git a/dlls/kernelbase/tests/Makefile.in b/dlls/kernelbase/tests/Makefile.in index 22e4a17a58..fe7ab212e6 100644 --- a/dlls/kernelbase/tests/Makefile.in +++ b/dlls/kernelbase/tests/Makefile.in @@ -3,3 +3,6 @@ TESTDLL = kernelbase.dll C_SRCS = \ path.c \ sync.c + +RC_SRCS = \ + rsrc.rc diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index d77eaebd91..2ee7b512b3 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -2337,6 +2337,26 @@ static void test_PathIsUNCEx(void) } } +static void test_actctx(void) +{ + ACTCTX_SECTION_KEYED_DATA data = { sizeof(data) }; + WCHAR exe_path[MAX_PATH]; + char buf[1024]; + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *info = (void *)buf; + SIZE_T size; + BOOL b; + + b = FindActCtxSectionStringW(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, L"testdll.dll", &data); + ok(b, "FindActCtxSectionString failed: %u\n", GetLastError()); + + b = QueryActCtxW(0, data.hActCtx, &data.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, buf, sizeof(buf), &size); + ok(b, "QueryActCtx failed: %u\n", GetLastError()); + + GetModuleFileNameW(NULL, exe_path, ARRAY_SIZE(exe_path)); + ok(!lstrcmpW(info->lpAssemblyManifestPath, exe_path), "lpAssemblyManifestPath = %s expected %s\n", debugstr_w(info->lpAssemblyManifestPath), debugstr_w(exe_path)); + ok(!info->lpAssemblyDirectoryName, "lpAssemblyDirectoryName = %s\n", wine_dbgstr_w(info->lpAssemblyDirectoryName)); +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -2386,4 +2406,5 @@ START_TEST(path) test_PathCchStripPrefix(); test_PathCchStripToRoot(); test_PathIsUNCEx(); + test_actctx(); } diff --git a/dlls/kernelbase/tests/rsrc.rc b/dlls/kernelbase/tests/rsrc.rc new file mode 100644 index 0000000000..57496b3ef2 --- /dev/null +++ b/dlls/kernelbase/tests/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2020 Jacek Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winuser.h" + +/* @makedep: test.manifest */ +1 RT_MANIFEST test.manifest diff --git a/dlls/kernelbase/tests/test.manifest b/dlls/kernelbase/tests/test.manifest new file mode 100644 index 0000000000..6dad9c5fdc --- /dev/null +++ b/dlls/kernelbase/tests/test.manifest @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> + <assemblyIdentity processorArchitecture="*" type="win32" name="Firefly" version="16.0.0.0" /> + <description>Wine Test</description> + <file name="testdll.dll" /> +</assembly>

1 0

Jacek Caban : ntdll: Use module path as assembly path for manifests embedded in resources.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 2d764e90dd2c624f7a2d863ab29bd418ed33d252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d764e90dd2c624f7a2d863a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 6 14:48:25 2020 +0100 ntdll: Use module path as assembly path for manifests embedded in resources. Fixes Office 2016 installer, which removes its .exe directory from load path, but expects to be able to load files listed in manifest. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 61 +++++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 9e7782c1ee..c513419828 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -818,6 +818,29 @@ static inline const char* debugstr_version(const struct assembly_version *ver) return wine_dbg_sprintf("%u.%u.%u.%u", ver->major, ver->minor, ver->build, ver->revision); } +static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsigned int extra_len ) +{ + NTSTATUS status; + ULONG_PTR magic; + LDR_MODULE *pldr; + + LdrLockLoaderLock(0, NULL, &magic); + status = LdrFindEntryForAddress( module, &pldr ); + if (status == STATUS_SUCCESS) + { + if ((str->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, + pldr->FullDllName.Length + extra_len + sizeof(WCHAR) ))) + { + memcpy( str->Buffer, pldr->FullDllName.Buffer, pldr->FullDllName.Length + sizeof(WCHAR) ); + str->Length = pldr->FullDllName.Length; + str->MaximumLength = pldr->FullDllName.Length + extra_len + sizeof(WCHAR); + } + else status = STATUS_NO_MEMORY; + } + LdrUnlockLoaderLock(0, magic); + return status; +} + static struct assembly *add_assembly(ACTIVATION_CONTEXT *actctx, enum assembly_type at) { struct assembly *assembly; @@ -2790,7 +2813,7 @@ static NTSTATUS parse_manifest_buffer( struct actctx_loader* acl, struct assembl } static NTSTATUS parse_manifest( struct actctx_loader* acl, struct assembly_identity* ai, - LPCWSTR filename, LPCWSTR directory, BOOL shared, + LPCWSTR filename, HANDLE module, LPCWSTR directory, BOOL shared, const void *buffer, SIZE_T size ) { xmlbuf_t xmlbuf; @@ -2806,7 +2829,14 @@ static NTSTATUS parse_manifest( struct actctx_loader* acl, struct assembly_ident if (directory && !(assembly->directory = strdupW(directory))) return STATUS_NO_MEMORY; - if (filename) assembly->manifest.info = strdupW( filename + 4 /* skip \??\ prefix */ ); + if (!filename) + { + UNICODE_STRING module_path; + if ((status = get_module_filename( module, &module_path, 0 ))) return status; + assembly->manifest.info = module_path.Buffer; + } + else if(!(assembly->manifest.info = strdupW( filename + 4 /* skip \??\ prefix */ ))) return STATUS_NO_MEMORY; + assembly->manifest.type = assembly->manifest.info ? ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE : ACTIVATION_CONTEXT_PATH_TYPE_NONE; @@ -2863,29 +2893,6 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) return NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); } -static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsigned int extra_len ) -{ - NTSTATUS status; - ULONG_PTR magic; - LDR_MODULE *pldr; - - LdrLockLoaderLock(0, NULL, &magic); - status = LdrFindEntryForAddress( module, &pldr ); - if (status == STATUS_SUCCESS) - { - if ((str->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, - pldr->FullDllName.Length + extra_len + sizeof(WCHAR) ))) - { - memcpy( str->Buffer, pldr->FullDllName.Buffer, pldr->FullDllName.Length + sizeof(WCHAR) ); - str->Length = pldr->FullDllName.Length; - str->MaximumLength = pldr->FullDllName.Length + extra_len + sizeof(WCHAR); - } - else status = STATUS_NO_MEMORY; - } - LdrUnlockLoaderLock(0, magic); - return status; -} - static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assembly_identity* ai, LPCWSTR filename, LPCWSTR directory, BOOL shared, HANDLE hModule, LPCWSTR resname, ULONG lang ) @@ -2937,7 +2944,7 @@ static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assemb if (status == STATUS_SUCCESS) status = LdrAccessResource(hModule, entry, &ptr, NULL); if (status == STATUS_SUCCESS) - status = parse_manifest(acl, ai, filename, directory, shared, ptr, entry->Size); + status = parse_manifest(acl, ai, filename, hModule, directory, shared, ptr, entry->Size); return status; } @@ -3024,7 +3031,7 @@ static NTSTATUS get_manifest_in_manifest_file( struct actctx_loader* acl, struct status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileEndOfFileInformation ); if (status == STATUS_SUCCESS) - status = parse_manifest(acl, ai, filename, directory, shared, base, info.EndOfFile.QuadPart); + status = parse_manifest(acl, ai, filename, NULL, directory, shared, base, info.EndOfFile.QuadPart); NtUnmapViewOfSection( GetCurrentProcess(), base ); return status;

1 0

Zebediah Figura : setupapi: Use the "section" and "description" fields directly in more places.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: dd74b9c8e659398f64be0084337adef99e14a754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd74b9c8e659398f64be0084… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 8 14:13:16 2020 -0500 setupapi: Use the "section" and "description" fields directly in more places. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index a812545aa9..a21959a262 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4333,7 +4333,7 @@ CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dev, const DEVPROPKEY *key, DE */ BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { - WCHAR section[LINE_LEN], section_ext[LINE_LEN], iface_section[LINE_LEN], refstr[LINE_LEN], guidstr[39]; + WCHAR section_ext[LINE_LEN], iface_section[LINE_LEN], refstr[LINE_LEN], guidstr[39]; UINT install_flags = SPINST_ALL; struct device_iface *iface; struct device *device; @@ -4360,9 +4360,7 @@ BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO devinfo, SP_DEVINFO_DATA *de if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) return FALSE; - SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); - SetupGetStringFieldW(&ctx, 1, section, ARRAY_SIZE(section), NULL); - SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, NULL); + SetupDiGetActualSectionToInstallW(hinf, driver->section, section_ext, ARRAY_SIZE(section_ext), NULL, NULL); if (device->params.Flags & DI_NOFILECOPY) install_flags &= ~SPINST_FILES; @@ -4410,12 +4408,11 @@ BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO devinfo, SP_DEVINFO_DATA *de BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { static const WCHAR coinstallersW[] = {'.','C','o','I','n','s','t','a','l','l','e','r','s',0}; - WCHAR coinst_key[LINE_LEN], coinst_key_ext[LINE_LEN]; + WCHAR coinst_key_ext[LINE_LEN]; struct device *device; struct driver *driver; void *callback_ctx; HKEY driver_key; - INFCONTEXT ctx; HINF hinf; LONG l; @@ -4434,9 +4431,7 @@ BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO devinfo, SP_DEVINFO_DATA if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) return FALSE; - SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); - SetupGetStringFieldW(&ctx, 1, coinst_key, ARRAY_SIZE(coinst_key), NULL); - SetupDiGetActualSectionToInstallW(hinf, coinst_key, coinst_key_ext, ARRAY_SIZE(coinst_key_ext), NULL, NULL); + SetupDiGetActualSectionToInstallW(hinf, driver->section, coinst_key_ext, ARRAY_SIZE(coinst_key_ext), NULL, NULL); lstrcatW(coinst_key_ext, coinstallersW); if ((l = create_driver_key(device, &driver_key))) @@ -4998,10 +4993,10 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; static const WCHAR rootW[] = {'r','o','o','t','\\',0}; WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; - WCHAR svc_name[LINE_LEN], field[LINE_LEN]; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; SC_HANDLE manager, service; + WCHAR svc_name[LINE_LEN]; struct device *device; struct driver *driver; void *callback_ctx; @@ -5024,13 +5019,10 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) return FALSE; - SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); - - SetupGetStringFieldW(&ctx, 0, field, ARRAY_SIZE(field), NULL); - RegSetValueExW(device->key, L"DeviceDesc", 0, REG_SZ, (BYTE *)field, wcslen(field) * sizeof(WCHAR)); + RegSetValueExW(device->key, L"DeviceDesc", 0, REG_SZ, (BYTE *)driver->description, + wcslen(driver->description) * sizeof(WCHAR)); - SetupGetStringFieldW(&ctx, 1, section, ARRAY_SIZE(section), NULL); - SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, &extptr); + SetupDiGetActualSectionToInstallW(hinf, driver->section, section_ext, ARRAY_SIZE(section_ext), NULL, &extptr); if ((l = create_driver_key(device, &driver_key))) {

1 0

Zebediah Figura : setupapi: Implement SetupDiGetDriverInfoDetail().
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 5cff8c9e2e926edcc74202fa3354c2a4bb5ebef3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cff8c9e2e926edcc74202fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 8 14:13:15 2020 -0500 setupapi: Implement SetupDiGetDriverInfoDetail(). Needed by the Windows Device Framework co-installer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 153 ++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/tests/devinst.c | 98 +++++++++++++++++++++++++-- 3 files changed, 249 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5cff8c9e2e926edcc742…

1 0

Zebediah Figura : setupapi: Implement SetupDiGetSelectedDriver().
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 6971dfcfc21e887e4b5724d4f32e29d012e1b5be URL: https://source.winehq.org/git/wine.git/?a=commit;h=6971dfcfc21e887e4b5724d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 8 14:13:14 2020 -0500 setupapi: Implement SetupDiGetSelectedDriver(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48639 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 90 +++++++++++++++++++++++++++++++------------ dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/tests/devinst.c | 14 +++++++ 3 files changed, 82 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 268965f0fe..ce7268a5e8 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4645,16 +4645,42 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } +static BOOL copy_driver_data(SP_DRVINFO_DATA_W *data, const struct driver *driver) +{ + INFCONTEXT ctx; + HINF hinf; + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + data->ProviderName[0] = 0; + if (SetupFindFirstLineW(hinf, L"Version", L"Provider", &ctx)) + SetupGetStringFieldW(&ctx, 1, data->ProviderName, ARRAY_SIZE(data->ProviderName), NULL); + wcscpy(data->Description, driver->description); + wcscpy(data->MfgName, driver->manufacturer); + data->DriverType = SPDIT_COMPATDRIVER; + + SetupCloseInfFile(hinf); + + return TRUE; +} + +static void driver_data_wtoa(SP_DRVINFO_DATA_A *a, const SP_DRVINFO_DATA_W *w) +{ + a->DriverType = w->DriverType; + a->Reserved = w->Reserved; + WideCharToMultiByte(CP_ACP, 0, w->Description, -1, a->Description, sizeof(a->Description), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, w->MfgName, -1, a->MfgName, sizeof(a->MfgName), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, w->ProviderName, -1, a->ProviderName, sizeof(a->ProviderName), NULL, NULL); +} + /*********************************************************************** * 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); @@ -4675,19 +4701,7 @@ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat 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); - lstrcpyW(driver_data->Description, device->drivers[index].description); - lstrcpyW(driver_data->MfgName, device->drivers[index].manufacturer); - driver_data->DriverType = SPDIT_COMPATDRIVER; - - SetupCloseInfFile(hinf); - - return TRUE; + return copy_driver_data(driver_data, &device->drivers[index]); } /*********************************************************************** @@ -4701,14 +4715,7 @@ BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat 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); + driver_data_wtoa(driver_data, &driver_dataW); return ret; } @@ -4738,6 +4745,41 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } +/*********************************************************************** + * SetupDiGetSelectedDriverW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetSelectedDriverW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, SP_DRVINFO_DATA_W *driver_data) +{ + struct device *device; + + TRACE("devinfo %p, device_data %p, driver_data %p.\n", devinfo, device_data, driver_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!device->selected_driver) + { + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + return copy_driver_data(driver_data, device->selected_driver); +} + +/*********************************************************************** + * SetupDiGetSelectedDriverA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetSelectedDriverA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, SP_DRVINFO_DATA_A *driver_data) +{ + SP_DRVINFO_DATA_W driver_dataW; + BOOL ret; + + driver_dataW.cbSize = sizeof(driver_dataW); + if ((ret = SetupDiGetSelectedDriverW(devinfo, device_data, &driver_dataW))) + driver_data_wtoa(driver_data, &driver_dataW); + return ret; +} + /*********************************************************************** * SetupDiInstallDriverFiles (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 33ccc48097..233a02e550 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -361,8 +361,8 @@ @ stdcall SetupDiGetINFClassA(str ptr ptr long ptr) @ stdcall SetupDiGetINFClassW(wstr ptr ptr long ptr) @ stub SetupDiGetSelectedDevice -@ stub SetupDiGetSelectedDriverA -@ stub SetupDiGetSelectedDriverW +@ stdcall SetupDiGetSelectedDriverA(ptr ptr ptr) +@ stdcall SetupDiGetSelectedDriverW(ptr ptr ptr) @ stub SetupDiGetWizardPage @ stdcall SetupDiInstallClassA(long str long ptr) @ stub SetupDiInstallClassExA diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a9ac0d849f..0b1a1fa381 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2434,6 +2434,20 @@ static void test_driver_list(void) ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); + ret = SetupDiGetSelectedDriverA(set, &device, &driver); + ok(ret /* Win10 1809 */ || GetLastError() == ERROR_NO_DRIVER_SELECTED, + "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiSelectBestCompatDrv(set, &device); + ok(ret, "Failed to select driver, error %#x.\n", GetLastError()); + + ret = SetupDiGetSelectedDriverA(set, &device, &driver); + ok(ret, "Failed to get selected driver, error %#x.\n", GetLastError()); + ok(driver.DriverType == SPDIT_COMPATDRIVER, "Got wrong type %#x.\n", driver.DriverType); + ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); + ok(!strcmp(driver.MfgName, wow64 ? "mfg1_wow" : "mfg1"), "Got wrong manufacturer '%s'.\n", driver.MfgName); + ok(!strcmp(driver.ProviderName, ""), "Got wrong provider '%s'.\n", driver.ProviderName); + SetupDiDestroyDeviceInfoList(set); ret = DeleteFileA(inf_path); ok(ret, "Failed to delete %s, error %u.\n", inf_path, GetLastError());

1 0

Zebediah Figura : strmbase: Remove no longer used DLL registration and vending framework.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 7e788741d1aaf975d6486e2b7f7c4e6098176208 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e788741d1aaf975d6486e2b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 8 14:05:11 2020 -0500 strmbase: Remove no longer used DLL registration and vending framework. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/Makefile.in | 1 - dlls/strmbase/dllfunc.c | 375 ---------------------------------------------- include/wine/strmbase.h | 32 ---- 3 files changed, 408 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e788741d1aaf975d648…

1 0

Zebediah Figura : wineqtdecoder: Reimplement COM registration and vending locally.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: dd3d68e5d9e54b204168216da2da6bf6d1d8d296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd3d68e5d9e54b204168216d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 8 14:05:10 2020 -0500 wineqtdecoder: Reimplement COM registration and vending locally. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/Makefile.in | 4 +- dlls/wineqtdecoder/main.c | 292 ++++++++++++++++----------- dlls/wineqtdecoder/qtsplitter.c | 16 +- dlls/wineqtdecoder/qtvdecoder.c | 20 +- dlls/wineqtdecoder/wineqtdecoder_classes.idl | 37 ++++ 5 files changed, 234 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd3d68e5d9e54b204168…

1 0

Zebediah Figura : qcap: Reimplement COM registration and vending locally.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 7bcb8e74ce4b3428ac25db624349949caef69dda URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bcb8e74ce4b3428ac25db62… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 8 14:05:08 2020 -0500 qcap: Reimplement COM registration and vending locally. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 4 +- dlls/qcap/audiorecord.c | 24 ++-- dlls/qcap/avico.c | 25 ++-- dlls/qcap/avimux.c | 17 +-- dlls/qcap/capturegraph.c | 40 +++--- dlls/qcap/qcap_classes.idl | 70 ++++++++++ dlls/qcap/qcap_main.c | 321 +++++++++++++++++++++++++++++---------------- dlls/qcap/qcap_main.h | 19 +-- dlls/qcap/smartteefilter.c | 16 +-- dlls/qcap/vfwcapture.c | 11 +- 10 files changed, 340 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bcb8e74ce4b3428ac25…

1 0

Zebediah Figura : qedit: Register the sample grabber and null renderer.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: cf376c96e8d7ac8308f37217400de251d13299cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf376c96e8d7ac8308f37217… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 8 14:05:07 2020 -0500 qedit: Register the sample grabber and null renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/main.c | 77 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/qedit/qedit_private.h | 3 +- dlls/quartz/regsvr.c | 12 -------- 3 files changed, 77 insertions(+), 15 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index a271f9adb7..3797d96dcf 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -192,12 +192,71 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return S_OK; } +static const REGPINTYPES reg_null_mt = {&GUID_NULL, &GUID_NULL}; + +static const REGFILTERPINS2 reg_sample_grabber_pins[2] = +{ + { + .cInstances = 1, + .nMediaTypes = 1, + .lpMediaType = &reg_null_mt, + }, + { + .dwFlags = REG_PINFLAG_B_OUTPUT, + .cInstances = 1, + .nMediaTypes = 1, + .lpMediaType = &reg_null_mt, + }, +}; + +static const REGFILTER2 reg_sample_grabber = +{ + .dwVersion = 2, + .dwMerit = MERIT_DO_NOT_USE, + .u.s2.cPins2 = 2, + .u.s2.rgPins2 = reg_sample_grabber_pins, +}; + +static const REGFILTERPINS2 reg_null_renderer_pins[1] = +{ + { + .dwFlags = REG_PINFLAG_B_OUTPUT, + .cInstances = 1, + .nMediaTypes = 1, + .lpMediaType = &reg_null_mt, + }, +}; + +static const REGFILTER2 reg_null_renderer = +{ + .dwVersion = 2, + .dwMerit = MERIT_DO_NOT_USE, + .u.s2.cPins2 = 1, + .u.s2.rgPins2 = reg_null_renderer_pins, +}; + /*********************************************************************** * DllRegisterServer (QEDIT.@) */ HRESULT WINAPI DllRegisterServer(void) { - return __wine_register_resources( instance ); + IFilterMapper2 *mapper; + HRESULT hr; + + if (FAILED(hr = __wine_register_resources( instance ))) + return hr; + + if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (void **)&mapper))) + return hr; + + IFilterMapper2_RegisterFilter(mapper, &CLSID_SampleGrabber, L"SampleGrabber", + NULL, NULL, NULL, &reg_sample_grabber); + IFilterMapper2_RegisterFilter(mapper, &CLSID_NullRenderer, L"Null Renderer", + NULL, NULL, NULL, &reg_null_renderer); + + IFilterMapper2_Release(mapper); + return S_OK; } /*********************************************************************** @@ -205,5 +264,19 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - return __wine_unregister_resources( instance ); + IFilterMapper2 *mapper; + HRESULT hr; + + if (FAILED(hr = __wine_unregister_resources( instance ))) + return hr; + + if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (void **)&mapper))) + return hr; + + IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_SampleGrabber); + IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_NullRenderer); + + IFilterMapper2_Release(mapper); + return S_OK; } diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h index 344656d7d8..96f21bcb3b 100644 --- a/dlls/qedit/qedit_private.h +++ b/dlls/qedit/qedit_private.h @@ -23,7 +23,8 @@ #include <stdarg.h> #define COBJMACROS - +#define NONAMELESSSTRUCT +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wtypes.h" diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index ff5db662f0..7196f79a54 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -174,18 +174,6 @@ static HRESULT unregister_filters(struct regsvr_filter const *list) */ static struct regsvr_filter const filter_list[] = { - { &CLSID_NullRenderer, - &CLSID_LegacyAmFilterCategory, - L"Null Renderer", - 0x200000, - { { REG_PINFLAG_B_RENDERER, - { { &MEDIATYPE_NULL, &GUID_NULL }, - { NULL } - }, - }, - { 0xFFFFFFFF }, - } - }, { &CLSID_VideoRenderer, &CLSID_LegacyAmFilterCategory, L"Video Renderer",

1 0

Zebediah Figura : d3dcompiler: Clarify error messages related to misplaced type modifiers.
by Alexandre Julliard March 6, 2020

March 6, 2020

Module: wine Branch: master Commit: 0d47e9bde44721df4f8d6b44baaeb210be0f883a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d47e9bde44721df4f8d6b44… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 20:29:49 2020 -0600 d3dcompiler: Clarify error messages related to misplaced type modifiers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 52 +++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index e91c2a08eb..4bf5599e52 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -178,16 +178,6 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc); -static BOOL check_type_modifiers(DWORD modifiers, struct source_location *loc) -{ - if (modifiers & ~HLSL_TYPE_MODIFIERS_MASK) - { - hlsl_report_message(*loc, HLSL_LEVEL_ERROR, "modifier not allowed on typedefs"); - return FALSE; - } - return TRUE; -} - static BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) { if (get_type(scope, def->name, FALSE)) @@ -781,21 +771,12 @@ static struct hlsl_type *new_struct_type(const char *name, DWORD modifiers, stru return type; } -static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct list *list, - struct source_location *loc) +static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct list *list) { BOOL ret; struct hlsl_type *type; struct parse_variable_def *v, *v_next; - if (!check_type_modifiers(modifiers, loc)) - { - LIST_FOR_EACH_ENTRY_SAFE(v, v_next, list, struct parse_variable_def, entry) - d3dcompiler_free(v); - d3dcompiler_free(list); - return FALSE; - } - LIST_FOR_EACH_ENTRY_SAFE(v, v_next, list, struct parse_variable_def, entry) { if (v->array_size) @@ -1208,17 +1189,18 @@ preproc_directive: PRE_LINE STRING struct_declaration: struct_spec variables_def_optional ';' { - struct source_location loc; - - loc = get_location(&@3); if (!$2) { if (!$1->name) { - hlsl_report_message(loc, HLSL_LEVEL_ERROR, + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, "anonymous struct declaration with no variables"); } - check_type_modifiers($1->modifiers, &loc); + if ($1->modifiers) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "modifier not allowed on struct type declaration"); + } } $$ = declare_vars($1, 0, $2); } @@ -1582,18 +1564,22 @@ declaration_statement: declaration typedef: KW_TYPEDEF var_modifiers type type_specs ';' { - struct source_location loc; - - loc = get_location(&@1); - if (!add_typedef($2, $3, $4, &loc)) + if ($2 & ~HLSL_TYPE_MODIFIERS_MASK) + { + struct parse_variable_def *v, *v_next; + hlsl_report_message(get_location(&@1), + HLSL_LEVEL_ERROR, "modifier not allowed on typedefs"); + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, $4, struct parse_variable_def, entry) + d3dcompiler_free(v); + d3dcompiler_free($4); + YYABORT; + } + if (!add_typedef($2, $3, $4)) YYABORT; } | KW_TYPEDEF struct_spec type_specs ';' { - struct source_location loc; - - loc = get_location(&@1); - if (!add_typedef(0, $2, $3, &loc)) + if (!add_typedef(0, $2, $3)) YYABORT; }

1 0