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

[PATCH v6 2/7] winex11.drv: Initialize GPU registry data.
by Zhiyi Zhang 23 May '19

23 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 172 +++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 22 +++++ dlls/winex11.drv/xinerama.c | 25 +++++ 4 files changed, 220 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 9ca2fc6efe..72ab1bb77b 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winex11.drv -IMPORTS = uuid user32 gdi32 advapi32 +IMPORTS = uuid user32 gdi32 advapi32 ntoskrnl setupapi DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 7d81de09ac..c45a0a4657 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -26,11 +26,43 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" +#include "initguid.h" +#include "devguid.h" +#include "devpkey.h" +#include "setupapi.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "ddk/ntddk.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "x11drv.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; +static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; +static const WCHAR guid_fmtW[] = { + '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; +static const WCHAR gpu_instance_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','%','0','8','X','&', + 'R','E','V','_','%','0','2','X','\\', + '%','0','8','X',0}; +static const WCHAR gpu_hardware_id_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; +static const WCHAR winex11_drvW[] = { + 'C',':','\\', + 'W','i','n','d','o','w','s','\\', + 'S','y','s','t','e','m','3','2','\\', + 'w','i','n','e','x','1','1','.','d','r','v',0}; static const WCHAR video_keyW[] = { 'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -47,8 +79,125 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } +/* Initialize a GPU instance */ +static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index) +{ + static const BOOL present = TRUE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + HKEY hkey = NULL; + GUID guid; + INT written; + DWORD size; + BOOL ret = FALSE; + + sprintfW(instanceW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); + if (!SetupDiOpenDeviceInfoW(devinfo, instanceW, NULL, 0, &device_data)) + { + SetupDiCreateDeviceInfoW(devinfo, instanceW, &GUID_DEVCLASS_DISPLAY, gpu->name, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto fail; + } + + /* Write HaredwareID registry property */ + written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); + bufferW[written + 1] = 0; + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)bufferW, + (written + 2) * sizeof(WCHAR))) + goto fail; + + /* Write DEVPKEY_Device_IsPresent property */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&present, sizeof(present), 0)) + goto fail; + + /* Open driver key. + * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + + /* Write GraphicsDriver value */ + if (RegSetValueExW(hkey, graphics_driverW, 0, REG_SZ, (const BYTE *)winex11_drvW, sizeof(winex11_drvW))) + goto fail; + + /* Write DriverDesc value */ + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, + (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto fail; + RegCloseKey(hkey); + hkey = NULL; + + /* Write GUID in VideoID in .../instance/Device Parameters, reuse the GUID if it's existent */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + + size = sizeof(bufferW); + bufferW[0] = 0; + if (RegQueryValueExW(hkey, video_idW, 0, NULL, (BYTE *)bufferW, &size)) + { + ExUuidCreate(&guid); + sprintfW(bufferW, guid_fmtW, guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], guid.Data4[2], + guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); + if (RegSetValueExW(hkey, video_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + } + + ret = TRUE; +fail: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize GPU\n"); + return ret; +} + +static void prepare_devices(void) +{ + static const BOOL not_present = FALSE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD i = 0; + + /* Set all GPUs as not present. We can't simply delete them because we need to keep the GUID consistent with + * each initialization run. We clean up non present GPUs at the end of initialization */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&not_present, sizeof(not_present), 0)) + ERR("Failed to set GPU present property\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + +static void cleanup_devices(void) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD type; + DWORD i = 0; + BOOL present; + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + present = FALSE; + SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, &type, (BYTE *)&present, + sizeof(present), NULL, 0); + if (!present && !SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove GPU\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + void X11DRV_DisplayDevices_Init(void) { + struct x11drv_gpu *gpus = NULL; + INT gpu_count; + INT gpu; + HDEVINFO gpu_devinfo = NULL; HKEY video_hkey = NULL; DWORD disposition = 0; BOOL success = FALSE; @@ -66,9 +215,32 @@ void X11DRV_DisplayDevices_Init(void) goto fail; } + /* FIXME: + * Currently SetupDiGetClassDevsW with DIGCF_PRESENT is unsupported, So we need to clean up not present devices in + * case application use SetupDiGetClassDevsW to enumerate devices. Wrong devices could exist in registry as a result + * of prefix copying or having devices unplugged. But then we couldn't simply delete GPUs because we need to retain + * the same GUID for the same GPU. */ + prepare_devices(); + + gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + + /* Initialize GPUs */ + if (!handler.pGetGpus(&gpus, &gpu_count)) + goto fail; + + for (gpu = 0; gpu < gpu_count; gpu++) + { + if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu)) + goto fail; + } + success = TRUE; fail: + cleanup_devices(); + SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); + if (gpus) + handler.pFreeGpus(gpus); if (!success) ERR("Failed to initialize display devices\n"); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index fbc5a104f6..e50158d282 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -667,6 +667,20 @@ void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; /* X11 display device handler. Used to initialize display device registry data */ +/* Represent a physical GPU in the PCI slots */ +struct x11drv_gpu +{ + /* ID to uniquely identify a GPU in handler */ + ULONG_PTR id; + /* Name */ + WCHAR name[128]; + /* PCI ID */ + UINT vendor_id; + UINT device_id; + UINT subsys_id; + UINT revision_id; +}; + /* Required functions for display device registry initialization */ struct x11drv_display_device_handler { @@ -675,6 +689,14 @@ struct x11drv_display_device_handler /* Higher priority can override handlers with lower proprity */ INT priority; + + /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + + /* pFreeGpus will be called to free a GPU list from pGetGpus */ + void (*pFreeGpus)(struct x11drv_gpu *gpus); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 35dd36049b..520f59f93d 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -201,6 +201,29 @@ RECT get_primary_monitor_rect(void) return get_primary()->rcMonitor; } +static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count ) +{ + static const WCHAR wine_gpuW[] = {'W','i','n','e',' ','G','P','U',0}; + struct x11drv_gpu *gpus; + + /* Xinerama has no support for GPU, faking one */ + gpus = heap_calloc( 1, sizeof(*gpus) ); + if (!gpus) + return FALSE; + + strcpyW( gpus[0].name, wine_gpuW ); + + *new_gpus = gpus; + *count = 1; + + return TRUE; +} + +static void xinerama_free_gpus( struct x11drv_gpu *gpus ) +{ + heap_free( gpus ); +} + void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; @@ -239,6 +262,8 @@ void xinerama_init( unsigned int width, unsigned int height ) strcpy( handler.name, "Xinerama" ); handler.priority = 100; + handler.pGetGpus = xinerama_get_gpus; + handler.pFreeGpus = xinerama_free_gpus; X11DRV_DisplayDevices_SetHandler( &handler ); TRACE( "virtual size: %s primary: %s\n", -- 2.20.1

3 4

[PATCH] gdiplus: Created ADD_GTCTO environment variable that increases thread suspension time out.
by Vanida Plamondon 23 May '19

23 May '19

This patch was made as using an environment variable instead of a registry entry because it addresses unwanted/bugged behaviour. I could be wrong about that. With ADD_GTCTO=5000, Magic the Gathering: Arena's updater/ downloader completes without issue. It should work for other outdated unity-build games that suffer the same issue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45546 Signed-off-by: Vanida Plamondon <vanida.plamondon(a)gmail.com> --- v1: Created ADD_GTCTO environment variable --- dlls/ntdll/thread.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 46de839400..09aa94ba65 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -23,6 +23,7 @@ #include <assert.h> #include <stdarg.h> +#include <stdlib.h> #include <limits.h> #include <sys/types.h> #ifdef HAVE_SYS_MMAN_H @@ -772,7 +773,11 @@ NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int flags, BOOL *self ) { NTSTATUS ret; - DWORD dummy, i; + DWORD dummy, i, gtcto; + + /* get the ADD_GTCTO value, if any */ + const char *add_gtcto = getenv( "ADD_GTCTO" ); + gtcto = add_gtcto ? ( DWORD ) ( atol( add_gtcto) + 100 ) : 100; SERVER_START_REQ( get_thread_context ) { @@ -787,7 +792,7 @@ NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int fla if (ret == STATUS_PENDING) { - for (i = 0; i < 100; i++) + for (i = 0; i < gtcto; i++) { SERVER_START_REQ( get_thread_context ) { -- 2.20.1

2 1

[PATCH 1/4] setupapi/tests: Clean up and expand tests for SetupCopyOEMInf().
by Zebediah Figura 23 May '19

23 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/misc.c | 298 ++++++++++++++++++------------------- 1 file changed, 142 insertions(+), 156 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 9143cd4bd33..157edd82a7c 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -45,27 +45,19 @@ static CHAR CURR_DIR[MAX_PATH]; */ static BOOL (WINAPI *pSetupGetFileCompressionInfoExA)(PCSTR, PSTR, DWORD, PDWORD, PDWORD, PDWORD, PUINT); -static BOOL (WINAPI *pSetupCopyOEMInfA)(PCSTR, PCSTR, DWORD, DWORD, PSTR, DWORD, PDWORD, PSTR *); static BOOL (WINAPI *pSetupQueryInfOriginalFileInformationA)(PSP_INF_INFORMATION, UINT, PSP_ALTPLATFORM_INFO, PSP_ORIGINAL_FILE_INFO_A); -static BOOL (WINAPI *pSetupUninstallOEMInfA)(PCSTR, DWORD, PVOID); -static void create_inf_file(LPCSTR filename) +static void create_file(const char *name, const char *data) { - DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE file; + DWORD size; + BOOL ret; - static const char data[] = - "[Version]\n" - "Signature=\"$Chicago$\"\n" - "AdvancedINF=2.5\n" - "[DefaultInstall]\n" - "RegisterOCXs=RegisterOCXsSection\n" - "[RegisterOCXsSection]\n" - "%%11%%\\ole32.dll\n"; - - WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL); - CloseHandle(hf); + file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create %s, error %u.\n", name, GetLastError()); + ret = WriteFile(file, data, strlen(data), &size, NULL); + ok(ret && size == strlen(data), "Failed to write %s, error %u.\n", name, GetLastError()); + CloseHandle(file); } static void get_temp_filename(LPSTR path) @@ -84,19 +76,13 @@ static BOOL file_exists(LPSTR path) return GetFileAttributesA(path) != INVALID_FILE_ATTRIBUTES; } -static BOOL check_format(LPSTR path, LPSTR inf) +static BOOL is_in_inf_dir(const char *path) { - CHAR check[MAX_PATH]; - BOOL res; - - static const CHAR format[] = "\\INF\\oem"; - - GetWindowsDirectoryA(check, MAX_PATH); - strcat(check, format); - res = CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, check, -1, path, strlen(check)) == CSTR_EQUAL && - path[strlen(check)] != '\\'; + char expect[MAX_PATH]; - return (!inf) ? res : res && (inf == path + strlen(check) - 3); + GetWindowsDirectoryA(expect, sizeof(expect)); + strcat(expect, "\\inf\\"); + return !strncasecmp(path, expect, strrchr(path, '\\') - path); } static void test_original_file_name(LPCSTR original, LPCSTR dest) @@ -143,32 +129,39 @@ static void test_original_file_name(LPCSTR original, LPCSTR dest) static void test_SetupCopyOEMInf(void) { - CHAR toolong[MAX_PATH * 2]; - CHAR path[MAX_PATH], dest[MAX_PATH]; - CHAR tmpfile[MAX_PATH], dest_save[MAX_PATH]; - LPSTR inf = NULL; + char path[MAX_PATH * 2], dest[MAX_PATH], tmpfile[MAX_PATH], orig_dest[MAX_PATH]; + char *filepart, pnf[MAX_PATH]; DWORD size; BOOL res; + static const char inf_data1[] = + "[Version]\n" + "Signature=\"$Chicago$\"\n" + "; This is a WINE test INF file\n"; + + static const char inf_data2[] = + "[Version]\n" + "Signature=\"$Chicago$\"\n" + "; This is another WINE test INF file\n"; + /* try NULL SourceInfFileName */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(NULL, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(NULL, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* try empty SourceInfFileName */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA("", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA("", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == ERROR_BAD_PATHNAME || /* Win98 */ GetLastError() == ERROR_INVALID_PARAMETER, /* Vista, W2K8 */ "Unexpected error : %d\n", GetLastError()); /* try a relative nonexistent SourceInfFileName */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA("nonexistent", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA("nonexistent", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); @@ -177,30 +170,18 @@ static void test_SetupCopyOEMInf(void) strcpy(path, CURR_DIR); strcat(path, "\\nonexistent"); SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - /* try a long SourceInfFileName */ - memset(toolong, 'a', MAX_PATH * 2); - toolong[MAX_PATH * 2 - 1] = '\0'; - SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(toolong, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); - ok(res == FALSE, "Expected FALSE, got %d\n", res); - ok(GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == ERROR_FILENAME_EXCED_RANGE, /* Win98 */ - "Expected ERROR_FILE_NOT_FOUND or ERROR_FILENAME_EXCED_RANGE, got %d\n", GetLastError()); - get_temp_filename(tmpfile); - create_inf_file(tmpfile); + create_file(tmpfile, inf_data1); /* try a relative SourceInfFileName */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); - ok(res == FALSE || - broken(res == TRUE), /* Win98 */ - "Expected FALSE, got %d\n", res); + res = SetupCopyOEMInfA(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + ok(res == FALSE, "Expected FALSE, got %d\n", res); if (GetLastError() == ERROR_WRONG_INF_TYPE || GetLastError() == ERROR_UNSUPPORTED_TYPE /* Win7 */) { /* FIXME: @@ -212,152 +193,169 @@ static void test_SetupCopyOEMInf(void) return; } - ok(GetLastError() == ERROR_FILE_NOT_FOUND || - broken(GetLastError() == ERROR_SUCCESS), /* Win98 */ - "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(file_exists(tmpfile), "Expected tmpfile to exist\n"); /* try SP_COPY_REPLACEONLY, dest does not exist */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(file_exists(tmpfile), "Expected source inf to exist\n"); - /* try an absolute SourceInfFileName, without DestinationInfFileName */ + /* Test a successful call. */ strcpy(path, CURR_DIR); strcat(path, "\\"); strcat(path, tmpfile); SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), NULL, NULL); if (!res && GetLastError() == ERROR_ACCESS_DENIED) { skip("SetupCopyOEMInfA() failed on insufficient permissions\n"); + DeleteFileA(tmpfile); return; } ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(file_exists(path), "Expected source inf to exist\n"); + ok(file_exists(path), "Expected source inf to exist.\n"); + ok(file_exists(dest), "Expected dest file to exist.\n"); + ok(is_in_inf_dir(dest), "Got unexpected path '%s'.\n", dest); + strcpy(orig_dest, dest); + + /* Existing INF files are checked for a match. */ + SetLastError(0xdeadbeef); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), NULL, NULL); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(file_exists(path), "Expected source inf to exist.\n"); + ok(file_exists(dest), "Expected dest file to exist.\n"); +todo_wine + ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); /* try SP_COPY_REPLACEONLY, dest exists */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, dest, sizeof(dest), NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(file_exists(path), "Expected source inf to exist\n"); + ok(file_exists(path), "Expected source inf to exist.\n"); + ok(file_exists(dest), "Expected dest file to exist.\n"); +todo_wine + ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); - /* try SP_COPY_NOOVERWRITE */ + strcpy(dest, "aaa"); SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_NOOVERWRITE, dest, sizeof(dest), NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %d\n", GetLastError()); +todo_wine + ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); - /* get the DestinationInfFileName */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, NULL, 0, NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(strlen(dest) != 0, "Expected a non-zero length string\n"); - ok(file_exists(dest), "Expected destination inf to exist\n"); - ok(check_format(dest, NULL), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); - ok(file_exists(path), "Expected source inf to exist\n"); + ok(file_exists(path), "Expected source inf to exist.\n"); + ok(file_exists(orig_dest), "Expected dest file to exist.\n"); - strcpy(dest_save, dest); - DeleteFileA(dest_save); - - /* get the DestinationInfFileName, DestinationInfFileNameSize is too small - * - inf is still copied - */ strcpy(dest, "aaa"); size = 0; SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, 5, &size, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, 5, &size, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(file_exists(path), "Expected source inf to exist\n"); - ok(file_exists(dest_save), "Expected dest inf to exist\n"); + ok(file_exists(orig_dest), "Expected dest inf to exist\n"); ok(!strcmp(dest, "aaa"), "Expected dest to be unchanged\n"); - ok(size == strlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); +todo_wine + ok(size == strlen(orig_dest) + 1, "Expected size %d, got %d.\n", strlen(orig_dest) + 1, size); - /* get the DestinationInfFileName and DestinationInfFileNameSize */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, &size, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), &size, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(lstrlenA(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlenA(dest), size); - ok(file_exists(dest), "Expected destination inf to exist\n"); - ok(check_format(dest, NULL), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); - ok(file_exists(path), "Expected source inf to exist\n"); - ok(size == lstrlenA(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); +todo_wine + ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); + ok(size == strlen(dest) + 1, "Expected size %d, got %d.\n", strlen(dest) + 1, size); test_original_file_name(strrchr(path, '\\') + 1, dest); - /* get the DestinationInfFileName, DestinationInfFileNameSize, and DestinationInfFileNameComponent */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, &size, &inf); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), NULL, &filepart); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(lstrlenA(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlenA(dest), size); - ok(file_exists(dest), "Expected destination inf to exist\n"); - ok((inf && inf[0] != 0) || - broken(!inf), /* Win98 */ - "Expected inf to point to the filename\n"); - ok(check_format(dest, inf), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); - ok(file_exists(path), "Expected source inf to exist\n"); - ok(size == lstrlenA(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); +todo_wine + ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); + ok(filepart == strrchr(dest, '\\') + 1, "Got unexpected file part %s.\n", filepart); - /* try SP_COPY_DELETESOURCE */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_DELETESOURCE, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_DELETESOURCE, NULL, 0, NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(!file_exists(path), "Expected source inf to not exist\n"); - if (pSetupUninstallOEMInfA) - { - char pnf[MAX_PATH]; - char *pnffile; - char *destfile = strrchr(dest, '\\') + 1; - - strcpy(pnf, dest); - *(strrchr(pnf, '.') + 1) = 'p'; - pnffile = strrchr(pnf, '\\') + 1; - - SetLastError(0xdeadbeef); - res = pSetupUninstallOEMInfA(destfile, 0, NULL); - if(!res) - res = pSetupUninstallOEMInfA(pnffile, 0, NULL); - ok(res, "Failed to uninstall '%s'/'%s' : %d\n", destfile, - pnffile, GetLastError()); - todo_wine ok(!file_exists(dest), "Expected inf '%s' to not exist\n", dest); - if(file_exists(dest)) - { - SetLastError(0xdeadbeef); - res = DeleteFileA(dest); - ok(res, "Failed to delete file '%s' : %d\n", dest, GetLastError()); - } - ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); - if(file_exists(pnf)) - { - SetLastError(0xdeadbeef); - res = DeleteFileA(pnf); - ok(res, "Failed to delete file '%s' : %d\n", pnf, GetLastError()); - } - } - else - { - /* Win9x/WinMe */ - SetLastError(0xdeadbeef); - res = DeleteFileA(dest); - ok(res, "Failed to delete file '%s' : %d\n", dest, GetLastError()); - - /* On WinMe we also need to remove the .pnf file */ - *(strrchr(dest, '.') + 1) = 'p'; - DeleteFileA(dest); - } + strcpy(pnf, dest); + *(strrchr(pnf, '.') + 1) = 'p'; + + res = SetupUninstallOEMInfA(strrchr(dest, '\\') + 1, 0, NULL); + ok(res, "Failed to uninstall '%s', error %u.\n", dest, GetLastError()); + todo_wine ok(!file_exists(dest), "Expected inf '%s' to not exist\n", dest); + DeleteFileA(dest); + ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); + + create_file(tmpfile, inf_data1); + SetLastError(0xdeadbeef); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), NULL, NULL); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(is_in_inf_dir(dest), "Got unexpected path '%s'.\n", dest); + strcpy(orig_dest, dest); + + create_file(tmpfile, inf_data2); + SetLastError(0xdeadbeef); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), NULL, NULL); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(is_in_inf_dir(dest), "Got unexpected path '%s'.\n", dest); + ok(strcmp(dest, orig_dest), "Expected INF files to be copied to differnet paths.\n"); + + res = SetupUninstallOEMInfA(strrchr(dest, '\\') + 1, 0, NULL); + ok(res, "Failed to uninstall '%s', error %u.\n", dest, GetLastError()); + todo_wine ok(!file_exists(dest), "Expected inf '%s' to not exist\n", dest); + DeleteFileA(dest); + strcpy(pnf, dest); + *(strrchr(pnf, '.') + 1) = 'p'; + ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); + + res = SetupUninstallOEMInfA(strrchr(orig_dest, '\\') + 1, 0, NULL); + ok(res, "Failed to uninstall '%s', error %u.\n", orig_dest, GetLastError()); + todo_wine ok(!file_exists(orig_dest), "Expected inf '%s' to not exist\n", dest); + DeleteFileA(orig_dest); + strcpy(pnf, dest); + *(strrchr(pnf, '.') + 1) = 'p'; + ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); + + GetWindowsDirectoryA(orig_dest, sizeof(orig_dest)); + strcat(orig_dest, "\\inf\\"); + strcat(orig_dest, tmpfile); + res = CopyFileA(tmpfile, orig_dest, TRUE); +todo_wine + ok(res, "Failed to copy file, error %u.\n", GetLastError()); + SetLastError(0xdeadbeef); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), NULL, NULL); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); +todo_wine + ok(!strcasecmp(dest, orig_dest), "Expected '%s', got '%s'.\n", orig_dest, dest); + + /* Since it wasn't actually installed, SetupUninstallOEMInf would fail here. */ + res = DeleteFileA(dest); + ok(res, "Failed to delete '%s', error %u.\n", tmpfile, GetLastError()); + + res = DeleteFileA(tmpfile); + ok(res, "Failed to delete '%s', error %u.\n", tmpfile, GetLastError()); } static void create_source_file(LPSTR filename, const BYTE *data, DWORD size) @@ -716,12 +714,12 @@ static void test_SetupUninstallOEMInf(void) BOOL ret; SetLastError(0xdeadbeef); - ret = pSetupUninstallOEMInfA(NULL, 0, NULL); + ret = SetupUninstallOEMInfA(NULL, 0, NULL); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pSetupUninstallOEMInfA("", 0, NULL); + ret = SetupUninstallOEMInfA("", 0, NULL); todo_wine { ok(!ret, "Expected failure\n"); @@ -729,7 +727,7 @@ static void test_SetupUninstallOEMInf(void) } SetLastError(0xdeadbeef); - ret = pSetupUninstallOEMInfA("nonexistent.inf", 0, NULL); + ret = SetupUninstallOEMInfA("nonexistent.inf", 0, NULL); todo_wine { ok(!ret, "Expected failure\n"); @@ -835,17 +833,11 @@ START_TEST(misc) HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); pSetupGetFileCompressionInfoExA = (void*)GetProcAddress(hsetupapi, "SetupGetFileCompressionInfoExA"); - pSetupCopyOEMInfA = (void*)GetProcAddress(hsetupapi, "SetupCopyOEMInfA"); pSetupQueryInfOriginalFileInformationA = (void*)GetProcAddress(hsetupapi, "SetupQueryInfOriginalFileInformationA"); - pSetupUninstallOEMInfA = (void*)GetProcAddress(hsetupapi, "SetupUninstallOEMInfA"); GetCurrentDirectoryA(MAX_PATH, CURR_DIR); - if (pSetupCopyOEMInfA) - test_SetupCopyOEMInf(); - else - win_skip("SetupCopyOEMInfA is not available\n"); - + test_SetupCopyOEMInf(); test_SetupGetFileCompressionInfo(); if (pSetupGetFileCompressionInfoExA) @@ -854,14 +846,8 @@ START_TEST(misc) win_skip("SetupGetFileCompressionInfoExA is not available\n"); test_SetupDecompressOrCopyFile(); - - if (pSetupUninstallOEMInfA) - test_SetupUninstallOEMInf(); - else - win_skip("SetupUninstallOEMInfA is not available\n"); - + test_SetupUninstallOEMInf(); test_defaultcallback(); - test_SetupLogError(); test_CM_Get_Version(); } -- 2.21.0

