February 2016 - Wine-commits

Charles Davis : winebuild: When building implibs, invoke dlltool with a machine type.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 2ea17846b8dbaf7d3c78f3c4d1a37e2de4b2e81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea17846b8dbaf7d3c78f3c4d… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 11 03:20:27 2016 -0700 winebuild: When building implibs, invoke dlltool with a machine type. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 13596a4..d3aa41b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1329,6 +1329,7 @@ void output_import_lib( DLLSPEC *spec, char **argv ) { struct strarray *args; char *def_file; + const char *as_flags, *m_flag; if (target_platform != PLATFORM_WINDOWS) fatal_error( "Unix-style import libraries not supported yet\n" ); @@ -1342,7 +1343,23 @@ void output_import_lib( DLLSPEC *spec, char **argv ) output_file = NULL; args = find_tool( "dlltool", NULL ); + switch (target_cpu) + { + case CPU_x86: + m_flag = "i386"; + as_flags = "--as-flags=--32"; + break; + case CPU_x86_64: + m_flag = "i386:x86-64"; + as_flags = "--as-flags=--64"; + break; + default: + m_flag = NULL; + break; + } strarray_add( args, "-k", "-l", output_file_name, "-d", def_file, NULL ); + if (m_flag) + strarray_add( args, "-m", m_flag, as_flags, NULL ); spawn( args ); strarray_free( args );

1 0

Sebastian Lackner : msvcp100/tests: Use brackets to protect arguments in call_func2 macro.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 5fd226ac06332990a1e4c93653384e60e88959ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd226ac06332990a1e4c9365… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 02:16:53 2016 +0100 msvcp100/tests: Use brackets to protect arguments in call_func2 macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/tests/misc.c | 2 +- dlls/msvcp100/tests/string.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c index 4740951..e85bf10 100644 --- a/dlls/msvcp100/tests/misc.c +++ b/dlls/msvcp100/tests/misc.c @@ -83,7 +83,7 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) #else diff --git a/dlls/msvcp100/tests/string.c b/dlls/msvcp100/tests/string.c index eb02bc5..c963169 100644 --- a/dlls/msvcp100/tests/string.c +++ b/dlls/msvcp100/tests/string.c @@ -67,7 +67,7 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) #else

1 0

Sebastian Lackner : msvcrt/tests: Use brackets to protect arguments in call_func2 macro.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 340f1615bd01645c2f8747c6bcaa5f3e3409bd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=340f1615bd01645c2f8747c6b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 02:17:07 2016 +0100 msvcrt/tests: Use brackets to protect arguments in call_func2 macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index e67e344..e3f7f99 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -146,7 +146,7 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) #else

1 0

Sebastian Lackner : msvcp60/tests: Use brackets to protect arguments in call_func macros.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: e9b70edab607cc87ed769bf6df5b578def489c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9b70edab607cc87ed769bf6d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 02:17:30 2016 +0100 msvcp60/tests: Use brackets to protect arguments in call_func macros. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/string.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index 3ed1480..2cbf025 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -128,14 +128,14 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) -#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)a,(const void*)b) -#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)a,\ - (const void*)b,(const void*)c) -#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)a,\ - (const void*)b,(const void*)c,(const void*)d) -#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)a,\ - (const void*)b,(const void*)c,(const void*)d,(const void*)e) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),(const void*)(b)) +#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c)) +#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c),(const void*)(d)) +#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e)) #else

1 0

Sebastian Lackner : msvcp90/tests: Use brackets to protect arguments in call_func macros.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 6ed6e91621bf3c9a2e5538227e11cd9137abb9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed6e91621bf3c9a2e5538227… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 02:17:42 2016 +0100 msvcp90/tests: Use brackets to protect arguments in call_func macros. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/string.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 5f8fcd2..8aea30a 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -149,14 +149,14 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) -#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)a,(const void*)b) -#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)a,\ - (const void*)b,(const void*)c) -#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)a,\ - (const void*)b,(const void*)c,(const void*)d) -#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)a,\ - (const void*)b,(const void*)c,(const void*)d,(const void*)e) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),(const void*)(b)) +#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c)) +#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c),(const void*)(d)) +#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e)) #else

1 0

