June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : loadperf: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 2e6b4e1f5b765f7c1f6982e8879e091eab8de950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e6b4e1f5b765f7c1f6982e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:55:31 2019 +0200 loadperf: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/loadperf/Makefile.in | 2 ++ dlls/loadperf/loadperf_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/loadperf/Makefile.in b/dlls/loadperf/Makefile.in index b7c9620..9258ec0 100644 --- a/dlls/loadperf/Makefile.in +++ b/dlls/loadperf/Makefile.in @@ -1,5 +1,7 @@ MODULE = loadperf.dll IMPORTLIB = loadperf +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ loadperf_main.c diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c index 8f0da11..54901a7 100644 --- a/dlls/loadperf/loadperf_main.c +++ b/dlls/loadperf/loadperf_main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_copy_bo_address().
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 7bdbf00b0fd282090bb41ed2e79ba4843b3c4839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bdbf00b0fd282090bb41ed2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 17:40:30 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_copy_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 ++- dlls/wined3d/context.c | 13 ++++++------- dlls/wined3d/view.c | 3 ++- dlls/wined3d/wined3d_private.h | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8dc6d4b..9fcd96b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1218,7 +1218,8 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off src.addr += src_offset; context = context_acquire(dst_buffer->resource.device, NULL, 0); - context_copy_bo_address(context, &dst, wined3d_buffer_gl(dst_buffer)->buffer_type_hint, + wined3d_context_gl_copy_bo_address(wined3d_context_gl(context), + &dst, wined3d_buffer_gl(dst_buffer)->buffer_type_hint, &src, wined3d_buffer_gl(src_buffer)->buffer_type_hint, size); context_release(context); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 18a516c..933bf13 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2634,15 +2634,14 @@ void context_unmap_bo_address(struct wined3d_context *context, checkGLcall("Unmap buffer object"); } -void context_copy_bo_address(struct wined3d_context *context, +void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; BYTE *dst_ptr, *src_ptr; - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; if (dst->buffer_object && src->buffer_object) { @@ -2656,13 +2655,13 @@ void context_copy_bo_address(struct wined3d_context *context, } else { - src_ptr = context_map_bo_address(context, src, size, src_binding, WINED3D_MAP_READ); - dst_ptr = context_map_bo_address(context, dst, size, dst_binding, WINED3D_MAP_WRITE); + src_ptr = context_map_bo_address(&context_gl->c, src, size, src_binding, WINED3D_MAP_READ); + dst_ptr = context_map_bo_address(&context_gl->c, dst, size, dst_binding, WINED3D_MAP_WRITE); memcpy(dst_ptr, src_ptr, size); - context_unmap_bo_address(context, dst, dst_binding); - context_unmap_bo_address(context, src, src_binding); + context_unmap_bo_address(&context_gl->c, dst, dst_binding); + context_unmap_bo_address(&context_gl->c, src, src_binding); } } else if (!dst->buffer_object && src->buffer_object) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4456a10..bd32b88 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1096,6 +1096,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) { struct wined3d_unordered_access_view_gl *view_gl = wined3d_unordered_access_view_gl(view); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_bo_address dst, src; DWORD dst_location; @@ -1108,7 +1109,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ src.buffer_object = view_gl->counter_bo; src.addr = NULL; - context_copy_bo_address(context, &dst, wined3d_buffer_gl(buffer)->buffer_type_hint, + wined3d_context_gl_copy_bo_address(context_gl, &dst, wined3d_buffer_gl(buffer)->buffer_type_hint, &src, GL_ATOMIC_COUNTER_BUFFER, sizeof(GLuint)); wined3d_buffer_invalidate_location(buffer, ~dst_location); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9462358..4214083 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2086,6 +2086,9 @@ void wined3d_context_gl_bind_dummy_textures(const struct wined3d_context_gl *con void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; +void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, + const struct wined3d_bo_address *dst, GLenum dst_binding, + const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; @@ -2239,9 +2242,6 @@ void wined3d_raw_blitter_create(struct wined3d_blitter **next, BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -void context_copy_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *dst, GLenum dst_binding, - const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect,

1 0

Alexandre Julliard : ktmw32: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 6e4753d795a74262ec9ead092abf638e3d7ea441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e4753d795a74262ec9ead09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:55:23 2019 +0200 ktmw32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ktmw32/Makefile.in | 2 ++ dlls/ktmw32/ktmw32_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ktmw32/Makefile.in b/dlls/ktmw32/Makefile.in index b0517f0..0ff7534 100644 --- a/dlls/ktmw32/Makefile.in +++ b/dlls/ktmw32/Makefile.in @@ -1,4 +1,6 @@ MODULE = ktmw32.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ ktmw32_main.c diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 35d1e85..462d122 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -17,7 +17,6 @@ */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : ksuser: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: ce8b8dac6d9300c8b263013b5f692920703c7c67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce8b8dac6d9300c8b263013b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:55:14 2019 +0200 ksuser: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ksuser/Makefile.in | 2 ++ dlls/ksuser/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ksuser/Makefile.in b/dlls/ksuser/Makefile.in index 1945a19..6674a68 100644 --- a/dlls/ksuser/Makefile.in +++ b/dlls/ksuser/Makefile.in @@ -1,4 +1,6 @@ MODULE = ksuser.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/ksuser/main.c b/dlls/ksuser/main.c index f8cb426..df8e1a1 100644 --- a/dlls/ksuser/main.c +++ b/dlls/ksuser/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : ksecdd.sys: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 3257fe6c7f7c0c039dfda39228d9ea9a45010c29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3257fe6c7f7c0c039dfda392… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:55:05 2019 +0200 ksecdd.sys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ksecdd.sys/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ksecdd.sys/Makefile.in b/dlls/ksecdd.sys/Makefile.in index 9b6430e..ae537b2 100644 --- a/dlls/ksecdd.sys/Makefile.in +++ b/dlls/ksecdd.sys/Makefile.in @@ -1,6 +1,8 @@ MODULE = ksecdd.sys EXTRADLLFLAGS = -Wl,--subsystem,native +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : keyboard.drv: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 08894ceb1ea7e88618ad4a4d7fc514654b695b2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=08894ceb1ea7e88618ad4a4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:54:55 2019 +0200 keyboard.drv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/keyboard.drv16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/keyboard.drv16/Makefile.in b/dlls/keyboard.drv16/Makefile.in index 91c82f7..91b7c87 100644 --- a/dlls/keyboard.drv16/Makefile.in +++ b/dlls/keyboard.drv16/Makefile.in @@ -1,5 +1,5 @@ MODULE = keyboard.drv16 IMPORTS = user32 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = keyboard.c

1 0

Jactry Zeng : zh-cn: Remove dead links.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: website Branch: master Commit: da19e109c6b353a53875ddb8adc19f5ecf29d6e0 URL: https://source.winehq.org/git/website.git/?a=commit;h=da19e109c6b353a53875d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Jun 8 22:47:30 2019 +0800 zh-cn: Remove dead links. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/zh-cn/about.template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/zh-cn/about.template b/templates/zh-cn/about.template index 0a75ddd..ab3c6f4 100644 --- a/templates/zh-cn/about.template +++ b/templates/zh-cn/about.template @@ -10,10 +10,9 @@ Wine 不是像虚拟机或者模拟器一样模仿内部的 Windows 逻辑，而程序的办法。不久之后，Alexandre Julliard 开始接手领导 Wine 的开发，从此由他管理这个项目。多年以来，随着 Windows API 和应用为了适应新硬件及软件而不断演变，Wine 也一直不断发展来支持新的特性，移植到更多其他系统，并且更加稳定，提供着更好的用户体验。</p> -<p>通过确立一个宏伟的目标，在2008年项目到达 v1.0 之前，Wine 一直稳健地持续了 15 年之久，那是第一个稳定版。 +<p>通过确立一个宏伟的目标，在 2008 年项目到达 v1.0 之前，Wine 一直稳健地持续了 15 年之久，那是第一个稳定版。多个版本以后，虽然还有许多工作要做，但今天 Wine 仍然在活跃地开发着。 -并且有大约<a href="https://wiki.winehq.org/UsageStatistics" title="Wine Usage -Statistics">数以百万人计的人们</a>使用 Wine 在他们所选择的系统上运行 Windows 软件。</p> +并且有大约数以百万人计的人们使用 Wine 在他们所选择的系统上运行 Windows 软件。</p> <h3>开放源代码和用户驱动的</h3> @@ -33,8 +32,6 @@ may not be up-to-date)</i></p> <ul> <li><a href="https://wiki.winehq.org/ImportanceOfWine"> Wine 的重要性</a> </li> - <li><a href="https://wiki.winehq.org/Debunking_Wine_Myths">常见误解</a> - </li> <li><a href="https://wiki.winehq.org/WineHistory"> Wine 项目的历史</a> </li> <li><a href="https://wiki.winehq.org/ProjectOrganization">组织与领导</a>

1 0

Józef Kucia : vkd3d: Fix debug_d3d12_shader_component_mapping().
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: vkd3d Branch: master Commit: 5f4b2266b96f4041985811412b7804110a0a6c70 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5f4b2266b96f40419858114… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 7 14:38:04 2019 +0200 vkd3d: Fix debug_d3d12_shader_component_mapping(). 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> --- libs/vkd3d/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index ea468b3..4483a8d 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -409,10 +409,10 @@ static const char *debug_d3d12_shader_component(D3D12_SHADER_COMPONENT_MAPPING c const char *debug_d3d12_shader_component_mapping(unsigned int mapping) { return vkd3d_dbg_sprintf("{%s, %s, %s, %s}", - debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(mapping, 0)), - debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(mapping, 1)), - debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(mapping, 2)), - debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(mapping, 3))); + debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(0, mapping)), + debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(1, mapping)), + debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(2, mapping)), + debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(3, mapping))); } const char *debug_vk_extent_3d(VkExtent3D extent)

1 0

Józef Kucia : vkd3d: Introduce vkd3d_physical_device_info.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: vkd3d Branch: master Commit: c756008f6ec7546058bf3168fcdc03d524d15656 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c756008f6ec7546058bf316… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 7 14:38:01 2019 +0200 vkd3d: Introduce vkd3d_physical_device_info. Simplifies passing around Vulkan physical device properties and features. 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> --- libs/vkd3d/device.c | 507 +++++++++++++++++++++++++--------------------------- 1 file changed, 247 insertions(+), 260 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c756008f6ec7546058b…

1 0

Józef Kucia : vkd3d: Introduce helper functions to call ID3D12Device methods.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: vkd3d Branch: master Commit: afe725924205417420c4e13cf8c1ed0da66feceb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=afe725924205417420c4e13… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 7 14:38:03 2019 +0200 vkd3d: Introduce helper functions to call ID3D12Device methods. 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> --- libs/vkd3d/command.c | 60 +++++++++++++++++++--------------------------- libs/vkd3d/resource.c | 52 +++++++++++++++++----------------------- libs/vkd3d/state.c | 25 +++++++++---------- libs/vkd3d/vkd3d_private.h | 21 ++++++++++++++++ 4 files changed, 79 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=afe725924205417420c…

1 0