github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-16 06:05:58 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core/Rpc: fixed to compile with VS2015, ide: Icon icon creation UHD default value fixed, ide: MSC builder fixed for VS2015

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8938 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-09-16 20:04:57 +00:00
parent 338da398b5
commit 929c235edf
12 changed files with 90 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/Core/Rpc/Rpc.h
View file

@ -1,8 +1,9 @@
// NOTE: Because of clash with Windows rpc.h, Core/Core.h has to be included before this header
// For the same reason implementation files are in 'imp' subdirectory
#ifndef Rpc_Rpc_h
#define Rpc_Rpc_h
#include <Core/Core.h>
NAMESPACE_UPP
enum {

12
uppsrc/Core/Rpc/Rpc.upp
View file

@ -1,10 +1,10 @@
description "XML-RPC support package (both server and client stuff)\3770,128,128";
file
Rpc.h options PCH,
legacy.h,
Value.cpp,
Xml.cpp,
Server.cpp,
Client.cpp;
Rpc.h options(BUILDER_OPTION) PCH,
imp\Value.cpp,
imp\Xml.cpp,
imp\Client.cpp,
imp\Server.cpp,
legacy.h;

1
uppsrc/Core/Rpc/Client.cpp → uppsrc/Core/Rpc/imp/Client.cpp
View file

@ -1,3 +1,4 @@
#include <Core/Core.h>
#include <Core/Rpc/Rpc.h>
NAMESPACE_UPP

1
uppsrc/Core/Rpc/Server.cpp → uppsrc/Core/Rpc/imp/Server.cpp
View file

@ -1,3 +1,4 @@
#include <Core/Core.h>
#include <Core/Rpc/Rpc.h>
#define LLOG(x) // DLOG(x)

1
uppsrc/Core/Rpc/Value.cpp → uppsrc/Core/Rpc/imp/Value.cpp
View file

@ -1,3 +1,4 @@
#include <Core/Core.h>
#include <Core/Rpc/Rpc.h>
NAMESPACE_UPP

1
uppsrc/Core/Rpc/Xml.cpp → uppsrc/Core/Rpc/imp/Xml.cpp
View file

@ -1,3 +1,4 @@
#include <Core/Core.h>
#include <Core/Rpc/Rpc.h>
NAMESPACE_UPP

21
uppsrc/IconDes/List.cpp
View file

@ -105,6 +105,13 @@ void IconDes::InsertRemoved(int q)
}
}
void SetRes(Image& m, int resolution)
{
ImageBuffer ib(m);
ib.SetResolution(decode(resolution, 0, IMAGE_RESOLUTION_STANDARD, 1, IMAGE_RESOLUTION_UHD, IMAGE_RESOLUTION_NONE));
m = ib;
}
void IconDes::ImageInsert(const String& name, const Image& m, bool exp)
{
int ii = ilist.IsCursor() ? (int)ilist.GetKey() : 0;
@ -118,17 +125,11 @@ void IconDes::ImageInsert(const String& name, const Image& m, bool exp)
GoTo(ii);
}
void SetRes(Image& m, int resolution)
{
ImageBuffer ib(m);
ib.SetResolution(decode(resolution, 0, IMAGE_RESOLUTION_STANDARD, 1, IMAGE_RESOLUTION_UHD, IMAGE_RESOLUTION_NONE));
m = ib;
}
void IconDes::InsertImage()
{
WithImageLayout<TopWindow> dlg;
PrepareImageDlg(dlg);
dlg.resolution <<= IMAGE_RESOLUTION_STANDARD;
do {
if(dlg.Run() != IDOK)
return;
@ -155,6 +156,7 @@ void IconDes::InsertPaste()
Exclamation("Clipboard does not contain an image.");
return;
}
SetRes(m, IMAGE_RESOLUTION_STANDARD);
ImageInsert("", m);
EditImage();
}
@ -198,7 +200,7 @@ struct ImgPreview : Display {
static void sLoadImage(const String& path, Image& result)
{
if(findarg(ToLower(GetFileExt(path)), ".png", ".gif", ".jpeg", ".jpg") < 0)
return;
return;
FileIn in(path);
if(!in)
return;
@ -243,6 +245,7 @@ void IconDes::InsertFile()
String id = Filter(GetFileTitle(fn), CharFilterImageId);
if(!IsAlpha(*id) && *id != '_')
id = '_' + id;
SetRes(m, IMAGE_RESOLUTION_STANDARD);
ImageInsert(id, m);
}
}
@ -250,7 +253,7 @@ void IconDes::InsertFile()
void IconDes::ExportPngs()
{
String dir = SelectDirectory();
if(!dir.IsEmpty())
if(!dir.IsEmpty())
for(int i = 0; i < GetCount(); i++)
PNGEncoder().SaveFile(AppendFileName(dir, GetName(i) + ".png"), GetImage(i));
}

