November 2017 - Wine-Commits

Nikolay Sivov : dwrite: Set lfItalic style to get more compatible results for gdiinterop.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: e5276c766b25d19c35e5dd2e0394e9d336db4410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5276c766b25d19c35e5dd2e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 13:15:34 2017 +0300 dwrite: Set lfItalic style to get more compatible results for gdiinterop. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 4f570f5..18fb00b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1375,6 +1375,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d props->style = DWRITE_FONT_STYLE_OBLIQUE; else if (fsSelection & OS2_FSSELECTION_ITALIC) props->style = DWRITE_FONT_STYLE_ITALIC; + props->lf.lfItalic = !!(fsSelection & OS2_FSSELECTION_ITALIC); memcpy(&props->panose, &tt_os2->panose, sizeof(props->panose)); @@ -1404,12 +1405,13 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (macStyle & TT_HEAD_MACSTYLE_BOLD) props->weight = DWRITE_FONT_WEIGHT_BOLD; - if (macStyle & TT_HEAD_MACSTYLE_ITALIC) + if (macStyle & TT_HEAD_MACSTYLE_ITALIC) { props->style = DWRITE_FONT_STYLE_ITALIC; + props->lf.lfItalic = 1; + } } props->lf.lfWeight = props->weight; - props->lf.lfItalic = props->style == DWRITE_FONT_STYLE_ITALIC; TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style);

1 0

Józef Kucia : wined3d: Add 4.4 to supported OpenGL versions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 6a0546da92e7607e8013a3c26bc2151e2efc6884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0546da92e7607e8013a3c26… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 2 11:39:28 2017 +0100 wined3d: Add 4.4 to supported OpenGL versions. We have a more efficient codepath for SM4+ interpolation modifiers if GLSL 4.40 is available. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ef3a7fd..c89d556 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6515,6 +6515,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, { static const DWORD supported_gl_versions[] = { + MAKEDWORD_VERSION(4, 4), MAKEDWORD_VERSION(3, 2), MAKEDWORD_VERSION(1, 0), };

1 0

Józef Kucia : wined3d: Factor out acquire_graphics_pipeline_resources().
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: c736181da4e8430259f6a447ef3112abffe9b305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c736181da4e8430259f6a447e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:41 2017 +0100 wined3d: Factor out acquire_graphics_pipeline_resources(). 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/cs.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 04e01da..afc4b05 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -809,25 +809,11 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); } -void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, - int base_vertex_idx, unsigned int start_idx, unsigned int index_count, - unsigned int start_instance, unsigned int instance_count, BOOL indexed) +static void acquire_graphics_pipeline_resources(const struct wined3d_state *state, + BOOL indexed, const struct wined3d_gl_info *gl_info) { - const struct wined3d_state *state = &cs->device->state; - struct wined3d_cs_draw *op; unsigned int i; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_DRAW; - op->primitive_type = primitive_type; - op->patch_vertex_count = patch_vertex_count; - op->base_vertex_idx = base_vertex_idx; - op->start_idx = start_idx; - op->index_count = index_count; - op->start_instance = start_instance; - op->instance_count = instance_count; - op->indexed = indexed; - if (indexed) wined3d_resource_acquire(&state->index_buffer->resource); for (i = 0; i < ARRAY_SIZE(state->streams); ++i) @@ -845,7 +831,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned if (state->textures[i]) wined3d_resource_acquire(&state->textures[i]->resource); } - for (i = 0; i < cs->device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < gl_info->limits.buffers; ++i) { if (state->fb->render_targets[i]) wined3d_resource_acquire(state->fb->render_targets[i]->resource); @@ -855,6 +841,28 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned acquire_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); acquire_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); +} + +void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, + int base_vertex_idx, unsigned int start_idx, unsigned int index_count, + unsigned int start_instance, unsigned int instance_count, BOOL indexed) +{ + const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_state *state = &cs->device->state; + struct wined3d_cs_draw *op; + + op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_DRAW; + op->primitive_type = primitive_type; + op->patch_vertex_count = patch_vertex_count; + op->base_vertex_idx = base_vertex_idx; + op->start_idx = start_idx; + op->index_count = index_count; + op->start_instance = start_instance; + op->instance_count = instance_count; + op->indexed = indexed; + + acquire_graphics_pipeline_resources(state, indexed, gl_info); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); }

1 0

Michael Stefaniuc : wined3d: Use ARRAY_SIZE().
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 9d1acd197d4aaddb618b0e77caebf8b384785740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1acd197d4aaddb618b0e77c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 31 12:10:29 2017 +0100 wined3d: Use ARRAY_SIZE(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 994c4b1..76f6705 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -488,7 +488,7 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) state_cleanup(&device->state); - for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) + for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) { HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); device->multistate_funcs[i] = NULL; @@ -5106,7 +5106,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, return WINED3D_OK; err: - for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) + for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) { HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); }

1 0

Alexandre Julliard : xcopy: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 9aa298ba69401e4b9f0003c4543ec0b0f8e2ea78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa298ba69401e4b9f0003c45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:27 2017 +0100 xcopy: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/xcopy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 5c2f7ca..a173cc1 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -94,7 +94,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) { * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -static int __cdecl XCOPY_wprintf(const WCHAR *format, ...) { +static int WINAPIV XCOPY_wprintf(const WCHAR *format, ...) { static WCHAR *output_bufW = NULL; static char *output_bufA = NULL;

1 0

Alexandre Julliard : reg: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: a37358d0f5ab6e447f96f22ceee0da6c34b5355f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37358d0f5ab6e447f96f22ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:21:30 2017 +0100 reg: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 4 ++-- programs/reg/reg.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index fac3d22..42fd6e9 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -151,7 +151,7 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) LocalFree(str); } -void __cdecl output_message(unsigned int id, ...) +void WINAPIV output_message(unsigned int id, ...) { WCHAR fmt[1024]; __ms_va_list va_args; @@ -166,7 +166,7 @@ void __cdecl output_message(unsigned int id, ...) __ms_va_end(va_args); } -static void __cdecl output_string(const WCHAR *fmt, ...) +static void WINAPIV output_string(const WCHAR *fmt, ...) { __ms_va_list va_args; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 14c05b1..07bbecf 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -27,7 +27,7 @@ void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); BOOL heap_free(void *buf); -void __cdecl output_message(unsigned int id, ...); +void WINAPIV output_message(unsigned int id, ...); HKEY path_get_rootkey(const WCHAR *path); /* import.c */

1 0

Alexandre Julliard : attrib: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 1722db40e5a14613aa7a44becfef05ef4124c804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1722db40e5a14613aa7a44bec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:20:40 2017 +0100 attrib: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/attrib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 0938cb8..a574204 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -48,7 +48,7 @@ static WCHAR *ATTRIB_LoadMessage(UINT id) * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) +static int WINAPIV ATTRIB_wprintf(const WCHAR *format, ...) { static WCHAR *output_bufW = NULL; static char *output_bufA = NULL;

1 0

Alexandre Julliard : ntdll: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: a5b67f3fddd49645fc9afaeac25bb3a5782fe6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b67f3fddd49645fc9afaeac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:16:54 2017 +0100 ntdll: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 8 ++++---- dlls/ntdll/string.c | 2 +- dlls/ntdll/tests/string.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index b6b8b6c..8a966304 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -709,7 +709,7 @@ int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_v /********************************************************************* * _snprintf (NTDLL.@) */ -int CDECL NTDLL__snprintf( char *str, SIZE_T len, const char *format, ... ) +int WINAPIV NTDLL__snprintf( char *str, SIZE_T len, const char *format, ... ) { int ret; __ms_va_list valist; @@ -724,7 +724,7 @@ int CDECL NTDLL__snprintf( char *str, SIZE_T len, const char *format, ... ) /*********************************************************************** * _snwprintf (NTDLL.@) */ -int CDECL NTDLL__snwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, ... ) +int WINAPIV NTDLL__snwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, ... ) { int ret; __ms_va_list valist; @@ -748,7 +748,7 @@ int CDECL NTDLL_vsprintf( char *str, const char *format, __ms_va_list args ) /********************************************************************* * sprintf (NTDLL.@) */ -int CDECL NTDLL_sprintf( char *str, const char *format, ... ) +int WINAPIV NTDLL_sprintf( char *str, const char *format, ... ) { int ret; __ms_va_list valist; @@ -763,7 +763,7 @@ int CDECL NTDLL_sprintf( char *str, const char *format, ... ) /*********************************************************************** * swprintf (NTDLL.@) */ -int CDECL NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ) +int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ) { int ret; __ms_va_list valist; diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index e8d061a..eb762c6 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -1363,7 +1363,7 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) /********************************************************************* * sscanf (NTDLL.@) */ -int __cdecl NTDLL_sscanf( const char *str, const char *format, ... ) +int WINAPIV NTDLL_sscanf( const char *str, const char *format, ... ) { int ret; __ms_va_list valist; diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 9bbaddd..8fca5d4 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -59,7 +59,7 @@ static LPWSTR (WINAPIV *p_wcsrchr)(LPCWSTR, WCHAR); static void (__cdecl *p_qsort)(void *,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static void* (__cdecl *p_bsearch)(void *,void*,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); -static int (__cdecl *p__snprintf)(char *, size_t, const char *, ...); +static int (WINAPIV *p__snprintf)(char *, size_t, const char *, ...); static void InitFunctionPtrs(void)

1 0

Alexandre Julliard : wldap32: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 70e02ce73c627837ad6ca1b1d8c6a91b7bb4dbd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e02ce73c627837ad6ca1b1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:16:27 2017 +0100 wldap32: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/ber.c | 4 ++-- include/winldap.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 41acd70..c2c6f26 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -322,7 +322,7 @@ ULONG CDECL WLDAP32_ber_skip_tag( BerElement *berelement, ULONG *len ) * berelement must have been allocated with ber_alloc_t. This function * can be called multiple times to append data. */ -INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) +INT WINAPIV WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) { #ifdef HAVE_LDAP __ms_va_list list; @@ -417,7 +417,7 @@ INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) * berelement must have been allocated with ber_init. This function * can be called multiple times to decode data. */ -INT CDECL WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) +INT WINAPIV WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) { #ifdef HAVE_LDAP __ms_va_list list; diff --git a/include/winldap.h b/include/winldap.h index 2014e06..e5c1faa 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -628,9 +628,9 @@ void CDECL ber_free(BerElement*,INT); BerElement* CDECL ber_init(BERVAL*); ULONG CDECL ber_next_element(BerElement*,ULONG*,CHAR*); ULONG CDECL ber_peek_tag(BerElement*,ULONG*); -INT CDECL ber_printf(BerElement*,PCHAR,...); +INT WINAPIV ber_printf(BerElement*,PCHAR,...); ULONG CDECL ber_skip_tag(BerElement*,ULONG*); -INT CDECL ber_scanf(BerElement*,PCHAR,...); +INT WINAPIV ber_scanf(BerElement*,PCHAR,...); ULONG CDECL LdapGetLastError(void); ULONG CDECL LdapMapErrorToWin32(ULONG);

1 0

Martin Storsjo : msvcrt: Back up and restore the FPU state in setjmp/ longjmp on ARM.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 171b3bcf3b7c4ef992fce81849108202d70dbddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=171b3bcf3b7c4ef992fce8184… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Nov 2 08:55:42 2017 +0200 msvcrt: Back up and restore the FPU state in setjmp/longjmp on ARM. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 29ddb7b..76c4735 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -151,7 +151,16 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmpex, "str r11, [r0, #0x20]\n\t" /* jmp_buf->R11 */ "str sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "str lr, [r0, #0x28]\n\t" /* jmp_buf->Pc */ - /* FIXME: Save floating point data */ + "vmrs r2, fpscr\n\t" + "str r2, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ + "vstr d8, [r0, #0x30]\n\t" /* jmp_buf->D[0] */ + "vstr d9, [r0, #0x38]\n\t" /* jmp_buf->D[1] */ + "vstr d10, [r0, #0x40]\n\t" /* jmp_buf->D[2] */ + "vstr d11, [r0, #0x48]\n\t" /* jmp_buf->D[3] */ + "vstr d12, [r0, #0x50]\n\t" /* jmp_buf->D[4] */ + "vstr d13, [r0, #0x58]\n\t" /* jmp_buf->D[5] */ + "vstr d14, [r0, #0x60]\n\t" /* jmp_buf->D[6] */ + "vstr d15, [r0, #0x68]\n\t" /* jmp_buf->D[7] */ "mov r0, #0\n\t" "bx lr"); @@ -168,7 +177,16 @@ __ASM_GLOBAL_FUNC(longjmp_set_regs, "ldr r11, [r0, #0x20]\n\t" /* jmp_buf->R11 */ "ldr sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "ldr r2, [r0, #0x28]\n\t" /* jmp_buf->Pc */ - /* FIXME: Restore floating point data */ + "ldr r3, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ + "vmsr fpscr, r3\n\t" + "vldr d8, [r0, #0x30]\n\t" /* jmp_buf->D[0] */ + "vldr d9, [r0, #0x38]\n\t" /* jmp_buf->D[1] */ + "vldr d10, [r0, #0x40]\n\t" /* jmp_buf->D[2] */ + "vldr d11, [r0, #0x48]\n\t" /* jmp_buf->D[3] */ + "vldr d12, [r0, #0x50]\n\t" /* jmp_buf->D[4] */ + "vldr d13, [r0, #0x58]\n\t" /* jmp_buf->D[5] */ + "vldr d14, [r0, #0x60]\n\t" /* jmp_buf->D[6] */ + "vldr d15, [r0, #0x68]\n\t" /* jmp_buf->D[7] */ "mov r0, r1\n\t" /* retval */ "bx r2");

1 0

Alexandre Julliard : include: Use the hard-float calling convention for Windows APIs on ARM
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 644f497e87c51f1a1c62b26ea9f588e7bc97d13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=644f497e87c51f1a1c62b26ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:56 2017 +0100 include: Use the hard-float calling convention for Windows APIs on ARM Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/crtdefs.h | 10 +++++++++- include/windef.h | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 9ec2082..ff0f4bd 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -60,6 +60,8 @@ # else # define __stdcall __attribute__((ms_abi)) # endif +# elif defined(__arm__) && defined (__GNUC__) +# define __stdcall __attribute__((pcs("aapcs-vfp"))) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -78,6 +80,8 @@ # else # define __cdecl __attribute__((ms_abi)) # endif +# elif defined(__arm__) && defined (__GNUC__) +# define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif !defined(_MSC_VER) # define __cdecl # endif @@ -102,7 +106,11 @@ #endif #ifndef WINAPIV -# define WINAPIV __cdecl +# if defined(__arm__) && defined (__GNUC__) +# define WINAPIV __attribute__((pcs("aapcs"))) +# else +# define WINAPIV __cdecl +# endif #endif #ifndef DECLSPEC_ALIGN diff --git a/include/windef.h b/include/windef.h index e77b1ca..d2afcf4 100644 --- a/include/windef.h +++ b/include/windef.h @@ -69,6 +69,8 @@ extern "C" { # else # define __stdcall __attribute__((ms_abi)) # endif +# elif defined(__arm__) && defined (__GNUC__) +# define __stdcall __attribute__((pcs("aapcs-vfp"))) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -87,6 +89,8 @@ extern "C" { # else # define __cdecl __attribute__((ms_abi)) # endif +# elif defined(__arm__) && defined (__GNUC__) +# define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif !defined(_MSC_VER) # define __cdecl # endif @@ -110,6 +114,12 @@ extern "C" { # endif #endif +#if defined(__arm__) && defined (__GNUC__) +# define WINAPIV __attribute__((pcs("aapcs"))) +#else +# define WINAPIV __cdecl +#endif + #ifdef __WINESRC__ #define __ONLY_IN_WINELIB(x) do_not_use_this_in_wine #else @@ -179,7 +189,6 @@ extern "C" { #define PASCAL __stdcall #define CDECL __cdecl #define _CDECL __cdecl -#define WINAPIV __cdecl #define APIENTRY WINAPI #define CONST __ONLY_IN_WINELIB(const)

1 0

Alexandre Julliard : taskkill: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 6c4cea952f94c3cef262ca74e539126a11414382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4cea952f94c3cef262ca74e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:10 2017 +0100 taskkill: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskkill/taskkill.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index b9dd1a5..6e4e1eb 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -74,7 +74,7 @@ static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args) return count; } -static int CDECL taskkill_printfW(const WCHAR *msg, ...) +static int WINAPIV taskkill_printfW(const WCHAR *msg, ...) { __ms_va_list va_args; int len; @@ -86,7 +86,7 @@ static int CDECL taskkill_printfW(const WCHAR *msg, ...) return len; } -static int CDECL taskkill_message_printfW(int msg, ...) +static int WINAPIV taskkill_message_printfW(int msg, ...) { __ms_va_list va_args; WCHAR msg_buffer[8192];

1 0

Alexandre Julliard : regsvr32: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: a31e62a2676806aafe05bc9ddc6150b65597efeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a31e62a2676806aafe05bc9dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:01 2017 +0100 regsvr32: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 6338bae..988aaa3 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -40,7 +40,7 @@ typedef HRESULT (WINAPI *DLLINSTALL) (BOOL,LPCWSTR); static BOOL Silent = FALSE; -static void __cdecl output_write(UINT id, ...) +static void WINAPIV output_write(UINT id, ...) { WCHAR fmt[1024]; __ms_va_list va_args;

1 0

Alexandre Julliard : regedit: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 7344ac9b728ac60fdabf2ee10113c5e94c5d9e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7344ac9b728ac60fdabf2ee10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:21:53 2017 +0100 regedit: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 4 ++-- programs/regedit/main.h | 2 +- programs/regedit/regedit.c | 4 ++-- programs/regedit/regproc.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 3694627..6ccce00 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -64,7 +64,7 @@ static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_l return ret; } -int __cdecl messagebox(HWND hwnd, int buttons, int titleId, int resId, ...) +int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...) { __ms_va_list ap; INT result; @@ -76,7 +76,7 @@ int __cdecl messagebox(HWND hwnd, int buttons, int titleId, int resId, ...) return result; } -static void __cdecl error_code_messagebox(HWND hwnd, unsigned int msg_id, ...) +static void WINAPIV error_code_messagebox(HWND hwnd, unsigned int msg_id, ...) { __ms_va_list ap; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 8e05888..788de1a 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -160,7 +160,7 @@ extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); -extern int __cdecl messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); +extern int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); /* hexedit.c */ extern void HexEdit_Register(void); diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 4dd71ca..2d724f9 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -67,7 +67,7 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) LocalFree(str); } -void __cdecl output_message(unsigned int id, ...) +void WINAPIV output_message(unsigned int id, ...) { WCHAR fmt[1536]; __ms_va_list va_args; @@ -82,7 +82,7 @@ void __cdecl output_message(unsigned int id, ...) __ms_va_end(va_args); } -void __cdecl error_exit(unsigned int id, ...) +void WINAPIV error_exit(unsigned int id, ...) { WCHAR fmt[1536]; __ms_va_list va_args; diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 4031255..9364fde 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -24,8 +24,8 @@ #define REG_FORMAT_5 1 #define REG_FORMAT_4 2 -void __cdecl output_message(unsigned int id, ...); -void __cdecl error_exit(unsigned int id, ...); +void WINAPIV output_message(unsigned int id, ...); +void WINAPIV error_exit(unsigned int id, ...); char *GetMultiByteString(const WCHAR *strW); void *heap_xalloc(size_t size);

1 0

Alexandre Julliard : net: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 399feae786147162837cacb2280afb322bc3aff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=399feae786147162837cacb22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:21:10 2017 +0100 net: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/net/net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 2e540ea..d8123eb 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -70,7 +70,7 @@ static int output_vprintf(const WCHAR* fmt, __ms_va_list va_args) return 0; } -static int __cdecl output_printf(const WCHAR* fmt, ...) +static int WINAPIV output_printf(const WCHAR* fmt, ...) { __ms_va_list arguments; @@ -80,7 +80,7 @@ static int __cdecl output_printf(const WCHAR* fmt, ...) return 0; } -static int __cdecl output_string(int msg, ...) +static int WINAPIV output_string(int msg, ...) { WCHAR fmt[8192]; __ms_va_list arguments;

1 0

Alexandre Julliard : ipconfig: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 308bf48b7348c520a254885fda82467e043140e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308bf48b7348c520a254885fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:20:57 2017 +0100 ipconfig: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ipconfig/ipconfig.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index a74ded6..936dfa2 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -62,7 +62,7 @@ static int ipconfig_vprintfW(const WCHAR *msg, __ms_va_list va_args) return count; } -static int CDECL ipconfig_printfW(const WCHAR *msg, ...) +static int WINAPIV ipconfig_printfW(const WCHAR *msg, ...) { __ms_va_list va_args; int len; @@ -74,7 +74,7 @@ static int CDECL ipconfig_printfW(const WCHAR *msg, ...) return len; } -static int CDECL ipconfig_message_printfW(int msg, ...) +static int WINAPIV ipconfig_message_printfW(int msg, ...) { __ms_va_list va_args; WCHAR msg_buffer[8192];

1 0

Alexandre Julliard : cmd: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: bcb6bf98e09ca9802ea08a2b91bb12ca6e8c8540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb6bf98e09ca9802ea08a2b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:20:52 2017 +0100 cmd: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmd.h | 6 +++--- programs/cmd/wcmdmain.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 1180251..557be14 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -75,9 +75,9 @@ void WCMD_if (WCHAR *, CMD_LIST **cmdList); void WCMD_leave_paged_mode(void); void WCMD_more (WCHAR *); void WCMD_move (void); -WCHAR* CDECL WCMD_format_string (const WCHAR *format, ...); -void CDECL WCMD_output (const WCHAR *format, ...); -void CDECL WCMD_output_stderr (const WCHAR *format, ...); +WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...); +void WINAPIV WCMD_output (const WCHAR *format, ...); +void WINAPIV WCMD_output_stderr (const WCHAR *format, ...); void WCMD_output_asis (const WCHAR *message); void WCMD_output_asis_stderr (const WCHAR *message); void WCMD_pause (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 102e485..cec6df0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -128,7 +128,7 @@ static void WCMD_output_asis_len(const WCHAR *message, DWORD len, HANDLE device) * */ -void CDECL WCMD_output (const WCHAR *format, ...) { +void WINAPIV WCMD_output (const WCHAR *format, ...) { __ms_va_list ap; WCHAR* string; @@ -154,7 +154,7 @@ void CDECL WCMD_output (const WCHAR *format, ...) { * */ -void CDECL WCMD_output_stderr (const WCHAR *format, ...) { +void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) { __ms_va_list ap; WCHAR* string; @@ -180,8 +180,8 @@ void CDECL WCMD_output_stderr (const WCHAR *format, ...) { * */ -WCHAR* CDECL WCMD_format_string (const WCHAR *format, ...) { - +WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...) +{ __ms_va_list ap; WCHAR* string; DWORD len;

1 0

Alexandre Julliard : kernel32/tests: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: e488a246a5467814bf1d3ef0f0b88373a72d82af URL: http://source.winehq.org/git/wine.git/?a=commit;h=e488a246a5467814bf1d3ef0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:17:04 2017 +0100 kernel32/tests: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 1f88e24..7098805 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -26,7 +26,7 @@ #define ULL(a,b) (((ULONG64)(a) << 32) | (b)) -static DWORD __cdecl doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, +static DWORD WINAPIV doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPSTR out, DWORD outsize, ... ) { __ms_va_list list; @@ -39,7 +39,7 @@ static DWORD __cdecl doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, return r; } -static DWORD __cdecl doitW(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, +static DWORD WINAPIV doitW(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPWSTR out, DWORD outsize, ... ) { __ms_va_list list;

1 0

Alexandre Julliard : uninstaller: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 7c555f5c907ca42ec01d0af57d4fd17aaeadf7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c555f5c907ca42ec01d0af57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:17 2017 +0100 uninstaller: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 1c834ea..736593e 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -97,7 +97,7 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) LocalFree(str); } -static void __cdecl output_message(unsigned int id, ...) +static void WINAPIV output_message(unsigned int id, ...) { WCHAR fmt[1024]; __ms_va_list va_args; @@ -112,7 +112,7 @@ static void __cdecl output_message(unsigned int id, ...) __ms_va_end(va_args); } -static void __cdecl output_array(WCHAR *fmt, ...) +static void WINAPIV output_array(WCHAR *fmt, ...) { __ms_va_list va_args;

1 0

Alexandre Julliard : netstat: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 83d6249c412aaaa89723ff7a5ce12fab9a3317ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d6249c412aaaa89723ff7a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:21:15 2017 +0100 netstat: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/netstat/netstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 6112497..8fe5900 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -70,7 +70,7 @@ static const WCHAR tcpstatesW[][16] = { * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -static int __cdecl NETSTAT_wprintf(const WCHAR *format, ...) +static int WINAPIV NETSTAT_wprintf(const WCHAR *format, ...) { static WCHAR *output_bufW = NULL; static char *output_bufA = NULL;

1 0

Alexandre Julliard : include: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 667b150a98a5df15302749cb5243568b8ffa1564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=667b150a98a5df15302749cb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:20:27 2017 +0100 include: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oledlg.h | 4 ++-- include/rpcndr.h | 2 +- include/vfw.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/oledlg.h b/include/oledlg.h index f009d76..80829ec 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -967,8 +967,8 @@ BOOL WINAPI OleUIAddVerbMenuW(LPOLEOBJECT lpOleObj, LPCWSTR lpszShortType, HMEN UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial); UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial); #define OleUIPasteSpecial WINELIB_NAME_AW(OleUIPasteSpecial) -INT __cdecl OleUIPromptUserA(INT,HWND, ...); -INT __cdecl OleUIPromptUserW(INT,HWND, ...); +INT WINAPIV OleUIPromptUserA(INT,HWND, ...); +INT WINAPIV OleUIPromptUserW(INT,HWND, ...); #define OleUIPromptUser WINELIB_NAME_AW(OleUIPromptUser) #ifdef __cplusplus diff --git a/include/rpcndr.h b/include/rpcndr.h index 9029950..0f751d7 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -114,7 +114,7 @@ typedef UINT64 MIDL_uhyper; typedef unsigned char boolean; #define __RPC_CALLEE WINAPI -#define RPC_VAR_ENTRY __cdecl +#define RPC_VAR_ENTRY WINAPIV #define NDR_SHAREABLE static #define MIDL_ascii_strlen(s) strlen(s) diff --git a/include/vfw.h b/include/vfw.h index aa3d4f5..cec5345 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -1082,10 +1082,10 @@ BOOL WINAPI AVISaveOptions(HWND hWnd,UINT uFlags,INT nStream, PAVISTREAM *ppavi,LPAVICOMPRESSOPTIONS *ppOptions); HRESULT WINAPI AVISaveOptionsFree(INT nStreams,LPAVICOMPRESSOPTIONS*ppOptions); -HRESULT CDECL AVISaveA(LPCSTR szFile, CLSID *pclsidHandler, +HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID *pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...); -HRESULT CDECL AVISaveW(LPCWSTR szFile, CLSID *pclsidHandler, +HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID *pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...); #define AVISave WINELIB_NAME_AW(AVISave)

1 0

Alexandre Julliard : msvcrt: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 7726157e19f030690c209e59cd1102a6d0e243a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7726157e19f030690c209e59c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:19:18 2017 +0100 msvcrt: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp_main.c | 4 +-- dlls/msvcr120/tests/msvcr120.c | 2 +- dlls/msvcr90/tests/msvcr90.c | 4 +-- dlls/msvcrt/console.c | 4 +-- dlls/msvcrt/except_i386.c | 2 +- dlls/msvcrt/file.c | 26 +++++++------- dlls/msvcrt/msvcrt.h | 12 +++---- dlls/msvcrt/process.c | 32 ++++++++--------- dlls/msvcrt/scanf.c | 80 +++++++++++++++++++++--------------------- dlls/msvcrt/scheduler.c | 2 +- dlls/msvcrt/tests/printf.c | 22 ++++++------ dlls/msvcrt/tests/scanf.c | 2 +- dlls/msvcrt/wcs.c | 42 +++++++++++----------- dlls/ucrtbase/tests/printf.c | 12 +++---- include/msvcrt/conio.h | 8 ++--- include/msvcrt/crtdbg.h | 2 +- include/msvcrt/crtdefs.h | 4 +++ include/msvcrt/io.h | 12 +++---- include/msvcrt/process.h | 48 ++++++++++++------------- include/msvcrt/stdio.h | 62 ++++++++++++++++---------------- include/msvcrt/wchar.h | 50 +++++++++++++------------- 21 files changed, 218 insertions(+), 214 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7726157e19f030690c209…

1 0

Jacek Caban : jscript: Added support for VT_UI2 VARIANT types.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 4fc0f2aa3848b5cb41a851400a1cfe757441fdb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc0f2aa3848b5cb41a851400… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 1 16:43:37 2017 +0100 jscript: Added support for VT_UI2 VARIANT types. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 3 +++ dlls/jscript/tests/run.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index edfebcf..48628bd 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -297,6 +297,9 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) case VT_I2: *r = jsval_number(V_I2(var)); return S_OK; + case VT_UI2: + *r = jsval_number(V_UI2(var)); + return S_OK; case VT_INT: *r = jsval_number(V_INT(var)); return S_OK; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 1d42c54..bd5e341 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1315,7 +1315,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[7], v; + VARIANT args[8], v; DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; @@ -1357,6 +1357,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VARIANTREF(args+5) = &v; V_VT(args+6) = VT_R4; V_R4(args+6) = 0.5; + V_VT(args+7) = VT_UI2; + V_R4(args+7) = 3; V_VT(&v) = VT_I4; V_I4(&v) = 2; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); @@ -2647,7 +2649,7 @@ static BOOL run_tests(void) SET_EXPECT(global_testargtypes_i); parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp," - "function(r4,i4ref,ui4,nullunk,d,i,s) {" + "function(ui2,r4,i4ref,ui4,nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" @@ -2659,6 +2661,7 @@ static BOOL run_tests(void) " ok(i4ref === 2, 'i4ref = ' + i4ref);" " ok(r4 === 0.5, 'r4 = ' + r4);" " ok(getVT(r4) === 'VT_R8', 'getVT(r4) = ' + getVT(r4));" + " ok(getVT(ui2) === 'VT_I4', 'getVT(ui2) = ' + getVT(ui2));" "});"); CHECK_CALLED(global_testargtypes_i);

1 0

Zebediah Figura : regedit: Always start the GUI as 64-bit when on a 64-bit prefix.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 25c78b61de4a0beccbb9a6f556a1656c8dac7785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c78b61de4a0beccbb9a6f55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 31 18:27:21 2017 -0500 regedit: Always start the GUI as 64-bit when on a 64-bit prefix. Same as we do with winecfg. This should help to eliminate some confusion with users who may want to edit keys with WOW64 redirection (e.g. Software\\Wine\\Drives). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 8f82580..460a951 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -24,10 +24,13 @@ #include <stdlib.h> #include <stdio.h> #include <fcntl.h> +#include "wine/debug.h" #define REGEDIT_DECLARE_FUNCTIONS #include "main.h" +WINE_DEFAULT_DEBUG_CHANNEL(regedit); + WCHAR g_pszDefaultValueName[64]; BOOL ProcessCmdLine(WCHAR *cmdline); @@ -138,11 +141,36 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi { MSG msg; HACCEL hAccel; + BOOL is_wow64; if (ProcessCmdLine(GetCommandLineW())) { return 0; } + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR filename[MAX_PATH]; + void *redir; + DWORD exit_code; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + GetModuleFileNameW( 0, filename, MAX_PATH ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + WaitForSingleObject( pi.hProcess, INFINITE ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ExitProcess( exit_code ); + } + else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); + } + /* Initialize global strings */ LoadStringW(hInstance, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, COUNT_OF(g_pszDefaultValueName));

1 0

Alexandre Julliard : configure: Require floating point support on ARM.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 05fad4b75171291619381bafe9acfbe71890e72c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05fad4b75171291619381bafe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 09:52:26 2017 +0100 configure: Require floating point support on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 23 +++++++++++++++++++++++ configure.ac | 5 +++++ 2 files changed, 28 insertions(+) diff --git a/configure b/configure index 00b0087..cb21f2a 100755 --- a/configure +++ b/configure @@ -5265,6 +5265,29 @@ rm -f core conftest.err conftest.$ac_objext \ CFLAGS="$CFLAGS -marm" TARGETFLAGS="-marm" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports floating point" >&5 +$as_echo_n "checking whether $CC supports floating point... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +asm("vmrs r2,fpscr"); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "You need a target with floating point support to build Wine for ARM." "$LINENO" 5 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ;; i[3456789]86*) enable_win16=${enable_win16:-yes} diff --git a/configure.ac b/configure.ac index 3039c94..29f4cd1 100644 --- a/configure.ac +++ b/configure.ac @@ -179,6 +179,11 @@ case $host in AC_MSG_ERROR([You need a target with Thumb support to build Wine for ARM.])]) CFLAGS="$CFLAGS -marm" AC_SUBST(TARGETFLAGS,"-marm") + AC_MSG_CHECKING([whether $CC supports floating point]) + WINE_TRY_ASM_LINK(["vmrs r2,fpscr"],,, + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([You need a target with floating point support to build Wine for ARM.])]) ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes}

1 0