Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[tfaber] 75101: [LIBTIFF] - Update to version 4.0.8 CORE-13451

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 18 17:50:12 2017 New Revision: 75101 URL: http://svn.reactos.org/svn/reactos?rev=75101&view=rev Log: [LIBTIFF] - Update to version 4.0.8 CORE-13451 Modified: trunk/reactos/dll/3rdparty/libtiff/tif_color.c trunk/reactos/dll/3rdparty/libtiff/tif_dir.c trunk/reactos/dll/3rdparty/libtiff/tif_dirread.c trunk/reactos/dll/3rdparty/libtiff/tif_dirwrite.c trunk/reactos/dll/3rdparty/libtiff/tif_fax3.c trunk/reactos/dll/3rdparty/libtiff/tif_getimage.c trunk/reactos/dll/3rdparty/libtiff/tif_jpeg.c trunk/reactos/dll/3rdparty/libtiff/tif_luv.c trunk/reactos/dll/3rdparty/libtiff/tif_lzw.c trunk/reactos/dll/3rdparty/libtiff/tif_ojpeg.c trunk/reactos/dll/3rdparty/libtiff/tif_open.c trunk/reactos/dll/3rdparty/libtiff/tif_packbits.c trunk/reactos/dll/3rdparty/libtiff/tif_pixarlog.c trunk/reactos/dll/3rdparty/libtiff/tif_predict.c trunk/reactos/dll/3rdparty/libtiff/tif_print.c trunk/reactos/dll/3rdparty/libtiff/tif_read.c trunk/reactos/dll/3rdparty/libtiff/tif_strip.c trunk/reactos/dll/3rdparty/libtiff/tif_unix.c trunk/reactos/dll/3rdparty/libtiff/tif_win32.c trunk/reactos/dll/3rdparty/libtiff/tif_write.c trunk/reactos/dll/3rdparty/libtiff/tif_zip.c trunk/reactos/sdk/include/reactos/libs/libtiff/tif_fax3.h trunk/reactos/sdk/include/reactos/libs/libtiff/tiffio.h trunk/reactos/sdk/include/reactos/libs/libtiff/tiffiop.h trunk/reactos/sdk/include/reactos/libs/libtiff/tiffvers.h Modified: trunk/reactos/dll/3rdparty/libtiff/tif_color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_c… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_color.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_color.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_color.c,v 1.22 2016-09-04 21:32:56 erouault Exp $ */ +/* $Id: tif_color.c,v 1.23 2017-05-13 18:17:34 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -199,6 +199,23 @@ *b = CLAMP(i, 0, 255); } +/* Clamp function for sanitization purposes. Normally clamping should not */ +/* occur for well behaved chroma and refBlackWhite coefficients */ +static float CLAMPw(float v, float vmin, float vmax) +{ + if( v < vmin ) + { + /* printf("%f clamped to %f\n", v, vmin); */ + return vmin; + } + if( v > vmax ) + { + /* printf("%f clamped to %f\n", v, vmax); */ + return vmax; + } + return v; +} + /* * Initialize the YCbCr->RGB conversion tables. The conversion * is done according to the 6.0 spec: @@ -238,10 +255,10 @@ ycbcr->Cb_g_tab = ycbcr->Cr_g_tab + 256; ycbcr->Y_tab = ycbcr->Cb_g_tab + 256; - { float f1 = 2-2*LumaRed; int32 D1 = FIX(f1); - float f2 = LumaRed*f1/LumaGreen; int32 D2 = -FIX(f2); - float f3 = 2-2*LumaBlue; int32 D3 = FIX(f3); - float f4 = LumaBlue*f3/LumaGreen; int32 D4 = -FIX(f4); + { float f1 = 2-2*LumaRed; int32 D1 = FIX(CLAMP(f1,0.0F,2.0F)); + float f2 = LumaRed*f1/LumaGreen; int32 D2 = -FIX(CLAMP(f2,0.0F,2.0F)); + float f3 = 2-2*LumaBlue; int32 D3 = FIX(CLAMP(f3,0.0F,2.0F)); + float f4 = LumaBlue*f3/LumaGreen; int32 D4 = -FIX(CLAMP(f4,0.0F,2.0F)); int x; #undef LumaBlue @@ -256,17 +273,20 @@ * constructing tables indexed by the raw pixel data. */ for (i = 0, x = -128; i < 256; i++, x++) { - int32 Cr = (int32)Code2V(x, refBlackWhite[4] - 128.0F, - refBlackWhite[5] - 128.0F, 127); - int32 Cb = (int32)Code2V(x, refBlackWhite[2] - 128.0F, - refBlackWhite[3] - 128.0F, 127); + int32 Cr = (int32)CLAMPw(Code2V(x, refBlackWhite[4] - 128.0F, + refBlackWhite[5] - 128.0F, 127), + -128.0F * 64, 128.0F * 64); + int32 Cb = (int32)CLAMPw(Code2V(x, refBlackWhite[2] - 128.0F, + refBlackWhite[3] - 128.0F, 127), + -128.0F * 64, 128.0F * 64); ycbcr->Cr_r_tab[i] = (int32)((D1*Cr + ONE_HALF)>>SHIFT); ycbcr->Cb_b_tab[i] = (int32)((D3*Cb + ONE_HALF)>>SHIFT); ycbcr->Cr_g_tab[i] = D2*Cr; ycbcr->Cb_g_tab[i] = D4*Cb + ONE_HALF; ycbcr->Y_tab[i] = - (int32)Code2V(x + 128, refBlackWhite[0], refBlackWhite[1], 255); + (int32)CLAMPw(Code2V(x + 128, refBlackWhite[0], refBlackWhite[1], 255), + -128.0F * 64, 128.0F * 64); } } Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_dir.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_dir.c,v 1.127 2016-10-25 21:35:15 erouault Exp $ */ +/* $Id: tif_dir.c,v 1.130 2017-05-17 21:54:05 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -32,6 +32,7 @@ */ #include <precomp.h> +#include <float.h> /* * These are used in the backwards compatibility code... @@ -153,6 +154,15 @@ td->td_samplesperpixel, td->td_samplesperpixel-i); return (0); +} + +static float TIFFClampDoubleToFloat( double val ) +{ + if( val > FLT_MAX ) + return FLT_MAX; + if( val < -FLT_MAX ) + return -FLT_MAX; + return (float)val; } static int @@ -313,13 +323,13 @@ dblval = va_arg(ap, double); if( dblval < 0 ) goto badvaluedouble; - td->td_xresolution = (float) dblval; + td->td_xresolution = TIFFClampDoubleToFloat( dblval ); break; case TIFFTAG_YRESOLUTION: dblval = va_arg(ap, double); if( dblval < 0 ) goto badvaluedouble; - td->td_yresolution = (float) dblval; + td->td_yresolution = TIFFClampDoubleToFloat( dblval ); break; case TIFFTAG_PLANARCONFIG: v = (uint16) va_arg(ap, uint16_vap); @@ -328,10 +338,10 @@ td->td_planarconfig = (uint16) v; break; case TIFFTAG_XPOSITION: - td->td_xposition = (float) va_arg(ap, double); + td->td_xposition = TIFFClampDoubleToFloat( va_arg(ap, double) ); break; case TIFFTAG_YPOSITION: - td->td_yposition = (float) va_arg(ap, double); + td->td_yposition = TIFFClampDoubleToFloat( va_arg(ap, double) ); break; case TIFFTAG_RESOLUTIONUNIT: v = (uint16) va_arg(ap, uint16_vap); @@ -677,7 +687,7 @@ case TIFF_SRATIONAL: case TIFF_FLOAT: { - float v2 = (float)va_arg(ap, double); + float v2 = TIFFClampDoubleToFloat(va_arg(ap, double)); _TIFFmemcpy(val, &v2, tv_size); } break; @@ -855,6 +865,32 @@ if( fip == NULL ) /* cannot happen since TIFFGetField() already checks it */ return 0; + if( tag == TIFFTAG_NUMBEROFINKS ) + { + int i; + for (i = 0; i < td->td_customValueCount; i++) { + uint16 val; + TIFFTagValue *tv = td->td_customValues + i; + if (tv->info->field_tag != tag) + continue; + val = *(uint16 *)tv->value; + /* Truncate to SamplesPerPixel, since the */ + /* setting code for INKNAMES assume that there are SamplesPerPixel */ + /* inknames. */ + /* Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2599 */ + if( val > td->td_samplesperpixel ) + { + TIFFWarningExt(tif->tif_clientdata,"_TIFFVGetField", + "Truncating NumberOfInks from %u to %u", + val, td->td_samplesperpixel); + val = td->td_samplesperpixel; + } + *va_arg(ap, uint16*) = val; + return 1; + } + return 0; + } + /* * We want to force the custom code to be used for custom * fields even if the tag happens to match a well known Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dirread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_dirread.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_dirread.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_dirread.c,v 1.204 2016-11-16 15:14:15 erouault Exp $ */ +/* $Id: tif_dirread.c,v 1.208 2017-04-27 15:46:22 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -40,6 +40,7 @@ */ #include <precomp.h> +#include <float.h> #define IGNORE 0 /* tag placeholder used below */ #define FAILED_FII ((uint32) -1) @@ -2406,7 +2407,14 @@ ma=(double*)origdata; mb=data; for (n=0; n<count; n++) - *mb++=(float)(*ma++); + { + double val = *ma++; + if( val > FLT_MAX ) + val = FLT_MAX; + else if( val < -FLT_MAX ) + val = -FLT_MAX; + *mb++=(float)val; + } } break; } @@ -2872,7 +2880,10 @@ m.l = direntry->tdir_offset.toff_long8; if (tif->tif_flags&TIFF_SWAB) TIFFSwabArrayOfLong(m.i,2); - if (m.i[0]==0) + /* Not completely sure what we should do when m.i[1]==0, but some */ + /* sanitizers do not like division by 0.0: */ + /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */ + if (m.i[0]==0 || m.i[1]==0) *value=0.0; else *value=(double)m.i[0]/(double)m.i[1]; @@ -2900,7 +2911,10 @@ m.l=direntry->tdir_offset.toff_long8; if (tif->tif_flags&TIFF_SWAB) TIFFSwabArrayOfLong(m.i,2); - if ((int32)m.i[0]==0) + /* Not completely sure what we should do when m.i[1]==0, but some */ + /* sanitizers do not like division by 0.0: */ + /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */ + if ((int32)m.i[0]==0 || m.i[1]==0) *value=0.0; else *value=(double)((int32)m.i[0])/(double)m.i[1]; @@ -3724,6 +3738,14 @@ _TIFFmemcpy( &(tif->tif_dir.td_stripoffset_entry), dp, sizeof(TIFFDirEntry) ); #else + if( tif->tif_dir.td_stripoffset != NULL ) + { + TIFFErrorExt(tif->tif_clientdata, module, + "tif->tif_dir.td_stripoffset is " + "already allocated. Likely duplicated " + "StripOffsets/TileOffsets tag"); + goto bad; + } if (!TIFFFetchStripThing(tif,dp,tif->tif_dir.td_nstrips,&tif->tif_dir.td_stripoffset)) goto bad; #endif @@ -3734,7 +3756,15 @@ _TIFFmemcpy( &(tif->tif_dir.td_stripbytecount_entry), dp, sizeof(TIFFDirEntry) ); #else - if (!TIFFFetchStripThing(tif,dp,tif->tif_dir.td_nstrips,&tif->tif_dir.td_stripbytecount)) + if( tif->tif_dir.td_stripbytecount != NULL ) + { + TIFFErrorExt(tif->tif_clientdata, module, + "tif->tif_dir.td_stripbytecount is " + "already allocated. Likely duplicated " + "StripByteCounts/TileByteCounts tag"); + goto bad; + } + if (!TIFFFetchStripThing(tif,dp,tif->tif_dir.td_nstrips,&tif->tif_dir.td_stripbytecount)) goto bad; #endif break; @@ -5502,8 +5532,7 @@ uint64 rowblockbytes; uint64 stripbytes; uint32 strip; - uint64 nstrips64; - uint32 nstrips32; + uint32 nstrips; uint32 rowsperstrip; uint64* newcounts; uint64* newoffsets; @@ -5534,18 +5563,17 @@ return; /* - * never increase the number of strips in an image + * never increase the number of rows per strip */ if (rowsperstrip >= td->td_rowsperstrip) return; - nstrips64 = TIFFhowmany_64(bytecount, stripbytes); - if ((nstrips64==0)||(nstrips64>0xFFFFFFFF)) /* something is wonky, do nothing. */ - return; - nstrips32 = (uint32)nstrips64; - - newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64), + nstrips = TIFFhowmany_32(td->td_imagelength, rowsperstrip); + if( nstrips == 0 ) + return; + + newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64), "for chopped \"StripByteCounts\" array"); - newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64), + newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64), "for chopped \"StripOffsets\" array"); if (newcounts == NULL || newoffsets == NULL) { /* @@ -5562,18 +5590,18 @@ * Fill the strip information arrays with new bytecounts and offsets * that reflect the broken-up format. */ - for (strip = 0; strip < nstrips32; strip++) { + for (strip = 0; strip < nstrips; strip++) { if (stripbytes > bytecount) stripbytes = bytecount; newcounts[strip] = stripbytes; - newoffsets[strip] = offset; + newoffsets[strip] = stripbytes ? offset : 0; offset += stripbytes; bytecount -= stripbytes; } /* * Replace old single strip info with multi-strip info. */ - td->td_stripsperimage = td->td_nstrips = nstrips32; + td->td_stripsperimage = td->td_nstrips = nstrips; TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip); _TIFFfree(td->td_stripbytecount); Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dirwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_dirwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_dirwrite.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_dirwrite.c,v 1.83 2016-10-25 21:35:15 erouault Exp $ */ +/* $Id: tif_dirwrite.c,v 1.85 2017-01-11 16:09:02 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -31,6 +31,7 @@ */ #include <precomp.h> +#include <float.h> #ifdef HAVE_IEEEFP #define TIFFCvtNativeToIEEEFloat(tif, n, fp) @@ -940,6 +941,69 @@ return(0); } +static float TIFFClampDoubleToFloat( double val ) +{ + if( val > FLT_MAX ) + return FLT_MAX; + if( val < -FLT_MAX ) + return -FLT_MAX; + return (float)val; +} + +static int8 TIFFClampDoubleToInt8( double val ) +{ + if( val > 127 ) + return 127; + if( val < -128 || val != val ) + return -128; + return (int8)val; +} + +static int16 TIFFClampDoubleToInt16( double val ) +{ + if( val > 32767 ) + return 32767; + if( val < -32768 || val != val ) + return -32768; + return (int16)val; +} + +static int32 TIFFClampDoubleToInt32( double val ) +{ + if( val > 0x7FFFFFFF ) + return 0x7FFFFFFF; + if( val < -0x7FFFFFFF-1 || val != val ) + return -0x7FFFFFFF-1; + return (int32)val; +} + +static uint8 TIFFClampDoubleToUInt8( double val ) +{ + if( val < 0 ) + return 0; + if( val > 255 || val != val ) + return 255; + return (uint8)val; +} + +static uint16 TIFFClampDoubleToUInt16( double val ) +{ + if( val < 0 ) + return 0; + if( val > 65535 || val != val ) + return 65535; + return (uint16)val; +} + +static uint32 TIFFClampDoubleToUInt32( double val ) +{ + if( val < 0 ) + return 0; + if( val > 0xFFFFFFFFU || val != val ) + return 0xFFFFFFFFU; + return (uint32)val; +} + static int TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, double* value) { @@ -960,7 +1024,7 @@ if (tif->tif_dir.td_bitspersample<=32) { for (i = 0; i < count; ++i) - ((float*)conv)[i] = (float)value[i]; + ((float*)conv)[i] = TIFFClampDoubleToFloat(value[i]); ok = TIFFWriteDirectoryTagFloatArray(tif,ndir,dir,tag,count,(float*)conv); } else @@ -972,19 +1036,19 @@ if (tif->tif_dir.td_bitspersample<=8) { for (i = 0; i < count; ++i) - ((int8*)conv)[i] = (int8)value[i]; + ((int8*)conv)[i] = TIFFClampDoubleToInt8(value[i]); ok = TIFFWriteDirectoryTagSbyteArray(tif,ndir,dir,tag,count,(int8*)conv); } else if (tif->tif_dir.td_bitspersample<=16) { for (i = 0; i < count; ++i) - ((int16*)conv)[i] = (int16)value[i]; + ((int16*)conv)[i] = TIFFClampDoubleToInt16(value[i]); ok = TIFFWriteDirectoryTagSshortArray(tif,ndir,dir,tag,count,(int16*)conv); } else { for (i = 0; i < count; ++i) - ((int32*)conv)[i] = (int32)value[i]; + ((int32*)conv)[i] = TIFFClampDoubleToInt32(value[i]); ok = TIFFWriteDirectoryTagSlongArray(tif,ndir,dir,tag,count,(int32*)conv); } break; @@ -992,19 +1056,19 @@ if (tif->tif_dir.td_bitspersample<=8) { for (i = 0; i < count; ++i) - ((uint8*)conv)[i] = (uint8)value[i]; + ((uint8*)conv)[i] = TIFFClampDoubleToUInt8(value[i]); ok = TIFFWriteDirectoryTagByteArray(tif,ndir,dir,tag,count,(uint8*)conv); } else if (tif->tif_dir.td_bitspersample<=16) { for (i = 0; i < count; ++i) - ((uint16*)conv)[i] = (uint16)value[i]; + ((uint16*)conv)[i] = TIFFClampDoubleToUInt16(value[i]); ok = TIFFWriteDirectoryTagShortArray(tif,ndir,dir,tag,count,(uint16*)conv); } else { for (i = 0; i < count; ++i) - ((uint32*)conv)[i] = (uint32)value[i]; + ((uint32*)conv)[i] = TIFFClampDoubleToUInt32(value[i]); ok = TIFFWriteDirectoryTagLongArray(tif,ndir,dir,tag,count,(uint32*)conv); } break; @@ -2095,15 +2159,25 @@ static int TIFFWriteDirectoryTagCheckedRational(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, double value) { + static const char module[] = "TIFFWriteDirectoryTagCheckedRational"; uint32 m[2]; - assert(value>=0.0); assert(sizeof(uint32)==4); - if (value<=0.0) + if( value < 0 ) + { + TIFFErrorExt(tif->tif_clientdata,module,"Negative value is illegal"); + return 0; + } + else if( value != value ) + { + TIFFErrorExt(tif->tif_clientdata,module,"Not-a-number value is illegal"); + return 0; + } + else if (value==0.0) { m[0]=0; m[1]=1; } - else if (value==(double)(uint32)value) + else if (value <= 0xFFFFFFFFU && value==(double)(uint32)value) { m[0]=(uint32)value; m[1]=1; @@ -2144,12 +2218,13 @@ } for (na=value, nb=m, nc=0; nc<count; na++, nb+=2, nc++) { - if (*na<=0.0) + if (*na<=0.0 || *na != *na) { nb[0]=0; nb[1]=1; } - else if (*na==(float)(uint32)(*na)) + else if (*na >= 0 && *na <= (float)0xFFFFFFFFU && + *na==(float)(uint32)(*na)) { nb[0]=(uint32)(*na); nb[1]=1; Modified: trunk/reactos/dll/3rdparty/libtiff/tif_fax3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_f… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_fax3.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_fax3.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_fax3.c,v 1.78 2016-09-04 21:32:56 erouault Exp $ */ +/* $Id: tif_fax3.c,v 1.80 2017-04-27 19:50:01 erouault Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -330,34 +330,64 @@ #if SIZEOF_UNSIGNED_LONG == 8 # define FILL(n, cp) \ switch (n) { \ - case 15:(cp)[14] = 0xff; case 14:(cp)[13] = 0xff; case 13: (cp)[12] = 0xff;\ - case 12:(cp)[11] = 0xff; case 11:(cp)[10] = 0xff; case 10: (cp)[9] = 0xff;\ - case 9: (cp)[8] = 0xff; case 8: (cp)[7] = 0xff; case 7: (cp)[6] = 0xff;\ - case 6: (cp)[5] = 0xff; case 5: (cp)[4] = 0xff; case 4: (cp)[3] = 0xff;\ - case 3: (cp)[2] = 0xff; case 2: (cp)[1] = 0xff; \ - case 1: (cp)[0] = 0xff; (cp) += (n); case 0: ; \ + case 15:(cp)[14] = 0xff; /*-fallthrough*/ \ + case 14:(cp)[13] = 0xff; /*-fallthrough*/ \ + case 13:(cp)[12] = 0xff; /*-fallthrough*/ \ + case 12:(cp)[11] = 0xff; /*-fallthrough*/ \ + case 11:(cp)[10] = 0xff; /*-fallthrough*/ \ + case 10: (cp)[9] = 0xff; /*-fallthrough*/ \ + case 9: (cp)[8] = 0xff; /*-fallthrough*/ \ + case 8: (cp)[7] = 0xff; /*-fallthrough*/ \ + case 7: (cp)[6] = 0xff; /*-fallthrough*/ \ + case 6: (cp)[5] = 0xff; /*-fallthrough*/ \ + case 5: (cp)[4] = 0xff; /*-fallthrough*/ \ + case 4: (cp)[3] = 0xff; /*-fallthrough*/ \ + case 3: (cp)[2] = 0xff; /*-fallthrough*/ \ + case 2: (cp)[1] = 0xff; /*-fallthrough*/ \ + case 1: (cp)[0] = 0xff; (cp) += (n); /*-fallthrough*/ \ + case 0: ; \ } # define ZERO(n, cp) \ switch (n) { \ - case 15:(cp)[14] = 0; case 14:(cp)[13] = 0; case 13: (cp)[12] = 0; \ - case 12:(cp)[11] = 0; case 11:(cp)[10] = 0; case 10: (cp)[9] = 0; \ - case 9: (cp)[8] = 0; case 8: (cp)[7] = 0; case 7: (cp)[6] = 0; \ - case 6: (cp)[5] = 0; case 5: (cp)[4] = 0; case 4: (cp)[3] = 0; \ - case 3: (cp)[2] = 0; case 2: (cp)[1] = 0; \ - case 1: (cp)[0] = 0; (cp) += (n); case 0: ; \ + case 15:(cp)[14] = 0; /*-fallthrough*/ \ + case 14:(cp)[13] = 0; /*-fallthrough*/ \ + case 13:(cp)[12] = 0; /*-fallthrough*/ \ + case 12:(cp)[11] = 0; /*-fallthrough*/ \ + case 11:(cp)[10] = 0; /*-fallthrough*/ \ + case 10: (cp)[9] = 0; /*-fallthrough*/ \ + case 9: (cp)[8] = 0; /*-fallthrough*/ \ + case 8: (cp)[7] = 0; /*-fallthrough*/ \ + case 7: (cp)[6] = 0; /*-fallthrough*/ \ + case 6: (cp)[5] = 0; /*-fallthrough*/ \ + case 5: (cp)[4] = 0; /*-fallthrough*/ \ + case 4: (cp)[3] = 0; /*-fallthrough*/ \ + case 3: (cp)[2] = 0; /*-fallthrough*/ \ + case 2: (cp)[1] = 0; /*-fallthrough*/ \ + case 1: (cp)[0] = 0; (cp) += (n); /*-fallthrough*/ \ + case 0: ; \ } #else # define FILL(n, cp) \ switch (n) { \ - case 7: (cp)[6] = 0xff; case 6: (cp)[5] = 0xff; case 5: (cp)[4] = 0xff; \ - case 4: (cp)[3] = 0xff; case 3: (cp)[2] = 0xff; case 2: (cp)[1] = 0xff; \ - case 1: (cp)[0] = 0xff; (cp) += (n); case 0: ; \ + case 7: (cp)[6] = 0xff; /*-fallthrough*/ \ + case 6: (cp)[5] = 0xff; /*-fallthrough*/ \ + case 5: (cp)[4] = 0xff; /*-fallthrough*/ \ + case 4: (cp)[3] = 0xff; /*-fallthrough*/ \ + case 3: (cp)[2] = 0xff; /*-fallthrough*/ \ + case 2: (cp)[1] = 0xff; /*-fallthrough*/ \ + case 1: (cp)[0] = 0xff; (cp) += (n); /*-fallthrough*/ \ + case 0: ; \ } # define ZERO(n, cp) \ switch (n) { \ - case 7: (cp)[6] = 0; case 6: (cp)[5] = 0; case 5: (cp)[4] = 0; \ - case 4: (cp)[3] = 0; case 3: (cp)[2] = 0; case 2: (cp)[1] = 0; \ - case 1: (cp)[0] = 0; (cp) += (n); case 0: ; \ + case 7: (cp)[6] = 0; /*-fallthrough*/ \ + case 6: (cp)[5] = 0; /*-fallthrough*/ \ + case 5: (cp)[4] = 0; /*-fallthrough*/ \ + case 4: (cp)[3] = 0; /*-fallthrough*/ \ + case 3: (cp)[2] = 0; /*-fallthrough*/ \ + case 2: (cp)[1] = 0; /*-fallthrough*/ \ + case 1: (cp)[0] = 0; (cp) += (n); /*-fallthrough*/ \ + case 0: ; \ } #endif @@ -1100,7 +1130,7 @@ static void Fax3Close(TIFF* tif) { - if ((Fax3State(tif)->mode & FAXMODE_NORTC) == 0) { + if ((Fax3State(tif)->mode & FAXMODE_NORTC) == 0 && tif->tif_rawcp) { Fax3CodecState* sp = EncoderState(tif); unsigned int code = EOL; unsigned int length = 12; @@ -1322,6 +1352,7 @@ "No space for state block"); return (0); } + _TIFFmemset(tif->tif_data, 0, sizeof (Fax3CodecState)); sp = Fax3State(tif); sp->rw_mode = tif->tif_mode; Modified: trunk/reactos/dll/3rdparty/libtiff/tif_getimage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_g… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_getimage.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_getimage.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_getimage.c,v 1.98 2016-11-18 02:47:45 bfriesen Exp $ */ +/* $Id: tif_getimage.c,v 1.106 2017-05-20 11:29:02 erouault Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -284,6 +284,13 @@ img->redcmap = NULL; img->greencmap = NULL; img->bluecmap = NULL; + img->Map = NULL; + img->BWmap = NULL; + img->PALmap = NULL; + img->ycbcr = NULL; + img->cielab = NULL; + img->UaToAa = NULL; + img->Bitdepth16To8 = NULL; img->req_orientation = ORIENTATION_BOTLEFT; /* It is the default */ img->tif = tif; @@ -469,13 +476,6 @@ photoTag, img->photometric); goto fail_return; } - img->Map = NULL; - img->BWmap = NULL; - img->PALmap = NULL; - img->ycbcr = NULL; - img->cielab = NULL; - img->UaToAa = NULL; - img->Bitdepth16To8 = NULL; TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &img->width); TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &img->height); TIFFGetFieldDefaulted(tif, TIFFTAG_ORIENTATION, &img->orientation); @@ -495,10 +495,7 @@ return 1; fail_return: - _TIFFfree( img->redcmap ); - _TIFFfree( img->greencmap ); - _TIFFfree( img->bluecmap ); - img->redcmap = img->greencmap = img->bluecmap = NULL; + TIFFRGBAImageEnd( img ); return 0; } @@ -703,7 +700,7 @@ this_toskew = toskew; } - y += (flip & FLIP_VERTICALLY ? -(int32) nrow : (int32) nrow); + y += ((flip & FLIP_VERTICALLY) ? -(int32) nrow : (int32) nrow); } _TIFFfree(buf); @@ -872,7 +869,7 @@ this_toskew = toskew; } - y += (flip & FLIP_VERTICALLY ?-(int32) nrow : (int32) nrow); + y += ((flip & FLIP_VERTICALLY) ?-(int32) nrow : (int32) nrow); } if (flip & FLIP_HORIZONTALLY) { @@ -963,7 +960,7 @@ pos = ((row + img->row_offset) % rowsperstrip) * scanline + \ ((tmsize_t) img->col_offset * img->samplesperpixel); (*put)(img, raster+y*w, 0, y, w, nrow, fromskew, toskew, buf + pos); - y += (flip & FLIP_VERTICALLY ? -(int32) nrow : (int32) nrow); + y += ((flip & FLIP_VERTICALLY) ? -(int32) nrow : (int32) nrow); } if (flip & FLIP_HORIZONTALLY) { @@ -1098,7 +1095,7 @@ ((tmsize_t) img->col_offset * img->samplesperpixel); (*put)(img, raster+y*w, 0, y, w, nrow, fromskew, toskew, p0 + pos, p1 + pos, p2 + pos, (alpha?(pa+pos):NULL)); - y += (flip & FLIP_VERTICALLY ? -(int32) nrow : (int32) nrow); + y += ((flip & FLIP_VERTICALLY) ? -(int32) nrow : (int32) nrow); } if (flip & FLIP_HORIZONTALLY) { @@ -1137,11 +1134,15 @@ #define REPEAT2(op) op; op #define CASE8(x,op) \ switch (x) { \ - case 7: op; case 6: op; case 5: op; \ - case 4: op; case 3: op; case 2: op; \ + case 7: op; /*-fallthrough*/ \ + case 6: op; /*-fallthrough*/ \ + case 5: op; /*-fallthrough*/ \ + case 4: op; /*-fallthrough*/ \ + case 3: op; /*-fallthrough*/ \ + case 2: op; /*-fallthrough*/ \ case 1: op; \ } -#define CASE4(x,op) switch (x) { case 3: op; case 2: op; case 1: op; } +#define CASE4(x,op) switch (x) { case 3: op; /*-fallthrough*/ case 2: op; /*-fallthrough*/ case 1: op; } #define NOP #define UNROLL8(w, op1, op2) { \ @@ -1306,7 +1307,7 @@ while (h-- > 0) { for (x = w; x-- > 0;) { - *cp++ = BWmap[*pp][0] & (*(pp+1) << 24 | ~A1); + *cp++ = BWmap[*pp][0] & ((uint32)*(pp+1) << 24 | ~A1); pp += samplesperpixel; } cp += toskew; @@ -2047,9 +2048,9 @@ int32 Cr = pp[5]; switch( (w&3) ) { - case 3: YCbCrtoRGB(cp [2], pp[2]); - case 2: YCbCrtoRGB(cp [1], pp[1]); - case 1: YCbCrtoRGB(cp [0], pp[0]); + case 3: YCbCrtoRGB(cp [2], pp[2]); /*-fallthrough*/ + case 2: YCbCrtoRGB(cp [1], pp[1]); /*-fallthrough*/ + case 1: YCbCrtoRGB(cp [0], pp[0]); /*-fallthrough*/ case 0: break; } @@ -2239,6 +2240,11 @@ } #undef YCbCrtoRGB +static int isInRefBlackWhiteRange(float f) +{ + return f >= (float)(-0x7FFFFFFF + 128) && f <= (float)0x7FFFFFFF; +} + static int initYCbCrConversion(TIFFRGBAImage* img) { @@ -2263,6 +2269,31 @@ TIFFGetFieldDefaulted(img->tif, TIFFTAG_YCBCRCOEFFICIENTS, &luma); TIFFGetFieldDefaulted(img->tif, TIFFTAG_REFERENCEBLACKWHITE, &refBlackWhite); + + /* Do some validation to avoid later issues. Detect NaN for now */ + /* and also if lumaGreen is zero since we divide by it later */ + if( luma[0] != luma[0] || + luma[1] != luma[1] || + luma[1] == 0.0 || + luma[2] != luma[2] ) + { + TIFFErrorExt(img->tif->tif_clientdata, module, + "Invalid values for YCbCrCoefficients tag"); + return (0); + } + + if( !isInRefBlackWhiteRange(refBlackWhite[0]) || + !isInRefBlackWhiteRange(refBlackWhite[1]) || + !isInRefBlackWhiteRange(refBlackWhite[2]) || + !isInRefBlackWhiteRange(refBlackWhite[3]) || + !isInRefBlackWhiteRange(refBlackWhite[4]) || + !isInRefBlackWhiteRange(refBlackWhite[5]) ) + { + TIFFErrorExt(img->tif->tif_clientdata, module, + "Invalid values for ReferenceBlackWhite tag"); + return (0); + } + if (TIFFYCbCrToRGBInit(img->ycbcr, luma, refBlackWhite) < 0) return(0); return (1); @@ -2817,6 +2848,13 @@ TIFFReadRGBAStrip(TIFF* tif, uint32 row, uint32 * raster ) { + return TIFFReadRGBAStripExt(tif, row, raster, 0 ); +} + +int +TIFFReadRGBAStripExt(TIFF* tif, uint32 row, uint32 * raster, int stop_on_error) + +{ char emsg[1024] = ""; TIFFRGBAImage img; int ok; @@ -2837,7 +2875,7 @@ return (0); } - if (TIFFRGBAImageOK(tif, emsg) && TIFFRGBAImageBegin(&img, tif, 0, emsg)) { + if (TIFFRGBAImageOK(tif, emsg) && TIFFRGBAImageBegin(&img, tif, stop_on_error, emsg)) { img.row_offset = row; img.col_offset = 0; @@ -2868,6 +2906,13 @@ TIFFReadRGBATile(TIFF* tif, uint32 col, uint32 row, uint32 * raster) { + return TIFFReadRGBATileExt(tif, col, row, raster, 0 ); +} + + +int +TIFFReadRGBATileExt(TIFF* tif, uint32 col, uint32 row, uint32 * raster, int stop_on_error ) +{ char emsg[1024] = ""; TIFFRGBAImage img; int ok; @@ -2902,7 +2947,7 @@ */ if (!TIFFRGBAImageOK(tif, emsg) - || !TIFFRGBAImageBegin(&img, tif, 0, emsg)) { + || !TIFFRGBAImageBegin(&img, tif, stop_on_error, emsg)) { TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "%s", emsg); return( 0 ); } Modified: trunk/reactos/dll/3rdparty/libtiff/tif_jpeg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_j… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_jpeg.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_jpeg.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_jpeg.c,v 1.123 2016-01-23 21:20:34 erouault Exp $ */ +/* $Id: tif_jpeg.c,v 1.127 2017-01-31 13:02:27 erouault Exp $ */ /* * Copyright (c) 1994-1997 Sam Leffler @@ -698,9 +698,11 @@ JPEGFixupTags(TIFF* tif) { #ifdef CHECK_JPEG_YCBCR_SUBSAMPLING + JPEGState* sp = JState(tif); if ((tif->tif_dir.td_photometric==PHOTOMETRIC_YCBCR)&& (tif->tif_dir.td_planarconfig==PLANARCONFIG_CONTIG)&& - (tif->tif_dir.td_samplesperpixel==3)) + (tif->tif_dir.td_samplesperpixel==3) && + !sp->ycbcrsampling_fetched) JPEGFixupTagsSubsampling(tif); #endif @@ -1627,6 +1629,20 @@ case PHOTOMETRIC_YCBCR: sp->h_sampling = td->td_ycbcrsubsampling[0]; sp->v_sampling = td->td_ycbcrsubsampling[1]; + if( sp->h_sampling == 0 || sp->v_sampling == 0 ) + { + TIFFErrorExt(tif->tif_clientdata, module, + "Invalig horizontal/vertical sampling value"); + return (0); + } + if( td->td_bitspersample > 16 ) + { + TIFFErrorExt(tif->tif_clientdata, module, + "BitsPerSample %d not allowed for JPEG", + td->td_bitspersample); + return (0); + } + /* * A ReferenceBlackWhite field *must* be present since the * default value is inappropriate for YCbCr. Fill in the @@ -2292,6 +2308,15 @@ } else { if (!TIFFjpeg_create_compress(sp)) return (0); +#ifndef TIFF_JPEG_MAX_MEMORY_TO_USE +#define TIFF_JPEG_MAX_MEMORY_TO_USE (10 * 1024 * 1024) +#endif + /* Increase the max memory usable. This helps when creating files */ + /* with "big" tile, without using libjpeg temporary files. */ + /* For example a 512x512 tile with 3 bands */ + /* requires 1.5 MB which is above libjpeg 1MB default */ + if( sp->cinfo.c.mem->max_memory_to_use < TIFF_JPEG_MAX_MEMORY_TO_USE ) + sp->cinfo.c.mem->max_memory_to_use = TIFF_JPEG_MAX_MEMORY_TO_USE; } sp->cinfo_initialized = TRUE; Modified: trunk/reactos/dll/3rdparty/libtiff/tif_luv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_l… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_luv.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_luv.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_luv.c,v 1.43 2016-09-04 21:32:56 erouault Exp $ */ +/* $Id: tif_luv.c,v 1.47 2017-05-14 10:17:27 erouault Exp $ */ /* * Copyright (c) 1997 Greg Ward Larson @@ -159,6 +159,7 @@ typedef struct logLuvState LogLuvState; struct logLuvState { + int encoder_state; /* 1 if encoder correctly initialized */ int user_datafmt; /* user data format */ int encode_meth; /* encoding method */ int pixel_size; /* bytes per pixel */ @@ -473,7 +474,7 @@ tif->tif_rawcp = op; tif->tif_rawcc = tif->tif_rawdatasize - occ; if (!TIFFFlushData1(tif)) - return (-1); + return (0); op = tif->tif_rawcp; occ = tif->tif_rawdatasize - tif->tif_rawcc; } @@ -505,7 +506,7 @@ tif->tif_rawcp = op; tif->tif_rawcc = tif->tif_rawdatasize - occ; if (!TIFFFlushData1(tif)) - return (-1); + return (0); op = tif->tif_rawcp; occ = tif->tif_rawdatasize - tif->tif_rawcc; } @@ -565,7 +566,7 @@ tif->tif_rawcp = op; tif->tif_rawcc = tif->tif_rawdatasize - occ; if (!TIFFFlushData1(tif)) - return (-1); + return (0); op = tif->tif_rawcp; occ = tif->tif_rawdatasize - tif->tif_rawcc; } @@ -624,7 +625,7 @@ tif->tif_rawcp = op; tif->tif_rawcc = tif->tif_rawdatasize - occ; if (!TIFFFlushData1(tif)) - return (-1); + return (0); op = tif->tif_rawcp; occ = tif->tif_rawdatasize - tif->tif_rawcc; } @@ -656,7 +657,7 @@ tif->tif_rawcp = op; tif->tif_rawcc = tif->tif_rawdatasize - occ; if (!TIFFFlushData1(tif)) - return (-1); + return (0); op = tif->tif_rawcp; occ = tif->tif_rawdatasize - tif->tif_rawcc; } @@ -1264,15 +1265,16 @@ return (SGILOGDATAFMT_UNKNOWN); } + +#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0)) +#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1) + static tmsize_t multiply_ms(tmsize_t m1, tmsize_t m2) { - tmsize_t bytes = m1 * m2; - - if (m1 && bytes / m1 != m2) - bytes = 0; - - return bytes; + if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 ) + return 0; + return m1 * m2; } static int @@ -1313,8 +1315,10 @@ } if( isTiled(tif) ) sp->tbuflen = multiply_ms(td->td_tilewidth, td->td_tilelength); + else if( td->td_rowsperstrip != (uint32)-1 ) + sp->tbuflen = multiply_ms(td->td_imagewidth, td->td_rowsperstrip); else - sp->tbuflen = multiply_ms(td->td_imagewidth, td->td_rowsperstrip); + sp->tbuflen = multiply_ms(td->td_imagewidth, td->td_imagelength); if (multiply_ms(sp->tbuflen, sizeof (int16)) == 0 || (sp->tbuf = (uint8*) _TIFFmalloc(sp->tbuflen * sizeof (int16))) == NULL) { TIFFErrorExt(tif->tif_clientdata, module, "No space for SGILog translation buffer"); @@ -1553,6 +1557,7 @@ td->td_photometric, "must be either LogLUV or LogL"); break; } + sp->encoder_state = 1; return (1); notsupported: TIFFErrorExt(tif->tif_clientdata, module, @@ -1564,19 +1569,27 @@ static void LogLuvClose(TIFF* tif) { + LogLuvState* sp = (LogLuvState*) tif->tif_data; TIFFDirectory *td = &tif->tif_dir; + assert(sp != 0); /* * For consistency, we always want to write out the same * bitspersample and sampleformat for our TIFF file, * regardless of the data format being used by the application. * Since this routine is called after tags have been set but * before they have been recorded in the file, we reset them here. + * Note: this is really a nasty approach. See PixarLogClose */ - td->td_samplesperpixel = - (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3; - td->td_bitspersample = 16; - td->td_sampleformat = SAMPLEFORMAT_INT; + if( sp->encoder_state ) + { + /* See PixarLogClose. Might avoid issues with tags whose size depends + * on those below, but not completely sure this is enough. */ + td->td_samplesperpixel = + (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3; + td->td_bitspersample = 16; + td->td_sampleformat = SAMPLEFORMAT_INT; + } } static void Modified: trunk/reactos/dll/3rdparty/libtiff/tif_lzw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_l… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_lzw.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_lzw.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_lzw.c,v 1.52 2016-09-04 21:32:56 erouault Exp $ */ +/* $Id: tif_lzw.c,v 1.55 2017-05-17 09:38:58 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -319,7 +319,7 @@ sp->dec_restart = 0; sp->dec_nbitsmask = MAXCODE(BITS_MIN); #ifdef LZW_CHECKEOS - sp->dec_bitsleft = ((uint64)tif->tif_rawcc) << 3; + sp->dec_bitsleft = 0; #endif sp->dec_free_entp = sp->dec_codetab + CODE_FIRST; /* @@ -426,6 +426,9 @@ } bp = (unsigned char *)tif->tif_rawcp; +#ifdef LZW_CHECKEOS + sp->dec_bitsleft = (((uint64)tif->tif_rawcc) << 3); +#endif nbits = sp->lzw_nbits; nextdata = sp->lzw_nextdata; nextbits = sp->lzw_nextbits; @@ -550,6 +553,7 @@ } } + tif->tif_rawcc -= (tmsize_t)( (uint8*) bp - tif->tif_rawcp ); tif->tif_rawcp = (uint8*) bp; sp->lzw_nbits = (unsigned short) nbits; sp->lzw_nextdata = nextdata; @@ -970,7 +974,8 @@ */ if (op > limit) { tif->tif_rawcc = (tmsize_t)(op - tif->tif_rawdata); - TIFFFlushData1(tif); + if( !TIFFFlushData1(tif) ) + return 0; op = tif->tif_rawdata; } PutNextCode(op, ent); @@ -1055,12 +1060,32 @@ if (op > sp->enc_rawlimit) { tif->tif_rawcc = (tmsize_t)(op - tif->tif_rawdata); - TIFFFlushData1(tif); + if( !TIFFFlushData1(tif) ) + return 0; op = tif->tif_rawdata; } if (sp->enc_oldcode != (hcode_t) -1) { + int free_ent = sp->lzw_free_ent; + PutNextCode(op, sp->enc_oldcode); sp->enc_oldcode = (hcode_t) -1; + free_ent ++; + + if (free_ent == CODE_MAX-1) { + /* table is full, emit clear code and reset */ + outcount = 0; + PutNextCode(op, CODE_CLEAR); + nbits = BITS_MIN; + } else { + /* + * If the next entry is going to be too big for + * the code size, then increase it, if possible. + */ + if (free_ent > sp->lzw_maxcode) { + nbits++; + assert(nbits <= BITS_MAX); + } + } } PutNextCode(op, CODE_EOI); /* Explicit 0xff masking to make icc -check=conversions happy */ Modified: trunk/reactos/dll/3rdparty/libtiff/tif_ojpeg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_o… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_ojpeg.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_ojpeg.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_ojpeg.c,v 1.65 2016-09-04 21:32:56 erouault Exp $ */ +/* $Id: tif_ojpeg.c,v 1.69 2017-04-27 17:29:26 erouault Exp $ */ /* WARNING: The type of JPEG encapsulation defined by the TIFF Version 6.0 specification is now totally obsolete and deprecated for new applications and @@ -245,6 +245,7 @@ typedef struct { TIFF* tif; + int decoder_ok; #ifndef LIBJPEG_ENCAP_EXTERNAL JMP_BUF exit_jmpbuf; #endif @@ -723,6 +724,7 @@ } sp->write_curstrile++; } + sp->decoder_ok = 1; return(1); } @@ -785,8 +787,14 @@ static int OJPEGDecode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s) { + static const char module[]="OJPEGDecode"; OJPEGState* sp=(OJPEGState*)tif->tif_data; (void)s; + if( !sp->decoder_ok ) + { + TIFFErrorExt(tif->tif_clientdata,module,"Cannot decode: decoder not correctly initialized"); + return 0; + } if (sp->libjpeg_jpeg_query_style==0) { if (OJPEGDecodeRaw(tif,buf,cc)==0) @@ -1783,7 +1791,12 @@ TIFFSeekFile(tif,sp->qtable_offset[m],SEEK_SET); p=(uint32)TIFFReadFile(tif,&ob[sizeof(uint32)+5],64); if (p!=64) + { + _TIFFfree(ob); return(0); + } + if (sp->qtable[m]!=0) + _TIFFfree(sp->qtable[m]); sp->qtable[m]=ob; sp->sof_tq[m]=m; } @@ -1847,7 +1860,12 @@ rb[sizeof(uint32)+5+n]=o[n]; p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); if (p!=q) + { + _TIFFfree(rb); return(0); + } + if (sp->dctable[m]!=0) + _TIFFfree(sp->dctable[m]); sp->dctable[m]=rb; sp->sos_tda[m]=(m<<4); } @@ -1911,7 +1929,12 @@ rb[sizeof(uint32)+5+n]=o[n]; p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); if (p!=q) + { + _TIFFfree(rb); return(0); + } + if (sp->actable[m]!=0) + _TIFFfree(sp->actable[m]); sp->actable[m]=rb; sp->sos_tda[m]=(sp->sos_tda[m]|m); } Modified: trunk/reactos/dll/3rdparty/libtiff/tif_open.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_o… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_open.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_open.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_open.c,v 1.47 2016-01-23 21:20:34 erouault Exp $ */ +/* $Id: tif_open.c,v 1.48 2016-11-20 22:29:47 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -280,10 +280,10 @@ * Setup header and write. */ #ifdef WORDS_BIGENDIAN - tif->tif_header.common.tiff_magic = tif->tif_flags & TIFF_SWAB + tif->tif_header.common.tiff_magic = (tif->tif_flags & TIFF_SWAB) ? TIFF_LITTLEENDIAN : TIFF_BIGENDIAN; #else - tif->tif_header.common.tiff_magic = tif->tif_flags & TIFF_SWAB + tif->tif_header.common.tiff_magic = (tif->tif_flags & TIFF_SWAB) ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN; #endif if (!(tif->tif_flags&TIFF_BIGTIFF)) Modified: trunk/reactos/dll/3rdparty/libtiff/tif_packbits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_p… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_packbits.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_packbits.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_packbits.c,v 1.24 2016-09-04 21:32:56 erouault Exp $ */ +/* $Id: tif_packbits.c,v 1.26 2017-05-14 02:26:07 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -100,7 +100,7 @@ slop = (long)(op - lastliteral); tif->tif_rawcc += (tmsize_t)(lastliteral - tif->tif_rawcp); if (!TIFFFlushData1(tif)) - return (-1); + return (0); op = tif->tif_rawcp; while (slop-- > 0) *op++ = *lastliteral++; @@ -108,7 +108,7 @@ } else { tif->tif_rawcc += (tmsize_t)(op - tif->tif_rawcp); if (!TIFFFlushData1(tif)) - return (-1); + return (0); op = tif->tif_rawcp; } } @@ -245,6 +245,12 @@ (unsigned long) ((tmsize_t)n - occ)); n = (long)occ; } + if( cc == 0 ) + { + TIFFWarningExt(tif->tif_clientdata, module, + "Terminating PackBitsDecode due to lack of data."); + break; + } occ -= n; b = *bp++; cc--; Modified: trunk/reactos/dll/3rdparty/libtiff/tif_pixarlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_p… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_pixarlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_pixarlog.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_pixarlog.c,v 1.48 2016-09-23 22:12:18 erouault Exp $ */ +/* $Id: tif_pixarlog.c,v 1.53 2017-05-17 09:53:06 erouault Exp $ */ /* * Copyright (c) 1996-1997 Sam Leffler @@ -637,29 +637,27 @@ return guess; } +#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0)) +#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1) + static tmsize_t multiply_ms(tmsize_t m1, tmsize_t m2) { - tmsize_t bytes = m1 * m2; - - if (m1 && bytes / m1 != m2) - bytes = 0; - - return bytes; + if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 ) + return 0; + return m1 * m2; } static tmsize_t add_ms(tmsize_t m1, tmsize_t m2) { - tmsize_t bytes = m1 + m2; - /* if either input is zero, assume overflow already occurred */ if (m1 == 0 || m2 == 0) - bytes = 0; - else if (bytes <= m1 || bytes <= m2) - bytes = 0; - - return bytes; + return 0; + else if (m1 > TIFF_TMSIZE_T_MAX - m2) + return 0; + + return m1 + m2; } static int @@ -678,6 +676,12 @@ tmsize_t tbuf_size; assert(sp != NULL); + + /* This function can possibly be called several times by */ + /* PredictorSetupDecode() if this function succeeds but */ + /* PredictorSetup() fails */ + if( (sp->state & PLSTATE_INIT) != 0 ) + return 1; /* Make sure no byte swapping happens on the data * after decompression. */ @@ -700,6 +704,9 @@ if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) sp->user_datafmt = PixarLogGuessDataFmt(td); if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) { + _TIFFfree(sp->tbuf); + sp->tbuf = NULL; + sp->tbuf_size = 0; TIFFErrorExt(tif->tif_clientdata, module, "PixarLog compression can't handle bits depth/data format combination (depth: %d)", td->td_bitspersample); @@ -707,6 +714,9 @@ } if (inflateInit(&sp->stream) != Z_OK) { + _TIFFfree(sp->tbuf); + sp->tbuf = NULL; + sp->tbuf_size = 0; TIFFErrorExt(tif->tif_clientdata, module, "%s", sp->stream.msg ? sp->stream.msg : "(null)"); return (0); } else { @@ -775,6 +785,10 @@ (void) s; assert(sp != NULL); + + sp->stream.next_in = tif->tif_rawcp; + sp->stream.avail_in = (uInt) tif->tif_rawcc; + sp->stream.next_out = (unsigned char *) sp->tbuf; assert(sizeof(sp->stream.avail_out)==4); /* if this assert gets raised, we need to simplify this code to reflect a ZLib that is likely updated @@ -819,6 +833,9 @@ (unsigned long) tif->tif_row, (TIFF_UINT64_T) sp->stream.avail_out); return (0); } + + tif->tif_rawcp = sp->stream.next_in; + tif->tif_rawcc = sp->stream.avail_in; up = sp->tbuf; /* Swap bytes in the data if from a different endian machine. */ @@ -1234,8 +1251,10 @@ static void PixarLogClose(TIFF* tif) { + PixarLogState* sp = (PixarLogState*) tif->tif_data; TIFFDirectory *td = &tif->tif_dir; + assert(sp != 0); /* In a really sneaky (and really incorrect, and untruthful, and * troublesome, and error-prone) maneuver that completely goes against * the spirit of TIFF, and breaks TIFF, on close, we covertly @@ -1244,8 +1263,19 @@ * readers that don't know about PixarLog, or how to set * the PIXARLOGDATFMT pseudo-tag. */ - td->td_bitspersample = 8; - td->td_sampleformat = SAMPLEFORMAT_UINT; + + if (sp->state&PLSTATE_INIT) { + /* We test the state to avoid an issue such as in + * http://bugzilla.maptools.org/show_bug.cgi?id=2604 + * What appends in that case is that the bitspersample is 1 and + * a TransferFunction is set. The size of the TransferFunction + * depends on 1<<bitspersample. So if we increase it, an access + * out of the buffer will happen at directory flushing. + * Another option would be to clear those targs. + */ + td->td_bitspersample = 8; + td->td_sampleformat = SAMPLEFORMAT_UINT; + } } static void Modified: trunk/reactos/dll/3rdparty/libtiff/tif_predict.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_p… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_predict.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_predict.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_predict.c,v 1.40 2016-11-04 09:19:13 erouault Exp $ */ +/* $Id: tif_predict.c,v 1.43 2017-05-10 15:21:16 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -118,6 +118,9 @@ TIFFPredictorState* sp = PredictorState(tif); TIFFDirectory* td = &tif->tif_dir; + /* Note: when PredictorSetup() fails, the effets of setupdecode() */ + /* will not be "cancelled" so setupdecode() might be robust to */ + /* be called several times. */ if (!(*sp->setupdecode)(tif) || !PredictorSetup(tif)) return 0; @@ -260,11 +263,12 @@ #define REPEAT4(n, op) \ switch (n) { \ - default: { tmsize_t i; for (i = n-4; i > 0; i--) { op; } } \ - case 4: op; \ - case 3: op; \ - case 2: op; \ - case 1: op; \ + default: { \ + tmsize_t i; for (i = n-4; i > 0; i--) { op; } } /*-fallthrough*/ \ + case 4: op; /*-fallthrough*/ \ + case 3: op; /*-fallthrough*/ \ + case 2: op; /*-fallthrough*/ \ + case 1: op; /*-fallthrough*/ \ case 0: ; \ } @@ -798,7 +802,7 @@ case 2: fprintf(fd, "horizontal differencing "); break; case 3: fprintf(fd, "floating point predictor "); break; } - fprintf(fd, "%u (0x%x)\n", sp->predictor, sp->predictor); + fprintf(fd, "%d (0x%x)\n", sp->predictor, sp->predictor); } if (sp->printdir) (*sp->printdir)(tif, fd, flags); Modified: trunk/reactos/dll/3rdparty/libtiff/tif_print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_p… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_print.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_print.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_print.c,v 1.64 2015-12-06 22:19:56 erouault Exp $ */ +/* $Id: tif_print.c,v 1.65 2016-11-20 22:31:22 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -263,7 +263,7 @@ if (td->td_subfiletype & FILETYPE_MASK) fprintf(fd, "%stransparency mask", sep); fprintf(fd, " (%lu = 0x%lx)\n", - (long) td->td_subfiletype, (long) td->td_subfiletype); + (unsigned long) td->td_subfiletype, (long) td->td_subfiletype); } if (TIFFFieldSet(tif,FIELD_IMAGEDIMENSIONS)) { fprintf(fd, " Image Width: %lu Image Length: %lu", @@ -522,7 +522,7 @@ fprintf(fd, "\n"); n = 1L<<td->td_bitspersample; for (l = 0; l < n; l++) - fprintf(fd, " %5lu: %5u %5u %5u\n", + fprintf(fd, " %5ld: %5u %5u %5u\n", l, td->td_colormap[0][l], td->td_colormap[1][l], @@ -545,7 +545,7 @@ n = 1L<<td->td_bitspersample; for (l = 0; l < n; l++) { uint16 i; - fprintf(fd, " %2lu: %5u", + fprintf(fd, " %2ld: %5u", l, td->td_transferfunction[0][l]); for (i = 1; i < td->td_samplesperpixel; i++) fprintf(fd, " %5u", @@ -662,7 +662,7 @@ uint32 s; fprintf(fd, " %lu %s:\n", - (long) td->td_nstrips, + (unsigned long) td->td_nstrips, isTiled(tif) ? "Tiles" : "Strips"); for (s = 0; s < td->td_nstrips; s++) #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) Modified: trunk/reactos/dll/3rdparty/libtiff/tif_read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_r… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_read.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_read.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_read.c,v 1.49 2016-07-10 18:00:21 erouault Exp $ */ +/* $Id: tif_read.c,v 1.59 2017-05-13 15:34:06 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -48,6 +48,121 @@ #define NOSTRIP ((uint32)(-1)) /* undefined state */ #define NOTILE ((uint32)(-1)) /* undefined state */ +#define INITIAL_THRESHOLD (1024 * 1024) +#define THRESHOLD_MULTIPLIER 10 +#define MAX_THRESHOLD (THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * INITIAL_THRESHOLD) + +/* Read 'size' bytes in tif_rawdata buffer starting at offset 'rawdata_offset' + * Returns 1 in case of success, 0 otherwise. */ +static int TIFFReadAndRealloc( TIFF* tif, tmsize_t size, + tmsize_t rawdata_offset, + int is_strip, uint32 strip_or_tile, + const char* module ) +{ +#if SIZEOF_VOIDP == 8 || SIZEOF_SIZE_T == 8 + tmsize_t threshold = INITIAL_THRESHOLD; +#endif + tmsize_t already_read = 0; + + /* On 64 bit processes, read first a maximum of 1 MB, then 10 MB, etc */ + /* so as to avoid allocating too much memory in case the file is too */ + /* short. We could ask for the file size, but this might be */ + /* expensive with some I/O layers (think of reading a gzipped file) */ + /* Restrict to 64 bit processes, so as to avoid reallocs() */ + /* on 32 bit processes where virtual memory is scarce. */ + while( already_read < size ) + { + tmsize_t bytes_read; + tmsize_t to_read = size - already_read; +#if SIZEOF_VOIDP == 8 || SIZEOF_SIZE_T == 8 + if( to_read >= threshold && threshold < MAX_THRESHOLD && + already_read + to_read + rawdata_offset > tif->tif_rawdatasize ) + { + to_read = threshold; + threshold *= THRESHOLD_MULTIPLIER; + } +#endif + if (already_read + to_read + rawdata_offset > tif->tif_rawdatasize) { + uint8* new_rawdata; + assert((tif->tif_flags & TIFF_MYBUFFER) != 0); + tif->tif_rawdatasize = (tmsize_t)TIFFroundup_64( + (uint64)already_read + to_read + rawdata_offset, 1024); + if (tif->tif_rawdatasize==0) { + TIFFErrorExt(tif->tif_clientdata, module, + "Invalid buffer size"); + return 0; + } + new_rawdata = (uint8*) _TIFFrealloc( + tif->tif_rawdata, tif->tif_rawdatasize); + if( new_rawdata == 0 ) + { + TIFFErrorExt(tif->tif_clientdata, module, + "No space for data buffer at scanline %lu", + (unsigned long) tif->tif_row); + _TIFFfree(tif->tif_rawdata); + tif->tif_rawdata = 0; + tif->tif_rawdatasize = 0; + return 0; + } + tif->tif_rawdata = new_rawdata; + } + + bytes_read = TIFFReadFile(tif, + tif->tif_rawdata + rawdata_offset + already_read, to_read); + already_read += bytes_read; + if (bytes_read != to_read) { + memset( tif->tif_rawdata + rawdata_offset + already_read, 0, + tif->tif_rawdatasize - rawdata_offset - already_read ); +#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + if( is_strip ) + { + TIFFErrorExt(tif->tif_clientdata, module, + "Read error at scanline %lu; got %I64u bytes, " + "expected %I64u", + (unsigned long) tif->tif_row, + (unsigned __int64) already_read, + (unsigned __int64) size); + } + else + { + TIFFErrorExt(tif->tif_clientdata, module, + "Read error at row %lu, col %lu, tile %lu; " + "got %I64u bytes, expected %I64u", + (unsigned long) tif->tif_row, + (unsigned long) tif->tif_col, + (unsigned long) strip_or_tile, + (unsigned __int64) already_read, + (unsigned __int64) size); + } +#else + if( is_strip ) + { + TIFFErrorExt(tif->tif_clientdata, module, + "Read error at scanline %lu; got %llu bytes, " + "expected %llu", + (unsigned long) tif->tif_row, + (unsigned long long) already_read, + (unsigned long long) size); + } + else + { + TIFFErrorExt(tif->tif_clientdata, module, + "Read error at row %lu, col %lu, tile %lu; " + "got %llu bytes, expected %llu", + (unsigned long) tif->tif_row, + (unsigned long) tif->tif_col, + (unsigned long) strip_or_tile, + (unsigned long long) already_read, + (unsigned long long) size); + } +#endif + return 0; + } + } + return 1; +} + + static int TIFFFillStripPartial( TIFF *tif, int strip, tmsize_t read_ahead, int restart ) { @@ -55,7 +170,8 @@ register TIFFDirectory *td = &tif->tif_dir; tmsize_t unused_data; uint64 read_offset; - tmsize_t cc, to_read; + tmsize_t to_read; + tmsize_t read_ahead_mod; /* tmsize_t bytecountm; */ if (!_TIFFFillStriles( tif ) || !tif->tif_dir.td_stripbytecount) @@ -68,7 +184,14 @@ */ /* bytecountm=(tmsize_t) td->td_stripbytecount[strip]; */ - if (read_ahead*2 > tif->tif_rawdatasize) { + + /* Not completely sure where the * 2 comes from, but probably for */ + /* an exponentional growth strategy of tif_rawdatasize */ + if( read_ahead < TIFF_TMSIZE_T_MAX / 2 ) + read_ahead_mod = read_ahead * 2; + else + read_ahead_mod = read_ahead; + if (read_ahead_mod > tif->tif_rawdatasize) { assert( restart ); tif->tif_curstrip = NOSTRIP; @@ -78,8 +201,6 @@ (unsigned long) strip); return (0); } - if (!TIFFReadBufferSetup(tif, 0, read_ahead*2)) - return (0); } if( restart ) @@ -119,7 +240,10 @@ /* ** How much do we want to read? */ - to_read = tif->tif_rawdatasize - unused_data; + if( read_ahead_mod > tif->tif_rawdatasize ) + to_read = read_ahead_mod - unused_data; + else + to_read = tif->tif_rawdatasize - unused_data; if( (uint64) to_read > td->td_stripbytecount[strip] - tif->tif_rawdataoff - tif->tif_rawdataloaded ) { @@ -128,25 +252,14 @@ } assert((tif->tif_flags&TIFF_BUFFERMMAP)==0); - cc = TIFFReadFile(tif, tif->tif_rawdata + unused_data, to_read); - - if (cc != to_read) { -#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) - TIFFErrorExt(tif->tif_clientdata, module, - "Read error at scanline %lu; got %I64u bytes, expected %I64u", - (unsigned long) tif->tif_row, - (unsigned __int64) cc, - (unsigned __int64) to_read); -#else - TIFFErrorExt(tif->tif_clientdata, module, - "Read error at scanline %lu; got %llu bytes, expected %llu", - (unsigned long) tif->tif_row, - (unsigned long long) cc, - (unsigned long long) to_read); -#endif + if( !TIFFReadAndRealloc( tif, to_read, unused_data, + 1, /* is_strip */ + 0, /* strip_or_tile */ + module) ) + { return 0; } - + tif->tif_rawdataoff = tif->tif_rawdataoff + tif->tif_rawdataloaded - unused_data ; tif->tif_rawdataloaded = unused_data + to_read; @@ -165,7 +278,10 @@ if( restart ) return TIFFStartStrip(tif, strip); else + { + tif->tif_rawcc = tif->tif_rawdataloaded; return 1; + } } /* @@ -220,7 +336,18 @@ if( !whole_strip ) { - read_ahead = tif->tif_scanlinesize * 16 + 5000; + /* 16 is for YCbCr mode where we may need to read 16 */ + /* lines at a time to get a decompressed line, and 5000 */ + /* is some constant value, for example for JPEG tables */ + if( tif->tif_scanlinesize < TIFF_TMSIZE_T_MAX / 16 && + tif->tif_scanlinesize * 16 < TIFF_TMSIZE_T_MAX - 5000 ) + { + read_ahead = tif->tif_scanlinesize * 16 + 5000; + } + else + { + read_ahead = tif->tif_scanlinesize; + } } /* @@ -347,7 +474,7 @@ rowsperstrip=td->td_rowsperstrip; if (rowsperstrip>td->td_imagelength) rowsperstrip=td->td_imagelength; - stripsperplane=((td->td_imagelength+rowsperstrip-1)/rowsperstrip); + stripsperplane= TIFFhowmany_32_maxuint_compat(td->td_imagelength, rowsperstrip); stripinplane=(strip%stripsperplane); plane=(uint16)(strip/stripsperplane); rows=td->td_imagelength-stripinplane*rowsperstrip; @@ -421,16 +548,25 @@ return ((tmsize_t)(-1)); } } else { - tmsize_t ma,mb; + tmsize_t ma = 0; tmsize_t n; - ma=(tmsize_t)td->td_stripoffset[strip]; - mb=ma+size; - if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||(ma>tif->tif_size)) - n=0; - else if ((mb<ma)||(mb<size)||(mb>tif->tif_size)) - n=tif->tif_size-ma; - else - n=size; + if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)|| + ((ma=(tmsize_t)td->td_stripoffset[strip])>tif->tif_size)) + { + n=0; + } + else if( ma > TIFF_TMSIZE_T_MAX - size ) + { + n=0; + } + else + { + tmsize_t mb=ma+size; + if (mb>tif->tif_size) + n=tif->tif_size-ma; + else + n=size; + } if (n!=size) { #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) TIFFErrorExt(tif->tif_clientdata, module, @@ -455,6 +591,43 @@ return (size); } +static tmsize_t +TIFFReadRawStripOrTile2(TIFF* tif, uint32 strip_or_tile, int is_strip, + tmsize_t size, const char* module) +{ + TIFFDirectory *td = &tif->tif_dir; + + assert( !isMapped(tif) ); + assert((tif->tif_flags&TIFF_NOREADRAW)==0); + + if (!SeekOK(tif, td->td_stripoffset[strip_or_tile])) { + if( is_strip ) + { + TIFFErrorExt(tif->tif_clientdata, module, + "Seek error at scanline %lu, strip %lu", + (unsigned long) tif->tif_row, + (unsigned long) strip_or_tile); + } + else + { + TIFFErrorExt(tif->tif_clientdata, module, + "Seek error at row %lu, col %lu, tile %lu", + (unsigned long) tif->tif_row, + (unsigned long) tif->tif_col, + (unsigned long) strip_or_tile); + } + return ((tmsize_t)(-1)); + } + + if( !TIFFReadAndRealloc( tif, size, 0, is_strip, + strip_or_tile, module ) ) + { + return ((tmsize_t)(-1)); + } + + return (size); +} + /* * Read a strip of data from the file. */ @@ -536,6 +709,39 @@ #endif return (0); } + + /* To avoid excessive memory allocations: */ + /* Byte count should normally not be larger than a number of */ + /* times the uncompressed size plus some margin */ + if( bytecount > 1024 * 1024 ) + { + /* 10 and 4096 are just values that could be adjusted. */ + /* Hopefully they are safe enough for all codecs */ + tmsize_t stripsize = TIFFStripSize(tif); + if( stripsize != 0 && + (bytecount - 4096) / 10 > (uint64)stripsize ) + { + uint64 newbytecount = (uint64)stripsize * 10 + 4096; + if( (int64)newbytecount >= 0 ) + { +#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + TIFFWarningExt(tif->tif_clientdata, module, + "Too large strip byte count %I64u, strip %lu. Limiting to %I64u", + (unsigned __int64) bytecount, + (unsigned long) strip, + (unsigned __int64) newbytecount); +#else + TIFFErrorExt(tif->tif_clientdata, module, + "Too large strip byte count %llu, strip %lu. Limiting to %llu", + (unsigned long long) bytecount, + (unsigned long) strip, + (unsigned long long) newbytecount); +#endif + bytecount = newbytecount; + } + } + } + if (isMapped(tif) && (isFillOrder(tif, td->td_fillorder) || (tif->tif_flags & TIFF_NOBITREV))) { @@ -625,17 +831,36 @@ (unsigned long) strip); return (0); } - if (!TIFFReadBufferSetup(tif, 0, bytecountm)) - return (0); } if (tif->tif_flags&TIFF_BUFFERMMAP) { tif->tif_curstrip = NOSTRIP; - if (!TIFFReadBufferSetup(tif, 0, bytecountm)) + tif->tif_rawdata = NULL; + tif->tif_rawdatasize = 0; + tif->tif_flags &= ~TIFF_BUFFERMMAP; + } + + if( isMapped(tif) ) + { + if (bytecountm > tif->tif_rawdatasize && + !TIFFReadBufferSetup(tif, 0, bytecountm)) + { return (0); - } - if (TIFFReadRawStrip1(tif, strip, tif->tif_rawdata, - bytecountm, module) != bytecountm) - return (0); + } + if (TIFFReadRawStrip1(tif, strip, tif->tif_rawdata, + bytecountm, module) != bytecountm) + { + return (0); + } + } + else + { + if (TIFFReadRawStripOrTile2(tif, strip, 1, + bytecountm, module) != bytecountm) + { + return (0); + } + } + tif->tif_rawdataoff = 0; tif->tif_rawdataloaded = bytecountm; @@ -918,18 +1143,36 @@ (unsigned long) tile); return (0); } - if (!TIFFReadBufferSetup(tif, 0, bytecountm)) - return (0); } if (tif->tif_flags&TIFF_BUFFERMMAP) { tif->tif_curtile = NOTILE; - if (!TIFFReadBufferSetup(tif, 0, bytecountm)) + tif->tif_rawdata = NULL; + tif->tif_rawdatasize = 0; + tif->tif_flags &= ~TIFF_BUFFERMMAP; + } + + if( isMapped(tif) ) + { + if (bytecountm > tif->tif_rawdatasize && + !TIFFReadBufferSetup(tif, 0, bytecountm)) + { return (0); - } - - if (TIFFReadRawTile1(tif, tile, tif->tif_rawdata, - bytecountm, module) != bytecountm) - return (0); + } + if (TIFFReadRawTile1(tif, tile, tif->tif_rawdata, + bytecountm, module) != bytecountm) + { + return (0); + } + } + else + { + if (TIFFReadRawStripOrTile2(tif, tile, 0, + bytecountm, module) != bytecountm) + { + return (0); + } + } + tif->tif_rawdataoff = 0; tif->tif_rawdataloaded = bytecountm; @@ -977,7 +1220,9 @@ "Invalid buffer size"); return (0); } - tif->tif_rawdata = (uint8*) _TIFFmalloc(tif->tif_rawdatasize); + /* Initialize to zero to avoid uninitialized buffers in case of */ + /* short reads (http://bugzilla.maptools.org/show_bug.cgi?id=2651) */ + tif->tif_rawdata = (uint8*) _TIFFcalloc(1, tif->tif_rawdatasize); tif->tif_flags |= TIFF_MYBUFFER; } if (tif->tif_rawdata == NULL) { @@ -1019,7 +1264,10 @@ else { tif->tif_rawcp = tif->tif_rawdata; - tif->tif_rawcc = (tmsize_t)td->td_stripbytecount[strip]; + if( tif->tif_rawdataloaded > 0 ) + tif->tif_rawcc = tif->tif_rawdataloaded; + else + tif->tif_rawcc = (tmsize_t)td->td_stripbytecount[strip]; } return ((*tif->tif_predecode)(tif, (uint16)(strip / td->td_stripsperimage))); Modified: trunk/reactos/dll/3rdparty/libtiff/tif_strip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_s… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_strip.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_strip.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_strip.c,v 1.37 2016-11-09 23:00:49 erouault Exp $ */ +/* $Id: tif_strip.c,v 1.38 2016-12-03 11:02:15 erouault Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -63,15 +63,6 @@ { TIFFDirectory *td = &tif->tif_dir; uint32 nstrips; - - /* If the value was already computed and store in td_nstrips, then return it, - since ChopUpSingleUncompressedStrip might have altered and resized the - since the td_stripbytecount and td_stripoffset arrays to the new value - after the initial affectation of td_nstrips = TIFFNumberOfStrips() in - tif_dirread.c ~line 3612. - See http://bugzilla.maptools.org/show_bug.cgi?id=2587 */ - if( td->td_nstrips ) - return td->td_nstrips; nstrips = (td->td_rowsperstrip == (uint32) -1 ? 1 : TIFFhowmany_32(td->td_imagelength, td->td_rowsperstrip)); Modified: trunk/reactos/dll/3rdparty/libtiff/tif_unix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_u… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_unix.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_unix.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_unix.c,v 1.27 2015-08-19 02:31:04 bfriesen Exp $ */ +/* $Id: tif_unix.c,v 1.28 2017-01-11 19:02:49 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -316,6 +316,14 @@ return (malloc((size_t) s)); } +void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz) +{ + if( nmemb == 0 || siz == 0 ) + return ((void *) NULL); + + return calloc((size_t) nmemb, (size_t)siz); +} + void _TIFFfree(void* p) { Modified: trunk/reactos/dll/3rdparty/libtiff/tif_win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_w… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_win32.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_win32.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_win32.c,v 1.41 2015-08-23 20:12:44 bfriesen Exp $ */ +/* $Id: tif_win32.c,v 1.42 2017-01-11 19:02:49 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -364,6 +364,14 @@ return (malloc((size_t) s)); } +void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz) +{ + if( nmemb == 0 || siz == 0 ) + return ((void *) NULL); + + return calloc((size_t) nmemb, (size_t)siz); +} + void _TIFFfree(void* p) { Modified: trunk/reactos/dll/3rdparty/libtiff/tif_write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_w… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_write.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_write.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_write.c,v 1.45 2016-09-23 22:12:18 erouault Exp $ */ +/* $Id: tif_write.c,v 1.46 2016-12-03 21:57:44 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -477,22 +477,22 @@ sample = (uint16)(tile/td->td_stripsperimage); if (!(*tif->tif_preencode)(tif, sample)) return ((tmsize_t)(-1)); - /* swab if needed - note that source buffer will be altered */ - tif->tif_postdecode( tif, (uint8*) data, cc ); - - if (!(*tif->tif_encodetile)(tif, (uint8*) data, cc, sample)) - return ((tmsize_t) -1); - if (!(*tif->tif_postencode)(tif)) - return ((tmsize_t)(-1)); - if (!isFillOrder(tif, td->td_fillorder) && - (tif->tif_flags & TIFF_NOBITREV) == 0) - TIFFReverseBits((uint8*)tif->tif_rawdata, tif->tif_rawcc); - if (tif->tif_rawcc > 0 && !TIFFAppendToStrip(tif, tile, - tif->tif_rawdata, tif->tif_rawcc)) - return ((tmsize_t)(-1)); - tif->tif_rawcc = 0; - tif->tif_rawcp = tif->tif_rawdata; - return (cc); + /* swab if needed - note that source buffer will be altered */ + tif->tif_postdecode( tif, (uint8*) data, cc ); + + if (!(*tif->tif_encodetile)(tif, (uint8*) data, cc, sample)) + return ((tmsize_t) -1); + if (!(*tif->tif_postencode)(tif)) + return ((tmsize_t)(-1)); + if (!isFillOrder(tif, td->td_fillorder) && + (tif->tif_flags & TIFF_NOBITREV) == 0) + TIFFReverseBits((uint8*)tif->tif_rawdata, tif->tif_rawcc); + if (tif->tif_rawcc > 0 && !TIFFAppendToStrip(tif, tile, + tif->tif_rawdata, tif->tif_rawcc)) + return ((tmsize_t)(-1)); + tif->tif_rawcc = 0; + tif->tif_rawcp = tif->tif_rawdata; + return (cc); } /* Modified: trunk/reactos/dll/3rdparty/libtiff/tif_zip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_z… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_zip.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_zip.c [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_zip.c,v 1.36 2016-11-12 16:48:28 erouault Exp $ */ +/* $Id: tif_zip.c,v 1.37 2017-05-10 15:21:16 erouault Exp $ */ /* * Copyright (c) 1995-1997 Sam Leffler @@ -108,7 +108,11 @@ sp->state = 0; } - if (inflateInit(&sp->stream) != Z_OK) { + /* This function can possibly be called several times by */ + /* PredictorSetupDecode() if this function succeeds but */ + /* PredictorSetup() fails */ + if ((sp->state & ZSTATE_INIT_DECODE) == 0 && + inflateInit(&sp->stream) != Z_OK) { TIFFErrorExt(tif->tif_clientdata, module, "%s", SAFE_MSG(sp)); return (0); } else { Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tif_fax3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libtiff/tif_fax3.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libtiff/tif_fax3.h [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tif_fax3.h,v 1.11 2016-01-23 21:20:34 erouault Exp $ */ +/* $Id: tif_fax3.h,v 1.13 2016-12-14 18:36:27 faxguy Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -81,10 +81,12 @@ #define S_MakeUp 11 #define S_EOL 12 +/* WARNING: do not change the layout of this structure as the HylaFAX software */ +/* really depends on it. See http://bugzilla.maptools.org/show_bug.cgi?id=2636 */ typedef struct { /* state table entry */ unsigned char State; /* see above */ unsigned char Width; /* width of code in bits */ - uint16 Param; /* unsigned 16-bit run length in bits */ + uint32 Param; /* unsigned 32-bit run length in bits (holds on 16 bit actually, but cannot be changed. See above warning) */ } TIFFFaxTabEnt; extern const TIFFFaxTabEnt TIFFFaxMainTable[]; Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tiffio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libtiff/tiffio.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libtiff/tiffio.h [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tiffio.h,v 1.92 2016-01-23 21:20:34 erouault Exp $ */ +/* $Id: tiffio.h,v 1.94 2017-01-11 19:02:49 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -295,6 +295,7 @@ */ extern void* _TIFFmalloc(tmsize_t s); +extern void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz); extern void* _TIFFrealloc(void* p, tmsize_t s); extern void _TIFFmemset(void* p, int v, tmsize_t c); extern void _TIFFmemcpy(void* d, const void* s, tmsize_t c); @@ -432,6 +433,8 @@ extern int TIFFReadRGBAStrip(TIFF*, uint32, uint32 * ); extern int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * ); +extern int TIFFReadRGBAStripExt(TIFF*, uint32, uint32 *, int stop_on_error ); +extern int TIFFReadRGBATileExt(TIFF*, uint32, uint32, uint32 *, int stop_on_error ); extern int TIFFRGBAImageOK(TIFF*, char [1024]); extern int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]); extern int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32); Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tiffiop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libtiff/tiffiop.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libtiff/tiffiop.h [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -/* $Id: tiffiop.h,v 1.89 2016-01-23 21:20:34 erouault Exp $ */ +/* $Id: tiffiop.h,v 1.90 2016-12-02 21:56:56 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -250,6 +250,10 @@ #define TIFFhowmany_32(x, y) (((uint32)x < (0xffffffff - (uint32)(y-1))) ? \ ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y))) : \ 0U) +/* Variant of TIFFhowmany_32() that doesn't return 0 if x close to MAXUINT. */ +/* Caution: TIFFhowmany_32_maxuint_compat(x,y)*y might overflow */ +#define TIFFhowmany_32_maxuint_compat(x, y) \ + (((uint32)(x) / (uint32)(y)) + ((((uint32)(x) % (uint32)(y)) != 0) ? 1 : 0)) #define TIFFhowmany8_32(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3) #define TIFFroundup_32(x, y) (TIFFhowmany_32(x,y)*(y)) #define TIFFhowmany_64(x, y) ((((uint64)(x))+(((uint64)(y))-1))/((uint64)(y))) Modified: trunk/reactos/sdk/include/reactos/libs/libtiff/tiffvers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libtiff/tiffvers.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libtiff/tiffvers.h [iso-8859-1] Sun Jun 18 17:50:12 2017 @@ -1,4 +1,4 @@ -#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.7\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." +#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.8\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." /* * This define can be used in code that requires * compilation-related definitions specific to a @@ -6,4 +6,4 @@ * version checking should be done based on the * string returned by TIFFGetVersion. */ -#define TIFFLIB_VERSION 20161119 +#define TIFFLIB_VERSION 20170521

