Skip to content

Commit ad23d6b

Browse files
papyrussolutionpapyrussolution
committed
Version 11.4.2
1 parent c144c5f commit ad23d6b

File tree

12 files changed

+54
-79
lines changed

12 files changed

+54
-79
lines changed

‎Src/BuildVC70/papyrus.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ EndProject
6969
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsoap-supp", "gsoap-supp.vcproj", "{813784D9-8B70-4880-91E7-51BB4265D187}"
7070
ProjectSection(ProjectDependencies) = postProject
7171
{D507E468-21FC-4209-A5A8-DE1F055866DC} = {D507E468-21FC-4209-A5A8-DE1F055866DC}
72-
{82523A80-856A-4957-BCEA-1A5738139141} = {82523A80-856A-4957-BCEA-1A5738139141}
7372
EndProjectSection
7473
EndProject
7574
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPSoapUhtt", "PPSoapUhtt.vcproj", "{265B05E1-A149-4509-9A4E-594253F8D417}"

‎Src/Include/PPDBS.H‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// PPDBS.H
2-
// This file was generated by DL600C.EXE from 'D:\Papyrus\Src\Rsrc\dl600\ppdbs.dl6'
2+
// This file was generated by DL600C.EXE from 'd:\Papyrus\Src\Rsrc\dl600\ppdbs.dl6'
33
//
44
#ifndef __PPDBS_H
55
#define __PPDBS_H

