Skip to content

Commit

Permalink
Version 12.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@papyrussolution
papyrussolution committed May 26, 2024
1 parent 38cfa7a commit e6fce1b
Show file tree
Hide file tree
Showing 45 changed files with 482 additions and 7,759 deletions.
1 change: 0 additions & 1 deletion Src/BuildVC2017/slib.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2574,7 +2574,6 @@
<ClCompile Include="..\SLib\tcontrol.cpp" />
<ClCompile Include="..\SLib\Tdialog.cpp" />
<ClCompile Include="..\SLib\test-cairo.cpp" />
<ClCompile Include="..\SLib\test-openssl.cpp" />
<ClCompile Include="..\SLib\Toolbar.cpp" />
<ClCompile Include="..\SLib\Tprogram.cpp" />
<ClCompile Include="..\SLib\tprogram_exp.cpp" />
Expand Down
1 change: 0 additions & 1 deletion Src/BuildVC2017/slib.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
<ClCompile Include="..\SLib\curl-parsedate.cpp" />
<ClCompile Include="..\SLib\uchardet.cpp" />
<ClCompile Include="..\SLib\test-cairo.cpp" />
<ClCompile Include="..\SLib\test-openssl.cpp" />
<ClCompile Include="..\SLib\saudio.cpp" />
<ClCompile Include="..\SLib\curl-inet_ntop.cpp" />
<ClCompile Include="..\SLib\bdb.cpp" />
Expand Down
1 change: 0 additions & 1 deletion Src/BuildVC2019/slib.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2619,7 +2619,6 @@
<ClCompile Include="..\SLib\tcontrol.cpp" />
<ClCompile Include="..\SLib\Tdialog.cpp" />
<ClCompile Include="..\SLib\test-cairo.cpp" />
<ClCompile Include="..\SLib\test-openssl.cpp" />
<ClCompile Include="..\SLib\Toolbar.cpp" />
<ClCompile Include="..\SLib\Tprogram.cpp" />
<ClCompile Include="..\SLib\tprogram_exp.cpp" />
Expand Down
1 change: 0 additions & 1 deletion Src/BuildVC2019/slib.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
<ClCompile Include="..\SLib\curl-parsedate.cpp" />
<ClCompile Include="..\SLib\uchardet.cpp" />
<ClCompile Include="..\SLib\test-cairo.cpp" />
<ClCompile Include="..\SLib\test-openssl.cpp" />
<ClCompile Include="..\SLib\saudio.cpp" />
<ClCompile Include="..\SLib\curl-inet_ntop.cpp" />
<ClCompile Include="..\SLib\bdb.cpp" />
Expand Down
1 change: 0 additions & 1 deletion Src/BuildVC2022/slib.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2685,7 +2685,6 @@
<ClCompile Include="..\SLib\tcontrol.cpp" />
<ClCompile Include="..\SLib\Tdialog.cpp" />
<ClCompile Include="..\SLib\test-cairo.cpp" />
<ClCompile Include="..\SLib\test-openssl.cpp" />
<ClCompile Include="..\SLib\Toolbar.cpp" />
<ClCompile Include="..\SLib\Tprogram.cpp" />
<ClCompile Include="..\SLib\tprogram_exp.cpp" />
Expand Down
1 change: 0 additions & 1 deletion Src/BuildVC2022/slib.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
<ClCompile Include="..\SLib\curl-parsedate.cpp" />
<ClCompile Include="..\SLib\uchardet.cpp" />
<ClCompile Include="..\SLib\test-cairo.cpp" />
<ClCompile Include="..\SLib\test-openssl.cpp" />
<ClCompile Include="..\SLib\saudio.cpp" />
<ClCompile Include="..\SLib\curl-inet_ntop.cpp" />
<ClCompile Include="..\SLib\bdb.cpp" />
Expand Down
22 changes: 21 additions & 1 deletion Src/Include/Db.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4645,6 +4645,7 @@ class SRecPageFreeList {
int Put(uint32 type, uint64 rowId, uint32 freeSize);
int Remove(uint32 type, uint64 rowId) { return Put(type, rowId, 0U); }
const Entry * Get(uint32 type, uint32 reqSize) const;
int GetListForPage(uint pageSeq, TSVector <SRecPageFreeList::Entry> & rList) const; // @debug
};

struct SDataPageHeader {
Expand Down Expand Up @@ -4723,7 +4724,7 @@ struct SDataPageHeader {
uint UsableBlockCount; // Количество свободных блоков, чей размер позволяет их использовать для записи данных
uint UsableBlockSize; // Общий размер данных, который может быть записан в пригодные к использованию свободные блоки
};
bool GetStat(Stat & rStat) const;
bool GetStat(Stat & rStat, TSVector <SRecPageFreeList::Entry> * pUsableBlockList) const;
bool IsValid() const;
uint32 ReadRecPrefix(uint pos, RecPrefix & rPfx) const;
//
Expand Down Expand Up @@ -4810,6 +4811,24 @@ struct SDataPageHeader {

class SRecPageManager {
public:
//
// Структура RowId:
// | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
// 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
// 6 5 4 3 2 1 0
// | | |
// reserve offs bits
//
// Общий размер типа: 64 бита
// Старшие 16 бит - зарезервированы
// Следующие старшие 4 бита - индикатор битовой ширины поля смещения внутри страницы.
// Битовая ширина смещения может быть от 9 до 24 бит (0: 9, 1: 10, 15: 24)
// Битовую ширину поля смещения назовем pobw (page offset bit-width)
// Само смещение внутри страницы задается со сдвигом в 32 поскольку заголовок
// страницы длиной 32 байта не участвует в распределении рабочих блоков.
// Таким образом максимальная длина страницы = 2^(24+5)
// Следующие старшие (64-4-pobw) бит - номер страницы.
//
static constexpr uint RowIdBitWidth = 48;
static uint64 MakeRowId(uint pageSize, uint pageSeq, uint offset);
static int SplitRowId(uint64 rowId, uint pageSize, uint * pPageSeq, uint * pOffset);
Expand All @@ -4822,6 +4841,7 @@ class SRecPageManager {
// !0 - actual size of the read data
//
uint Read(uint64 rowId, void * pBuf, size_t bufSize);
static bool TestSinglePage(uint pageSize);
private:
SDataPageHeader * GetPage(uint32 seq);
SDataPageHeader * AllocatePage(uint32 type);
Expand Down
8 changes: 5 additions & 3 deletions Src/Include/Pp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22118,7 +22118,7 @@ class PPSyncCashSession {
PPID NodeID;
char Port[128]; //
char Name[48]; //
int PortType; // 0 - file, 1 - lpt, 2 - com
int PortType; // 0 - file, 1 - lpt, 2 - com, 3 - server /*@v12.0.3*/
int Handle; //
long State;
PPSlipFormatter * P_SlipFmt;
Expand Down Expand Up @@ -23977,6 +23977,7 @@ class PPObjDBDiv : public PPObjReference {
#define GTCHZNPT_ALTTOBACCO 11 // @v11.9.0 Альтернативная табачная продукция. Марки очень похожи на табак, но есть нюансы в обработке.
#define GTCHZNPT_DRAFTBEER 12 // @v11.9.2 Пиво разливное
#define GTCHZNPT_DIETARYSUPPLEMENT 13 // @v11.9.6 БАДы
#define GTCHZNPT_BEER 14 // @v12.0.3 Пиво фасованное

struct PPGoodsType2 { // @persistent @store(Reference2Tbl+)
PPGoodsType2();
Expand Down Expand Up @@ -56365,7 +56366,7 @@ class PPEdiProcessor {
enum {
ctrfTestMode = 0x0001
};
ProviderImplementation(const PPEdiProviderPacket & rEpp, PPID mainOrgID, long flags);
ProviderImplementation(const PPEdiProviderPacket & rEpp, PPID mainOrgID, long flags, PPLogger * pLogger);
virtual ~ProviderImplementation();
virtual int GetDocumentList(const PPBillIterchangeFilt & rP, DocumentInfoList & rList) { return -1; }
virtual int ReceiveDocument(const PPEdiProcessor::DocumentInfo * pIdent, TSCollection <PPEdiProcessor::Packet> & rList) { return -1; }
Expand Down Expand Up @@ -56449,13 +56450,14 @@ class PPEdiProcessor {
int ResolveDlvrLoc(const OwnFormatContractor & rC, PPBillPacket * pPack);
int ResolveOwnFormatContractor(const OwnFormatContractor & rC, int partyQ, PPBillPacket * pPack);
SString EncBuf;
PPLogger * P_Logger; // @notowned
private:
int GetIntermediatePath(const char * pSub, int docType, SString & rBuf);
int Helper_GetPersonGLN(PPID psnID, SString & rGLN);
};

static int FASTCALL GetEdiMsgTypeByText(const char * pSymb);
static ProviderImplementation * CreateProviderImplementation(PPID ediPrvID, PPID mainOrgID, long flags);
static ProviderImplementation * CreateProviderImplementation(PPID ediPrvID, PPID mainOrgID, long flags, PPLogger * pLogger);
explicit PPEdiProcessor(ProviderImplementation * pImp, PPLogger * pLogger);
~PPEdiProcessor();
int SendOrders(const PPBillIterchangeFilt & rP, const PPIDArray & rArList);
Expand Down
1 change: 1 addition & 0 deletions Src/Include/SLIB.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1345,6 +1345,7 @@ public:
static constexpr uint64 FnvHash1Init64 = 0xcbf29ce484222325ULL; // @v11.9.12 Константа инициализации хэш-функции FNV1_64 и FNVa_64
static constexpr uint32 FnvHashPrime32 = 0x01000193U/*16777619*/; // @v11.9.12 Константа для итерации хэш-функции FNV_32 (32 bit magic FNV-0 and FNV-1 prime)
static constexpr uint64 FnvHashPrime64 = 0x100000001b3ULL; // @v11.9.12 Константа для итерации хэш-функции FNV_4 (64 bit magic FNV-0 and FNV-1 prime)
static constexpr uint32 OzanYigitHashPrime = 65599U; // @v12.0.3 Константа для итерации хэш-функции Ozan Yigit (используется в BDB и gSOAP)
static constexpr long OneBillion = 1000000000L; // @v11.7.6
static constexpr const char * P_HxDigL = "0123456789abcdef";
static constexpr const char * P_HxDigU = "0123456789ABCDEF";
Expand Down
3 changes: 3 additions & 0 deletions Src/Include/wsctl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ class WsCtl_SelfIdentityBlock {
MACAddrArray MacAdrList; // @v12.0.1
S_IPAddr IpAdr; // @v12.0.1
PPID PrcID; // ������������� ���������� �� �������. ������������ ������� �� �������.
PPID ComputerID; // @v12.0.3 ������������� ���������� �� �������.
PPID CompCatID; // @v12.0.3 ������������� ��������� ����������.
SString PrcName; // ������������ ���������� �� �������. ������������ ������� �� �������.
SString CompCatName; // @v12.0.3 ������������ ��������� ����������
};
//
//
Expand Down
4 changes: 2 additions & 2 deletions Src/OSF/BDB/hash_func.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ uint32 __ham_func2(DB * dbp, const void * key, uint32 len)
* iteration, perform 8 HASHC's so we handle all 8 bytes. Essentially, this
* saves us 7 cmp & branch instructions.
*
* PUBLIC: uint32 __ham_func3 __P((DB *, const void *, uint32));
* PUBLIC: uint32 __ham_func3(DB *, const void *, uint32);
*/
uint32 __ham_func3(DB * dbp, const void * key, uint32 len)
{
Expand All @@ -75,7 +75,7 @@ uint32 __ham_func3(DB * dbp, const void * key, uint32 len)
COMPQUIET(dbp, 0);
if(!len)
return 0;
#define HASHC n = *k+++65599*n
#define HASHC n = *k++ + SlConst::OzanYigitHashPrime/*65599*/ * n
n = 0;
k = static_cast<const uint8 *>(key);
loop = (len+8-1)>>3;
Expand Down
90 changes: 0 additions & 90 deletions Src/OSF/SDL/.clang-format
View file

This file was deleted.

58 changes: 0 additions & 58 deletions Src/OSF/SDL/.clang-tidy
View file

This file was deleted.

69 changes: 0 additions & 69 deletions Src/OSF/SDL/.editorconfig
View file

This file was deleted.

Loading

0 comments on commit e6fce1b

Please sign in to comment.