From 104519b296a4a1a690a21d4704330f41cd3a07bb Mon Sep 17 00:00:00 2001 From: "Guilherme G. Menaldo" Date: Thu, 19 Oct 2023 00:05:50 -0300 Subject: [PATCH 1/7] fix appveyor mysql service "mysql56" is not (no longer?) a valid service --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 33a9f5a75f7..11410f48bf5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,7 +16,7 @@ environment: HerculesProject: Hercules-16.sln - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 HerculesProject: Hercules-17.sln -services: mysql56 +services: mysql build_script: - cmd: MSBuild %HerculesProject% /t:map-server,char-server,login-server test: off From 39bde24642930083135d5f1ec222bbbf58988fa8 Mon Sep 17 00:00:00 2001 From: "Guilherme G. Menaldo" Date: Thu, 19 Oct 2023 00:09:32 -0300 Subject: [PATCH 2/7] fix clang-13 build action debian:unstable doesn't have clang-13 available for installation, using debian bookworm instead --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 155cf5d9618..56367453953 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: - CC: "clang-11" LTO: "--enable-lto" container: - image: debian:unstable + image: debian:bookworm services: mariadb: image: mariadb:latest From 0fd50217aee2e0ecc12de32c58089fece633f66d Mon Sep 17 00:00:00 2001 From: "Guilherme G. Menaldo" Date: Thu, 19 Oct 2023 00:10:45 -0300 Subject: [PATCH 3/7] add concurrency setting for github actions workflows pushing a new commit in a PR now stops actions from previous commits of the same PR, allowing CI to stop testing old code and starting the new one earlier --- .github/workflows/build.yml | 7 +++++++ .github/workflows/clang15_test.yml | 7 +++++++ .github/workflows/codeql-analysis.yml | 6 ++++++ .github/workflows/gcc_test.yml | 7 +++++++ .github/workflows/gccold1.yml | 7 +++++++ .github/workflows/gccold2.yml | 7 +++++++ .github/workflows/gccold3.yml | 7 +++++++ .github/workflows/gccsnapshot_test.yml | 7 +++++++ .github/workflows/mariadb.yml | 7 +++++++ .github/workflows/mysql.yml | 7 +++++++ .github/workflows/tools.yml | 7 +++++++ 11 files changed, 76 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 56367453953..34d244aecc7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,6 +28,13 @@ jobs: CLIENT_TYPE: "--enable-packetver-zero" - CC: "clang-11" LTO: "--enable-lto" + + # github.head_ref will stop previous runs in the same PR (if in a PR) + # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop) + concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.LTO }} + cancel-in-progress: true + container: image: debian:bookworm services: diff --git a/.github/workflows/clang15_test.yml b/.github/workflows/clang15_test.yml index b24e35d77a5..6306bb4b2b6 100644 --- a/.github/workflows/clang15_test.yml +++ b/.github/workflows/clang15_test.yml @@ -24,6 +24,13 @@ jobs: exclude: - PACKET_VERSION: "--enable-packetver=20130724" CLIENT_TYPE: "--enable-packetver-zero" + + # github.head_ref will stop previous runs in the same PR (if in a PR) + # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop) + concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}} + cancel-in-progress: true + container: image: debian:unstable services: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a08eafbfff6..60faa89a3f6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -12,6 +12,12 @@ jobs: matrix: language: ['c', 'python'] + # github.head_ref will stop previous runs in the same PR (if in a PR) + # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop) + concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.language }} + cancel-in-progress: true + permissions: security-events: write diff --git a/.github/workflows/gcc_test.yml b/.github/workflows/gcc_test.yml index 4a65a29ef0a..2298c70e675 100644 --- a/.github/workflows/gcc_test.yml +++ b/.github/workflows/gcc_test.yml @@ -24,6 +24,13 @@ jobs: exclude: - PACKET_VERSION: "--enable-packetver=20130724" CLIENT_TYPE: "--enable-packetver-zero" + + # github.head_ref will stop previous runs in the same PR (if in a PR) + # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop) + concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}} + cancel-in-progress: true + container: image: debian:unstable services: diff --git a/.github/workflows/gccold1.yml b/.github/workflows/gccold1.yml index 05a2635ba2f..0f1499df4cb 100644 --- a/.github/workflows/gccold1.yml +++ b/.github/workflows/gccold1.yml @@ -25,6 +25,13 @@ jobs: exclude: - PACKET_VERSION: "--enable-packetver=20100105" CLIENT_TYPE: "--enable-packetver-zero" + + # github.head_ref will stop previous runs in the same PR (if in a PR) + # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop) + concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.LTO }} + cancel-in-progress: true + container: image: ubuntu:22.04 services: diff --git a/.github/workflows/gccold2.yml b/.github/workflows/gccold2.yml index ebc6a0dd944..e39f71c4e4b 100644 --- a/.github/workflows/gccold2.yml +++ b/.github/workflows/gccold2.yml @@ -25,6 +25,13 @@ jobs: exclude: - PACKET_VERSION: "--enable-packetver=20100105" CLIENT_TYPE: "--enable-packetver-zero" + + # github.head_ref will stop previous runs in the same PR (if in a PR) + # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop) + concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.LTO }} + cancel-in-progress: true + container: image: ubuntu:20.04 services: diff --git a/.github/workflows/gccold3.yml b/.github/workflows/gccold3.yml index 270386966d8..74781cb4784 100644 --- a/.github/workflows/gccold3.yml +++ b/.github/workflows/gccold3.yml @@ -26,6 +26,13 @@ jobs: exclude: - PACKET_VERSION: "--enable-packetver=20100105" CLIENT_TYPE: "--enable-packetver-zero" + + # github.head_ref will stop previous runs in the same PR (if in a PR) + # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop) + concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.LTO }} + cancel-in-progress: true + container: image: ubuntu:18.04 services: diff --git a/.github/workflows/gccsnapshot_test.yml b/.github/workflows/gccsnapshot_test.yml index 95607e2dc97..228dbf5cad5 100644 --- a/.github/workflows/gccsnapshot_test.yml +++ b/.github/workflows/gccsnapshot_test.yml @@ -24,6 +24,13 @@ jobs: exclude: - PACKET_VERSION: "--enable-packetver=20130724" CLIENT_TYPE: "--enable-packetver-zero" + + # github.head_ref will stop previous runs in the same PR (if in a PR) + # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop) + concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}} + cancel-in-progress: true + container: image: debian:unstable services: diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml index 9f6e13b0c13..5b206e56ab9 100644 --- a/.github/workflows/mariadb.yml +++ b/.github/workflows/mariadb.yml @@ -22,6 +22,13 @@ jobs: SANITIZER: ["--disable-manager", "--enable-sanitize=full"] PACKET_VERSION: ["--enable-packetver=20221024"] MYSQL: ["10.2", "latest"] + + # github.head_ref will stop previous runs in the same PR (if in a PR) + # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop) + concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.MYSQL }} + cancel-in-progress: true + container: image: debian:unstable services: diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml index 35bc7395ed9..59cc18f406d 100644 --- a/.github/workflows/mysql.yml +++ b/.github/workflows/mysql.yml @@ -22,6 +22,13 @@ jobs: SANITIZER: ["--disable-manager", "--enable-sanitize=full"] PACKET_VERSION: ["--enable-packetver=20221024"] MYSQL: ["5.6", "5.7", "latest"] + + # github.head_ref will stop previous runs in the same PR (if in a PR) + # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop) + concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.MYSQL }} + cancel-in-progress: true + container: image: debian:unstable services: diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index 16830afa27b..bde7820f00a 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -12,6 +12,13 @@ env: jobs: build: runs-on: ubuntu-latest + + # github.head_ref will stop previous runs in the same PR (if in a PR) + # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop) + concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + container: image: debian:unstable steps: From bdac982faef3567d875877f071b1e48e39016fed Mon Sep 17 00:00:00 2001 From: "Guilherme G. Menaldo" Date: Thu, 19 Oct 2023 00:13:06 -0300 Subject: [PATCH 4/7] fix itemlink formatting for zero 2022 clients --- src/map/clif.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/map/clif.c b/src/map/clif.c index 8d63c6d0088..b0c1f4a7e41 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -25993,12 +25993,12 @@ static void clif_format_itemlink(StringBuf *buf, const struct item *it) #if PACKETVER >= 20161116 static const char view_sep = '&'; #endif -#if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723 +#if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723 || PACKETVER_ZERO_NUM >= 20221024 static const char grade_sep = '\''; #endif // Separators that were updated along the time -#if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723 +#if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723 || PACKETVER_ZERO_NUM >= 20221024 static const char *tag_name = "ITEML"; static const char card_sep = ')'; static const char optid_sep = '+'; @@ -26043,7 +26043,7 @@ static void clif_format_itemlink(StringBuf *buf, const struct item *it) StrBuf->Printf(buf, "%c%s", view_sep, get_padded_value(itd->view_sprite, 2)); #endif // PACKETVER >= 20161116 -#if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723 +#if PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723 || PACKETVER_ZERO_NUM >= 20221024 StrBuf->Printf(buf, "%c%s", grade_sep, get_padded_value(it->grade, 2)); #endif // PACKETVER_MAIN_NUM >= 20200916 || PACKETVER_RE_NUM >= 20200723 From 601e52ee5cef92ac5831fece1ee4676f4e153fa0 Mon Sep 17 00:00:00 2001 From: "Guilherme G. Menaldo" Date: Thu, 19 Oct 2023 00:13:56 -0300 Subject: [PATCH 5/7] fix itemlink tests for pre-re one of the cards used in the test is not available for pre-re, changing to a card that is available in both --- npc/dev/test.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/npc/dev/test.txt b/npc/dev/test.txt index 32d0cf1f4a1..a6c7ecbdf37 100644 --- a/npc/dev/test.txt +++ b/npc/dev/test.txt @@ -243,7 +243,7 @@ function script F_TestGetItemLink_BaseWeapon { } function script F_TestGetItemLink_FullWeapon { - setarray(.@cards[0], Fabre_Card, Captain_Felock_Card, 0, Agility1); + setarray(.@cards[0], Fabre_Card, Necromancer_Card, 0, Agility1); setarray(.@options[0], WEAPON_ATTR_GROUND, 1, 0, VAR_MAXHPAMOUNT, 10, 0); .@str$ = getitemlink(Knife, 10, .@cards, .@options, 2); @@ -251,11 +251,11 @@ function script F_TestGetItemLink_FullWeapon { if (PACKETVER < 20150923) { .@pass = (.@str$ == getiteminfo(Knife, ITEMINFO_NAME)); } else if (PACKETVER < 20161116) { - .@pass = (.@str$ == "000021jn%0a'12y'74q'00'1ei)2R*00+01)01*00+0a"); + .@pass = (.@str$ == "000021jn%0a'12y'19C'00'1ei)2R*00+01)01*00+0a"); } else if (PACKETVER < 20200916) { - .@pass = (.@str$ == "000021jn%0a&00(12y(74q(00(1ei*2R+00,01*01+00,0a"); + .@pass = (.@str$ == "000021jn%0a&00(12y(19C(00(1ei*2R+00,01*01+00,0a"); } else { - .@pass = (.@str$ == "000021jn%0a&00'02)12y)74q)00)1ei+2R,00-01+01,00-0a"); + .@pass = (.@str$ == "000021jn%0a&00'02)12y)19C)00)1ei+2R,00-01+01,00-0a"); } return .@pass; From fab1b8393d4314dbd983bfb86eb5de59456fc8e4 Mon Sep 17 00:00:00 2001 From: "Guilherme G. Menaldo" Date: Thu, 19 Oct 2023 00:14:35 -0300 Subject: [PATCH 6/7] fix a possible buffer overread in chunked test --- src/test/test_chunked.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/test_chunked.c b/src/test/test_chunked.c index 9d238ce593f..6ce1e0d04e2 100644 --- a/src/test/test_chunked.c +++ b/src/test/test_chunked.c @@ -359,10 +359,12 @@ static void testChunkedBuf2(char *data, int sz) fake_rflags = NULL; } +#define MAX_TEST_BUFFER 10000 + static void testChunkedBuf(char *data, int sz) { if (sz == 0) - sz = (int)strlen(data); + sz = (int) strnlen(data, MAX_TEST_BUFFER); for (int f = 1; f < 30; f ++) { fake_wchunk_size = f; testChunkedBuf2(data, sz); @@ -380,7 +382,7 @@ static void testChunked1(void) testChunkedBuf("", 0); show_success = false; ShowStatus("Test long chunked\n"); - for (int f = 0; f < 10000; f += 100) { + for (int f = 0; f < MAX_TEST_BUFFER; f += 100) { // reallocate buffer always for detect overflow char *buf = aCalloc(1, f); for (int i = 0; i < f; i ++) { From a95cde5b534a0cbce892bf4e135079820c60f478 Mon Sep 17 00:00:00 2001 From: "Guilherme G. Menaldo" Date: Thu, 19 Oct 2023 00:38:42 -0300 Subject: [PATCH 7/7] include base62.h/.c into VS projects --- vcproj-15/char-server.vcxproj | 4 +++- vcproj-15/char-server.vcxproj.filters | 8 +++++++- vcproj-15/login-server.vcxproj | 4 +++- vcproj-15/login-server.vcxproj.filters | 8 +++++++- vcproj-15/map-server.vcxproj | 4 +++- vcproj-15/map-server.vcxproj.filters | 8 +++++++- vcproj-16/api-server.vcxproj | 4 +++- vcproj-16/api-server.vcxproj.filters | 8 +++++++- vcproj-16/char-server.vcxproj | 4 +++- vcproj-16/char-server.vcxproj.filters | 8 +++++++- vcproj-16/login-server.vcxproj | 4 +++- vcproj-16/login-server.vcxproj.filters | 8 +++++++- vcproj-16/map-server.vcxproj | 4 +++- vcproj-16/map-server.vcxproj.filters | 8 +++++++- vcproj-17/api-server.vcxproj | 4 +++- vcproj-17/api-server.vcxproj.filters | 6 +++++- vcproj-17/char-server.vcxproj | 4 +++- vcproj-17/char-server.vcxproj.filters | 8 +++++++- vcproj-17/login-server.vcxproj | 4 +++- vcproj-17/login-server.vcxproj.filters | 8 +++++++- vcproj-17/map-server.vcxproj | 4 +++- vcproj-17/map-server.vcxproj.filters | 8 +++++++- 22 files changed, 108 insertions(+), 22 deletions(-) diff --git a/vcproj-15/char-server.vcxproj b/vcproj-15/char-server.vcxproj index 8d6f1854a52..a51c99b1187 100644 --- a/vcproj-15/char-server.vcxproj +++ b/vcproj-15/char-server.vcxproj @@ -164,6 +164,7 @@ + @@ -231,6 +232,7 @@ + @@ -259,4 +261,4 @@ - \ No newline at end of file + diff --git a/vcproj-15/char-server.vcxproj.filters b/vcproj-15/char-server.vcxproj.filters index c50fe684f48..5682ec18690 100644 --- a/vcproj-15/char-server.vcxproj.filters +++ b/vcproj-15/char-server.vcxproj.filters @@ -1,6 +1,9 @@  + + common + common @@ -156,6 +159,9 @@ common + + common + common @@ -372,4 +378,4 @@ {d2dbc907-ce23-48c3-85ac-049ff2a8c728} - \ No newline at end of file + diff --git a/vcproj-15/login-server.vcxproj b/vcproj-15/login-server.vcxproj index a94a27d0f9a..d49bf93fa70 100644 --- a/vcproj-15/login-server.vcxproj +++ b/vcproj-15/login-server.vcxproj @@ -144,6 +144,7 @@ + @@ -196,6 +197,7 @@ + @@ -230,4 +232,4 @@ - \ No newline at end of file + diff --git a/vcproj-15/login-server.vcxproj.filters b/vcproj-15/login-server.vcxproj.filters index 22dbec7934f..e7453690303 100644 --- a/vcproj-15/login-server.vcxproj.filters +++ b/vcproj-15/login-server.vcxproj.filters @@ -16,6 +16,9 @@ login + + common + common @@ -126,6 +129,9 @@ common + + common + common @@ -282,4 +288,4 @@ {d8fb6ac7-c87d-4d6b-aea4-98a0ea800666} - \ No newline at end of file + diff --git a/vcproj-15/map-server.vcxproj b/vcproj-15/map-server.vcxproj index 5d5d4e47c25..10ddbe038cf 100644 --- a/vcproj-15/map-server.vcxproj +++ b/vcproj-15/map-server.vcxproj @@ -139,6 +139,7 @@ + @@ -248,6 +249,7 @@ + @@ -339,4 +341,4 @@ - \ No newline at end of file + diff --git a/vcproj-15/map-server.vcxproj.filters b/vcproj-15/map-server.vcxproj.filters index a218c69694f..50e5f23a5db 100644 --- a/vcproj-15/map-server.vcxproj.filters +++ b/vcproj-15/map-server.vcxproj.filters @@ -193,6 +193,9 @@ common + + common + common @@ -456,6 +459,9 @@ common + + common + common @@ -570,4 +576,4 @@ {d7d16c66-c973-45d7-b47f-a1f80a898b9b} - \ No newline at end of file + diff --git a/vcproj-16/api-server.vcxproj b/vcproj-16/api-server.vcxproj index 2491da5ef4e..4560c15500c 100644 --- a/vcproj-16/api-server.vcxproj +++ b/vcproj-16/api-server.vcxproj @@ -169,6 +169,7 @@ + @@ -234,6 +235,7 @@ + @@ -262,4 +264,4 @@ - \ No newline at end of file + diff --git a/vcproj-16/api-server.vcxproj.filters b/vcproj-16/api-server.vcxproj.filters index 1e9f39212e5..9d869c75709 100644 --- a/vcproj-16/api-server.vcxproj.filters +++ b/vcproj-16/api-server.vcxproj.filters @@ -64,6 +64,9 @@ commom + + common + common @@ -150,6 +153,9 @@ commom + + commom + commom @@ -354,4 +360,4 @@ {7d241991-b832-4445-ac48-8d1fa9693f33} - \ No newline at end of file + diff --git a/vcproj-16/char-server.vcxproj b/vcproj-16/char-server.vcxproj index 39895ab4a3d..024a850bd30 100644 --- a/vcproj-16/char-server.vcxproj +++ b/vcproj-16/char-server.vcxproj @@ -164,6 +164,7 @@ + @@ -231,6 +232,7 @@ + @@ -259,4 +261,4 @@ - \ No newline at end of file + diff --git a/vcproj-16/char-server.vcxproj.filters b/vcproj-16/char-server.vcxproj.filters index cd6a368cda5..67537acf754 100644 --- a/vcproj-16/char-server.vcxproj.filters +++ b/vcproj-16/char-server.vcxproj.filters @@ -1,6 +1,9 @@ + + common + common @@ -165,6 +168,9 @@ common + + common + common @@ -393,4 +399,4 @@ {d2dbc907-ce23-48c3-85ac-049ff2a8c728} - \ No newline at end of file + diff --git a/vcproj-16/login-server.vcxproj b/vcproj-16/login-server.vcxproj index 114c7b00552..0bfebb8f2a0 100644 --- a/vcproj-16/login-server.vcxproj +++ b/vcproj-16/login-server.vcxproj @@ -144,6 +144,7 @@ + @@ -196,6 +197,7 @@ + @@ -230,4 +232,4 @@ - \ No newline at end of file + diff --git a/vcproj-16/login-server.vcxproj.filters b/vcproj-16/login-server.vcxproj.filters index c1edb3cdbed..949a3c8e96d 100644 --- a/vcproj-16/login-server.vcxproj.filters +++ b/vcproj-16/login-server.vcxproj.filters @@ -1,6 +1,9 @@ + + common + common @@ -114,6 +117,9 @@ common + + common + common @@ -294,4 +300,4 @@ {d8fb6ac7-c87d-4d6b-aea4-98a0ea800666} - \ No newline at end of file + diff --git a/vcproj-16/map-server.vcxproj b/vcproj-16/map-server.vcxproj index ca154bf6c15..95f1ec35fe5 100644 --- a/vcproj-16/map-server.vcxproj +++ b/vcproj-16/map-server.vcxproj @@ -139,6 +139,7 @@ + @@ -248,6 +249,7 @@ + @@ -339,4 +341,4 @@ - \ No newline at end of file + diff --git a/vcproj-16/map-server.vcxproj.filters b/vcproj-16/map-server.vcxproj.filters index e6ccd144909..9ef0f57c852 100644 --- a/vcproj-16/map-server.vcxproj.filters +++ b/vcproj-16/map-server.vcxproj.filters @@ -190,6 +190,9 @@ common + + common + common @@ -450,6 +453,9 @@ common + + common + common @@ -594,4 +600,4 @@ {d7d16c66-c973-45d7-b47f-a1f80a898b9b} - \ No newline at end of file + diff --git a/vcproj-17/api-server.vcxproj b/vcproj-17/api-server.vcxproj index 71e8743366a..b660582f171 100644 --- a/vcproj-17/api-server.vcxproj +++ b/vcproj-17/api-server.vcxproj @@ -169,6 +169,7 @@ + @@ -234,6 +235,7 @@ + @@ -262,4 +264,4 @@ - \ No newline at end of file + diff --git a/vcproj-17/api-server.vcxproj.filters b/vcproj-17/api-server.vcxproj.filters index 8ddd695640c..6635bca2dec 100644 --- a/vcproj-17/api-server.vcxproj.filters +++ b/vcproj-17/api-server.vcxproj.filters @@ -64,6 +64,7 @@ commom + @@ -135,6 +136,9 @@ commom + + commom + commom @@ -354,4 +358,4 @@ {83a2192a-8174-4bf9-a54b-04862a01d8f6} - \ No newline at end of file + diff --git a/vcproj-17/char-server.vcxproj b/vcproj-17/char-server.vcxproj index 50639bfd296..6558ae1db4e 100644 --- a/vcproj-17/char-server.vcxproj +++ b/vcproj-17/char-server.vcxproj @@ -164,6 +164,7 @@ + @@ -231,6 +232,7 @@ + @@ -259,4 +261,4 @@ - \ No newline at end of file + diff --git a/vcproj-17/char-server.vcxproj.filters b/vcproj-17/char-server.vcxproj.filters index aaeed8e9d6d..96941c5c78f 100644 --- a/vcproj-17/char-server.vcxproj.filters +++ b/vcproj-17/char-server.vcxproj.filters @@ -1,6 +1,9 @@  + + common + common @@ -165,6 +168,9 @@ common + + common + common @@ -390,4 +396,4 @@ {d2dbc907-ce23-48c3-85ac-049ff2a8c728} - \ No newline at end of file + diff --git a/vcproj-17/login-server.vcxproj b/vcproj-17/login-server.vcxproj index 52e0d8854a7..6a3f593f888 100644 --- a/vcproj-17/login-server.vcxproj +++ b/vcproj-17/login-server.vcxproj @@ -144,6 +144,7 @@ + @@ -196,6 +197,7 @@ + @@ -230,4 +232,4 @@ - \ No newline at end of file + diff --git a/vcproj-17/login-server.vcxproj.filters b/vcproj-17/login-server.vcxproj.filters index fc6c2bf36f1..0ea203ed16c 100644 --- a/vcproj-17/login-server.vcxproj.filters +++ b/vcproj-17/login-server.vcxproj.filters @@ -16,6 +16,9 @@ login + + common + common @@ -129,6 +132,9 @@ common + + common + common @@ -288,4 +294,4 @@ {d8fb6ac7-c87d-4d6b-aea4-98a0ea800666} - \ No newline at end of file + diff --git a/vcproj-17/map-server.vcxproj b/vcproj-17/map-server.vcxproj index 20c11c6b01b..bc033e3ff35 100644 --- a/vcproj-17/map-server.vcxproj +++ b/vcproj-17/map-server.vcxproj @@ -139,6 +139,7 @@ + @@ -248,6 +249,7 @@ + @@ -339,4 +341,4 @@ - \ No newline at end of file + diff --git a/vcproj-17/map-server.vcxproj.filters b/vcproj-17/map-server.vcxproj.filters index 9d15ec8fe54..a070f2c113f 100644 --- a/vcproj-17/map-server.vcxproj.filters +++ b/vcproj-17/map-server.vcxproj.filters @@ -190,6 +190,9 @@ common + + common + common @@ -453,6 +456,9 @@ common + + common + common @@ -570,4 +576,4 @@ {d7d16c66-c973-45d7-b47f-a1f80a898b9b} - \ No newline at end of file +