Add Open vs SaveAs modes.

Author: bob.burrough

Natives.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Natives", "Natives\Natives.vcxproj", "{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}"
 EndProject
@@ -13,12 +13,12 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}.Debug|x64.ActiveCfg = Debug|Win32
-		{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}.Debug|x64.Build.0 = Debug|Win32
+		{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}.Debug|x64.ActiveCfg = Debug|x64
+		{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}.Debug|x64.Build.0 = Debug|x64
 		{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}.Debug|x86.ActiveCfg = Debug|Win32
 		{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}.Debug|x86.Build.0 = Debug|Win32
-		{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}.Release|x64.ActiveCfg = Release|Win32
-		{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}.Release|x64.Build.0 = Release|Win32
+		{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}.Release|x64.ActiveCfg = Release|x64
+		{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}.Release|x64.Build.0 = Release|x64
 		{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}.Release|x86.ActiveCfg = Release|Win32
 		{44B46E4E-C88D-493F-8FCC-6DF46C1CB4FC}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection

Natives/Natives.vcxproj

@@ -38,17 +38,17 @@
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -71,6 +71,9 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetExt>.dll</TargetExt>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -95,9 +98,12 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\ExternalProjects\pthreads-w32\Pre-built.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>FORCE_WIN32;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);pthreadVC2.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)ExternalProjects\pthreads-w32\Pre-built.2\lib\x64</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -118,14 +124,18 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)ExternalProjects\pthreads-w32\Pre-built.2\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(SolutionDir)ExternalProjects\pthreads-w32\Pre-built.2\lib\x64</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);pthreadVC2.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

Natives/natives.cpp

@@ -25,9 +25,24 @@ struct ChooseFileContext
     list<wstring> filetype_names;
     list<wstring> filetype_extensions;
     wchar_t* chosenFilename;
+    bool saveAs;
 };
 
 
+void __stdcall SetChooseFileModeSaveAs(void* context)
+{
+    ChooseFileContext* cfc = (ChooseFileContext*)context;
+    cfc->saveAs = true;
+}
+
+
+void __stdcall SetChooseFileModeOpen(void* context)
+{
+    ChooseFileContext* cfc = (ChooseFileContext*)context;
+    cfc->saveAs = false;
+}
+
+
 void* FilePickerThread(void* arg)
 {    
     ChooseFileContext* cfc = (ChooseFileContext*)arg;
@@ -37,7 +52,7 @@ void* FilePickerThread(void* arg)
     memset(cfc->chosenFilename, 0, buf_len);
 
     OPENFILENAME ofn;       // common dialog box structure
-    
+
     //string test("G-code\0*.gcode\0All\0*.*\0");
     wstring filetype_filters;
     list<wstring>::const_iterator ext_itr = cfc->filetype_extensions.begin();
@@ -76,8 +91,13 @@ void* FilePickerThread(void* arg)
     ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR | OFN_READONLY;
 
     //SetCurrentDirectory(cwd);
+    BOOL status;
+    if (cfc->saveAs)
+        status = GetSaveFileName(&ofn);
+    else
+        status = GetOpenFileName(&ofn);
 
-    if (GetOpenFileName(&ofn))
+    if (status)
     {
         pthread_testcancel();
         if (cfc->_chooseFileSuccessCallback)
@@ -102,6 +122,7 @@ void* __stdcall CreateChooseFileContext()
     cfc->_chooseFileCancelledCallback = NULL;
     cfc->_chooseFileSuccessCallback = NULL;
     cfc->chosenFilename = NULL;
+    cfc->saveAs = false;
     return cfc;
 }
 

Natives/natives.h

@@ -18,6 +18,8 @@ typedef void(__stdcall *ChooseFileCancelledCallback)();
 
 DLLEXPORT void* __stdcall CreateChooseFileContext();
 DLLEXPORT void __stdcall AddChooseFileType(void* context, const wchar_t* name, const wchar_t* extension);
+DLLEXPORT void __stdcall SetChooseFileModeSaveAs(void* context);
+DLLEXPORT void __stdcall SetChooseFileModeOpen(void* context);
 DLLEXPORT void __stdcall ChooseFile(void* context, ChooseFileSuccessCallback successCallback, ChooseFileCancelledCallback cancelledCallback);
 DLLEXPORT void __stdcall DestroyChooseFileContext(void* context);