March 2022 - Wine-commits - list.winehq.org

Eric Pouech : quartz/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 3c2e6efb5a6b077ccd6eac2190e16829882ee333 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2e6efb5a6b077ccd6eac21… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Mar 7 12:54:07 2022 -0600 quartz/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 1 - dlls/quartz/tests/acmwrapper.c | 196 ++--- dlls/quartz/tests/avidec.c | 506 +++++------ dlls/quartz/tests/avisplit.c | 576 ++++++------ dlls/quartz/tests/dsoundrender.c | 500 +++++------ dlls/quartz/tests/filesource.c | 496 +++++------ dlls/quartz/tests/filtergraph.c | 1762 +++++++++++++++++++------------------ dlls/quartz/tests/filtermapper.c | 120 +-- dlls/quartz/tests/memallocator.c | 358 ++++---- dlls/quartz/tests/mpegsplit.c | 626 ++++++------- dlls/quartz/tests/passthrough.c | 32 +- dlls/quartz/tests/systemclock.c | 88 +- dlls/quartz/tests/videorenderer.c | 1216 ++++++++++++------------- dlls/quartz/tests/vmr7.c | 1314 +++++++++++++-------------- dlls/quartz/tests/vmr9.c | 1688 +++++++++++++++++------------------ dlls/quartz/tests/waveparser.c | 388 ++++---- 16 files changed, 4934 insertions(+), 4933 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c2e6efb5a6b077ccd6e…

1 0

