Merge pull request #31 from am11/master

Code: Sends copy of string to upstream

Author: darrenkopp

appveyor.yml

@@ -1,3 +1,7 @@
+platform:
+  - Win32
+  - x64
+
 configuration:
   - Debug
   - Release
@@ -11,3 +15,7 @@ before_build:
 build:
   verbosity: minimal
   project: libsass-net.sln
+
+on_success:
+  - 7z a libsass-net.zip .
+  - ps: Push-AppveyorArtifact libsass-net.zip

libsass/SassInterface.cpp

@@ -18,21 +18,17 @@
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
 
-#include <exception>
-#include "native\sass_interface.h"
 #include "native\sass2scss.h"
 #include "StringToANSI.hpp"
 #include "SassInterface.hpp"
-#include "native\sass_context.h"
-
-using namespace std;
 
 namespace LibSassNet
 {
     int SassInterface::Compile(SassContext^ sassContext)
     {
         char* includePaths = MarshalString(sassContext->Options->IncludePaths);
         char* sourceString = MarshalString(sassContext->SourceString);
+        char* lineFeed = MarshalString(sassContext->Options->LineFeed);
         struct Sass_Data_Context* ctx;
 
         try
@@ -45,12 +41,13 @@ namespace LibSassNet
             sass_option_set_output_style(options, GetOutputStyle(sassContext->Options->OutputStyle));
             sass_option_set_source_comments(options, sassContext->Options->IncludeSourceComments);
             sass_option_set_precision(options, sassContext->Options->Precision);
+            sass_option_set_linefeed(options, lineFeed);
             sass_option_set_include_path(options, includePaths);
-            sass_option_set_omit_source_map_url(options, true);
+            sass_option_set_omit_source_map_url(options, sassContext->Options->OmitSourceMappingUrl);
 
             sass_compile_data_context(ctx);
 
-            sassContext->ErrorStatus = sass_context_get_error_status(ctx_out);
+            sassContext->ErrorStatus = !!sass_context_get_error_status(ctx_out);
             sassContext->ErrorMessage = gcnew String(sass_context_get_error_message(ctx_out));
             sassContext->OutputString = gcnew String(sass_context_get_output_string(ctx_out));
 
@@ -67,8 +64,6 @@ namespace LibSassNet
         finally
         {
             // Free resources
-            FreeString(includePaths);
-            FreeString(sourceString);
             sass_delete_data_context(ctx);
         }
     }
@@ -90,8 +85,9 @@ namespace LibSassNet
         char* includePaths = MarshalString(sassFileContext->Options->IncludePaths);
         char* mapFile = MarshalString(sassFileContext->OutputSourceMapFile);
         char* inputPath = MarshalString(sassFileContext->InputPath);
-
+        char* lineFeed = MarshalString(sassFileContext->Options->LineFeed);
         struct Sass_File_Context* ctx;
+
         try
         {
             ctx = sass_make_file_context(inputPath);
@@ -103,13 +99,14 @@ namespace LibSassNet
             sass_option_set_output_style(options, GetOutputStyle(sassFileContext->Options->OutputStyle));
             sass_option_set_source_comments(options, sassFileContext->Options->IncludeSourceComments);
             sass_option_set_precision(options, sassFileContext->Options->Precision);
+            sass_option_set_linefeed(options, lineFeed);
             sass_option_set_include_path(options, includePaths);
-            sass_option_set_omit_source_map_url(options, String::IsNullOrEmpty(sassFileContext->OutputSourceMapFile));
+            sass_option_set_omit_source_map_url(options, sassFileContext->Options->OmitSourceMappingUrl);
             sass_option_set_source_map_file(options, mapFile);
 
             sass_compile_file_context(ctx);
 
-            sassFileContext->ErrorStatus = sass_context_get_error_status(ctx_out);
+            sassFileContext->ErrorStatus = !!sass_context_get_error_status(ctx_out);
             sassFileContext->ErrorMessage = gcnew String(sass_context_get_error_message(ctx_out));
             sassFileContext->OutputString = gcnew String(sass_context_get_output_string(ctx_out));
             sassFileContext->OutputSourceMap = gcnew String(sass_context_get_source_map_string(ctx_out));
@@ -127,9 +124,6 @@ namespace LibSassNet
         finally
         {
             // Free resources
-            FreeString(includePaths);
-            FreeString(inputPath);
-            FreeString(mapFile);
             sass_delete_file_context(ctx);
         }
     }
@@ -156,6 +150,7 @@ namespace LibSassNet
         }
         finally
         {
+            // Upstream will not free the memory in case of sass2scss
             FreeString(sourceText);
         }
     }
