February 2017 - Wine-commits

Józef Kucia : wined3d: Update UAV read bitmask for ld_raw and ld_structured instructions.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: dae8785bea94c3b13f1ca7e582af1e9984ff1859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae8785bea94c3b13f1ca7e58… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:40 2017 +0100 wined3d: Update UAV read bitmask for ld_raw and ld_structured instructions. 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/shader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 14cb243..fa61674 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1331,11 +1331,15 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st || (WINED3DSIH_IMM_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_IMM_ATOMIC_XOR && ins.handler_idx != WINED3DSIH_IMM_ATOMIC_CONSUME) - || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) + || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED + || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_UAV) + || (ins.handler_idx == WINED3DSIH_LD_STRUCTURED && ins.src[2].reg.type == WINED3DSPR_UAV)) { unsigned int reg_idx; - if (ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) + if (ins.handler_idx == WINED3DSIH_LD_UAV_TYPED || ins.handler_idx == WINED3DSIH_LD_RAW) reg_idx = ins.src[1].reg.idx[0].offset; + else if (ins.handler_idx == WINED3DSIH_LD_STRUCTURED) + reg_idx = ins.src[2].reg.idx[0].offset; else if (WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) reg_idx = ins.dst[0].reg.idx[0].offset; else

1 0

Józef Kucia : wined3d: Always use correct sampler bind index for ld_raw and ld_structured.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: adedebf47a9a02694b79965eb2aa670b3906b398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adedebf47a9a02694b79965eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:41 2017 +0100 wined3d: Always use correct sampler bind index for ld_raw and ld_structured. 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/glsl_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8345888..28d1c15 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5072,8 +5072,8 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); const struct wined3d_shader_src_param *src = &ins->src[ins->src_count - 1]; + unsigned int i, swizzle, resource_idx, bind_idx, stride, src_idx = 0; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; - unsigned int i, swizzle, resource_idx, stride, src_idx = 0; struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param structure_idx, offset; @@ -5090,6 +5090,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) return; } stride = reg_maps->resource_info[resource_idx].stride; + bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, WINED3D_SAMPLER_DEFAULT); function = "texelFetch"; resource = "sampler"; } @@ -5101,6 +5102,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) return; } stride = reg_maps->uav_resource_info[resource_idx].stride; + bind_idx = resource_idx; function = "imageLoad"; resource = "image"; } @@ -5123,7 +5125,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) swizzle = shader_glsl_swizzle_get_component(src->swizzle, i); shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", - function, prefix, resource, src->reg.idx[0].offset, address->buffer, swizzle); + function, prefix, resource, bind_idx, address->buffer, swizzle); } string_buffer_release(priv->string_buffers, address);

1 0

Francois Gouget : xmllite: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: d369857cb4dce467b27606cba5bde4c58b790e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d369857cb4dce467b27606cba… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 11:26:51 2017 +0100 xmllite: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their parameter names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/xmllite_private.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 3f03379..fa29265 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -22,14 +22,15 @@ #define __XMLLITE_PRIVATE__ /* memory allocation functions */ -static inline void *heap_alloc(size_t len) + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, mem, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } static inline BOOL heap_free(void *mem)

1 0

André Hentschel : xmllite: Fix CreateXmlReaderInputWithEncodingName spec file entry.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 05956e6d77bf64c62efd4315d83699b0f289afda URL: http://source.winehq.org/git/wine.git/?a=commit;h=05956e6d77bf64c62efd4315d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:07 2017 +0100 xmllite: Fix CreateXmlReaderInputWithEncodingName spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/xmllite.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/xmllite.spec b/dlls/xmllite/xmllite.spec index d6ee017..574ed98 100644 --- a/dlls/xmllite/xmllite.spec +++ b/dlls/xmllite/xmllite.spec @@ -1,6 +1,6 @@ @ stdcall CreateXmlReader(ptr ptr ptr) @ stub CreateXmlReaderInputWithEncodingCodePage -@ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr ptr long ptr ptr) +@ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr wstr long wstr ptr) @ stdcall CreateXmlWriter(ptr ptr ptr) @ stdcall CreateXmlWriterOutputWithEncodingCodePage(ptr ptr long ptr) @ stdcall CreateXmlWriterOutputWithEncodingName(ptr ptr wstr ptr)

1 0

André Hentschel : serialui: Fix some spec file entries.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: e4448f24e5f7a9073128c62e610484e6f5518a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4448f24e5f7a9073128c62e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:10 2017 +0100 serialui: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/serialui/serialui.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/serialui/serialui.spec b/dlls/serialui/serialui.spec index 7be42ae..b5e92bb 100644 --- a/dlls/serialui/serialui.spec +++ b/dlls/serialui/serialui.spec @@ -1,6 +1,6 @@ 1 stdcall EnumPropPages(ptr ptr long) -2 stdcall drvCommConfigDialogW(ptr long ptr) -3 stdcall drvCommConfigDialogA(ptr long ptr) +2 stdcall drvCommConfigDialogW(wstr long ptr) +3 stdcall drvCommConfigDialogA(str long ptr) 4 stdcall drvSetDefaultCommConfigW(wstr ptr long) 5 stdcall drvSetDefaultCommConfigA(str ptr long) 6 stdcall drvGetDefaultCommConfigW(wstr ptr ptr)

1 0