‎Src/Include/Private/VERDATA.INC‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
//
22
// ..\INCLUDE\PRIVATE\VERDATA.INC
3-
// 2022-06-23T16:15:10
3+
// 2022-06-23T16:52:32
44
// Automaticaly generated file
55
// Don't modify!
66
//
77
0x24, 0x00, 0x00, 0x00, 0x33, 0x30, 0x79, 0x61, 0x52, 0x42, 0x44, 0x33, 0x44, 0x4f, 0x57, 0x45, 0x68, 0x31, 0x52, 0x66, 0x56, 0x32, 0x70, 0x74, 0x74, 0x7a, 0x51, 0x4a, 0x50, 0x59, 0x7a, 0x44,
8-
0x4a, 0x00, 0x76, 0x48, 0x00, 0x01, 0x00, 0x00, 0x21, 0xb5, 0x60, 0x0c, 0xca, 0x1c, 0x51, 0xdb, 0x9b, 0x8d, 0x76, 0x49, 0xbb, 0x9c, 0xab, 0x77, 0x43, 0xaa, 0xe8, 0x14, 0xcd, 0x92, 0x0b, 0xd0,
9-
0x11, 0xc3, 0x43, 0xc6, 0x45, 0xab, 0x7a, 0x41, 0xca, 0x49, 0x68, 0xd0, 0x32, 0x90, 0xae, 0x34, 0xba, 0x3f, 0xdc, 0x4d, 0xac, 0x51, 0xc1, 0x31, 0xd7, 0xe7, 0x0a, 0xd1, 0xa9, 0x09, 0x36, 0x2f,
10-
0x07, 0x49, 0x0c, 0xee, 0x20, 0x8f, 0x76, 0x2d, 0x1e, 0x4b, 0xad, 0x3f, 0xa4, 0x02, 0x89, 0x89, 0xfb, 0x92, 0x1a, 0x32, 0xf7, 0xd8, 0x6f, 0x87, 0x80, 0x85, 0x26, 0x29, 0xef, 0x78, 0xf0, 0xb9,
11-
0x99, 0x33, 0x86, 0x8f, 0x7e, 0xfb, 0x61, 0xd7, 0x9b, 0x7e, 0x36, 0x58, 0x2d, 0xf6, 0xd3, 0x36, 0x00, 0x01, 0xe6, 0x1b, 0x00, 0x25, 0x0d, 0x3d, 0x62, 0x3a, 0x12, 0x49, 0xa9, 0xca, 0xaf, 0xcc,
12-
0x71, 0x17, 0xde, 0xea, 0x82, 0x8d, 0x45, 0x1c, 0xe5, 0x2a, 0xd9, 0x63, 0x0e, 0x07, 0x49, 0x38, 0x99, 0xd4, 0x57, 0x98, 0x7b, 0x53, 0x99, 0xdd, 0x9d, 0x8d, 0xb0, 0xdb, 0x50, 0x5f, 0x50, 0x6b,
13-
0x4f, 0x85, 0x7a, 0x45, 0xf5, 0x81, 0xbb, 0xcc, 0xb3, 0xca, 0x8f, 0x4b, 0xda, 0x59, 0xc5, 0xce, 0xaa, 0xfe, 0xcb, 0xf0, 0xe1, 0x2a, 0x45, 0x30, 0xd7, 0xe8, 0x85, 0x8d, 0xb3, 0xfe, 0xb7, 0x8a,
14-
0xb5, 0x7e, 0x75, 0x46, 0x61, 0x54, 0x5c, 0xda, 0x12, 0x79, 0xda, 0x0f, 0x9d, 0x16, 0x7b, 0x7b, 0xef, 0xb6, 0x6f, 0x28, 0xba, 0xb4, 0xb4, 0xc1, 0x0d, 0x91, 0xf4, 0x58, 0xe7, 0x25, 0x28, 0x22
8+
0x4a, 0x00, 0x11, 0x2e, 0x00, 0x01, 0x00, 0x00, 0x21, 0xb5, 0x60, 0x0c, 0xca, 0x1c, 0x51, 0xdb, 0x9b, 0x8d, 0x76, 0x49, 0xbb, 0x9c, 0xab, 0x77, 0x43, 0xaa, 0xe8, 0x18, 0xcd, 0x92, 0x0b, 0xd0,
9+
0x50, 0x2b, 0xc5, 0x80, 0xe3, 0x19, 0xbc, 0x92, 0xdb, 0x8f, 0x0c, 0x5e, 0x69, 0x89, 0x97, 0xd0, 0xb4, 0x63, 0xde, 0x0a, 0xe6, 0x39, 0x9f, 0x46, 0x65, 0x7f, 0xd0, 0xa6, 0x08, 0x4e, 0x2d, 0xd9,
10+
0xdb, 0x28, 0x1c, 0x2b, 0x94, 0x15, 0xd9, 0x04, 0x9f, 0x31, 0x02, 0xa4, 0x96, 0x8e, 0x44, 0x7d, 0x93, 0x3a, 0x7a, 0xd9, 0x75, 0x70, 0xae, 0xef, 0xdd, 0x95, 0x3a, 0xf6, 0xc9, 0xee, 0xbd, 0x1e,
11+
0xb2, 0xe7, 0xb8, 0xfb, 0x43, 0xab, 0x4a, 0xfe, 0xae, 0xcd, 0x15, 0x79, 0x02, 0x58, 0x10, 0x61, 0x2f, 0x47, 0x0c, 0x13, 0xbc, 0xd5, 0xa9, 0x78, 0x9a, 0xef, 0xd5, 0x0b, 0xf9, 0x97, 0x07, 0xbf,
12+
0xea, 0xcc, 0x7a, 0xfc, 0x1c, 0x9d, 0xa1, 0xd5, 0x30, 0xf4, 0xdd, 0x11, 0xae, 0xe3, 0xb7, 0xda, 0xc1, 0xf6, 0x7f, 0x61, 0xb1, 0x97, 0xf8, 0xfb, 0xd0, 0x76, 0x6c, 0x01, 0xee, 0x57, 0x8f, 0x21,
13+
0xf3, 0xcd, 0xdf, 0xc2, 0x95, 0xaf, 0xc8, 0xec, 0x7f, 0x0e, 0x8d, 0xfd, 0xbc, 0x21, 0xe4, 0x80, 0x2c, 0x7b, 0xa9, 0xd5, 0xa3, 0x47, 0x65, 0xac, 0x7c, 0x67, 0x39, 0x15, 0xcf, 0xfa, 0xa3, 0x17,
14+
0xfc, 0xe3, 0xa1, 0x2e, 0x26, 0xb8, 0x85, 0x2a, 0x5b, 0xdf, 0x50, 0xd3, 0xf3, 0x2e, 0x10, 0x5f, 0x96, 0x90, 0xe0, 0xfd, 0xab, 0xea, 0xb1, 0xf3, 0xd2, 0x70, 0xfe, 0xa9, 0x7c, 0x2b, 0xeb, 0x23

