С++20 for Client #3636

G-Moris · 2024-08-09T13:26:30Z

С++20 for Client, my test version

TracerDS

You want to introduce C++20 for Client but you change server code?
You also didnt tackle any issues regarding game_sa and multiplayer_sa

Client/core/CCommands.cpp

TracerDS · 2024-08-09T13:33:09Z

Client/core/CCore.cpp

@@ -60,13 +60,13 @@ static HMODULE WINAPI SkipDirectPlay_LoadLibraryA(LPCSTR fileName)
        const fs::path inLaunchDir = fs::path{FromUTF8(GetLaunchPath())} / "enbseries" / "enbhelper.dll";

        if (fs::is_regular_file(inLaunchDir, ec))
-            return Win32LoadLibraryA(inLaunchDir.u8string().c_str());
+            return Win32LoadLibraryA(inLaunchDir.string().c_str());


leave it as u8string for utf8 compatibility

Why is this conversation marked as resolved?

See below. In C++20 path.u8string may/will return std::basic_string<char8_t> which is incompatible with std::string

Something you're not aware of: in the MSVC STL implementation of std::filesystem::path the actual path is stored as a wide string (using string_type = std::wstring) and the path::u8string function uses _Convert_wide_to_narrow to convert the wide string to a narrow variant with the UTF-8 codepage there, but the path::string() function uses the active code page (ACP), which isn't going to be UTF-8 in most cases.

Something you're not aware of: in the MSVC STL implementation of std::filesystem::path the actual path is stored as a wide string (using string_type = std::wstring) and the path::u8string function uses _Convert_wide_to_narrow to convert the wide string to a narrow variant with the UTF-8 codepage there, but the path::string() function uses the active code page (ACP), which isn't going to be UTF-8 in most cases.

Should I use ToACP for u8string? I understood correctly? For example: ToACP(inLaunchDir.u8string()).c_str();

If you are going to call Windows API functions like LoadLibraryA with the *A suffix, then you need the active code page encoding (ACP), which you get from path::string(). For any other code that expects UTF-8, you have to take the wide string path::wstring() and convert it with ToUTF8 (one of our functions - but please double-check that it actually converts from wide to narrow UTF-8), or you continue using path::u8string() but cast the values from char8_t* to char*, for example.

TracerDS · 2024-08-09T13:33:16Z

Client/core/CCore.cpp


        // Try to load enbhelper.dll from the GTA install directory second.
        const fs::path inGTADir = g_gtaDirectory / "enbseries" / "enbhelper.dll";

        if (fs::is_regular_file(inGTADir, ec))
-            return Win32LoadLibraryA(inGTADir.u8string().c_str());
+            return Win32LoadLibraryA(inGTADir.string().c_str());


leave it as u8string for utf8 compatibility

c_str in 'u8' returns char8_t, which is not compatible with LPCSTR

Right, it changes in the C++20. Nevermind then

Can I close this and the like?

See comment

Client/core/CEntryHistory.h

Server/launcher/premake5.lua

Server/mods/deathmatch/premake5.lua

Shared/sdk/SharedUtil.Logging.hpp

Shared/sdk/SString.h

vendor/sparsehash/src/sparsehash/internal/hashtable-common.h

Client/core/CCommands.cpp

tederis · 2024-08-10T04:31:58Z

Client/core/CCore.cpp

@@ -60,13 +60,13 @@ static HMODULE WINAPI SkipDirectPlay_LoadLibraryA(LPCSTR fileName)
        const fs::path inLaunchDir = fs::path{FromUTF8(GetLaunchPath())} / "enbseries" / "enbhelper.dll";

        if (fs::is_regular_file(inLaunchDir, ec))
-            return Win32LoadLibraryA(inLaunchDir.u8string().c_str());
+            return Win32LoadLibraryA(inLaunchDir.string().c_str());


Why is this conversation marked as resolved?

Client/core/CVersionUpdater.Util.hpp

botder · 2024-08-23T19:10:31Z

Client/core/CCommands.cpp

