SQLyog 13 GA

webyog · Apr 5, 2018 · 876d0ae · 876d0ae
1 parent fc1cd0f
commit 876d0ae
Show file tree

Hide file tree

Showing 186 changed files with 31,754 additions and 13,796 deletions.
diff --git a/build/SQLyogCommunity.vcxproj b/build/SQLyogCommunity.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -34,18 +34,28 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Template|x64'">
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -87,21 +97,21 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../include;../include/scintilla;../include/mysql;../include/htmlayout;../include/pcre;../include/tinyxml;../include/vld;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x500;COMMUNITY;UNICODE;_UNICODE;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x501;COMMUNITY;UNICODE;_UNICODE;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <ProgramDataBaseFileName>$(IntDir)vc70_t.pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>shfolder.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shfolder.lib;version.lib;Ws2_32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite3.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;ssleay32MD.lib;libeay32MD.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>LIBCMT; LIBC;LIBCD;msvcrt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>LIBCMT;msvcrt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -117,17 +127,17 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../include;../include/scintilla;../include/mysql;../include/htmlayout;../include/pcre;../include/tinyxml;../include/vld;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_WIN32_WINNT=0x500;COMMUNITY;UNICODE;_UNICODE;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_WIN32_WINNT=0x501;COMMUNITY;UNICODE;_UNICODE;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <ProgramDataBaseFileName>$(IntDir)vc70_t.pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level1</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>shfolder.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shfolder.lib;version.lib;Ws2_32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite3.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>LIBCMT; LIBC;LIBCD;msvcrt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -149,19 +159,19 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>../include;../include/scintilla;../include/mysql;../include/htmlayout;../include/pcre;../include/tinyxml;../include/vld;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x500;SCI_LEXER;STATIC_BUILD;COMMUNITY;_UNICODE;UNICODE;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x501;SCI_LEXER;STATIC_BUILD;COMMUNITY;_UNICODE;UNICODE;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <ProgramDataBaseFileName>$(IntDir)vc70.pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>shfolder.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shfolder.lib;version.lib;Ws2_32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite3.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>LIBCD;msvcrt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -183,19 +193,19 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>../include;../include/scintilla;../include/mysql;../include/htmlayout;../include/pcre;../include/tinyxml;../include/vld;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_WIN32_WINNT=0x500;SCI_LEXER;STATIC_BUILD;COMMUNITY;_UNICODE;UNICODE;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_WIN32_WINNT=0x501;SCI_LEXER;STATIC_BUILD;COMMUNITY;_UNICODE;UNICODE;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <ProgramDataBaseFileName>$(IntDir)vc70.pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>shfolder.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shfolder.lib;version.lib;Ws2_32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite3.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>LIBCD.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -298,7 +308,6 @@
     <ClCompile Include="..\src\ImportBatch.cpp" />
     <ClCompile Include="..\src\ImportData.cpp" />
     <ClCompile Include="..\src\ImportFromSQL.cpp" />
-    <ClCompile Include="..\src\InputBoxGeneric.cpp" />
     <ClCompile Include="..\src\KeyShortCuts.cpp" />
     <ClCompile Include="..\src\L10n.cpp" />
     <ClCompile Include="..\src\L10nText.cpp" />
@@ -387,6 +396,7 @@
     <ClCompile Include="..\src\wySqlite.cpp" />
     <ClCompile Include="..\src\wyString.cpp" />
     <ClCompile Include="..\src\wyTheme.cpp" />
+    <ClCompile Include="RegisterEmail.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\Announcements.h" />
@@ -441,7 +451,6 @@
     <ClInclude Include="..\include\ImportBatch.h" />
     <ClInclude Include="..\include\ImportFromSQL.h" />
     <ClInclude Include="..\include\Include.h" />
-    <ClInclude Include="..\include\InputBoxGeneric.h" />
     <ClInclude Include="..\include\L10n.h" />
     <ClInclude Include="..\include\L10nText.h" />
     <ClInclude Include="..\include\LexHelper.h" />
@@ -536,6 +545,8 @@
     <None Include="..\include\bitmaps\circle6.ico" />
     <None Include="..\include\bitmaps\circle7.ico" />
     <None Include="..\include\bitmaps\circle8.ico" />
+    <None Include="..\include\bitmaps\commit.ico" />
+    <None Include="..\include\bitmaps\commit_16.ico" />
     <None Include="..\include\bitmaps\compare-data.ico" />
     <None Include="..\include\bitmaps\datasearch.ico" />
     <None Include="..\include\bitmaps\dataview.ico" />
@@ -557,9 +568,13 @@
     <None Include="..\include\bitmaps\result_export.ico" />
     <None Include="..\include\bitmaps\revert_all.png" />
     <None Include="..\include\bitmaps\revert_selected.png" />
+    <None Include="..\include\bitmaps\rollback.ico" />
+    <None Include="..\include\bitmaps\rollback_16.ico" />
     <None Include="..\include\bitmaps\session_close.ico" />
     <None Include="..\include\bitmaps\session_open.ico" />
     <None Include="..\include\bitmaps\session_save_all.ico" />
+    <None Include="..\include\bitmaps\start_transaction.ico" />
+    <None Include="..\include\bitmaps\start_transaction_16.ico" />
     <None Include="..\include\bitmaps\stop.png" />
     <None Include="..\include\bitmaps\TableOptions.ico" />
     <None Include="..\include\bitmaps\tablerefresh.ico" />