7 years, 3 months

[tfaber] 75100: [MBEDTLS] - Update to version 2.4.2 CORE-13451

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 18 17:25:30 2017 New Revision: 75100 URL: http://svn.reactos.org/svn/reactos?rev=75100&view=rev Log: [MBEDTLS] - Update to version 2.4.2 CORE-13451 Modified: trunk/reactos/dll/3rdparty/mbedtls/base64.c trunk/reactos/dll/3rdparty/mbedtls/bignum.c trunk/reactos/dll/3rdparty/mbedtls/cipher.c trunk/reactos/dll/3rdparty/mbedtls/cmac.c trunk/reactos/dll/3rdparty/mbedtls/ctr_drbg.c trunk/reactos/dll/3rdparty/mbedtls/debug.c trunk/reactos/dll/3rdparty/mbedtls/ecp_curves.c trunk/reactos/dll/3rdparty/mbedtls/md2.c trunk/reactos/dll/3rdparty/mbedtls/net_sockets.c trunk/reactos/dll/3rdparty/mbedtls/pem.c trunk/reactos/dll/3rdparty/mbedtls/pk.c trunk/reactos/dll/3rdparty/mbedtls/pk_wrap.c trunk/reactos/dll/3rdparty/mbedtls/pkparse.c trunk/reactos/dll/3rdparty/mbedtls/platform.c trunk/reactos/dll/3rdparty/mbedtls/ssl_cookie.c trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c trunk/reactos/dll/3rdparty/mbedtls/x509.c trunk/reactos/dll/3rdparty/mbedtls/x509_crl.c trunk/reactos/dll/3rdparty/mbedtls/x509_crt.c trunk/reactos/dll/3rdparty/mbedtls/x509_csr.c trunk/reactos/sdk/include/reactos/libs/mbedtls/cmac.h trunk/reactos/sdk/include/reactos/libs/mbedtls/compat-1.3.h trunk/reactos/sdk/include/reactos/libs/mbedtls/config.h trunk/reactos/sdk/include/reactos/libs/mbedtls/rsa.h trunk/reactos/sdk/include/reactos/libs/mbedtls/ssl.h trunk/reactos/sdk/include/reactos/libs/mbedtls/version.h trunk/reactos/sdk/include/reactos/libs/mbedtls/x509.h Modified: trunk/reactos/dll/3rdparty/mbedtls/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/base6… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/base64.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/base64.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -194,7 +194,11 @@ return( 0 ); } - n = ( ( n * 6 ) + 7 ) >> 3; + /* The following expression is to calculate the following formula without + * risk of integer overflow in n: + * n = ( ( n * 6 ) + 7 ) >> 3; + */ + n = ( 6 * ( n >> 3 ) ) + ( ( 6 * ( n & 0x7 ) + 7 ) >> 3 ); n -= j; if( dst == NULL || dlen < n ) Modified: trunk/reactos/dll/3rdparty/mbedtls/bignum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/bignu… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/bignum.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/bignum.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -536,7 +536,12 @@ n = mbedtls_mpi_bitlen( X ); if( radix >= 4 ) n >>= 1; if( radix >= 16 ) n >>= 1; - n += 3; + /* + * Round up the buffer length to an even value to ensure that there is + * enough room for hexadecimal values that can be represented in an odd + * number of digits. + */ + n += 3 + ( ( n + 1 ) & 1 ); if( buflen < n ) { Modified: trunk/reactos/dll/3rdparty/mbedtls/cipher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ciphe… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/cipher.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/cipher.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -328,9 +328,9 @@ * If there is not enough data for a full block, cache it. */ if( ( ctx->operation == MBEDTLS_DECRYPT && - ilen + ctx->unprocessed_len <= block_size ) || + ilen <= block_size - ctx->unprocessed_len ) || ( ctx->operation == MBEDTLS_ENCRYPT && - ilen + ctx->unprocessed_len < block_size ) ) + ilen < block_size - ctx->unprocessed_len ) ) { memcpy( &( ctx->unprocessed_data[ctx->unprocessed_len] ), input, ilen ); Modified: trunk/reactos/dll/3rdparty/mbedtls/cmac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/cmac.… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/cmac.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/cmac.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -28,7 +28,7 @@ * * - NIST SP 800-38B Recommendation for Block Cipher Modes of Operation: The * CMAC Mode for Authentication - * http://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38b.pdf + * http://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-38b.pdf * * - RFC 4493 - The AES-CMAC Algorithm * https://tools.ietf.org/html/rfc4493 @@ -64,7 +64,7 @@ #if defined(MBEDTLS_SELF_TEST) #include <stdio.h> #define mbedtls_printf printf -#endif /* MBEDTLS_SELF_TEST && MBEDTLS_AES_C || MBEDTLS_DES_C */ +#endif /* MBEDTLS_SELF_TEST */ #endif /* MBEDTLS_PLATFORM_C */ /* Implementation that should never be optimized out by the compiler */ @@ -82,7 +82,7 @@ * with R_64 = 0x1B and R_128 = 0x87 * * Input and output MUST NOT point to the same buffer - * Block size must be 8 byes or 16 bytes - the block sizes for DES and AES. + * Block size must be 8 bytes or 16 bytes - the block sizes for DES and AES. */ static int cmac_multiply_by_u( unsigned char *output, const unsigned char *input, @@ -107,7 +107,7 @@ return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA ); } - for( i = blocksize - 1; i >= 0; i-- ) + for( i = (int)blocksize - 1; i >= 0; i-- ) { output[i] = input[i] << 1 | overflow; overflow = input[i] >> 7; @@ -211,7 +211,7 @@ if( ctx == NULL || ctx->cipher_info == NULL || key == NULL ) return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA ); - if( ( retval = mbedtls_cipher_setkey( ctx, key, keybits, + if( ( retval = mbedtls_cipher_setkey( ctx, key, (int)keybits, MBEDTLS_ENCRYPT ) ) != 0 ) return( retval ); @@ -246,8 +246,8 @@ { mbedtls_cmac_context_t* cmac_ctx; unsigned char *state; - int n, j, ret = 0; - size_t olen, block_size; + int ret = 0; + size_t n, j, olen, block_size; if( ctx == NULL || ctx->cipher_info == NULL || input == NULL || ctx->cmac_ctx == NULL ) @@ -282,8 +282,9 @@ /* n is the number of blocks including any final partial block */ n = ( ilen + block_size - 1 ) / block_size; - /* Iterate across the input data in block sized chunks */ - for( j = 0; j < n - 1; j++ ) + /* Iterate across the input data in block sized chunks, excluding any + * final partial or complete block */ + for( j = 1; j < n; j++ ) { cmac_xor_block( state, input, state, block_size ); @@ -471,8 +472,9 @@ #if defined(MBEDTLS_SELF_TEST) /* - * CMAC test data from SP800-38B Appendix D.1 (corrected) - * http://csrc.nist.gov/publications/nistpubs/800-38B/Updated_CMAC_Examples.pdf + * CMAC test data for SP800-38B + * http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/AES_CMAC.pdf + * http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/TDES_CMAC.pdf * * AES-CMAC-PRF-128 test data from RFC 4615 * https://tools.ietf.org/html/rfc4615#page-4 @@ -484,128 +486,148 @@ #if defined(MBEDTLS_AES_C) || defined(MBEDTLS_DES_C) /* All CMAC test inputs are truncated from the same 64 byte buffer. */ static const unsigned char test_message[] = { - 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, - 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, - 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, - 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, - 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, - 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, - 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, - 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 + /* PT */ + 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 }; #endif /* MBEDTLS_AES_C || MBEDTLS_DES_C */ #if defined(MBEDTLS_AES_C) /* Truncation point of message for AES CMAC tests */ static const unsigned int aes_message_lengths[NB_CMAC_TESTS_PER_KEY] = { + /* Mlen */ 0, 16, - 40, + 20, 64 }; -/* AES 128 CMAC Test Data */ +/* CMAC-AES128 Test Data */ static const unsigned char aes_128_key[16] = { - 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, - 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c + 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, + 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c }; static const unsigned char aes_128_subkeys[2][MBEDTLS_AES_BLOCK_SIZE] = { { - 0xfb, 0xee, 0xd6, 0x18, 0x35, 0x71, 0x33, 0x66, - 0x7c, 0x85, 0xe0, 0x8f, 0x72, 0x36, 0xa8, 0xde - }, - { - 0xf7, 0xdd, 0xac, 0x30, 0x6a, 0xe2, 0x66, 0xcc, - 0xf9, 0x0b, 0xc1, 0x1e, 0xe4, 0x6d, 0x51, 0x3b + /* K1 */ + 0xfb, 0xee, 0xd6, 0x18, 0x35, 0x71, 0x33, 0x66, + 0x7c, 0x85, 0xe0, 0x8f, 0x72, 0x36, 0xa8, 0xde + }, + { + /* K2 */ + 0xf7, 0xdd, 0xac, 0x30, 0x6a, 0xe2, 0x66, 0xcc, + 0xf9, 0x0b, 0xc1, 0x1e, 0xe4, 0x6d, 0x51, 0x3b } }; static const unsigned char aes_128_expected_result[NB_CMAC_TESTS_PER_KEY][MBEDTLS_AES_BLOCK_SIZE] = { { - 0xbb, 0x1d, 0x69, 0x29, 0xe9, 0x59, 0x37, 0x28, - 0x7f, 0xa3, 0x7d, 0x12, 0x9b, 0x75, 0x67, 0x46 - }, - { - 0x07, 0x0a, 0x16, 0xb4, 0x6b, 0x4d, 0x41, 0x44, - 0xf7, 0x9b, 0xdd, 0x9d, 0xd0, 0x4a, 0x28, 0x7c - }, - { - 0xdf, 0xa6, 0x67, 0x47, 0xde, 0x9a, 0xe6, 0x30, - 0x30, 0xca, 0x32, 0x61, 0x14, 0x97, 0xc8, 0x27 - }, - { - 0x51, 0xf0, 0xbe, 0xbf, 0x7e, 0x3b, 0x9d, 0x92, - 0xfc, 0x49, 0x74, 0x17, 0x79, 0x36, 0x3c, 0xfe - } -}; - -/* AES 192 CMAC Test Data */ + /* Example #1 */ + 0xbb, 0x1d, 0x69, 0x29, 0xe9, 0x59, 0x37, 0x28, + 0x7f, 0xa3, 0x7d, 0x12, 0x9b, 0x75, 0x67, 0x46 + }, + { + /* Example #2 */ + 0x07, 0x0a, 0x16, 0xb4, 0x6b, 0x4d, 0x41, 0x44, + 0xf7, 0x9b, 0xdd, 0x9d, 0xd0, 0x4a, 0x28, 0x7c + }, + { + /* Example #3 */ + 0x7d, 0x85, 0x44, 0x9e, 0xa6, 0xea, 0x19, 0xc8, + 0x23, 0xa7, 0xbf, 0x78, 0x83, 0x7d, 0xfa, 0xde + }, + { + /* Example #4 */ + 0x51, 0xf0, 0xbe, 0xbf, 0x7e, 0x3b, 0x9d, 0x92, + 0xfc, 0x49, 0x74, 0x17, 0x79, 0x36, 0x3c, 0xfe + } +}; + +/* CMAC-AES192 Test Data */ static const unsigned char aes_192_key[24] = { - 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, - 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, - 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b + 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, + 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, + 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b }; static const unsigned char aes_192_subkeys[2][MBEDTLS_AES_BLOCK_SIZE] = { { - 0x44, 0x8a, 0x5b, 0x1c, 0x93, 0x51, 0x4b, 0x27, - 0x3e, 0xe6, 0x43, 0x9d, 0xd4, 0xda, 0xa2, 0x96 - }, - { - 0x89, 0x14, 0xb6, 0x39, 0x26, 0xa2, 0x96, 0x4e, - 0x7d, 0xcc, 0x87, 0x3b, 0xa9, 0xb5, 0x45, 0x2c + /* K1 */ + 0x44, 0x8a, 0x5b, 0x1c, 0x93, 0x51, 0x4b, 0x27, + 0x3e, 0xe6, 0x43, 0x9d, 0xd4, 0xda, 0xa2, 0x96 + }, + { + /* K2 */ + 0x89, 0x14, 0xb6, 0x39, 0x26, 0xa2, 0x96, 0x4e, + 0x7d, 0xcc, 0x87, 0x3b, 0xa9, 0xb5, 0x45, 0x2c } }; static const unsigned char aes_192_expected_result[NB_CMAC_TESTS_PER_KEY][MBEDTLS_AES_BLOCK_SIZE] = { { - 0xd1, 0x7d, 0xdf, 0x46, 0xad, 0xaa, 0xcd, 0xe5, - 0x31, 0xca, 0xc4, 0x83, 0xde, 0x7a, 0x93, 0x67 - }, - { - 0x9e, 0x99, 0xa7, 0xbf, 0x31, 0xe7, 0x10, 0x90, - 0x06, 0x62, 0xf6, 0x5e, 0x61, 0x7c, 0x51, 0x84 - }, - { - 0x8a, 0x1d, 0xe5, 0xbe, 0x2e, 0xb3, 0x1a, 0xad, - 0x08, 0x9a, 0x82, 0xe6, 0xee, 0x90, 0x8b, 0x0e - }, - { - 0xa1, 0xd5, 0xdf, 0x0e, 0xed, 0x79, 0x0f, 0x79, - 0x4d, 0x77, 0x58, 0x96, 0x59, 0xf3, 0x9a, 0x11 - } -}; - -/* AES 256 CMAC Test Data */ + /* Example #1 */ + 0xd1, 0x7d, 0xdf, 0x46, 0xad, 0xaa, 0xcd, 0xe5, + 0x31, 0xca, 0xc4, 0x83, 0xde, 0x7a, 0x93, 0x67 + }, + { + /* Example #2 */ + 0x9e, 0x99, 0xa7, 0xbf, 0x31, 0xe7, 0x10, 0x90, + 0x06, 0x62, 0xf6, 0x5e, 0x61, 0x7c, 0x51, 0x84 + }, + { + /* Example #3 */ + 0x3d, 0x75, 0xc1, 0x94, 0xed, 0x96, 0x07, 0x04, + 0x44, 0xa9, 0xfa, 0x7e, 0xc7, 0x40, 0xec, 0xf8 + }, + { + /* Example #4 */ + 0xa1, 0xd5, 0xdf, 0x0e, 0xed, 0x79, 0x0f, 0x79, + 0x4d, 0x77, 0x58, 0x96, 0x59, 0xf3, 0x9a, 0x11 + } +}; + +/* CMAC-AES256 Test Data */ static const unsigned char aes_256_key[32] = { - 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, - 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, - 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, - 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4 + 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, + 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, + 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, + 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4 }; static const unsigned char aes_256_subkeys[2][MBEDTLS_AES_BLOCK_SIZE] = { { - 0xca, 0xd1, 0xed, 0x03, 0x29, 0x9e, 0xed, 0xac, - 0x2e, 0x9a, 0x99, 0x80, 0x86, 0x21, 0x50, 0x2f - }, - { - 0x95, 0xa3, 0xda, 0x06, 0x53, 0x3d, 0xdb, 0x58, - 0x5d, 0x35, 0x33, 0x01, 0x0c, 0x42, 0xa0, 0xd9 + /* K1 */ + 0xca, 0xd1, 0xed, 0x03, 0x29, 0x9e, 0xed, 0xac, + 0x2e, 0x9a, 0x99, 0x80, 0x86, 0x21, 0x50, 0x2f + }, + { + /* K2 */ + 0x95, 0xa3, 0xda, 0x06, 0x53, 0x3d, 0xdb, 0x58, + 0x5d, 0x35, 0x33, 0x01, 0x0c, 0x42, 0xa0, 0xd9 } }; static const unsigned char aes_256_expected_result[NB_CMAC_TESTS_PER_KEY][MBEDTLS_AES_BLOCK_SIZE] = { { - 0x02, 0x89, 0x62, 0xf6, 0x1b, 0x7b, 0xf8, 0x9e, - 0xfc, 0x6b, 0x55, 0x1f, 0x46, 0x67, 0xd9, 0x83 - }, - { - 0x28, 0xa7, 0x02, 0x3f, 0x45, 0x2e, 0x8f, 0x82, - 0xbd, 0x4b, 0xf2, 0x8d, 0x8c, 0x37, 0xc3, 0x5c - }, - { - 0xaa, 0xf3, 0xd8, 0xf1, 0xde, 0x56, 0x40, 0xc2, - 0x32, 0xf5, 0xb1, 0x69, 0xb9, 0xc9, 0x11, 0xe6 - }, - { - 0xe1, 0x99, 0x21, 0x90, 0x54, 0x9f, 0x6e, 0xd5, - 0x69, 0x6a, 0x2c, 0x05, 0x6c, 0x31, 0x54, 0x10 + /* Example #1 */ + 0x02, 0x89, 0x62, 0xf6, 0x1b, 0x7b, 0xf8, 0x9e, + 0xfc, 0x6b, 0x55, 0x1f, 0x46, 0x67, 0xd9, 0x83 + }, + { + /* Example #2 */ + 0x28, 0xa7, 0x02, 0x3f, 0x45, 0x2e, 0x8f, 0x82, + 0xbd, 0x4b, 0xf2, 0x8d, 0x8c, 0x37, 0xc3, 0x5c + }, + { + /* Example #3 */ + 0x15, 0x67, 0x27, 0xdc, 0x08, 0x78, 0x94, 0x4a, + 0x02, 0x3c, 0x1f, 0xe0, 0x3b, 0xad, 0x6d, 0x93 + }, + { + /* Example #4 */ + 0xe1, 0x99, 0x21, 0x90, 0x54, 0x9f, 0x6e, 0xd5, + 0x69, 0x6a, 0x2c, 0x05, 0x6c, 0x31, 0x54, 0x10 } }; #endif /* MBEDTLS_AES_C */ @@ -614,66 +636,84 @@ /* Truncation point of message for 3DES CMAC tests */ static const unsigned int des3_message_lengths[NB_CMAC_TESTS_PER_KEY] = { 0, - 8, + 16, 20, 32 }; -/* 3DES 2 Key CMAC Test Data */ +/* CMAC-TDES (Generation) - 2 Key Test Data */ static const unsigned char des3_2key_key[24] = { - 0x4c, 0xf1, 0x51, 0x34, 0xa2, 0x85, 0x0d, 0xd5, - 0x8a, 0x3d, 0x10, 0xba, 0x80, 0x57, 0x0d, 0x38, - 0x4c, 0xf1, 0x51, 0x34, 0xa2, 0x85, 0x0d, 0xd5 + /* Key1 */ + 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, + /* Key2 */ + 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xEF, 0x01, + /* Key3 */ + 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }; static const unsigned char des3_2key_subkeys[2][8] = { { - 0x8e, 0xcf, 0x37, 0x3e, 0xd7, 0x1a, 0xfa, 0xef - }, - { - 0x1d, 0x9e, 0x6e, 0x7d, 0xae, 0x35, 0xf5, 0xc5 + /* K1 */ + 0x0d, 0xd2, 0xcb, 0x7a, 0x3d, 0x88, 0x88, 0xd9 + }, + { + /* K2 */ + 0x1b, 0xa5, 0x96, 0xf4, 0x7b, 0x11, 0x11, 0xb2 } }; static const unsigned char des3_2key_expected_result[NB_CMAC_TESTS_PER_KEY][MBEDTLS_DES3_BLOCK_SIZE] = { { - 0xbd, 0x2e, 0xbf, 0x9a, 0x3b, 0xa0, 0x03, 0x61 - }, - { - 0x4f, 0xf2, 0xab, 0x81, 0x3c, 0x53, 0xce, 0x83 - }, - { - 0x62, 0xdd, 0x1b, 0x47, 0x19, 0x02, 0xbd, 0x4e - }, - { - 0x31, 0xb1, 0xe4, 0x31, 0xda, 0xbc, 0x4e, 0xb8 - } -}; - -/* 3DES 3 Key CMAC Test Data */ + /* Sample #1 */ + 0x79, 0xce, 0x52, 0xa7, 0xf7, 0x86, 0xa9, 0x60 + }, + { + /* Sample #2 */ + 0xcc, 0x18, 0xa0, 0xb7, 0x9a, 0xf2, 0x41, 0x3b + }, + { + /* Sample #3 */ + 0xc0, 0x6d, 0x37, 0x7e, 0xcd, 0x10, 0x19, 0x69 + }, + { + /* Sample #4 */ + 0x9c, 0xd3, 0x35, 0x80, 0xf9, 0xb6, 0x4d, 0xfb + } +}; + +/* CMAC-TDES (Generation) - 3 Key Test Data */ static const unsigned char des3_3key_key[24] = { - 0x8a, 0xa8, 0x3b, 0xf8, 0xcb, 0xda, 0x10, 0x62, - 0x0b, 0xc1, 0xbf, 0x19, 0xfb, 0xb6, 0xcd, 0x58, - 0xbc, 0x31, 0x3d, 0x4a, 0x37, 0x1c, 0xa8, 0xb5 + /* Key1 */ + 0x01, 0x23, 0x45, 0x67, 0x89, 0xaa, 0xcd, 0xef, + /* Key2 */ + 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x01, + /* Key3 */ + 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x01, 0x23 }; static const unsigned char des3_3key_subkeys[2][8] = { { - 0x91, 0x98, 0xe9, 0xd3, 0x14, 0xe6, 0x53, 0x5f - }, - { - 0x23, 0x31, 0xd3, 0xa6, 0x29, 0xcc, 0xa6, 0xa5 + /* K1 */ + 0x9d, 0x74, 0xe7, 0x39, 0x33, 0x17, 0x96, 0xc0 + }, + { + /* K2 */ + 0x3a, 0xe9, 0xce, 0x72, 0x66, 0x2f, 0x2d, 0x9b } }; static const unsigned char des3_3key_expected_result[NB_CMAC_TESTS_PER_KEY][MBEDTLS_DES3_BLOCK_SIZE] = { { - 0xb7, 0xa6, 0x88, 0xe1, 0x22, 0xff, 0xaf, 0x95 - }, - { - 0x8e, 0x8f, 0x29, 0x31, 0x36, 0x28, 0x37, 0x97 - }, - { - 0x74, 0x3d, 0xdb, 0xe0, 0xce, 0x2d, 0xc2, 0xed - }, - { - 0x33, 0xe6, 0xb1, 0x09, 0x24, 0x00, 0xea, 0xe5 + /* Sample #1 */ + 0x7d, 0xb0, 0xd3, 0x7d, 0xf9, 0x36, 0xc5, 0x50 + }, + { + /* Sample #2 */ + 0x30, 0x23, 0x9c, 0xf1, 0xf5, 0x2e, 0x66, 0x09 + }, + { + /* Sample #3 */ + 0x6c, 0x9f, 0x3e, 0xe4, 0x92, 0x3f, 0x6b, 0xe2 + }, + { + /* Sample #4 */ + 0x99, 0x42, 0x9b, 0xd0, 0xbF, 0x79, 0x04, 0xe5 } }; @@ -682,8 +722,9 @@ #if defined(MBEDTLS_AES_C) /* AES AES-CMAC-PRF-128 Test Data */ static const unsigned char PRFK[] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + /* Key */ + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0xed, 0xcb }; @@ -694,25 +735,25 @@ 10 }; -/* PRF M */ +/* Message */ static const unsigned char PRFM[] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13 }; static const unsigned char PRFT[NB_PRF_TESTS][16] = { { - 0x84, 0xa3, 0x48, 0xa4, 0xa4, 0x5d, 0x23, 0x5b, - 0xab, 0xff, 0xfc, 0x0d, 0x2b, 0x4d, 0xa0, 0x9a - }, - { - 0x98, 0x0a, 0xe8, 0x7b, 0x5f, 0x4c, 0x9c, 0x52, - 0x14, 0xf5, 0xb6, 0xa8, 0x45, 0x5e, 0x4c, 0x2d - }, - { - 0x29, 0x0d, 0x9e, 0x11, 0x2e, 0xdb, 0x09, 0xee, - 0x14, 0x1f, 0xcf, 0x64, 0xc0, 0xb7, 0x2f, 0x3d + 0x84, 0xa3, 0x48, 0xa4, 0xa4, 0x5d, 0x23, 0x5b, + 0xab, 0xff, 0xfc, 0x0d, 0x2b, 0x4d, 0xa0, 0x9a + }, + { + 0x98, 0x0a, 0xe8, 0x7b, 0x5f, 0x4c, 0x9c, 0x52, + 0x14, 0xf5, 0xb6, 0xa8, 0x45, 0x5e, 0x4c, 0x2d + }, + { + 0x29, 0x0d, 0x9e, 0x11, 0x2e, 0xdb, 0x09, 0xee, + 0x14, 0x1f, 0xcf, 0x64, 0xc0, 0xb7, 0x2f, 0x3d } }; #endif /* MBEDTLS_AES_C */ Modified: trunk/reactos/dll/3rdparty/mbedtls/ctr_drbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ctr_d… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/ctr_drbg.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/ctr_drbg.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -292,7 +292,8 @@ unsigned char seed[MBEDTLS_CTR_DRBG_MAX_SEED_INPUT]; size_t seedlen = 0; - if( ctx->entropy_len + len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT ) + if( ctx->entropy_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT || + len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT - ctx->entropy_len ) return( MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG ); memset( seed, 0, MBEDTLS_CTR_DRBG_MAX_SEED_INPUT ); Modified: trunk/reactos/dll/3rdparty/mbedtls/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/debug… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/debug.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/debug.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -73,7 +73,7 @@ */ #if defined(MBEDTLS_THREADING_C) char idstr[20 + DEBUG_BUF_SIZE]; /* 0x + 16 nibbles + ': ' */ - mbedtls_snprintf( idstr, sizeof( idstr ), "%p: %s", ssl, str ); + mbedtls_snprintf( idstr, sizeof( idstr ), "%p: %s", (void*)ssl, str ); ssl->conf->f_dbg( ssl->conf->p_dbg, level, file, line, idstr ); #else ssl->conf->f_dbg( ssl->conf->p_dbg, level, file, line, str ); Modified: trunk/reactos/dll/3rdparty/mbedtls/ecp_curves.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ecp_c… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/ecp_curves.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/ecp_curves.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -1215,7 +1215,7 @@ int ret; size_t i; mbedtls_mpi M, R; - mbedtls_mpi_uint Mp[P_KOBLITZ_MAX + P_KOBLITZ_R]; + mbedtls_mpi_uint Mp[P_KOBLITZ_MAX + P_KOBLITZ_R + 1]; if( N->n < p_limbs ) return( 0 ); @@ -1237,7 +1237,7 @@ memcpy( Mp, N->p + p_limbs - adjust, M.n * sizeof( mbedtls_mpi_uint ) ); if( shift != 0 ) MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, shift ) ); - M.n += R.n - adjust; /* Make room for multiplication by R */ + M.n += R.n; /* Make room for multiplication by R */ /* N = A0 */ if( mask != 0 ) @@ -1259,7 +1259,7 @@ memcpy( Mp, N->p + p_limbs - adjust, M.n * sizeof( mbedtls_mpi_uint ) ); if( shift != 0 ) MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, shift ) ); - M.n += R.n - adjust; /* Make room for multiplication by R */ + M.n += R.n; /* Make room for multiplication by R */ /* N = A0 */ if( mask != 0 ) Modified: trunk/reactos/dll/3rdparty/mbedtls/md2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/md2.c… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/md2.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/md2.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -160,7 +160,7 @@ while( ilen > 0 ) { - if( ctx->left + ilen > 16 ) + if( ilen > 16 - ctx->left ) fill = 16 - ctx->left; else fill = ilen; Modified: trunk/reactos/dll/3rdparty/mbedtls/net_sockets.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/net_s… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/net_sockets.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/net_sockets.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -135,7 +135,8 @@ /* * Initiate a TCP connection with host:port and the given protocol */ -int mbedtls_net_connect( mbedtls_net_context *ctx, const char *host, const char *port, int proto ) +int mbedtls_net_connect( mbedtls_net_context *ctx, const char *host, + const char *port, int proto ) { int ret; struct addrinfo hints, *addr_list, *cur; @@ -240,7 +241,7 @@ } } - /* I we ever get there, it's a success */ + /* Bind was successful */ ret = 0; break; } @@ -324,7 +325,7 @@ { /* TCP: actual accept() */ ret = client_ctx->fd = (int) accept( bind_ctx->fd, - (struct sockaddr *) &client_addr, &n ); + (struct sockaddr *) &client_addr, &n ); } else { Modified: trunk/reactos/dll/3rdparty/mbedtls/pem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pem.c… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/pem.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/pem.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -46,12 +46,12 @@ #define mbedtls_free free #endif +#if defined(MBEDTLS_PEM_PARSE_C) /* Implementation that should never be optimized out by the compiler */ static void mbedtls_zeroize( void *v, size_t n ) { volatile unsigned char *p = v; while( n-- ) *p++ = 0; } -#if defined(MBEDTLS_PEM_PARSE_C) void mbedtls_pem_init( mbedtls_pem_context *ctx ) { memset( ctx, 0, sizeof( mbedtls_pem_context ) ); @@ -251,7 +251,7 @@ enc = 0; - if( memcmp( s1, "Proc-Type: 4,ENCRYPTED", 22 ) == 0 ) + if( s2 - s1 >= 22 && memcmp( s1, "Proc-Type: 4,ENCRYPTED", 22 ) == 0 ) { #if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) && \ ( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) ) @@ -264,22 +264,22 @@ #if defined(MBEDTLS_DES_C) - if( memcmp( s1, "DEK-Info: DES-EDE3-CBC,", 23 ) == 0 ) + if( s2 - s1 >= 23 && memcmp( s1, "DEK-Info: DES-EDE3-CBC,", 23 ) == 0 ) { enc_alg = MBEDTLS_CIPHER_DES_EDE3_CBC; s1 += 23; - if( pem_get_iv( s1, pem_iv, 8 ) != 0 ) + if( s2 - s1 < 16 || pem_get_iv( s1, pem_iv, 8 ) != 0 ) return( MBEDTLS_ERR_PEM_INVALID_ENC_IV ); s1 += 16; } - else if( memcmp( s1, "DEK-Info: DES-CBC,", 18 ) == 0 ) + else if( s2 - s1 >= 18 && memcmp( s1, "DEK-Info: DES-CBC,", 18 ) == 0 ) { enc_alg = MBEDTLS_CIPHER_DES_CBC; s1 += 18; - if( pem_get_iv( s1, pem_iv, 8) != 0 ) + if( s2 - s1 < 16 || pem_get_iv( s1, pem_iv, 8) != 0 ) return( MBEDTLS_ERR_PEM_INVALID_ENC_IV ); s1 += 16; @@ -287,9 +287,11 @@ #endif /* MBEDTLS_DES_C */ #if defined(MBEDTLS_AES_C) - if( memcmp( s1, "DEK-Info: AES-", 14 ) == 0 ) + if( s2 - s1 >= 14 && memcmp( s1, "DEK-Info: AES-", 14 ) == 0 ) { - if( memcmp( s1, "DEK-Info: AES-128-CBC,", 22 ) == 0 ) + if( s2 - s1 < 22 ) + return( MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG ); + else if( memcmp( s1, "DEK-Info: AES-128-CBC,", 22 ) == 0 ) enc_alg = MBEDTLS_CIPHER_AES_128_CBC; else if( memcmp( s1, "DEK-Info: AES-192-CBC,", 22 ) == 0 ) enc_alg = MBEDTLS_CIPHER_AES_192_CBC; @@ -299,7 +301,7 @@ return( MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG ); s1 += 22; - if( pem_get_iv( s1, pem_iv, 16 ) != 0 ) + if( s2 - s1 < 32 || pem_get_iv( s1, pem_iv, 16 ) != 0 ) return( MBEDTLS_ERR_PEM_INVALID_ENC_IV ); s1 += 32; @@ -318,7 +320,7 @@ ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */ } - if( s1 == s2 ) + if( s1 >= s2 ) return( MBEDTLS_ERR_PEM_INVALID_DATA ); ret = mbedtls_base64_decode( NULL, 0, &len, s1, s2 - s1 ); Modified: trunk/reactos/dll/3rdparty/mbedtls/pk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pk.c?… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/pk.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/pk.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -31,6 +31,8 @@ #include "mbedtls/pk.h" #include "mbedtls/pk_internal.h" +#include "mbedtls/bignum.h" + #if defined(MBEDTLS_RSA_C) #include "mbedtls/rsa.h" #endif @@ -40,6 +42,8 @@ #if defined(MBEDTLS_ECDSA_C) #include "mbedtls/ecdsa.h" #endif + +#include <limits.h> /* Implementation that should never be optimized out by the compiler */ static void mbedtls_zeroize( void *v, size_t n ) { @@ -210,6 +214,11 @@ #if defined(MBEDTLS_RSA_C) && defined(MBEDTLS_PKCS1_V21) int ret; const mbedtls_pk_rsassa_pss_options *pss_opts; + +#if defined(MBEDTLS_HAVE_INT64) + if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len ) + return( MBEDTLS_ERR_PK_BAD_INPUT_DATA ); +#endif /* MBEDTLS_HAVE_INT64 */ if( options == NULL ) return( MBEDTLS_ERR_PK_BAD_INPUT_DATA ); @@ -234,7 +243,7 @@ return( 0 ); #else return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE ); -#endif +#endif /* MBEDTLS_RSA_C && MBEDTLS_PKCS1_V21 */ } /* General case: no options */ Modified: trunk/reactos/dll/3rdparty/mbedtls/pk_wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pk_wr… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/pk_wrap.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/pk_wrap.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -32,6 +32,7 @@ /* Even if RSA not activated, for the sake of RSA-alt */ #include "mbedtls/rsa.h" +#include "mbedtls/bignum.h" #include <string.h> @@ -51,6 +52,8 @@ #define mbedtls_free free #endif +#include <limits.h> + #if defined(MBEDTLS_PK_RSA_ALT_SUPPORT) /* Implementation that should never be optimized out by the compiler */ static void mbedtls_zeroize( void *v, size_t n ) { @@ -76,6 +79,11 @@ { int ret; +#if defined(MBEDTLS_HAVE_INT64) + if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len ) + return( MBEDTLS_ERR_PK_BAD_INPUT_DATA ); +#endif /* MBEDTLS_HAVE_INT64 */ + if( sig_len < ((mbedtls_rsa_context *) ctx)->len ) return( MBEDTLS_ERR_RSA_VERIFY_FAILED ); @@ -95,6 +103,11 @@ unsigned char *sig, size_t *sig_len, int (*f_rng)(void *, unsigned char *, size_t), void *p_rng ) { +#if defined(MBEDTLS_HAVE_INT64) + if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len ) + return( MBEDTLS_ERR_PK_BAD_INPUT_DATA ); +#endif /* MBEDTLS_HAVE_INT64 */ + *sig_len = ((mbedtls_rsa_context *) ctx)->len; return( mbedtls_rsa_pkcs1_sign( (mbedtls_rsa_context *) ctx, f_rng, p_rng, MBEDTLS_RSA_PRIVATE, @@ -404,6 +417,11 @@ { mbedtls_rsa_alt_context *rsa_alt = (mbedtls_rsa_alt_context *) ctx; +#if defined(MBEDTLS_HAVE_INT64) + if( UINT_MAX < hash_len ) + return( MBEDTLS_ERR_PK_BAD_INPUT_DATA ); +#endif /* MBEDTLS_HAVE_INT64 */ + *sig_len = rsa_alt->key_len_func( rsa_alt->key ); return( rsa_alt->sign_func( rsa_alt->key, f_rng, p_rng, MBEDTLS_RSA_PRIVATE, Modified: trunk/reactos/dll/3rdparty/mbedtls/pkparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pkpar… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/pkparse.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/pkparse.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -1189,12 +1189,12 @@ #endif /* MBEDTLS_PEM_PARSE_C */ /* - * At this point we only know it's not a PEM formatted key. Could be any - * of the known DER encoded private key formats - * - * We try the different DER format parsers to see if one passes without - * error - */ + * At this point we only know it's not a PEM formatted key. Could be any + * of the known DER encoded private key formats + * + * We try the different DER format parsers to see if one passes without + * error + */ #if defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C) if( ( ret = pk_parse_key_pkcs8_encrypted_der( pk, key, keylen, pwd, pwdlen ) ) == 0 ) Modified: trunk/reactos/dll/3rdparty/mbedtls/platform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/platf… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/platform.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/platform.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -239,7 +239,7 @@ } fclose( file ); - return( n ); + return( (int)n ); } int mbedtls_platform_std_nv_seed_write( unsigned char *buf, size_t buf_len ) @@ -257,7 +257,7 @@ } fclose( file ); - return( n ); + return( (int)n ); } #endif /* MBEDTLS_PLATFORM_NO_STD_FUNCTIONS */ Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_c… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/ssl_cookie.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/ssl_cookie.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -100,7 +100,7 @@ mbedtls_md_free( &ctx->hmac_ctx ); #if defined(MBEDTLS_THREADING_C) - mbedtls_mutex_init( &ctx->mutex ); + mbedtls_mutex_free( &ctx->mutex ); #endif mbedtls_zeroize( ctx, sizeof( mbedtls_ssl_cookie_ctx ) ); Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_t… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -3430,7 +3430,7 @@ if( ret == MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED ) { - /* Dont check write errors as we can't do anything here. + /* Don't check write errors as we can't do anything here. * If the error is permanent we'll catch it later, * if it's not, then hopefully it'll work next time. */ (void) ssl->f_send( ssl->p_bio, ssl->out_buf, len ); @@ -6008,8 +6008,9 @@ const char **p; /* - * "Empty strings MUST NOT be included and byte strings MUST NOT be - * truncated". Check lengths now rather than later. + * RFC 7301 3.1: "Empty strings MUST NOT be included and byte strings + * MUST NOT be truncated." + * We check lengths now rather than later. */ tot_len = 0; for( p = protos; *p != NULL; p++ ) @@ -6483,6 +6484,10 @@ */ static int ssl_check_ctr_renegotiate( mbedtls_ssl_context *ssl ) { + size_t ep_len = ssl_ep_len( ssl ); + int in_ctr_cmp; + int out_ctr_cmp; + if( ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER || ssl->renego_status == MBEDTLS_SSL_RENEGOTIATION_PENDING || ssl->conf->disable_renegotiation == MBEDTLS_SSL_RENEGOTIATION_DISABLED ) @@ -6490,8 +6495,12 @@ return( 0 ); } - if( memcmp( ssl->in_ctr, ssl->conf->renego_period, 8 ) <= 0 && - memcmp( ssl->out_ctr, ssl->conf->renego_period, 8 ) <= 0 ) + in_ctr_cmp = memcmp( ssl->in_ctr + ep_len, + ssl->conf->renego_period + ep_len, 8 - ep_len ); + out_ctr_cmp = memcmp( ssl->out_ctr + ep_len, + ssl->conf->renego_period + ep_len, 8 - ep_len ); + + if( in_ctr_cmp <= 0 && out_ctr_cmp <= 0 ) { return( 0 ); } @@ -7232,8 +7241,8 @@ #if defined(MBEDTLS_SSL_RENEGOTIATION) conf->renego_max_records = MBEDTLS_SSL_RENEGO_MAX_RECORDS_DEFAULT; - memset( conf->renego_period, 0xFF, 7 ); - conf->renego_period[7] = 0x00; + memset( conf->renego_period, 0x00, 2 ); + memset( conf->renego_period + 2, 0xFF, 6 ); #endif #if defined(MBEDTLS_DHM_C) && defined(MBEDTLS_SSL_SRV_C) @@ -7587,7 +7596,7 @@ * and, for DTLS, to/from TLS equivalent. * * For TLS this is the identity. - * For DTLS, use one complement (v -> 255 - v, and then map as follows: + * For DTLS, use 1's complement (v -> 255 - v, and then map as follows: * 1.0 <-> 3.2 (DTLS 1.0 is based on TLS 1.1) * 1.x <-> 3.x+1 for x != 0 (DTLS 1.2 based on TLS 1.2) */ @@ -7646,8 +7655,7 @@ #if defined(MBEDTLS_SSL_PROTO_TLS1) || defined(MBEDTLS_SSL_PROTO_TLS1_1) #if defined(MBEDTLS_MD5_C) case MBEDTLS_SSL_HASH_MD5: - ssl->handshake->calc_verify = ssl_calc_verify_tls; - break; + return MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH; #endif #if defined(MBEDTLS_SHA1_C) case MBEDTLS_SSL_HASH_SHA1: Modified: trunk/reactos/dll/3rdparty/mbedtls/x509.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509.… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/x509.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/x509.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -482,14 +482,20 @@ } } -static int x509_parse_int(unsigned char **p, unsigned n, int *res){ +static int x509_parse_int( unsigned char **p, size_t n, int *res ) +{ *res = 0; - for( ; n > 0; --n ){ - if( ( **p < '0') || ( **p > '9' ) ) return MBEDTLS_ERR_X509_INVALID_DATE; + + for( ; n > 0; --n ) + { + if( ( **p < '0') || ( **p > '9' ) ) + return ( MBEDTLS_ERR_X509_INVALID_DATE ); + *res *= 10; - *res += (*(*p)++ - '0'); - } - return 0; + *res += ( *(*p)++ - '0' ); + } + + return( 0 ); } static int x509_date_is_valid(const mbedtls_x509_time *time) @@ -520,6 +526,70 @@ } /* + * Parse an ASN1_UTC_TIME (yearlen=2) or ASN1_GENERALIZED_TIME (yearlen=4) + * field. + */ +static int x509_parse_time( unsigned char **p, size_t len, size_t yearlen, + mbedtls_x509_time *time ) +{ + int ret; + + /* + * Minimum length is 10 or 12 depending on yearlen + */ + if ( len < yearlen + 8 ) + return ( MBEDTLS_ERR_X509_INVALID_DATE ); + len -= yearlen + 8; + + /* + * Parse year, month, day, hour, minute + */ + CHECK( x509_parse_int( p, yearlen, &time->year ) ); + if ( 2 == yearlen ) + { + if ( time->year < 50 ) + time->year += 100; + + time->year += 1900; + } + + CHECK( x509_parse_int( p, 2, &time->mon ) ); + CHECK( x509_parse_int( p, 2, &time->day ) ); + CHECK( x509_parse_int( p, 2, &time->hour ) ); + CHECK( x509_parse_int( p, 2, &time->min ) ); + + /* + * Parse seconds if present + */ + if ( len >= 2 ) + { + CHECK( x509_parse_int( p, 2, &time->sec ) ); + len -= 2; + } + else + return ( MBEDTLS_ERR_X509_INVALID_DATE ); + + /* + * Parse trailing 'Z' if present + */ + if ( 1 == len && 'Z' == **p ) + { + (*p)++; + len--; + } + + /* + * We should have parsed all characters at this point + */ + if ( 0 != len ) + return ( MBEDTLS_ERR_X509_INVALID_DATE ); + + CHECK( x509_date_is_valid( time ) ); + + return ( 0 ); +} + +/* * Time ::= CHOICE { * utcTime UTCTime, * generalTime GeneralizedTime } @@ -528,7 +598,7 @@ mbedtls_x509_time *time ) { int ret; - size_t len; + size_t len, year_len; unsigned char tag; if( ( end - *p ) < 1 ) @@ -538,55 +608,20 @@ tag = **p; if( tag == MBEDTLS_ASN1_UTC_TIME ) - { - (*p)++; - ret = mbedtls_asn1_get_len( p, end, &len ); - - if( ret != 0 ) - return( MBEDTLS_ERR_X509_INVALID_DATE + ret ); - - CHECK( x509_parse_int( p, 2, &time->year ) ); - CHECK( x509_parse_int( p, 2, &time->mon ) ); - CHECK( x509_parse_int( p, 2, &time->day ) ); - CHECK( x509_parse_int( p, 2, &time->hour ) ); - CHECK( x509_parse_int( p, 2, &time->min ) ); - if( len > 10 ) - CHECK( x509_parse_int( p, 2, &time->sec ) ); - if( len > 12 && *(*p)++ != 'Z' ) - return( MBEDTLS_ERR_X509_INVALID_DATE ); - - time->year += 100 * ( time->year < 50 ); - time->year += 1900; - - CHECK( x509_date_is_valid( time ) ); - - return( 0 ); - } + year_len = 2; else if( tag == MBEDTLS_ASN1_GENERALIZED_TIME ) - { - (*p)++; - ret = mbedtls_asn1_get_len( p, end, &len ); - - if( ret != 0 ) - return( MBEDTLS_ERR_X509_INVALID_DATE + ret ); - - CHECK( x509_parse_int( p, 4, &time->year ) ); - CHECK( x509_parse_int( p, 2, &time->mon ) ); - CHECK( x509_parse_int( p, 2, &time->day ) ); - CHECK( x509_parse_int( p, 2, &time->hour ) ); - CHECK( x509_parse_int( p, 2, &time->min ) ); - if( len > 12 ) - CHECK( x509_parse_int( p, 2, &time->sec ) ); - if( len > 14 && *(*p)++ != 'Z' ) - return( MBEDTLS_ERR_X509_INVALID_DATE ); - - CHECK( x509_date_is_valid( time ) ); - - return( 0 ); - } + year_len = 4; else return( MBEDTLS_ERR_X509_INVALID_DATE + MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ); + + (*p)++; + ret = mbedtls_asn1_get_len( p, end, &len ); + + if( ret != 0 ) + return( MBEDTLS_ERR_X509_INVALID_DATE + ret ); + + return x509_parse_time( p, len, year_len, time ); } int mbedtls_x509_get_sig( unsigned char **p, const unsigned char *end, mbedtls_x509_buf *sig ) @@ -663,7 +698,7 @@ /* * X.509 Extensions (No parsing of extensions, pointer should - * be either manually updated or extensions should be parsed! + * be either manually updated or extensions should be parsed!) */ int mbedtls_x509_get_ext( unsigned char **p, const unsigned char *end, mbedtls_x509_buf *ext, int tag ) Modified: trunk/reactos/dll/3rdparty/mbedtls/x509_crl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509_… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/x509_crl.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/x509_crl.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -527,16 +527,17 @@ if( ( ret = mbedtls_x509_crl_parse_der( chain, pem.buf, pem.buflen ) ) != 0 ) { + mbedtls_pem_free( &pem ); return( ret ); } - - mbedtls_pem_free( &pem ); - } - else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT ) + } + else if( is_pem ) { mbedtls_pem_free( &pem ); return( ret ); } + + mbedtls_pem_free( &pem ); } /* In the PEM case, buflen is 1 at the end, for the terminated NULL byte. * And a valid CRL cannot be less than 1 byte anyway. */ Modified: trunk/reactos/dll/3rdparty/mbedtls/x509_crt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509_… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/x509_crt.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/x509_crt.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -971,10 +971,8 @@ */ int mbedtls_x509_crt_parse( mbedtls_x509_crt *chain, const unsigned char *buf, size_t buflen ) { -#ifndef __REACTOS__ +#if defined(MBEDTLS_PEM_PARSE_C) int success = 0, first_error = 0, total_failed = 0; -#endif -#if defined(MBEDTLS_PEM_PARSE_C) int buf_format = MBEDTLS_X509_FORMAT_DER; #endif @@ -1126,7 +1124,7 @@ p = filename + len; filename[len++] = '*'; - w_ret = MultiByteToWideChar( CP_ACP, 0, filename, len, szDir, + w_ret = MultiByteToWideChar( CP_ACP, 0, filename, (int)len, szDir, MAX_PATH - 3 ); if( w_ret == 0 ) return( MBEDTLS_ERR_X509_BAD_INPUT_DATA ); @@ -1908,6 +1906,7 @@ int check_path_cnt; unsigned char hash[MBEDTLS_MD_MAX_SIZE]; const mbedtls_md_info_t *md_info; + mbedtls_x509_crt *future_past_ca = NULL; if( mbedtls_x509_time_is_past( &child->valid_to ) ) *flags |= MBEDTLS_X509_BADCERT_EXPIRED; @@ -1962,16 +1961,6 @@ continue; } - if( mbedtls_x509_time_is_past( &trust_ca->valid_to ) ) - { - continue; - } - - if( mbedtls_x509_time_is_future( &trust_ca->valid_from ) ) - { - continue; - } - if( mbedtls_pk_verify_ext( child->sig_pk, child->sig_opts, &trust_ca->pk, child->sig_md, hash, mbedtls_md_get_size( md_info ), child->sig.p, child->sig.len ) != 0 ) @@ -1979,6 +1968,20 @@ continue; } + if( mbedtls_x509_time_is_past( &trust_ca->valid_to ) || + mbedtls_x509_time_is_future( &trust_ca->valid_from ) ) + { + if ( future_past_ca == NULL ) + future_past_ca = trust_ca; + + continue; + } + + break; + } + + if( trust_ca != NULL || ( trust_ca = future_past_ca ) != NULL ) + { /* * Top of chain is signed by a trusted CA */ @@ -1986,8 +1989,6 @@ if( x509_profile_check_key( profile, child->sig_pk, &trust_ca->pk ) != 0 ) *flags |= MBEDTLS_X509_BADCERT_BAD_KEY; - - break; } /* @@ -2007,6 +2008,12 @@ ((void) ca_crl); #endif + if( mbedtls_x509_time_is_past( &trust_ca->valid_to ) ) + ca_flags |= MBEDTLS_X509_BADCERT_EXPIRED; + + if( mbedtls_x509_time_is_future( &trust_ca->valid_from ) ) + ca_flags |= MBEDTLS_X509_BADCERT_FUTURE; + if( NULL != f_vrfy ) { if( ( ret = f_vrfy( p_vrfy, trust_ca, path_cnt + 1, Modified: trunk/reactos/dll/3rdparty/mbedtls/x509_csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509_… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/x509_csr.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/x509_csr.c [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -267,8 +267,8 @@ */ int mbedtls_x509_csr_parse( mbedtls_x509_csr *csr, const unsigned char *buf, size_t buflen ) { +#if defined(MBEDTLS_PEM_PARSE_C) int ret; -#if defined(MBEDTLS_PEM_PARSE_C) size_t use_len; mbedtls_pem_context pem; #endif Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/cmac.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/mbedtls/cmac.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/mbedtls/cmac.h [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -60,9 +60,13 @@ /** * \brief Set the CMAC key and prepare to authenticate the input * data. - * Should be called with an initialised cipher context. + * Should be called with an initialized cipher context. * - * \param ctx Cipher context + * \param ctx Cipher context. This should be a cipher context, + * initialized to be one of the following types: + * MBEDTLS_CIPHER_AES_128_ECB, MBEDTLS_CIPHER_AES_192_ECB, + * MBEDTLS_CIPHER_AES_256_ECB or + * MBEDTLS_CIPHER_DES_EDE3_ECB. * \param key CMAC key * \param keybits length of the CMAC key in bits * (must be acceptable by the cipher) @@ -117,7 +121,7 @@ int mbedtls_cipher_cmac_reset( mbedtls_cipher_context_t *ctx ); /** - * \brief Output = Generic_CMAC( hmac key, input buffer ) + * \brief Output = Generic_CMAC( cmac key, input buffer ) * * \param cipher_info message digest info * \param key CMAC key Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/compat-1.3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/mbedtls/compat-1.3.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/mbedtls/compat-1.3.h [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -2455,7 +2455,6 @@ #define ssl_set_arc4_support mbedtls_ssl_conf_arc4_support #define ssl_set_authmode mbedtls_ssl_conf_authmode #define ssl_set_bio mbedtls_ssl_set_bio -#define ssl_set_bio mbedtls_ssl_set_bio_timeout #define ssl_set_ca_chain mbedtls_ssl_conf_ca_chain #define ssl_set_cbc_record_splitting mbedtls_ssl_conf_cbc_record_splitting #define ssl_set_ciphersuites mbedtls_ssl_conf_ciphersuites Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/mbedtls/config.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/mbedtls/config.h [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -1527,7 +1527,7 @@ * library/pkwrite.c * library/x509_create.c * library/x509write_crt.c - * library/mbedtls_x509write_csr.c + * library/x509write_csr.c */ #define MBEDTLS_ASN1_WRITE_C @@ -1890,7 +1890,7 @@ * * Enable the generic message digest layer. * - * Module: library/mbedtls_md.c + * Module: library/md.c * Caller: * * Uncomment to enable generic message digest wrappers. @@ -1902,7 +1902,7 @@ * * Enable the MD2 hash algorithm. * - * Module: library/mbedtls_md2.c + * Module: library/md2.c * Caller: * * Uncomment to enable support for (rare) MD2-signed X.509 certs. @@ -1914,7 +1914,7 @@ * * Enable the MD4 hash algorithm. * - * Module: library/mbedtls_md4.c + * Module: library/md4.c * Caller: * * Uncomment to enable support for (rare) MD4-signed X.509 certs. @@ -1926,8 +1926,8 @@ * * Enable the MD5 hash algorithm. * - * Module: library/mbedtls_md5.c - * Caller: library/mbedtls_md.c + * Module: library/md5.c + * Caller: library/md.c * library/pem.c * library/ssl_tls.c * @@ -1984,11 +1984,11 @@ * library/rsa.c * library/x509.c * library/x509_create.c - * library/mbedtls_x509_crl.c - * library/mbedtls_x509_crt.c - * library/mbedtls_x509_csr.c + * library/x509_crl.c + * library/x509_crt.c + * library/x509_csr.c * library/x509write_crt.c - * library/mbedtls_x509write_csr.c + * library/x509write_csr.c * * This modules translates between OIDs and internal values. */ @@ -2016,9 +2016,9 @@ * Module: library/pem.c * Caller: library/dhm.c * library/pkparse.c - * library/mbedtls_x509_crl.c - * library/mbedtls_x509_crt.c - * library/mbedtls_x509_csr.c + * library/x509_crl.c + * library/x509_crt.c + * library/x509_csr.c * * Requires: MBEDTLS_BASE64_C * @@ -2034,7 +2034,7 @@ * Module: library/pem.c * Caller: library/pkwrite.c * library/x509write_crt.c - * library/mbedtls_x509write_csr.c + * library/x509write_csr.c * * Requires: MBEDTLS_BASE64_C * @@ -2064,8 +2064,8 @@ * Enable the generic public (asymetric) key parser. * * Module: library/pkparse.c - * Caller: library/mbedtls_x509_crt.c - * library/mbedtls_x509_csr.c + * Caller: library/x509_crt.c + * library/x509_csr.c * * Requires: MBEDTLS_PK_C * @@ -2156,8 +2156,8 @@ * * Enable the RIPEMD-160 hash algorithm. * - * Module: library/mbedtls_ripemd160.c - * Caller: library/mbedtls_md.c + * Module: library/ripemd160.c + * Caller: library/md.c * */ #define MBEDTLS_RIPEMD160_C @@ -2185,8 +2185,8 @@ * * Enable the SHA1 cryptographic hash algorithm. * - * Module: library/mbedtls_sha1.c - * Caller: library/mbedtls_md.c + * Module: library/sha1.c + * Caller: library/md.c * library/ssl_cli.c * library/ssl_srv.c * library/ssl_tls.c @@ -2201,9 +2201,9 @@ * * Enable the SHA-224 and SHA-256 cryptographic hash algorithms. * - * Module: library/mbedtls_sha256.c + * Module: library/sha256.c * Caller: library/entropy.c - * library/mbedtls_md.c + * library/md.c * library/ssl_cli.c * library/ssl_srv.c * library/ssl_tls.c @@ -2218,9 +2218,9 @@ * * Enable the SHA-384 and SHA-512 cryptographic hash algorithms. * - * Module: library/mbedtls_sha512.c + * Module: library/sha512.c * Caller: library/entropy.c - * library/mbedtls_md.c + * library/md.c * library/ssl_cli.c * library/ssl_srv.c * @@ -2368,9 +2368,9 @@ * Enable X.509 core for using certificates. * * Module: library/x509.c - * Caller: library/mbedtls_x509_crl.c - * library/mbedtls_x509_crt.c - * library/mbedtls_x509_csr.c + * Caller: library/x509_crl.c + * library/x509_crt.c + * library/x509_csr.c * * Requires: MBEDTLS_ASN1_PARSE_C, MBEDTLS_BIGNUM_C, MBEDTLS_OID_C, * MBEDTLS_PK_PARSE_C @@ -2384,7 +2384,7 @@ * * Enable X.509 certificate parsing. * - * Module: library/mbedtls_x509_crt.c + * Module: library/x509_crt.c * Caller: library/ssl_cli.c * library/ssl_srv.c * library/ssl_tls.c @@ -2400,8 +2400,8 @@ * * Enable X.509 CRL parsing. * - * Module: library/mbedtls_x509_crl.c - * Caller: library/mbedtls_x509_crt.c + * Module: library/x509_crl.c + * Caller: library/x509_crt.c * * Requires: MBEDTLS_X509_USE_C * @@ -2414,7 +2414,7 @@ * * Enable X.509 Certificate Signing Request (CSR) parsing. * - * Module: library/mbedtls_x509_csr.c + * Module: library/x509_csr.c * Caller: library/x509_crt_write.c * * Requires: MBEDTLS_X509_USE_C Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/rsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/mbedtls/rsa.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/mbedtls/rsa.h [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -208,7 +208,7 @@ * \return 0 if successful, or an MBEDTLS_ERR_RSA_XXX error code * * \note This function does NOT take care of message - * padding. Also, be sure to set input[0] = 0 or assure that + * padding. Also, be sure to set input[0] = 0 or ensure that * input is smaller than N. * * \note The input and output buffers must be large Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/ssl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/mbedtls/ssl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/mbedtls/ssl.h [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -1148,7 +1148,7 @@ * * \note See the documentation of \c mbedtls_ssl_set_timer_t and * \c mbedtls_ssl_get_timer_t for the conventions this pair of - * callbacks must fallow. + * callbacks must follow. * * \note On some platforms, timing.c provides * \c mbedtls_timing_set_delay() and @@ -2185,7 +2185,7 @@ /** * \brief Set record counter threshold for periodic renegotiation. - * (Default: 2^64 - 256.) + * (Default: 2^48 - 1) * * Renegotiation is automatically triggered when a record * counter (outgoing or ingoing) crosses the defined @@ -2196,9 +2196,17 @@ * Lower values can be used to enforce policies such as "keys * must be refreshed every N packets with cipher X". * + * The renegotiation period can be disabled by setting + * conf->disable_renegotiation to + * MBEDTLS_SSL_RENEGOTIATION_DISABLED. + * + * \note When the configured transport is + * MBEDTLS_SSL_TRANSPORT_DATAGRAM the maximum renegotiation + * period is 2^48 - 1, and for MBEDTLS_SSL_TRANSPORT_STREAM, + * the maximum renegotiation period is 2^64 - 1. + * * \param conf SSL configuration * \param period The threshold value: a big-endian 64-bit number. - * Set to 2^64 - 1 to disable periodic renegotiation */ void mbedtls_ssl_conf_renegotiation_period( mbedtls_ssl_config *conf, const unsigned char period[8] ); @@ -2430,7 +2438,7 @@ * \param len how many bytes must be written * * \return the number of bytes actually written (may be less than len), - * or MBEDTLS_ERR_SSL_WANT_WRITE of MBEDTLS_ERR_SSL_WANT_READ, + * or MBEDTLS_ERR_SSL_WANT_WRITE or MBEDTLS_ERR_SSL_WANT_READ, * or another negative error code. * * \note If this function returns something other than a positive @@ -2515,7 +2523,6 @@ * \param transport MBEDTLS_SSL_TRANSPORT_STREAM for TLS, or * MBEDTLS_SSL_TRANSPORT_DATAGRAM for DTLS * \param preset a MBEDTLS_SSL_PRESET_XXX value - * (currently unused). * * \note See \c mbedtls_ssl_conf_transport() for notes on DTLS. * Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/mbedtls/version.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/mbedtls/version.h [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -41,16 +41,16 @@ */ #define MBEDTLS_VERSION_MAJOR 2 #define MBEDTLS_VERSION_MINOR 4 -#define MBEDTLS_VERSION_PATCH 0 +#define MBEDTLS_VERSION_PATCH 2 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define MBEDTLS_VERSION_NUMBER 0x02040000 -#define MBEDTLS_VERSION_STRING "2.4.0" -#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.4.0" +#define MBEDTLS_VERSION_NUMBER 0x02040200 +#define MBEDTLS_VERSION_STRING "2.4.2" +#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.4.2" #if defined(MBEDTLS_VERSION_C) Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/x509.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/mbedtls/x509.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/mbedtls/x509.h [iso-8859-1] Sun Jun 18 17:25:30 2017 @@ -159,7 +159,7 @@ #define MBEDTLS_X509_EXT_INIHIBIT_ANYPOLICY (1 << 13) #define MBEDTLS_X509_EXT_FRESHEST_CRL (1 << 14) -#define MBEDTLS_X509_EXT_NS_CERT_TYPE (1 << 16) /* Parsed (and then ?) */ +#define MBEDTLS_X509_EXT_NS_CERT_TYPE (1 << 16) /* * Storage format identifiers