Nikolay Sivov : usp10: Use memcpy() to return ScriptLayout() results.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: a8c6c9f49a8c49a6e14fd4dc6a71f9ef7726180e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c6c9f49a8c49a6e14fd4dc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 13:09:44 2016 +0300 usp10: Use memcpy() to return ScriptLayout() results. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 253177a..3b31867 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3645,7 +3645,6 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log if (!indexs) return E_OUTOFMEMORY; - if (vistolog) { for( ich = 0; ich < runs; ich++) @@ -3654,11 +3653,9 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log ich = 0; while (ich < runs) ich += BIDI_ReorderV2lLevel(0, indexs+ich, level+ich, runs - ich, FALSE); - for (ich = 0; ich < runs; ich++) - vistolog[ich] = indexs[ich]; + memcpy(vistolog, indexs, runs * sizeof(*vistolog)); } - if (logtovis) { for( ich = 0; ich < runs; ich++) @@ -3667,8 +3664,7 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log ich = 0; while (ich < runs) ich += BIDI_ReorderL2vLevel(0, indexs+ich, level+ich, runs - ich, FALSE); - for (ich = 0; ich < runs; ich++) - logtovis[ich] = indexs[ich]; + memcpy(logtovis, indexs, runs * sizeof(*logtovis)); } heap_free(indexs);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_map().
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 7f69a345748daea05581f48c089012481b6a2820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f69a345748daea05581f48c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:29:56 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 8 ++------ dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 16b6555..75585d8 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -40,11 +40,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) return TRUE; } -void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, UINT *slice_pitch) -{ - wined3d_texture_get_pitch(volume->container, volume->texture_level, row_pitch, slice_pitch); -} - /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -588,7 +583,8 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, } else { - wined3d_volume_get_pitch(volume, &map_desc->row_pitch, &map_desc->slice_pitch); + wined3d_texture_get_pitch(volume->container, volume->texture_level, + &map_desc->row_pitch, &map_desc->slice_pitch); } if (!box) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 470db1f..56ca786 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2444,7 +2444,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) DECLSPEC_HIDDEN HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN; -void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, UINT *slice_pitch) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in surface_create_dib_section().
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: fdecf9e452042be81f86aa9ec3de49a65d06759d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdecf9e452042be81f86aa9ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:29:57 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in surface_create_dib_section(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bd8cf45..b31e2ea 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -360,6 +360,7 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) { const struct wined3d_format *format = surface->resource.format; unsigned int format_flags = surface->container->resource.format_flags; + unsigned int row_pitch, slice_pitch; SYSTEM_INFO sysInfo; BITMAPINFO *b_info; int extraline = 0; @@ -409,10 +410,10 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) b_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); /* TODO: Is there a nicer way to force a specific alignment? (8 byte for ddraw) */ - b_info->bmiHeader.biWidth = wined3d_surface_get_pitch(surface) / format->byte_count; + wined3d_texture_get_pitch(surface->container, surface->texture_level, &row_pitch, &slice_pitch); + b_info->bmiHeader.biWidth = row_pitch / format->byte_count; b_info->bmiHeader.biHeight = 0 - surface->resource.height - extraline; - b_info->bmiHeader.biSizeImage = (surface->resource.height + extraline) - * wined3d_surface_get_pitch(surface); + b_info->bmiHeader.biSizeImage = (surface->resource.height + extraline) * row_pitch; b_info->bmiHeader.biPlanes = 1; b_info->bmiHeader.biBitCount = format->byte_count * 8;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in surface_download_data().
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: ef040d71db045a13df0b3209f542ba4a50787a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef040d71db045a13df0b3209f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:29:58 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b31e2ea..820fbfa 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1330,14 +1330,15 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } else { - unsigned int src_row_pitch, src_slice_pitch, dst_pitch = 0; + unsigned int dst_row_pitch, dst_slice_pitch; + unsigned int src_row_pitch, src_slice_pitch; GLenum gl_format = format->glFormat; GLenum gl_type = format->glType; void *mem; if (surface->flags & SFLAG_NONPOW2) { - dst_pitch = wined3d_surface_get_pitch(surface); + wined3d_texture_get_pitch(surface->container, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); wined3d_format_calculate_pitch(format, surface->resource.device->surface_alignment, surface->pow2Width, surface->pow2Height, &src_row_pitch, &src_slice_pitch); mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch); @@ -1425,12 +1426,12 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * won't be released, and doesn't have to be re-read. */ src_data = mem; dst_data = data.addr; - TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_pitch); + TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); for (y = 0; y < surface->resource.height; ++y) { - memcpy(dst_data, src_data, dst_pitch); + memcpy(dst_data, src_data, dst_row_pitch); src_data += src_row_pitch; - dst_data += dst_pitch; + dst_data += dst_row_pitch; } HeapFree(GetProcessHeap(), 0, mem);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in surface_upload_from_surface().
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: bb385366a110a8223667a3fbbc8f5960a4cca321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb385366a110a8223667a3fbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:29:59 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 820fbfa..95ee255 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1590,6 +1590,7 @@ static BOOL surface_check_block_align_rect(struct wined3d_surface *surface, cons HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) { + unsigned int src_row_pitch, src_slice_pitch; const struct wined3d_format *src_format; const struct wined3d_format *dst_format; unsigned int src_fmt_flags, dst_fmt_flags; @@ -1599,7 +1600,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P UINT update_w, update_h; UINT dst_w, dst_h; RECT r, dst_rect; - UINT src_pitch; POINT p; TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", @@ -1687,10 +1687,10 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P wined3d_texture_bind_and_dirtify(dst_surface->container, context, FALSE); surface_get_memory(src_surface, &data, src_surface->locations); - src_pitch = wined3d_surface_get_pitch(src_surface); + wined3d_texture_get_pitch(src_surface->container, src_surface->texture_level, &src_row_pitch, &src_slice_pitch); wined3d_surface_upload_data(dst_surface, gl_info, src_format, src_rect, - src_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); + src_row_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); context_release(context);

1 0