From 3afba76bceff37330f357154bcadc87b2273085a Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 27 Feb 2018 10:51:06 +0000 Subject: [PATCH] =?UTF-8?q?=20*=20modified=20Patch=20from=20#33018=20by=20?= =?UTF-8?q?=E9=9A=86=E5=8D=9A.=20Locale=20aware=20datefromstr=20functions.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: trunk@38358 - --- packages/rtl-objpas/src/inc/varutilh.inc | 5 +++++ packages/rtl-objpas/src/win/varutils.pp | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/rtl-objpas/src/inc/varutilh.inc b/packages/rtl-objpas/src/inc/varutilh.inc index ed68642e39..89a7c24054 100644 --- a/packages/rtl-objpas/src/inc/varutilh.inc +++ b/packages/rtl-objpas/src/inc/varutilh.inc @@ -73,6 +73,11 @@ function VariantToWideString(const VargSrc : TVarData) : WideString; function VariantToAnsiString(const VargSrc : TVarData) : AnsiString; function VariantToShortString(const VargSrc : TVarData) : ShortString; +{$ifdef MSWINDOWS} +function VarDateFromStr(const strIn: POleStr; alcid: DWORD; dwFlags: Longint; out dateOut: Double): HRESULT; stdcall; overload; +function VarDateFromStr(const strIn: POleStr; alcid: DWORD; dwFlags: Longint; out dateOut: TDateTime): HRESULT; stdcall; overload; +{$endif} + {Debug routines } procedure DumpVariant(const VSrc : Variant); procedure DumpVariant(const aName: string; const VSrc : Variant); diff --git a/packages/rtl-objpas/src/win/varutils.pp b/packages/rtl-objpas/src/win/varutils.pp index f46edf81de..8cff79a8b7 100644 --- a/packages/rtl-objpas/src/win/varutils.pp +++ b/packages/rtl-objpas/src/win/varutils.pp @@ -23,7 +23,7 @@ Unit varutils; Interface -Uses sysutils; +Uses sysutils,Types; {$i varutilh.inc} @@ -69,4 +69,7 @@ function SafeArrayRedim(psa: PVarArray; const NewBound: TVarArrayBound): HRESULT function SafeArrayUnaccessData(psa: PVarArray): HRESULT; stdcall;external oleaut; function SafeArrayUnlock(psa: PVarArray): HRESULT; stdcall;external oleaut; +function VarDateFromStr(const strIn: POleStr; alcid: DWORD; dwFlags: Longint; out dateOut: Double): HRESULT; stdcall; external oleaut; overload; +function VarDateFromStr(const strIn: POleStr; alcid: DWORD; dwFlags: Longint; out dateOut: TDateTime): HRESULT; stdcall; external oleaut; overload; + end.