From 1afba55381a1697d80daea5e9a12aeb567a92402 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 14 Dec 2013 16:56:48 +0000 Subject: - another atavism (DBVTF_DENYUNICODE) removed; - default text formatter for EVENTTYPE_AUTHREQUEST added git-svn-id: http://svn.miranda-ng.org/main/trunk@7208 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/delphi/m_core.inc | 1 - include/m_database.h | 5 +---- include/m_system_cpp.h | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc index 40298ee87b..9a5b054f6d 100644 --- a/include/delphi/m_core.inc +++ b/include/delphi/m_core.inc @@ -50,7 +50,6 @@ const DBVT_UTF8 = 253; // pszVal is valid DBVT_WCHAR = 252; // pszVal is valid DBVTF_VARIABLELENGTH = $80; // ? - DBVTF_DENYUNICODE = $10000; type PDBVARIANT = ^TDBVARIANT; diff --git a/include/m_database.h b/include/m_database.h index ddc32d1e7b..f5a8c1d7da 100644 --- a/include/m_database.h +++ b/include/m_database.h @@ -299,16 +299,13 @@ Retrieves the event's text wParam = (WPARAM)0 (unused) lParam = (LPARAM)(DBEVENTGETTEXT*)egt - pointer to structure with parameters egt->dbei should be the valid database event read via db_event_get() - egt->datatype = DBVT_WCHAR or DBVT_ASCIIZ or DBVT_TCHAR. If a caller wants to -suppress Unicode part of event in answer, add DBVTF_DENYUNICODE to this field. + egt->datatype = DBVT_WCHAR or DBVT_ASCIIZ or DBVT_TCHAR. egt->codepage is any valid codepage, CP_ACP by default. Function returns a pointer to a string in the required format. This string should be freed by a call of mir_free */ -#define DBVTF_DENYUNICODE 0x10000 - typedef struct { DBEVENTINFO* dbei; int datatype; diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h index d30c857713..2775f5220f 100644 --- a/include/m_system_cpp.h +++ b/include/m_system_cpp.h @@ -51,6 +51,7 @@ public: __inline T* operator->() const { return data; } __inline operator T*() const { return data; } __inline operator INT_PTR() const { return (INT_PTR)data; } + __inline T* detouch() { T *res = data; data = NULL; return res; } }; typedef mir_ptr ptrA; -- cgit v1.2.3