x64 win build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62004 954022d7-b5bf-4e40-9824-e11837661b57

ASCImageStudio3/ASCGraphics/OfficeSvmFile/OfficeSvmFile2005.vcproj

@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -142,6 +145,135 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\Redist;..\..\Common;..\..\..\Common;&quot;..\..\..\ASCOfficeUtils\ZLIB\zlib-1.2.3&quot;;Source/vcl/win/inc;Source/vcl/source/gdi;Source\sal\source;Source\sal\inc;Source\i18npool\inc;Source\vcl\inc;Source\tools\inc;ASC"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				IgnoreDefaultLibraryNames=""
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..\..\Redist;..\..\..\Common;..\..\..\..\..\..\Common;&quot;..\..\..\ASCOfficeUtils\ZLIB\zlib-1.2.3&quot;;Source/vcl/win/inc;Source/vcl/source/gdi;Source\sal\source;Source\sal\inc;Source\i18npool\inc;Source\vcl\inc;Source\tools\inc;ASC"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				IgnoreDefaultLibraryNames="deflate.obj"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -739,10 +871,6 @@
 			RelativePath=".\ReadMe.txt"
 			>
 		</File>
-		<File
-			RelativePath=".\zlibstat.lib"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>

ASCImageStudio3/ASCGraphics/OfficeSvmFile/Source/vcl/win/inc/vcl/wincomp.hxx

@@ -156,37 +156,65 @@ inline HFONT GetWindowFont( HWND hWnd )
 
 inline void SetClassCursor( HWND hWnd, HCURSOR hCursor )
 {
+#ifdef _WIN64
+	SetClassLong( hWnd, GCLP_HCURSOR, (DWORD)hCursor );
+#else //_WIN32
 	SetClassLong( hWnd, GCL_HCURSOR, (DWORD)hCursor );
+#endif
 }
 
 inline HCURSOR GetClassCursor( HWND hWnd )
 {
+#ifdef _WIN64
+	return (HCURSOR)GetClassLong( hWnd, GCLP_HCURSOR );
+#else //_WIN32
 	return (HCURSOR)GetClassLong( hWnd, GCL_HCURSOR );
+#endif
 }
 
 inline void SetClassIcon( HWND hWnd, HICON hIcon )
 {
+#ifdef _WIN64
+	SetClassLong( hWnd, GCLP_HICON, (DWORD)hIcon );
+#else //_WIN32
 	SetClassLong( hWnd, GCL_HICON, (DWORD)hIcon );
+#endif
 }
 
 inline HICON GetClassIcon( HWND hWnd )
 {
+#ifdef _WIN64
+	return (HICON)GetClassLong( hWnd, GCLP_HICON );
+#else //_WIN32
 	return (HICON)GetClassLong( hWnd, GCL_HICON );
+#endif
 }
 
 inline HBRUSH SetClassBrush( HWND hWnd, HBRUSH hBrush )
 {
+#ifdef _WIN64
+	return (HBRUSH)SetClassLong( hWnd, GCLP_HBRBACKGROUND, (DWORD)hBrush );
+#else //_WIN32
 	return (HBRUSH)SetClassLong( hWnd, GCL_HBRBACKGROUND, (DWORD)hBrush );
+#endif
 }
 
 inline HBRUSH GetClassBrush( HWND hWnd )
 {
+#ifdef _WIN64
+	return (HBRUSH)GetClassLong( hWnd, GCLP_HBRBACKGROUND );
+#else //_WIN32
 	return (HBRUSH)GetClassLong( hWnd, GCL_HBRBACKGROUND );
+#endif
 }
 
 inline HINSTANCE GetWindowInstance( HWND hWnd )
 {
+#ifdef _WIN64
+	return (HINSTANCE)GetWindowLong( hWnd, GWLP_HINSTANCE );
+#else //_WIN32
 	return (HINSTANCE)GetWindowLong( hWnd, GWL_HINSTANCE );
+#endif
 }
 #ifdef AVS
 // ------------------------