October 2018 - Wine-devel - list.winehq.org

[PATCH 8/8] wined3d: Validate byte code pointer in shader_init().
by Józef Kucia 03 Oct '18

03 Oct '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/shader.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 438af50d8410..9524757470eb 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3699,6 +3699,9 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device TRACE("byte_code %p, byte_code_size %#lx, format %#x.\n", desc->byte_code, (long)desc->byte_code_size, desc->format); + if (!desc->byte_code) + return WINED3DERR_INVALIDCALL; + if (!(shader->frontend = shader_select_frontend(desc->format))) { FIXME("Unable to find frontend for shader.\n"); @@ -4251,9 +4254,6 @@ HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const stru TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, parent, parent_ops, shader); - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -4288,9 +4288,6 @@ HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const stru TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, parent, parent_ops, shader); - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -4326,9 +4323,6 @@ HRESULT CDECL wined3d_shader_create_gs(struct wined3d_device *device, const stru TRACE("device %p, desc %p, so_desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, so_desc, parent, parent_ops, shader); - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -4356,9 +4350,6 @@ HRESULT CDECL wined3d_shader_create_hs(struct wined3d_device *device, const stru TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, parent, parent_ops, shader); - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -4393,9 +4384,6 @@ HRESULT CDECL wined3d_shader_create_ps(struct wined3d_device *device, const stru TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, parent, parent_ops, shader); - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -4423,9 +4411,6 @@ HRESULT CDECL wined3d_shader_create_vs(struct wined3d_device *device, const stru TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, parent, parent_ops, shader); - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; -- 2.16.4

2 1

[PATCH 3/8] wined3d: Pass device to shader_set_function().
by Józef Kucia 03 Oct '18

03 Oct '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/shader.c | 70 +++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a5b148648ed9..38377c0b9857 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -928,7 +928,7 @@ static HRESULT shader_record_shader_phase(struct wined3d_shader *shader, if (shader->reg_maps.shader_version.type != WINED3D_SHADER_TYPE_HULL) { - ERR("Unexpected shader type %#x.\n", shader->reg_maps.shader_version.type); + ERR("Unexpected shader type %s.\n", debug_shader_type(shader->reg_maps.shader_version.type)); return E_FAIL; } @@ -3321,17 +3321,38 @@ const struct wined3d_shader_backend_ops none_shader_backend = shader_none_has_ffp_proj_control, }; -static HRESULT shader_set_function(struct wined3d_shader *shader, - unsigned int float_const_count, enum wined3d_shader_type type, unsigned int max_version) +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_set_function(struct wined3d_shader *shader, struct wined3d_device *device, + enum wined3d_shader_type type, unsigned int float_const_count) { const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info; struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + const struct wined3d_shader_version *version = &reg_maps->shader_version; const struct wined3d_shader_frontend *fe; unsigned int backend_version; HRESULT hr; - TRACE("shader %p, float_const_count %u, type %#x, max_version %u.\n", - shader, float_const_count, type, max_version); + TRACE("shader %p, device %p, type %s, float_const_count %u.\n", + shader, device, debug_shader_type(type), float_const_count); fe = shader->frontend; if (!(shader->frontend_data = fe->shader_init(shader->function, @@ -3349,14 +3370,14 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, if (FAILED(hr = shader_get_registers_used(shader, float_const_count))) return hr; - if (reg_maps->shader_version.type != type) + if (version->type != type) { - WARN("Wrong shader type %#x.\n", reg_maps->shader_version.type); + WARN("Wrong shader type %s.\n", debug_shader_type(reg_maps->shader_version.type)); return WINED3DERR_INVALIDCALL; } - if (reg_maps->shader_version.major > max_version) + if (version->major > shader_max_version_from_feature_level(device->feature_level)) { - WARN("Shader version %u not supported by this device.\n", reg_maps->shader_version.major); + WARN("Shader version %u not supported by this device.\n", version->major); return WINED3DERR_INVALIDCALL; } switch (type) @@ -3383,10 +3404,10 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, FIXME("No backend version-checking for this shader type.\n"); backend_version = 0; } - if (reg_maps->shader_version.major > backend_version) + if (version->major > backend_version) { - WARN("Shader version %d.%d not supported by your GPU with the current shader backend.\n", - reg_maps->shader_version.major, reg_maps->shader_version.minor); + WARN("Shader version %u.%u not supported by the current shader backend.\n", + version->major, version->minor); return WINED3DERR_INVALIDCALL; } @@ -3638,26 +3659,6 @@ 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_copy_signatures_from_shader_desc(struct wined3d_shader *shader, const struct wined3d_shader_desc *desc) { @@ -3702,15 +3703,12 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_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; HRESULT hr; 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))) { FIXME("Unable to find frontend for shader.\n"); @@ -3768,7 +3766,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, max_version))) + if (FAILED(hr = shader_set_function(shader, device, type, float_const_count))) { WARN("Failed to set function, hr %#x.\n", hr); shader_cleanup(shader); -- 2.16.4

