September 2018 - Wine-Commits

Józef Kucia : wined3d: Derive allowed shader versions from the current feature level.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: wine Branch: master Commit: 937f4897fd6507203eb5738e79f073f9754b555b URL: https://source.winehq.org/git/wine.git/?a=commit;h=937f4897fd6507203eb5738e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 25 10:33:25 2018 +0200 wined3d: Derive allowed shader versions from the current feature level. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 27 --------------------------- dlls/d3d8/shader.c | 2 -- dlls/d3d9/shader.c | 2 -- dlls/wined3d/shader.c | 37 ++++++++++++++++++++++++++++++------- include/wine/wined3d.h | 1 - 5 files changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 759c570..a1da9ef 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -517,27 +517,6 @@ static const struct wined3d_parent_ops d3d_vertex_shader_wined3d_parent_ops = d3d_vertex_shader_wined3d_object_destroyed, }; -static unsigned int d3d_sm_from_feature_level(D3D_FEATURE_LEVEL feature_level) -{ - switch (feature_level) - { - case D3D_FEATURE_LEVEL_11_1: - case D3D_FEATURE_LEVEL_11_0: - return 5; - case D3D_FEATURE_LEVEL_10_1: - case D3D_FEATURE_LEVEL_10_0: - return 4; - case D3D_FEATURE_LEVEL_9_3: - return 3; - case D3D_FEATURE_LEVEL_9_2: - case D3D_FEATURE_LEVEL_9_1: - return 2; - default: - ERR("Unexpected feature_level %#x.\n", feature_level); - } - return 0; -} - static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) { @@ -557,7 +536,6 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d wined3d_mutex_unlock(); return hr; } - desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_vs(device->wined3d_device, &desc, shader, &d3d_vertex_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -769,7 +747,6 @@ static HRESULT d3d11_hull_shader_init(struct d3d11_hull_shader *shader, struct d wined3d_mutex_unlock(); return hr; } - desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_hs(device->wined3d_device, &desc, shader, &d3d11_hull_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -971,7 +948,6 @@ static HRESULT d3d11_domain_shader_init(struct d3d11_domain_shader *shader, stru wined3d_mutex_unlock(); return hr; } - desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_ds(device->wined3d_device, &desc, shader, &d3d11_domain_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -1477,7 +1453,6 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, WARN("Failed to extract shader, hr %#x.\n", hr); return hr; } - desc.max_version = d3d_sm_from_feature_level(device->feature_level); memset(&so_desc, 0, sizeof(so_desc)); if (so_entries) @@ -1827,7 +1802,6 @@ static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d wined3d_mutex_unlock(); return hr; } - desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_ps(device->wined3d_device, &desc, shader, &d3d_pixel_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -2037,7 +2011,6 @@ static HRESULT d3d11_compute_shader_init(struct d3d11_compute_shader *shader, st wined3d_mutex_unlock(); return hr; } - desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_cs(device->wined3d_device, &desc, shader, &d3d11_compute_shader_wined3d_parent_ops, &shader->wined3d_shader); diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index 8192b23..8a68812 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -121,7 +121,6 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.patch_constant_signature.element_count = 0; - desc.max_version = 1; wined3d_mutex_lock(); hr = wined3d_shader_create_vs(device->wined3d_device, &desc, shader, @@ -173,7 +172,6 @@ HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, struct d3d8_dev desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.patch_constant_signature.element_count = 0; - desc.max_version = 1; wined3d_mutex_lock(); hr = wined3d_shader_create_ps(device->wined3d_device, &desc, shader, diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 9cb3983..5fc356c 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -148,7 +148,6 @@ HRESULT vertexshader_init(struct d3d9_vertexshader *shader, struct d3d9_device * desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.patch_constant_signature.element_count = 0; - desc.max_version = 3; wined3d_mutex_lock(); hr = wined3d_shader_create_vs(device->wined3d_device, &desc, shader, @@ -302,7 +301,6 @@ HRESULT pixelshader_init(struct d3d9_pixelshader *shader, struct d3d9_device *de desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.patch_constant_signature.element_count = 0; - desc.max_version = 3; wined3d_mutex_lock(); hr = wined3d_shader_create_ps(device->wined3d_device, &desc, shader, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 20d4f07..62ec971 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3321,8 +3321,8 @@ const struct wined3d_shader_backend_ops none_shader_backend = shader_none_has_ffp_proj_control, }; -static HRESULT shader_set_function(struct wined3d_shader *shader, DWORD float_const_count, - enum wined3d_shader_type type, unsigned int max_version) +static HRESULT shader_set_function(struct wined3d_shader *shader, + unsigned int float_const_count, enum wined3d_shader_type type, unsigned int max_version) { const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info; struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; @@ -3351,12 +3351,12 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, DWORD float_co if (reg_maps->shader_version.type != type) { - WARN("Wrong shader type %d.\n", reg_maps->shader_version.type); + WARN("Wrong shader type %#x.\n", reg_maps->shader_version.type); return WINED3DERR_INVALIDCALL; } if (reg_maps->shader_version.major > max_version) { - WARN("Shader version %d not supported by this D3D API version.\n", reg_maps->shader_version.major); + WARN("Shader version %u not supported by this device.\n", reg_maps->shader_version.major); return WINED3DERR_INVALIDCALL; } switch (type) @@ -3636,17 +3636,40 @@ static HRESULT shader_signature_copy(struct wined3d_shader_signature *dst, return WINED3D_OK; } +static unsigned int shader_max_version_from_feature_level(enum wined3d_feature_level level) +{ + switch (level) + { + case WINED3D_FEATURE_LEVEL_11_1: + case WINED3D_FEATURE_LEVEL_11: + return 5; + case WINED3D_FEATURE_LEVEL_10_1: + case WINED3D_FEATURE_LEVEL_10: + return 4; + case WINED3D_FEATURE_LEVEL_9_SM3: + return 3; + case WINED3D_FEATURE_LEVEL_9_SM2: + case WINED3D_FEATURE_LEVEL_9_1: + return 2; + default: + return 1; + } +} + static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, DWORD float_const_count, enum wined3d_shader_type type, void *parent, const struct wined3d_parent_ops *parent_ops) { + unsigned int max_version; size_t byte_code_size; SIZE_T total; HRESULT hr; char *ptr; - TRACE("byte_code %p, byte_code_size %#lx, format %#x, max_version %#x.\n", - desc->byte_code, (long)desc->byte_code_size, desc->format, desc->max_version); + TRACE("byte_code %p, byte_code_size %#lx, format %#x.\n", + desc->byte_code, (long)desc->byte_code_size, desc->format); + + max_version = shader_max_version_from_feature_level(device->feature_level); if (!(shader->frontend = shader_select_frontend(desc->format))) { @@ -3732,7 +3755,7 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device memcpy(shader->function, desc->byte_code, byte_code_size); shader->functionLength = byte_code_size; - if (FAILED(hr = shader_set_function(shader, float_const_count, type, desc->max_version))) + if (FAILED(hr = shader_set_function(shader, float_const_count, type, max_version))) { WARN("Failed to set function, hr %#x.\n", hr); shader_cleanup(shader); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ef89caf..dc613ff 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2063,7 +2063,6 @@ struct wined3d_shader_desc struct wined3d_shader_signature input_signature; struct wined3d_shader_signature output_signature; struct wined3d_shader_signature patch_constant_signature; - unsigned int max_version; }; struct wined3d_stream_output_element

