| リビジョン | 11a908d571b3e136fc6623eb10e6e94d7e035778 (tree) |
|---|---|
| 日時 | 2022-04-30 17:22:11 |
| 作者 | Fojtik |
| コミッター | Fojtik |
Fixed wrong WMF header CRC calcullation.
trunk/sources.cc/pass1wmf.cc (diff)
trunk/sources.cc/wp2latex.h (diff)| @@ -1940,6 +1940,8 @@ | ||
| 1940 | 1940 | else ActualPos+= 2*WmfRec.Size; |
| 1941 | 1941 | |
| 1942 | 1942 | fseek(wpd,ActualPos,SEEK_SET); |
| 1943 | + if(WmfRec.Function==0) | |
| 1944 | + break; // Break loop on WMF End | |
| 1943 | 1945 | } |
| 1944 | 1946 | else |
| 1945 | 1947 | ActualPos = ftell(wpd); |
| @@ -2100,10 +2102,10 @@ | ||
| 2100 | 2102 | |
| 2101 | 2103 | DWORD Checksum = hdr.Key; |
| 2102 | 2104 | Checksum ^= hdr.Handle; |
| 2103 | - Checksum ^= hdr.Left; | |
| 2104 | - Checksum ^= hdr.Top; | |
| 2105 | - Checksum ^= hdr.Right; | |
| 2106 | - Checksum ^= hdr.Bottom; | |
| 2105 | + Checksum ^= (WORD)hdr.Left; // Convert to unsigned to prevent sign expansion. | |
| 2106 | + Checksum ^= (WORD)hdr.Top; | |
| 2107 | + Checksum ^= (WORD)hdr.Right; | |
| 2108 | + Checksum ^= (WORD)hdr.Bottom; | |
| 2107 | 2109 | Checksum ^= hdr.Inch; |
| 2108 | 2110 | Checksum ^= hdr.Reserved; |
| 2109 | 2111 |
| @@ -18,7 +18,7 @@ | ||
| 18 | 18 | #define LineLength 80 /* Split lines after more than LineLength charcters */ |
| 19 | 19 | |
| 20 | 20 | #define VersionWP2L "3.pre107" |
| 21 | -#define VersionDate "26 Apr 2022" /* day (space) month (space) full year */ | |
| 21 | +#define VersionDate "30 Apr 2022" /* day (space) month (space) full year */ | |
| 22 | 22 | |
| 23 | 23 | #ifndef false |
| 24 | 24 | #define false 0 |
Fork