1 3

[PATCH] ntdll: Created ADD_GTCTO environment variable that increases thread suspension time out.
by Vanida Plamondon 23 May '19

23 May '19

This patch was made as using an environment variable instead of a registry entry because it addresses unwanted/bugged behaviour. I could be wrong about that. With ADD_GTCTO=5000, Magic the Gathering: Arena's updater/ downloader completes without issue. It should work for other outdated unity-build games that suffer the same issue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45546 Signed-off-by: Vanida Plamondon <vanida.plamondon(a)gmail.com> --- v1: Created ADD_GTCTO environment variable --- dlls/ntdll/thread.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 46de839400..09aa94ba65 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -23,6 +23,7 @@ #include <assert.h> #include <stdarg.h> +#include <stdlib.h> #include <limits.h> #include <sys/types.h> #ifdef HAVE_SYS_MMAN_H @@ -772,7 +773,11 @@ NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int flags, BOOL *self ) { NTSTATUS ret; - DWORD dummy, i; + DWORD dummy, i, gtcto; + + /* get the ADD_GTCTO value, if any */ + const char *add_gtcto = getenv( "ADD_GTCTO" ); + gtcto = add_gtcto ? ( DWORD ) ( atol( add_gtcto) + 100 ) : 100; SERVER_START_REQ( get_thread_context ) { @@ -787,7 +792,7 @@ NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int fla if (ret == STATUS_PENDING) { - for (i = 0; i < 100; i++) + for (i = 0; i < gtcto; i++) { SERVER_START_REQ( get_thread_context ) { -- 2.20.1