1 0

Alexandre Julliard : kernel32: Remove the DOS/Win16/ OS2 binary distinction.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: wine Branch: master Commit: 1060567cc592aaf7aa453d43a0a48bf7e9ac87f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1060567cc592aaf7aa453d43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 25 19:23:00 2018 +0200 kernel32: Remove the DOS/Win16/OS2 binary distinction. They all need to be run through winevdm. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_private.h | 2 -- dlls/kernel32/module.c | 72 +----------------------------------------- dlls/kernel32/process.c | 8 ++--- 3 files changed, 3 insertions(+), 79 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 9073e18..b465d17 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -69,8 +69,6 @@ enum binary_type BINARY_UNKNOWN = 0, BINARY_PE, BINARY_WIN16, - BINARY_OS216, - BINARY_DOS, BINARY_UNIX_EXE, BINARY_UNIX_LIB }; diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 31e3014..f03b498 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -259,54 +259,6 @@ BOOL WINAPI DisableThreadLibraryCalls( HMODULE hModule ) } -/* Check whether a file is an OS/2 or a very old Windows executable - * by testing on import of KERNEL. - * - * Reading the module imports is the only reasonable way of discerning - * old Windows binaries from OS/2 ones. - */ -static DWORD MODULE_Decide_OS2_OldWin(HANDLE hfile, const IMAGE_DOS_HEADER *mz, const IMAGE_OS2_HEADER *ne) -{ - DWORD currpos = SetFilePointer( hfile, 0, NULL, SEEK_CUR); - DWORD ret = BINARY_OS216; - LPWORD modtab = NULL; - LPSTR nametab = NULL; - DWORD len; - int i; - - /* read modref table */ - if ( (SetFilePointer( hfile, mz->e_lfanew + ne->ne_modtab, NULL, SEEK_SET ) == -1) - || (!(modtab = HeapAlloc( GetProcessHeap(), 0, ne->ne_cmod*sizeof(WORD)))) - || (!(ReadFile(hfile, modtab, ne->ne_cmod*sizeof(WORD), &len, NULL))) - || (len != ne->ne_cmod*sizeof(WORD)) ) - goto done; - - /* read imported names table */ - if ( (SetFilePointer( hfile, mz->e_lfanew + ne->ne_imptab, NULL, SEEK_SET ) == -1) - || (!(nametab = HeapAlloc( GetProcessHeap(), 0, ne->ne_enttab - ne->ne_imptab))) - || (!(ReadFile(hfile, nametab, ne->ne_enttab - ne->ne_imptab, &len, NULL))) - || (len != ne->ne_enttab - ne->ne_imptab) ) - goto done; - - for (i=0; i < ne->ne_cmod; i++) - { - LPSTR module = &nametab[modtab[i]]; - TRACE("modref: %.*s\n", module[0], &module[1]); - if (!(strncmp(&module[1], "KERNEL", module[0]))) - { /* very old Windows file */ - MESSAGE("This seems to be a very old (pre-3.0) Windows executable. Expect crashes, especially if this is a real-mode binary !\n"); - ret = BINARY_WIN16; - break; - } - } - -done: - HeapFree( GetProcessHeap(), 0, modtab); - HeapFree( GetProcessHeap(), 0, nametab); - SetFilePointer( hfile, currpos, NULL, SEEK_SET); /* restore filepos */ - return ret; -} - /*********************************************************************** * MODULE_GetBinaryType */ @@ -460,7 +412,7 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) * This will tell us if there is more header information * to read or not. */ - info->type = BINARY_DOS; + info->type = BINARY_WIN16; info->arch = IMAGE_FILE_MACHINE_I386; if (SetFilePointer( hfile, header.mz.e_lfanew, NULL, SEEK_SET ) == -1) return; if (!ReadFile( hfile, &ext_header, sizeof(ext_header), &len, NULL ) || len < 4) return; @@ -504,28 +456,6 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) } } } - else if (!memcmp( &ext_header.os2.ne_magic, "NE", 2 )) - { - /* This is a Windows executable (NE) header. This can - * mean either a 16-bit OS/2 or a 16-bit Windows or even a - * DOS program (running under a DOS extender). To decide - * which, we'll have to read the NE header. - */ - if (len >= sizeof(ext_header.os2)) - { - if (ext_header.os2.ne_flags & NE_FFLAGS_LIBMODULE) info->flags |= BINARY_FLAG_DLL; - switch ( ext_header.os2.ne_exetyp ) - { - case 1: info->type = BINARY_OS216; break; /* OS/2 */ - case 2: info->type = BINARY_WIN16; break; /* Windows */ - case 3: info->type = BINARY_DOS; break; /* European MS-DOS 4.x */ - case 4: info->type = BINARY_WIN16; break; /* Windows 386; FIXME: is this 32bit??? */ - case 5: info->type = BINARY_DOS; break; /* BOSS, Borland Operating System Services */ - /* other types, e.g. 0 is: "unknown" */ - default: info->type = MODULE_Decide_OS2_OldWin(hfile, &header.mz, &ext_header.os2); break; - } - } - } } } diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b0b5ccf..e159047 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2478,9 +2478,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); break; - case BINARY_OS216: case BINARY_WIN16: - case BINARY_DOS: TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) ); retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); @@ -2498,7 +2496,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A if (!strcmpiW( p, comW ) || !strcmpiW( p, pifW )) { TRACE( "starting %s as DOS binary\n", debugstr_w(name) ); - binary_info.type = BINARY_DOS; + binary_info.type = BINARY_WIN16; binary_info.arch = IMAGE_FILE_MACHINE_I386; retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, @@ -2640,12 +2638,10 @@ static void exec_process( LPCWSTR name ) /* check for .com or .pif extension */ if (!(p = strrchrW( name, '.' ))) break; if (strcmpiW( p, comW ) && strcmpiW( p, pifW )) break; - binary_info.type = BINARY_DOS; + binary_info.type = BINARY_WIN16; binary_info.arch = IMAGE_FILE_MACHINE_I386; /* fall through */ - case BINARY_OS216: case BINARY_WIN16: - case BINARY_DOS: TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) ); create_vdm_process( name, GetCommandLineW(), NULL, NULL, NULL, NULL, FALSE, 0, &startup_info, &info, NULL, &binary_info, TRUE );