7 years, 3 months

[tfaber] 75099: [LIBTIRPC] - Try to fix VC2010 build as well CORE-8204

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 18 17:01:14 2017 New Revision: 75099 URL: http://svn.reactos.org/svn/reactos?rev=75099&view=rev Log: [LIBTIRPC] - Try to fix VC2010 build as well CORE-8204 Modified: trunk/reactos/dll/win32/libtirpc/src/clnt_dg.c Modified: trunk/reactos/dll/win32/libtirpc/src/clnt_dg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/cln… ============================================================================== --- trunk/reactos/dll/win32/libtirpc/src/clnt_dg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/libtirpc/src/clnt_dg.c [iso-8859-1] Sun Jun 18 17:01:14 2017 @@ -339,6 +339,9 @@ ssize_t recvlen = 0; int rpc_lock_value; u_int32_t xid, inval, outval; +#ifdef __REACTOS__ + fd_set infd; +#endif outlen = 0; #ifndef _WIN32 @@ -445,9 +448,6 @@ #error Not supported! #endif /* ReactOS: use select instead of poll */ - fd_set infd; - struct timeval timeout; - FD_ZERO(&infd); FD_SET(cu->cu_fd, &infd);

7 years, 3 months

[tfaber] 75098: [LIBTIRPC] - Fix MSVC build CORE-8204

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 18 16:41:23 2017 New Revision: 75098 URL: http://svn.reactos.org/svn/reactos?rev=75098&view=rev Log: [LIBTIRPC] - Fix MSVC build CORE-8204 Modified: trunk/reactos/dll/win32/libtirpc/CMakeLists.txt trunk/reactos/dll/win32/libtirpc/src/auth_time.c trunk/reactos/dll/win32/libtirpc/src/auth_unix.c trunk/reactos/dll/win32/libtirpc/src/bindresvport.c trunk/reactos/dll/win32/libtirpc/src/clnt_vc.c trunk/reactos/dll/win32/libtirpc/src/rpc_generic.c Modified: trunk/reactos/dll/win32/libtirpc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/libtirpc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/libtirpc/CMakeLists.txt [iso-8859-1] Sun Jun 18 16:41:23 2017 @@ -1,6 +1,6 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-DUNICODE -D_WIN32 -DPORTMAP) +add_definitions(-DUNICODE -D_WIN32 -DPORTMAP -Dstrdup=_strdup) include_directories(${REACTOS_SOURCE_DIR}/dll/win32/libtirpc/tirpc) @@ -94,11 +94,10 @@ if(MSVC) else() # FIXME: Tons of warnings. - replace_compile_flags("-Werror" " ") + add_target_compile_flags(libtirpc "-w") endif() set_module_type(libtirpc win32dll) -target_link_libraries(libtirpc user32 advapi32) -add_importlibs(libtirpc kernel32 kernel32_vista ws2_32 msvcrt) +add_importlibs(libtirpc user32 advapi32 kernel32_vista ws2_32 msvcrt kernel32 ntdll) add_delay_importlibs(libtirpc secur32) add_cd_file(TARGET libtirpc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/libtirpc/src/auth_time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/aut… ============================================================================== --- trunk/reactos/dll/win32/libtirpc/src/auth_time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/libtirpc/src/auth_time.c [iso-8859-1] Sun Jun 18 16:41:23 2017 @@ -248,7 +248,9 @@ char ut[64], ipuaddr[64]; endpoint teps[32]; nis_server tsrv; +#ifndef __REACTOS__ void (*oldsig)() = NULL; /* old alarm handler */ +#endif struct sockaddr_in sin; SOCKET s = RPC_ANYSOCK; socklen_t len; Modified: trunk/reactos/dll/win32/libtirpc/src/auth_unix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/aut… ============================================================================== --- trunk/reactos/dll/win32/libtirpc/src/auth_unix.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/libtirpc/src/auth_unix.c [iso-8859-1] Sun Jun 18 16:41:23 2017 @@ -376,10 +376,21 @@ } static bool_t +#ifndef __REACTOS__ authunix_wrap(AUTH *auth, XDR *xdrs, xdrproc_t func, caddr_t args, u_int seq) +#else +authunix_wrap(AUTH *auth, XDR *xdrs, xdrproc_t func, caddr_t args) +#endif { return ((*func)(xdrs, args)); } +#ifdef __REACTOS__ +static bool_t +authunix_unwrap(AUTH *auth, XDR *xdrs, xdrproc_t func, caddr_t args, u_int seq) +{ + return ((*func)(xdrs, args)); +} +#endif static struct auth_ops * authunix_ops() @@ -397,7 +408,11 @@ ops.ah_refresh = authunix_refresh; ops.ah_destroy = authunix_destroy; ops.ah_wrap = authunix_wrap; +#ifndef __REACTOS__ ops.ah_unwrap = authunix_wrap; +#else + ops.ah_unwrap = authunix_unwrap; +#endif } mutex_unlock(&ops_lock); return (&ops); Modified: trunk/reactos/dll/win32/libtirpc/src/bindresvport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/bin… ============================================================================== --- trunk/reactos/dll/win32/libtirpc/src/bindresvport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/libtirpc/src/bindresvport.c [iso-8859-1] Sun Jun 18 16:41:23 2017 @@ -186,7 +186,9 @@ #ifdef _WIN32 memset(sa, 0, salen); if (error = getsockopt(sd, SOL_SOCKET, SO_PROTOCOL_INFO, (char *)&proto_info, &proto_info_size) == SOCKET_ERROR) { +#ifndef __REACTOS__ int sockerr = WSAGetLastError(); +#endif return -1; } af = proto_info.iAddressFamily; @@ -244,7 +246,9 @@ error = bind(sd, sa, salen); if (error) { +#ifndef __REACTOS__ int err = WSAGetLastError(); +#endif } #ifdef IPV6_PORTRANGE Modified: trunk/reactos/dll/win32/libtirpc/src/clnt_vc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/cln… ============================================================================== --- trunk/reactos/dll/win32/libtirpc/src/clnt_vc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/libtirpc/src/clnt_vc.c [iso-8859-1] Sun Jun 18 16:41:23 2017 @@ -1025,17 +1025,24 @@ } static int +#ifndef __REACTOS__ write_vc(ctp, buf, len) +#else +write_vc(ctp, ptr, len) +#endif void *ctp; #ifndef __REACTOS__ char *buf; #else - void *buf; + void *ptr; #endif int len; { struct ct_data *ct = (struct ct_data *)ctp; int i = 0, cnt; +#ifdef __REACTOS__ + char *buf = ptr; +#endif for (cnt = len; cnt > 0; cnt -= i, buf += i) { if ((i = send(ct->ct_fd, buf, (size_t)cnt, 0)) == SOCKET_ERROR) { Modified: trunk/reactos/dll/win32/libtirpc/src/rpc_generic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rpc… ============================================================================== --- trunk/reactos/dll/win32/libtirpc/src/rpc_generic.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/libtirpc/src/rpc_generic.c [iso-8859-1] Sun Jun 18 16:41:23 2017 @@ -488,7 +488,9 @@ WSAPROTOCOL_INFO proto_info; int proto_info_size = sizeof(proto_info); if (getsockopt(fd, SOL_SOCKET, SO_PROTOCOL_INFO, (char *)&proto_info, &proto_info_size) == SOCKET_ERROR) { +#ifndef __REACTOS__ int err = WSAGetLastError(); +#endif return 0; } len = proto_info.iMaxSockAddr; @@ -503,7 +505,9 @@ len = sizeof type; if (getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&type, &len) == SOCKET_ERROR) { +#ifndef __REACTOS__ int err = WSAGetLastError(); +#endif return 0; }