diff --git a/build/SQLyogCommunity.vcxproj.filters b/build/SQLyogCommunity.vcxproj.filters
@@ -144,9 +144,6 @@
     <ClCompile Include="..\src\ImportFromSQL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\InputBoxGeneric.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\KeyShortCuts.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -357,6 +354,9 @@
     <ClCompile Include="..\src\sqlite3.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="RegisterEmail.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\AppInfo.h">
@@ -491,9 +491,6 @@
     <ClInclude Include="..\include\ImportFromSQL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\InputBoxGeneric.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\LexHelper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1562,6 +1559,24 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="ClassDiagram1.cd" />
+    <None Include="..\include\bitmaps\commit.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\include\bitmaps\rollback.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\include\bitmaps\start_transaction.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\include\bitmaps\commit_16.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\include\bitmaps\rollback_16.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\include\bitmaps\start_transaction_16.ico">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\include\SQLyog.rc">

diff --git a/build/SQLyogCommunity.vcxproj.user b/build/SQLyogCommunity.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/include/AppInfo.h b/include/AppInfo.h
@@ -38,7 +38,7 @@
 
 #define	SQLITE_APPVERSION_MAJOR						"10"
 #define	SQLITE_APPVERSION_MINOR						"5"
-#define	COMPANY_COPYRIGHT							"(c) 2001-2017 Webyog Inc."
+#define	COMPANY_COPYRIGHT							"(c) 2001-2018 Webyog Inc."
 
 #define FILEVER                                     MAJOR_VERSION_INT ## , ## MINOR_VERSION_INT ## , ## UPDATE_VERSION_INT ## , ## RELEASE_VERSION_INT
 #define STRFILEVER                                  MAJOR_VERSION "." MINOR_VERSION "." STRINGIZE(UPDATE_VERSION_INT) "." STRINGIZE(RELEASE_VERSION_INT)

diff --git a/include/CustTab.h b/include/CustTab.h
@@ -143,7 +143,7 @@ struct tab_item_information
     LPSTR	    m_psztext;
     wyInt32	    m_cchtextmax;
     wyInt32		m_iimage;
-    wyInt32		m_lparam;
+    LPARAM		m_lparam;
 	COLORREF	m_color;//Color of tab
 	COLORREF	m_fgcolor;//Text color of tab
 	LPSTR		m_tooltiptext;//tooltip text

diff --git a/include/FrameWindow.h b/include/FrameWindow.h
@@ -1328,6 +1328,16 @@ class FrameWindow
     @returns void   
     */
     void                    HandleOnRefresh(MDIWindow *pcquerywnd);
+
+
+	/// Collapse Handler
+	/**
+	@param pcquerywnd       : IN/OUT Query window HANDLE
+	@returns void
+	*/
+	void                    HandleOnCollapse(MDIWindow *pcquerywnd);
+
+
 	///Calling Refresh or Excute query functions based on SwitchShortcut Preference
 	/**
 	 @param hwndactive      : IN Active window HANDLE

diff --git a/include/FrameWindowHelper.h b/include/FrameWindowHelper.h
@@ -584,7 +584,7 @@ wyInt32 my_query(MDIWindow *wnd, Tunnel * tunnel, PMYSQL mysql, const wyChar *qu
 @param iscomment	: IN def. flag tells whether its query or comment
 @return wyTrue on success else return wyFalse
 */
-wyBool  my_queryprofile(MDIWindow *wnd, wyInt64 timetaken, const wyChar *proftext, wyBool iscomment = wyFalse);
+wyBool  my_queryprofile(MDIWindow *wnd, wyInt64 timetaken, const wyChar *proftext, wyBool iscomment = wyFalse, wyInt32 errnum=0, const wyChar *errormsg=NULL);
 
 /// This function is wrapper to the Win32 messagebox. Before calling MessageBox it gets the HWND
 /// which has focus and after the message box has been shown it returns the focus back to that HWND

diff --git a/include/MDIWindow.h b/include/MDIWindow.h
@@ -52,7 +52,7 @@ class tabeditorelem : public wyElem
 public:
 	TabEditor*	m_pctabeditor;
 	//TabQueryBuilder* m_
-	wyInt32		m_tabptr;
+	wyInt64		m_tabptr;
 	wyInt32		m_id;
 	wyInt32		m_tabid;
 	wyInt32		m_iimage;

diff --git a/include/ObjectBrowser.h b/include/ObjectBrowser.h
@@ -88,6 +88,10 @@ class CQueryObject
     @param mysql       : Pointer to mysql pointer.
     */
 	void		RefreshObjectBrowser(Tunnel * tunnel, PMYSQL mysql, MDIWindow* wnd);
+
+	void		CollapseObjectBrowser(HWND hTree);
+
+	void		CollapseNode(HWND hTree, HTREEITEM hti);
 
     /// Gets the old database name.
     /**

diff --git a/include/SQLTokenizer.h b/include/SQLTokenizer.h
@@ -152,7 +152,7 @@ class SQLTokenizer
 	QUERY_TOKEN			*m_bufferedline;					
 
     /// File to read query from 
-	FILE				*m_importfile;						
+	int					m_importfile;						
 
 	/// Number of bytes read from buffer
 	wyUInt32    		 m_bytesread;