@@ -84,12 +84,11 @@ bool CCommands::Execute(const char* szCommandLine)
 bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool bHandleRemotely, bool bIsScriptedBind)
 {
    // Copy szParametersIn so the contents can be changed
-    char* szParameters = NULL;
+    std::unique_ptr<char[]> szParameters = nullptr;


Why are you not using std::string?

botder · 2024-08-23T19:10:56Z

Client/core/CCommands.cpp

@@ -99,23 +98,27 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
        if (szParameters)
        {
            // His line starts with '/'?
-            if (*szParameters == '/')
+            if (szParameters[0] == '/')
            {
                // Copy the characters after the slash to the 0 terminator to a seperate buffer
                char szBuffer[256];


If you already refactor this code, use a std::array here.

botder · 2024-08-23T19:14:52Z

Client/core/ServerBrowser/CServerBrowser.cpp

        const SString strVersionSortKey = pServer->strVersionSortKey + pServer->strTieBreakSortKey;

-        const SString strPlayers = pServer->nMaxPlayers == 0 ? "" : SString("%d / %d", pServer->nPlayers, pServer->nMaxPlayers);
+        const char*   szPlayers = pServer->nMaxPlayers == 0 ? "" : SString("%d / %d", pServer->nPlayers, pServer->nMaxPlayers).c_str();


You create a SString on the right side, and take the pointer to the internal heap allocated string (though small string optimization might work here and you would get a stack pointer instead), but after this statement/line, the SString will go through the destructor and your szPlayers pointer will point to freed memory.

botder · 2024-08-23T19:15:13Z

Client/core/ServerBrowser/CServerBrowser.cpp

        const SString strPlayersSortKey = SString("%04d-", pServer->nMaxPlayers ? pServer->nPlayers + 1 : 0) + pServer->strTieBreakSortKey;

-        const SString strPing = pServer->nPing == 9999 ? "" : SString("%d", pServer->nPing);
+        const char*   szPing = pServer->nPing == 9999 ? "" : SString("%d", pServer->nPing).c_str();


Same problem with the SString. See other review comment.

botder · 2024-08-23T19:15:50Z

Client/game_sa/CWeaponSA.cpp

+    const CVector*   pvecOrigin = &vecOrigin;
+    const CVector2D* pvecDirection = &vecDirection;


This is just lazy. Refactor the code to work with the references.

Shared/sdk/SString.h

botder · 2024-08-23T19:21:37Z

Shared/sdk/SharedUtil.Win32Utf8FileHooks.hpp

@@ -107,7 +107,7 @@ namespace SharedUtil
    {
    #ifdef UTF8_FILE_HOOKS_PERSONALITY_Core
        static SString gtaDirCP = ToACP(g_gtaDirectory);
-        static SString gtaDirUTF8 = g_gtaDirectory.u8string();
+        static SString gtaDirUTF8 = g_gtaDirectory.string();


std::filesystem::path::string does not return a narrow string with UTF-8 encoding.

…to client_c20

G-Moris · 2024-08-25T01:08:31Z

@botder @tederis Do my corrections fit your requirements?

…to client_c20

G-Moris · 2024-08-31T16:28:11Z

@Dutchman101 Hello! Sorry for the trouble and for the fact that this is not on the topic of PR, can you please unblock me in the Multi Theft Development group? I'm not going to bother anyone or prescribe something bad. It's just that in some developments I want to work together with those who want it.

…to client_c20

G-Moris · 2024-09-06T15:15:38Z

You want to introduce C++20 for Client but you change server code? You also didnt tackle any issues regarding game_sa and multiplayer_sa

Maybe I'll try to solve it

Main

4d49b80

TracerDS suggested changes Aug 9, 2024

View reviewed changes

G_Moris added 3 commits August 9, 2024 17:22

Fixed part 1

1f10a85

Fixed part 2

79b76ef

Fix crash

d59efc1

TracerDS reviewed Aug 9, 2024

View reviewed changes

Client/core/CCommands.cpp Outdated Show resolved Hide resolved

Fast fix by TracerDS

5cd6fc3

tederis added the refactor label Aug 10, 2024

tederis requested changes Aug 10, 2024

View reviewed changes

G_Moris and others added 5 commits August 10, 2024 11:29

Fixed by Tederis

1d8c1d7

Fast 666

6a86788

Merge branch 'master' into client_c20

87a30e2

Merge branch 'master' into client_c20

bd8e747

Merge branch 'master' into client_c20

d64cd42

G-Moris requested a review from tederis August 15, 2024 16:19

G-Moris added 7 commits August 16, 2024 00:17

Merge branch 'master' into client_c20

649cc85

Merge branch 'master' into client_c20

41a6ccb

Merge branch 'master' into client_c20

c55ed03

Merge branch 'master' into client_c20

876e654

Merge branch 'master' into client_c20

8c58a63

Merge branch 'master' into client_c20

17f9dae

Merge branch 'master' into client_c20

9fbe17f

botder requested changes Aug 23, 2024

View reviewed changes

G-Moris and others added 3 commits August 25, 2024 04:04

Merge branch 'master' into client_c20

3e8779b

Fixed by Botder

160909f

Merge branch 'client_c20' of https://github.com/G-Moris/mtasa-blue in…

9f3ebd3

…to client_c20

G-Moris and others added 3 commits August 28, 2024 03:40

Merge branch 'master' into client_c20

fb1b6f7

Mini refactor

9b171c2

Merge branch 'client_c20' of https://github.com/G-Moris/mtasa-blue in…

6383ddf

…to client_c20

G-Moris requested review from TracerDS and botder August 28, 2024 18:12

G-Moris and others added 8 commits August 31, 2024 19:28

Merge branch 'master' into client_c20

4f0f087

Merge branch 'master' into client_c20

65644c4

Merge branch 'master' into client_c20

e964cb2

Update CEGUI

30c42e7

Merge branch 'client_c20' of https://github.com/G-Moris/mtasa-blue in…

01f3de7

…to client_c20

Update CEGUI (Full)

33981ff

Update Discord RPC and Tinygettext

055752b

Update Lunasvg

e7f3a86

G_Moris and others added 5 commits September 6, 2024 21:43

Test Fix multiplayer_sa

7a11241

Test fix game_sa

903f812

Merge branch 'master' into client_c20

50b0ac8

Merge branch 'master' into client_c20

a9ff24c

Merge branch 'master' into client_c20

0e16f15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

С++20 for Client #3636

С++20 for Client #3636

G-Moris commented Aug 9, 2024

TracerDS left a comment

TracerDS Aug 9, 2024

tederis Aug 10, 2024

TracerDS Aug 10, 2024

botder Aug 23, 2024

G-Moris Aug 23, 2024 •

edited

Loading

botder Aug 24, 2024

TracerDS Aug 9, 2024

G-Moris Aug 9, 2024

TracerDS Aug 9, 2024

G-Moris Aug 9, 2024

TracerDS Aug 9, 2024

botder Aug 23, 2024

tederis Aug 10, 2024

botder Aug 23, 2024

botder Aug 23, 2024

botder Aug 23, 2024

botder Aug 23, 2024

botder Aug 23, 2024

botder Aug 23, 2024

G-Moris commented Aug 25, 2024

G-Moris commented Aug 31, 2024 •

edited

Loading

G-Moris commented Sep 6, 2024

		const CVector* pvecOrigin = &vecOrigin;
		const CVector2D* pvecDirection = &vecDirection;

С++20 for Client #3636

Are you sure you want to change the base?

С++20 for Client #3636

Conversation

G-Moris commented Aug 9, 2024

TracerDS left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

G-Moris Aug 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

G-Moris commented Aug 25, 2024

G-Moris commented Aug 31, 2024 • edited Loading

G-Moris commented Sep 6, 2024

G-Moris Aug 23, 2024 •

edited

Loading

G-Moris commented Aug 31, 2024 •

edited

Loading