7 years, 3 months

[pschweitzer] 75097: [LIBTIRPC] Fix MSVC build?

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 18 15:41:54 2017 New Revision: 75097 URL: http://svn.reactos.org/svn/reactos?rev=75097&view=rev Log: [LIBTIRPC] Fix MSVC build? Modified: trunk/reactos/dll/win32/libtirpc/src/svc_vc.c Modified: trunk/reactos/dll/win32/libtirpc/src/svc_vc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… ============================================================================== --- trunk/reactos/dll/win32/libtirpc/src/svc_vc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/libtirpc/src/svc_vc.c [iso-8859-1] Sun Jun 18 15:41:54 2017 @@ -560,10 +560,14 @@ * Any error is fatal and the connection is closed. */ static int +#ifdef __REACTOS__ +write_vc(xprtp, ptr, len) +#else write_vc(xprtp, buf, len) +#endif void *xprtp; #ifdef __REACTOS__ - void *buf; + void *ptr; #else char *buf; #endif @@ -573,6 +577,9 @@ int i, cnt; struct cf_conn *cd; struct timeval tv0, tv1; +#ifdef __REACTOS__ + char *buf = ptr; +#endif xprt = (SVCXPRT *)xprtp; assert(xprt != NULL);

7 years, 3 months

[pschweitzer] 75096: [LIBTIRPC] Import the libtirpc from the nfs41 project. CORE-8204

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 18 15:31:06 2017 New Revision: 75096 URL: http://svn.reactos.org/svn/reactos?rev=75096&view=rev Log: [LIBTIRPC] Import the libtirpc from the nfs41 project. CORE-8204 Added: trunk/reactos/dll/win32/libtirpc/ trunk/reactos/dll/win32/libtirpc/.gitignore trunk/reactos/dll/win32/libtirpc/AUTHORS (with props) trunk/reactos/dll/win32/libtirpc/CMakeLists.txt (with props) trunk/reactos/dll/win32/libtirpc/COPYING (with props) trunk/reactos/dll/win32/libtirpc/ChangeLog (with props) trunk/reactos/dll/win32/libtirpc/INSTALL trunk/reactos/dll/win32/libtirpc/Makefile.am trunk/reactos/dll/win32/libtirpc/NEWS trunk/reactos/dll/win32/libtirpc/README trunk/reactos/dll/win32/libtirpc/THANKS trunk/reactos/dll/win32/libtirpc/TODO trunk/reactos/dll/win32/libtirpc/VERSION trunk/reactos/dll/win32/libtirpc/autogen.sh (with props) trunk/reactos/dll/win32/libtirpc/bootstrap (with props) trunk/reactos/dll/win32/libtirpc/configure.ac (with props) trunk/reactos/dll/win32/libtirpc/dirs (with props) trunk/reactos/dll/win32/libtirpc/doc/ trunk/reactos/dll/win32/libtirpc/doc/Makefile.am (with props) trunk/reactos/dll/win32/libtirpc/doc/etc_netconfig (with props) trunk/reactos/dll/win32/libtirpc/libtirpc/ trunk/reactos/dll/win32/libtirpc/libtirpc.pc.in (with props) trunk/reactos/dll/win32/libtirpc/libtirpc/libtirpc.def (with props) trunk/reactos/dll/win32/libtirpc/libtirpc/libtirpc.rc (with props) trunk/reactos/dll/win32/libtirpc/libtirpc/libtirpc_ros.rc (with props) trunk/reactos/dll/win32/libtirpc/libtirpc/resource.h (with props) trunk/reactos/dll/win32/libtirpc/man/ trunk/reactos/dll/win32/libtirpc/man/Makefile.am (with props) trunk/reactos/dll/win32/libtirpc/man/bindresvport.3t (with props) trunk/reactos/dll/win32/libtirpc/man/des_crypt.3t (with props) trunk/reactos/dll/win32/libtirpc/man/getnetconfig.3t (with props) trunk/reactos/dll/win32/libtirpc/man/getnetpath.3t (with props) trunk/reactos/dll/win32/libtirpc/man/getrpcent.3t (with props) trunk/reactos/dll/win32/libtirpc/man/getrpcport.3t (with props) trunk/reactos/dll/win32/libtirpc/man/netconfig.5 (with props) trunk/reactos/dll/win32/libtirpc/man/publickey.3t (with props) trunk/reactos/dll/win32/libtirpc/man/publickey.5 (with props) trunk/reactos/dll/win32/libtirpc/man/rpc.3t (with props) trunk/reactos/dll/win32/libtirpc/man/rpc.5 (with props) trunk/reactos/dll/win32/libtirpc/man/rpc_clnt_auth.3t (with props) trunk/reactos/dll/win32/libtirpc/man/rpc_clnt_calls.3t (with props) trunk/reactos/dll/win32/libtirpc/man/rpc_clnt_create.3t (with props) trunk/reactos/dll/win32/libtirpc/man/rpc_secure.3t (with props) trunk/reactos/dll/win32/libtirpc/man/rpc_soc.3t (with props) trunk/reactos/dll/win32/libtirpc/man/rpc_svc_calls.3t (with props) trunk/reactos/dll/win32/libtirpc/man/rpc_svc_create.3t (with props) trunk/reactos/dll/win32/libtirpc/man/rpc_svc_err.3t (with props) trunk/reactos/dll/win32/libtirpc/man/rpc_svc_reg.3t (with props) trunk/reactos/dll/win32/libtirpc/man/rpc_xdr.3t (with props) trunk/reactos/dll/win32/libtirpc/man/rpcbind.3t (with props) trunk/reactos/dll/win32/libtirpc/man/rtime.3t (with props) trunk/reactos/dll/win32/libtirpc/src/ trunk/reactos/dll/win32/libtirpc/src/Makefile.am (with props) trunk/reactos/dll/win32/libtirpc/src/asprintf.c (with props) trunk/reactos/dll/win32/libtirpc/src/auth_des.c (with props) trunk/reactos/dll/win32/libtirpc/src/auth_gss.c (with props) trunk/reactos/dll/win32/libtirpc/src/auth_none.c (with props) trunk/reactos/dll/win32/libtirpc/src/auth_sspi.c (with props) trunk/reactos/dll/win32/libtirpc/src/auth_time.c (with props) trunk/reactos/dll/win32/libtirpc/src/auth_unix.c (with props) trunk/reactos/dll/win32/libtirpc/src/authdes_prot.c (with props) trunk/reactos/dll/win32/libtirpc/src/authgss_prot.c (with props) trunk/reactos/dll/win32/libtirpc/src/authsspi_prot.c (with props) trunk/reactos/dll/win32/libtirpc/src/authunix_prot.c (with props) trunk/reactos/dll/win32/libtirpc/src/bindresvport.c (with props) trunk/reactos/dll/win32/libtirpc/src/clnt_bcast.c (with props) trunk/reactos/dll/win32/libtirpc/src/clnt_dg.c (with props) trunk/reactos/dll/win32/libtirpc/src/clnt_generic.c (with props) trunk/reactos/dll/win32/libtirpc/src/clnt_perror.c (with props) trunk/reactos/dll/win32/libtirpc/src/clnt_raw.c (with props) trunk/reactos/dll/win32/libtirpc/src/clnt_simple.c (with props) trunk/reactos/dll/win32/libtirpc/src/clnt_vc.c (with props) trunk/reactos/dll/win32/libtirpc/src/crypt_client.c (with props) trunk/reactos/dll/win32/libtirpc/src/des_crypt.c (with props) trunk/reactos/dll/win32/libtirpc/src/des_soft.c (with props) trunk/reactos/dll/win32/libtirpc/src/epoll_sub.c (with props) trunk/reactos/dll/win32/libtirpc/src/getnetconfig.c (with props) trunk/reactos/dll/win32/libtirpc/src/getnetpath.c (with props) trunk/reactos/dll/win32/libtirpc/src/getpeereid.c (with props) trunk/reactos/dll/win32/libtirpc/src/getpublickey.c (with props) trunk/reactos/dll/win32/libtirpc/src/getrpcent.c (with props) trunk/reactos/dll/win32/libtirpc/src/getrpcport.c (with props) trunk/reactos/dll/win32/libtirpc/src/gettimeofday.c (with props) trunk/reactos/dll/win32/libtirpc/src/key_call.c (with props) trunk/reactos/dll/win32/libtirpc/src/key_prot_xdr.c (with props) trunk/reactos/dll/win32/libtirpc/src/libtirpc.def (with props) trunk/reactos/dll/win32/libtirpc/src/makefile (with props) trunk/reactos/dll/win32/libtirpc/src/mt_misc.c (with props) trunk/reactos/dll/win32/libtirpc/src/netname.c (with props) trunk/reactos/dll/win32/libtirpc/src/netnamer.c (with props) trunk/reactos/dll/win32/libtirpc/src/pmap_clnt.c (with props) trunk/reactos/dll/win32/libtirpc/src/pmap_getmaps.c (with props) trunk/reactos/dll/win32/libtirpc/src/pmap_getport.c (with props) trunk/reactos/dll/win32/libtirpc/src/pmap_prot.c (with props) trunk/reactos/dll/win32/libtirpc/src/pmap_prot2.c (with props) trunk/reactos/dll/win32/libtirpc/src/pmap_rmt.c (with props) trunk/reactos/dll/win32/libtirpc/src/rpc_callmsg.c (with props) trunk/reactos/dll/win32/libtirpc/src/rpc_com.h (with props) trunk/reactos/dll/win32/libtirpc/src/rpc_commondata.c (with props) trunk/reactos/dll/win32/libtirpc/src/rpc_dtablesize.c (with props) trunk/reactos/dll/win32/libtirpc/src/rpc_generic.c (with props) trunk/reactos/dll/win32/libtirpc/src/rpc_prot.c (with props) trunk/reactos/dll/win32/libtirpc/src/rpc_soc.c (with props) trunk/reactos/dll/win32/libtirpc/src/rpcb_clnt.c (with props) trunk/reactos/dll/win32/libtirpc/src/rpcb_prot.c (with props) trunk/reactos/dll/win32/libtirpc/src/rpcb_st_xdr.c (with props) trunk/reactos/dll/win32/libtirpc/src/rpcdname.c (with props) trunk/reactos/dll/win32/libtirpc/src/rtime.c (with props) trunk/reactos/dll/win32/libtirpc/src/sources (with props) trunk/reactos/dll/win32/libtirpc/src/svc.c (with props) trunk/reactos/dll/win32/libtirpc/src/svc_auth.c (with props) trunk/reactos/dll/win32/libtirpc/src/svc_auth_des.c (with props) trunk/reactos/dll/win32/libtirpc/src/svc_auth_gss.c (with props) trunk/reactos/dll/win32/libtirpc/src/svc_auth_none.c (with props) trunk/reactos/dll/win32/libtirpc/src/svc_auth_unix.c (with props) trunk/reactos/dll/win32/libtirpc/src/svc_dg.c (with props) trunk/reactos/dll/win32/libtirpc/src/svc_generic.c (with props) trunk/reactos/dll/win32/libtirpc/src/svc_raw.c (with props) trunk/reactos/dll/win32/libtirpc/src/svc_run.c (with props) trunk/reactos/dll/win32/libtirpc/src/svc_simple.c (with props) trunk/reactos/dll/win32/libtirpc/src/svc_vc.c (with props) trunk/reactos/dll/win32/libtirpc/src/winstubs.c (with props) trunk/reactos/dll/win32/libtirpc/src/wintirpc.c (with props) trunk/reactos/dll/win32/libtirpc/src/xdr.c (with props) trunk/reactos/dll/win32/libtirpc/src/xdr_array.c (with props) trunk/reactos/dll/win32/libtirpc/src/xdr_float.c (with props) trunk/reactos/dll/win32/libtirpc/src/xdr_mem.c (with props) trunk/reactos/dll/win32/libtirpc/src/xdr_rec.c (with props) trunk/reactos/dll/win32/libtirpc/src/xdr_reference.c (with props) trunk/reactos/dll/win32/libtirpc/src/xdr_sizeof.c (with props) trunk/reactos/dll/win32/libtirpc/src/xdr_stdio.c (with props) trunk/reactos/dll/win32/libtirpc/tirpc/ trunk/reactos/dll/win32/libtirpc/tirpc/fpmath.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/getpeereid.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/libc_private.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/misc/ trunk/reactos/dll/win32/libtirpc/tirpc/misc/event.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/misc/queue.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/misc/socket.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/namespace.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/netconfig.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/nss_tls.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/reentrant.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/ trunk/reactos/dll/win32/libtirpc/tirpc/rpc/auth.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/auth_des.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/auth_gss.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/auth_kerb.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/auth_sspi.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/auth_unix.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/clnt.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/clnt_soc.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/clnt_stat.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/des.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/des_crypt.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/nettype.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/pmap_clnt.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/pmap_prot.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/pmap_rmt.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/raw.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpc.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpc_com.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpc_msg.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpcb_clnt.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpcb_prot.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpcb_prot.x (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpcent.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/svc.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/svc_auth.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/svc_dg.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/svc_soc.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/types.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpc/xdr.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpcsvc/ trunk/reactos/dll/win32/libtirpc/tirpc/rpcsvc/crypt.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpcsvc/crypt.x (with props) trunk/reactos/dll/win32/libtirpc/tirpc/rpcsvc/nis.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/spinlock.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/sys/ trunk/reactos/dll/win32/libtirpc/tirpc/sys/queue.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/un-namespace.h (with props) trunk/reactos/dll/win32/libtirpc/tirpc/wintirpc.h (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… Added: trunk/reactos/dll/win32/libtirpc/.gitignore URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/.gitign… Added: trunk/reactos/dll/win32/libtirpc/AUTHORS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/AUTHORS… Added: trunk/reactos/dll/win32/libtirpc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/CMakeLi… Added: trunk/reactos/dll/win32/libtirpc/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/COPYING… Added: trunk/reactos/dll/win32/libtirpc/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/ChangeL… Added: trunk/reactos/dll/win32/libtirpc/INSTALL URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/INSTALL… Added: trunk/reactos/dll/win32/libtirpc/Makefile.am URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/Makefil… Added: trunk/reactos/dll/win32/libtirpc/NEWS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/NEWS?re… Added: trunk/reactos/dll/win32/libtirpc/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/README?… Added: trunk/reactos/dll/win32/libtirpc/THANKS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/THANKS?… Added: trunk/reactos/dll/win32/libtirpc/TODO URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/TODO?re… Added: trunk/reactos/dll/win32/libtirpc/VERSION URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/VERSION… Added: trunk/reactos/dll/win32/libtirpc/autogen.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/autogen… Added: trunk/reactos/dll/win32/libtirpc/bootstrap URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/bootstr… Added: trunk/reactos/dll/win32/libtirpc/configure.ac URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/configu… Added: trunk/reactos/dll/win32/libtirpc/dirs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/dirs?re… Added: trunk/reactos/dll/win32/libtirpc/doc/Makefile.am URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/doc/Mak… Added: trunk/reactos/dll/win32/libtirpc/doc/etc_netconfig URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/doc/etc… Added: trunk/reactos/dll/win32/libtirpc/libtirpc.pc.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/libtirp… Added: trunk/reactos/dll/win32/libtirpc/libtirpc/libtirpc.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/libtirp… Added: trunk/reactos/dll/win32/libtirpc/libtirpc/libtirpc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/libtirp… Added: trunk/reactos/dll/win32/libtirpc/libtirpc/libtirpc_ros.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/libtirp… Added: trunk/reactos/dll/win32/libtirpc/libtirpc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/libtirp… Added: trunk/reactos/dll/win32/libtirpc/man/Makefile.am URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/Mak… Added: trunk/reactos/dll/win32/libtirpc/man/bindresvport.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/bin… Added: trunk/reactos/dll/win32/libtirpc/man/des_crypt.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/des… Added: trunk/reactos/dll/win32/libtirpc/man/getnetconfig.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/get… Added: trunk/reactos/dll/win32/libtirpc/man/getnetpath.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/get… Added: trunk/reactos/dll/win32/libtirpc/man/getrpcent.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/get… Added: trunk/reactos/dll/win32/libtirpc/man/getrpcport.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/get… Added: trunk/reactos/dll/win32/libtirpc/man/netconfig.5 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/net… Added: trunk/reactos/dll/win32/libtirpc/man/publickey.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/pub… Added: trunk/reactos/dll/win32/libtirpc/man/publickey.5 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/pub… Added: trunk/reactos/dll/win32/libtirpc/man/rpc.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rpc.5 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rpc_clnt_auth.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rpc_clnt_calls.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rpc_clnt_create.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rpc_secure.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rpc_soc.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rpc_svc_calls.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rpc_svc_create.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rpc_svc_err.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rpc_svc_reg.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rpc_xdr.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rpcbind.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rpc… Added: trunk/reactos/dll/win32/libtirpc/man/rtime.3t URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/man/rti… Added: trunk/reactos/dll/win32/libtirpc/src/Makefile.am URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/Mak… Added: trunk/reactos/dll/win32/libtirpc/src/asprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/asp… Added: trunk/reactos/dll/win32/libtirpc/src/auth_des.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/aut… Added: trunk/reactos/dll/win32/libtirpc/src/auth_gss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/aut… Added: trunk/reactos/dll/win32/libtirpc/src/auth_none.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/aut… Added: trunk/reactos/dll/win32/libtirpc/src/auth_sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/aut… Added: trunk/reactos/dll/win32/libtirpc/src/auth_time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/aut… Added: trunk/reactos/dll/win32/libtirpc/src/auth_unix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/aut… Added: trunk/reactos/dll/win32/libtirpc/src/authdes_prot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/aut… Added: trunk/reactos/dll/win32/libtirpc/src/authgss_prot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/aut… Added: trunk/reactos/dll/win32/libtirpc/src/authsspi_prot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/aut… Added: trunk/reactos/dll/win32/libtirpc/src/authunix_prot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/aut… Added: trunk/reactos/dll/win32/libtirpc/src/bindresvport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/bin… Added: trunk/reactos/dll/win32/libtirpc/src/clnt_bcast.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/cln… Added: trunk/reactos/dll/win32/libtirpc/src/clnt_dg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/cln… Added: trunk/reactos/dll/win32/libtirpc/src/clnt_generic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/cln… Added: trunk/reactos/dll/win32/libtirpc/src/clnt_perror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/cln… Added: trunk/reactos/dll/win32/libtirpc/src/clnt_raw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/cln… Added: trunk/reactos/dll/win32/libtirpc/src/clnt_simple.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/cln… Added: trunk/reactos/dll/win32/libtirpc/src/clnt_vc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/cln… Added: trunk/reactos/dll/win32/libtirpc/src/crypt_client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/cry… Added: trunk/reactos/dll/win32/libtirpc/src/des_crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/des… Added: trunk/reactos/dll/win32/libtirpc/src/des_soft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/des… Added: trunk/reactos/dll/win32/libtirpc/src/epoll_sub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/epo… Added: trunk/reactos/dll/win32/libtirpc/src/getnetconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/get… Added: trunk/reactos/dll/win32/libtirpc/src/getnetpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/get… Added: trunk/reactos/dll/win32/libtirpc/src/getpeereid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/get… Added: trunk/reactos/dll/win32/libtirpc/src/getpublickey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/get… Added: trunk/reactos/dll/win32/libtirpc/src/getrpcent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/get… Added: trunk/reactos/dll/win32/libtirpc/src/getrpcport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/get… Added: trunk/reactos/dll/win32/libtirpc/src/gettimeofday.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/get… Added: trunk/reactos/dll/win32/libtirpc/src/key_call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/key… Added: trunk/reactos/dll/win32/libtirpc/src/key_prot_xdr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/key… Added: trunk/reactos/dll/win32/libtirpc/src/libtirpc.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/lib… Added: trunk/reactos/dll/win32/libtirpc/src/makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/mak… Added: trunk/reactos/dll/win32/libtirpc/src/mt_misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/mt_… Added: trunk/reactos/dll/win32/libtirpc/src/netname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/net… Added: trunk/reactos/dll/win32/libtirpc/src/netnamer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/net… Added: trunk/reactos/dll/win32/libtirpc/src/pmap_clnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/pma… Added: trunk/reactos/dll/win32/libtirpc/src/pmap_getmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/pma… Added: trunk/reactos/dll/win32/libtirpc/src/pmap_getport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/pma… Added: trunk/reactos/dll/win32/libtirpc/src/pmap_prot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/pma… Added: trunk/reactos/dll/win32/libtirpc/src/pmap_prot2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/pma… Added: trunk/reactos/dll/win32/libtirpc/src/pmap_rmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/pma… Added: trunk/reactos/dll/win32/libtirpc/src/rpc_callmsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rpc… Added: trunk/reactos/dll/win32/libtirpc/src/rpc_com.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rpc… Added: trunk/reactos/dll/win32/libtirpc/src/rpc_commondata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rpc… Added: trunk/reactos/dll/win32/libtirpc/src/rpc_dtablesize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rpc… Added: trunk/reactos/dll/win32/libtirpc/src/rpc_generic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rpc… Added: trunk/reactos/dll/win32/libtirpc/src/rpc_prot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rpc… Added: trunk/reactos/dll/win32/libtirpc/src/rpc_soc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rpc… Added: trunk/reactos/dll/win32/libtirpc/src/rpcb_clnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rpc… Added: trunk/reactos/dll/win32/libtirpc/src/rpcb_prot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rpc… Added: trunk/reactos/dll/win32/libtirpc/src/rpcb_st_xdr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rpc… Added: trunk/reactos/dll/win32/libtirpc/src/rpcdname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rpc… Added: trunk/reactos/dll/win32/libtirpc/src/rtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/rti… Added: trunk/reactos/dll/win32/libtirpc/src/sources URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/sou… Added: trunk/reactos/dll/win32/libtirpc/src/svc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… Added: trunk/reactos/dll/win32/libtirpc/src/svc_auth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… Added: trunk/reactos/dll/win32/libtirpc/src/svc_auth_des.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… Added: trunk/reactos/dll/win32/libtirpc/src/svc_auth_gss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… Added: trunk/reactos/dll/win32/libtirpc/src/svc_auth_none.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… Added: trunk/reactos/dll/win32/libtirpc/src/svc_auth_unix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… Added: trunk/reactos/dll/win32/libtirpc/src/svc_dg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… Added: trunk/reactos/dll/win32/libtirpc/src/svc_generic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… Added: trunk/reactos/dll/win32/libtirpc/src/svc_raw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… Added: trunk/reactos/dll/win32/libtirpc/src/svc_run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… Added: trunk/reactos/dll/win32/libtirpc/src/svc_simple.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… Added: trunk/reactos/dll/win32/libtirpc/src/svc_vc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/svc… Added: trunk/reactos/dll/win32/libtirpc/src/winstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/win… Added: trunk/reactos/dll/win32/libtirpc/src/wintirpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/win… Added: trunk/reactos/dll/win32/libtirpc/src/xdr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/xdr… Added: trunk/reactos/dll/win32/libtirpc/src/xdr_array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/xdr… Added: trunk/reactos/dll/win32/libtirpc/src/xdr_float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/xdr… Added: trunk/reactos/dll/win32/libtirpc/src/xdr_mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/xdr… Added: trunk/reactos/dll/win32/libtirpc/src/xdr_rec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/xdr… Added: trunk/reactos/dll/win32/libtirpc/src/xdr_reference.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/xdr… Added: trunk/reactos/dll/win32/libtirpc/src/xdr_sizeof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/xdr… Added: trunk/reactos/dll/win32/libtirpc/src/xdr_stdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/src/xdr… Added: trunk/reactos/dll/win32/libtirpc/tirpc/fpmath.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/f… Added: trunk/reactos/dll/win32/libtirpc/tirpc/getpeereid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/g… Added: trunk/reactos/dll/win32/libtirpc/tirpc/libc_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/l… Added: trunk/reactos/dll/win32/libtirpc/tirpc/misc/event.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/m… Added: trunk/reactos/dll/win32/libtirpc/tirpc/misc/queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/m… Added: trunk/reactos/dll/win32/libtirpc/tirpc/misc/socket.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/m… Added: trunk/reactos/dll/win32/libtirpc/tirpc/namespace.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/n… Added: trunk/reactos/dll/win32/libtirpc/tirpc/netconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/n… Added: trunk/reactos/dll/win32/libtirpc/tirpc/nss_tls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/n… Added: trunk/reactos/dll/win32/libtirpc/tirpc/reentrant.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/auth.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/auth_des.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/auth_gss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/auth_kerb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/auth_sspi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/auth_unix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/clnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/clnt_soc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/clnt_stat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/des.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/des_crypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/nettype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/pmap_clnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/pmap_prot.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/pmap_rmt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/raw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpc_com.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpc_msg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpcb_clnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpcb_prot.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpcb_prot.x URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/rpcent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/svc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/svc_auth.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/svc_dg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/svc_soc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpc/xdr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpcsvc/crypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpcsvc/crypt.x URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/rpcsvc/nis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/r… Added: trunk/reactos/dll/win32/libtirpc/tirpc/spinlock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/s… Added: trunk/reactos/dll/win32/libtirpc/tirpc/sys/queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/s… Added: trunk/reactos/dll/win32/libtirpc/tirpc/un-namespace.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/u… Added: trunk/reactos/dll/win32/libtirpc/tirpc/wintirpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/libtirpc/tirpc/w…

