diff --git a/.github/workflows/windows-dotnet.yml b/.github/workflows/windows-dotnet.yml index 6353075..72cb53a 100644 --- a/.github/workflows/windows-dotnet.yml +++ b/.github/workflows/windows-dotnet.yml @@ -32,49 +32,47 @@ 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: pwsh run: | - mkdir -p ${{github.workspace}}/src/dotnet/runtimes/win-arm64/native \ - ${{github.workspace}}/src/dotnet/runtimes/win-x64/native \ - ${{github.workspace}}/src/dotnet/runtimes/win-x86/native - cp ${{github.workspace}}/assets/amd64_arm64/bin/libragephoto.dll \ - ${{github.workspace}}/src/dotnet/runtimes/win-arm64/native/libragephoto.dll - cp ${{github.workspace}}/assets/amd64/bin/libragephoto.dll \ - ${{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 + mkdir -p ${{github.workspace}}\src\dotnet\runtimes\win-arm64\native + mkdir -p ${{github.workspace}}\src\dotnet\runtimes\win-x64\native + mkdir -p ${{github.workspace}}\src\dotnet\runtimes\win-x86\native + cp ${{github.workspace}}\assets\amd64_arm64\bin\libragephoto.dll ${{github.workspace}}\src\dotnet\runtimes\win-arm64\native\libragephoto.dll + cp ${{github.workspace}}\assets\amd64\bin\libragephoto.dll ${{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 ${{github.workspace}}\src\dotnet\Syping.RagePhoto.Core.csproj /t:restore /t:pack /p:Configuration=${{env.BUILD_TYPE}} - name: Upload uses: actions/upload-artifact@v4 with: name: NuGet Package path: | - ${{github.workspace}}/src/dotnet/bin/${{env.BUILD_TYPE}}/Syping.RagePhoto.Core.*.nupkg + ${{github.workspace}}\src\dotnet\bin\${{env.BUILD_TYPE}}\Syping.RagePhoto.Core.*.nupkg 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 ec677ab..dea1a33 100644 --- a/src/dotnet/RagePhoto.cs +++ b/src/dotnet/RagePhoto.cs @@ -1,132 +1,85 @@ using System; using System.Runtime.InteropServices; +using System.Text; + +namespace Syping.RagePhoto { -namespace Syping.RagePhoto { public class Photo : IDisposable { private bool _disposed; private readonly IntPtr _instance; private const String _library = "libragephoto"; - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern IntPtr ragephoto_open(); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern void ragephoto_clear(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern void ragephoto_close(IntPtr instance); - [DllImport(_library)] - [return: MarshalAs(UnmanagedType.Bool)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] + [return: MarshalAs(UnmanagedType.I1)] private static extern bool ragephoto_load(IntPtr instance, Byte[] data, UIntPtr size); - [DllImport(_library)] - [return: MarshalAs(UnmanagedType.Bool)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] + [return: MarshalAs(UnmanagedType.I1)] private static extern bool ragephoto_loadfile(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern Int32 ragephoto_error(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern IntPtr ragephoto_getphotodata(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern IntPtr ragephoto_getphotodesc(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern UInt32 ragephoto_getphotoformat(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern IntPtr ragephoto_getphotojpeg(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern IntPtr ragephoto_getphotojson(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern IntPtr ragephoto_getphotoheader(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern UInt64 ragephoto_getphotosign(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern UInt32 ragephoto_getphotosize(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern IntPtr ragephoto_getphototitle(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern UIntPtr ragephoto_getsavesize(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern UIntPtr ragephoto_getsavesizef(IntPtr instance, UInt32 photoFormat); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] + [return: MarshalAs(UnmanagedType.I1)] private static extern bool ragephoto_save(IntPtr instance, [Out] Byte[] data); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] + [return: MarshalAs(UnmanagedType.I1)] private static extern bool ragephoto_savef(IntPtr instance, [Out] Byte[] data, UInt32 photoFormat); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] + [return: MarshalAs(UnmanagedType.I1)] + private static extern bool ragephoto_savefile(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename); + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] + [return: MarshalAs(UnmanagedType.I1)] + private static extern bool ragephoto_savefilef(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename, UInt32 photoFormat); + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern void ragephoto_setbufferdefault(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern void ragephoto_setbufferoffsets(IntPtr instance); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] + [return: MarshalAs(UnmanagedType.I1)] + private static extern bool ragephoto_setphotodatac(IntPtr instance, IntPtr data); + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern void ragephoto_setphotodesc(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String description, UInt32 bufferSize); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern void ragephoto_setphotoformat(IntPtr instance, UInt32 photoFormat); - [DllImport(_library)] - [return: MarshalAs(UnmanagedType.Bool)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] + [return: MarshalAs(UnmanagedType.I1)] private static extern bool ragephoto_setphotojpeg(IntPtr instance, Byte[] jpeg, UInt32 size, UInt32 bufferSize); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern void ragephoto_setphotojson(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String json, UInt32 bufferSize); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern void ragephoto_setphotoheader2(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String header, UInt32 headerSum, UInt32 headerSum2); - [DllImport(_library)] + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] private static extern void ragephoto_setphototitle(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String title, UInt32 bufferSize); - [DllImport(_library)] - [return: MarshalAs(UnmanagedType.LPStr)] - private static extern String ragephoto_version(); - - public enum DefaultSize : UInt32 { - DEFAULT_GTA5_PHOTOBUFFER = 524288U, - DEFAULT_RDR2_PHOTOBUFFER = 1048576U, - DEFAULT_DESCBUFFER = 256U, - DEFAULT_JSONBUFFER = 3072U, - DEFAULT_TITLBUFFER = 256U, - GTA5_HEADERSIZE = 264U, - RDR2_HEADERSIZE = 272U - } - - public enum PhotoError : Int32 { - DescBufferTight = 39, - DescMallocError = 31, - DescReadError = 32, - HeaderBufferTight = 35, - HeaderMallocError = 4, - IncompatibleFormat = 2, - IncompleteChecksum = 7, - IncompleteDescBuffer = 30, - IncompleteDescMarker = 28, - IncompleteDescOffset = 11, - IncompleteEOF = 8, - IncompleteHeader = 3, - IncompleteJendMarker = 33, - IncompleteJpegMarker = 12, - IncompleteJsonBuffer = 20, - IncompleteJsonMarker = 18, - IncompleteJsonOffset = 9, - IncompletePhotoBuffer = 14, - IncompletePhotoSize = 15, - IncompleteTitleBuffer = 25, - IncompleteTitleMarker = 23, - IncompleteTitleOffset = 10, - IncorrectDescMarker = 29, - IncorrectJendMarker = 34, - IncorrectJpegMarker = 13, - IncorrectJsonMarker = 19, - IncorrectTitleMarker = 24, - JsonBufferTight = 37, - JsonMallocError = 21, - JsonReadError = 22, - NoError = 255, - NoFormatIdentifier = 1, - PhotoBufferTight = 36, - PhotoMallocError = 16, - PhotoReadError = 17, - TitleBufferTight = 38, - TitleMallocError = 26, - TitleReadError = 27, - UnicodeInitError = 5, - UnicodeHeaderError = 6, - Uninitialised = 0 - } - - public enum PhotoFormat : UInt32 { - GTA5 = 0x01000000U, - RDR2 = 0x04000000U - } + [DllImport(_library, CallingConvention = CallingConvention.Cdecl)] + private static extern IntPtr ragephoto_version(); public Photo() { try { @@ -139,6 +92,19 @@ namespace Syping.RagePhoto { } } + public Photo(Photo photo) { + try { + _instance = ragephoto_open(); + if (_instance == IntPtr.Zero) + throw new RagePhotoException(this, "Failed to initialize libragephoto"); + } + catch (Exception exception) { + throw new RagePhotoException(this, "Failed to initialize libragephoto", exception); + } + if (!ragephoto_setphotodatac(_instance, ragephoto_getphotodata(photo._instance))) + throw new RagePhotoException(this, string.Format("Failed to copy Photo: {0}", Error)); + } + ~Photo() { Dispose(false); } @@ -160,28 +126,18 @@ namespace Syping.RagePhoto { } public void Load(Byte[] data) { - UIntPtr size = (UIntPtr)data.LongLength; - bool result = ragephoto_load(_instance, data, size); - if (!result) - throw new RagePhotoException(this, string.Format("Failed to load Photo: {0}", Error.ToString())); + if (!ragephoto_load(_instance, data, (UIntPtr)data.LongLength)) + throw new RagePhotoException(this, string.Format("Failed to load Photo: {0}", Error)); } - public void LoadFile(String filePath) { - bool result = ragephoto_loadfile(_instance, filePath); - if (!result) - throw new RagePhotoException(this, string.Format("Failed to load Photo: {0}", Error.ToString())); - } - - public RagePhotoData Data { - get => Marshal.PtrToStructure(ragephoto_getphotodata(_instance)); + public void LoadFile(String path) { + if (!ragephoto_loadfile(_instance, path)) + throw new RagePhotoException(this, string.Format("Failed to load Photo: {0}", Error)); } 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 { @@ -198,35 +154,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 { @@ -234,18 +167,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 { @@ -257,11 +184,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() { @@ -274,20 +198,28 @@ namespace Syping.RagePhoto { public Byte[] Save() { 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())); + if (!ragephoto_save(_instance, photo)) + throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error)); return photo; } public Byte[] Save(PhotoFormat photoFormat) { 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())); + if (!ragephoto_savef(_instance, photo, (UInt32)photoFormat)) + throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error)); return photo; } + public void SaveFile(String path) { + if (!ragephoto_savefile(_instance, path)) + throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error)); + } + + public void SaveFile(String path, PhotoFormat photoFormat) { + if (!ragephoto_savefilef(_instance, path, (UInt32)photoFormat)) + throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error)); + } + public void SetBufferDefault() { ragephoto_setbufferdefault(_instance); } @@ -296,17 +228,86 @@ 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; + } + if (!ragephoto_setphotojpeg(_instance, jpeg, size, bufferSize)) + throw new RagePhotoException(this, string.Format("Failed to set Jpeg: {0}", Error)); + } + + public void SetJpeg(Byte[] jpeg, UInt32 bufferSize) { + if (!ragephoto_setphotojpeg(_instance, jpeg, (UInt32)jpeg.Length, bufferSize)) + 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 => ragephoto_version(); + 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/RagePhotoData.cs b/src/dotnet/RagePhotoData.cs deleted file mode 100644 index 4127744..0000000 --- a/src/dotnet/RagePhotoData.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Runtime.InteropServices; - -namespace Syping.RagePhoto { - [StructLayout(LayoutKind.Sequential)] - public readonly struct RagePhotoData { - readonly IntPtr jpeg; - [MarshalAs(UnmanagedType.LPUTF8Str)] - readonly String description; - [MarshalAs(UnmanagedType.LPUTF8Str)] - readonly String json; - [MarshalAs(UnmanagedType.LPUTF8Str)] - readonly String header; - [MarshalAs(UnmanagedType.LPUTF8Str)] - readonly String title; - readonly Int32 error; - readonly UInt32 descBuffer; - readonly UInt32 descOffset; - readonly UInt32 endOfFile; - readonly UInt32 headerSum; - readonly UInt32 headerSum2; - readonly UInt32 jpegBuffer; - readonly UInt32 jpegSize; - readonly UInt32 jsonBuffer; - readonly UInt32 jsonOffset; - readonly UInt32 photoFormat; - readonly UInt32 titlBuffer; - readonly UInt32 titlOffset; - } -} diff --git a/src/dotnet/RagePhotoTypes.cs b/src/dotnet/RagePhotoTypes.cs new file mode 100644 index 0000000..2a94091 --- /dev/null +++ b/src/dotnet/RagePhotoTypes.cs @@ -0,0 +1,63 @@ +using System; + +namespace Syping.RagePhoto { + + public enum DefaultSize : UInt32 { + DEFAULT_GTA5_PHOTOBUFFER = 524288U, + DEFAULT_RDR2_PHOTOBUFFER = 1048576U, + DEFAULT_DESCBUFFER = 256U, + DEFAULT_JSONBUFFER = 3072U, + DEFAULT_TITLBUFFER = 256U, + GTA5_HEADERSIZE = 264U, + RDR2_HEADERSIZE = 272U + } + + public enum PhotoError : Int32 { + DescBufferTight = 39, + DescMallocError = 31, + DescReadError = 32, + HeaderBufferTight = 35, + HeaderMallocError = 4, + IncompatibleFormat = 2, + IncompleteChecksum = 7, + IncompleteDescBuffer = 30, + IncompleteDescMarker = 28, + IncompleteDescOffset = 11, + IncompleteEOF = 8, + IncompleteHeader = 3, + IncompleteJendMarker = 33, + IncompleteJpegMarker = 12, + IncompleteJsonBuffer = 20, + IncompleteJsonMarker = 18, + IncompleteJsonOffset = 9, + IncompletePhotoBuffer = 14, + IncompletePhotoSize = 15, + IncompleteTitleBuffer = 25, + IncompleteTitleMarker = 23, + IncompleteTitleOffset = 10, + IncorrectDescMarker = 29, + IncorrectJendMarker = 34, + IncorrectJpegMarker = 13, + IncorrectJsonMarker = 19, + IncorrectTitleMarker = 24, + JsonBufferTight = 37, + JsonMallocError = 21, + JsonReadError = 22, + NoError = 255, + NoFormatIdentifier = 1, + PhotoBufferTight = 36, + PhotoMallocError = 16, + PhotoReadError = 17, + TitleBufferTight = 38, + TitleMallocError = 26, + TitleReadError = 27, + UnicodeInitError = 5, + UnicodeHeaderError = 6, + Uninitialised = 0 + } + + public enum PhotoFormat : UInt32 { + GTA5 = 0x01000000U, + RDR2 = 0x04000000U + } +} diff --git a/src/dotnet/Syping.RagePhoto.Core.csproj b/src/dotnet/Syping.RagePhoto.Core.csproj index 892307b..7ccc6c7 100644 --- a/src/dotnet/Syping.RagePhoto.Core.csproj +++ b/src/dotnet/Syping.RagePhoto.Core.csproj @@ -1,15 +1,21 @@  - netstandard2.1 + netstandard2.1;net47 Syping.RagePhoto.Core Syping.RagePhoto - 0.6.1 - 0.6.1.0 - 0.6.1.0 + 0.6.1.5 + 0.6.1.5 + 0.6.1.5 Syping Copyright © 2025 Syping Open Source RAGE Photo Parser for GTA V and RDR 2 + BSD-2-Clause + https://github.com/Syping/libragephoto + + + + 8.0