From 98798c427c894b728153a3ed7098f3aaece267c7 Mon Sep 17 00:00:00 2001
From: Andreas Luxbauer <al@verag.ag>
Date: Wed, 25 Oct 2023 14:55:18 +0200
Subject: [PATCH] Iwas

---
 VERAGAddIn.sln               | 60 +++++++++++++++++++++++++-----------
 VERAGAddIn/VERAGAddIn.vbproj | 26 ++++++----------
 VERAGAddIn/app.config        | 26 +++++++++++++++-
 VERAGAddIn/rbnVERAG.vb       |  6 ++--
 4 files changed, 80 insertions(+), 38 deletions(-)

diff --git a/VERAGAddIn.sln b/VERAGAddIn.sln
index e8285c7..7d9f242 100644
--- a/VERAGAddIn.sln
+++ b/VERAGAddIn.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30406.217
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32314.265
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAGAddIn", "VERAGAddIn\VERAGAddIn.vbproj", "{D579F7A6-7D29-4295-B382-DA5F7EFB4528}"
 EndProject
@@ -15,9 +15,11 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -25,40 +27,62 @@ Global
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|x64.Build.0 = Debug|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|x64.ActiveCfg = Release|Any CPU
+		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|x64.Build.0 = Release|Any CPU
 		{D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|x86.ActiveCfg = Release|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64
+		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|x64
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.Build.0 = Debug|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Mixed Platforms.Build.0 = Release|x64
+		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.ActiveCfg = Release|x64
+		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.Build.0 = Release|x64
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x86.ActiveCfg = Release|Any CPU
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x86.Build.0 = Release|Any CPU
+		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.Build.0 = Debug|x64
+		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.ActiveCfg = Debug|x64
+		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.Build.0 = Debug|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x86.ActiveCfg = Debug|x86
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x86.Build.0 = Debug|x86
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Any CPU.ActiveCfg = Release|x86
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Mixed Platforms.Build.0 = Release|x86
+		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Any CPU.ActiveCfg = Release|x64
+		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Any CPU.Build.0 = Release|x64
+		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Mixed Platforms.Build.0 = Release|x64
+		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x64.ActiveCfg = Release|x64
+		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x64.Build.0 = Release|x64
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.ActiveCfg = Release|x86
 		{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.Build.0 = Release|x86
-		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x64.ActiveCfg = Debug|x64
+		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x64.Build.0 = Debug|x64
 		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x86.ActiveCfg = Debug|x86
 		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x86.Build.0 = Debug|x86
-		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|Any CPU.ActiveCfg = Release|x86
-		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|Mixed Platforms.Build.0 = Release|x86
+		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|Mixed Platforms.Build.0 = Release|x64
+		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x64.ActiveCfg = Release|x64
+		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x64.Build.0 = Release|x64
 		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x86.ActiveCfg = Release|x86
 		{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj
index c83587e..30a32b0 100644
--- a/VERAGAddIn/VERAGAddIn.vbproj
+++ b/VERAGAddIn/VERAGAddIn.vbproj
@@ -123,7 +123,7 @@
     <RegisterForComInterop>false</RegisterForComInterop>
     <RemoveIntegerChecks>false</RemoveIntegerChecks>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <!--
     This section defines properties that are set when the "Release" configuration is selected.
@@ -168,9 +168,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="VERAG_PROG_ALLGEMEIN">
-      <HintPath>..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Office.Tools.v4.0.Framework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -204,7 +201,6 @@
     <Import Include="System.Collections.Generic" />
     <Import Include="System.Linq" />
     <Import Include="System.Text" />
-    <Import Include="System.Xml.Linq" />
     <Import Include="Office = Microsoft.Office.Core" />
     <Import Include="Outlook = Microsoft.Office.Interop.Outlook" />
   </ItemGroup>
@@ -251,6 +247,7 @@
     <EmbeddedResource Include="rbnVERAG.resx">
       <DependentUpon>rbnVERAG.vb</DependentUpon>
     </EmbeddedResource>
+    <None Include="AL20210908.pfx" />
     <None Include="app.config" />
     <None Include="Resources\GS\gsdll32.lib">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -304,15 +301,6 @@
       <Isolated>False</Isolated>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
-    <COMReference Include="stdole2">
-      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
     <COMReference Include="VBIDE">
       <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>5</VersionMajor>
@@ -332,6 +320,11 @@
       <Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
       <Name>Gemeinsames</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
+      <Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
+      <Name>VERAG_PROG_ALLGEMEIN</Name>
+      <Private>True</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\Aviso.png" />
@@ -374,11 +367,10 @@
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>
-    </ManifestKeyFile>
+    <ManifestKeyFile>AL20210908.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>2508FAE878AAAD6136689CC8171DC8A749727DD4</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>5A6BD29D23A7643243CD6EFA1FEF21BAF955E653</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
diff --git a/VERAGAddIn/app.config b/VERAGAddIn/app.config
index 008ded4..651768b 100644
--- a/VERAGAddIn/app.config
+++ b/VERAGAddIn/app.config
@@ -16,7 +16,31 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.8.2.0" newVersion="1.8.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.6.0.0" newVersion="7.6.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Dynamsoft.Twain" publicKeyToken="298ad97013b423eb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.3.3.726" newVersion="8.3.3.726" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Dynamsoft.PDF" publicKeyToken="298ad97013b423eb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.3.3.726" newVersion="8.3.3.726" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Dynamsoft.Forms.Viewer" publicKeyToken="298ad97013b423eb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.3.3.726" newVersion="8.3.3.726" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Dynamsoft.ImageCore" publicKeyToken="298ad97013b423eb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.3.3.726" newVersion="8.3.3.726" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="8fb06cb64d019a17" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.7.2.0" newVersion="2.7.2.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb
index 59409d1..fe4a3c8 100644
--- a/VERAGAddIn/rbnVERAG.vb
+++ b/VERAGAddIn/rbnVERAG.vb
@@ -541,8 +541,10 @@ Public Class AVISO_Mail_Functions
         Try
             If AvisoId > 0 Then
                 ' The full path will place the email in the user's temporary folder 
-
-                If bezeichnung = "" Then bezeichnung = Left(Regex.Replace(mailItem.Subject, "[\/\\\:\?\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, " ") & ".msg"
+                If bezeichnung <> "" Then
+                    bezeichnung = Left(Regex.Replace(mailItem.Subject, "[\/\\\:\?\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, " ") & ".msg"
+                    bezeichnung = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(bezeichnung)
+                End If
                 Dim strTmpPath As String = System.IO.Path.GetTempPath() & bezeichnung & If(bezeichnung.EndsWith(".msg"), "", ".msg")
                 ' Save the email to the user's temp folder and convert it to a .MSG
                 'Dim cnt = 0