7 years, 3 months

[ssawant] 75095: [QCKLNCH] -Stubbed CISFBand methods and required interfaces. -Added a C Constructor for CISFBand. -Implemented and Tested a button via CISFBand.

by ssawant＠svn.reactos.org

Author: ssawant Date: Sun Jun 18 14:59:26 2017 New Revision: 75095 URL: http://svn.reactos.org/svn/reactos?rev=75095&view=rev Log: [QCKLNCH] -Stubbed CISFBand methods and required interfaces. -Added a C Constructor for CISFBand. -Implemented and Tested a button via CISFBand. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] Sun Jun 18 14:59:26 2017 @@ -35,9 +35,9 @@ //IObjectWithSite HRESULT STDMETHODCALLTYPE CISFBand::SetSite(IUnknown *pUnkSite) { - //MessageBox(0, L"CISFBand::SetSite called!", L"Testing", MB_OK | MB_ICONINFORMATION); - - /* HRESULT hRet; + MessageBox(0, L"CISFBand::SetSite called!", L"Testing", MB_OK | MB_ICONINFORMATION); + + HRESULT hRet; HWND hwndParent; TRACE("CISFBand::SetSite(0x%p)\n", pUnkSite); @@ -51,9 +51,8 @@ m_Site = pUnkSite; m_hWnd = CreateWindowEx(0, L"BUTTON", L">>", WS_CHILD, CW_USEDEFAULT, CW_USEDEFAULT, 50, 50, hwndParent, 0, m_hInstance, 0); SetWindowSubclass(hwndParent, MyWndProc, 0, 0); //when button is clicked, parent receives WM_COMMAND, and thus subclassed to show a test message box - */ - - return E_NOTIMPL; + + return S_OK; } HRESULT STDMETHODCALLTYPE CISFBand::GetSite( @@ -61,16 +60,17 @@ OUT VOID **ppvSite) { //MessageBox(0, L"GetSite called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //TRACE("CISFBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); - - /* HRESULT hr; + TRACE("CISFBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); + + HRESULT hr; if (m_Site != NULL) { hr = m_Site->QueryInterface(riid, ppvSite); if (FAILED(hr)) return hr; - }*/ - - return E_NOTIMPL; + } + + *ppvSite = NULL; + return E_FAIL; } /*****************************************************************************/ @@ -79,13 +79,13 @@ { //MessageBox(0, L"GetWindow called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - /*if (!m_hWnd) + if (!m_hWnd) return E_FAIL; if (!phwnd) return E_INVALIDARG; - *phwnd = m_hWnd;*/ - - return E_NOTIMPL; + *phwnd = m_hWnd; + + return S_OK; } HRESULT STDMETHODCALLTYPE CISFBand::ContextSensitiveHelp( @@ -103,12 +103,12 @@ { //MessageBox(0, L"ShowDW called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - /*if (m_hWnd) + if (m_hWnd) { ShowWindow(m_hWnd, bShow ? SW_SHOW : SW_HIDE); - }*/ - - return E_NOTIMPL; + } + + return S_OK; } HRESULT STDMETHODCALLTYPE CISFBand::CloseDW( @@ -116,14 +116,14 @@ { //MessageBox(0, L"CloseDW called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - /*if (m_hWnd) + if (m_hWnd) { ShowWindow(m_hWnd, SW_HIDE); DestroyWindow(m_hWnd); m_hWnd = NULL; - }*/ - - return E_NOTIMPL; + } + + return S_OK; } HRESULT STDMETHODCALLTYPE CISFBand::ResizeBorderDW( @@ -145,9 +145,70 @@ { //MessageBox(0, L"GetBandInfo called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //TRACE("CTaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd); - - return E_NOTIMPL; + TRACE("CTaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd); + + HRESULT hr = E_INVALIDARG; + + if (m_hWnd && pdbi) + { + m_BandID = dwBandID; + pdbi->dwModeFlags = DBIMF_VARIABLEHEIGHT; + + if (dwViewMode & DBIF_VIEWMODE_VERTICAL) + { + pdbi->ptIntegral.y = 1; + pdbi->ptMinSize.y = 20; + /* FIXME: Get the button metrics from the task bar object!!! */ + pdbi->ptMinSize.x = (3 * GetSystemMetrics(SM_CXEDGE) / 2) + /* FIXME: Might be wrong if only one column! */ + GetSystemMetrics(SM_CXSIZE) + (2 * GetSystemMetrics(SM_CXEDGE)); /* FIXME: Min button size, query!!! */ + } + else + { + /* When the band is horizontal its minimum height is the height of the start button */ + RECT rcButton; + GetWindowRect(m_hWndStartButton, &rcButton); + pdbi->ptMinSize.y = rcButton.bottom - rcButton.top; + pdbi->ptIntegral.y = pdbi->ptMinSize.y + (3 * GetSystemMetrics(SM_CYEDGE) / 2); /* FIXME: Query metrics */ + /* We're not going to allow task bands where not even the minimum button size fits into the band */ + pdbi->ptMinSize.x = pdbi->ptIntegral.y; + } + + if (pdbi->dwMask & DBIM_MAXSIZE) + { + pdbi->ptMaxSize.y = -1; + } + + if (pdbi->dwMask & DBIM_ACTUAL) + { + pdbi->ptActual.x = 35; + pdbi->ptActual.y = 30; + } + + if (pdbi->dwMask & DBIM_TITLE) + { + // Don't show title by removing this flag. + pdbi->dwMask &= ~DBIM_TITLE; + } + + if (pdbi->dwMask & DBIM_MODEFLAGS) + { + pdbi->dwModeFlags = DBIMF_NORMAL | DBIMF_VARIABLEHEIGHT; + } + + if (pdbi->dwMask & DBIM_BKCOLOR) + { + // Use the default background color by removing this flag. + pdbi->dwMask &= ~DBIM_BKCOLOR; + } + + TRACE("H: %d, Min: %d,%d, Integral.y: %d Actual: %d,%d\n", (dwViewMode & DBIF_VIEWMODE_VERTICAL) == 0, + pdbi->ptMinSize.x, pdbi->ptMinSize.y, pdbi->ptIntegral.y, + pdbi->ptActual.x, pdbi->ptActual.y); + + hr = S_OK; + } + + return hr; } /*****************************************************************************/ @@ -155,7 +216,7 @@ HRESULT STDMETHODCALLTYPE CISFBand::SetClient( IN IUnknown *punkClient) { - //TRACE("IDeskBar::SetClient(0x%p)\n", punkClient); + TRACE("IDeskBar::SetClient(0x%p)\n", punkClient); //MessageBox(0, L"SetClient called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); @@ -165,7 +226,7 @@ HRESULT STDMETHODCALLTYPE CISFBand::GetClient( OUT IUnknown **ppunkClient) { - //TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient); + TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient); //MessageBox(0, L"GetClient called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); @@ -175,11 +236,11 @@ HRESULT STDMETHODCALLTYPE CISFBand::OnPosRectChangeDB( IN RECT *prc) { - //TRACE("IDeskBar::OnPosRectChangeDB(0x%p=(%d,%d,%d,%d))\n", prc, prc->left, prc->top, prc->right, prc->bottom); + TRACE("IDeskBar::OnPosRectChangeDB(0x%p=(%d,%d,%d,%d))\n", prc, prc->left, prc->top, prc->right, prc->bottom); //MessageBox(0, L"OnPosRectChangeDB called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - return E_NOTIMPL; + return S_OK; } /*****************************************************************************/ @@ -188,11 +249,12 @@ OUT CLSID *pClassID) { //MessageBox(0, L"GetClassID called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //TRACE("CISFBand::GetClassID(0x%p)\n", pClassID); + + TRACE("CISFBand::GetClassID(0x%p)\n", pClassID); /* We're going to return the (internal!) CLSID of the quick launch band */ - /* *pClassID = CLSID_QuickLaunchBand; */ - - return E_NOTIMPL; + *pClassID = CLSID_QuickLaunchBand; + + return S_OK; } HRESULT STDMETHODCALLTYPE CISFBand::IsDirty() @@ -201,18 +263,18 @@ //MessageBox(0, L"IsDirty called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - return E_NOTIMPL; + return S_FALSE; } HRESULT STDMETHODCALLTYPE CISFBand::Load( IN IStream *pStm) { - //TRACE("CISFBand::Load called\n"); + TRACE("CISFBand::Load called\n"); /* Nothing to do */ //MessageBox(0, L"Load called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - return E_NOTIMPL; + return S_OK; } HRESULT STDMETHODCALLTYPE CISFBand::Save( @@ -223,18 +285,18 @@ //MessageBox(0, L"Save called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - return E_NOTIMPL; + return S_OK; } HRESULT STDMETHODCALLTYPE CISFBand::GetSizeMax( OUT ULARGE_INTEGER *pcbSize) { - //TRACE("CISFBand::GetSizeMax called\n"); + TRACE("CISFBand::GetSizeMax called\n"); //pcbSize->QuadPart = 0; //MessageBox(0, L"GetSizeMax called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - return E_NOTIMPL; + return S_OK; } @@ -247,7 +309,7 @@ IN LPARAM lParam, OUT LRESULT *plrResult) { - //TRACE("CISFBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); + TRACE("CISFBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); //MessageBox(0, L"ProcessMessage called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); return E_NOTIMPL; @@ -258,20 +320,20 @@ { //MessageBox(0, L"ContainsWindow called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - /*if (hWnd == m_hWnd || + if (hWnd == m_hWnd || IsChild(m_hWnd, hWnd)) { TRACE("CISFBand::ContainsWindow(0x%p) returns S_OK\n", hWnd); return S_OK; - }*/ - - return E_NOTIMPL; + } + + return S_FALSE; } HRESULT STDMETHODCALLTYPE CISFBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { //MessageBox(0, L"OnWinEvent called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //UNIMPLEMENTED; + UNIMPLEMENTED; return E_NOTIMPL; } @@ -279,9 +341,7 @@ HRESULT STDMETHODCALLTYPE CISFBand::IsWindowOwner(HWND hWnd) { //MessageBox(0, L"IsWindowOwner called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //return (hWnd == m_hWnd) ? S_OK : S_FALSE; - - return E_NOTIMPL; + return (hWnd == m_hWnd) ? S_OK : S_FALSE; } /*****************************************************************************/ @@ -289,14 +349,14 @@ HRESULT STDMETHODCALLTYPE CISFBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) { //MessageBox(0, L"QueryStatus called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //UNIMPLEMENTED; + UNIMPLEMENTED; return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CISFBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - /*if (IsEqualIID(*pguidCmdGroup, IID_IBandSite)) + if (IsEqualIID(*pguidCmdGroup, IID_IBandSite)) { return S_OK; } @@ -304,10 +364,18 @@ if (IsEqualIID(*pguidCmdGroup, IID_IDeskBand)) { return S_OK; - }*/ + } //MessageBox(0, L"Exec called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - + UNIMPLEMENTED; + return E_NOTIMPL; } +//C Constructor + extern "C" + HRESULT WINAPI CIFSBand_CreateInstance(REFIID riid, void** ppv) + { + return ShellObjectCreator<CISFBand>(riid, ppv); + } + Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] Sun Jun 18 14:59:26 2017 @@ -18,10 +18,8 @@ public IWinEventHandler, public IOleCommandTarget { - CComPtr<IUnknown> m_Site; - CComPtr<IUnknown> m_punkISFB; - - HINSTANCE m_hInstance; + HINSTANCE m_hInstance; + CComPtr<IUnknown> m_Site; HWND m_hWnd; HWND m_hWndStartButton; DWORD m_BandID; @@ -164,4 +162,8 @@ COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) END_COM_MAP() -}; +}; + +//C Constructor +extern "C" +HRESULT WINAPI CIFSBand_CreateInstance(REFIID riid, void** ppv); Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] Sun Jun 18 14:59:26 2017 @@ -40,7 +40,7 @@ //CQuickLaunchBand - CQuickLaunchBand::CQuickLaunchBand() : m_hWnd(NULL), m_BandID(0) {} + CQuickLaunchBand::CQuickLaunchBand() {} CQuickLaunchBand::~CQuickLaunchBand() {} @@ -51,11 +51,11 @@ { //MessageBox(0, L"CQuickLaunchBand::FinalConstruct Begin!", L"Testing", MB_OK | MB_ICONINFORMATION); - HRESULT hr = CoCreateInstance(CLSID_ISFBand, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (void**) &m_punkISFB); + HRESULT hr = CIFSBand_CreateInstance(IID_IUnknown, (void**) &m_punkISFB); if (SUCCEEDED(hr)) { - //MessageBox(0, L"CoCreateInstance success!", L"Testing", MB_OK | MB_ICONINFORMATION); - + MessageBox(0, L"CreateInstance success!", L"Testing", MB_OK | MB_ICONINFORMATION); + /* CComPtr<IShellFolderBand> pISFB; hr = m_punkISFB->QueryInterface(IID_IShellFolderBand, (void**) &pISFB); if (SUCCEEDED(hr)) @@ -77,7 +77,7 @@ pISFB->InitializeSFB(pISF, 0); //} } - } + } */ } // MessageBox(0, L"CQuickLaunchBand::FinalConstruct End!", L"Testing", MB_OK | MB_ICONINFORMATION); @@ -86,24 +86,9 @@ //IObjectWithSite HRESULT STDMETHODCALLTYPE CQuickLaunchBand::SetSite(IUnknown *pUnkSite) - { - MessageBox(0, L"CQuickLaunchBand::SetSite called!", L"Testing", MB_OK | MB_ICONINFORMATION); - - /* HRESULT hRet; - HWND hwndParent; - + { TRACE("CQuickLaunchBand::SetSite(0x%p)\n", pUnkSite); - hRet = IUnknown_GetWindow(pUnkSite, &hwndParent); - if (FAILED(hRet)) - { - TRACE("Querying site window failed: 0x%x\n", hRet); - return hRet; - } - m_Site = pUnkSite; - m_hWnd = CreateWindowEx(0, L"BUTTON", L">>", WS_CHILD, CW_USEDEFAULT, CW_USEDEFAULT, 50, 50, hwndParent, 0, m_hInstance, 0); - SetWindowSubclass(hwndParent, MyWndProc, 0, 0); //when button is clicked, parent receives WM_COMMAND, and thus subclassed to show a test message box - */ //Internal CISFBand Calls CComPtr<IObjectWithSite> pIOWS; HRESULT hr = m_punkISFB->QueryInterface(IID_IObjectWithSite, (void**)&pIOWS); @@ -115,16 +100,8 @@ HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetSite( IN REFIID riid, OUT VOID **ppvSite) - { - //MessageBox(0, L"GetSite called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + { TRACE("CQuickLaunchBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); - - /* HRESULT hr; - if (m_Site != NULL) - { - hr = m_Site->QueryInterface(riid, ppvSite); - if (FAILED(hr)) return hr; - }*/ //Internal CISFBand Calls CComPtr<IObjectWithSite> pIOWS; @@ -138,14 +115,6 @@ //IDeskBand HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetWindow(OUT HWND *phwnd) { - //MessageBox(0, L"GetWindow called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - - /*if (!m_hWnd) - return E_FAIL; - if (!phwnd) - return E_INVALIDARG; - *phwnd = m_hWnd;*/ - //Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB); @@ -157,10 +126,6 @@ HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ContextSensitiveHelp( IN BOOL fEnterMode) { - /* FIXME: Implement */ - - //MessageBox(0, L"ContextSensitiveHelp called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB); @@ -171,14 +136,7 @@ HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ShowDW( IN BOOL bShow) - { - //MessageBox(0, L"ShowDW called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - - /*if (m_hWnd) - { - ShowWindow(m_hWnd, bShow ? SW_SHOW : SW_HIDE); - }*/ - + { //Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB); @@ -189,16 +147,7 @@ HRESULT STDMETHODCALLTYPE CQuickLaunchBand::CloseDW( IN DWORD dwReserved) - { - //MessageBox(0, L"CloseDW called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - - /*if (m_hWnd) - { - ShowWindow(m_hWnd, SW_HIDE); - DestroyWindow(m_hWnd); - m_hWnd = NULL; - }*/ - + { //Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB); @@ -211,11 +160,7 @@ LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) - { - /* No need to implement this method */ - - //MessageBox(0, L"ResizeBorderDW called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - + { //Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB); @@ -228,10 +173,8 @@ IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) - { - //MessageBox(0, L"GetBandInfo called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - - TRACE("CTaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd); + { + TRACE("CQuickLaunchBand::GetBandInfo(0x%x,0x%x,0x%p)\n", dwBandID, dwViewMode, pdbi); //Internal CISFBand Calls CComPtr<IDeskBand> pIDB; @@ -248,8 +191,6 @@ { TRACE("IDeskBar::SetClient(0x%p)\n", punkClient); - //MessageBox(0, L"SetClient called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //Internal CISFBand Calls CComPtr<IDeskBar> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBar, (void**)&pIDB); @@ -263,8 +204,6 @@ { TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient); - //MessageBox(0, L"GetClient called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //Internal CISFBand Calls CComPtr<IDeskBar> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBar, (void**)&pIDB); @@ -278,8 +217,6 @@ { TRACE("IDeskBar::OnPosRectChangeDB(0x%p=(%d,%d,%d,%d))\n", prc, prc->left, prc->top, prc->right, prc->bottom); - //MessageBox(0, L"OnPosRectChangeDB called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //Internal CISFBand Calls CComPtr<IDeskBar> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBar, (void**)&pIDB); @@ -292,11 +229,8 @@ //IPersistStream HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetClassID( OUT CLSID *pClassID) - { - //MessageBox(0, L"GetClassID called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + { TRACE("CQuickLaunchBand::GetClassID(0x%p)\n", pClassID); - /* We're going to return the (internal!) CLSID of the quick launch band */ - /* *pClassID = CLSID_QuickLaunchBand; */ //Internal CISFBand Calls CComPtr<IPersistStream> pIPS; @@ -307,11 +241,7 @@ } HRESULT STDMETHODCALLTYPE CQuickLaunchBand::IsDirty() - { - /* The object hasn't changed since the last save! */ - - //MessageBox(0, L"IsDirty called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - + { //Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream, (void**)&pIPS); @@ -324,9 +254,6 @@ IN IStream *pStm) { TRACE("CQuickLaunchBand::Load called\n"); - /* Nothing to do */ - - //MessageBox(0, L"Load called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); //Internal CISFBand Calls CComPtr<IPersistStream> pIPS; @@ -339,11 +266,7 @@ HRESULT STDMETHODCALLTYPE CQuickLaunchBand::Save( IN IStream *pStm, IN BOOL fClearDirty) - { - /* Nothing to do */ - - //MessageBox(0, L"Save called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - + { //Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream, (void**)&pIPS); @@ -356,10 +279,7 @@ OUT ULARGE_INTEGER *pcbSize) { TRACE("CQuickLaunchBand::GetSizeMax called\n"); - //pcbSize->QuadPart = 0; - - //MessageBox(0, L"GetSizeMax called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - + //Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream, (void**)&pIPS); @@ -379,31 +299,18 @@ OUT LRESULT *plrResult) { TRACE("CQuickLaunchBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); - - //MessageBox(0, L"ProcessMessage called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ContainsWindow( IN HWND hWnd) { - //MessageBox(0, L"ContainsWindow called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - - /*if (hWnd == m_hWnd || - IsChild(m_hWnd, hWnd)) - { - TRACE("CQuickLaunchBand::ContainsWindow(0x%p) returns S_OK\n", hWnd); - return S_OK; - }*/ - return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) - { - //MessageBox(0, L"OnWinEvent called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //UNIMPLEMENTED; - + { //Internal CISFBand Calls CComPtr<IWinEventHandler> pWEH; HRESULT hr = m_punkISFB->QueryInterface(IID_IWinEventHandler, (void**)&pWEH); @@ -413,10 +320,7 @@ } HRESULT STDMETHODCALLTYPE CQuickLaunchBand::IsWindowOwner(HWND hWnd) - { - //MessageBox(0, L"IsWindowOwner called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //return (hWnd == m_hWnd) ? S_OK : S_FALSE; - + { //Internal CISFBand Calls CComPtr<IWinEventHandler> pWEH; HRESULT hr = m_punkISFB->QueryInterface(IID_IWinEventHandler, (void**)&pWEH); @@ -428,10 +332,7 @@ /*****************************************************************************/ // *** IOleCommandTarget methods *** HRESULT STDMETHODCALLTYPE CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) - { - //MessageBox(0, L"QueryStatus called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - //UNIMPLEMENTED; - + { //Internal CISFBand Calls CComPtr<IOleCommandTarget> pOCT; HRESULT hr = m_punkISFB->QueryInterface(IID_IOleCommandTarget, (void**)&pOCT); @@ -441,19 +342,7 @@ } HRESULT STDMETHODCALLTYPE CQuickLaunchBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) - { - /*if (IsEqualIID(*pguidCmdGroup, IID_IBandSite)) - { - return S_OK; - } - - if (IsEqualIID(*pguidCmdGroup, IID_IDeskBand)) - { - return S_OK; - }*/ - - //MessageBox(0, L"Exec called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - + { //Internal CISFBand Calls CComPtr<IOleCommandTarget> pOCT; HRESULT hr = m_punkISFB->QueryInterface(IID_IOleCommandTarget, (void**)&pOCT); Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] Sun Jun 18 14:59:26 2017 @@ -23,16 +23,10 @@ public IPersistStream, public IWinEventHandler, public IOleCommandTarget -{ - CComPtr<IUnknown> m_Site; - CComPtr<IUnknown> m_punkISFB; +{ + CComPtr<IUnknown> m_punkISFB; - HINSTANCE m_hInstance; - HWND m_hWnd; - HWND m_hWndStartButton; - DWORD m_BandID; - -public: + public: CQuickLaunchBand(); virtual ~CQuickLaunchBand();

