Commit 0880284b authored by Vicentiu Ciorbaru's avatar Vicentiu Ciorbaru

Fix win/ files to be stored with LF in repository

On Windows, the files get checked out with CRLF thanks
to .gitattributes.
parent c1b07ff9
This diff is collapsed.
...@@ -104,48 +104,48 @@ static void EscapeCommandLine(const wchar_t *in, wchar_t *out, size_t buflen) ...@@ -104,48 +104,48 @@ static void EscapeCommandLine(const wchar_t *in, wchar_t *out, size_t buflen)
} }
pos= 0; pos= 0;
for(int i = 0 ; ; i++) for(int i = 0 ; ; i++)
{ {
size_t n_backslashes = 0; size_t n_backslashes = 0;
wchar_t c; wchar_t c;
while (in[i] == L'\\') while (in[i] == L'\\')
{ {
i++; i++;
n_backslashes++; n_backslashes++;
} }
c= in[i]; c= in[i];
if (c == 0) if (c == 0)
{ {
/* /*
Escape all backslashes, but let the terminating double quotation mark Escape all backslashes, but let the terminating double quotation mark
that caller adds be interpreted as a metacharacter. that caller adds be interpreted as a metacharacter.
*/ */
for(size_t j= 0; j < 2*n_backslashes;j++) for(size_t j= 0; j < 2*n_backslashes;j++)
{ {
out[pos++]=L'\\'; out[pos++]=L'\\';
} }
break; break;
} }
else if (c == L'"') else if (c == L'"')
{ {
/* /*
Escape all backslashes and the following double quotation mark. Escape all backslashes and the following double quotation mark.
*/ */
for(size_t j= 0; j < 2*n_backslashes + 1; j++) for(size_t j= 0; j < 2*n_backslashes + 1; j++)
{ {
out[pos++]=L'\\'; out[pos++]=L'\\';
} }
out[pos++]= L'"'; out[pos++]= L'"';
} }
else else
{ {
/* Backslashes aren't special here. */ /* Backslashes aren't special here. */
for (size_t j=0; j < n_backslashes; j++) for (size_t j=0; j < n_backslashes; j++)
out[pos++] = L'\\'; out[pos++] = L'\\';
out[pos++]= c; out[pos++]= c;
} }
} }
out[pos++]= 0; out[pos++]= 0;
} }
......
This diff is collapsed.
SET(HEIDISQL_BASE_NAME "HeidiSQL_9.1_Portable") SET(HEIDISQL_BASE_NAME "HeidiSQL_9.1_Portable")
SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip") SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip")
SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}") SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}")
SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME}) SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME})
IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}) IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP})
MAKE_DIRECTORY(${HEIDISQL_DOWNLOAD_DIR}) MAKE_DIRECTORY(${HEIDISQL_DOWNLOAD_DIR})
MESSAGE(STATUS "Downloading ${HEIDISQL_URL} to ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}") MESSAGE(STATUS "Downloading ${HEIDISQL_URL} to ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}")
FILE(DOWNLOAD ${HEIDISQL_URL} ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP} TIMEOUT 60) FILE(DOWNLOAD ${HEIDISQL_URL} ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP} TIMEOUT 60)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E chdir ${HEIDISQL_DOWNLOAD_DIR} EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E chdir ${HEIDISQL_DOWNLOAD_DIR}
${CMAKE_COMMAND} -E tar xfz ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP} ${CMAKE_COMMAND} -E tar xfz ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}
) )
ENDIF() ENDIF()
SET(LIBMYSQLDLL_SOURCE ${HEIDISQL_DOWNLOAD_DIR}/libmysql.dll) SET(LIBMYSQLDLL_SOURCE ${HEIDISQL_DOWNLOAD_DIR}/libmysql.dll)
IF(CMAKE_SIZEOF_VOID_P EQUAL 4) IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
# Use our libmysql if it is 32 bit. # Use our libmysql if it is 32 bit.
IF(LIBMYSQL_LOCATION) IF(LIBMYSQL_LOCATION)
SET(LIBMYSQLDLL_SOURCE "${LIBMYSQL_LOCATION}") SET(LIBMYSQLDLL_SOURCE "${LIBMYSQL_LOCATION}")
ENDIF() ENDIF()
ENDIF() ENDIF()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql.wxi) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql.wxi)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql_feature.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql_feature.wxi) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql_feature.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql_feature.wxi)
<Include> <Include>
<Property Id="HEIDISQLINSTALLED" Secure="yes"> <Property Id="HEIDISQLINSTALLED" Secure="yes">
<RegistrySearch Id="HeidiSQL" <RegistrySearch Id="HeidiSQL"
Root="HKLM" Root="HKLM"
Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\HeidiSQL_is1" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\HeidiSQL_is1"
Name="UninstallString" Name="UninstallString"
Type="raw" Type="raw"
Win64="no" Win64="no"
/> />
</Property> </Property>
<DirectoryRef Id="MariaDBShared"> <DirectoryRef Id="MariaDBShared">
<Directory Id="D.HeidiSQL" Name="HeidiSQL"> <Directory Id="D.HeidiSQL" Name="HeidiSQL">
<Component Id="component.HeidiSQL" Guid="96ea3879-5320-4098-8f26-2f655d2f716c" Win64="no"> <Component Id="component.HeidiSQL" Guid="96ea3879-5320-4098-8f26-2f655d2f716c" Win64="no">
<File Id="heidisql.gpl.txt" Name="gpl.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\gpl.txt" /> <File Id="heidisql.gpl.txt" Name="gpl.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\gpl.txt" />
<File Id="heidisql.heidisql.exe" Name="heidisql.exe" Source="${HEIDISQL_DOWNLOAD_DIR}\heidisql.exe" KeyPath="yes"> <File Id="heidisql.heidisql.exe" Name="heidisql.exe" Source="${HEIDISQL_DOWNLOAD_DIR}\heidisql.exe" KeyPath="yes">
<Shortcut Id="desktopHeidiSQL" Directory="DesktopFolder" Name="HeidiSQL" Advertise="yes"/> <Shortcut Id="desktopHeidiSQL" Directory="DesktopFolder" Name="HeidiSQL" Advertise="yes"/>
</File> </File>
<!-- <!--
Forced file removal for heidisql.exe might be required. Forced file removal for heidisql.exe might be required.
HeidiSQL is self-updating, thus the version that was installed by MSI not necessarily matches HeidiSQL is self-updating, thus the version that was installed by MSI not necessarily matches
the version of the file on uninstall. MSI would not touch such file by default and leave it after the version of the file on uninstall. MSI would not touch such file by default and leave it after
uninstallation. We use RemoveFile to force delete in any case. uninstallation. We use RemoveFile to force delete in any case.
--> -->
<RemoveFile Id="Remove_HeidiSQL_exe" Name="heidisql.exe" On="uninstall" /> <RemoveFile Id="Remove_HeidiSQL_exe" Name="heidisql.exe" On="uninstall" />
<!-- remove readme.txt too, it's not included in HeidiSQL-9.1-Portable.zip --> <!-- remove readme.txt too, it's not included in HeidiSQL-9.1-Portable.zip -->
<RemoveFile Id="Remove_readme_txt" Name="readme.txt" On="uninstall" /> <RemoveFile Id="Remove_readme_txt" Name="readme.txt" On="uninstall" />
<File Id="heidisql.license.txt" Name="license.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\license.txt" /> <File Id="heidisql.license.txt" Name="license.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\license.txt" />
</Component> </Component>
<Component Id="component.HeidiSQL_MenuShortcut" Guid="*" Win64="no"> <Component Id="component.HeidiSQL_MenuShortcut" Guid="*" Win64="no">
<RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall" Name="shortcuts.heidisql" Value="1" Type="string" KeyPath="yes" /> <RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall" Name="shortcuts.heidisql" Value="1" Type="string" KeyPath="yes" />
<Shortcut Id="startmenuHeidiSQL" Directory="ShortcutFolder" Name="HeidiSQL" Target="[D.HeidiSQL]\heidisql.exe"/> <Shortcut Id="startmenuHeidiSQL" Directory="ShortcutFolder" Name="HeidiSQL" Target="[D.HeidiSQL]\heidisql.exe"/>
</Component> </Component>
<Component Id="component.HeidiSQL_libmysql.dll" Guid="*" Win64="no"> <Component Id="component.HeidiSQL_libmysql.dll" Guid="*" Win64="no">
<File Id="heidisql.libmysql.dll" Name="libmysql.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmysql.dll" /> <File Id="heidisql.libmysql.dll" Name="libmysql.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmysql.dll" />
</Component> </Component>
<Component Id="component.HeidiSQL_libeay32.dll" Guid="*" Win64="no"> <Component Id="component.HeidiSQL_libeay32.dll" Guid="*" Win64="no">
<File Id="heidisql.libeay32.dll" Name="libeay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libeay32.dll" /> <File Id="heidisql.libeay32.dll" Name="libeay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libeay32.dll" />
</Component> </Component>
<Component Id="component.HeidiSQL_libpq.dll" Guid="*" Win64="no"> <Component Id="component.HeidiSQL_libpq.dll" Guid="*" Win64="no">
<File Id="heidisql.libpq.dll" Name="libpq.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libpq.dll" /> <File Id="heidisql.libpq.dll" Name="libpq.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libpq.dll" />
</Component> </Component>
<Component Id="component.HeidiSQL_ssleay32.dll" Guid="*" Win64="no"> <Component Id="component.HeidiSQL_ssleay32.dll" Guid="*" Win64="no">
<File Id="heidisql.ssleay32.dll" Name="ssleay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\ssleay32.dll" /> <File Id="heidisql.ssleay32.dll" Name="ssleay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\ssleay32.dll" />
</Component> </Component>
<Component Id="component.HeidiSQL_libintl.dll" Guid="*" Win64="no"> <Component Id="component.HeidiSQL_libintl.dll" Guid="*" Win64="no">
<File Id="heidisql.libintl.dll" Name="libintl.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libintl.dll" /> <File Id="heidisql.libintl.dll" Name="libintl.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libintl.dll" />
</Component> </Component>
<Directory Id="D.HeidiSQL.plugins" Name="plugins"> <Directory Id="D.HeidiSQL.plugins" Name="plugins">
<Component Id="component.HeidiSQL_dialog.dll" Guid="*" Win64="no"> <Component Id="component.HeidiSQL_dialog.dll" Guid="*" Win64="no">
<File Id="heidisql.dialog.dll" Name="dialog.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\dialog.dll" /> <File Id="heidisql.dialog.dll" Name="dialog.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\dialog.dll" />
</Component> </Component>
</Directory> </Directory>
<Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no"> <Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no">
<Condition>HEIDISQLINSTALLED</Condition> <Condition>HEIDISQLINSTALLED</Condition>
<RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\UninstallCleanupHeidiSQLSettings" Name="cleanup.heidisql" Value="1" Type="string" KeyPath="yes" /> <RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\UninstallCleanupHeidiSQLSettings" Name="cleanup.heidisql" Value="1" Type="string" KeyPath="yes" />
<RemoveRegistryKey Id="HeidiSQL_RegistryCleanup" Root="HKCU" Key="SOFTWARE\HeidiSQL" Action="removeOnUninstall" /> <RemoveRegistryKey Id="HeidiSQL_RegistryCleanup" Root="HKCU" Key="SOFTWARE\HeidiSQL" Action="removeOnUninstall" />
</Component> </Component>
</Directory> </Directory>
</DirectoryRef> </DirectoryRef>
<ComponentGroup Id="HeidiSQL"> <ComponentGroup Id="HeidiSQL">
<ComponentRef Id="component.HeidiSQL"/> <ComponentRef Id="component.HeidiSQL"/>
<ComponentRef Id="component.HeidiSQL_MenuShortcut"/> <ComponentRef Id="component.HeidiSQL_MenuShortcut"/>
<ComponentRef Id="component.HeidiSQL_libmysql.dll"/> <ComponentRef Id="component.HeidiSQL_libmysql.dll"/>
<ComponentRef Id="component.HeidiSQL_libeay32.dll" /> <ComponentRef Id="component.HeidiSQL_libeay32.dll" />
<ComponentRef Id="component.HeidiSQL_libpq.dll" /> <ComponentRef Id="component.HeidiSQL_libpq.dll" />
<ComponentRef Id="component.HeidiSQL_ssleay32.dll" /> <ComponentRef Id="component.HeidiSQL_ssleay32.dll" />
<ComponentRef Id="component.HeidiSQL_libintl.dll" /> <ComponentRef Id="component.HeidiSQL_libintl.dll" />
<ComponentRef Id="component.HeidiSQL_dialog.dll" /> <ComponentRef Id="component.HeidiSQL_dialog.dll" />
<ComponentRef Id="component.HeidiSQL_CleanupSettings"/> <ComponentRef Id="component.HeidiSQL_CleanupSettings"/>
</ComponentGroup> </ComponentGroup>
</Include> </Include>
<Include> <Include>
<Feature Id="HeidiSQL" <Feature Id="HeidiSQL"
Title='HeidiSQL' Title='HeidiSQL'
Description= 'Powerful, easy and free MySQL/MariaDB GUI client by Ansgar Becker' Description= 'Powerful, easy and free MySQL/MariaDB GUI client by Ansgar Becker'
AllowAdvertise='no' AllowAdvertise='no'
Level='1'> Level='1'>
<Condition Level="0">HEIDISQLINSTALLED AND NOT REMOVE ~= ALL</Condition> <Condition Level="0">HEIDISQLINSTALLED AND NOT REMOVE ~= ALL</Condition>
<ComponentGroupRef Id='HeidiSQL'/> <ComponentGroupRef Id='HeidiSQL'/>
</Feature> </Feature>
</Include> </Include>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product <Product
Id="*" Id="*"
UpgradeCode="@CPACK_WIX_UPGRADE_CODE@" UpgradeCode="@CPACK_WIX_UPGRADE_CODE@"
Name="@CPACK_WIX_PACKAGE_NAME@" Name="@CPACK_WIX_PACKAGE_NAME@"
Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@" Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@"
Language="1033" Language="1033"
Manufacturer="@MANUFACTURER@"> Manufacturer="@MANUFACTURER@">
<Package Id='*' <Package Id='*'
Keywords='Installer' Keywords='Installer'
Description='MariaDB Server' Description='MariaDB Server'
Manufacturer='@MANUFACTURER@' Manufacturer='@MANUFACTURER@'
InstallerVersion='200' InstallerVersion='200'
Languages='1033' Languages='1033'
Compressed='yes' Compressed='yes'
SummaryCodepage='1252' SummaryCodepage='1252'
Platform='@Platform@'/> Platform='@Platform@'/>
<Media Id='1' Cabinet='product.cab' EmbedCab='yes' CompressionLevel='high' /> <Media Id='1' Cabinet='product.cab' EmbedCab='yes' CompressionLevel='high' />
<!-- Upgrade --> <!-- Upgrade -->
<Upgrade Id="@CPACK_WIX_UPGRADE_CODE@"> <Upgrade Id="@CPACK_WIX_UPGRADE_CODE@">
<?if "@PATCH_VERSION@" != "0"?> <?if "@PATCH_VERSION@" != "0"?>
<UpgradeVersion <UpgradeVersion
Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0" Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"
IncludeMinimum="yes" IncludeMinimum="yes"
Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@" Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@"
IncludeMaximum="yes" IncludeMaximum="yes"
Property="OLDERVERSIONBEINGUPGRADED" Property="OLDERVERSIONBEINGUPGRADED"
MigrateFeatures="yes" MigrateFeatures="yes"
/> />
<?endif?> <?endif?>
<UpgradeVersion <UpgradeVersion
Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@" Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@"
Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.999" Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.999"
IncludeMinimum="no" IncludeMinimum="no"
OnlyDetect="yes" OnlyDetect="yes"
Property="NEWERVERSIONDETECTED" /> Property="NEWERVERSIONDETECTED" />
</Upgrade> </Upgrade>
<Condition Message="A more recent version of [ProductName] is already installed. Setup will now exit."> <Condition Message="A more recent version of [ProductName] is already installed. Setup will now exit.">
NOT NEWERVERSIONDETECTED OR Installed NOT NEWERVERSIONDETECTED OR Installed
</Condition> </Condition>
<InstallExecuteSequence> <InstallExecuteSequence>
<RemoveExistingProducts After="InstallFinalize"/> <RemoveExistingProducts After="InstallFinalize"/>
</InstallExecuteSequence> </InstallExecuteSequence>
<InstallUISequence> <InstallUISequence>
<AppSearch After="FindRelatedProducts"/> <AppSearch After="FindRelatedProducts"/>
</InstallUISequence> </InstallUISequence>
<!-- UI --> <!-- UI -->
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property> <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
<UIRef Id="WixUI_ErrorProgressText" /> <UIRef Id="WixUI_ErrorProgressText" />
<UIRef Id="@CPACK_WIX_UI@" /> <UIRef Id="@CPACK_WIX_UI@" />
<!-- License --> <!-- License -->
<WixVariable <WixVariable
Id="WixUILicenseRtf" Id="WixUILicenseRtf"
Value="@COPYING_RTF@"/> Value="@COPYING_RTF@"/>
<!-- Installation root--> <!-- Installation root-->
<Directory Id='TARGETDIR' Name='SourceDir'> <Directory Id='TARGETDIR' Name='SourceDir'>
<Directory Id='@PlatformProgramFilesFolder@'> <Directory Id='@PlatformProgramFilesFolder@'>
<Directory Id='INSTALLDIR' Name='@CPACK_WIX_PACKAGE_BASE_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@'> <Directory Id='INSTALLDIR' Name='@CPACK_WIX_PACKAGE_BASE_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@'>
</Directory> </Directory>
</Directory> </Directory>
</Directory> </Directory>
<!-- CPACK_WIX_FEATURES --> <!-- CPACK_WIX_FEATURES -->
@CPACK_WIX_FEATURES@ @CPACK_WIX_FEATURES@
<!-- CPACK_WIX_DIRECTORIES --> <!-- CPACK_WIX_DIRECTORIES -->
@CPACK_WIX_DIRECTORIES@ @CPACK_WIX_DIRECTORIES@
<!--CPACK_WIX_COMPONENTS--> <!--CPACK_WIX_COMPONENTS-->
@CPACK_WIX_COMPONENTS@ @CPACK_WIX_COMPONENTS@
<!--CPACK_WIX_COMPONENTS_GROUPS --> <!--CPACK_WIX_COMPONENTS_GROUPS -->
@CPACK_WIX_COMPONENT_GROUPS@ @CPACK_WIX_COMPONENT_GROUPS@
<!--CPACK_WIX_INCLUDES --> <!--CPACK_WIX_INCLUDES -->
@CPACK_WIX_INCLUDES@ @CPACK_WIX_INCLUDES@
</Product> </Product>
</Wix> </Wix>
// stdafx.h : include file for standard system include files, // stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, // or project specific include files that are used frequently,
// but are changed infrequently // but are changed infrequently
#pragma once #pragma once
#ifndef _SECURE_ATL #ifndef _SECURE_ATL
#define _SECURE_ATL 1 #define _SECURE_ATL 1
#endif #endif
#ifndef VC_EXTRALEAN #ifndef VC_EXTRALEAN
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
#endif #endif
#include "targetver.h" #include "targetver.h"
#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
// turns off MFC's hiding of some common and often safely ignored warning messages // turns off MFC's hiding of some common and often safely ignored warning messages
#define _AFX_ALL_WARNINGS #define _AFX_ALL_WARNINGS
#include <afxwin.h> // MFC core and standard components #include <afxwin.h> // MFC core and standard components
#include <afxext.h> // MFC extensions #include <afxext.h> // MFC extensions
#ifndef _AFX_NO_OLE_SUPPORT #ifndef _AFX_NO_OLE_SUPPORT
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls #include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
#endif #endif
#ifndef _AFX_NO_AFXCMN_SUPPORT #ifndef _AFX_NO_AFXCMN_SUPPORT
#include <afxcmn.h> // MFC support for Windows Common Controls #include <afxcmn.h> // MFC support for Windows Common Controls
#endif // _AFX_NO_AFXCMN_SUPPORT #endif // _AFX_NO_AFXCMN_SUPPORT
#pragma once #pragma once
// Including SDKDDKVer.h defines the highest available Windows platform. // Including SDKDDKVer.h defines the highest available Windows platform.
// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and // If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. // set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
#include <SDKDDKVer.h> #include <SDKDDKVer.h>
// upgrade.cpp : Defines the class behaviors for the application. // upgrade.cpp : Defines the class behaviors for the application.
// //
#include "stdafx.h" #include "stdafx.h"
#include "upgrade.h" #include "upgrade.h"
#include "upgradeDlg.h" #include "upgradeDlg.h"
#ifdef _DEBUG #ifdef _DEBUG
#define new DEBUG_NEW #define new DEBUG_NEW
#endif #endif
// CUpgradeApp // CUpgradeApp
BEGIN_MESSAGE_MAP(CUpgradeApp, CWinApp) BEGIN_MESSAGE_MAP(CUpgradeApp, CWinApp)
ON_COMMAND(ID_HELP, &CWinApp::OnHelp) ON_COMMAND(ID_HELP, &CWinApp::OnHelp)
END_MESSAGE_MAP() END_MESSAGE_MAP()
// CUpgradeApp construction // CUpgradeApp construction
CUpgradeApp::CUpgradeApp() CUpgradeApp::CUpgradeApp()
{ {
// TODO: add construction code here, // TODO: add construction code here,
// Place all significant initialization in InitInstance // Place all significant initialization in InitInstance
} }
// The one and only CUpgradeApp object // The one and only CUpgradeApp object
CUpgradeApp theApp; CUpgradeApp theApp;
// CUpgradeApp initialization // CUpgradeApp initialization
BOOL CUpgradeApp::InitInstance() BOOL CUpgradeApp::InitInstance()
{ {
// InitCommonControlsEx() is required on Windows XP if an application // InitCommonControlsEx() is required on Windows XP if an application
// manifest specifies use of ComCtl32.dll version 6 or later to enable // manifest specifies use of ComCtl32.dll version 6 or later to enable
// visual styles. Otherwise, any window creation will fail. // visual styles. Otherwise, any window creation will fail.
INITCOMMONCONTROLSEX InitCtrls; INITCOMMONCONTROLSEX InitCtrls;
InitCtrls.dwSize = sizeof(InitCtrls); InitCtrls.dwSize = sizeof(InitCtrls);
// Set this to include all the common control classes you want to use // Set this to include all the common control classes you want to use
// in your application. // in your application.
InitCtrls.dwICC = ICC_WIN95_CLASSES; InitCtrls.dwICC = ICC_WIN95_CLASSES;
InitCommonControlsEx(&InitCtrls); InitCommonControlsEx(&InitCtrls);
CWinApp::InitInstance(); CWinApp::InitInstance();
CUpgradeDlg dlg; CUpgradeDlg dlg;
m_pMainWnd = &dlg; m_pMainWnd = &dlg;
dlg.DoModal(); dlg.DoModal();
// Since the dialog has been closed, return FALSE so that we exit the // Since the dialog has been closed, return FALSE so that we exit the
// application, rather than start the application's message pump. // application, rather than start the application's message pump.
return FALSE; return FALSE;
} }
// zzz.h : main header file for the PROJECT_NAME application // zzz.h : main header file for the PROJECT_NAME application
// //
#pragma once #pragma once
#ifndef __AFXWIN_H__ #ifndef __AFXWIN_H__
#error "include 'stdafx.h' before including this file for PCH" #error "include 'stdafx.h' before including this file for PCH"
#endif #endif
#include "resource.h" // main symbols #include "resource.h" // main symbols
// CzzzApp: // CzzzApp:
// See zzz.cpp for the implementation of this class // See zzz.cpp for the implementation of this class
// //
class CUpgradeApp : public CWinApp class CUpgradeApp : public CWinApp
{ {
public: public:
CUpgradeApp(); CUpgradeApp();
// Overrides // Overrides
public: public:
virtual BOOL InitInstance(); virtual BOOL InitInstance();
// Implementation // Implementation
DECLARE_MESSAGE_MAP() DECLARE_MESSAGE_MAP()
}; };
extern CUpgradeApp theApp; extern CUpgradeApp theApp;
\ No newline at end of file
// Microsoft Visual C++ generated resource script. // Microsoft Visual C++ generated resource script.
// //
#include "resource.h" #include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS #define APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#ifndef APSTUDIO_INVOKED #ifndef APSTUDIO_INVOKED
#include "targetver.h" #include "targetver.h"
#endif #endif
#include "afxres.h" #include "afxres.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// German (Germany) resources // German (Germany) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
LANGUAGE LANG_GERMAN, SUBLANG_GERMAN LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// TEXTINCLUDE // TEXTINCLUDE
// //
1 TEXTINCLUDE 1 TEXTINCLUDE
BEGIN BEGIN
"resource.h\0" "resource.h\0"
END END
2 TEXTINCLUDE 2 TEXTINCLUDE
BEGIN BEGIN
"#ifndef APSTUDIO_INVOKED\r\n" "#ifndef APSTUDIO_INVOKED\r\n"
"#include ""targetver.h""\r\n" "#include ""targetver.h""\r\n"
"#endif\r\n" "#endif\r\n"
"#include ""afxres.h""\r\n" "#include ""afxres.h""\r\n"
"\0" "\0"
END END
3 TEXTINCLUDE 3 TEXTINCLUDE
BEGIN BEGIN
"#define _AFX_NO_SPLITTER_RESOURCES\r\n" "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
"#define _AFX_NO_OLE_RESOURCES\r\n" "#define _AFX_NO_OLE_RESOURCES\r\n"
"#define _AFX_NO_TRACKER_RESOURCES\r\n" "#define _AFX_NO_TRACKER_RESOURCES\r\n"
"#define _AFX_NO_PROPERTY_RESOURCES\r\n" "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
"\r\n" "\r\n"
"#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
"LANGUAGE 9, 1\r\n" "LANGUAGE 9, 1\r\n"
"#include ""res\\upgrade.rc2"" // non-Microsoft Visual C++ edited resources\r\n" "#include ""res\\upgrade.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
"#include ""afxres.rc"" // Standard components\r\n" "#include ""afxres.rc"" // Standard components\r\n"
"#endif\r\n" "#endif\r\n"
"\0" "\0"
END END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Icon // Icon
// //
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
IDR_MAINFRAME ICON "res\\upgrade.ico" IDR_MAINFRAME ICON "res\\upgrade.ico"
#endif // German (Germany) resources #endif // German (Germany) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// English (United States) resources // English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Dialog // Dialog
// //
IDD_UPGRADE_DIALOG DIALOGEX 0, 0, 320, 200 IDD_UPGRADE_DIALOG DIALOGEX 0, 0, 320, 200
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW EXSTYLE WS_EX_APPWINDOW
CAPTION "MariaDB Upgrade Wizard" CAPTION "MariaDB Upgrade Wizard"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,113,169,50,14 DEFPUSHBUTTON "OK",IDOK,113,169,50,14
PUSHBUTTON "Cancel",IDCANCEL,191,169,50,14 PUSHBUTTON "Cancel",IDCANCEL,191,169,50,14
LISTBOX IDC_LIST1,24,39,216,80,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LISTBOX IDC_LIST1,24,39,216,80,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_EDIT1,97,124,193,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER EDITTEXT IDC_EDIT1,97,124,193,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
EDITTEXT IDC_EDIT2,98,138,181,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER EDITTEXT IDC_EDIT2,98,138,181,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
CONTROL "",IDC_PROGRESS1,"msctls_progress32",PBS_SMOOTH | WS_BORDER,26,153,243,14 CONTROL "",IDC_PROGRESS1,"msctls_progress32",PBS_SMOOTH | WS_BORDER,26,153,243,14
EDITTEXT IDC_EDIT3,98,151,40,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER EDITTEXT IDC_EDIT3,98,151,40,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
EDITTEXT IDC_EDIT7,27,124,65,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER EDITTEXT IDC_EDIT7,27,124,65,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
EDITTEXT IDC_EDIT8,27,137,62,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER EDITTEXT IDC_EDIT8,27,137,62,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
EDITTEXT IDC_EDIT9,27,151,62,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER EDITTEXT IDC_EDIT9,27,151,62,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
PUSHBUTTON "Select all",IDC_BUTTON1,245,61,50,14 PUSHBUTTON "Select all",IDC_BUTTON1,245,61,50,14
PUSHBUTTON "Clear all",IDC_BUTTON2,246,88,50,14 PUSHBUTTON "Clear all",IDC_BUTTON2,246,88,50,14
LTEXT "Select services you want to upgrade and click on the [Upgrade] button.\nMake sure to backup data directories prior to upgrade.",IDC_STATIC,25,14,215,26 LTEXT "Select services you want to upgrade and click on the [Upgrade] button.\nMake sure to backup data directories prior to upgrade.",IDC_STATIC,25,14,215,26
END END
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// DESIGNINFO // DESIGNINFO
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO GUIDELINES DESIGNINFO
BEGIN BEGIN
IDD_UPGRADE_DIALOG, DIALOG IDD_UPGRADE_DIALOG, DIALOG
BEGIN BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 313 RIGHTMARGIN, 313
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 193 BOTTOMMARGIN, 193
END END
END END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED
#endif // English (United States) resources #endif // English (United States) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED #ifndef APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Generated from the TEXTINCLUDE 3 resource. // Generated from the TEXTINCLUDE 3 resource.
// //
#define _AFX_NO_SPLITTER_RESOURCES #define _AFX_NO_SPLITTER_RESOURCES
#define _AFX_NO_OLE_RESOURCES #define _AFX_NO_OLE_RESOURCES
#define _AFX_NO_TRACKER_RESOURCES #define _AFX_NO_TRACKER_RESOURCES
#define _AFX_NO_PROPERTY_RESOURCES #define _AFX_NO_PROPERTY_RESOURCES
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE 9, 1 LANGUAGE 9, 1
#include "res\upgrade.rc2" // non-Microsoft Visual C++ edited resources #include "res\upgrade.rc2" // non-Microsoft Visual C++ edited resources
#include "afxres.rc" // Standard components #include "afxres.rc" // Standard components
#endif #endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED #endif // not APSTUDIO_INVOKED
// upgradeDlg.h : header file // upgradeDlg.h : header file
// //
#pragma once #pragma once
#include "afxcmn.h" #include "afxcmn.h"
#include "afxwin.h" #include "afxwin.h"
#include <string> #include <string>
// CUpgradeDlg dialog // CUpgradeDlg dialog
class CUpgradeDlg : public CDialog class CUpgradeDlg : public CDialog
{ {
// Construction // Construction
public: public:
CUpgradeDlg(CWnd* pParent = NULL); // standard constructor CUpgradeDlg(CWnd* pParent = NULL); // standard constructor
// Dialog Data // Dialog Data
enum { IDD = IDD_UPGRADE_DIALOG }; enum { IDD = IDD_UPGRADE_DIALOG };
protected: protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
// job object for current process and children // job object for current process and children
HANDLE m_JobObject; HANDLE m_JobObject;
// Services are being upgraded // Services are being upgraded
BOOL m_UpgradeRunning; BOOL m_UpgradeRunning;
// ProgressBar related: number of services to upgrade // ProgressBar related: number of services to upgrade
int m_ProgressTotal; int m_ProgressTotal;
//ProgressBar related: current service being upgraded //ProgressBar related: current service being upgraded
int m_ProgressCurrent; int m_ProgressCurrent;
protected: protected:
HICON m_hIcon; HICON m_hIcon;
// Generated message map functions // Generated message map functions
virtual BOOL OnInitDialog(); virtual BOOL OnInitDialog();
void PopulateServicesList(); void PopulateServicesList();
afx_msg void OnPaint(); afx_msg void OnPaint();
afx_msg HCURSOR OnQueryDragIcon(); afx_msg HCURSOR OnQueryDragIcon();
DECLARE_MESSAGE_MAP() DECLARE_MESSAGE_MAP()
public: public:
void SelectService(int index); void SelectService(int index);
void UpgradeServices(); void UpgradeServices();
void UpgradeOneService(const std::string& name); void UpgradeOneService(const std::string& name);
void ErrorExit(const char *); void ErrorExit(const char *);
std::string m_InstallDir; std::string m_InstallDir;
CCheckListBox m_Services; CCheckListBox m_Services;
CProgressCtrl m_Progress; CProgressCtrl m_Progress;
CButton m_Ok; CButton m_Ok;
CButton m_Cancel; CButton m_Cancel;
CButton m_SelectAll; CButton m_SelectAll;
CButton m_ClearAll; CButton m_ClearAll;
int m_MajorVersion; int m_MajorVersion;
int m_MinorVersion; int m_MinorVersion;
int m_PatchVersion; int m_PatchVersion;
CEdit m_IniFilePath; CEdit m_IniFilePath;
afx_msg void OnLbnSelchangeList1(); afx_msg void OnLbnSelchangeList1();
afx_msg void OnChkChange(); afx_msg void OnChkChange();
CEdit m_DataDir; CEdit m_DataDir;
CEdit m_Version; CEdit m_Version;
afx_msg void OnBnClickedOk(); afx_msg void OnBnClickedOk();
afx_msg void OnBnClickedCancel(); afx_msg void OnBnClickedCancel();
afx_msg void OnBnSelectAll(); afx_msg void OnBnSelectAll();
afx_msg void OnBnClearAll(); afx_msg void OnBnClearAll();
CEdit m_IniFileLabel; CEdit m_IniFileLabel;
CEdit m_DataDirLabel; CEdit m_DataDirLabel;
CEdit m_VersionLabel; CEdit m_VersionLabel;
}; };
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security> <security>
<requestedPrivileges> <requestedPrivileges>
<requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel> <requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel>
</requestedPrivileges> </requestedPrivileges>
</security> </security>
</trustInfo> </trustInfo>
<dependency> <dependency>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity> <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
</assembly> </assembly>
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment