Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Cleanup

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2021-03-30 12:03:29 +02:00
parent 72f8b179d7
commit f3bb513545
14 changed files with 33 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MSI/MSICA

@ -1 +1 @@
Subproject commit 00032cd404478c9f80f1817cbb8adf81f6a65449 Subproject commit d3320ca1f3a433fac7886cf3a32cf808ac1b4cb9

2
Updater

@ -1 +1 @@
Subproject commit 924971bb3b2b2425b7e69dc315e9771c23d83a1b Subproject commit 165894247e4807ea137e0ff67255319075402e8f

2
lib/WinStd

@ -1 +1 @@
Subproject commit 96e18824059bd8225ab99126e16b33cf50734873 Subproject commit 51b262b38223fbce3b9b43812ad0ff5ef88bdeb4

11
lib/libZRCola/include/zrcola/character.h
View File

@ -22,6 +22,7 @@
#include "common.h" #include "common.h"
#include <stdex/idrec.h> #include <stdex/idrec.h>
#include <assert.h>
#include <algorithm> #include <algorithm>
#include <istream> #include <istream>
#include <map> #include <map>
@ -48,7 +49,7 @@ namespace ZRCola {
/// Character category ID type /// Character category ID type
/// Two letter abbreviation, non-terminated /// Two letter abbreviation, non-terminated
/// ///
struct ZRCOLA_API chrcatid_t { struct chrcatid_t {
char data[2]; char data[2];
inline chrcatid_t& operator=(const chrcatid_t &src) inline chrcatid_t& operator=(const chrcatid_t &src)
@ -176,7 +177,7 @@ namespace ZRCola {
/// ///
/// Character Database /// Character Database
/// ///
class ZRCOLA_API character_db { class character_db {
public: public:
#pragma pack(push) #pragma pack(push)
#pragma pack(2) #pragma pack(2)
@ -334,13 +335,13 @@ namespace ZRCola {
}; };
typedef ZRCOLA_API stdex::idrec::record<character_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> character_rec; typedef stdex::idrec::record<character_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> character_rec;
/// ///
/// Character category database /// Character category database
/// ///
class ZRCOLA_API chrcat_db { class chrcat_db {
public: public:
#pragma pack(push) #pragma pack(push)
#pragma pack(2) #pragma pack(2)
@ -502,7 +503,7 @@ namespace ZRCola {
}; };
typedef ZRCOLA_API stdex::idrec::record<chrcat_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> chrcat_rec; typedef stdex::idrec::record<chrcat_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> chrcat_rec;
}; };

13
lib/libZRCola/include/zrcola/common.h
View File

@ -29,11 +29,6 @@
#endif #endif
///
/// Public function calling convention
///
#define ZRCOLA_API
#define ZRCOLA_NOVTABLE __declspec(novtable)
#pragma warning(push) #pragma warning(push)
#pragma warning(disable: 4251) #pragma warning(disable: 4251)
#pragma warning(disable: 4512) #pragma warning(disable: 4512)
@ -75,7 +70,7 @@ namespace ZRCola {
/// Language ID type /// Language ID type
/// Three letter abbreviation, zero terminated /// Three letter abbreviation, zero terminated
/// ///
struct ZRCOLA_API langid_t { struct langid_t {
char data[4]; char data[4];
inline langid_t& operator=(const langid_t &src) inline langid_t& operator=(const langid_t &src)
@ -221,7 +216,7 @@ namespace ZRCola {
/// \param[in] lang_win Windows language ID /// \param[in] lang_win Windows language ID
/// \param[in,out] lang ZRCola language ID /// \param[in,out] lang ZRCola language ID
/// ///
void ZRCOLA_API LangConvert(_In_ LANGID lang_win, _Inout_ langid_t &lang); void LangConvert(_In_ LANGID lang_win, _Inout_ langid_t &lang);
#endif #endif
@ -505,7 +500,7 @@ namespace ZRCola {
/// ///
/// Source-destination index transformation mapping /// Source-destination index transformation mapping
/// ///
class ZRCOLA_NOVTABLE ZRCOLA_API mapping { class __declspec(novtable) mapping {
public: public:
size_t src; ///< Character index in source string size_t src; ///< Character index in source string
size_t dst; ///< Character index in destination string size_t dst; ///< Character index in destination string
@ -523,7 +518,7 @@ namespace ZRCola {
/// ///
/// A vector for destination-source index transformation mapping /// A vector for destination-source index transformation mapping
/// ///
class ZRCOLA_API mapping_vector : public std::vector<mapping> { class mapping_vector : public std::vector<mapping> {
public: public:
/// ///
/// Transforms character index of destination to source /// Transforms character index of destination to source

8
lib/libZRCola/include/zrcola/language.h
View File

@ -37,7 +37,7 @@ namespace ZRCola {
/// ///
/// Language Character Database /// Language Character Database
/// ///
class ZRCOLA_API langchar_db { class langchar_db {
public: public:
#pragma pack(push) #pragma pack(push)
#pragma pack(2) #pragma pack(2)
@ -195,13 +195,13 @@ namespace ZRCola {
}; };
typedef ZRCOLA_API stdex::idrec::record<langchar_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> langchar_rec; typedef stdex::idrec::record<langchar_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> langchar_rec;
/// ///
/// Language database /// Language database
/// ///
class ZRCOLA_API language_db { class language_db {
public: public:
#pragma pack(push) #pragma pack(push)
#pragma pack(2) #pragma pack(2)
@ -298,7 +298,7 @@ namespace ZRCola {
}; };
typedef ZRCOLA_API stdex::idrec::record<language_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> language_rec; typedef stdex::idrec::record<language_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> language_rec;
}; };

9
lib/libZRCola/include/zrcola/tag.h
View File

@ -22,6 +22,7 @@
#include "common.h" #include "common.h"
#include <stdex/idrec.h> #include <stdex/idrec.h>
#include <assert.h>
#include <istream> #include <istream>
#include <ostream> #include <ostream>
#include <vector> #include <vector>
@ -39,7 +40,7 @@ namespace ZRCola {
/// ///
/// Character Tag Database /// Character Tag Database
/// ///
class ZRCOLA_API chrtag_db { class chrtag_db {
public: public:
#pragma pack(push) #pragma pack(push)
#pragma pack(2) #pragma pack(2)
@ -227,13 +228,13 @@ namespace ZRCola {
}; };
typedef ZRCOLA_API stdex::idrec::record<chrtag_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> chrtag_rec; typedef stdex::idrec::record<chrtag_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> chrtag_rec;
/// ///
/// Tag name database /// Tag name database
/// ///
class ZRCOLA_API tagname_db { class tagname_db {
public: public:
#pragma pack(push) #pragma pack(push)
#pragma pack(2) #pragma pack(2)
@ -440,7 +441,7 @@ namespace ZRCola {
}; };
typedef ZRCOLA_API stdex::idrec::record<tagname_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> tagname_rec; typedef stdex::idrec::record<tagname_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> tagname_rec;
}; };

12
lib/libZRCola/include/zrcola/translate.h
View File

@ -59,7 +59,7 @@ namespace ZRCola {
/// ///
/// Translation database /// Translation database
/// ///
class ZRCOLA_API translation_db { class translation_db {
public: public:
#pragma pack(push) #pragma pack(push)
#pragma pack(2) #pragma pack(2)
@ -324,13 +324,13 @@ namespace ZRCola {
}; };
typedef ZRCOLA_API stdex::idrec::record<translation_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> translation_rec; typedef stdex::idrec::record<translation_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> translation_rec;
/// ///
/// Translation set database /// Translation set database
/// ///
class ZRCOLA_API transet_db { class transet_db {
public: public:
#pragma pack(push) #pragma pack(push)
#pragma pack(2) #pragma pack(2)
@ -440,13 +440,13 @@ namespace ZRCola {
}; };
typedef ZRCOLA_API stdex::idrec::record<transet_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> transet_rec; typedef stdex::idrec::record<transet_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> transet_rec;
/// ///
/// Translation sequence database /// Translation sequence database
/// ///
class ZRCOLA_API transeq_db { class transeq_db {
public: public:
#pragma pack(push) #pragma pack(push)
#pragma pack(2) #pragma pack(2)
@ -621,7 +621,7 @@ namespace ZRCola {
}; };
typedef ZRCOLA_API stdex::idrec::record<transeq_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> transeq_rec; typedef stdex::idrec::record<transeq_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> transeq_rec;
}; };

1
lib/libZRColaUI/build/libZRColaUI.vcxproj
View File

@ -39,7 +39,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\include\zrcolaui\chargroup.h" /> <ClInclude Include="..\include\zrcolaui\chargroup.h" />
<ClInclude Include="..\include\zrcolaui\common.h" />
<ClInclude Include="..\include\zrcolaui\keyboard.h" /> <ClInclude Include="..\include\zrcolaui\keyboard.h" />
<ClInclude Include="..\src\pch.h" /> <ClInclude Include="..\src\pch.h" />
</ItemGroup> </ItemGroup>

3
lib/libZRColaUI/build/libZRColaUI.vcxproj.filters
View File

@ -29,9 +29,6 @@
<ClInclude Include="..\src\pch.h"> <ClInclude Include="..\src\pch.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\zrcolaui\common.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\zrcolaui\keyboard.h"> <ClInclude Include="..\include\zrcolaui\keyboard.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>

5
lib/libZRColaUI/include/zrcolaui/chargroup.h
View File

@ -19,7 +19,6 @@
#pragma once #pragma once
#include "common.h"
#include <zrcola/common.h> #include <zrcola/common.h>
#include <stdex/idrec.h> #include <stdex/idrec.h>
@ -45,7 +44,7 @@ namespace ZRCola {
/// ///
/// Character group database /// Character group database
/// ///
class ZRCOLAUI_API chrgrp_db { class chrgrp_db {
public: public:
#pragma pack(push) #pragma pack(push)
#pragma pack(2) #pragma pack(2)
@ -184,7 +183,7 @@ namespace ZRCola {
}; };
typedef ZRCOLAUI_API stdex::idrec::record<chrgrp_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> chrgrp_rec; typedef stdex::idrec::record<chrgrp_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> chrgrp_rec;
}; };

27
lib/libZRColaUI/include/zrcolaui/common.h
View File

@ -1,27 +0,0 @@
/*
Copyright © 2015-2021 Amebis
This file is part of ZRCola.
ZRCola is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
ZRCola is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
///
/// Public function calling convention
///
#define ZRCOLAUI_API
#define ZRCOLA_NOVTABLE __declspec(novtable)

5
lib/libZRColaUI/include/zrcolaui/keyboard.h
View File

@ -19,7 +19,6 @@
#pragma once #pragma once
#include "common.h"
#include <zrcola/common.h> #include <zrcola/common.h>
#include <stdex/idrec.h> #include <stdex/idrec.h>
@ -44,7 +43,7 @@ namespace ZRCola {
/// ///
/// Key sequence database /// Key sequence database
/// ///
class ZRCOLAUI_API keyseq_db { class keyseq_db {
public: public:
#pragma pack(push) #pragma pack(push)
#pragma pack(2) #pragma pack(2)
@ -288,7 +287,7 @@ namespace ZRCola {
}; };
typedef ZRCOLAUI_API stdex::idrec::record<keyseq_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> keyseq_rec; typedef stdex::idrec::record<keyseq_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> keyseq_rec;
}; };

2
lib/stdex

@ -1 +1 @@
Subproject commit 919b44573aac51e7288c100abc76ca49483df9c2 Subproject commit 3d903579052ee07e3c4ee5b0c97daa3fee000b64