7 years, 3 months

[tfaber] 75094: [LIBMPG123] - Add missing files CORE-13451

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 18 14:08:53 2017 New Revision: 75094 URL: http://svn.reactos.org/svn/reactos?rev=75094&view=rev Log: [LIBMPG123] - Add missing files CORE-13451 Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h trunk/reactos/sdk/include/reactos/libs/libmpg123/intsym.h trunk/reactos/sdk/include/reactos/libs/libmpg123/mpg123.h Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h [iso-8859-1] Sun Jun 18 14:08:53 2017 @@ -83,9 +83,21 @@ /* Define to 1 if you have the <CUlib.h> header file. */ /* #undef HAVE_CULIB_H */ +/* Define to 1 if you have the <dirent.h> header file. */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the `dlclose' function. */ +/* #undef HAVE_DLCLOSE */ + /* Define to 1 if you have the <dlfcn.h> header file. */ /* #undef HAVE_DLFCN_H */ +/* Define to 1 if you have the `dlopen' function. */ +/* #undef HAVE_DLOPEN */ + +/* Define to 1 if you have the `dlsym' function. */ +/* #undef HAVE_DLSYM */ + /* Define if getaddrinfo accepts the AI_ADDRCONFIG flag */ /* #undef HAVE_GAI_ADDRCONFIG */ @@ -119,9 +131,6 @@ /* Define to 1 if you have the <locale.h> header file. */ #define HAVE_LOCALE_H 1 -/* Define if libltdl is available */ -/* #undef HAVE_LTDL */ - /* Define to 1 if you have the <machine/soundcard.h> header file. */ /* #undef HAVE_MACHINE_SOUNDCARD_H */ @@ -191,9 +200,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 @@ -220,6 +226,9 @@ /* Define to 1 if you have the <sys/resource.h> header file. */ /* #undef HAVE_SYS_RESOURCE_H */ + +/* Define to 1 if you have the <sys/select.h> header file. */ +/* #undef HAVE_SYS_SELECT_H */ /* Define to 1 if you have the <sys/signal.h> header file. */ /* #undef HAVE_SYS_SIGNAL_H */ @@ -267,11 +276,17 @@ functions. */ #define LFS_ALIAS_BITS 32 +/* Define to the extension used for runtime loadable modules, say, ".so". */ +/* #undef LT_MODULE_EXT */ + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" -/* The suffix for module files. */ -#define MODULE_FILE_SUFFIX ".la" +/* Define to the shared library suffix, say, ".dylib". */ +/* #undef LT_SHARED_EXT */ + +/* Define to the shared archive member specification, say "(shr.o)". */ +/* #undef LT_SHARED_LIB_MEMBER */ /* Define if network support is enabled. */ #define NETWORK 1 @@ -341,7 +356,7 @@ #define PACKAGE_NAME "mpg123" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "mpg123 1.23.0" +#define PACKAGE_STRING "mpg123 1.25.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mpg123" @@ -350,7 +365,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.23.0" +#define PACKAGE_VERSION "1.25.0" /* Define if portaudio v18 API is wanted. */ /* #undef PORTAUDIO18 */ @@ -383,7 +398,7 @@ /* #undef USE_YASM_FOR_AVX */ /* Version number of package */ -#define VERSION "1.23.0" +#define VERSION "1.25.0" /* Define to use Win32 named pipes */ #define WANT_WIN32_FIFO 1 Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/intsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/intsym.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/intsym.h [iso-8859-1] Sun Jun 18 14:08:53 2017 @@ -6,9 +6,12 @@ #define COS9 INT123_COS9 #define tfcos36 INT123_tfcos36 #define pnts INT123_pnts +#define catchsignal INT123_catchsignal #define safe_realloc INT123_safe_realloc +#define compat_strdup INT123_compat_strdup #define compat_open INT123_compat_open #define compat_fopen INT123_compat_fopen +#define compat_fdopen INT123_compat_fdopen #define compat_close INT123_compat_close #define compat_fclose INT123_compat_fclose #define win32_wide_utf8 INT123_win32_wide_utf8 @@ -242,6 +245,57 @@ #define feed_forget INT123_feed_forget #define feed_set_pos INT123_feed_set_pos #define open_bad INT123_open_bad +#define open_module INT123_open_module +#define close_module INT123_close_module +#define list_modules INT123_list_modules +#define buffer_init INT123_buffer_init +#define buffer_exit INT123_buffer_exit +#define buffer_sync_param INT123_buffer_sync_param +#define buffer_open INT123_buffer_open +#define buffer_encodings INT123_buffer_encodings +#define buffer_formats INT123_buffer_formats +#define buffer_start INT123_buffer_start +#define buffer_ndrain INT123_buffer_ndrain +#define buffer_stop INT123_buffer_stop +#define buffer_close INT123_buffer_close +#define buffer_continue INT123_buffer_continue +#define buffer_ignore_lowmem INT123_buffer_ignore_lowmem +#define buffer_drain INT123_buffer_drain +#define buffer_end INT123_buffer_end +#define buffer_pause INT123_buffer_pause +#define buffer_drop INT123_buffer_drop +#define buffer_write INT123_buffer_write +#define buffer_fill INT123_buffer_fill +#define read_buf INT123_read_buf +#define xfer_write_string INT123_xfer_write_string +#define xfer_read_string INT123_xfer_read_string +#define xfermem_init INT123_xfermem_init +#define xfermem_init_writer INT123_xfermem_init_writer +#define xfermem_init_reader INT123_xfermem_init_reader +#define xfermem_get_freespace INT123_xfermem_get_freespace +#define xfermem_get_usedspace INT123_xfermem_get_usedspace +#define xfermem_getcmd INT123_xfermem_getcmd +#define xfermem_getcmds INT123_xfermem_getcmds +#define xfermem_putcmd INT123_xfermem_putcmd +#define xfermem_writer_block INT123_xfermem_writer_block +#define xfermem_write INT123_xfermem_write +#define xfermem_done INT123_xfermem_done +#define au_open INT123_au_open +#define cdr_open INT123_cdr_open +#define raw_open INT123_raw_open +#define wav_open INT123_wav_open +#define wav_write INT123_wav_write +#define wav_close INT123_wav_close +#define au_close INT123_au_close +#define raw_close INT123_raw_close +#define cdr_formats INT123_cdr_formats +#define au_formats INT123_au_formats +#define raw_formats INT123_raw_formats +#define wav_formats INT123_wav_formats +#define wav_drain INT123_wav_drain +#define write_parameters INT123_write_parameters +#define read_parameters INT123_read_parameters +#define stringlists_add INT123_stringlists_add #define check_neon INT123_check_neon #define dct64_3dnow INT123_dct64_3dnow #define dct64_3dnowext INT123_dct64_3dnowext @@ -300,9 +354,6 @@ #define synth_1to1_s32_x86_64_asm INT123_synth_1to1_s32_x86_64_asm #define costab_mmxsse INT123_costab_mmxsse #define make_decode_tables_mmx_asm INT123_make_decode_tables_mmx_asm -#ifndef HAVE_STRDUP -#define strdup INT123_strdup -#endif #ifndef HAVE_STRERROR #define strerror INT123_strerror #endif Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/mpg123.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/mpg123.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/mpg123.h [iso-8859-1] Sun Jun 18 14:08:53 2017 @@ -1,5 +1,5 @@ /* - libmpg123: MPEG Audio Decoder library (version 1.23.0) + libmpg123: MPEG Audio Decoder library (version 1.25.0) copyright 1995-2015 by the mpg123 project free software under the terms of the LGPL 2.1 @@ -17,8 +17,9 @@ * This should be incremented at least each time a new symbol is added * to the header. */ -#define MPG123_API_VERSION 42 - +#define MPG123_API_VERSION 44 + +#ifndef MPG123_EXPORT /** Defines needed for MS Visual Studio(tm) DLL builds. * Every public function must be prefixed with MPG123_EXPORT. When building * the DLL ensure to define BUILD_MPG123_DLL. This makes the function accessible @@ -38,14 +39,26 @@ #define MPG123_EXPORT #endif #endif +#endif + +#ifndef __REACTOS__ +/* This is for Visual Studio, so this header works as distributed in the binary downloads */ +#if defined(_MSC_VER) && !defined(MPG123_DEF_SSIZE_T) +#define MPG123_DEF_SSIZE_T +#include <stddef.h> +typedef ptrdiff_t ssize_t; +#endif +#endif /* __REACTOS__ */ #ifndef MPG123_NO_CONFIGURE /* Enable use of this file without configure. */ #include <stdlib.h> #include <sys/types.h> +#ifdef __REACTOS__ #ifndef ssize_t typedef long ssize_t; #endif +#endif /* __REACTOS__ */ /* Simplified large file handling. I used to have a check here that prevents building for a library with conflicting large file setup @@ -196,6 +209,13 @@ ,MPG123_IGNORE_INFOFRAME = 0x4000 /**< 100 0000 0000 0000 Do not parse the LAME/Xing info frame, treat it as normal MPEG data. */ ,MPG123_AUTO_RESAMPLE = 0x8000 /**< 1000 0000 0000 0000 Allow automatic internal resampling of any kind (default on if supported). Especially when going lowlevel with replacing output buffer, you might want to unset this flag. Setting MPG123_DOWNSAMPLE or MPG123_FORCE_RATE will override this. */ ,MPG123_PICTURE = 0x10000 /**< 17th bit: Enable storage of pictures from tags (ID3v2 APIC). */ + ,MPG123_NO_PEEK_END = 0x20000 /**< 18th bit: Do not seek to the end of + * the stream in order to probe + * the stream length and search for the id3v1 field. This also means + * the file size is unknown unless set using mpg123_set_filesize() and + * the stream is assumed as non-seekable unless overridden. + */ + ,MPG123_FORCE_SEEKABLE = 0x40000 /**< 19th bit: Force the stream to be seekable. */ }; /** choices for MPG123_RVA */ @@ -395,7 +415,7 @@ * The active decoder engine can vary depening on output constraints, * mostly non-resampling, integer output is accelerated via 3DNow & Co. but for * other modes a fallback engine kicks in. - * Note that this can return a decoder that is ony active in the hidden and not + * Note that this can return a decoder that is only active in the hidden and not * available as decoder choice from the outside. * \param mh handle * \return The decoder name or NULL on error. @@ -411,7 +431,7 @@ * * Before you dive in, please be warned that you might get confused by this. This seems to happen a lot, therefore I am trying to explain in advance. * - * The mpg123 library decides what output format to use when encountering the first frame in a stream, or actually any frame that is still valid but differs from the frames before in the prompted output format. At such a deciding point, an internal table of allowed encodings, sampling rates and channel setups is consulted. According to this table, an output format is chosen and the decoding engine set up accordingly (including ptimized routines for different output formats). This might seem unusual but it just follows from the non-existence of "MPEG audio files" with defined overall properties. There are streams, streams are concatenations of (semi) independent frames. We store streams on disk and call them "MPEG audio files", but that does not change their nature as the decoder is concerned (the LAME/Xing header for gapless decoding makes things interesting again). + * The mpg123 library decides what output format to use when encountering the first frame in a stream, or actually any frame that is still valid but differs from the frames before in the prompted output format. At such a deciding point, an internal table of allowed encodings, sampling rates and channel setups is consulted. According to this table, an output format is chosen and the decoding engine set up accordingly (including optimized routines for different output formats). This might seem unusual but it just follows from the non-existence of "MPEG audio files" with defined overall properties. There are streams, streams are concatenations of (semi) independent frames. We store streams on disk and call them "MPEG audio files", but that does not change their nature as the decoder is concerned (the LAME/Xing header for gapless decoding makes things interesting again). * * To get to the point: What you do with mpg123_format() and friends is to fill the internal table of allowed formats before it is used. That includes removing support for some formats or adding your forced sample rate (see MPG123_FORCE_RATE) that will be used with the crude internal resampler. Also keep in mind that the sample encoding is just a question of choice -- the MPEG frames do only indicate their native sampling rate and channel count. If you want to decode to integer or float samples, 8 or 16 bit ... that is your decision. In a "clean" world, libmpg123 would always decode to 32 bit float and let you handle any sample conversion. But there are optimized routines that work faster by directly decoding to the desired encoding / accuracy. We prefer efficiency over conceptual tidyness. * @@ -481,6 +501,10 @@ , long rate, int encoding ); /** Get the current output format written to the addresses given. + * If the stream is freshly loaded, this will try to parse enough + * of it to give you the format to come. This clears the flag that + * would otherwise make the first decoding call return + * MPG123_NEW_FORMAT. * \param mh handle * \param rate sampling rate return address * \param channels channel count return address @@ -489,6 +513,20 @@ */ MPG123_EXPORT int mpg123_getformat( mpg123_handle *mh , long *rate, int *channels, int *encoding ); + +/** Get the current output format written to the addresses given. + * This differs from plain mpg123_getformat() in that you can choose + * _not_ to clear the flag that would trigger the next decoding call + * to return MPG123_NEW_FORMAT in case of a new format arriving. + * \param mh handle + * \param rate sampling rate return address + * \param channels channel count return address + * \param encoding encoding return address + * \param clear_flag if true, clear internal format flag + * \return MPG123_OK on success + */ +MPG123_EXPORT int mpg123_getformat2( mpg123_handle *mh +, long *rate, int *channels, int *encoding, int clear_flag ); /*@}*/ @@ -1101,7 +1139,7 @@ * Also, you might want to take a bit of care with preparing the data; for example, strip leading zeroes (I have seen that). * \param sb target string * \param enc mpg123 text encoding value - * \param source source buffer with plain unsigned bytes (you might need to cast from char *) + * \param source source buffer with plain unsigned bytes (you might need to cast from signed char) * \param source_size number of bytes in the source buffer * \return 0 on error, 1 on success (on error, mpg123_free_string is called on sb) */ @@ -1391,7 +1429,7 @@ * Note: As it would be troublesome to mess with this while having a file open, * this mpg123_close() is implied here. * \param mh handle - * \param r_read callback for reading (behaviour like POSIXread) + * \param r_read callback for reading (behaviour like POSIX read) * \param r_lseek callback for seeking (like POSIX lseek) * \param cleanup A callback to clean up an I/O handle on mpg123_close, * can be NULL for none (you take care of cleaning your handles). @@ -1408,6 +1446,4 @@ } #endif -#undef MPG123_EXPORT - #endif