2 1

[PATCH 1/8] wined3d: Factor out shader_copy_signatures_from_shader_desc().
by Józef Kucia 03 Oct '18

03 Oct '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/shader.c | 53 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 09681725b5a7..60e817485b8b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3656,32 +3656,13 @@ static unsigned int shader_max_version_from_feature_level(enum wined3d_feature_l } } -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) +static HRESULT shader_copy_signatures_from_shader_desc(struct wined3d_shader *shader, + const struct wined3d_shader_desc *desc) { - 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.\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))) - { - FIXME("Unable to find frontend for shader.\n"); - return WINED3DERR_INVALIDCALL; - } - - shader->ref = 1; - shader->device = device; - shader->parent = parent; - shader->parent_ops = parent_ops; - total = 0; if (FAILED(hr = shader_signature_calculate_strings_length(&desc->input_signature, &total))) return hr; @@ -3712,6 +3693,36 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device return hr; } + return S_OK; +} + +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; + HRESULT hr; + + 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))) + { + FIXME("Unable to find frontend for shader.\n"); + return WINED3DERR_INVALIDCALL; + } + + shader->ref = 1; + shader->device = device; + shader->parent = parent; + shader->parent_ops = parent_ops; + + if (FAILED(hr = shader_copy_signatures_from_shader_desc(shader, desc))) + return hr; + list_init(&shader->linked_programs); list_init(&shader->constantsF); list_init(&shader->constantsB); -- 2.16.4

2 1

[PATCH] mshtml: Use set_document_mode in process_document_response_headers.
by Jacek Caban 03 Oct '18

03 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mutation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] makefiles: Only generate proxy code for the target architecture.
by Zebediah Figura 03 Oct '18

03 Oct '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Makefile.in | 1 + configure.ac | 5 +++++ tools/makedep.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/Makefile.in b/Makefile.in index 6b65fdf..c1242af 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,6 +49,7 @@ MSVCRTFLAGS = @BUILTINFLAG@ TARGETFLAGS = @TARGETFLAGS@ UNWINDFLAGS = @UNWINDFLAGS@ LDEXECFLAGS = @LDEXECFLAGS@ +WIDLFLAGS = @WIDLFLAGS@ LIBS = @LIBS@ BISON = @BISON@ FLEX = @FLEX@ diff --git a/configure.ac b/configure.ac index 70532b2..31ec935 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,7 @@ case $host in host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") + AC_SUBST(WIDLFLAGS,"--win32") PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -174,6 +175,7 @@ case $host in host_cpu="x86_64" notice_platform="64-bit " AC_SUBST(TARGETFLAGS,"-m64") + AC_SUBST(WIDLFLAGS,"--win64") fi ;; arm*) @@ -205,6 +207,7 @@ case $host in esac CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi") + AC_SUBST(WIDLFLAGS,"--win32") ;; aarch64*) AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) @@ -212,9 +215,11 @@ case $host in [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])]) + AC_SUBST(WIDLFLAGS,"--win64") ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} + AC_SUBST(WIDLFLAGS,"--win32") ;; esac diff --git a/tools/makedep.c b/tools/makedep.c index 4fcc99e..66b21db 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -133,6 +133,7 @@ static struct strarray msvcrt_flags; static struct strarray extra_cflags; static struct strarray cpp_flags; static struct strarray unwind_flags; +static struct strarray widl_flags; static struct strarray libs; static struct strarray enable_tests; static struct strarray cmdline_vars; @@ -2641,6 +2642,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames_obj_dir( make, targets ); output( ": %s\n", tools_path( make, "widl" )); output( "\t%s -o $@", tools_path( make, "widl" ) ); + output_filenames( widl_flags ); output_filenames( target_flags ); output_filenames( make->include_args ); output_filenames( make->define_args ); @@ -4208,6 +4210,7 @@ int main( int argc, char *argv[] ) extra_cflags = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" ); cpp_flags = get_expanded_make_var_array( top_makefile, "CPPFLAGS" ); unwind_flags = get_expanded_make_var_array( top_makefile, "UNWINDFLAGS" ); + widl_flags = get_expanded_make_var_array( top_makefile, "WIDLFLAGS" ); libs = get_expanded_make_var_array( top_makefile, "LIBS" ); enable_tests = get_expanded_make_var_array( top_makefile, "ENABLE_TESTS" ); -- 2.7.4