1 0

Alexandre Julliard : kernel32: Reimplement GetBinaryTypeW to rely on the server for header parsing.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: wine Branch: master Commit: 57512807b9da8c5852e0ff1466950bad9ece36ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=57512807b9da8c5852e0ff14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 25 17:42:19 2018 +0200 kernel32: Reimplement GetBinaryTypeW to rely on the server for header parsing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 122 ++++++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 57 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 1188298..31e3014 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -563,76 +563,84 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) * ".com" and ".pif" files are only recognized by their file name extension, * as per native Windows. */ -BOOL WINAPI GetBinaryTypeW( LPCWSTR lpApplicationName, LPDWORD lpBinaryType ) +BOOL WINAPI GetBinaryTypeW( LPCWSTR name, LPDWORD type ) { - BOOL ret = FALSE; - HANDLE hfile; - struct binary_info binary_info; + static const WCHAR comW[] = { '.','c','o','m',0 }; + static const WCHAR pifW[] = { '.','p','i','f',0 }; + HANDLE hfile, mapping; + NTSTATUS status; + const WCHAR *ptr; - TRACE("%s\n", debugstr_w(lpApplicationName) ); + TRACE("%s\n", debugstr_w(name) ); - /* Sanity check. - */ - if ( lpApplicationName == NULL || lpBinaryType == NULL ) - return FALSE; + if (type == NULL) return FALSE; - /* Open the file indicated by lpApplicationName for reading. - */ - hfile = CreateFileW( lpApplicationName, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, 0 ); + hfile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); if ( hfile == INVALID_HANDLE_VALUE ) return FALSE; - /* Check binary type - */ - MODULE_get_binary_info( hfile, &binary_info ); - switch (binary_info.type) - { - case BINARY_UNKNOWN: + status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY, + NULL, NULL, PAGE_READONLY, SEC_IMAGE, hfile ); + CloseHandle( hfile ); + + switch (status) { - static const WCHAR comW[] = { '.','C','O','M',0 }; - static const WCHAR pifW[] = { '.','P','I','F',0 }; - const WCHAR *ptr; - - /* try to determine from file name */ - ptr = strrchrW( lpApplicationName, '.' ); - if (!ptr) break; - if (!strcmpiW( ptr, comW )) + case STATUS_SUCCESS: { - *lpBinaryType = SCS_DOS_BINARY; - ret = TRUE; + SECTION_IMAGE_INFORMATION info; + + status = NtQuerySection( mapping, SectionImageInformation, &info, sizeof(info), NULL ); + CloseHandle( mapping ); + if (status) return FALSE; + switch (info.Machine) + { + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARM: + case IMAGE_FILE_MACHINE_THUMB: + case IMAGE_FILE_MACHINE_ARMNT: + case IMAGE_FILE_MACHINE_POWERPC: + *type = SCS_32BIT_BINARY; + return TRUE; + case IMAGE_FILE_MACHINE_AMD64: + case IMAGE_FILE_MACHINE_ARM64: + *type = SCS_64BIT_BINARY; + return TRUE; + } + return FALSE; } - else if (!strcmpiW( ptr, pifW )) + case STATUS_INVALID_IMAGE_WIN_16: + *type = SCS_WOW_BINARY; + return TRUE; + case STATUS_INVALID_IMAGE_WIN_32: + *type = SCS_32BIT_BINARY; + return TRUE; + case STATUS_INVALID_IMAGE_WIN_64: + *type = SCS_64BIT_BINARY; + return TRUE; + case STATUS_INVALID_IMAGE_NE_FORMAT: + *type = SCS_OS216_BINARY; + return TRUE; + case STATUS_INVALID_IMAGE_PROTECT: + *type = SCS_DOS_BINARY; + return TRUE; + case STATUS_INVALID_IMAGE_NOT_MZ: + if ((ptr = strrchrW( name, '.' ))) { - *lpBinaryType = SCS_PIF_BINARY; - ret = TRUE; + if (!strcmpiW( ptr, comW )) + { + *type = SCS_DOS_BINARY; + return TRUE; + } + if (!strcmpiW( ptr, pifW )) + { + *type = SCS_PIF_BINARY; + return TRUE; + } } - break; - } - case BINARY_PE: - *lpBinaryType = (binary_info.flags & BINARY_FLAG_64BIT) ? SCS_64BIT_BINARY : SCS_32BIT_BINARY; - ret = TRUE; - break; - case BINARY_WIN16: - *lpBinaryType = SCS_WOW_BINARY; - ret = TRUE; - break; - case BINARY_OS216: - *lpBinaryType = SCS_OS216_BINARY; - ret = TRUE; - break; - case BINARY_DOS: - *lpBinaryType = SCS_DOS_BINARY; - ret = TRUE; - break; - case BINARY_UNIX_EXE: - case BINARY_UNIX_LIB: - ret = FALSE; - break; + return FALSE; + default: + return FALSE; } - - CloseHandle( hfile ); - return ret; } /***********************************************************************

1 0

Zebediah Figura : quartz/filtergraph: Improve HRESULT propagation from IFilterGraph2_Connect().
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: wine Branch: master Commit: 58148a31fcc4962eee1017242e03fc8680dccf67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58148a31fcc4962eee101724… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 24 23:55:21 2018 -0500 quartz/filtergraph: Improve HRESULT propagation from IFilterGraph2_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 11 +++++-- dlls/quartz/tests/filtergraph.c | 67 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4f3e0a7..8d99ee5 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1147,7 +1147,11 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, /* Try direct connection first */ hr = IPin_Connect(ppinOut, ppinIn, NULL); - if (SUCCEEDED(hr)) + + /* If direct connection succeeded, we should propagate that return value. + * If it returned VFW_E_NOT_CONNECTED or VFW_E_NO_AUDIO_HARDWARE, then don't + * even bother trying intermediate filters, since they won't succeed. */ + if (SUCCEEDED(hr) || hr == VFW_E_NOT_CONNECTED || hr == VFW_E_NO_AUDIO_HARDWARE) goto out; TRACE("Direct connection failed, trying to render using extra filters\n"); @@ -1345,6 +1349,9 @@ error: } } + if (FAILED(hr)) + hr = VFW_E_CANNOT_CONNECT; + IEnumMoniker_Release(pEnumMoniker); out: @@ -1357,7 +1364,7 @@ out: --This->recursioncount; LeaveCriticalSection(&This->cs); TRACE("--> %08x\n", hr); - return SUCCEEDED(hr) ? S_OK : hr; + return hr; } /* Render all output pins of the given filter. Helper for FilterGraph2_Render(). */ diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6c8b9fa..5693c86 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -609,7 +609,6 @@ static void test_render_run(const WCHAR *file) ok(!refs, "Graph has %u references\n", refs); hr = test_graph_builder_connect_file(filename); -todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "got %#x\n", hr); } else @@ -776,6 +775,8 @@ struct testpin unsigned int type_count, enum_idx; AM_MEDIA_TYPE *request_mt, *accept_mt; + HRESULT Connect_hr; + HRESULT EnumMediaTypes_hr; HRESULT QueryInternalConnections_hr; }; @@ -964,6 +965,9 @@ static HRESULT WINAPI testpin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **out) struct testpin *pin = impl_from_IPin(iface); if (winetest_debug > 1) trace("%p->EnumMediaTypes()\n", pin); + if (FAILED(pin->EnumMediaTypes_hr)) + return pin->EnumMediaTypes_hr; + *out = &pin->IEnumMediaTypes_iface; IEnumMediaTypes_AddRef(*out); pin->enum_idx = 0; @@ -1063,6 +1067,8 @@ static void testpin_init(struct testpin *pin, const IPinVtbl *vtbl, PIN_DIRECTIO pin->IEnumMediaTypes_iface.lpVtbl = &testenummt_vtbl; pin->ref = 1; pin->dir = dir; + pin->Connect_hr = S_OK; + pin->EnumMediaTypes_hr = S_OK; pin->QueryInternalConnections_hr = E_NOTIMPL; } @@ -1077,12 +1083,16 @@ static HRESULT WINAPI testsource_Connect(IPin *iface, IPin *peer, const AM_MEDIA HRESULT hr; if (winetest_debug > 1) trace("%p->Connect(%p)\n", pin, peer); + if (FAILED(pin->Connect_hr)) + return pin->Connect_hr; + ok(!mt, "Got media type %p.\n", mt); if (SUCCEEDED(hr = IPin_ReceiveConnection(peer, &pin->IPin_iface, pin->request_mt))) { pin->peer = peer; IPin_AddRef(peer); + return pin->Connect_hr; } return hr; } @@ -1711,12 +1721,50 @@ static void test_graph_builder_connect(void) IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + for (source_pin.Connect_hr = 0x00040200; source_pin.Connect_hr <= 0x000402ff; + ++source_pin.Connect_hr) + { + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); + ok(hr == source_pin.Connect_hr, "Got hr %#x for Connect() hr %#x.\n", + hr, source_pin.Connect_hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + IFilterGraph2_Disconnect(graph, source_pin.peer); + IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + } + source_pin.Connect_hr = S_OK; + sink_pin.accept_mt = &sink_type; hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + for (source_pin.Connect_hr = 0x80040200; source_pin.Connect_hr <= 0x800402ff; + ++source_pin.Connect_hr) + { + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); + if (source_pin.Connect_hr == VFW_E_NOT_CONNECTED + || source_pin.Connect_hr == VFW_E_NO_AUDIO_HARDWARE) + ok(hr == source_pin.Connect_hr, "Got hr %#x for Connect() hr %#x.\n", + hr, source_pin.Connect_hr); + else + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x for Connect() hr %#x.\n", + hr, source_pin.Connect_hr); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + } + source_pin.Connect_hr = S_OK; + + for (source_pin.EnumMediaTypes_hr = 0x80040200; source_pin.EnumMediaTypes_hr <= 0x800402ff; + ++source_pin.EnumMediaTypes_hr) + { + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); + ok(hr == source_pin.EnumMediaTypes_hr, "Got hr %#x for EnumMediaTypes() hr %#x.\n", + hr, source_pin.EnumMediaTypes_hr); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + } + source_pin.EnumMediaTypes_hr = S_OK; + /* Test usage of intermediate filters. Similarly to Render(), filters are * simply tried in enumeration order. */ @@ -1740,6 +1788,20 @@ todo_wine IFilterGraph2_Disconnect(graph, sink_pin.peer); IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + for (source_pin.Connect_hr = 0x00040200; source_pin.Connect_hr <= 0x000402ff; + ++source_pin.Connect_hr) + { + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x for Connect() hr %#x.\n", hr, source_pin.Connect_hr); + ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + IFilterGraph2_Disconnect(graph, source_pin.peer); + IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + IFilterGraph2_Disconnect(graph, sink_pin.peer); + IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + } + source_pin.Connect_hr = S_OK; + IFilterGraph2_RemoveFilter(graph, &parser1.IBaseFilter_iface); IFilterGraph2_AddFilter(graph, &parser1.IBaseFilter_iface, NULL); @@ -1805,7 +1867,6 @@ todo_wine parser1_pins[1].name[0] = '~'; hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);