7 years, 3 months

[tfaber] 75093: [LIBMPG123] - Update to version 1.25.0 CORE-13451

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 18 14:03:50 2017 New Revision: 75093 URL: http://svn.reactos.org/svn/reactos?rev=75093&view=rev Log: [LIBMPG123] - Update to version 1.25.0 CORE-13451 Added: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat.c - copied, changed from r75092, trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_str.c - copied, changed from r75091, trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h Removed: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h trunk/reactos/sdk/include/reactos/libs/libmpg123/mangle.h trunk/reactos/sdk/include/reactos/libs/libmpg123/sample.h trunk/reactos/sdk/include/reactos/libs/libmpg123/synth_sse3d.h trunk/reactos/sdk/lib/3rdparty/libmpg123/CMakeLists.txt trunk/reactos/sdk/lib/3rdparty/libmpg123/icy2utf8.c trunk/reactos/sdk/lib/3rdparty/libmpg123/id3.c trunk/reactos/sdk/lib/3rdparty/libmpg123/libmpg123.c trunk/reactos/sdk/lib/3rdparty/libmpg123/readers.c trunk/reactos/sdk/lib/3rdparty/libmpg123/synth.c Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/CMak… ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -16,5 +16,5 @@ set_module_type(winemp3.acm win32dll) set_target_properties(winemp3.acm PROPERTIES SUFFIX "") target_link_libraries(winemp3.acm wine libmpg123 oldnames) -add_importlibs(winemp3.acm winmm user32 msvcrt kernel32 ntdll) +add_importlibs(winemp3.acm shlwapi winmm user32 msvcrt kernel32 ntdll) add_cd_file(TARGET winemp3.acm DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -15,10 +15,14 @@ #define MPG123_COMPAT_H #include "config.h" - -/* Needed for strdup(), in strict mode ... */ -#ifndef _XOPEN_SOURCE -#define _XOPEN_SOURCE 500 +#include "intsym.h" + +/* For --nagging compilation with -std=c89, we need + to disable the inline keyword. */ +#ifdef PLAIN_C89 +#ifndef inline +#define inline +#endif #endif #include <errno.h> @@ -98,8 +102,10 @@ typedef unsigned char byte; #ifndef __REACTOS__ -#ifdef _MSC_VER -typedef long ssize_t; +#if defined(_MSC_VER) && !defined(MPG123_DEF_SSIZE_T) +#define MPG123_DEF_SSIZE_T +#include <stddef.h> +typedef ptrdiff_t ssize_t; #endif #endif /* __REACTOS__ */ @@ -109,9 +115,9 @@ const char *strerror(int errnum); #endif -#ifndef HAVE_STRDUP -char *strdup(const char *s); -#endif +/* Roll our own strdup() that does not depend on libc feature test macros + and returns NULL on NULL input instead of crashing. */ +char* compat_strdup(const char *s); /* If we have the size checks enabled, try to derive some sane printfs. Simple start: Use max integer type and format if long is not big enough. @@ -140,6 +146,10 @@ typedef long ssize_p; #endif +/* Get an environment variable, possibly converted to UTF-8 from wide string. + The return value is a copy that you shall free. */ +char *compat_getenv(const char* name); + /** * Opening a file handle can be different. * This function here is defined to take a path in native encoding (ISO8859 / UTF-8 / ...), or, when MS Windows Unicode support is enabled, an UTF-8 string that will be converted back to native UCS-2 (wide character) before calling the system's open function. @@ -149,6 +159,10 @@ */ int compat_open(const char *filename, int flags); FILE* compat_fopen(const char *filename, const char *mode); +/** + * Also fdopen to avoid having to define POSIX macros in various source files. + */ +FILE* compat_fdopen(int fd, const char *mode); /** * Closing a file handle can be platform specific. @@ -190,6 +204,67 @@ int win32_utf8_wide(const char *const mbptr, wchar_t **wptr, size_t *buflen); #endif +/* + A little bit of path abstraction: We always work with plain char strings + that usually represent POSIX-ish UTF-8 paths (something like c:/some/file + might appear). For Windows, those are converted to wide strings with \ + instead of / and possible fun is had with prefixes to get around the old + path length limit. Outside of the compat library, that stuff should not + matter, although something like //?/UNC/server/some/file could be thrown + around as UTF-8 string, to be converted to a wide \\?\UNC\server\some\file + just before handing it to Windows API. + + There is a lot of unnecessary memory allocation and string copying because + of this, but this filesystem stuff is not really relevant to mpg123 + performance, so the goal is to keep the code outside the compatibility layer + simple. +*/ + +/* + Concatenate a prefix and a path, one of them alowed to be NULL. + If the path is already absolute, the prefix is ignored. Relative + parts (like /..) are resolved if this is sensible for the platform + (meaning: for Windows), else they are preserved (on POSIX, actual + file system access would be needed because of symlinks). +*/ +char* compat_catpath(const char *prefix, const char* path); + +/* Return 1 if the given path indicates an existing directory, + 0 otherwise. */ +int compat_isdir(const char *path); + +/* + Directory traversal. This talks ASCII/UTF-8 paths externally, converts + to/from wchar_t internally if the platform wants that. Returning NULL + means failure to open/end of listing. + There is no promise about sorting entries. +*/ +struct compat_dir; +/* Returns NULL if either directory failed to open or listing is empty. + Listing can still be empty even if non-NULL, so always rely on the + nextfile/nextdir functions. */ +struct compat_dir* compat_diropen(char *path); +void compat_dirclose(struct compat_dir*); +/* Get the next entry that is a file (or symlink to one). + The returned string is a copy that needs to be freed after use. */ +char* compat_nextfile(struct compat_dir*); +/* Get the next entry that is a directory (or symlink to one). + The returned string is a copy that needs to be freed after use. */ +char* compat_nextdir (struct compat_dir*); + +#ifdef USE_MODULES +/* + For keeping the path mess local, a system-specific dlopen() variant + is contained in here, too. This is very thin wrapping, even sparing + definition of a handle type, just using void pointers. + Use of absolute paths is a good idea if you want to be sure which + file is openend, as default search paths vary. +*/ +void *compat_dlopen (const char *path); +void *compat_dlsym (void *handle, const char* name); +void compat_dlclose(void *handle); +#endif + /* Blocking write/read of data with signal resilience. Both continue after being interrupted by signals and always return the amount of processed data (shortage indicating actual problem or EOF). */ Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/mangle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/mangle.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/mangle.h [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -12,6 +12,13 @@ #include "config.h" #include "intsym.h" + +#if (defined OPT_I486) || (defined OPT_I586) || (defined OPT_I586_DITHER) \ + || (defined OPT_MMX) || (defined OPT_SSE) || (defined OPT_3DNOW) || (defined OPT_3DNOWEXT) \ + || (defined OPT_3DNOW_VINTAGE) || (defined OPT_3DNOWEXT_VINTAGE) \ + || (defined OPT_SSE_VINTAGE) +#define OPT_X86 +#endif #ifdef CCALIGN #define MOVUAPS movaps @@ -49,7 +56,15 @@ #define ALIGN32 .align 32 #define ALIGN64 .align 64 #else +#ifdef ASMALIGN_ARMASM +#define ALIGN4 ALIGN 4 +#define ALIGN8 ALIGN 8 +#define ALIGN16 ALIGN 16 +#define ALIGN32 ALIGN 32 +#define ALIGN64 ALIGN 64 +#else #error "Dunno how assembler alignment works. Please specify." +#endif #endif #endif @@ -61,7 +76,7 @@ #if defined(__USER_LABEL_PREFIX__) #define ASM_NAME(a) MANGLE_MACROCAT(__USER_LABEL_PREFIX__,a) #define ASM_VALUE(a) MANGLE_MACROCAT($,ASM_NAME(a)) -#elif defined(__CYGWIN__) || defined(_WIN32) && !defined (_WIN64) || defined(__OS2__) || \ +#elif defined(__CYGWIN__) || defined(_WIN32) && !defined (_WIN64) && !defined (_M_ARM) || defined(__OS2__) || \ (defined(__OpenBSD__) && !defined(__ELF__)) || defined(__APPLE__) #define ASM_NAME(a) MANGLE_MACROCAT(_,a) #define ASM_VALUE(a) MANGLE_MACROCAT($_,a) @@ -69,6 +84,62 @@ #define ASM_NAME(a) a #define ASM_VALUE(a) MANGLE_MACROCAT($,a) #endif + +/* Enable position-independent code for certain platforms. */ + +#if defined(OPT_X86) + +#define _EBX_ %ebx + +#if defined(PIC) && defined(__ELF__) + +/* ELF binaries (Unix/Linux) */ +#define LOCAL_VAR(a) a ## @GOTOFF(_EBX_) +#define GLOBAL_VAR(a) ASM_NAME(a) ## @GOTOFF(_EBX_) +#define GLOBAL_VAR_PTR(a) ASM_NAME(a) ## @GOT(_EBX_) +#define FUNC(a) ASM_NAME(a) +#define EXTERNAL_FUNC(a) ASM_NAME(a) ## @PLT +#undef ASM_VALUE +#define ASM_VALUE(a) MANGLE_MACROCAT($,a) ##@GOTOFF +#define GET_GOT \ + call 1f; \ +1: \ + pop _EBX_; \ +2: \ + addl $_GLOBAL_OFFSET_TABLE_ + (2b-1b), _EBX_ +#define PREPARE_GOT pushl _EBX_ +#define RESTORE_GOT popl _EBX_ + +#elif defined(PIC) && defined(__APPLE__) + +/* Mach-O binaries (OSX/iOS) */ +#define LOCAL_VAR(a) a ## - Lpic_base(_EBX_) +#define GLOBAL_VAR(a) #error This ABI cannot access non-local symbols directly. +#define GLOBAL_VAR_PTR(a) L_ ## a ## - Lpic_base(_EBX_) +#define FUNC(a) L_ ## a +#define EXTERNAL_FUNC(a) L_ ## a +#define GET_GOT \ + call Lpic_base; \ +Lpic_base: \ + pop _EBX_ +#define PREPARE_GOT pushl _EBX_ +#define RESTORE_GOT popl _EBX_ + +#else + +/* Dummies for everyone else. */ +#define LOCAL_VAR(a) a +#define GLOBAL_VAR ASM_NAME +#define GLOBAL_VAR_PTR(a) #error Cannot use indirect addressing in non-PIC object. +#define FUNC ASM_NAME +#define EXTERNAL_FUNC ASM_NAME +#define GET_GOT +#define PREPARE_GOT +#define RESTORE_GOT + +#endif /* PIC variants */ + +#endif /* OPT_X86 */ #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__) #define COMM(a,b,c) .comm a,b @@ -80,6 +151,13 @@ #define BSS .data #else #define BSS .bss +#endif + +/* armasm for WIN32 UWP */ +#ifdef _M_ARM +#define GLOBAL_SYMBOL EXPORT +#else +#define GLOBAL_SYMBOL .globl #endif /* Mark non-executable stack. @@ -94,7 +172,7 @@ #define NONEXEC_STACK #endif -#if defined(__x86_64__) && (defined(_WIN64) || defined (__CYGWIN__)) +#if (defined(__x86_64__) || defined(_M_X64)) && (defined(_WIN64) || defined (__CYGWIN__)) #define IS_MSABI 1 /* Not using SYSV */ #endif Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/sample.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/sample.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/sample.h [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -32,6 +32,7 @@ /* From now on for single precision float... double precision is a possible option once we added some bits. But, it would be rather insane. */ #ifndef REAL_TO_SHORT +#if (defined FORCE_ACCURATE) || (defined ACCURATE_ROUNDING) /* Define the accurate rounding function. */ # if (defined REAL_IS_FLOAT) && (defined IEEE_FLOAT) /* This function is only available for IEEE754 single-precision values @@ -51,6 +52,7 @@ /* The "proper" rounding, plain C, a bit slow. */ # define REAL_TO_SHORT_ACCURATE(x) (short)((x)>0.0?(x)+0.5:(x)-0.5) # endif +#endif /* Now define the normal rounding. */ # ifdef ACCURATE_ROUNDING Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/synth_sse3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/synth_sse3d.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/synth_sse3d.h [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -15,11 +15,12 @@ That's not memory efficient since there's doubled code, but it's easier than giving another function pointer. Maybe I'll change it in future, but now I need something that works. - Original comment from MPlayer source follows: + Original comment from MPlayer source follows. Regarding the license history see + synth_mmx.S, which the original comment about this being licensed under GPL is + relating to. */ /* - * this code comes under GPL * This code was taken from http://www.mpg123.org * See ChangeLog of mpg123-0.59s-pre.1 for detail * Applied to mplayer by Nick Kurshev <nickols_k(a)mail.ru> @@ -48,11 +49,25 @@ pushl %ebp /* stack:0=ebp 4=back 8=bandptr 12=channel 16=samples 20=buffs 24=bo 28=decwins */ movl %esp, %ebp + /* Now the old stack addresses are preserved via %epb. */ +#ifdef PIC + subl $8,%esp /* What has been called temp before. */ +#else subl $4,%esp /* What has been called temp before. */ +#endif pushl %edi pushl %esi pushl %ebx + +#ifdef PIC + #undef _EBX_ + #define _EBX_ %eax + GET_GOT +#define EBXSAVE -4(%ebp) + movl _EBX_, EBXSAVE /* save PIC register */ +#endif + #define TEMP 12(%esp) /* APP */ movl 12(%ebp),%ecx @@ -94,6 +109,9 @@ leal (%ecx,%ebx,2), %edx movl (%esp),%ecx /* restore, but leave value on stack */ shrl $1, %ecx +#ifdef PIC + movl EBXSAVE, _EBX_ +#endif ALIGN16 3: movq (%edx),%mm0 @@ -130,8 +148,8 @@ packssdw %mm4,%mm4 movq (%edi), %mm1 punpckldq %mm4, %mm0 - pand one_null, %mm1 - pand null_one, %mm0 + pand LOCAL_VAR(one_null), %mm1 + pand LOCAL_VAR(null_one), %mm0 por %mm0, %mm1 movq %mm1,(%edi) leal 64(%esi),%esi @@ -166,6 +184,10 @@ 4: subl $64,%esi movl $7,%ecx + +#ifdef PIC + movl EBXSAVE, _EBX_ +#endif ALIGN16 5: movq (%edx),%mm0 @@ -206,8 +228,8 @@ psubsw %mm5,%mm4 movq (%edi), %mm1 punpckldq %mm4, %mm0 - pand one_null, %mm1 - pand null_one, %mm0 + pand LOCAL_VAR(one_null), %mm1 + pand LOCAL_VAR(null_one), %mm0 por %mm0, %mm1 movq %mm1,(%edi) subl $64,%esi @@ -241,6 +263,6 @@ popl %ebx popl %esi popl %edi - addl $4,%esp + mov %ebp, %esp popl %ebp ret Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -15,6 +15,7 @@ list(APPEND SOURCE compat/compat.c + compat/compat_str.c dct64.c dct64_i386.c equalizer.c Copied: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat.c (from r75092, trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -1,59 +1,180 @@ /* - compat: Some compatibility functions. + compat: Some compatibility functions (basic memory & string stuff in separate file) The mpg123 code is determined to keep it's legacy. A legacy of old, old UNIX. So anything possibly somewhat advanced should be considered to be put here, with proper #ifdef;-) - copyright 2007-8 by the mpg123 project - free software under the terms of the LGPL 2.1 + copyright 2007-2016 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org initially written by Thomas Orgis, Windows Unicode stuff by JonY. */ #include "config.h" +/* This source file does need _POSIX_SOURCE to get some sigaction. */ +#define _POSIX_SOURCE #include "compat.h" #ifdef _MSC_VER #include <io.h> -#else -#include <fcntl.h> -#endif -#include <sys/stat.h> - + +#if(defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_APP)) +#define WINDOWS_UWP +#endif + +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif + +/* Win32 is only supported with unicode now. These headers also cover + module stuff. The WANT_WIN32_UNICODE macro is synonymous with + "want windows-specific API, and only the unicode variants of which". */ #ifdef WANT_WIN32_UNICODE #include <wchar.h> #include <windows.h> #include <winnls.h> +#include <shlwapi.h> +#endif + +#ifdef USE_MODULES +# ifdef HAVE_DLFCN_H +# include <dlfcn.h> +# endif #endif #include "debug.h" -/* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ -void *safe_realloc(void *ptr, size_t size) -{ - if(ptr == NULL) return malloc(size); - else return realloc(ptr, size); -} - -#ifndef HAVE_STRERROR -const char *strerror(int errnum) -{ - extern int sys_nerr; - extern char *sys_errlist[]; - - return (errnum < sys_nerr) ? sys_errlist[errnum] : ""; -} -#endif - -#ifndef HAVE_STRDUP -char *strdup(const char *src) -{ - char *dest; - - if (!(dest = (char *) malloc(strlen(src)+1))) - return NULL; +#ifndef WINDOWS_UWP + +char *compat_getenv(const char* name) +{ + char *ret = NULL; +#ifdef WANT_WIN32_UNICODE + wchar_t *env; + wchar_t *wname = NULL; + if(win32_utf8_wide(name, &wname, NULL) > 0) + { + env = _wgetenv(wname); + free(wname); + if(env) + win32_wide_utf8(env, &ret, NULL); + } +#else + ret = getenv(name); + if(ret) + ret = compat_strdup(ret); +#endif + return ret; +} + +#ifdef WANT_WIN32_UNICODE + +/* Convert unix UTF-8 (or ASCII) paths to Windows wide character paths. */ +static wchar_t* u2wpath(const char *upath) +{ + wchar_t* wpath, *p; + if(!upath || win32_utf8_wide(upath, &wpath, NULL) < 1) + return NULL; + for(p=wpath; *p; ++p) + if(*p == L'/') + *p = L'\\'; + return wpath; +} + +/* Convert Windows wide character paths to unix UTF-8. */ +static char* w2upath(const wchar_t *wpath) +{ + char* upath, *p; + if(!wpath || win32_wide_utf8(wpath, &upath, NULL) < 1) + return NULL; + for(p=upath; *p; ++p) + if(*p == '\\') + *p = '/'; + return upath; +} + +/* An absolute path that is too long and not already marked with + \\?\ can be marked as a long one and still work. */ +static int wpath_need_elongation(wchar_t *wpath) +{ + if( wpath && !PathIsRelativeW(wpath) + && wcslen(wpath) > MAX_PATH-1 + && wcsncmp(L"\\\\?\\", wpath, 4) ) + return 1; else - return strcpy(dest, src); -} + return 0; +} + +/* Take any wide windows path and turn it into a path that is allowed + to be longer than MAX_PATH, if it is not already. */ +static wchar_t* wlongpath(wchar_t *wpath) +{ + size_t len, plen; + const wchar_t *prefix = L""; + wchar_t *wlpath = NULL; + if(!wpath) + return NULL; + + /* Absolute paths that do not start with \\?\ get that prepended + to allow them being long. */ + if(!PathIsRelativeW(wpath) && wcsncmp(L"\\\\?\\", wpath, 4)) + { + if(wcslen(wpath) >= 2 && PathIsUNCW(wpath)) + { + /* \\server\path -> \\?\UNC\server\path */ + prefix = L"\\\\?\\UNC"; + ++wpath; /* Skip the first \. */ + } + else /* c:\some/path -> \\?\c:\some\path */ + prefix = L"\\\\?\\"; + } + plen = wcslen(prefix); + len = plen + wcslen(wpath); + wlpath = malloc(len+1*sizeof(wchar_t)); + if(wlpath) + { + /* Brute force memory copying, swprintf is too dandy. */ + memcpy(wlpath, prefix, sizeof(wchar_t)*plen); + memcpy(wlpath+plen, wpath, sizeof(wchar_t)*(len-plen)); + wlpath[len] = 0; + } + return wlpath; +} + +/* Convert unix path to wide windows path, optionally marking + it as long path if necessary. */ +static wchar_t* u2wlongpath(const char *upath) +{ + wchar_t *wpath = NULL; + wchar_t *wlpath = NULL; + wpath = u2wpath(upath); + if(wpath_need_elongation(wpath)) + { + wlpath = wlongpath(wpath); + free(wpath); + wpath = wlpath; + } + return wpath; +} + +#endif + +#else + +static wchar_t* u2wlongpath(const char *upath) +{ + wchar_t* wpath, *p; + if (!upath || win32_utf8_wide(upath, &wpath, NULL) < 1) + return NULL; + for (p = wpath; *p; ++p) + if (*p == L'/') + *p = L'\\'; + return wpath; +} + #endif /* Always add a default permission mask in case of flags|O_CREAT. */ @@ -63,9 +184,9 @@ #if defined (WANT_WIN32_UNICODE) wchar_t *frag = NULL; - ret = win32_utf8_wide(filename, &frag, NULL); + frag = u2wlongpath(filename); /* Fallback to plain open when ucs-2 conversion fails */ - if((frag == NULL) || (ret == 0)) + if(!frag) goto open_fallback; /*Try _wopen */ @@ -86,8 +207,7 @@ #if defined (WANT_WIN32_UNICODE) open_ok: - /* A cast to void*? Does Windows need that?! */ - free((void *)frag); + free(frag); #endif return ret; @@ -103,8 +223,8 @@ wchar_t *wname = NULL; wchar_t *wmode = NULL; - cnt = win32_utf8_wide(filename, &wname, NULL); - if( (wname == NULL) || (cnt == 0)) + wname = u2wlongpath(filename); + if(!wname) goto fopen_fallback; cnt = win32_utf8_wide(mode, &wmode, NULL); if( (wmode == NULL) || (cnt == 0)) @@ -123,6 +243,11 @@ free(wname); #endif return stream; +} + +FILE* compat_fdopen(int fd, const char *mode) +{ + return fdopen(fd, mode); } int compat_close(int infd) @@ -181,6 +306,310 @@ } #endif +#ifndef WINDOWS_UWP + +/* + The Windows file and path stuff is an extract of jon_y's win32 loader + prototype from the loader_rework branch. It's been divided in to + reusable functons by ThOr in the hope to work out some generic-looking + loader code for both POSIX and Windows. The routines might be + helpful for consistent path work in other parts of mpg123, too. + + This all is about getting some working code on a wide range of + systems while staying somewhat sane. If it does ridiculously inefficient + things with extraneous copies and grabbing of functions that made + it late to some official APIs, that's still fine with us. +*/ + +char* compat_catpath(const char *prefix, const char* path) +{ + char *ret = NULL; +#ifdef WANT_WIN32_UNICODE + wchar_t *wprefix = NULL; /* Wide windows versions of */ + wchar_t *wpath = NULL; /* input arguments. */ + wchar_t *locwret = NULL; /* Tmp return value from LocalAlloc */ + /* + This variation of combinepath can work with long and UNC paths, but + is not officially exposed in any DLLs, It also allocates all its buffers + internally via LocalAlloc, avoiding buffer overflow problems. + ThOr: I presume this hack is for supporting pre-8 Windows, as + from Windows 8 on, this is documented in the API. + */ + HRESULT (__stdcall *mypac)( const wchar_t *in, const wchar_t* more + , unsigned long flags, wchar_t **out ) = NULL; + HMODULE pathcch = NULL; + + if(!prefix && !path) + goto catpath_end; + wprefix = u2wpath(prefix); + wpath = u2wpath(path); + if((prefix && !wprefix) || (path && !wpath)) + goto catpath_end; + + /* Again: I presume this whole fun is to get at PathAllocCombine + even when pathcch.h is not available (like in MinGW32). */ + if( (pathcch = GetModuleHandleA("kernelbase")) ) + mypac = (void *)GetProcAddress(pathcch, "PathAllocCombine"); + if(mypac) /* PATHCCH_ALLOW_LONG_PATH = 1 per API docs */ + { + debug("Actually calling PathAllocCombine!"); + mypac(wprefix, wpath, 1, &locwret); + } + else + { + /* Playing safe, if we'd care much about performance, this would be on + the stack. */ + locwret = LocalAlloc(LPTR, sizeof(wchar_t)*MAX_PATH); + if(locwret) + PathCombineW(locwret, wprefix, wpath); + } + ret = w2upath(locwret); + +catpath_end: + LocalFree(locwret); + free(wprefix); + free(wpath); +#else + size_t len, prelen, patlen; + + if(path && path[0] == '/') + prefix = NULL; /* Absolute path stays as it is. */ + prelen = prefix ? strlen(prefix) : 0; + patlen = path ? strlen(path) : 0; + /* Concatenate the two, put a / in between if both present. */ + len = ((prefix && path) ? 1 : 0) + prelen + patlen; + ret = malloc(len+1); + if(ret) + { + size_t off=0; + memcpy(ret, prefix, prelen); + if(prefix && path) + ret[prelen+(off++)] = '/'; + memcpy(ret+prelen+off, path, patlen); + ret[len] = 0; + } +#endif + return ret; +} + +int compat_isdir(const char *path) +{ + int ret = 0; +#ifdef WANT_WIN32_UNICODE + wchar_t *wpath; + wpath = u2wlongpath(path); + if(wpath) + { + DWORD attr = GetFileAttributesW(wpath); + if(attr != INVALID_FILE_ATTRIBUTES && attr & FILE_ATTRIBUTE_DIRECTORY) + ret=1; + free(wpath); + } +#else + struct stat sb; + if(path && !stat(path, &sb)) + { + if(S_ISDIR(sb.st_mode)) + ret=1; + } +#endif + return ret; +} + +struct compat_dir +{ + char *path; +#ifdef WANT_WIN32_UNICODE + int gotone; /* Got a result stored from FindFirstFileW. */ + WIN32_FIND_DATAW d; + HANDLE ffn; +#else + DIR* dir; +#endif +}; + +struct compat_dir* compat_diropen(char *path) +{ + struct compat_dir *cd; + if(!path) + return NULL; + cd = malloc(sizeof(*cd)); + if(!cd) + return NULL; +#ifdef WANT_WIN32_UNICODE + cd->gotone = 0; + { + char *pattern; + wchar_t *wpattern; + pattern = compat_catpath(path, "*"); + wpattern = u2wlongpath(pattern); + if(wpattern) + { + cd->ffn = FindFirstFileW(wpattern, &(cd->d)); + if(cd->ffn == INVALID_HANDLE_VALUE) + { + /* FindClose() only needed after successful first find, right? */ + free(cd); + cd = NULL; + } + else + cd->gotone = 1; + } + free(wpattern); + free(pattern); + } +#else + cd->dir = opendir(path); + if(!cd->dir) + { + free(cd); + cd = NULL; + } +#endif + if(cd) + { + cd->path = compat_strdup(path); + if(!cd->path) + { + compat_dirclose(cd); + cd = NULL; + } + } + return cd; +} + +void compat_dirclose(struct compat_dir *cd) +{ + if(cd) + { + free(cd->path); +#ifdef WANT_WIN32_UNICODE + FindClose(cd->ffn); +#else + closedir(cd->dir); +#endif + free(cd); + } +} + +char* compat_nextfile(struct compat_dir *cd) +{ + if(!cd) + return NULL; +#ifdef WANT_WIN32_UNICODE + while(cd->gotone || FindNextFileW(cd->ffn, &(cd->d))) + { + cd->gotone = 0; + if(!(cd->d.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + char *ret; + win32_wide_utf8(cd->d.cFileName, &ret, NULL); + return ret; + } + } +#else + { + struct dirent *dp; + while((dp = readdir(cd->dir))) + { + struct stat fst; + char *fullpath = compat_catpath(cd->path, dp->d_name); + if(fullpath && !stat(fullpath, &fst) && S_ISREG(fst.st_mode)) + { + free(fullpath); + return compat_strdup(dp->d_name); + } + free(fullpath); + } + } +#endif + return NULL; +} + +char* compat_nextdir(struct compat_dir *cd) +{ + if(!cd) + return NULL; +#ifdef WANT_WIN32_UNICODE + while(cd->gotone || FindNextFileW(cd->ffn, &(cd->d))) + { + cd->gotone = 0; + if(cd->d.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + char *ret; + win32_wide_utf8(cd->d.cFileName, &ret, NULL); + return ret; + } + } +#else + { + struct dirent *dp; + while((dp = readdir(cd->dir))) + { + struct stat fst; + char *fullpath = compat_catpath(cd->path, dp->d_name); + if(fullpath && !stat(fullpath, &fst) && S_ISDIR(fst.st_mode)) + { + free(fullpath); + return compat_strdup(dp->d_name); + } + free(fullpath); + } + } +#endif + return NULL; +} + +#endif + +#ifdef USE_MODULES +/* + This is what I expected the platform-specific dance for dynamic module + support to be. Little did I know about the peculiarities of (long) + paths and directory/file search on Windows. +*/ + +void *compat_dlopen(const char *path) +{ + void *handle = NULL; +#ifdef WANT_WIN32_UNICODE + wchar_t *wpath; + wpath = u2wlongpath(path); + if(wpath) + handle = LoadLibraryW(wpath); + free(wpath); +#else + handle = dlopen(path, RTLD_NOW); +#endif + return handle; +} + +void *compat_dlsym(void *handle, const char *name) +{ + void *sym = NULL; + if(!handle) + return NULL; +#ifdef WANT_WIN32_UNICODE + sym = GetProcAddress(handle, name); +#else + sym = dlsym(handle, name); +#endif + return sym; +} + +void compat_dlclose(void *handle) +{ + if(!handle) + return; +#ifdef WANT_WIN32_UNICODE + FreeLibrary(handle); +#else + dlclose(handle); +#endif +} + +#endif /* USE_MODULES */ + /* This shall survive signals and any return value less than given byte count is an error */ Removed: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h (removed) @@ -1,236 +0,0 @@ -/* - compat: Some compatibility functions. - - The mpg123 code is determined to keep it's legacy. A legacy of old, old UNIX. - So anything possibly somewhat advanced should be considered to be put here, with proper #ifdef;-) - - copyright 2007-8 by the mpg123 project - free software under the terms of the LGPL 2.1 - see COPYING and AUTHORS files in distribution or http://mpg123.org - initially written by Thomas Orgis, Windows Unicode stuff by JonY. -*/ - -#include "config.h" -#include "compat.h" - -#ifdef _MSC_VER -#include <io.h> -#else -#include <fcntl.h> -#endif -#include <sys/stat.h> - -#ifdef WANT_WIN32_UNICODE -#include <wchar.h> -#include <windows.h> -#include <winnls.h> -#endif - -#include "debug.h" - -/* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ -void *safe_realloc(void *ptr, size_t size) -{ - if(ptr == NULL) return malloc(size); - else return realloc(ptr, size); -} - -#ifndef HAVE_STRERROR -const char *strerror(int errnum) -{ - extern int sys_nerr; - extern char *sys_errlist[]; - - return (errnum < sys_nerr) ? sys_errlist[errnum] : ""; -} -#endif - -#ifndef HAVE_STRDUP -char *strdup(const char *src) -{ - char *dest; - - if (!(dest = (char *) malloc(strlen(src)+1))) - return NULL; - else - return strcpy(dest, src); -} -#endif - -/* Always add a default permission mask in case of flags|O_CREAT. */ -int compat_open(const char *filename, int flags) -{ - int ret; -#if defined (WANT_WIN32_UNICODE) - wchar_t *frag = NULL; - - ret = win32_utf8_wide(filename, &frag, NULL); - /* Fallback to plain open when ucs-2 conversion fails */ - if((frag == NULL) || (ret == 0)) - goto open_fallback; - - /*Try _wopen */ - ret = _wopen(frag, flags|_O_BINARY, _S_IREAD | _S_IWRITE); - if(ret != -1 ) - goto open_ok; /* msdn says -1 means failure */ - -open_fallback: -#endif - -#if (defined(WIN32) && !defined (__CYGWIN__)) - /* MSDN says POSIX function is deprecated beginning in Visual C++ 2005 */ - /* Try plain old _open(), if it fails, do nothing */ - ret = _open(filename, flags|_O_BINARY, _S_IREAD | _S_IWRITE); -#else - ret = open(filename, flags, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); -#endif - -#if defined (WANT_WIN32_UNICODE) -open_ok: - /* A cast to void*? Does Windows need that?! */ - free((void *)frag); -#endif - - return ret; -} - -/* Moved over from wav.c, logic with fallbacks added from the - example of compat_open(). */ -FILE* compat_fopen(const char *filename, const char *mode) -{ - FILE* stream = NULL; -#ifdef WANT_WIN32_UNICODE - int cnt = 0; - wchar_t *wname = NULL; - wchar_t *wmode = NULL; - - cnt = win32_utf8_wide(filename, &wname, NULL); - if( (wname == NULL) || (cnt == 0)) - goto fopen_fallback; - cnt = win32_utf8_wide(mode, &wmode, NULL); - if( (wmode == NULL) || (cnt == 0)) - goto fopen_fallback; - - stream = _wfopen(wname, wmode); - if(stream) goto fopen_ok; - -fopen_fallback: -#endif - stream = fopen(filename, mode); -#ifdef WANT_WIN32_UNICODE - -fopen_ok: - free(wmode); - free(wname); -#endif - return stream; -} - -int compat_close(int infd) -{ -#if (defined(WIN32) && !defined (__CYGWIN__)) /* MSDN says POSIX function is deprecated beginning in Visual C++ 2005 */ - return _close(infd); -#else - return close(infd); -#endif -} - -int compat_fclose(FILE *stream) -{ - return fclose(stream); -} - -/* Windows Unicode stuff */ - -#ifdef WANT_WIN32_UNICODE -int win32_wide_utf8(const wchar_t * const wptr, char **mbptr, size_t * buflen) -{ - size_t len; - char *buf; - int ret = 0; - - len = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, NULL, 0, NULL, NULL); /* Get utf-8 string length */ - buf = calloc(len + 1, sizeof (char)); /* Can we assume sizeof char always = 1? */ - - if(!buf) len = 0; - else { - if (len != 0) ret = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, buf, len, NULL, NULL); /*Do actual conversion*/ - buf[len] = '0'; /* Must terminate */ - } - *mbptr = buf; /* Set string pointer to allocated buffer */ - if(buflen != NULL) *buflen = (len) * sizeof (char); /* Give length of allocated memory if needed. */ - return ret; -} - -int win32_utf8_wide(const char *const mbptr, wchar_t **wptr, size_t *buflen) -{ - size_t len; - wchar_t *buf; - int ret = 0; - - len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, NULL, 0); /* Get converted size */ - buf = calloc(len + 1, sizeof (wchar_t)); /* Allocate memory accordingly */ - - if(!buf) len = 0; - else { - if (len != 0) ret = MultiByteToWideChar (CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, buf, len); /* Do conversion */ - buf[len] = L'0'; /* Must terminate */ - } - *wptr = buf; /* Set string pointer to allocated buffer */ - if (buflen != NULL) *buflen = len * sizeof (wchar_t); /* Give length of allocated memory if needed. */ - return ret; /* Number of characters written */ -} -#endif - - -/* This shall survive signals and any return value less than given byte count - is an error */ -size_t unintr_write(int fd, void const *buffer, size_t bytes) -{ - size_t written = 0; - while(bytes) - { - ssize_t part = write(fd, (char*)buffer+written, bytes); - if(part < 0 && errno != EINTR) - break; - bytes -= part; - written += part; - } - return written; -} - -/* Same for reading the data. */ -size_t unintr_read(int fd, void *buffer, size_t bytes) -{ - size_t got = 0; - while(bytes) - { - ssize_t part = read(fd, (char*)buffer+got, bytes); - if(part < 0 && errno != EINTR) - break; - bytes -= part; - got += part; - } - return got; -} - -#ifndef NO_CATCHSIGNAL -#if (!defined(WIN32) || defined (__CYGWIN__)) && defined(HAVE_SIGNAL_H) -void (*catchsignal(int signum, void(*handler)()))() -{ - struct sigaction new_sa; - struct sigaction old_sa; - -#ifdef DONT_CATCH_SIGNALS - fprintf (stderr, "Not catching any signals.\n"); - return ((void (*)()) -1); -#endif - - new_sa.sa_handler = handler; - sigemptyset(&new_sa.sa_mask); - new_sa.sa_flags = 0; - if(sigaction(signum, &new_sa, &old_sa) == -1) - return ((void (*)()) -1); - return (old_sa.sa_handler); -} -#endif -#endif Copied: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_str.c (from r75091, trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_str.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -1,30 +1,15 @@ /* - compat: Some compatibility functions. + compat: Some compatibility functions (basic memory and string stuff) The mpg123 code is determined to keep it's legacy. A legacy of old, old UNIX. So anything possibly somewhat advanced should be considered to be put here, with proper #ifdef;-) - copyright 2007-8 by the mpg123 project - free software under the terms of the LGPL 2.1 + copyright 2007-2016 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org initially written by Thomas Orgis, Windows Unicode stuff by JonY. */ -#include "config.h" #include "compat.h" - -#ifdef _MSC_VER -#include <io.h> -#else -#include <fcntl.h> -#endif -#include <sys/stat.h> - -#ifdef WANT_WIN32_UNICODE -#include <wchar.h> -#include <windows.h> -#include <winnls.h> -#endif - #include "debug.h" /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ @@ -44,193 +29,15 @@ } #endif -#ifndef HAVE_STRDUP -char *strdup(const char *src) +char* compat_strdup(const char *src) { - char *dest; - - if (!(dest = (char *) malloc(strlen(src)+1))) - return NULL; - else - return strcpy(dest, src); + char *dest = NULL; + if(src) + { + size_t len; + len = strlen(src)+1; + if((dest = malloc(len))) + memcpy(dest, src, len); + } + return dest; } -#endif - -/* Always add a default permission mask in case of flags|O_CREAT. */ -int compat_open(const char *filename, int flags) -{ - int ret; -#if defined (WANT_WIN32_UNICODE) - wchar_t *frag = NULL; - - ret = win32_utf8_wide(filename, &frag, NULL); - /* Fallback to plain open when ucs-2 conversion fails */ - if((frag == NULL) || (ret == 0)) - goto open_fallback; - - /*Try _wopen */ - ret = _wopen(frag, flags|_O_BINARY, _S_IREAD | _S_IWRITE); - if(ret != -1 ) - goto open_ok; /* msdn says -1 means failure */ - -open_fallback: -#endif - -#if (defined(WIN32) && !defined (__CYGWIN__)) - /* MSDN says POSIX function is deprecated beginning in Visual C++ 2005 */ - /* Try plain old _open(), if it fails, do nothing */ - ret = _open(filename, flags|_O_BINARY, _S_IREAD | _S_IWRITE); -#else - ret = open(filename, flags, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); -#endif - -#if defined (WANT_WIN32_UNICODE) -open_ok: - /* A cast to void*? Does Windows need that?! */ - free((void *)frag); -#endif - - return ret; -} - -/* Moved over from wav.c, logic with fallbacks added from the - example of compat_open(). */ -FILE* compat_fopen(const char *filename, const char *mode) -{ - FILE* stream = NULL; -#ifdef WANT_WIN32_UNICODE - int cnt = 0; - wchar_t *wname = NULL; - wchar_t *wmode = NULL; - - cnt = win32_utf8_wide(filename, &wname, NULL); - if( (wname == NULL) || (cnt == 0)) - goto fopen_fallback; - cnt = win32_utf8_wide(mode, &wmode, NULL); - if( (wmode == NULL) || (cnt == 0)) - goto fopen_fallback; - - stream = _wfopen(wname, wmode); - if(stream) goto fopen_ok; - -fopen_fallback: -#endif - stream = fopen(filename, mode); -#ifdef WANT_WIN32_UNICODE - -fopen_ok: - free(wmode); - free(wname); -#endif - return stream; -} - -int compat_close(int infd) -{ -#if (defined(WIN32) && !defined (__CYGWIN__)) /* MSDN says POSIX function is deprecated beginning in Visual C++ 2005 */ - return _close(infd); -#else - return close(infd); -#endif -} - -int compat_fclose(FILE *stream) -{ - return fclose(stream); -} - -/* Windows Unicode stuff */ - -#ifdef WANT_WIN32_UNICODE -int win32_wide_utf8(const wchar_t * const wptr, char **mbptr, size_t * buflen) -{ - size_t len; - char *buf; - int ret = 0; - - len = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, NULL, 0, NULL, NULL); /* Get utf-8 string length */ - buf = calloc(len + 1, sizeof (char)); /* Can we assume sizeof char always = 1? */ - - if(!buf) len = 0; - else { - if (len != 0) ret = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, buf, len, NULL, NULL); /*Do actual conversion*/ - buf[len] = '0'; /* Must terminate */ - } - *mbptr = buf; /* Set string pointer to allocated buffer */ - if(buflen != NULL) *buflen = (len) * sizeof (char); /* Give length of allocated memory if needed. */ - return ret; -} - -int win32_utf8_wide(const char *const mbptr, wchar_t **wptr, size_t *buflen) -{ - size_t len; - wchar_t *buf; - int ret = 0; - - len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, NULL, 0); /* Get converted size */ - buf = calloc(len + 1, sizeof (wchar_t)); /* Allocate memory accordingly */ - - if(!buf) len = 0; - else { - if (len != 0) ret = MultiByteToWideChar (CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, buf, len); /* Do conversion */ - buf[len] = L'0'; /* Must terminate */ - } - *wptr = buf; /* Set string pointer to allocated buffer */ - if (buflen != NULL) *buflen = len * sizeof (wchar_t); /* Give length of allocated memory if needed. */ - return ret; /* Number of characters written */ -} -#endif - - -/* This shall survive signals and any return value less than given byte count - is an error */ -size_t unintr_write(int fd, void const *buffer, size_t bytes) -{ - size_t written = 0; - while(bytes) - { - ssize_t part = write(fd, (char*)buffer+written, bytes); - if(part < 0 && errno != EINTR) - break; - bytes -= part; - written += part; - } - return written; -} - -/* Same for reading the data. */ -size_t unintr_read(int fd, void *buffer, size_t bytes) -{ - size_t got = 0; - while(bytes) - { - ssize_t part = read(fd, (char*)buffer+got, bytes); - if(part < 0 && errno != EINTR) - break; - bytes -= part; - got += part; - } - return got; -} - -#ifndef NO_CATCHSIGNAL -#if (!defined(WIN32) || defined (__CYGWIN__)) && defined(HAVE_SIGNAL_H) -void (*catchsignal(int signum, void(*handler)()))() -{ - struct sigaction new_sa; - struct sigaction old_sa; - -#ifdef DONT_CATCH_SIGNALS - fprintf (stderr, "Not catching any signals.\n"); - return ((void (*)()) -1); -#endif - - new_sa.sa_handler = handler; - sigemptyset(&new_sa.sa_mask); - new_sa.sa_flags = 0; - if(sigaction(signum, &new_sa, &old_sa) == -1) - return ((void (*)()) -1); - return (old_sa.sa_handler); -} -#endif -#endif Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/icy2utf8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/icy2utf8.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/icy2utf8.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -384,7 +384,7 @@ /* Some funny streams from Apple/iTunes give ICY info in UTF-8 already. So, be prepared and don't try to re-encode such. Unless forced. */ - if(!force && is_utf8(src)) return (strdup(src)); + if(!force && is_utf8(src)) return (compat_strdup(src)); srclen = strlen(src) + 1; /* allocate conservatively */ Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/id3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/id3.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/id3.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -656,6 +656,9 @@ unsigned char flags = 0; int ret = 1; int ret2; +#ifndef NO_ID3V2 + int skiptag = 0; +#endif unsigned char major = first4bytes & 0xff; debug1("ID3v2: major tag version: %i", major); if(major == 0xff) return 0; /* Invalid... */ @@ -706,17 +709,28 @@ #ifndef NO_ID3V2 if(VERBOSE2) fprintf(stderr,"Note: ID3v2.%i rev %i tag of %lu bytes\n", major, buf[0], length); /* skip if unknown version/scary flags, parse otherwise */ - if(fr->p.flags & MPG123_SKIP_ID3V2 || ((flags & UNKNOWN_FLAGS) || (major > 4) || (major < 2))) + if(fr->p.flags & MPG123_SKIP_ID3V2) + { + if(VERBOSE3) + fprintf(stderr, "Note: Skipping ID3v2 tag per user request.\n"); + skiptag = 1; + } + if((flags & UNKNOWN_FLAGS) || (major > 4) || (major < 2)) { if(NOQUIET) - { - if(fr->p.flags & MPG123_SKIP_ID3V2) - { - if(VERBOSE3) fprintf(stderr, "Note: Skipping ID3v2 tag per user request.\n"); - } - else /* Must be because of scary Tag properties. */ - warning2("ID3v2: Won't parse the ID3v2 tag with major version %u and flags 0x%xu - some extra code may be needed", major, flags); - } + warning2( "ID3v2: Won't parse the ID3v2 tag with major version" + " %u and flags 0x%xu - some extra code may be needed" + , major, flags ); + skiptag = 1; + } + if(length < 10) + { + if(NOQUIET) + warning1("ID3v2: unrealistic small tag lengh %lu, skipping", length); + skiptag = 1; + } + if(skiptag) + { #endif if((ret2 = fr->rd->skip_bytes(fr,length)) < 0) /* will not store data in backbuff! */ ret = ret2; Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/libmpg123.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/libmpg123.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/libmpg123.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -11,6 +11,9 @@ #include "debug.h" #include "gapless.h" +/* Want accurate rounding function regardless of decoder setup. */ +#define FORCE_ACCURATE +#include "sample.h" #define SEEKFRAME(mh) ((mh)->ignoreframe < 0 ? 0 : (mh)->ignoreframe) @@ -31,6 +34,15 @@ prepare_decode_tables(); check_decoders(); initialized = 1; +#if (defined REAL_IS_FLOAT) && (defined IEEE_FLOAT) + /* This is rather pointless but it eases my mind to check that we did + not enable the special rounding on a VAX or something. */ + if(12346 != REAL_TO_SHORT_ACCURATE(12345.67f)) + { + error("Bad IEEE 754 rounding. Re-build libmpg123 properly."); + return MPG123_ERR; + } +#endif return MPG123_OK; } @@ -357,7 +369,7 @@ { size_t sval = bc_fill(&mh->rdat.buffer); theval = (long)sval; - if((size_t)theval != sval) + if(theval < 0 || (size_t)theval != sval) { mh->err = MPG123_INT_OVERFLOW; ret = MPG123_ERR; @@ -1035,7 +1047,8 @@ return MPG123_OK; } -int attribute_align_arg mpg123_getformat(mpg123_handle *mh, long *rate, int *channels, int *encoding) +int attribute_align_arg mpg123_getformat2( mpg123_handle *mh +, long *rate, int *channels, int *encoding, int clear_flag ) { int b; @@ -1046,8 +1059,13 @@ if(rate != NULL) *rate = mh->af.rate; if(channels != NULL) *channels = mh->af.channels; if(encoding != NULL) *encoding = mh->af.encoding; - mh->new_format = 0; + if(clear_flag) mh->new_format = 0; return MPG123_OK; +} + +int attribute_align_arg mpg123_getformat(mpg123_handle *mh, long *rate, int *channels, int *encoding) +{ + return mpg123_getformat2(mh, rate, channels, encoding, 1); } off_t attribute_align_arg mpg123_timeframe(mpg123_handle *mh, double seconds) Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/readers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/readers.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/readers.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -1049,8 +1049,10 @@ if(fr->p.icy_interval > 0) fr->rdat.lseek = nix_lseek; #endif - fr->rdat.filelen = get_fileinfo(fr); + fr->rdat.filelen = fr->p.flags & MPG123_NO_PEEK_END ? -1 : get_fileinfo(fr); fr->rdat.filepos = 0; + if(fr->p.flags & MPG123_FORCE_SEEKABLE) + fr->rdat.flags |= READER_SEEKABLE; /* Don't enable seeking on ICY streams, just plain normal files. This check is necessary since the client can enforce ICY parsing on files that would otherwise be seekable. Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/synth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/synth.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/synth.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -7,6 +7,9 @@ */ #include "mpg123lib_intern.h" +#ifdef OPT_GENERIC_DITHER +#define FORCE_ACCURATE +#endif #include "sample.h" #include "debug.h"

7 years, 3 months

[tfaber] 75092: [LIBMPG123] - Fix ssize_t CORE-13451

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 18 13:35:40 2017 New Revision: 75092 URL: http://svn.reactos.org/svn/reactos?rev=75092&view=rev Log: [LIBMPG123] - Fix ssize_t CORE-13451 Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h [iso-8859-1] Sun Jun 18 13:35:40 2017 @@ -97,9 +97,11 @@ typedef unsigned char byte; +#ifndef __REACTOS__ #ifdef _MSC_VER typedef long ssize_t; #endif +#endif /* __REACTOS__ */ /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ void *safe_realloc(void *ptr, size_t size); Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h [iso-8859-1] Sun Jun 18 13:35:40 2017 @@ -451,7 +451,7 @@ /* #undef size_t */ /* Define to `long' if <sys/types.h> does not define. */ -/* #undef ssize_t */ +#define ssize_t long /* Define to `unsigned short' if <sys/types.h> does not define. */ /* #undef uint16_t */

7 years, 3 months

← Newer
1
...
13
14
15
16
17
18
19
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2017