2 files changed, 44 insertions, 2 deletions

diff --git a/demos/csharp/api/ghostnet.cs b/demos/csharp/api/ghostnet.cs
index 3ea7028ed..f033941f2 100644
--- a/demos/csharp/api/ghostnet.cs
+++ b/demos/csharp/api/ghostnet.cs
@@ -86,37 +86,46 @@ public class gsEventArgs : EventArgs
                         }
                 }
 
-                /* Ghostscript display device callback delegates. */
+                /* Ghostscript display device callback delegates. Make sure that
+                   these are using Cdecl calling convention, which means gsdll
+                   is doing the stack cleanup after the call */
 
                 /* New device has been opened */
                 /* This is the first event from this device. */
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
                 public delegate int display_open_del(IntPtr handle, IntPtr device);
 
                 /* Device is about to be closed. */
                 /* Device will not be closed until this function returns. */
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
                 public delegate int display_preclose_del(IntPtr handle, IntPtr device);
 
                 /* Device has been closed. */
                 /* This is the last event from this device. */
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
                 public delegate int display_close_del(IntPtr handle, IntPtr device);
 
                 /* Device is about to be resized. */
                 /* Resize will only occur if this function returns 0. */
                 /* raster is byte count of a row. */
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
                 public delegate int display_presize_del(IntPtr handle, IntPtr device,
                         int width, int height, int raster, uint format);
 
                 /* Device has been resized. */
                 /* New pointer to raster returned in pimage */
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
                 public delegate int display_size_del(IntPtr handle, IntPtr device,
                                                         int width, int height, int raster, uint format,
                                                         IntPtr pimage);
 
                 /* flushpage */
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
                 public delegate int display_sync_del(IntPtr handle, IntPtr device);
 
                 /* showpage */
                 /* If you want to pause on showpage, then don't return immediately */
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
                 public delegate int display_page_del(IntPtr handle, IntPtr device, int copies, int flush);
 
 
@@ -125,6 +134,7 @@ public class gsEventArgs : EventArgs
                  * progressive update of the display.
                  * This function pointer may be set to NULL if not required.
                  */
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
                 public delegate int display_update_del(IntPtr handle, IntPtr device, int x, int y,
                           int w, int h);
 
@@ -135,10 +145,12 @@ public class gsEventArgs : EventArgs
                  * image buffer. The first row will be placed at the address
                  * returned by display_memalloc.
                  */
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
                 public delegate int display_memalloc_del(IntPtr handle, IntPtr device, ulong size);
 
                 /* Free memory for bitmap */
                 /* If this is NULL, the Ghostscript memory device will free the bitmap */
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
                 public delegate int display_memfree_del(IntPtr handle, IntPtr device, IntPtr mem);
 
                 private int display_size(IntPtr handle, IntPtr device,
diff --git a/demos/csharp/windows/ghostnet_wpf_example/ghostnet_simple_viewer.csproj b/demos/csharp/windows/ghostnet_wpf_example/ghostnet_simple_viewer.csproj
index 6ea52f155..a7daf8f6f 100644
--- a/demos/csharp/windows/ghostnet_wpf_example/ghostnet_simple_viewer.csproj
+++ b/demos/csharp/windows/ghostnet_wpf_example/ghostnet_simple_viewer.csproj
@@ -14,6 +14,21 @@
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -57,7 +72,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;GHOSTPDL</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <LangVersion>7.3</LangVersion>
@@ -74,6 +89,9 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ReachFramework" />
     <Reference Include="System" />
@@ -179,6 +197,18 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>if $(ConfigurationName) == Debug (