1 0

Henri Verbeet : d2d1: Introduce a debug helper for D2D1_POINT_2F.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: wine Branch: master Commit: ced159025529c73da4a15a9f17d580d000588229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ced159025529c73da4a15a9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 25 02:13:17 2018 +0330 d2d1: Introduce a debug helper for D2D1_POINT_2F. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap_render_target.c | 12 ++++++------ dlls/d2d1/brush.c | 8 ++++---- dlls/d2d1/d2d1_private.h | 7 +++++++ dlls/d2d1/dc_render_target.c | 12 ++++++------ dlls/d2d1/device.c | 29 +++++++++++++++-------------- dlls/d2d1/factory.c | 2 +- dlls/d2d1/geometry.c | 32 +++++++++++++++----------------- dlls/d2d1/hwnd_render_target.c | 12 ++++++------ 8 files changed, 60 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ced159025529c73da4a1…

1 0

Henri Verbeet : wined3d: Do not report WINEDDSCAPS_VIDEOMEMORY for WINED3D_NO3D adapters.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: wine Branch: master Commit: 9efa178ee6b098d4d6d171356f7f7c2da03c164d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9efa178ee6b098d4d6d17135… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 25 02:13:19 2018 +0330 wined3d: Do not report WINEDDSCAPS_VIDEOMEMORY for WINED3D_NO3D adapters. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 925a5bc..abe81de 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2389,24 +2389,24 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->ddraw_caps.ssb_color_key_caps = ckey_caps; caps->ddraw_caps.ssb_fx_caps = fx_caps; - caps->ddraw_caps.dds_caps = WINEDDSCAPS_ALPHA | - WINEDDSCAPS_BACKBUFFER | - WINEDDSCAPS_FLIP | - WINEDDSCAPS_FRONTBUFFER | - WINEDDSCAPS_OFFSCREENPLAIN | - WINEDDSCAPS_PALETTE | - WINEDDSCAPS_PRIMARYSURFACE | - WINEDDSCAPS_SYSTEMMEMORY | - WINEDDSCAPS_VIDEOMEMORY | - WINEDDSCAPS_VISIBLE; + caps->ddraw_caps.dds_caps = WINEDDSCAPS_ALPHA + | WINEDDSCAPS_BACKBUFFER + | WINEDDSCAPS_FLIP + | WINEDDSCAPS_FRONTBUFFER + | WINEDDSCAPS_OFFSCREENPLAIN + | WINEDDSCAPS_PALETTE + | WINEDDSCAPS_PRIMARYSURFACE + | WINEDDSCAPS_SYSTEMMEMORY + | WINEDDSCAPS_VISIBLE; if (!(wined3d->flags & WINED3D_NO3D)) { - caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE | - WINEDDSCAPS_MIPMAP | - WINEDDSCAPS_TEXTURE | - WINEDDSCAPS_ZBUFFER; - caps->ddraw_caps.caps |= WINEDDCAPS_3D; + caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE + | WINEDDSCAPS_MIPMAP + | WINEDDSCAPS_TEXTURE + | WINEDDSCAPS_VIDEOMEMORY + | WINEDDSCAPS_ZBUFFER; + caps->ddraw_caps.caps |= WINEDDCAPS_3D; } caps->shader_double_precision = d3d_info->shader_double_precision;

