Skip to content

Add wstring support #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tornamic wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add wstring support #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7a06e7
Add wstring support
Tornamic Mar 10, 2026
e449c8d
fix BufferSize
Tornamic Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 79 additions & 1 deletion serialize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
serialize

Copyright © 2016 - 2024, Mas Bandwidth LLC.
Expand Down Expand Up @@ -1591,6 +1591,24 @@ namespace serialize
return true;
}

template <typename Stream> bool serialize_wstring_internal( Stream & stream, wchar_t * string, int buffer_size )
{
int length = 0;
if ( Stream::IsWriting )
{
length = (int) wcslen( string );
serialize_assert( length < buffer_size );
}

serialize_int( stream, length, 0, buffer_size - 1 );
serialize_bytes( stream, (uint8_t*)string, length * sizeof(wchar_t) );
if ( Stream::IsReading )
{
string[length] = L'\0';
}
return true;
}

/**
Serialize a string to the stream (read/write/measure).
This is a helper macro to make writing unified serialize functions easier.
Expand All @@ -1609,6 +1627,15 @@ namespace serialize
return false; \
} \
} while (0)

#define serialize_wstring( stream, string, buffer_size ) \
do \
{ \
if ( !serialize::serialize_wstring_internal( stream, string, buffer_size ) ) \
{ \
return false; \
} \
} while (0)

/**
Serialize an alignment to the stream (read/write/measure).
Expand Down Expand Up @@ -1890,6 +1917,16 @@ namespace serialize
} \
} while (0)

#define read_wstring( stream, string, buffer_size ) \
do \
{ \
wchar_t * string_ptr = (wchar_t*) string; \
if ( !serialize_wstring_internal( stream, string_ptr, buffer_size ) ) \
{ \
return false; \
} \
} while (0)

#define read_align serialize_align
#define read_check serialize_check
#define read_object serialize_object
Expand Down Expand Up @@ -1965,6 +2002,15 @@ namespace serialize
write_bytes( stream, (uint8_t*)string, length ); \
} while (0)

#define write_wstring( stream, string, buffer_size ) \
do \
{ \
int length = (int) wcslen( string ); \
serialize_assert( length < buffer_size ); \
write_int( stream, length, 0, buffer_size - 1 ); \
write_bytes( stream, (uint8_t*)string, length * sizeof(wchar_t) ); \
} while (0)

#define write_align( stream ) \
do \
{ \
Expand Down Expand Up @@ -2000,6 +2046,20 @@ inline void serialize_copy_string( char * dest, const char * source, size_t dest
}
}

inline void serialize_copy_wstring( wchar_t* dest, const wchar_t* source, size_t dest_size )
{
serialize_assert( dest );
serialize_assert( source );
serialize_assert( dest_size >= 1 );
memset( dest, 0, dest_size * sizeof(wchar_t) );
for ( size_t i = 0; i < dest_size - 1; i++ )
{
if ( source[i] == L'\0' )
break;
dest[i] = source[i];
}
}

#if SERIALIZE_ENABLE_TESTS

#include <time.h>
Expand Down Expand Up @@ -2155,6 +2215,7 @@ struct TestData
int int_relative;
uint8_t bytes[17];
char string[256];
wchar_t wstring[256];
};

struct TestContext
Expand Down Expand Up @@ -2194,6 +2255,8 @@ struct TestObject
data.bytes[i] = (uint8_t) ( i + 5 ) * 13;

serialize_copy_string( data.string, "hello world!", sizeof(data.string) - 1 );

serialize_copy_wstring( data.wstring, L"привіт, світ!", sizeof(data.wstring) / sizeof(wchar_t) - 1 );
}

template <typename Stream> bool Serialize( Stream & stream )
Expand Down Expand Up @@ -2233,6 +2296,7 @@ struct TestObject
serialize_bytes( stream, data.bytes, sizeof( data.bytes ) );

serialize_string( stream, data.string, sizeof( data.string ) );
serialize_wstring( stream, data.wstring, sizeof( data.wstring ) / sizeof( wchar_t ) );

return true;
}
Expand Down Expand Up @@ -2359,6 +2423,17 @@ bool ReadFunction( serialize::ReadStream & readStream )
serialize_check( string[5] == '\0' );
}

{
wchar_t wstring[20];
read_wstring( readStream, wstring, 20 );
serialize_check( wstring[0] == L'п' );
serialize_check( wstring[1] == L'р' );
serialize_check( wstring[2] == L'и' );
serialize_check( wstring[3] == L'в' );
serialize_check( wstring[4] == L'і' );
serialize_check( wstring[5] == L'т' );
}

read_align( readStream );

TestContext context;
Expand Down Expand Up @@ -2415,6 +2490,9 @@ inline void test_read_write()
const char * string = "hello";
write_string( writeStream, string, 10 );

wchar_t * wstring = L"привіт";
write_wstring( writeStream, wstring, 20 );

write_align( writeStream );

TestContext context;
Expand Down