diff --git a/.github/workflows/windows-dotnet.yml b/.github/workflows/windows-dotnet.yml index 6353075..34704ea 100644 --- a/.github/workflows/windows-dotnet.yml +++ b/.github/workflows/windows-dotnet.yml @@ -32,28 +32,29 @@ jobs: ${{github.workspace}}/install/ Release: needs: Native - runs-on: ubuntu-latest + runs-on: windows-latest env: BUILD_TYPE: Release steps: - name: Cloning uses: actions/checkout@v4 - - name: Download Windows MSVC amd64 + - name: Download Windows MSVC amd64 Assets uses: actions/download-artifact@v4 with: name: Windows MSVC amd64 path: assets/amd64 - - name: Download Windows MSVC amd64_x86 + - name: Download Windows MSVC amd64_x86 Assets uses: actions/download-artifact@v4 with: name: Windows MSVC amd64_x86 path: assets/amd64_x86 - - name: Download Windows MSVC amd64_arm64 + - name: Download Windows MSVC amd64_arm64 Assets uses: actions/download-artifact@v4 with: name: Windows MSVC amd64_arm64 path: assets/amd64_arm64 - - name: Copy Runtime Assets + - name: Copy Assets + shell: bash run: | mkdir -p ${{github.workspace}}/src/dotnet/runtimes/win-arm64/native \ ${{github.workspace}}/src/dotnet/runtimes/win-x64/native \ @@ -64,14 +65,14 @@ jobs: ${{github.workspace}}/src/dotnet/runtimes/win-x64/native/libragephoto.dll cp ${{github.workspace}}/assets/amd64_x86/bin/libragephoto.dll \ ${{github.workspace}}/src/dotnet/runtimes/win-x86/native/libragephoto.dll + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v2 - name: Setup .NET uses: actions/setup-dotnet@v4 with: dotnet-version: 8.0.x - - name: Restore dependencies - run: dotnet restore src/dotnet - - name: Pack Syping.RagePhoto.Core - run: dotnet pack src/dotnet --configuration ${{env.BUILD_TYPE}} + - name: Build Syping.RagePhoto.Core + run: msbuild src/dotnet/Syping.RagePhoto.Core.csproj /t:pack /p:Configuration=${{env.BUILD_TYPE}} - name: Upload uses: actions/upload-artifact@v4 with: diff --git a/src/dotnet/.editorconfig b/src/dotnet/.editorconfig new file mode 100644 index 0000000..d22e388 --- /dev/null +++ b/src/dotnet/.editorconfig @@ -0,0 +1,244 @@ +# Remove the line below if you want to inherit .editorconfig settings from higher directories +root = true + +# C# files +[*.cs] + +#### Core EditorConfig Options #### + +# Indentation and spacing +indent_size = 4 +indent_style = space +tab_width = 4 + +# New line preferences +end_of_line = crlf +insert_final_newline = false + +#### .NET Code Actions #### + +# Type members +dotnet_hide_advanced_members = false +dotnet_member_insertion_location = with_other_members_of_the_same_kind +dotnet_property_generation_behavior = prefer_throwing_properties + +# Symbol search +dotnet_search_reference_assemblies = true + +#### .NET Coding Conventions #### + +# Organize usings +dotnet_separate_import_directive_groups = false +dotnet_sort_system_directives_first = false +file_header_template = unset + +# this. and Me. preferences +dotnet_style_qualification_for_event = false +dotnet_style_qualification_for_field = false +dotnet_style_qualification_for_method = false +dotnet_style_qualification_for_property = false + +# Language keywords vs BCL types preferences +dotnet_style_predefined_type_for_locals_parameters_members = true +dotnet_style_predefined_type_for_member_access = true + +# Parentheses preferences +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_operators = never_if_unnecessary +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity + +# Modifier preferences +dotnet_style_require_accessibility_modifiers = for_non_interface_members + +# Expression-level preferences +dotnet_prefer_system_hash_code = true +dotnet_style_coalesce_expression = true +dotnet_style_collection_initializer = true +dotnet_style_explicit_tuple_names = true +dotnet_style_namespace_match_folder = true +dotnet_style_null_propagation = true +dotnet_style_object_initializer = true +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_prefer_auto_properties = true +dotnet_style_prefer_collection_expression = when_types_loosely_match +dotnet_style_prefer_compound_assignment = true +dotnet_style_prefer_conditional_expression_over_assignment = true +dotnet_style_prefer_conditional_expression_over_return = true +dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed +dotnet_style_prefer_inferred_anonymous_type_member_names = true +dotnet_style_prefer_inferred_tuple_names = true +dotnet_style_prefer_is_null_check_over_reference_equality_method = true +dotnet_style_prefer_simplified_boolean_expressions = true +dotnet_style_prefer_simplified_interpolation = true + +# Field preferences +dotnet_style_readonly_field = true + +# Parameter preferences +dotnet_code_quality_unused_parameters = all + +# Suppression preferences +dotnet_remove_unnecessary_suppression_exclusions = none + +# New line preferences +dotnet_style_allow_multiple_blank_lines_experimental = true +dotnet_style_allow_statement_immediately_after_block_experimental = true + +#### C# Coding Conventions #### + +# var preferences +csharp_style_var_elsewhere = false +csharp_style_var_for_built_in_types = false +csharp_style_var_when_type_is_apparent = false + +# Expression-bodied members +csharp_style_expression_bodied_accessors = true +csharp_style_expression_bodied_constructors = false +csharp_style_expression_bodied_indexers = true +csharp_style_expression_bodied_lambdas = true +csharp_style_expression_bodied_local_functions = false +csharp_style_expression_bodied_methods = false +csharp_style_expression_bodied_operators = false +csharp_style_expression_bodied_properties = true + +# Pattern matching preferences +csharp_style_pattern_matching_over_as_with_null_check = true +csharp_style_pattern_matching_over_is_with_cast_check = true +csharp_style_prefer_extended_property_pattern = true +csharp_style_prefer_not_pattern = true +csharp_style_prefer_pattern_matching = true +csharp_style_prefer_switch_expression = true + +# Null-checking preferences +csharp_style_conditional_delegate_call = true + +# Modifier preferences +csharp_prefer_static_anonymous_function = true +csharp_prefer_static_local_function = true +csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async +csharp_style_prefer_readonly_struct = true +csharp_style_prefer_readonly_struct_member = true + +# Code-block preferences +csharp_prefer_braces = true +csharp_prefer_simple_using_statement = true +csharp_prefer_system_threading_lock = true +csharp_style_namespace_declarations = block_scoped +csharp_style_prefer_method_group_conversion = true +csharp_style_prefer_primary_constructors = true +csharp_style_prefer_top_level_statements = true + +# Expression-level preferences +csharp_prefer_simple_default_expression = true +csharp_style_deconstructed_variable_declaration = true +csharp_style_implicit_object_creation_when_type_is_apparent = true +csharp_style_inlined_variable_declaration = true +csharp_style_prefer_index_operator = true +csharp_style_prefer_local_over_anonymous_function = true +csharp_style_prefer_null_check_over_type_check = true +csharp_style_prefer_range_operator = true +csharp_style_prefer_tuple_swap = true +csharp_style_prefer_utf8_string_literals = true +csharp_style_throw_expression = true +csharp_style_unused_value_assignment_preference = discard_variable +csharp_style_unused_value_expression_statement_preference = discard_variable + +# 'using' directive preferences +csharp_using_directive_placement = outside_namespace + +# New line preferences +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true +csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true +csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true +csharp_style_allow_embedded_statements_on_same_line_experimental = true + +#### C# Formatting Rules #### + +# New line preferences +csharp_new_line_before_catch = true +csharp_new_line_before_else = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = none +csharp_new_line_between_query_expression_clauses = true + +# Indentation preferences +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = false +csharp_indent_labels = flush_left +csharp_indent_switch_labels = true + +# Space preferences +csharp_space_after_cast = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_semicolon_in_for_statement = true +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false + +# Wrapping preferences +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = true + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case diff --git a/src/dotnet/RagePhoto.cs b/src/dotnet/RagePhoto.cs index d3efbcf..f5cf6bc 100644 --- a/src/dotnet/RagePhoto.cs +++ b/src/dotnet/RagePhoto.cs @@ -1,5 +1,6 @@ using System; using System.Runtime.InteropServices; +using System.Text; namespace Syping.RagePhoto { @@ -109,16 +110,15 @@ namespace Syping.RagePhoto { } public void Load(Byte[] data) { - UIntPtr size = (UIntPtr)data.LongLength; - bool result = ragephoto_load(_instance, data, size); + bool result = ragephoto_load(_instance, data, (UIntPtr)data.LongLength); if (!result) - throw new RagePhotoException(this, string.Format("Failed to load Photo: {0}", Error.ToString())); + throw new RagePhotoException(this, string.Format("Failed to load Photo: {0}", Error)); } public void LoadFile(String path) { bool result = ragephoto_loadfile(_instance, path); if (!result) - throw new RagePhotoException(this, string.Format("Failed to load Photo: {0}", Error.ToString())); + throw new RagePhotoException(this, string.Format("Failed to load Photo: {0}", Error)); } public RagePhotoData Data { @@ -126,11 +126,8 @@ namespace Syping.RagePhoto { } public String Description { - get { - IntPtr descPtr = ragephoto_getphotodesc(_instance); - return descPtr == IntPtr.Zero ? string.Empty : Marshal.PtrToStringUTF8(descPtr); - } - set => ragephoto_setphotodesc(_instance, value, 0); + get => PtrToStringUTF8(ragephoto_getphotodesc(_instance)); + set => ragephoto_setphotodesc(_instance, value, (UInt32)DefaultSize.DEFAULT_DESCBUFFER); } public PhotoError Error { @@ -147,35 +144,12 @@ namespace Syping.RagePhoto { UInt32 size = ragephoto_getphotosize(_instance); if (size == 0) return Array.Empty(); - IntPtr jpegPtr = ragephoto_getphotojpeg(_instance); - byte[] jpeg = new Byte[size]; - Marshal.Copy(jpegPtr, jpeg, 0, (Int32)size); - return jpeg; - } - set { - UInt32 bufferSize; - UInt32 size = (UInt32)value.Length; - switch (Format) { - case PhotoFormat.GTA5: - if (size > (UInt32)DefaultSize.DEFAULT_GTA5_PHOTOBUFFER) - bufferSize = size; - else - bufferSize = (UInt32)DefaultSize.DEFAULT_GTA5_PHOTOBUFFER; - break; - case PhotoFormat.RDR2: - if (size > (UInt32)DefaultSize.DEFAULT_RDR2_PHOTOBUFFER) - bufferSize = size; - else - bufferSize = (UInt32)DefaultSize.DEFAULT_RDR2_PHOTOBUFFER; - break; - default: - bufferSize = size; - break; - } - bool result = ragephoto_setphotojpeg(_instance, value, size, bufferSize); - if (!result) - throw new RagePhotoException(this, string.Format("Failed to set Jpeg: {0}", Error.ToString())); + byte[] buffer = new Byte[size]; + IntPtr ptr = ragephoto_getphotojpeg(_instance); + Marshal.Copy(ptr, buffer, 0, (Int32)size); + return buffer; } + set => SetJpeg(value); } public UInt32 JpegSize { @@ -183,18 +157,12 @@ namespace Syping.RagePhoto { } public String Json { - get { - IntPtr jsonPtr = ragephoto_getphotojson(_instance); - return jsonPtr == IntPtr.Zero ? string.Empty : Marshal.PtrToStringUTF8(jsonPtr); - } - set => ragephoto_setphotojson(_instance, value, 0); + get => PtrToStringUTF8(ragephoto_getphotojson(_instance)); + set => ragephoto_setphotojson(_instance, value, (UInt32)DefaultSize.DEFAULT_JSONBUFFER); } public String Header { - get { - IntPtr headerPtr = ragephoto_getphotoheader(_instance); - return headerPtr == IntPtr.Zero ? string.Empty : Marshal.PtrToStringUTF8(headerPtr); - } + get => PtrToStringUTF8(ragephoto_getphotoheader(_instance)); } public UIntPtr SaveSize { @@ -206,11 +174,8 @@ namespace Syping.RagePhoto { } public String Title { - get { - IntPtr titlePtr = ragephoto_getphototitle(_instance); - return titlePtr == IntPtr.Zero ? string.Empty : Marshal.PtrToStringUTF8(titlePtr); - } - set => ragephoto_setphototitle(_instance, value, 0); + get => PtrToStringUTF8(ragephoto_getphototitle(_instance)); + set => ragephoto_setphototitle(_instance, value, (UInt32)DefaultSize.DEFAULT_TITLBUFFER); } public UIntPtr GetSaveSize() { @@ -225,7 +190,7 @@ namespace Syping.RagePhoto { Byte[] photo = new Byte[Environment.Is64BitProcess ? (UInt64)GetSaveSize() : (UInt32)GetSaveSize()]; bool result = ragephoto_save(_instance, photo); if (!result) - throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error.ToString())); + throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error)); return photo; } @@ -233,20 +198,20 @@ namespace Syping.RagePhoto { Byte[] photo = new Byte[Environment.Is64BitProcess ? (UInt64)GetSaveSize(photoFormat) : (UInt32)GetSaveSize(photoFormat)]; bool result = ragephoto_savef(_instance, photo, (UInt32)photoFormat); if (!result) - throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error.ToString())); + throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error)); return photo; } public void SaveFile(String path) { bool result = ragephoto_savefile(_instance, path); if (!result) - throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error.ToString())); + throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error)); } public void SaveFile(String path, PhotoFormat photoFormat) { bool result = ragephoto_savefilef(_instance, path, (UInt32)photoFormat); if (!result) - throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error.ToString())); + throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error)); } public void SetBufferDefault() { @@ -257,20 +222,88 @@ namespace Syping.RagePhoto { ragephoto_setbufferoffsets(_instance); } + public void SetDescription(String description) { + ragephoto_setphotodesc(_instance, description, (UInt32)DefaultSize.DEFAULT_DESCBUFFER); + } + + public void SetDescription(String description, UInt32 bufferSize) { + ragephoto_setphotodesc(_instance, description, bufferSize); + } + public void SetHeader(String header, UInt32 headerSum, UInt32 headerSum2 = 0) { ragephoto_setphotoheader2(_instance, header, headerSum, headerSum2); } - public bool SetJpeg(Byte[] jpeg, UInt32 bufferSize = 0) { + public void SetJpeg(Byte[] jpeg) { + UInt32 bufferSize; UInt32 size = (UInt32)jpeg.Length; - return ragephoto_setphotojpeg(_instance, jpeg, size, bufferSize); + switch (Format) { + case PhotoFormat.GTA5: + if (size > (UInt32)DefaultSize.DEFAULT_GTA5_PHOTOBUFFER) + bufferSize = size; + else + bufferSize = (UInt32)DefaultSize.DEFAULT_GTA5_PHOTOBUFFER; + break; + case PhotoFormat.RDR2: + if (size > (UInt32)DefaultSize.DEFAULT_RDR2_PHOTOBUFFER) + bufferSize = size; + else + bufferSize = (UInt32)DefaultSize.DEFAULT_RDR2_PHOTOBUFFER; + break; + default: + bufferSize = size; + break; + } + bool result = ragephoto_setphotojpeg(_instance, jpeg, size, bufferSize); + if (!result) + throw new RagePhotoException(this, string.Format("Failed to set Jpeg: {0}", Error)); + } + + public void SetJpeg(Byte[] jpeg, UInt32 bufferSize) { + bool result = ragephoto_setphotojpeg(_instance, jpeg, (UInt32)jpeg.Length, bufferSize); + if (!result) + throw new RagePhotoException(this, string.Format("Failed to set Jpeg: {0}", Error)); + } + + public void SetJson(String json) { + ragephoto_setphotojson(_instance, json, (UInt32)DefaultSize.DEFAULT_JSONBUFFER); + } + + public void SetJson(String json, UInt32 bufferSize) { + ragephoto_setphotojson(_instance, json, bufferSize); + } + + public void SetTitle(String title) { + ragephoto_setphototitle(_instance, title, (UInt32)DefaultSize.DEFAULT_TITLBUFFER); + } + + public void SetTitle(String title, UInt32 bufferSize) { + ragephoto_setphototitle(_instance, title, bufferSize); } public static String Version { - get { - IntPtr versionPtr = ragephoto_version(); - return versionPtr == IntPtr.Zero ? string.Empty : Marshal.PtrToStringAnsi(versionPtr); - } + get => PtrToStringAnsi(ragephoto_version()); + } + + private static String PtrToStringAnsi(IntPtr ptr) { + if (ptr == IntPtr.Zero) + return string.Empty; + return Marshal.PtrToStringAnsi(ptr); + } + + private static String PtrToStringUTF8(IntPtr ptr) { + if (ptr == IntPtr.Zero) + return string.Empty; +#if NETSTANDARD2_1_OR_GREATER + return Marshal.PtrToStringUTF8(ptr); +#else + Int32 length = 0; + while (Marshal.ReadByte(ptr, length) != 0) + length++; + byte[] buffer = new byte[length]; + Marshal.Copy(ptr, buffer, 0, length); + return Encoding.UTF8.GetString(buffer); +#endif } } } diff --git a/src/dotnet/Syping.RagePhoto.Core.csproj b/src/dotnet/Syping.RagePhoto.Core.csproj index efb636d..b085894 100644 --- a/src/dotnet/Syping.RagePhoto.Core.csproj +++ b/src/dotnet/Syping.RagePhoto.Core.csproj @@ -1,12 +1,12 @@  - netstandard2.1 + netstandard2.1;net47 Syping.RagePhoto.Core Syping.RagePhoto - 0.6.1.3 - 0.6.1.3 - 0.6.1.3 + 0.6.1.4 + 0.6.1.4 + 0.6.1.4 Syping Copyright © 2025 Syping Open Source RAGE Photo Parser for GTA V and RDR 2 @@ -14,6 +14,10 @@ https://github.com/Syping/libragephoto + + 8.0 + +