1 0

Józef Kucia : wined3d: Cleanup fallback cards list.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: wine Branch: master Commit: c83a47004a707d1292b77eabc1cf44c037d46156 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c83a47004a707d1292b77eab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 25 10:33:23 2018 +0200 wined3d: Cleanup fallback cards list. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f7ef5c0..97037b6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -637,7 +637,6 @@ enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor * card_fallback_amd[] = { {WINED3D_FEATURE_LEVEL_5, CARD_AMD_RAGE_128PRO}, - {WINED3D_FEATURE_LEVEL_6, CARD_AMD_RAGE_128PRO}, {WINED3D_FEATURE_LEVEL_7, CARD_AMD_RADEON_7200}, {WINED3D_FEATURE_LEVEL_8, CARD_AMD_RADEON_8500}, {WINED3D_FEATURE_LEVEL_9_SM2, CARD_AMD_RADEON_9500}, @@ -649,10 +648,7 @@ enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor * card_fallback_intel[] = { {WINED3D_FEATURE_LEVEL_5, CARD_INTEL_845G}, - {WINED3D_FEATURE_LEVEL_6, CARD_INTEL_845G}, - {WINED3D_FEATURE_LEVEL_7, CARD_INTEL_845G}, {WINED3D_FEATURE_LEVEL_8, CARD_INTEL_915G}, - {WINED3D_FEATURE_LEVEL_9_SM2, CARD_INTEL_915G}, {WINED3D_FEATURE_LEVEL_9_SM3, CARD_INTEL_945G}, {WINED3D_FEATURE_LEVEL_10, CARD_INTEL_G45}, {WINED3D_FEATURE_LEVEL_11, CARD_INTEL_IVBD},

1 0

Józef Kucia : dxgi: Simplify dxgi_adapter_GetDesc().
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: wine Branch: master Commit: 47cf3204b45d6a81f531008035e45ffb6f2c5d40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47cf3204b45d6a81f5310080… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 25 10:33:21 2018 +0200 dxgi: Simplify dxgi_adapter_GetDesc(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index b7d7a0a..1f81d77 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -200,9 +200,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, D if (!desc) return E_INVALIDARG; - if (FAILED(hr = dxgi_adapter_GetDesc1(iface, &desc1))) - return hr; - memcpy(desc, &desc1, sizeof(*desc)); + if (SUCCEEDED(hr = dxgi_adapter_GetDesc1(iface, &desc1))) + memcpy(desc, &desc1, sizeof(*desc)); return hr; }

1 0

Nikolay Sivov : crypt32/base64: Fix certificate request header and trailer in CryptBinaryToStringW() output.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: wine Branch: master Commit: fb53f6e79d9c1948af206f58ba2f9a294d23c8d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb53f6e79d9c1948af206f58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 16:55:36 2018 +0300 crypt32/base64: Fix certificate request header and trailer in CryptBinaryToStringW() output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 4 +- dlls/crypt32/tests/base64.c | 226 ++++++++++++++++++++++++++++++-------------- 2 files changed, 159 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb53f6e79d9c1948af20…

1 0

Jason Edmeades : msvcrt: Do not put cmd.exe special environment variables into the environ.
by Alexandre Julliard Sept. 25, 2018

Sept. 25, 2018

Module: wine Branch: master Commit: 0dcfc97fcbea15037d15dd1021870de25b8382df URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dcfc97fcbea15037d15dd10… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Sep 25 08:39:59 2018 +0100 msvcrt: Do not put cmd.exe special environment variables into the environ. All the special environment variables from the command shell which track directory use are stripped out from the C runtime environ/wenviron. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45320 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 06e16a8..f08d9b1 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -73,7 +73,8 @@ char ** msvcrt_SnapshotOfEnvironmentA(char **blk) for (ptr = environ_strings; *ptr; ptr += strlen(ptr) + 1) { - count++; + /* Don't count environment variables starting with '=' which are command shell specific */ + if (*ptr != '=') count++; len += strlen(ptr) + 1; } if (blk) @@ -88,7 +89,8 @@ char ** msvcrt_SnapshotOfEnvironmentA(char **blk) memcpy(&blk[count],environ_strings,len); for (ptr = (char*) &blk[count]; *ptr; ptr += strlen(ptr) + 1) { - blk[i++] = ptr; + /* Skip special environment strings set by the command shell */ + if (*ptr != '=') blk[i++] = ptr; } } blk[i] = NULL; @@ -105,7 +107,8 @@ MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **wblk) for (wptr = wenviron_strings; *wptr; wptr += strlenW(wptr) + 1) { - count++; + /* Don't count environment variables starting with '=' which are command shell specific */ + if (*wptr != '=') count++; len += strlenW(wptr) + 1; } if (wblk) @@ -119,7 +122,8 @@ MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **wblk) memcpy(&wblk[count],wenviron_strings,len * sizeof(MSVCRT_wchar_t)); for (wptr = (MSVCRT_wchar_t*)&wblk[count]; *wptr; wptr += strlenW(wptr) + 1) { - wblk[i++] = wptr; + /* Skip special environment strings set by the command shell */ + if (*wptr != '=') wblk[i++] = wptr; } } wblk[i] = NULL;

1 0