1 0

[PATCH 1/5] strmbase: Use an unsigned int for the GetPin() callback.
by Zebediah Figura 23 May '19

23 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/evr/evr.c | 4 ++-- dlls/qcap/audiorecord.c | 5 ++--- dlls/qcap/avico.c | 15 ++++----------- dlls/qcap/avimux.c | 15 ++++++++------- dlls/qcap/smartteefilter.c | 18 +++++------------- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 6 +++--- dlls/quartz/filesource.c | 6 ++---- dlls/quartz/parser.c | 14 +++++--------- dlls/strmbase/filter.c | 2 +- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 4 ++-- dlls/winegstreamer/gstdemux.c | 10 ++++------ dlls/wineqtdecoder/qtsplitter.c | 2 +- include/wine/strmbase.h | 2 +- 15 files changed, 44 insertions(+), 67 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 01e4ee4598..493696f465 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -191,9 +191,9 @@ static const IBaseFilterVtbl basefilter_vtbl = BaseFilterImpl_QueryVendorInfo }; -static IPin* WINAPI filter_GetPin(BaseFilter *iface, int position) +static IPin * WINAPI filter_GetPin(BaseFilter *iface, unsigned int index) { - FIXME("(%p, %d): stub!\n", iface, position); + FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; } diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 373bc9a025..1e5aa43cfb 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -171,10 +171,9 @@ static const IBaseFilterVtbl AudioRecordVtbl = { BaseFilterImpl_QueryVendorInfo }; -static IPin* WINAPI AudioRecord_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI AudioRecord_GetPin(BaseFilter *iface, unsigned int index) { - AudioRecord *This = impl_from_BaseFilter(iface); - FIXME("(%p, %d): stub\n", This, pos); + FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; } diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 5ea4016a65..770790da1c 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -244,24 +244,17 @@ static const IBaseFilterVtbl AVICompressorVtbl = { AVICompressor_QueryVendorInfo }; -static IPin* WINAPI AVICompressor_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI AVICompressor_GetPin(BaseFilter *iface, unsigned int index) { AVICompressor *This = impl_from_BaseFilter(iface); IPin *ret; - TRACE("(%p)->(%d)\n", This, pos); - - switch(pos) { - case 0: + if (index == 0) ret = &This->in->pin.IPin_iface; - break; - case 1: + else if (index == 1) ret = &This->out->pin.IPin_iface; - break; - default: - TRACE("No pin %d\n", pos); + else return NULL; - }; IPin_AddRef(ret); return ret; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index ff45fb0112..ccec60c0b5 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -116,18 +116,19 @@ static inline AviMux* impl_from_BaseFilter(BaseFilter *filter) return CONTAINING_RECORD(filter, AviMux, filter); } -static IPin* WINAPI AviMux_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI AviMux_GetPin(BaseFilter *iface, unsigned int index) { AviMux *This = impl_from_BaseFilter(iface); - TRACE("(%p)->(%d)\n", This, pos); - - if(pos == 0) { + if (!index) + { IPin_AddRef(&This->out->pin.pin.IPin_iface); return &This->out->pin.pin.IPin_iface; - }else if(pos>0 && pos<=This->input_pin_no) { - IPin_AddRef(&This->in[pos-1]->pin.pin.IPin_iface); - return &This->in[pos-1]->pin.pin.IPin_iface; + } + else if (index <= This->input_pin_no) + { + IPin_AddRef(&This->in[index - 1]->pin.pin.IPin_iface); + return &This->in[index - 1]->pin.pin.IPin_iface; } return NULL; diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index cbcbc455ed..e16d08a759 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -199,27 +199,19 @@ static const IBaseFilterVtbl SmartTeeFilterVtbl = { BaseFilterImpl_QueryVendorInfo }; -static IPin* WINAPI SmartTeeFilter_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI SmartTeeFilter_GetPin(BaseFilter *iface, unsigned int index) { SmartTeeFilter *This = impl_from_BaseFilter(iface); IPin *ret; - TRACE("(%p)->(%d)\n", This, pos); - - switch(pos) { - case 0: + if (index == 0) ret = &This->input->pin.IPin_iface; - break; - case 1: + else if (index == 1) ret = &This->capture->pin.IPin_iface; - break; - case 2: + else if (index == 2) ret = &This->preview->pin.IPin_iface; - break; - default: - TRACE("No pin %d\n", pos); + else return NULL; - } IPin_AddRef(ret); return ret; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index feb9c08e85..54d9e59786 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -192,11 +192,11 @@ static const IUnknownVtbl unknown_inner_vtbl = unknown_inner_Release, }; -static IPin* WINAPI VfwCapture_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI VfwCapture_GetPin(BaseFilter *iface, unsigned int index) { VfwCapture *This = impl_from_BaseFilter(iface); - if (pos >= 1 || pos < 0) + if (index >= 1) return NULL; IPin_AddRef(This->pOutputPin); diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index bc91f72af1..cbaca69962 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -339,14 +339,14 @@ static const IUnknownVtbl samplegrabber_vtbl = SampleGrabber_Release, }; -static IPin *WINAPI SampleGrabber_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI SampleGrabber_GetPin(BaseFilter *iface, unsigned int index) { SG_Impl *This = impl_from_BaseFilter(iface); IPin *pin; - if (pos == 0) + if (index == 0) pin = &This->pin_in.IPin_iface; - else if (pos == 1) + else if (index == 1) pin = &This->pin_out.IPin_iface; else return NULL; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a331d3359a..f3a2c43c63 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -392,13 +392,11 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * return hr; } -static IPin* WINAPI AsyncReader_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI AsyncReader_GetPin(BaseFilter *iface, unsigned int index) { AsyncReader *This = impl_from_BaseFilter(iface); - TRACE("%p->(%d)\n", This, pos); - - if (pos >= 1 || !This->pOutputPin) + if (index >= 1 || !This->pOutputPin) return NULL; IPin_AddRef(This->pOutputPin); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 2af8a1ff6d..e21908504a 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -62,19 +62,15 @@ static inline ParserImpl *impl_from_BaseFilter( BaseFilter *iface ) return CONTAINING_RECORD(iface, ParserImpl, filter); } -/* FIXME: WRONG */ -static IPin* WINAPI Parser_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI Parser_GetPin(BaseFilter *iface, unsigned int index) { - ParserImpl *This = impl_from_BaseFilter(iface); + ParserImpl *filter = impl_from_BaseFilter(iface); - TRACE("%p->(%x)\n", This, pos); - - /* Input pin also has a pin, hence the > and not >= */ - if (pos > This->cStreams || pos < 0) + if (index > filter->cStreams) return NULL; - IPin_AddRef(This->ppPins[pos]); - return This->ppPins[pos]; + IPin_AddRef(filter->ppPins[index]); + return filter->ppPins[index]; } static const BaseFilterFuncTable BaseFuncTable = { diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 8bec368c15..c554097814 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -137,10 +137,10 @@ HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter *iface, IEnumPins **enum_pins HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin **ret) { BaseFilter *This = impl_from_IBaseFilter(iface); + unsigned int i; PIN_INFO info; HRESULT hr; IPin *pin; - int i; TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c6c7978235..cf6643befe 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -183,11 +183,11 @@ static const IPinVtbl BaseRenderer_InputPin_Vtbl = BaseInputPinImpl_NewSegment }; -static IPin* WINAPI BaseRenderer_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI BaseRenderer_GetPin(BaseFilter *iface, unsigned int index) { BaseRenderer *This = impl_from_BaseFilter(iface); - if (pos >= 1 || pos < 0) + if (index >= 1) return NULL; IPin_AddRef(&This->pInputPin->pin.IPin_iface); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index b8eb60ce2e..8f156ae3de 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -128,11 +128,11 @@ static HRESULT WINAPI TransformFilter_Output_GetMediaType(BasePin *This, int iPo return S_OK; } -static IPin *WINAPI TransformFilter_GetPin(BaseFilter *iface, int index) +static IPin *WINAPI TransformFilter_GetPin(BaseFilter *iface, unsigned int index) { TransformFilter *filter = impl_from_BaseFilter(iface); - if (index >= 2 || index < 0) + if (index >= 2) return NULL; IPin_AddRef(filter->ppPins[index]); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3653f647c4..3e660216e8 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1192,20 +1192,18 @@ static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) return CONTAINING_RECORD(iface, GSTOutPin, seek.IMediaSeeking_iface); } -static IPin* WINAPI GST_GetPin(BaseFilter *base, int pos) +static IPin* WINAPI GST_GetPin(BaseFilter *base, unsigned int index) { GSTImpl *This = impl_from_IBaseFilter(&base->IBaseFilter_iface); IPin *pin; - TRACE("%p: Asking for pos %x\n", This, pos); - - if (pos > This->cStreams || pos < 0) + if (index > This->cStreams) return NULL; - if (!pos) + if (!index) pin = &This->pInputPin.pin.IPin_iface; else - pin = &This->ppPins[pos - 1]->pin.pin.IPin_iface; + pin = &This->ppPins[index - 1]->pin.pin.IPin_iface; IPin_AddRef(pin); return pin; diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 651a4a8c6b..6fd4554056 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -202,7 +202,7 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) * Base Filter */ -static IPin * WINAPI QT_GetPin(BaseFilter *base, int index) +static IPin * WINAPI QT_GetPin(BaseFilter *base, unsigned int index) { QTSplitter *filter = impl_from_BaseFilter(base); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 2f150e8c48..c10e6e2123 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -168,7 +168,7 @@ typedef struct BaseFilter const struct BaseFilterFuncTable* pFuncsTable; } BaseFilter; -typedef IPin* (WINAPI *BaseFilter_GetPin)(BaseFilter* iface, int iPosition); +typedef IPin * (WINAPI *BaseFilter_GetPin)(BaseFilter *iface, unsigned int index); typedef struct BaseFilterFuncTable { /* Required */ -- 2.21.0

1 4

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 23 May '19

23 May '19

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/po/fi.po b/po/fi.po index 13840425d0..37811c3eec 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6809,10 +6809,8 @@ msgid "Begin request has already been made.\n" msgstr "Aloituspyyntö on jo tehty.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object is not initialized.\n" msgid "Sink has not been finalized.\n" -msgstr "Objektia ei ole alustettu.\n" +msgstr "Ulostuloa ei ole viimeistelty.\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7087,68 +7085,52 @@ msgid "Unsupported media source characteristics.\n" msgstr "Medialähteen ominaisuuksia ei tueta.\n" #: mferror.mc:536 -#, fuzzy -#| msgid "Rate change was preempted.\n" msgid "Stream sink was removed.\n" -msgstr "Nopeuden vaihto sivuutettiin.\n" +msgstr "Virtaulostulo poistettiin.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "Virtaulostulojen ajoitus ei täsmää.\n" #: mferror.mc:550 -#, fuzzy -#| msgid "Media stream has no duration set.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "Mediavirralla ei ole kestoa.\n" +msgstr "Mediaulostulon virtaulostuloja ei voi muuttaa.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Toimialue on jo olemassa.\n" +msgstr "Virtaulostulo on jo olemassa.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation was cancelled.\n" msgid "Sample allocation was canceled.\n" -msgstr "Toimenpide keskeytettiin.\n" +msgstr "Näytteen varaaminen keskeytettiin.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Hakemisto ei ole tyhjä.\n" +msgstr "Näytteenvaraaja on tyhjä.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Clock state was already set.\n" msgid "Sink was already stopped.\n" -msgstr "Kellon tila oli jo asetettu.\n" +msgstr "Ulostulo oli jo pysäytetty.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "ASF-tiedoston siirtonopeus (bitrate) oli tuntematon.\n" #: mferror.mc:592 -#, fuzzy -#| msgid "No media streams were selected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Mediavirtoja ei ole valittu.\n" +msgstr "Ulostulolle ei ole valittu mediavirtoja.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "Tiedostonimi on liian pitkä.\n" +msgstr "Metatieto on liian pitkä.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "Ulostulo ei käsitellyt näytteitä.\n" #: mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "Ulostulolle ei annettu tarvittavia otsikoita.\n" #: mferror.mc:627 msgid "Optional node is invalid.\n" -- 2.21.0

1 0

Re: [PATCH] gdiplus: add version resource
by Louis Lenders 23 May '19

23 May '19

>> Is there a specific reason not to use latest versions? As we ''mimic'' win7 by default I chose this one. That`s the only reason. 2019-05-23 19:02 GMT+02:00, Louis Lenders <xerox.xerox2000x(a)gmail.com>: > As we ''mimic'' win7 by default I chose this one. That`s the only reason. > > 2019-05-23 17:38 GMT+02:00, Zhiyi Zhang <zzhang(a)codeweavers.com>: >> >> >> On 5/23/19 11:23 PM, Louis Lenders wrote: >>> >>> https://bugs.winehq.org/show_bug.cgi?id=47137 >>> >>> >>> >>> Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> >>> --- >>> dlls/gdiplus/gdiplus.rc | 9 +++++++++ >>> 1 file changed, 9 insertions(+) >>> >>> diff --git a/dlls/gdiplus/gdiplus.rc b/dlls/gdiplus/gdiplus.rc >>> index 5c7e2cfe97..6191c1ab15 100644 >>> --- a/dlls/gdiplus/gdiplus.rc >>> +++ b/dlls/gdiplus/gdiplus.rc >>> @@ -18,6 +18,15 @@ >>> * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA >>> 02110-1301, >>> USA >>> */ >>> >>> +#define WINE_FILEDESCRIPTION_STR "Wine gdiplus" >>> +#define WINE_FILENAME_STR "gdiplus.dll" >>> +#define WINE_FILEVERSION 6,1,7601,17514 >>> +#define WINE_FILEVERSION_STR "6.1.7601.17514" >>> +#define WINE_PRODUCTVERSION 6,1,7601,17514 >>> +#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" >> Is there a specific reason not to use latest versions? >> >>> + >>> +#include "wine/wine_common_ver.rc" >>> + >>> /* @makedep: gdiplus.manifest */ >>> WINE_MANIFEST 24 gdiplus.manifest >>> >> >> >

1 0

[PATCH 2/3] server: Store pending flag in async object.
by Jacek Caban 23 May '19

23 May '19

Instead of abusing direct_result. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/async.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)

2 1

[PATCH 1/3] ntdll: Introduce wait_async helper.
by Jacek Caban 23 May '19

23 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-)

1 0

[PATCHv2] xaudio2: Use new features from FAudio 19.06 (but keep compatibility for <=19.05)
by elee＠codeweavers.com 23 May '19

23 May '19

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- configure.ac | 4 ++++ dlls/xaudio2_7/x3daudio.c | 6 ++++++ dlls/xaudio2_7/xaudio_dll.c | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ae8e85b356..c477796caf 100644 --- a/configure.ac +++ b/configure.ac @@ -1690,6 +1690,10 @@ then WINE_PACKAGE_FLAGS(FAUDIO,[faudio],[-lFAudio],,, [AC_CHECK_HEADERS([FAudio.h], [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])])]) + WINE_CHECK_LIB_FUNCS(\ + FAudio_CommitOperationSet \ + F3DAudioInitialize8, + [$FAUDIO_LIBS]) fi WINE_NOTICE_WITH(faudio,[test "x$ac_cv_lib_soname_FAudio" = "x"], [libFAudio ${notice_platform}development files not found, XAudio2 won't be supported.]) diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index ee3367e092..5bc7c8473c 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -51,8 +53,12 @@ HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, X3DAUDIO_HANDLE handle) { TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle); +#ifdef HAVE_F3DAUDIOINITIALIZE8 + return F3DAudioInitialize8(chanmask, speedofsound, handle); +#else F3DAudioInitialize(chanmask, speedofsound, handle); return S_OK; +#endif } #endif /* XAUDIO2_VER >= 8 */ diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index da21cc0353..70889176a4 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1796,9 +1796,13 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - TRACE("(%p)->(0x%x): stub!\n", This, operationSet); + TRACE("(%p)->(0x%x)\n", This, operationSet); +#ifdef HAVE_FAUDIO_COMMITOPERATIONSET + return FAudio_CommitOperationSet(This->faudio, operationSet); +#else return FAudio_CommitChanges(This->faudio); +#endif } static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, -- 2.21.0

3 2