diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-20 14:41:18 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-20 14:41:18 +0000 |
| commit | 34d205b40b9adab0f10ad62bf08e6999fe339348 (patch) | |
| tree | 08c035d6ac90e3e78a1e4411bdfe414b88a65f5d /plugins | |
| parent | 04f4e2acfbc82946ca3def654214c08071a87359 (diff) | |
MS_DB_TIME_* removed from pascal headers too
git-svn-id: http://svn.miranda-ng.org/main/trunk@14289 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/HistoryPlusPlus/hpp_events.pas | 3 | ||||
| -rw-r--r-- | plugins/ImportTXT/BqhfIP.inc | 2 | ||||
| -rw-r--r-- | plugins/ImportTXT/General.pas | 6 | ||||
| -rw-r--r-- | plugins/ImportTXT/ImportTU.pas | 4 | ||||
| -rw-r--r-- | plugins/QuickSearch/i_ok.inc | 6 |
5 files changed, 6 insertions, 15 deletions
diff --git a/plugins/HistoryPlusPlus/hpp_events.pas b/plugins/HistoryPlusPlus/hpp_events.pas index 401822797d..848008a37e 100644 --- a/plugins/HistoryPlusPlus/hpp_events.pas +++ b/plugins/HistoryPlusPlus/hpp_events.pas @@ -236,8 +236,7 @@ const // Miranda timestamp to TDateTime
function TimestampToDateTime(const Timestamp: DWord): TDateTime;
begin
- Result := UnixTimeStart +
- CallService(MS_DB_TIME_TIMESTAMPTOLOCAL,WPARAM(Timestamp),0) / SecondsPerDay;
+ Result := UnixTimeStart + TimeZone_ToLocal(Timestamp) / SecondsPerDay;
end;
// should probably add function param to use
diff --git a/plugins/ImportTXT/BqhfIP.inc b/plugins/ImportTXT/BqhfIP.inc index 91160dd1cc..aa7a9a8758 100644 --- a/plugins/ImportTXT/BqhfIP.inc +++ b/plugins/ImportTXT/BqhfIP.inc @@ -96,7 +96,7 @@ begin dbei.szModule := PAnsiChar(proto);
dbei.timestamp := RLInteger(pt + i + $12);
dbei.timestamp := dbei.timestamp -
- (Cardinal(CallService(MS_DB_TIME_TIMESTAMPTOLOCAL, dbei.timestamp, 0)) - dbei.timestamp); // приводим к GMT
+ (Cardinal(TimeZone_ToLocal(dbei.timestamp)) - dbei.timestamp); // приводим к GMT
if PByte(pt + i + $1A)^ = $00 then
dbei.flags := DBEF_READ or DBEF_UTF
else
diff --git a/plugins/ImportTXT/General.pas b/plugins/ImportTXT/General.pas index e6bac9318b..3fedce5df0 100644 --- a/plugins/ImportTXT/General.pas +++ b/plugins/ImportTXT/General.pas @@ -476,14 +476,10 @@ end; function TimeStampToWStr(ts: DWORD): WideString;
var
- dbtts: TDBTIMETOSTRING;
s: WideString;
begin
SetLength(s, 20);
- dbtts.szFormat.w := 'd s';
- dbtts.szDest.w := PWideChar(s);
- dbtts.cbDest := 20;
- CallService(MS_DB_TIME_TIMESTAMPTOSTRINGT, ts, int(@dbtts));
+ TimeZone_ToStringW(ts, 'd s', PWideChar(s), 20);
result := s;
end;
diff --git a/plugins/ImportTXT/ImportTU.pas b/plugins/ImportTXT/ImportTU.pas index b81a21167d..2fac66ad55 100644 --- a/plugins/ImportTXT/ImportTU.pas +++ b/plugins/ImportTXT/ImportTU.pas @@ -60,7 +60,7 @@ begin DT := (D * 24 * 60 * 60) + (Hour * 3600 + Min * 60 + Sec);
// Приводим к GMT...судя по всему миранда хранит таймштампы в GMT
if toGMT then
- Result := DT - (Longword(CallService(MS_DB_TIME_TIMESTAMPTOLOCAL, DT, 0)) - DT)
+ Result := DT - (Longword(TimeZone_ToLocal(DT)) - DT)
else
Result := DT;
end;
@@ -69,7 +69,7 @@ function DateTimeToTimeStamp(const DateTime: TDateTime; toGMT: Boolean = true): begin
Result := Round((DateTime - UnixDateDelta) * SecsPerDay);
if toGMT then
- Result := Result - (Dword(CallService(MS_DB_TIME_TIMESTAMPTOLOCAL, Result, 0)) - Result);
+ Result := Result - (Dword(TimeZone_ToLocal(Result)) - Result);
end;
function ChangeUnicode(str: PWideChar): PWideChar;
diff --git a/plugins/QuickSearch/i_ok.inc b/plugins/QuickSearch/i_ok.inc index 7ac8db8f70..51e756aacd 100644 --- a/plugins/QuickSearch/i_ok.inc +++ b/plugins/QuickSearch/i_ok.inc @@ -172,12 +172,8 @@ end; function TimeToStrW(data:dword):PWideChar;
var
strdatetime:array [0..63] of WideChar;
- dbtts:TDBTIMETOSTRING;
begin
- dbtts.cbDest :=Length(strdatetime);
- dbtts.szDest.w :=@strdatetime;
- dbtts.szFormat.w:='d - t';
- CallService(MS_DB_TIME_TIMESTAMPTOSTRINGT,data,lparam(@dbtts));
+ TimeZone_ToStringW(data, 'd - t', @strdatetime, Length(strdatetime));
StrDupW(result,strdatetime);
end;
|