@@ -205,4 +200,4 @@ namespace LibSassNet
     sass_free_folder_context(ctx);
     }
     }*/
-}
+}

libsass/SassInterface.hpp

@@ -19,6 +19,7 @@
 //SOFTWARE.
 
 #include "ISassInterface.hpp"
+#include "native\sass_context.h"
 
 namespace LibSassNet
 {
@@ -33,4 +34,4 @@ namespace LibSassNet
 			// Folder context isn't implemented in core libsass library now
 			/*virtual int Compile(SassFolderContext^ sassFolderContext);*/
 	};
-}
+}

libsass/SassOptions.hpp

@@ -29,8 +29,10 @@ namespace LibSassNet
 		public:
 			property int OutputStyle;
 			property bool IncludeSourceComments;
+			property bool OmitSourceMappingUrl;
 			property int Precision;
 			property String^ IncludePaths;
+			property String^ LineFeed;
 	};
 
 	public ref class SassContext

libsass/StringToANSI.cpp

@@ -19,6 +19,7 @@
 //SOFTWARE.
 
 #using <System.dll>
+#include <string>
 #include "StringToANSI.hpp"
 
 using namespace System;
@@ -27,8 +28,18 @@ using namespace System::Runtime::InteropServices;
 namespace LibSassNet
 {
 	char* MarshalString(String^ s)
-	{
-        return (char*) ((Marshal::StringToCoTaskMemAnsi(s)).ToPointer());
+    {
+        if (!s) {
+            return nullptr;
+        }
+
+        char* original_str = (char*)(Marshal::StringToCoTaskMemAnsi(s)).ToPointer();
+        char* target_str = (char*)malloc(strlen(original_str) + 1);
+        strcpy(target_str, original_str);
+
+        FreeString(original_str);
+
+        return target_str;
 	}
 
 	void FreeString(const char* p)

libsassnet/SassCompiler.cs

@@ -29,6 +29,10 @@ public class SassCompiler : ISassCompiler
     {
         private readonly ISassInterface _sassInterface;
 
+        public string OutputLineFeed { get; set; }
+
+        public bool OmitSourceMappingUrl { get; set; }
+
         public SassCompiler()
         {
             _sassInterface = new SassInterface();
@@ -50,7 +54,9 @@ public string Compile(string source, OutputStyle outputStyle = OutputStyle.Neste
                     OutputStyle = (int)outputStyle,
                     IncludeSourceComments = includeSourceComments,
                     IncludePaths = includePaths != null ? String.Join(";", includePaths) : String.Empty,
-                    Precision = precision
+                    Precision = precision,
+                    LineFeed = OutputLineFeed ?? (OutputLineFeed = "\r\n"),
+                    OmitSourceMappingUrl = OmitSourceMappingUrl
                 }
             };
 
@@ -83,7 +89,9 @@ public CompileFileResult CompileFile(string inputPath, OutputStyle outputStyle =
                     OutputStyle = (int)outputStyle,
                     IncludeSourceComments = includeSourceComments,
                     IncludePaths = String.Join(";", includePaths),
-                    Precision = precision
+                    Precision = precision,
+                    LineFeed = OutputLineFeed ?? (OutputLineFeed = "\r\n"),
+                    OmitSourceMappingUrl = OmitSourceMappingUrl
                 },
                 OutputSourceMapFile = sourceMapPath
             };