André Hentschel : propsys: Fix PSGetPropertyDescriptionListFromString spec file entry.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 8e273c8f8a6150c299b53f0ff036fd87f542aa5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e273c8f8a6150c299b53f0ff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:11 2017 +0100 propsys: Fix PSGetPropertyDescriptionListFromString spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 674df2cb..582308f 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -81,7 +81,7 @@ @ stub PSGetNamedPropertyFromPropertyStorage @ stdcall PSGetPropertyDescription(ptr ptr ptr) @ stub PSGetPropertyDescriptionByName -@ stdcall PSGetPropertyDescriptionListFromString(ptr ptr ptr) +@ stdcall PSGetPropertyDescriptionListFromString(wstr ptr ptr) @ stub PSGetPropertyFromPropertyStorage @ stub PSGetPropertyKeyFromName @ stdcall PSGetPropertySystem(ptr ptr)

1 0

André Hentschel : odbccp32: Fix some spec file entries.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 093d8702b9682817d1ba72edcc546e7b54e19241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=093d8702b9682817d1ba72edc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:13 2017 +0100 odbccp32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbccp32/odbccp32.spec b/dlls/odbccp32/odbccp32.spec index c4be93f..2717d22 100644 --- a/dlls/odbccp32/odbccp32.spec +++ b/dlls/odbccp32/odbccp32.spec @@ -19,7 +19,7 @@ 20 stdcall SQLRemoveDriver(str long ptr) 21 stdcall SQLConfigDriver(ptr long str str ptr long ptr) 22 stdcall SQLInstallerError(long ptr ptr long ptr) -23 stdcall SQLPostInstallerError(long ptr) +23 stdcall SQLPostInstallerError(long str) 24 stdcall SQLReadFileDSN(str str str ptr long ptr) 25 stdcall SQLWriteFileDSN(str str str str) 26 stdcall SQLInstallDriverEx(str str str long ptr long ptr) @@ -47,7 +47,7 @@ 220 stdcall SQLRemoveDriverW(wstr long ptr) 221 stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr) 222 stdcall SQLInstallerErrorW(long ptr ptr long ptr) -223 stdcall SQLPostInstallerErrorW(long ptr) +223 stdcall SQLPostInstallerErrorW(long wstr) 224 stdcall SQLReadFileDSNW(wstr wstr wstr ptr long ptr) 225 stdcall SQLWriteFileDSNW(wstr wstr wstr wstr) 226 stdcall SQLInstallDriverExW(wstr wstr wstr long ptr long ptr)

1 0

André Hentschel : hhcrtl.ocx: Fix some spec file entries.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: e5a12b773ce2122a77f7e9359a514078863cc678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a12b773ce2122a77f7e9359… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:17 2017 +0100 hhcrtl.ocx: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/hhctrl.ocx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.ocx.spec b/dlls/hhctrl.ocx/hhctrl.ocx.spec index e9cd118..931f93a 100644 --- a/dlls/hhctrl.ocx/hhctrl.ocx.spec +++ b/dlls/hhctrl.ocx/hhctrl.ocx.spec @@ -1,6 +1,6 @@ 13 stdcall doWinMain(long ptr) -14 stdcall HtmlHelpA(ptr ptr long long) -15 stdcall HtmlHelpW(ptr ptr long long) +14 stdcall HtmlHelpA(ptr str long long) +15 stdcall HtmlHelpW(ptr wstr long long) @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Henri Verbeet : wined3d: Support downloading depth textures in surface_load_sysmem().
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 5895f77474d39ab0506323bf038837b7d07b6c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5895f77474d39ab0506323bf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 24 08:10:29 2017 +0100 wined3d: Support downloading depth textures in surface_load_sysmem(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 399f436..8b5f5ce 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2475,13 +2475,6 @@ static BOOL surface_load_sysmem(struct wined3d_surface *surface, struct wined3d_texture_sub_resource *sub_resource; sub_resource = &texture->sub_resources[sub_resource_idx]; - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) - { - FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - wined3d_texture_prepare_location(texture, sub_resource_idx, context, dst_location); if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) @@ -2498,7 +2491,8 @@ static BOOL surface_load_sysmem(struct wined3d_surface *surface, return TRUE; } - if (sub_resource->locations & WINED3D_LOCATION_DRAWABLE) + if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { read_from_framebuffer(surface, context, dst_location); return TRUE;

1 0

Henri Verbeet : wined3d: Support uploading depth textures in surface_load_texture().
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: cc65b9045112c19054a75f4d31cff77e5d5e4746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc65b9045112c19054a75f4d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 24 08:10:30 2017 +0100 wined3d: Support uploading depth textures in surface_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8b5f5ce..1ac2e5f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2549,16 +2549,12 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_format format; POINT dst_point = {0, 0}; RECT src_rect; + BOOL depth; + depth = texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL; sub_resource = surface_get_sub_resource(surface); - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) - { - FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + if (!depth && wined3d_settings.offscreen_rendering_mode != ORM_FBO && wined3d_resource_is_offscreen(&texture->resource) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { @@ -2571,7 +2567,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, height = wined3d_texture_get_level_height(texture, surface->texture_level); SetRect(&src_rect, 0, 0, width, height); - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) + if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, texture->resource.usage, texture->resource.pool, texture->resource.format, @@ -2587,7 +2583,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, return TRUE; } - if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) + if (!depth && sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) && (!srgb || (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, texture->resource.usage, texture->resource.pool, texture->resource.format,

1 0