1. Proxy autoconfiguration script support.

2. Propagate format strings to Excel. 3. Handles local trust for SSL. 4. Small bugs.
BafflingTangent · Jan 5, 2015 · 555cac8 · 555cac8
1 parent 692b482
commit 555cac8
Show file tree

Hide file tree

Showing 13 changed files with 322 additions and 126 deletions.
diff --git a/ExecuteResponse.gsoap b/ExecuteResponse.gsoap
@@ -1,5 +1,6 @@
 extern typedef struct UserPropStruct {
 	const char*		elementName;
+	const char*		__xsi__type;
 	const char*		value;
 } UserDataProp; 
 
@@ -14,6 +15,7 @@ extern typedef struct CellPropStruct {
 	const char*		elementName;
 	const char*		name;
 	const char*		value;
+	const char*		type;
 } CellDataProp;
 
 

diff --git a/README b/README
@@ -1,3 +1,25 @@
+Changes 1-Jan-2015
+
+1. Proxy autoconfiguration script support. Implemented with ATLHTTP. You need to download it from here: http://atlserver.codeplex.com/ . The solution expects atlhttp to be on the same level with gsoap. The current build layout is shown belw:
+
+\
+|
+----XMLA Code
+|
+----openssl
+|	--lib
+|		--i386
+|			--static
+|		--x86_64
+|			--static
+----gsoap
+|
+----atl_server
+
+2. Propagate format strings to Excel.
+3. Handles local trust for SSL.
+4. Small bugs.
+
 Changes 8-September-2014
 
 1. openssl

diff --git a/XMLAProvider.aps b/XMLAProvider.aps
diff --git a/XMLAProvider.rc b/XMLAProvider.rc
diff --git a/XMLAProvider.vcxproj b/XMLAProvider.vcxproj
@@ -84,8 +84,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WITH_OPENSSL;WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ALLOW_TRANSLATIONS;WITH_OPENSSL;WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\;..\atl_server\include\</AdditionalIncludeDirectories>
     </ClCompile>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -110,7 +110,7 @@
       <ModuleDefinitionFile>.\XMLAProvider.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RegisterOutput>true</RegisterOutput>
-      <AdditionalDependencies>Crypt32.lib;Wininet.lib;libeay32d.lib;ssleay32d.lib;Version.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;Dnsapi.lib;Crypt32.lib;Wininet.lib;libeay32d.lib;ssleay32d.lib;Version.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\openssl\lib\Windows\i386\static\</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -119,8 +119,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WITH_OPENSSL;WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WITH_OPENSSL;WIN32;_WINDOWS;_DEBUG;_USRDLL;ALLOW_TRANSLATIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\;..\atl_server\include\</AdditionalIncludeDirectories>
     </ClCompile>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -143,7 +143,7 @@
       <ModuleDefinitionFile>.\XMLAProvider.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RegisterOutput>true</RegisterOutput>
-      <AdditionalDependencies>Crypt32.lib;Wininet.lib;libeay32d.lib;ssleay32d.lib;Version.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;Dnsapi.lib;Crypt32.lib;Wininet.lib;libeay32d.lib;ssleay32d.lib;Version.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\openssl\lib\Windows\x86_64\static\</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -152,8 +152,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>WITH_OPENSSL;WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ALLOW_TRANSLATIONS;WITH_OPENSSL;WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\;..\atl_server\include\</AdditionalIncludeDirectories>
     </ClCompile>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -180,7 +180,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <RegisterOutput>true</RegisterOutput>
-      <AdditionalDependencies>Crypt32.lib;Wininet.lib;libeay32.lib;ssleay32.lib;Version.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;Dnsapi.lib;Crypt32.lib;Wininet.lib;libeay32.lib;ssleay32.lib;Version.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\openssl\lib\Windows\i386\static\</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -189,8 +189,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>WITH_OPENSSL;WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ALLOW_TRANSLATIONS;WITH_OPENSSL;WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\;..\atl_server\include\</AdditionalIncludeDirectories>
     </ClCompile>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -215,7 +215,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <RegisterOutput>true</RegisterOutput>
-      <AdditionalDependencies>Crypt32.lib;Wininet.lib;libeay32.lib;ssleay32.lib;Version.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;Dnsapi.lib;Crypt32.lib;Wininet.lib;libeay32.lib;ssleay32.lib;Version.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\openssl\lib\Windows\x86_64\static\</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -237,6 +237,7 @@
       </PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="execute_response.cpp" />
+    <ClCompile Include="pac_interpreter.cpp" />
     <ClCompile Include="soapC.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
@@ -295,6 +296,7 @@
     <ClInclude Include="level_row.h" />
     <ClInclude Include="measure_row.h" />
     <ClInclude Include="member_row.h" />
+    <ClInclude Include="pac_interpreter.h" />
     <ClInclude Include="pass_prompt.h" />
     <ClInclude Include="property_row.h" />
     <ClInclude Include="resource.h" />

diff --git a/XMLAProvider.vcxproj.filters b/XMLAProvider.vcxproj.filters
@@ -44,6 +44,9 @@
     <Filter Include="Header Files\compatibility">
       <UniqueIdentifier>{f3517a29-0d54-4d3c-8fef-2913fa702896}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\config">
+      <UniqueIdentifier>{76d9fe54-63f4-4c8c-9b8d-8061d654cc40}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -85,6 +88,9 @@
     <ClCompile Include="config_data.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="pac_interpreter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -187,7 +193,10 @@
       <Filter>Header Files\schema</Filter>
     </ClInclude>
     <ClInclude Include="config_data.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\config</Filter>
+    </ClInclude>
+    <ClInclude Include="pac_interpreter.h">
+      <Filter>Header Files\config</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>

diff --git a/axis_row.h b/axis_row.h
@@ -298,8 +298,17 @@ class axis_row
 						}
 						break;
 					default://custom props
-						wcscpy_s(  ( wchar_t* )( m_data_exchange + offset ), m_col_info[i].ulColumnSize / 2, CA2W( crtTuple.Member[ memberIdx ].__userProp.__array[ m_indirection.at( idx ) - 3].value, CP_UTF8 ) );
-						offset += m_col_info[i].ulColumnSize;
+						{
+							size_t crt_idx = m_indirection.at( idx ) - 3;
+							if ( crtTuple.Member[ memberIdx ].__userProp.__size <= crt_idx )
+							{
+								*( ( wchar_t* )( m_data_exchange + offset ) ) = 0;
+							} else
+							{
+								wcscpy_s(  ( wchar_t* )( m_data_exchange + offset ), m_col_info[i].ulColumnSize / 2, CA2W( crtTuple.Member[ memberIdx ].__userProp.__array[crt_idx].value, CP_UTF8 ) );
+							}
+							offset += m_col_info[i].ulColumnSize;
+						}
 						break;
 					};
 				}

diff --git a/config_data.cpp b/config_data.cpp
@@ -32,3 +32,4 @@ int config_data::m_proxy_port;
 std::string config_data::m_proxy_ssl;
 int config_data::m_proxy_port_ssl;
 bool config_data::m_do_init = true;
+CSimpleScriptSite* config_data::m_auto_proxy_handler = nullptr;