‎Src/OSF/CAIRO-1160/PIXMAN/pixman-access.c‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -556,10 +556,8 @@ static void fetch_scanline_yv12(bits_image_t * image, int x, int line, int width
556556
int32 g = 0x012b27 * y - 0x00d0f2 * v - 0x00647e * u;
557557
/* B = 1.164(Y - 16) + 2.018(U - 128) */
558558
int32 b = 0x012b27 * y + 0x0206a2 * u;
559-
*buffer++ = 0xff000000 |
560-
(r >= 0 ? r < 0x1000000 ? r & 0xff0000 : 0xff0000 : 0) |
561-
(g >= 0 ? g < 0x1000000 ? (g >> 8) & 0x00ff00 : 0x00ff00 : 0) |
562-
(b >= 0 ? b < 0x1000000 ? (b >> 16) & 0x0000ff : 0x0000ff : 0);
559+
*buffer++ = 0xff000000 | (r >= 0 ? r < 0x1000000 ? r & 0xff0000 : 0xff0000 : 0) |
560+
(g >= 0 ? g < 0x1000000 ? (g >> 8) & 0x00ff00 : 0x00ff00 : 0) | (b >= 0 ? b < 0x1000000 ? (b >> 16) & 0x0000ff : 0x0000ff : 0);
563561
}
564562
}
565563