22
uppsrc/ide/Builders/MscBuilder.icpp
View file

@ -124,7 +124,7 @@ bool MscBuilder::IsMsc89() const
bool MscBuilder::IsMsc86() const
{
return HasFlag("MSC8") || HasFlag("MSC9") || HasFlag("MSC10") || HasFlag("MSC11")
|| HasFlag("MSC12");
|| HasFlag("MSC12") || HasFlag("MSC15");
}
bool MscBuilder::IsMscArm() const
@ -135,7 +135,7 @@ bool MscBuilder::IsMscArm() const
bool MscBuilder::IsMsc64() const
{
return HasFlag("MSC8X64") || HasFlag("MSC9X64") || HasFlag("MSC10X64") || HasFlag("MSC11X64")
|| HasFlag("MSC12X64");
|| HasFlag("MSC12X64")|| HasFlag("MSC15X64");
}
String MscBuilder::LinkerName() const
@ -463,8 +463,10 @@ bool MscBuilder::BuildPackage(const String& package, Vector<String>& linkfile, V
IdeConsoleEndGroup();
return false;
}
bool isgemsc10 = HasFlag("MSC10") || HasFlag("MSC10X64") || HasFlag("MSC11")
|| HasFlag("MSC11X64") || HasFlag("MSC12") || HasFlag("MSC12X64");
bool isgemsc10 = HasFlag("MSC10") || HasFlag("MSC10X64")
|| HasFlag("MSC11") || HasFlag("MSC11X64")
|| HasFlag("MSC12") || HasFlag("MSC12X64")
|| HasFlag("MSC15") || HasFlag("MSC15X64");
Vector<Host::FileInfo> objinfo = host->GetFileInfo(obj);
for(int i = 0; i < obj.GetCount(); i++)
if(objinfo[i] > producttime) {
@ -610,8 +612,10 @@ bool MscBuilder::Link(const Vector<String>& linkfile, const String& linkoptions,
if(!Wait())
return false;
PutLinking();
bool isgemsc10 = HasFlag("MSC10") || HasFlag("MSC10X64") || HasFlag("MSC11")
|| HasFlag("MSC11X64") || HasFlag("MSC12X64");
bool isgemsc10 = HasFlag("MSC10") || HasFlag("MSC10X64")
|| HasFlag("MSC11") || HasFlag("MSC11X64")
|| HasFlag("MSC12") || HasFlag("MSC12X64")
|| HasFlag("MSC15") || HasFlag("MSC15X64");
for(int i = 0; i < linkfile.GetCount(); i++)
if(GetFileTime(linkfile[i]) > targettime) {
String link, lib;
@ -640,9 +644,9 @@ bool MscBuilder::Link(const Vector<String>& linkfile, const String& linkoptions,
link << " -subsystem:windowsce,4.20 /ARMPADCODE -NODEFAULTLIB:\"oldnames.lib\" ";
else
if(HasFlag("GUI") || IsMscArm())
link << (HasFlag("WIN32") ? " -subsystem:windows" : " -subsystem:windowsce");
link << (HasFlag("WIN32") ? " -subsystem:windows,5.01" : " -subsystem:windowsce"); //,5.01 needed to support WindowsXP
else
link << " -subsystem:console";
link << " -subsystem:console,5.01"; //,5.01 needed to support WindowsXP
if(createmap)
link << " -MAP";
if(HasFlag("DLL"))
@ -742,6 +746,8 @@ INITBLOCK
RegisterBuilder("MSC11X64", CreateMscBuilder);
RegisterBuilder("MSC12", CreateMscBuilder);
RegisterBuilder("MSC12X64", CreateMscBuilder);
RegisterBuilder("MSC15", CreateMscBuilder);
RegisterBuilder("MSC15X64", CreateMscBuilder);
RegisterBuilder("EVC_ARM", CreateMscBuilder);
RegisterBuilder("EVC_MIPS", CreateMscBuilder);
RegisterBuilder("EVC_SH3", CreateMscBuilder);

BIN
uppsrc/ide/icon.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before After
Before After

80
uppsrc/ide/ide.iml
View file

@ -980,44 +980,44 @@ IMAGE_DATA(53,104,115,112,124,101,245,114,163,183,182,158,166,190,194,247,66,127
IMAGE_DATA(17,229,49,165,127,141,93,6,207,46,96,114,13,201,104,204,152,8,45,174,135,197,72,241,240,88,19,55,211,144,67,139)
IMAGE_DATA(205,16,193,108,214,228,54,56,104,93,14,189,98,50,116,110,142,10,139,10,76,203,161,83,76,218,220,82,154,183,48,124)
IMAGE_DATA(97,119,227,208,104,208,203,45,209,60,130,105,57,178,152,238,151,129,78,174,158,140,26,94,171,183,175,240,189,208,223,219)
IMAGE_DATA(253,235,237,249,245,69,253,244,182,126,251,162,127,68,121,76,232,223,44,99,151,1,217,148,23,108,61,215,191,51,57,34)
IMAGE_DATA(121,221,219,183,227,215,204,204,221,224,237,28,227,242,188,205,12,99,56,219,161,207,56,70,46,245,76,41,142,91,135,242)
IMAGE_DATA(83,187,80,123,45,1,181,151,143,66,145,17,142,219,251,150,227,88,160,91,209,107,78,214,179,196,176,75,222,28,31,124)
IMAGE_DATA(61,220,191,165,44,115,39,154,10,78,163,35,255,93,32,255,37,116,220,242,68,227,237,116,60,188,249,47,40,78,201,144)
IMAGE_DATA(179,231,61,188,63,125,212,14,1,247,212,147,79,244,15,93,48,245,171,210,212,109,104,79,243,3,226,198,163,35,209,3)
IMAGE_DATA(108,222,68,64,241,33,199,49,30,213,39,66,80,149,178,9,245,215,18,161,186,116,20,105,107,167,116,142,178,177,124,133)
IMAGE_DATA(240,129,179,156,183,151,126,179,157,207,201,30,115,6,178,62,228,57,26,206,47,67,199,141,215,241,240,188,31,14,165,191)
IMAGE_DATA(131,13,39,223,64,100,250,76,212,93,137,199,247,71,215,35,96,134,67,236,56,135,97,206,185,17,126,157,205,95,203,208)
IMAGE_DATA(226,231,11,245,246,191,161,227,216,27,104,76,94,128,170,111,182,112,57,55,162,50,233,99,124,154,233,142,232,43,139,241)
IMAGE_DATA(9,199,81,117,124,51,202,50,34,16,238,63,58,63,100,158,107,108,197,105,14,27,252,17,154,67,63,67,131,135,7,30)
IMAGE_DATA(156,141,68,195,245,84,52,228,28,71,195,181,36,40,211,182,225,191,137,11,17,158,62,3,153,9,115,81,126,56,16,213)
IMAGE_DATA(103,162,177,239,189,209,170,180,79,254,114,95,117,53,1,170,248,80,168,2,230,67,185,51,128,195,166,224,246,129,149,56)
IMAGE_DATA(189,201,13,55,190,252,0,117,220,122,87,236,219,3,167,232,20,204,138,62,0,69,236,50,212,156,141,193,254,247,71,182)
IMAGE_DATA(92,216,54,187,133,207,149,123,2,181,89,49,168,74,221,194,237,81,18,78,109,156,198,55,75,250,58,23,168,190,61,130)
IMAGE_DATA(73,209,9,240,203,184,200,113,28,135,124,183,63,167,49,6,7,151,58,32,104,214,4,89,110,244,82,252,47,97,35,20)
IMAGE_DATA(255,14,135,234,98,28,234,46,199,227,58,55,150,182,118,50,174,238,94,4,85,246,65,196,237,253,24,111,237,253,10,187)
IMAGE_DATA(162,54,65,153,30,142,194,163,27,16,250,142,117,33,229,152,56,234,89,207,37,30,191,223,26,58,127,66,102,234,26,215)
IMAGE_DATA(166,130,175,215,65,117,225,48,143,83,101,29,64,121,92,48,228,50,63,220,143,156,143,202,248,141,168,206,148,225,100,200)
IMAGE_DATA(155,112,25,53,192,215,176,134,70,88,89,78,72,89,61,177,179,150,195,41,246,175,224,181,202,119,205,71,73,212,34,212)
IMAGE_DATA(156,218,131,210,148,237,56,187,213,11,115,38,63,19,33,85,195,107,222,118,76,186,197,237,223,131,115,95,162,236,208,106)
IMAGE_DATA(212,156,222,203,97,163,112,109,247,98,68,191,107,221,249,231,241,150,235,123,234,129,17,86,3,94,137,91,62,166,147,114)
IMAGE_DATA(21,39,108,193,85,217,34,36,7,77,68,128,231,160,19,195,135,60,57,193,88,15,145,205,156,48,104,117,244,34,187,166)
IMAGE_DATA(144,217,214,185,115,93,6,70,56,62,251,164,179,41,56,115,173,167,203,192,194,4,55,52,7,206,73,168,139,137,62,146)
IMAGE_DATA(243,39,116,240,206,42,149,170,233,209,163,71,63,116,118,118,194,152,207,153,51,39,210,128,195,69,192,182,183,183,163,181)
IMAGE_DATA(181,21,205,205,205,188,55,53,53,161,190,190,30,74,165,18,101,101,101,60,94,173,86,195,219,219,91,151,195,69,224,38)
IMAGE_DATA(124,75,75,11,239,196,67,177,13,13,13,168,173,173,69,117,117,53,31,67,115,85,85,85,186,28,60,158,123,130,211,129)
IMAGE_DATA(156,156,28,254,51,61,219,218,218,248,207,15,31,62,212,27,167,120,205,156,139,46,190,163,163,131,127,10,56,210,67,79)
IMAGE_DATA(90,11,61,73,7,61,31,60,120,0,13,70,20,47,60,133,113,129,143,246,67,208,99,14,94,120,167,61,161,39,237,139)
IMAGE_DATA(24,222,48,222,112,92,88,15,241,72,225,13,247,73,108,156,214,99,136,55,197,73,23,157,145,33,222,212,218,19,240,180)
IMAGE_DATA(14,206,127,208,224,95,229,106,172,153,155,99,77,213,65,88,174,38,27,52,125,67,253,243,170,25,253,35,56,97,117,255)
IMAGE_DATA(23,217,148,222,237,214,195,98,151,129,61,99,90,67,11,13,100,104,206,180,56,90,164,212,6,208,1,24,52,161,174,185)
IMAGE_DATA(16,150,138,76,104,100,114,42,90,161,153,137,195,160,9,5,14,11,161,32,168,200,132,11,129,156,138,159,154,185,166,166)
IMAGE_DATA(70,219,200,148,99,238,220,185,2,135,30,94,115,200,90,14,138,111,108,108,212,54,159,174,107,246,195,66,23,79,90,143)
IMAGE_DATA(28,57,194,10,133,67,107,22,214,65,127,235,220,187,119,47,91,89,89,41,137,191,123,247,46,220,221,221,245,138,79,224)
IMAGE_DATA(184,117,235,22,166,78,157,10,238,226,148,196,7,5,5,193,218,218,26,251,246,237,99,61,60,60,216,139,23,47,178,201)
IMAGE_DATA(201,201,172,191,191,63,27,24,24,8,43,43,43,250,155,47,107,74,254,123,247,238,177,174,174,174,236,164,73,147,88,110)
IMAGE_DATA(255,216,130,130,2,184,185,185,241,123,98,170,254,217,179,103,179,171,86,173,98,105,29,132,167,57,131,70,148,196,159,63)
IMAGE_DATA(127,158,37,60,247,206,230,229,229,161,176,176,144,207,223,19,158,246,105,236,216,177,108,88,88,24,235,236,236,204,22,23)
IMAGE_DATA(23,179,87,174,92,225,247,130,106,193,201,201,137,13,15,15,151,92,191,88,243,139,185,24,222,156,203,128,46,31,13,94)
IMAGE_DATA(48,254,66,49,229,82,162,24,250,242,212,244,171,96,230,94,40,194,37,196,252,31,131,163,46,246,0,0,0,0,0,0)
IMAGE_DATA(253,235,237,249,245,69,253,244,182,126,251,162,127,68,121,76,233,95,99,151,1,217,148,23,108,61,215,191,51,57,34,121)
IMAGE_DATA(221,219,183,227,215,204,204,221,224,237,28,227,242,188,205,12,99,56,219,161,207,56,70,46,245,76,41,142,91,135,242,83)
IMAGE_DATA(187,80,123,45,1,181,151,143,66,145,17,142,219,251,150,227,88,160,91,209,107,78,214,179,196,176,75,222,28,31,124,61)
IMAGE_DATA(220,191,165,44,115,39,154,10,78,163,35,255,93,32,255,37,116,220,242,68,227,237,116,60,188,249,47,40,78,201,144,179)
IMAGE_DATA(231,61,188,63,125,212,14,1,247,212,147,79,244,15,93,48,245,171,210,212,109,104,79,243,3,226,198,163,35,209,3,108)
IMAGE_DATA(222,68,64,241,33,199,49,30,213,39,66,80,149,178,9,245,215,18,161,186,116,20,105,107,167,116,142,178,177,124,133,240)
IMAGE_DATA(129,179,156,183,151,126,179,157,207,201,30,115,6,178,62,228,57,26,206,47,67,199,141,215,241,240,188,31,14,165,191,131)
IMAGE_DATA(13,39,223,64,100,250,76,212,93,137,199,247,71,215,35,96,134,67,236,56,135,97,206,185,17,126,157,205,95,203,208,226)
IMAGE_DATA(231,11,245,246,191,161,227,216,27,104,76,94,128,170,111,182,112,57,55,162,50,233,99,124,154,233,142,232,43,139,241,9)
IMAGE_DATA(199,81,117,124,51,202,50,34,16,238,63,58,63,100,158,107,108,197,105,14,27,252,17,154,67,63,67,131,135,7,30,156)
IMAGE_DATA(141,68,195,245,84,52,228,28,71,195,181,36,40,211,182,225,191,137,11,17,158,62,3,153,9,115,81,126,56,16,213,103)
IMAGE_DATA(162,177,239,189,209,170,180,79,254,114,95,117,53,1,170,248,80,168,2,230,67,185,51,128,195,166,224,246,129,149,56,189)
IMAGE_DATA(201,13,55,190,252,0,117,220,122,87,236,219,3,167,232,20,204,138,62,0,69,236,50,212,156,141,193,254,247,71,182,92)
IMAGE_DATA(216,54,187,133,207,149,123,2,181,89,49,168,74,221,194,237,81,18,78,109,156,198,55,75,250,58,23,168,190,61,130,73)
IMAGE_DATA(209,9,240,203,184,200,113,28,135,124,183,63,167,49,6,7,151,58,32,104,214,4,89,110,244,82,252,47,97,35,20,255)
IMAGE_DATA(14,135,234,98,28,234,46,199,227,58,55,150,182,118,50,174,238,94,4,85,246,65,196,237,253,24,111,237,253,10,187,162)
IMAGE_DATA(54,65,153,30,142,194,163,27,16,250,142,117,33,229,152,56,234,89,207,37,30,191,223,26,58,127,66,102,234,26,215,166)
IMAGE_DATA(130,175,215,65,117,225,48,143,83,101,29,64,121,92,48,228,50,63,220,143,156,143,202,248,141,168,206,148,225,100,200,155)
IMAGE_DATA(112,25,53,192,215,176,134,70,88,89,78,72,89,61,177,179,150,195,41,246,175,224,181,202,119,205,71,73,212,34,212,156)
IMAGE_DATA(218,131,210,148,237,56,187,213,11,115,38,63,19,33,85,195,107,222,118,76,186,197,237,223,131,115,95,162,236,208,106,212)
IMAGE_DATA(156,222,203,97,163,112,109,247,98,68,191,107,221,249,231,241,150,235,123,234,129,17,86,3,94,137,91,62,166,147,114,21)
IMAGE_DATA(39,108,193,85,217,34,36,7,77,68,128,231,160,19,195,135,60,57,193,88,15,145,205,156,48,104,117,244,34,187,166,144)
IMAGE_DATA(217,214,185,115,93,6,70,56,62,251,164,179,41,56,179,173,135,203,192,194,4,55,52,7,206,73,168,139,137,62,146,243)
IMAGE_DATA(39,116,240,206,42,149,170,233,209,163,71,63,116,118,118,194,152,207,153,51,39,210,128,195,69,192,182,183,183,163,181,181)
IMAGE_DATA(21,205,205,205,188,55,53,53,161,190,190,30,74,165,18,101,101,101,60,94,173,86,195,219,219,91,151,195,69,224,38,124)
IMAGE_DATA(75,75,11,239,196,67,177,13,13,13,168,173,173,69,117,117,53,31,67,115,85,85,85,186,28,60,158,123,130,211,129,156)
IMAGE_DATA(156,28,254,51,61,219,218,218,248,207,15,31,62,212,27,167,120,205,156,139,46,190,163,163,131,127,10,56,210,67,79,90)
IMAGE_DATA(11,61,73,7,61,31,60,120,0,13,70,20,47,60,133,113,129,143,246,67,208,99,14,94,120,167,61,161,39,237,139,24)
IMAGE_DATA(222,48,222,112,92,88,15,241,72,225,13,247,73,108,156,214,99,136,55,197,73,23,157,145,33,222,212,218,19,240,180,14)
IMAGE_DATA(206,127,208,224,95,229,106,172,153,155,99,77,213,65,88,174,38,27,52,125,67,253,243,170,25,253,35,56,97,117,255,23)
IMAGE_DATA(217,148,222,237,222,195,34,151,129,61,99,90,67,11,13,100,104,206,180,56,90,164,212,6,208,1,24,52,161,174,185,16)
IMAGE_DATA(150,138,76,104,100,114,42,90,161,153,137,195,160,9,5,14,11,161,32,168,200,132,11,129,156,138,159,154,185,166,166,70)
IMAGE_DATA(219,200,148,99,238,220,185,2,135,30,94,115,200,90,14,138,111,108,108,212,54,159,174,107,246,195,66,23,79,90,143,28)
IMAGE_DATA(57,194,10,133,67,107,22,214,65,127,235,220,187,119,47,91,89,89,41,137,191,123,247,46,220,221,221,245,138,79,224,184)
IMAGE_DATA(117,235,22,166,78,157,10,238,226,148,196,7,5,5,193,218,218,26,251,246,237,99,61,60,60,216,139,23,47,178,201,201)
IMAGE_DATA(201,172,191,191,63,27,24,24,8,43,43,43,250,155,47,107,74,254,123,247,238,177,174,174,174,236,164,73,147,88,110,255)
IMAGE_DATA(216,130,130,2,184,185,185,241,123,98,170,254,217,179,103,179,171,86,173,98,105,29,132,167,57,131,70,148,196,159,63,127)
IMAGE_DATA(158,37,60,247,206,230,229,229,161,176,176,144,207,223,19,158,246,105,236,216,177,108,88,88,24,235,236,236,204,22,23,23)
IMAGE_DATA(179,87,174,92,225,247,130,106,193,201,201,137,13,15,15,151,92,191,88,243,139,185,24,222,156,203,128,46,31,13,94,48)
IMAGE_DATA(254,66,49,229,82,162,24,250,242,212,244,171,96,230,94,40,194,37,196,252,31,72,21,44,182,0,0,0,0,0,0,0)
IMAGE_END_DATA(2816, 11)

9
uppsrc/plugin/FT_fontsys/build_info.h Normal file
View file

@ -0,0 +1,9 @@
#define bmYEAR 2015
#define bmMONTH 9
#define bmDAY 16
#define bmHOUR 16
#define bmMINUTE 11
#define bmSECOND 2
#define bmTIME Time(2015, 9, 16, 16, 11, 2)
#define bmMACHINE "MAIN"
#define bmUSER "cxl"

4
uppsrc/plugin/zip/Zip.cpp
View file

@ -30,7 +30,7 @@ void Zip::FileHeader(const char *path, Time tm)
zip->Put32le(f.csize);
ASSERT((f.gpflag & 0x8) == 0 || f.usize == 0);
zip->Put32le(f.usize);
zip->Put16le(strlen(f.path));
zip->Put16le((word)strlen(f.path));
zip->Put16le(0);
zip->Put(f.path);
done += 5*2 + 5*4 + f.path.GetCount();
@ -50,7 +50,7 @@ void Zip::BeginFile(const char *path, Time tm)
f.csize = 0;
f.usize = 0;
FileHeader(path, tm);
if (zip->IsError()) WhenError();
if (zip->IsError()) WhenError();
}
void Zip::BeginFile(OutFilterStream& oz, const char *path, Time tm)