diff options
author | George Hazan <ghazan@miranda.im> | 2018-03-10 19:10:48 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2018-03-10 19:10:48 +0300 |
commit | 74e6676bf5bf17dac4632d3c4bf95f4df19458f7 (patch) | |
tree | 3749790a9e3f2dd6278e944451e924a5c396756b /plugins | |
parent | 20c605478b56c89841adfc5ccb2d81758fda5745 (diff) |
a couple of fixes for the built-in sqlite import
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Import/src/dbrw/dbintf.cpp | 4 | ||||
-rw-r--r-- | plugins/Import/src/dbrw/dbintf.h | 2 | ||||
-rw-r--r-- | plugins/Import/src/dbrw/dbsql.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Import/src/dbrw/dbintf.cpp b/plugins/Import/src/dbrw/dbintf.cpp index 04e7734d42..137b79aaa9 100644 --- a/plugins/Import/src/dbrw/dbintf.cpp +++ b/plugins/Import/src/dbrw/dbintf.cpp @@ -74,12 +74,12 @@ STDMETHODIMP_(void) CDbxSQLite::SetCacheSafetyMode(BOOL safeMode) sql_exec(m_sqlite, "PRAGMA synchronous = OFF;"); } -STDMETHODIMP_(BOOL) CDbxSQLite::MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub) +STDMETHODIMP_(BOOL) CDbxSQLite::MetaMergeHistory(DBCachedContact*, DBCachedContact*) { return FALSE; } -STDMETHODIMP_(BOOL) CDbxSQLite::MetaSplitHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub) +STDMETHODIMP_(BOOL) CDbxSQLite::MetaSplitHistory(DBCachedContact*, DBCachedContact*) { return FALSE; }
\ No newline at end of file diff --git a/plugins/Import/src/dbrw/dbintf.h b/plugins/Import/src/dbrw/dbintf.h index a9a33f9f93..3f88a6cc85 100644 --- a/plugins/Import/src/dbrw/dbintf.h +++ b/plugins/Import/src/dbrw/dbintf.h @@ -105,7 +105,7 @@ private: void sql_prepare_add(char **text, sqlite3_stmt **stmts, int len); void sql_prepare_statements(); - static void CALLBACK sql_server_sync_apc(DWORD dwParam); + static void CALLBACK sql_server_sync_apc(UINT_PTR dwParam); void sql_server_sync(TSqlMessage *msg); int sql_step(sqlite3_stmt *stmt); int sql_reset(sqlite3_stmt *stmt); diff --git a/plugins/Import/src/dbrw/dbsql.cpp b/plugins/Import/src/dbrw/dbsql.cpp index 4d49471e8e..01f895fc53 100644 --- a/plugins/Import/src/dbrw/dbsql.cpp +++ b/plugins/Import/src/dbrw/dbsql.cpp @@ -50,7 +50,7 @@ void CDbxSQLite::sql_prepare_statements() sql_prepare(m_sqlite, sql_prepare_text[i], sql_prepare_stmt[i]); } -void CALLBACK CDbxSQLite::sql_server_sync_apc(DWORD dwParam) +void CALLBACK CDbxSQLite::sql_server_sync_apc(UINT_PTR dwParam) { TSqlMessage *msg = (TSqlMessage*)dwParam; @@ -88,7 +88,7 @@ void CALLBACK CDbxSQLite::sql_server_sync_apc(DWORD dwParam) void CDbxSQLite::sql_server_sync(TSqlMessage *msg) { msg->hDoneEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - sql_server_sync_apc((DWORD)msg); + sql_server_sync_apc((UINT_PTR)msg); PostMessage(m_hAPCWindow, WM_NULL, 0, 0); WaitForSingleObject(msg->hDoneEvent, INFINITE); CloseHandle(msg->hDoneEvent); |