1 1

[PATCH] msvcp140: Added _Winerror_message implementation.
by Piotr Caban 03 Oct '18

03 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp140/tests/msvcp140.c | 23 +++++++++++++++++++++++ dlls/msvcp90/misc.c | 12 ++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-)

1 0

[PATCH] msvcr100: Added _Scoped_lock::_NonReentrantPPLLock class.
by Piotr Caban 03 Oct '18

03 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ dlls/msvcrt/lock.c | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 26 deletions(-)

1 0

[PATCH v2 2/2] hidclass.sys: use IoRegisterDeviceInterface
by Aric Stewart 03 Oct '18

03 Oct '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 60 ++++++++++++++++------------------------------ dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 4 +--- 3 files changed, 22 insertions(+), 44 deletions(-)

1 0

[PATCH 3/3] wineps: Leave passthrough mode at the end of the page.
by Huw Davies 03 Oct '18

03 Oct '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineps.drv/escape.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 7b90116..43bbe18 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -384,6 +384,8 @@ INT PSDRV_EndPage( PHYSDEV dev ) FIXME("Already ended a page?\n"); return 1; } + + passthrough_leave(dev); if(!PSDRV_WriteEndPage( dev )) return 0; PSDRV_EmptyDownloadList(dev, FALSE); -- 2.7.4

1 0

[PATCH 2/3] wineps: Add helpers to enter and leave passthrough.
by Huw Davies 03 Oct '18

03 Oct '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineps.drv/escape.c | 10 +--------- dlls/wineps.drv/ps.c | 27 +++++++++++++++++++++++---- dlls/wineps.drv/psdrv.h | 3 +++ 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index f9616bc..7b90116 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -44,10 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -static const char psbegindocument[] = -"%%BeginDocument: Wine passthrough\n"; - - DWORD write_spool( PHYSDEV dev, const void *data, DWORD num ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -269,11 +265,7 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, * length of the string, rather than 2 more. So we'll use the WORD at * in_data[0] instead. */ - if (physDev->job.passthrough_state == passthrough_none) - { - write_spool(dev, psbegindocument, sizeof(psbegindocument) - 1); - physDev->job.passthrough_state = passthrough_active; - } + passthrough_enter(dev); return write_spool(dev, ((char*)in_data) + 2, *(const WORD*)in_data); } diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 663cc23..4fd3c76 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -213,9 +213,31 @@ static const char psarrayput[] = static const char psarraydef[] = "/%s %d array def\n"; +static const char psbegindocument[] = +"%%BeginDocument: Wine passthrough\n"; static const char psenddocument[] = "\n%%EndDocument\n"; +void passthrough_enter(PHYSDEV dev) +{ + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + + if (physDev->job.passthrough_state != passthrough_none) return; + + write_spool(dev, psbegindocument, sizeof(psbegindocument) - 1); + physDev->job.passthrough_state = passthrough_active; +} + +void passthrough_leave(PHYSDEV dev) +{ + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + + if (physDev->job.passthrough_state == passthrough_none) return; + + write_spool(dev, psenddocument, sizeof(psenddocument) - 1); + physDev->job.passthrough_state = passthrough_none; +} + DWORD PSDRV_WriteSpool(PHYSDEV dev, LPCSTR lpData, DWORD cch) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -226,10 +248,7 @@ DWORD PSDRV_WriteSpool(PHYSDEV dev, LPCSTR lpData, DWORD cch) return 0; } - if(physDev->job.passthrough_state != passthrough_none) { /* Was in PASSTHROUGH mode */ - write_spool( dev, psenddocument, sizeof(psenddocument)-1 ); - physDev->job.passthrough_state = passthrough_none; - } + passthrough_leave(dev); if(physDev->job.OutOfPage) { /* Will get here after NEWFRAME Escape */ if( !PSDRV_StartPage(dev) ) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index d92fbb3..9cbee65 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -578,6 +578,9 @@ extern void T42_free(TYPE42 *t42) DECLSPEC_HIDDEN; extern DWORD RLE_encode(BYTE *in_buf, DWORD len, BYTE *out_buf) DECLSPEC_HIDDEN; extern DWORD ASCII85_encode(BYTE *in_buf, DWORD len, BYTE *out_buf) DECLSPEC_HIDDEN; +extern void passthrough_enter(PHYSDEV dev) DECLSPEC_HIDDEN; +extern void passthrough_leave(PHYSDEV dev) DECLSPEC_HIDDEN; + #define push_lc_numeric(x) do { \ const char *tmplocale = setlocale(LC_NUMERIC,NULL); \ setlocale(LC_NUMERIC,x); -- 2.7.4

1 0