From 270fdcf68ee373d9c8cf8216f0b5e869aa27fd18 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 28 Apr 2015 10:41:12 +0000 Subject: DbChecker - unified project git-svn-id: http://svn.miranda-ng.org/main/trunk@13224 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/DbChecker/src/cleaning.cpp | 2 +- plugins/DbChecker/src/dbchecker.h | 79 ------------------------------------ plugins/DbChecker/src/fileaccess.cpp | 2 +- plugins/DbChecker/src/finished.cpp | 2 +- plugins/DbChecker/src/main.cpp | 2 +- plugins/DbChecker/src/openerror.cpp | 2 +- plugins/DbChecker/src/progress.cpp | 2 +- plugins/DbChecker/src/selectdb.cpp | 2 +- plugins/DbChecker/src/stdafx.cpp | 18 -------- plugins/DbChecker/src/stdafx.cxx | 18 ++++++++ plugins/DbChecker/src/stdafx.h | 79 ++++++++++++++++++++++++++++++++++++ plugins/DbChecker/src/welcome.cpp | 2 +- plugins/DbChecker/src/wizard.cpp | 2 +- plugins/DbChecker/src/worker.cpp | 2 +- 14 files changed, 107 insertions(+), 107 deletions(-) delete mode 100644 plugins/DbChecker/src/dbchecker.h delete mode 100644 plugins/DbChecker/src/stdafx.cpp create mode 100644 plugins/DbChecker/src/stdafx.cxx create mode 100644 plugins/DbChecker/src/stdafx.h (limited to 'plugins/DbChecker/src') diff --git a/plugins/DbChecker/src/cleaning.cpp b/plugins/DbChecker/src/cleaning.cpp index c7c504a37d..ecfdaf6de5 100644 --- a/plugins/DbChecker/src/cleaning.cpp +++ b/plugins/DbChecker/src/cleaning.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "dbchecker.h" +#include "stdafx.h" INT_PTR CALLBACK CleaningDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) { diff --git a/plugins/DbChecker/src/dbchecker.h b/plugins/DbChecker/src/dbchecker.h deleted file mode 100644 index c2235a6c4c..0000000000 --- a/plugins/DbChecker/src/dbchecker.h +++ /dev/null @@ -1,79 +0,0 @@ -/* -Miranda Database Tool -Copyright 2000-2011 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "resource.h" -#include "version.h" - -#define WZM_GOTOPAGE (WM_USER+1) -#define WZN_PAGECHANGING (WM_USER+1221) -#define WZN_CANCELCLICKED (WM_USER+1222) - -struct DbToolOptions -{ - TCHAR filename[MAX_PATH]; - TCHAR workingFilename[MAX_PATH]; - TCHAR outputFilename[MAX_PATH]; - TCHAR backupFilename[MAX_PATH]; - DATABASELINK *dblink; - MIDatabaseChecker* dbChecker; - HANDLE hOutFile; - DWORD error; - int bCheckOnly, bBackup, bAggressive; - int bEraseHistory, bMarkRead, bConvertUtf; -}; - -extern HINSTANCE hInst; -extern DbToolOptions opts; -extern HANDLE hEventRun, hEventAbort; -extern int errorCount; -extern LRESULT wizardResult; -extern bool bServiceMode, bLaunchMiranda, bShortMode, bAutoExit; - -int DoMyControlProcessing(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam, INT_PTR *bReturn); - -INT_PTR CALLBACK SelectDbDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK CleaningDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK ProgressDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK FileAccessDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK WizardDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK FinishedDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK WelcomeDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK OpenErrorDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); - -int OpenDatabase(HWND hdlg, INT iNextPage); - -#define STATUS_CLASSMASK 0x0f -void AddToStatus(int flags, const TCHAR* fmt, ...); -void SetProgressBar(int perThou); - diff --git a/plugins/DbChecker/src/fileaccess.cpp b/plugins/DbChecker/src/fileaccess.cpp index 8e4b650473..c189f429f6 100644 --- a/plugins/DbChecker/src/fileaccess.cpp +++ b/plugins/DbChecker/src/fileaccess.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "dbchecker.h" +#include "stdafx.h" INT_PTR CALLBACK FileAccessDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) { diff --git a/plugins/DbChecker/src/finished.cpp b/plugins/DbChecker/src/finished.cpp index 6fc21564d3..8984215d03 100644 --- a/plugins/DbChecker/src/finished.cpp +++ b/plugins/DbChecker/src/finished.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "dbchecker.h" +#include "stdafx.h" INT_PTR CALLBACK FinishedDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) { diff --git a/plugins/DbChecker/src/main.cpp b/plugins/DbChecker/src/main.cpp index 6b6c8603c0..c7f1149dde 100644 --- a/plugins/DbChecker/src/main.cpp +++ b/plugins/DbChecker/src/main.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "dbchecker.h" +#include "stdafx.h" HINSTANCE hInst; int hLangpack = 0; diff --git a/plugins/DbChecker/src/openerror.cpp b/plugins/DbChecker/src/openerror.cpp index a387249b5b..09cdb16243 100644 --- a/plugins/DbChecker/src/openerror.cpp +++ b/plugins/DbChecker/src/openerror.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "dbchecker.h" +#include "stdafx.h" INT_PTR CALLBACK OpenErrorDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) { diff --git a/plugins/DbChecker/src/progress.cpp b/plugins/DbChecker/src/progress.cpp index 9a20a9ca0c..d38b5627ba 100644 --- a/plugins/DbChecker/src/progress.cpp +++ b/plugins/DbChecker/src/progress.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "dbchecker.h" +#include "stdafx.h" #define WM_PROCESSINGDONE (WM_USER+1) diff --git a/plugins/DbChecker/src/selectdb.cpp b/plugins/DbChecker/src/selectdb.cpp index 56dd69c269..4eeef524d3 100644 --- a/plugins/DbChecker/src/selectdb.cpp +++ b/plugins/DbChecker/src/selectdb.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "dbchecker.h" +#include "stdafx.h" static bool CheckBroken(const TCHAR *ptszFullPath) { diff --git a/plugins/DbChecker/src/stdafx.cpp b/plugins/DbChecker/src/stdafx.cpp deleted file mode 100644 index cc1550b30d..0000000000 --- a/plugins/DbChecker/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "dbchecker.h" \ No newline at end of file diff --git a/plugins/DbChecker/src/stdafx.cxx b/plugins/DbChecker/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/DbChecker/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/plugins/DbChecker/src/stdafx.h b/plugins/DbChecker/src/stdafx.h new file mode 100644 index 0000000000..c2235a6c4c --- /dev/null +++ b/plugins/DbChecker/src/stdafx.h @@ -0,0 +1,79 @@ +/* +Miranda Database Tool +Copyright 2000-2011 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people +listed in contributors.txt. + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "resource.h" +#include "version.h" + +#define WZM_GOTOPAGE (WM_USER+1) +#define WZN_PAGECHANGING (WM_USER+1221) +#define WZN_CANCELCLICKED (WM_USER+1222) + +struct DbToolOptions +{ + TCHAR filename[MAX_PATH]; + TCHAR workingFilename[MAX_PATH]; + TCHAR outputFilename[MAX_PATH]; + TCHAR backupFilename[MAX_PATH]; + DATABASELINK *dblink; + MIDatabaseChecker* dbChecker; + HANDLE hOutFile; + DWORD error; + int bCheckOnly, bBackup, bAggressive; + int bEraseHistory, bMarkRead, bConvertUtf; +}; + +extern HINSTANCE hInst; +extern DbToolOptions opts; +extern HANDLE hEventRun, hEventAbort; +extern int errorCount; +extern LRESULT wizardResult; +extern bool bServiceMode, bLaunchMiranda, bShortMode, bAutoExit; + +int DoMyControlProcessing(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam, INT_PTR *bReturn); + +INT_PTR CALLBACK SelectDbDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK CleaningDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProgressDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK FileAccessDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK WizardDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK FinishedDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK WelcomeDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK OpenErrorDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); + +int OpenDatabase(HWND hdlg, INT iNextPage); + +#define STATUS_CLASSMASK 0x0f +void AddToStatus(int flags, const TCHAR* fmt, ...); +void SetProgressBar(int perThou); + diff --git a/plugins/DbChecker/src/welcome.cpp b/plugins/DbChecker/src/welcome.cpp index fde9b6f112..326f7b5c14 100644 --- a/plugins/DbChecker/src/welcome.cpp +++ b/plugins/DbChecker/src/welcome.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "dbchecker.h" +#include "stdafx.h" INT_PTR CALLBACK WelcomeDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) { diff --git a/plugins/DbChecker/src/wizard.cpp b/plugins/DbChecker/src/wizard.cpp index fa2d8951a7..e0d49c507d 100644 --- a/plugins/DbChecker/src/wizard.cpp +++ b/plugins/DbChecker/src/wizard.cpp @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "dbchecker.h" +#include "stdafx.h" static HFONT hBoldFont = NULL; static HENHMETAFILE hEmfHeaderLogo = NULL; diff --git a/plugins/DbChecker/src/worker.cpp b/plugins/DbChecker/src/worker.cpp index 6d7dd5fe14..91eb089ff1 100644 --- a/plugins/DbChecker/src/worker.cpp +++ b/plugins/DbChecker/src/worker.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "dbchecker.h" +#include "stdafx.h" void ProcessingDone(void); -- cgit v1.2.3