November 2017 - Wine-commits

Nikolay Sivov : gdiplus/metafile: Simplify EmfPlusARGB definition.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 0625b33834b108c4d0bf6466cbf0571fa2bf52ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0625b33834b108c4d0bf6466c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:38 2017 +0300 gdiplus/metafile: Simplify EmfPlusARGB definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index e40487a..bf07fed 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -45,13 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); -typedef struct EmfPlusARGB -{ - BYTE Blue; - BYTE Green; - BYTE Red; - BYTE Alpha; -} EmfPlusARGB; +typedef ARGB EmfPlusARGB; typedef struct EmfPlusRecordHeader { @@ -1837,7 +1831,7 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si if (data_size != header_size + sizeof(EmfPlusSolidBrushData)) return InvalidParameter; - status = GdipCreateSolidFill(*(ARGB *)&data->BrushData.solid.SolidColor, (GpSolidFill **)brush); + status = GdipCreateSolidFill(data->BrushData.solid.SolidColor, (GpSolidFill **)brush); break; default: FIXME("brush type %u is not supported.\n", data->Type); @@ -2274,7 +2268,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill((ARGB)record->BrushID, (GpSolidFill**)&temp_brush); + stat = GdipCreateSolidFill(record->BrushID, (GpSolidFill **)&temp_brush); brush = temp_brush; } else @@ -2714,7 +2708,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill(*(ARGB *)&fill->data.Color, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->data.Color, (GpSolidFill **)&solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; @@ -3565,10 +3559,7 @@ static GpStatus METAFILE_AddImageAttributesObject(GpMetafile *metafile, const Gp attrs_record->Version = VERSION_MAGIC2; attrs_record->Reserved1 = 0; attrs_record->WrapMode = attrs->wrap; - attrs_record->ClampColor.Blue = attrs->outside_color & 0xff; - attrs_record->ClampColor.Green = (attrs->outside_color >> 8) & 0xff; - attrs_record->ClampColor.Red = (attrs->outside_color >> 16) & 0xff; - attrs_record->ClampColor.Alpha = attrs->outside_color >> 24; + attrs_record->ClampColor = attrs->outside_color; attrs_record->ObjectClamp = attrs->clamp; attrs_record->Reserved2 = 0; return Ok; @@ -3714,10 +3705,7 @@ static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) data->Version = VERSION_MAGIC2; data->Type = solid->brush.bt; - data->BrushData.solid.SolidColor.Blue = solid->color & 0xff; - data->BrushData.solid.SolidColor.Green = (solid->color >> 8) & 0xff; - data->BrushData.solid.SolidColor.Red = (solid->color >> 16) & 0xff; - data->BrushData.solid.SolidColor.Alpha = solid->color >> 24; + data->BrushData.solid.SolidColor = solid->color; } } @@ -3970,10 +3958,7 @@ GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) if (inline_color) { fill_path_record->Header.Flags = 0x8000 | path_id; - fill_path_record->data.Color.Blue = ((GpSolidFill*)brush)->color & 0xff; - fill_path_record->data.Color.Green = (((GpSolidFill*)brush)->color >> 8) & 0xff; - fill_path_record->data.Color.Red = (((GpSolidFill*)brush)->color >> 16) & 0xff; - fill_path_record->data.Color.Alpha = ((GpSolidFill*)brush)->color >> 24; + fill_path_record->data.Color = ((GpSolidFill *)brush)->color; } else {

1 0

Nikolay Sivov : gdiplus/metafile: Support hatch brushes in playback.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 6d0ca495b8b0555c5f62911e43fee04396cd7fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0ca495b8b0555c5f62911e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:39 2017 +0300 gdiplus/metafile: Support hatch brushes in playback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index bf07fed..c9ddcc6 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -230,12 +230,20 @@ typedef struct EmfPlusSolidBrushData EmfPlusARGB SolidColor; } EmfPlusSolidBrushData; +typedef struct EmfPlusHatchBrushData +{ + DWORD HatchStyle; + EmfPlusARGB ForeColor; + EmfPlusARGB BackColor; +} EmfPlusHatchBrushData; + typedef struct EmfPlusBrush { DWORD Version; DWORD Type; union { EmfPlusSolidBrushData solid; + EmfPlusHatchBrushData hatch; } BrushData; } EmfPlusBrush; @@ -1833,6 +1841,13 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si status = GdipCreateSolidFill(data->BrushData.solid.SolidColor, (GpSolidFill **)brush); break; + case BrushTypeHatchFill: + if (data_size != header_size + sizeof(EmfPlusHatchBrushData)) + return InvalidParameter; + + status = GdipCreateHatchBrush(data->BrushData.hatch.HatchStyle, data->BrushData.hatch.ForeColor, + data->BrushData.hatch.BackColor, (GpHatch **)brush); + break; default: FIXME("brush type %u is not supported.\n", data->Type); return NotImplemented;

1 0