@@ -825,10 +823,10 @@ static void fetch_scanline_a8r8g8b8_32_sRGB(bits_image_t * image, int x, int y,
825823
const uint32 * end = pixel + width;
826824
while(pixel < end) {
827825
uint32 tmp = READ(image, pixel++);
828-
uint8 a = (tmp >> 24) & 0xff;
829-
uint8 r = (tmp >> 16) & 0xff;
830-
uint8 g = (tmp >> 8) & 0xff;
831-
uint8 b = (tmp >> 0) & 0xff;
826+
uint8 a = static_cast<uint8>((tmp >> 24) & 0xff);
827+
uint8 r = static_cast<uint8>((tmp >> 16) & 0xff);
828+
uint8 g = static_cast<uint8>((tmp >> 8) & 0xff);
829+
uint8 b = static_cast<uint8>((tmp >> 0) & 0xff);
832830
r = static_cast<uint8>(to_linear[r] * 255.0f + 0.5f);
833831
g = static_cast<uint8>(to_linear[g] * 255.0f + 0.5f);
834832
b = static_cast<uint8>(to_linear[b] * 255.0f + 0.5f);
@@ -840,10 +838,10 @@ static uint32 fetch_pixel_a8r8g8b8_32_sRGB(bits_image_t * image, int offset, int
840838
{
841839
uint32 * bits = image->bits + line * image->rowstride;
842840
uint32 tmp = READ(image, bits + offset);
843-
uint8 a = (tmp >> 24) & 0xff;
844-
uint8 r = (tmp >> 16) & 0xff;
845-
uint8 g = (tmp >> 8) & 0xff;
846-
uint8 b = (tmp >> 0) & 0xff;
841+
uint8 a = static_cast<uint8>((tmp >> 24) & 0xff);
842+
uint8 r = static_cast<uint8>((tmp >> 16) & 0xff);
843+
uint8 g = static_cast<uint8>((tmp >> 8) & 0xff);
844+
uint8 b = static_cast<uint8>((tmp >> 0) & 0xff);
847845
r = static_cast<uint8>(to_linear[r] * 255.0f + 0.5f);
848846
g = static_cast<uint8>(to_linear[g] * 255.0f + 0.5f);
849847
b = static_cast<uint8>(to_linear[b] * 255.0f + 0.5f);
@@ -857,12 +855,11 @@ static void store_scanline_a8r8g8b8_32_sRGB(bits_image_t * image, int x, int y,
857855
uint32 * pixel = bits + x;
858856
uint64 tmp;
859857
for(int i = 0; i < width; ++i) {
860-
uint8 a, r, g, b;
861858
tmp = values[i];
862-
a = (tmp >> 24) & 0xff;
863-
r = (tmp >> 16) & 0xff;
864-
g = (tmp >> 8) & 0xff;
865-
b = (tmp >> 0) & 0xff;
859+
uint8 a = static_cast<uint8>((tmp >> 24) & 0xff);
860+
uint8 r = static_cast<uint8>((tmp >> 16) & 0xff);
861+
uint8 g = static_cast<uint8>((tmp >> 8) & 0xff);
862+
uint8 b = static_cast<uint8>((tmp >> 0) & 0xff);
866863
r = to_srgb(r * (1/255.0f));
867864
g = to_srgb(g * (1/255.0f));
868865
b = to_srgb(b * (1/255.0f));

‎Src/OSF/libarchive-350/libarchive/archive_blake2.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,12 @@ typedef struct blake2xb_state__ {
121121
blake2b_state S[1];
122122
blake2b_param P[1];
123123
} blake2xb_state;
124-
125-
/* Padded structs result in a compile-time error */
124+
//
125+
// Padded structs result in a compile-time error
126+
//
126127
enum {
127-
BLAKE2_DUMMY_1 = 1/(sizeof(blake2s_param) == BLAKE2S_OUTBYTES),
128-
BLAKE2_DUMMY_2 = 1/(sizeof(blake2b_param) == BLAKE2B_OUTBYTES)
128+
BLAKE2_DUMMY_1 = 1/BIN(sizeof(blake2s_param) == BLAKE2S_OUTBYTES),
129+
BLAKE2_DUMMY_2 = 1/BIN(sizeof(blake2b_param) == BLAKE2B_OUTBYTES)
129130
};
130131
//
131132
// Streaming API

‎Src/OSF/libarchive-350/libarchive/archive_read_support_format_zip.c‎

Lines changed: 20 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -638,11 +638,9 @@ static int process_extra(ArchiveRead * a, ArchiveEntry * entry,
638638
uint32 comment_length;
639639
if(datasize < 2)
640640
break;
641-
comment_length
642-
= archive_le16dec(p + offset);
641+
comment_length = archive_le16dec(p + offset);
643642
offset += 2;
644643
datasize -= 2;
645-
646644
if(datasize < comment_length)
647645
break;
648646
/* Comment is not supported by libarchive */
@@ -658,7 +656,6 @@ static int process_extra(ArchiveRead * a, ArchiveEntry * entry,
658656
break;
659657
offset += 5;
660658
datasize -= 5;
661-
662659
/* The path name in this field is always encoded
663660
* in UTF-8. */
664661
if(zip->sconv_utf8 == NULL) {
@@ -669,7 +666,6 @@ static int process_extra(ArchiveRead * a, ArchiveEntry * entry,
669666
if(zip->sconv_utf8 == NULL)
670667
break;
671668
}
672-
673669
/* Make sure the CRC32 of the filename matches. */
674670
if(!zip->ignore_crc32) {
675671
const char * cp = archive_entry_pathname(entry);
@@ -700,8 +696,7 @@ static int process_extra(ArchiveRead * a, ArchiveEntry * entry,
700696
if(datasize >= 2)
701697
zip_entry->uid = archive_le16dec(p + offset);
702698
if(datasize >= 4)
703-
zip_entry->gid =
704-
archive_le16dec(p + offset + 2);
699+
zip_entry->gid = archive_le16dec(p + offset + 2);
705700
break;
706701
case 0x7875:
707702
{
@@ -719,13 +714,11 @@ static int process_extra(ArchiveRead * a, ArchiveEntry * entry,
719714
}
720715
if(datasize >= (2 + uidsize + 3)) {
721716
/* get a gid size. */
722-
gidsize = 0xff &
723-
(int)p[offset+2+uidsize];
717+
gidsize = 0xff & (int)p[offset+2+uidsize];
724718
if(gidsize == 2)
725719
zip_entry->gid = archive_le16dec(p+offset+2+uidsize+1);
726-
else if(gidsize == 4 &&
727-
datasize >= (2 + uidsize + 5))
728-
zip_entry->gid = archive_le32dec(p+offset+2+uidsize+1);
720+
else if(gidsize == 4 && datasize >= (2 + uidsize + 5))
721+
zip_entry->gid = archive_le32dec(p+offset+2+uidsize+1);
729722
}
730723
}
731724
break;
@@ -738,13 +731,11 @@ static int process_extra(ArchiveRead * a, ArchiveEntry * entry,
738731
}
739732
if(p[offset + 2] == 'A' && p[offset + 3] == 'E') {
740733
/* Vendor version. */
741-
zip_entry->aes_extra.vendor =
742-
archive_le16dec(p + offset);
734+
zip_entry->aes_extra.vendor = archive_le16dec(p + offset);
743735
/* AES encryption strength. */
744736
zip_entry->aes_extra.strength = p[offset + 4];
745737
/* Actual compression method. */
746-
zip_entry->aes_extra.compression =
747-
p[offset + 5];
738+
zip_entry->aes_extra.compression = p[offset + 5];
748739
}
749740
break;
750741
default:
@@ -793,7 +784,6 @@ static int zipx_lzma_uncompress_buffer(const char * compressed_buffer, size_t co
793784
memcpy(lzma_alone_compressed_buffer, (void *)&alone_header, sizeof(alone_header));
794785
// copy compressed data into new buffer
795786
memcpy(lzma_alone_compressed_buffer + sizeof(alone_header), compressed_buffer + lzma_params_end, compressed_buffer_size - lzma_params_end);
796-
797787
// create and fill in lzma_alone_decoder stream
798788
lzma_stream stream = LZMA_STREAM_INIT;
799789
lzma_ret ret = lzma_alone_decoder(&stream, UINT64_MAX);
@@ -812,27 +802,25 @@ static int zipx_lzma_uncompress_buffer(const char * compressed_buffer, size_t co
812802
SAlloc::F(lzma_alone_compressed_buffer);
813803
return status;
814804
}
815-
816805
/*
817806
* Assumes file pointer is at beginning of local file header.
818807
*/
819-
static int zip_read_local_file_header(ArchiveRead * a, ArchiveEntry * entry,
820-
struct zip * zip)
808+
static int zip_read_local_file_header(ArchiveRead * a, ArchiveEntry * entry, struct zip * zip)
821809
{
822810
const char * p;
823811
const void * h;
824812
const wchar_t * wp;
825813
const char * cp;
826-
size_t len, filename_length, extra_length;
814+
size_t len;
815+
size_t filename_length;
816+
size_t extra_length;
827817
archive_string_conv * sconv;
828818
struct zip_entry * zip_entry = zip->entry;
829819
struct zip_entry zip_entry_central_dir;
830820
int ret = ARCHIVE_OK;
831821
char version;
832-
833822
/* Save a copy of the original for consistency checks. */
834823
zip_entry_central_dir = *zip_entry;
835-
836824
zip->decompress_init = 0;
837825
zip->end_of_entry = 0;
838826
zip->entry_uncompressed_bytes_read = 0;
@@ -876,9 +864,7 @@ static int zip_read_local_file_header(ArchiveRead * a, ArchiveEntry * entry,
876864
zip_entry->uncompressed_size = archive_le32dec(p + 22);
877865
filename_length = archive_le16dec(p + 26);
878866
extra_length = archive_le16dec(p + 28);
879-
880867
__archive_read_consume(a, 30);
881-
882868
/* Read the filename. */
883869
if((h = __archive_read_ahead(a, filename_length, NULL)) == NULL) {
884870
archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, "Truncated ZIP file header");
@@ -1514,7 +1500,7 @@ static int zip_read_data_zipx_xz(ArchiveRead * a, const void ** buff, size_t * s
15141500
archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, "Truncated xz file body");
15151501
return ARCHIVE_FATAL;
15161502
}
1517-
in_bytes = zipmin(zip->entry_bytes_remaining, bytes_avail);
1503+
in_bytes = static_cast<ssize_t>(zipmin(zip->entry_bytes_remaining, bytes_avail));
15181504
zip->zipx_lzma_stream.next_in = (const uint8 *)compressed_buf;
15191505
zip->zipx_lzma_stream.avail_in = in_bytes;
15201506
zip->zipx_lzma_stream.total_in = 0;
@@ -1535,25 +1521,22 @@ static int zip_read_data_zipx_xz(ArchiveRead * a, const void ** buff, size_t * s
15351521
default:
15361522
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "xz unknown error %d", (int)lz_ret);
15371523
return ARCHIVE_FATAL;
1538-
15391524
case LZMA_STREAM_END:
15401525
lzma_end(&zip->zipx_lzma_stream);
15411526
zip->zipx_lzma_valid = 0;
1542-
1543-
if((int64)zip->zipx_lzma_stream.total_in !=
1544-
zip->entry_bytes_remaining) {
1527+
if((int64)zip->zipx_lzma_stream.total_in != zip->entry_bytes_remaining) {
15451528
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "xz premature end of stream");
15461529
return ARCHIVE_FATAL;
15471530
}
15481531
zip->end_of_entry = 1;
15491532
break;
15501533
}
1551-
to_consume = zip->zipx_lzma_stream.total_in;
1534+
to_consume = static_cast<size_t>(zip->zipx_lzma_stream.total_in);
15521535
__archive_read_consume(a, to_consume);
15531536
zip->entry_bytes_remaining -= to_consume;
15541537
zip->entry_compressed_bytes_read += to_consume;
15551538
zip->entry_uncompressed_bytes_read += zip->zipx_lzma_stream.total_out;
1556-
*size = zip->zipx_lzma_stream.total_out;
1539+
*size = static_cast<size_t>(zip->zipx_lzma_stream.total_out);
15571540
*buff = zip->uncompressed_buffer;
15581541
ret = consume_optional_marker(a, zip);
15591542
if(ret != ARCHIVE_OK)
@@ -1589,7 +1572,7 @@ static int zip_read_data_zipx_lzma_alone(ArchiveRead * a, const void ** buff, si
15891572
return ARCHIVE_FATAL;
15901573
}
15911574
/* Set decompressor parameters. */
1592-
in_bytes = zipmin(zip->entry_bytes_remaining, bytes_avail);
1575+
in_bytes = static_cast<ssize_t>(zipmin(zip->entry_bytes_remaining, bytes_avail));
15931576
zip->zipx_lzma_stream.next_in = (const uint8 *)compressed_buf;
15941577
zip->zipx_lzma_stream.avail_in = in_bytes;
15951578
zip->zipx_lzma_stream.total_in = 0;
@@ -1598,9 +1581,7 @@ static int zip_read_data_zipx_lzma_alone(ArchiveRead * a, const void ** buff, si
15981581
/* These lzma_alone streams lack end of stream marker, so let's
15991582
* make sure the unpacker won't try to unpack more than it's
16001583
* supposed to. */
1601-
zipmin((int64)zip->uncompressed_buffer_size,
1602-
zip->entry->uncompressed_size -
1603-
zip->entry_uncompressed_bytes_read);
1584+
static_cast<size_t>(zipmin((int64)zip->uncompressed_buffer_size, zip->entry->uncompressed_size - zip->entry_uncompressed_bytes_read));
16041585
zip->zipx_lzma_stream.total_out = 0;
16051586

16061587
/* Perform the decompression. */
@@ -1609,14 +1590,12 @@ static int zip_read_data_zipx_lzma_alone(ArchiveRead * a, const void ** buff, si
16091590
case LZMA_DATA_ERROR:
16101591
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "lzma data error (error %d)", (int)lz_ret);
16111592
return ARCHIVE_FATAL;
1612-
16131593
/* This case is optional in lzma alone format. It can happen,
16141594
* but most of the files don't have it. (GitHub #1257) */
16151595
case LZMA_STREAM_END:
16161596
lzma_end(&zip->zipx_lzma_stream);
16171597
zip->zipx_lzma_valid = 0;
1618-
if((int64)zip->zipx_lzma_stream.total_in !=
1619-
zip->entry_bytes_remaining) {
1598+
if((int64)zip->zipx_lzma_stream.total_in != zip->entry_bytes_remaining) {
16201599
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "lzma alone premature end of stream");
16211600
return ARCHIVE_FATAL;
16221601
}
@@ -1628,7 +1607,7 @@ static int zip_read_data_zipx_lzma_alone(ArchiveRead * a, const void ** buff, si
16281607
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "lzma unknown error %d", (int)lz_ret);
16291608
return ARCHIVE_FATAL;
16301609
}
1631-
to_consume = zip->zipx_lzma_stream.total_in;
1610+
to_consume = static_cast<ssize_t>(zip->zipx_lzma_stream.total_in);
16321611
/* Update pointers. */
16331612
__archive_read_consume(a, to_consume);
16341613
zip->entry_bytes_remaining -= to_consume;
@@ -1638,7 +1617,7 @@ static int zip_read_data_zipx_lzma_alone(ArchiveRead * a, const void ** buff, si
16381617
zip->end_of_entry = 1;
16391618
}
16401619
/* Return values. */
1641-
*size = zip->zipx_lzma_stream.total_out;
1620+
*size = static_cast<size_t>(zip->zipx_lzma_stream.total_out);
16421621
*buff = zip->uncompressed_buffer;
16431622
/* Behave the same way as during deflate decompression. */
16441623
ret = consume_optional_marker(a, zip);

‎Src/OSF/libarchive-350/libarchive/archive_string.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2292,8 +2292,7 @@ static size_t unicode_to_utf16be(char * p, size_t remaining, uint32 uc)
22922292
{
22932293
char * utf16 = p;
22942294
if(uc > 0xffff) {
2295-
/* We have a code point that won't fit into a
2296-
* wchar_t; convert it to a surrogate pair. */
2295+
// We have a code point that won't fit into a wchar_t; convert it to a surrogate pair.
22972296
if(remaining < 4)
22982297
return 0;
22992298
uc -= 0x10000;

‎Src/PPLib/ppdbs.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// PPDBS.CPP
2-
// This file was generated by DL600C.EXE from 'D:\Papyrus\Src\Rsrc\dl600\ppdbs.dl6'
2+
// This file was generated by DL600C.EXE from 'd:\Papyrus\Src\Rsrc\dl600\ppdbs.dl6'
33
//
44

55
#include "ppdbs.h"

‎Src/Rsrc/Version/genver-open.dat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ OpenSource = 1
1515
MajorVer =11
1616
MinorVer =4
1717
Revision =1
18-
AssemblyVer=36567
18+
AssemblyVer=36571
1919
MinMajorVer =9
2020
MinMinorVer =8
2121
MinRevision =11

‎Src/Rsrc/dl600/ppifc.idl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// PPIFC.IDL
2-
// This file was generated by DL600C.EXE from 'D:\Papyrus\Src\Rsrc\Dl600\ppifc.dl6'
2+
// This file was generated by DL600C.EXE from 'd:\Papyrus\Src\Rsrc\dl600\ppifc.dl6'
33
//
44
import "unknwn.idl";
55
import "oaidl.idl";

0 commit comments

Comments
 (0)