David Kahurani : oleaut32: Do not skip the first decimal digit in VarParseNumFromStr().
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: a4ba88c0ff25c71687fd26792cda40c20d8eaed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ba88c0ff25c71687fd2679… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Mar 7 18:47:31 2022 +0100 oleaut32: Do not skip the first decimal digit in VarParseNumFromStr(). Add more tests to probe what happens if the integral part is omitted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52476 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 47 +++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.c | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index f25a448645c..a4e2700c7df 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1775,6 +1775,45 @@ static void test_VarParseNumFromStrEn(void) EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,0); EXPECT2(1,FAILDIG); + /* Skipping the integer part is not an error */ + CONVERT(".2", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(2,FAILDIG); + + /* Even zero gets an exponent (it sort of indicates 'precision') */ + CONVERT(".0", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(0,FAILDIG); + + CONVERT(".000", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-3); + EXPECTRGB(0,0); + EXPECTRGB(3,FAILDIG); + + CONVERT("$.02", NUMPRS_CURRENCY|NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_DECIMAL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,4,0,-2); + EXPECT2(2,FAILDIG); + + CONVERT(".001", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-3); + EXPECT2(1,FAILDIG); + + CONVERT(".101", NUMPRS_DECIMAL); + EXPECT(3,NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-3); + EXPECT2(1,0); + EXPECTRGB(2,1); + EXPECTRGB(3,FAILDIG); + + CONVERT(".30", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,3,0,-1); + /* See the NUMPRS_THOUSANDS comment about trailing zeroes */ + EXPECTRGB(0,3); + EXPECTRGB(2,FAILDIG); + + /* But skipping both the integer and decimal part is not allowed */ + CONVERT(".", NUMPRS_DECIMAL); + EXPECTFAIL; + /* Consumes only one decimal point */ CONVERT("1.1.", NUMPRS_DECIMAL); EXPECT(2,NUMPRS_DECIMAL,NUMPRS_DECIMAL,3,0,-1); @@ -2131,6 +2170,14 @@ static void test_VarParseNumFromStrFr(void) CONVERT("1.2", NUMPRS_DECIMAL); EXPECT(1,NUMPRS_DECIMAL,0,1,0,0); EXPECT2(1,FAILDIG); + + /* The integer part can still be omitted */ + CONVERT(",2", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(2,FAILDIG); + + CONVERT(".2", NUMPRS_DECIMAL); + EXPECTFAIL; } static void test_VarParseNumFromStrMisc(void) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index bf8f041b9c6..885082cc659 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1633,7 +1633,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla /* If we have no digits so far, skip leading zeros */ if (!pNumprs->cDig) { - while (lpszStr[1] == '0') + while (*lpszStr == '0') { dwState |= B_LEADING_ZERO; cchUsed++;

1 0

Alexandre Julliard : faudio: Revert some calling convention changes.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: b75e389046c90c8c673549523837f4467d244be8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b75e389046c90c8c67354952… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 20:41:24 2022 +0100 faudio: Revert some calling convention changes. We require -mabi=ms now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/faudio/src/FAudio_internal.c | 2 +- libs/faudio/src/FAudio_internal.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/faudio/src/FAudio_internal.c b/libs/faudio/src/FAudio_internal.c index 6ab0ce98bc2..d7b1fed19c9 100644 --- a/libs/faudio/src/FAudio_internal.c +++ b/libs/faudio/src/FAudio_internal.c @@ -27,7 +27,7 @@ #include "FAudio_internal.h" #ifndef FAUDIO_DISABLE_DEBUGCONFIGURATION -void WINAPIV FAudio_INTERNAL_debug( +void FAudio_INTERNAL_debug( FAudio *audio, const char *file, uint32_t line, diff --git a/libs/faudio/src/FAudio_internal.h b/libs/faudio/src/FAudio_internal.h index 11cee11de24..182c4b28b62 100644 --- a/libs/faudio/src/FAudio_internal.h +++ b/libs/faudio/src/FAudio_internal.h @@ -569,7 +569,7 @@ extern const float FAUDIO_INTERNAL_MATRIX_DEFAULTS[8][8][64]; #if defined(_MSC_VER) /* VC doesn't support __attribute__ at all, and there's no replacement for format. */ -void WINAPIV FAudio_INTERNAL_debug( +void FAudio_INTERNAL_debug( FAudio *audio, const char *file, uint32_t line, @@ -581,7 +581,7 @@ void WINAPIV FAudio_INTERNAL_debug( #define __func__ __FUNCTION__ #endif #else -void WINAPIV FAudio_INTERNAL_debug( +void FAudio_INTERNAL_debug( FAudio *audio, const char *file, uint32_t line,

1 0

Alexandre Julliard : lcms2: Revert some calling convention changes.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 4c9d8e194c796102cd34ee72f0eeb2c8b096f80b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c9d8e194c796102cd34ee72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 20:41:33 2022 +0100 lcms2: Revert some calling convention changes. We require -mabi=ms now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/lcms2/include/lcms2.h | 2 +- libs/lcms2/include/lcms2_plugin.h | 4 ++-- libs/lcms2/src/cmserr.c | 2 +- libs/lcms2/src/cmslut.c | 2 +- libs/lcms2/src/cmsplugin.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/lcms2/include/lcms2.h b/libs/lcms2/include/lcms2.h index 8f4d16164a1..c04b73efcd4 100644 --- a/libs/lcms2/include/lcms2.h +++ b/libs/lcms2/include/lcms2.h @@ -1234,7 +1234,7 @@ CMSAPI void CMSEXPORT cmsPipelineUnlinkStage(cmsPipeline* lut, cmsS // then a list of expected types followed with a list of double pointers to Stage elements. If // the function founds a match with current pipeline, it fills the pointers and returns TRUE // if not, returns FALSE without touching anything. -CMSAPI cmsBool WINAPIV cmsPipelineCheckAndRetreiveStages(const cmsPipeline* Lut, cmsUInt32Number n, ...); +CMSAPI cmsBool CMSEXPORT cmsPipelineCheckAndRetreiveStages(const cmsPipeline* Lut, cmsUInt32Number n, ...); // Matrix has double precision and CLUT has only float precision. That is because an ICC profile can encode // matrices with far more precision that CLUTS diff --git a/libs/lcms2/include/lcms2_plugin.h b/libs/lcms2/include/lcms2_plugin.h index a0211ff5fd6..5bc8227e388 100644 --- a/libs/lcms2/include/lcms2_plugin.h +++ b/libs/lcms2/include/lcms2_plugin.h @@ -102,7 +102,7 @@ CMSAPI void CMSEXPORT cmsMD5finish(cmsProfileID* ProfileID, cmsHAN // Error logging ------------------------------------------------------------------------------------- -CMSAPI void WINAPIV cmsSignalError(cmsContext ContextID, cmsUInt32Number ErrorCode, const char *ErrorText, ...); +CMSAPI void CMSEXPORT cmsSignalError(cmsContext ContextID, cmsUInt32Number ErrorCode, const char *ErrorText, ...); // Memory management ---------------------------------------------------------------------------------- @@ -174,7 +174,7 @@ CMSAPI cmsBool CMSEXPORT _cmsReadAlignment(cmsIOHANDLER* io); CMSAPI cmsBool CMSEXPORT _cmsWriteAlignment(cmsIOHANDLER* io); // To deal with text streams. 2K at most -CMSAPI cmsBool WINAPIV _cmsIOPrintf(cmsIOHANDLER* io, const char* frm, ...); +CMSAPI cmsBool CMSEXPORT _cmsIOPrintf(cmsIOHANDLER* io, const char* frm, ...); // Fixed point helper functions CMSAPI cmsFloat64Number CMSEXPORT _cms8Fixed8toDouble(cmsUInt16Number fixed8); diff --git a/libs/lcms2/src/cmserr.c b/libs/lcms2/src/cmserr.c index ee76b431732..f0acb256a96 100644 --- a/libs/lcms2/src/cmserr.c +++ b/libs/lcms2/src/cmserr.c @@ -506,7 +506,7 @@ void CMSEXPORT cmsSetLogErrorHandler(cmsLogErrorHandlerFunction Fn) // Log an error // ErrorText is a text holding an english description of error. -void WINAPIV cmsSignalError(cmsContext ContextID, cmsUInt32Number ErrorCode, const char *ErrorText, ...) +void CMSEXPORT cmsSignalError(cmsContext ContextID, cmsUInt32Number ErrorCode, const char *ErrorText, ...) { va_list args; char Buffer[MAX_ERROR_MESSAGE_LEN]; diff --git a/libs/lcms2/src/cmslut.c b/libs/lcms2/src/cmslut.c index dd95062afec..1ac5b4d173a 100644 --- a/libs/lcms2/src/cmslut.c +++ b/libs/lcms2/src/cmslut.c @@ -107,7 +107,7 @@ void From16ToFloat(const cmsUInt16Number In[], cmsFloat32Number Out[], cmsUInt32 // the function founds a match with current pipeline, it fills the pointers and returns TRUE // if not, returns FALSE without touching anything. Setting pointers to NULL does bypass // the storage process. -cmsBool WINAPIV cmsPipelineCheckAndRetreiveStages(const cmsPipeline* Lut, cmsUInt32Number n, ...) +cmsBool CMSEXPORT cmsPipelineCheckAndRetreiveStages(const cmsPipeline* Lut, cmsUInt32Number n, ...) { va_list args; cmsUInt32Number i; diff --git a/libs/lcms2/src/cmsplugin.c b/libs/lcms2/src/cmsplugin.c index 3265fbc3b8d..2b86b649202 100644 --- a/libs/lcms2/src/cmsplugin.c +++ b/libs/lcms2/src/cmsplugin.c @@ -492,7 +492,7 @@ cmsBool CMSEXPORT _cmsWriteAlignment(cmsIOHANDLER* io) // To deal with text streams. 2K at most -cmsBool WINAPIV _cmsIOPrintf(cmsIOHANDLER* io, const char* frm, ...) +cmsBool CMSEXPORT _cmsIOPrintf(cmsIOHANDLER* io, const char* frm, ...) { va_list args; int len;

1 0

Alexandre Julliard : tiff: Revert some calling convention changes.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 91d13963f8d9d0cc147b1fdd2495abf776bdf49b URL: https://source.winehq.org/git/wine.git/?a=commit;h=91d13963f8d9d0cc147b1fdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 20:41:41 2022 +0100 tiff: Revert some calling convention changes. We require -mabi=ms now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/tiff/libtiff/tif_aux.c | 2 +- libs/tiff/libtiff/tif_dir.c | 4 ++-- libs/tiff/libtiff/tif_dirinfo.c | 2 +- libs/tiff/libtiff/tif_error.c | 4 ++-- libs/tiff/libtiff/tif_warning.c | 4 ++-- libs/tiff/libtiff/tiffio.h | 14 +++++++------- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libs/tiff/libtiff/tif_aux.c b/libs/tiff/libtiff/tif_aux.c index ca033f64f2d..140f26c7df6 100644 --- a/libs/tiff/libtiff/tif_aux.c +++ b/libs/tiff/libtiff/tif_aux.c @@ -340,7 +340,7 @@ TIFFVGetFieldDefaulted(TIFF* tif, uint32_t tag, va_list ap) * Like TIFFGetField, but return any default * value if the tag is not present in the directory. */ -int WINAPIV +int TIFFGetFieldDefaulted(TIFF* tif, uint32_t tag, ...) { int ok; diff --git a/libs/tiff/libtiff/tif_dir.c b/libs/tiff/libtiff/tif_dir.c index 0bd43a62e74..a6c254fce27 100644 --- a/libs/tiff/libtiff/tif_dir.c +++ b/libs/tiff/libtiff/tif_dir.c @@ -824,7 +824,7 @@ OkToChangeTag(TIFF* tif, uint32_t tag) * when/if the directory structure is * updated. */ -int WINAPIV +int TIFFSetField(TIFF* tif, uint32_t tag, ...) { va_list ap; @@ -1266,7 +1266,7 @@ _TIFFVGetField(TIFF* tif, uint32_t tag, va_list ap) * Return the value of a field in the * internal directory structure. */ -int WINAPIV +int TIFFGetField(TIFF* tif, uint32_t tag, ...) { int status; diff --git a/libs/tiff/libtiff/tif_dirinfo.c b/libs/tiff/libtiff/tif_dirinfo.c index 5d3a33810b1..8565dfbcebc 100644 --- a/libs/tiff/libtiff/tif_dirinfo.c +++ b/libs/tiff/libtiff/tif_dirinfo.c @@ -436,7 +436,7 @@ _TIFFSetupFields(TIFF* tif, const TIFFFieldArray* fieldarray) } } -static int __cdecl +static int tagCompare(const void* a, const void* b) { const TIFFField* ta = *(const TIFFField**) a; diff --git a/libs/tiff/libtiff/tif_error.c b/libs/tiff/libtiff/tif_error.c index 9e0cb82f7dc..651168f7dc7 100644 --- a/libs/tiff/libtiff/tif_error.c +++ b/libs/tiff/libtiff/tif_error.c @@ -45,7 +45,7 @@ TIFFSetErrorHandlerExt(TIFFErrorHandlerExt handler) return (prev); } -void WINAPIV +void TIFFError(const char* module, const char* fmt, ...) { va_list ap; @@ -61,7 +61,7 @@ TIFFError(const char* module, const char* fmt, ...) } } -void WINAPIV +void TIFFErrorExt(thandle_t fd, const char* module, const char* fmt, ...) { va_list ap; diff --git a/libs/tiff/libtiff/tif_warning.c b/libs/tiff/libtiff/tif_warning.c index 8bba83da67d..c482785c293 100644 --- a/libs/tiff/libtiff/tif_warning.c +++ b/libs/tiff/libtiff/tif_warning.c @@ -45,7 +45,7 @@ TIFFSetWarningHandlerExt(TIFFErrorHandlerExt handler) return (prev); } -void WINAPIV +void TIFFWarning(const char* module, const char* fmt, ...) { va_list ap; @@ -61,7 +61,7 @@ TIFFWarning(const char* module, const char* fmt, ...) } } -void WINAPIV +void TIFFWarningExt(thandle_t fd, const char* module, const char* fmt, ...) { va_list ap; diff --git a/libs/tiff/libtiff/tiffio.h b/libs/tiff/libtiff/tiffio.h index 0212968b0c2..c6a192c5b3a 100644 --- a/libs/tiff/libtiff/tiffio.h +++ b/libs/tiff/libtiff/tiffio.h @@ -347,9 +347,9 @@ extern void TIFFCleanup(TIFF* tif); extern void TIFFClose(TIFF* tif); extern int TIFFFlush(TIFF* tif); extern int TIFFFlushData(TIFF* tif); -extern int WINAPIV TIFFGetField(TIFF* tif, uint32_t tag, ...); +extern int TIFFGetField(TIFF* tif, uint32_t tag, ...); extern int TIFFVGetField(TIFF* tif, uint32_t tag, va_list ap); -extern int WINAPIV TIFFGetFieldDefaulted(TIFF* tif, uint32_t tag, ...); +extern int TIFFGetFieldDefaulted(TIFF* tif, uint32_t tag, ...); extern int TIFFVGetFieldDefaulted(TIFF* tif, uint32_t tag, va_list ap); extern int TIFFReadDirectory(TIFF* tif); extern int TIFFReadCustomDirectory(TIFF* tif, toff_t diroff, const TIFFFieldArray* infoarray); @@ -410,7 +410,7 @@ extern int TIFFLastDirectory(TIFF*); extern int TIFFSetDirectory(TIFF*, uint16_t); extern int TIFFSetSubDirectory(TIFF*, uint64_t); extern int TIFFUnlinkDirectory(TIFF*, uint16_t); -extern int WINAPIV TIFFSetField(TIFF*, uint32_t, ...); +extern int TIFFSetField(TIFF*, uint32_t, ...); extern int TIFFVSetField(TIFF*, uint32_t, va_list); extern int TIFFUnsetField(TIFF*, uint32_t); extern int TIFFWriteDirectory(TIFF *); @@ -456,10 +456,10 @@ extern TIFF* TIFFClientOpen(const char*, const char*, TIFFMapFileProc, TIFFUnmapFileProc); extern const char* TIFFFileName(TIFF*); extern const char* TIFFSetFileName(TIFF*, const char *); -extern void WINAPIV TIFFError(const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,2,3))); -extern void WINAPIV TIFFErrorExt(thandle_t, const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,3,4))); -extern void WINAPIV TIFFWarning(const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,2,3))); -extern void WINAPIV TIFFWarningExt(thandle_t, const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,3,4))); +extern void TIFFError(const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,2,3))); +extern void TIFFErrorExt(thandle_t, const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,3,4))); +extern void TIFFWarning(const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,2,3))); +extern void TIFFWarningExt(thandle_t, const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,3,4))); extern TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler); extern TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt); extern TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler);

1 0

Alexandre Julliard : xml2: Revert some calling convention changes.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 5eb5d81793dcbee67c89fcaa9d7dc4b2ed9a8d98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb5d81793dcbee67c89fcaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 20:41:50 2022 +0100 xml2: Revert some calling convention changes. We require -mabi=ms now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/xml2/HTMLparser.c | 4 ++-- libs/xml2/globals.c | 2 +- libs/xml2/include/libxml/xmlerror.h | 2 +- libs/xml2/include/libxml/xmlexports.h | 2 +- libs/xml2/include/libxml/xmlstring.h | 2 +- libs/xml2/libxml.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/xml2/HTMLparser.c b/libs/xml2/HTMLparser.c index 70c6bfa18f6..b56363a3a03 100644 --- a/libs/xml2/HTMLparser.c +++ b/libs/xml2/HTMLparser.c @@ -1416,7 +1416,7 @@ void htmlInitAutoClose(void) { } -static int __cdecl +static int htmlCompareTags(const void *key, const void *member) { const xmlChar *tag = (const xmlChar *) key; const htmlElemDesc *desc = (const htmlElemDesc *) member; @@ -1460,7 +1460,7 @@ htmlGetEndPriority (const xmlChar *name) { } -static int __cdecl +static int htmlCompareStartClose(const void *vkey, const void *member) { const htmlStartCloseEntry *key = (const htmlStartCloseEntry *) vkey; const htmlStartCloseEntry *entry = (const htmlStartCloseEntry *) member; diff --git a/libs/xml2/globals.c b/libs/xml2/globals.c index 7fa317ee533..223393f267e 100644 --- a/libs/xml2/globals.c +++ b/libs/xml2/globals.c @@ -872,7 +872,7 @@ int xmlThrDefDoValidityCheckingDefaultValue(int v) { } #undef xmlGenericError -xmlGenericErrorFunc * XMLCALL +xmlGenericErrorFunc * __xmlGenericError(void) { if (IS_MAIN_THREAD) return (&xmlGenericError); diff --git a/libs/xml2/include/libxml/xmlerror.h b/libs/xml2/include/libxml/xmlerror.h index ba5bcace03f..c1019971f24 100644 --- a/libs/xml2/include/libxml/xmlerror.h +++ b/libs/xml2/include/libxml/xmlerror.h @@ -914,7 +914,7 @@ XMLPUBFUN int XMLCALL /* * Internal callback reporting routine */ -XMLPUBFUN void XMLCDECL +XMLPUBFUN void XMLCALL __xmlRaiseError (xmlStructuredErrorFunc schannel, xmlGenericErrorFunc channel, void *data, diff --git a/libs/xml2/include/libxml/xmlexports.h b/libs/xml2/include/libxml/xmlexports.h index c81043cd26f..1fd7c5c5bf7 100644 --- a/libs/xml2/include/libxml/xmlexports.h +++ b/libs/xml2/include/libxml/xmlexports.h @@ -26,7 +26,7 @@ #else #define XMLCALL __cdecl #endif -#define XMLCDECL WINAPIV +#define XMLCDECL __cdecl /** DOC_ENABLE */ #else /* not Windows */ diff --git a/libs/xml2/include/libxml/xmlstring.h b/libs/xml2/include/libxml/xmlstring.h index 338c3845fae..2d0b2d1668e 100644 --- a/libs/xml2/include/libxml/xmlstring.h +++ b/libs/xml2/include/libxml/xmlstring.h @@ -94,7 +94,7 @@ XMLPUBFUN xmlChar * XMLCALL xmlStrncatNew (const xmlChar *str1, const xmlChar *str2, int len); -XMLPUBFUN int XMLCDECL +XMLPUBFUN int XMLCALL xmlStrPrintf (xmlChar *buf, int len, const char *msg, diff --git a/libs/xml2/libxml.h b/libs/xml2/libxml.h index fbf0374a426..da940bcc4ca 100644 --- a/libs/xml2/libxml.h +++ b/libs/xml2/libxml.h @@ -115,7 +115,7 @@ int __xmlRandom(void); #endif XMLPUBFUN xmlChar * XMLCALL xmlEscapeFormatString(xmlChar **msg); -int XMLCALL xmlInputReadCallbackNop(void *context, char *buffer, int len); +int xmlInputReadCallbackNop(void *context, char *buffer, int len); #ifdef IN_LIBXML #ifdef __GNUC__

1 0

Alexandre Julliard : xslt: Revert some calling convention changes.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 05509812798f5d21e7c9055e624c613a2dd26a4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=05509812798f5d21e7c9055e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 20:41:57 2022 +0100 xslt: Revert some calling convention changes. We require -mabi=ms now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/xslt/libxslt/xsltutils.c | 6 +++--- libs/xslt/libxslt/xsltutils.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/xslt/libxslt/xsltutils.c b/libs/xslt/libxslt/xsltutils.c index 4717c0e8548..94097b9d209 100644 --- a/libs/xslt/libxslt/xsltutils.c +++ b/libs/xslt/libxslt/xsltutils.c @@ -511,7 +511,7 @@ xsltMessage(xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst) { * * Default handler for out of context error messages. */ -static void WINAPIV LIBXSLT_ATTR_FORMAT(2,3) +static void LIBXSLT_ATTR_FORMAT(2,3) xsltGenericErrorDefaultFunc(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) { va_list args; @@ -557,7 +557,7 @@ xsltSetGenericErrorFunc(void *ctx, xmlGenericErrorFunc handler) { * * Default handler for out of context error messages. */ -static void WINAPIV LIBXSLT_ATTR_FORMAT(2,3) +static void LIBXSLT_ATTR_FORMAT(2,3) xsltGenericDebugDefaultFunc(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) { va_list args; @@ -698,7 +698,7 @@ xsltSetTransformErrorFunc(xsltTransformContextPtr ctxt, * Display and format an error messages, gives file, line, position and * extra parameters, will use the specific transformation context if available */ -void WINAPIV +void xsltTransformError(xsltTransformContextPtr ctxt, xsltStylesheetPtr style, xmlNodePtr node, diff --git a/libs/xslt/libxslt/xsltutils.h b/libs/xslt/libxslt/xsltutils.h index 2b5f17a8b11..ea6c3740540 100644 --- a/libs/xslt/libxslt/xsltutils.h +++ b/libs/xslt/libxslt/xsltutils.h @@ -160,7 +160,7 @@ XSLTPUBFUN void XSLTCALL xsltSetTransformErrorFunc (xsltTransformContextPtr ctxt, void *ctx, xmlGenericErrorFunc handler); -XSLTPUBFUN void WINAPIV +XSLTPUBFUN void XSLTCALL xsltTransformError (xsltTransformContextPtr ctxt, xsltStylesheetPtr style, xmlNodePtr node,

1 0

Alexandre Julliard : include: Use the standard va_list in tests.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 87859352421d07884f72735be73d3c18abe41610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87859352421d07884f72735b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 20:42:28 2022 +0100 include: Use the standard va_list in tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 86 ++++++++++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 51 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 599234b3519..01ba81f4857 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -79,24 +79,16 @@ extern void winetest_wait_child_process( HANDLE process ); #define START_TEST(name) void func_##name(void) #endif -#if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) -#define __winetest_cdecl __cdecl -#define __winetest_va_list __builtin_ms_va_list -#else -#define __winetest_cdecl -#define __winetest_va_list va_list -#endif - extern int broken( int condition ); -extern int winetest_vok( int condition, const char *msg, __winetest_va_list ap ); -extern void winetest_vskip( const char *msg, __winetest_va_list ap ); +extern int winetest_vok( int condition, const char *msg, va_list ap ); +extern void winetest_vskip( const char *msg, va_list ap ); -extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) __WINE_PRINTF_ATTR(2,3); -extern void __winetest_cdecl winetest_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); -extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); -extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +extern void winetest_ok( int condition, const char *msg, ... ) __WINE_PRINTF_ATTR(2,3); +extern void winetest_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +extern void winetest_win_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +extern void winetest_trace( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); -extern void __winetest_cdecl winetest_push_context( const char *fmt, ... ) __WINE_PRINTF_ATTR(1, 2); +extern void winetest_push_context( const char *fmt, ... ) __WINE_PRINTF_ATTR(1, 2); extern void winetest_pop_context(void); #ifdef WINETEST_NO_LINE_NUMBERS @@ -187,14 +179,6 @@ extern void winetest_pop_context(void); #include <stdio.h> #include <excpt.h> -#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) -# define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) -# define __winetest_va_end(list) __builtin_ms_va_end(list) -#else -# define __winetest_va_start(list,arg) va_start(list,arg) -# define __winetest_va_end(list) va_end(list) -#endif - struct test { const char *name; @@ -300,18 +284,18 @@ const char *winetest_elapsed(void) return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); } -static void __winetest_cdecl winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); -static void __winetest_cdecl winetest_printf( const char *msg, ... ) +static void winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static void winetest_printf( const char *msg, ... ) { struct tls_data *data = get_tls_data(); - __winetest_va_list valist; + va_list valist; printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); - __winetest_va_start( valist, msg ); + va_start( valist, msg ); vprintf( msg, valist ); - __winetest_va_end( valist ); + va_end( valist ); } -static void __winetest_cdecl winetest_print_context( const char *msgtype ) +static void winetest_print_context( const char *msgtype ) { struct tls_data *data = get_tls_data(); unsigned int i; @@ -363,7 +347,7 @@ static LONG winetest_add_line( void ) * Return: * 0 if condition does not have the expected value, 1 otherwise */ -int winetest_vok( int condition, const char *msg, __winetest_va_list args ) +int winetest_vok( int condition, const char *msg, va_list args ) { struct tls_data *data = get_tls_data(); @@ -415,33 +399,33 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) } } -void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) +void winetest_ok( int condition, const char *msg, ... ) { - __winetest_va_list valist; + va_list valist; - __winetest_va_start(valist, msg); + va_start(valist, msg); winetest_vok(condition, msg, valist); - __winetest_va_end(valist); + va_end(valist); } -void __winetest_cdecl winetest_trace( const char *msg, ... ) +void winetest_trace( const char *msg, ... ) { - __winetest_va_list valist; + va_list valist; if (!winetest_debug) return; if (winetest_add_line() < winetest_mute_threshold) { winetest_print_context( "" ); - __winetest_va_start(valist, msg); + va_start(valist, msg); vprintf( msg, valist ); - __winetest_va_end(valist); + va_end(valist); } else InterlockedIncrement(&muted_traces); } -void winetest_vskip( const char *msg, __winetest_va_list args ) +void winetest_vskip( const char *msg, va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { @@ -453,23 +437,23 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) InterlockedIncrement(&muted_skipped); } -void __winetest_cdecl winetest_skip( const char *msg, ... ) +void winetest_skip( const char *msg, ... ) { - __winetest_va_list valist; - __winetest_va_start(valist, msg); + va_list valist; + va_start(valist, msg); winetest_vskip(msg, valist); - __winetest_va_end(valist); + va_end(valist); } -void __winetest_cdecl winetest_win_skip( const char *msg, ... ) +void winetest_win_skip( const char *msg, ... ) { - __winetest_va_list valist; - __winetest_va_start(valist, msg); + va_list valist; + va_start(valist, msg); if (strcmp(winetest_platform, "windows") == 0) winetest_vskip(msg, valist); else winetest_vok(0, msg, valist); - __winetest_va_end(valist); + va_end(valist); } void winetest_start_todo( int is_todo ) @@ -493,16 +477,16 @@ void winetest_end_todo(void) data->todo_level >>= 1; } -void __winetest_cdecl winetest_push_context( const char *fmt, ... ) +void winetest_push_context( const char *fmt, ... ) { struct tls_data *data = get_tls_data(); - __winetest_va_list valist; + va_list valist; if (data->context_count < ARRAY_SIZE(data->context)) { - __winetest_va_start(valist, fmt); + va_start(valist, fmt); vsnprintf( data->context[data->context_count], sizeof(data->context[data->context_count]), fmt, valist ); - __winetest_va_end(valist); + va_end(valist); data->context[data->context_count][sizeof(data->context[data->context_count]) - 1] = 0; } ++data->context_count;

1 0

Paul Gofman : ws2_32: Pre-validate optlen in getsockopt().
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 20e2edba076a4b452d3246e771ed13a6bed6753e URL: https://source.winehq.org/git/wine.git/?a=commit;h=20e2edba076a4b452d3246e7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sat Mar 5 22:04:03 2022 +0300 ws2_32: Pre-validate optlen in getsockopt(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e5e29107853..30dc007167a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1395,11 +1395,18 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl TRACE( "socket %#Ix, %s, optval %p, optlen %p (%d)\n", s, debugstr_sockopt(level, optname), optval, optlen, optlen ? *optlen : 0 ); - if ((level != SOL_SOCKET || optname != SO_OPENTYPE) && - !socket_list_find( s )) + if ((level != SOL_SOCKET || optname != SO_OPENTYPE)) { - SetLastError( WSAENOTSOCK ); - return SOCKET_ERROR; + if (!socket_list_find( s )) + { + SetLastError( WSAENOTSOCK ); + return SOCKET_ERROR; + } + if (!optlen || *optlen <= 0) + { + SetLastError( WSAEFAULT ); + return -1; + } } switch(level) @@ -1464,7 +1471,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl } case SO_CONNECT_TIME: - if (!optlen || !optval) + if (!optval) { SetLastError( WSAEFAULT ); return -1; @@ -1483,7 +1490,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl int len = sizeof(linger); int ret; - if (!optlen || *optlen < sizeof(BOOL)|| !optval) + if (*optlen < sizeof(BOOL)|| !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1500,7 +1507,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl /* As mentioned in setsockopt, Windows ignores this, so we * always return true here */ case SO_DONTROUTE: - if (!optlen || *optlen < sizeof(BOOL) || !optval) + if (*optlen < sizeof(BOOL) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1521,7 +1528,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl int size; /* struct linger and LINGER have different sizes */ - if (!optlen || *optlen < sizeof(LINGER) || !optval) + if (*optlen < sizeof(LINGER) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1540,7 +1547,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl } case SO_MAX_MSG_SIZE: - if (!optlen || *optlen < sizeof(int) || !optval) + if (*optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1574,9 +1581,9 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl ret = ws_protocol_info(s, optname == SO_PROTOCOL_INFOW, &infow, &size); if (ret) { - if (!optlen || !optval || *optlen < size) + if (!optval || *optlen < size) { - if(optlen) *optlen = size; + *optlen = size; ret = 0; SetLastError(WSAEFAULT); } @@ -1606,7 +1613,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl WSAPROTOCOL_INFOW info; int size; - if (!optlen || *optlen < sizeof(int) || !optval) + if (*optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1765,7 +1772,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP, optval, optlen ); case IPV6_PROTECTION_LEVEL: - if (!optlen || *optlen < sizeof(UINT) || !optval) + if (*optlen < sizeof(UINT) || !optval) { SetLastError( WSAEFAULT ); return -1;

1 0

Paul Gofman : ws2_32: Treat optlen as unsigned in setsockopt() for SO_RCVTIMEO.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 4fa433974880c8fd528c48294df84b41a9edab82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fa433974880c8fd528c4829… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sat Mar 5 22:04:04 2022 +0300 ws2_32: Treat optlen as unsigned in setsockopt() for SO_RCVTIMEO. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 30dc007167a..2e99f415c72 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2827,6 +2827,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_RCVBUF, optval, optlen ); case SO_RCVTIMEO: + if (optlen < 0) optlen = 4; return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_RCVTIMEO, optval, optlen ); case SO_REUSEADDR:

1 0