Nikolay Sivov : gdiplus/metafile: Support texture brushes playback.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 905bd23b2e46f800ab2100feec8abbdc2565d8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=905bd23b2e46f800ab2100fee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:40 2017 +0300 gdiplus/metafile: Support texture brushes playback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c9ddcc6..0630779 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -225,6 +225,18 @@ typedef struct EmfPlusPenData BYTE OptionalData[1]; } EmfPlusPenData; +enum BrushDataFlags +{ + BrushDataPath = 1 << 0, + BrushDataTransform = 1 << 1, + BrushDataPresetColors = 1 << 2, + BrushDataBlendFactorsH = 1 << 3, + BrushDataBlendFactorsV = 1 << 4, + BrushDataFocusScales = 1 << 6, + BrushDataIsGammaCorrected = 1 << 7, + BrushDataDoNotTransform = 1 << 8, +}; + typedef struct EmfPlusSolidBrushData { EmfPlusARGB SolidColor; @@ -237,6 +249,13 @@ typedef struct EmfPlusHatchBrushData EmfPlusARGB BackColor; } EmfPlusHatchBrushData; +typedef struct EmfPlusTextureBrushData +{ + DWORD BrushDataFlags; + INT WrapMode; + BYTE OptionalData[1]; +} EmfPlusTextureBrushData; + typedef struct EmfPlusBrush { DWORD Version; @@ -244,6 +263,7 @@ typedef struct EmfPlusBrush union { EmfPlusSolidBrushData solid; EmfPlusHatchBrushData hatch; + EmfPlusTextureBrushData texture; } BrushData; } EmfPlusBrush; @@ -1848,6 +1868,36 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si status = GdipCreateHatchBrush(data->BrushData.hatch.HatchStyle, data->BrushData.hatch.ForeColor, data->BrushData.hatch.BackColor, (GpHatch **)brush); break; + case BrushTypeTextureFill: + { + UINT offset = header_size + FIELD_OFFSET(EmfPlusTextureBrushData, OptionalData); + EmfPlusTransformMatrix *transform = NULL; + DWORD brushflags; + GpImage *image; + + if (data_size <= offset) + return InvalidParameter; + + brushflags = data->BrushData.texture.BrushDataFlags; + if (brushflags & BrushDataTransform) + { + if (data_size <= offset + sizeof(EmfPlusTransformMatrix)) + return InvalidParameter; + transform = (EmfPlusTransformMatrix *)(record_data + offset); + offset += sizeof(EmfPlusTransformMatrix); + } + + status = metafile_deserialize_image(record_data + offset, data_size - offset, &image); + if (status != Ok) + return status; + + status = GdipCreateTexture(image, data->BrushData.texture.WrapMode, (GpTexture **)brush); + if (status == Ok && transform && !(brushflags & BrushDataDoNotTransform)) + GdipSetTextureTransform((GpTexture *)*brush, (const GpMatrix *)transform); + + GdipDisposeImage(image); + break; + } default: FIXME("brush type %u is not supported.\n", data->Type); return NotImplemented;

1 0

Nikolay Sivov : gdiplus/metafile: Support hatch brushes for recording.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: f25f0fa2ac47af177de8ea7ef3a476b2b78a4941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25f0fa2ac47af177de8ea7ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:41 2017 +0300 gdiplus/metafile: Support hatch brushes for recording. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 0630779..8e9ad87 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3752,25 +3752,45 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD static GpStatus METAFILE_PrepareBrushData(GpBrush *brush, DWORD *size) { - if (brush->bt == BrushTypeSolidColor) + switch (brush->bt) { - *size = FIELD_OFFSET(EmfPlusBrush, BrushData.solid) + sizeof(EmfPlusSolidBrushData); - return Ok; + case BrushTypeSolidColor: + *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusSolidBrushData); + break; + case BrushTypeHatchFill: + *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusHatchBrushData); + break; + default: + FIXME("unsupported brush type: %d\n", brush->bt); + return NotImplemented; } - FIXME("unsupported brush type: %d\n", brush->bt); - return NotImplemented; + return Ok; } static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) { - if (brush->bt == BrushTypeSolidColor) - { - GpSolidFill *solid = (GpSolidFill*)brush; + data->Version = VERSION_MAGIC2; + data->Type = brush->bt; - data->Version = VERSION_MAGIC2; - data->Type = solid->brush.bt; + switch (brush->bt) + { + case BrushTypeSolidColor: + { + GpSolidFill *solid = (GpSolidFill *)brush; data->BrushData.solid.SolidColor = solid->color; + break; + } + case BrushTypeHatchFill: + { + GpHatch *hatch = (GpHatch *)brush; + data->BrushData.hatch.HatchStyle = hatch->hatchstyle; + data->BrushData.hatch.ForeColor = hatch->forecol; + data->BrushData.hatch.BackColor = hatch->backcol; + break; + } + default: + FIXME("unsupported brush type: %d\n", brush->bt); } }

1 0

Alexandre Julliard : wldap32: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

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

Alexandre Julliard : ntdll: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

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 : kernel32/tests: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

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 : msvcrt: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

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

Alexandre Julliard : include: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

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 : attrib: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

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