diff options
Diffstat (limited to 'src/mir_core')
88 files changed, 207 insertions, 101 deletions
diff --git a/src/mir_core/res/version.rc b/src/mir_core/res/version.rc index ea87e01885..9f1e2311b5 100644 --- a/src/mir_core/res/version.rc +++ b/src/mir_core/res/version.rc @@ -38,7 +38,7 @@ BEGIN VALUE "FileDescription", "Miranda NG\0"
VALUE "FileVersion", MIRANDA_VERSION_DISPLAY
VALUE "InternalName", "mir_core\0"
- VALUE "LegalCopyright", "Copyright © 2000-11 Miranda IM, 2012-24 Miranda NG team. This software is released under the terms of the GNU General Public License.\0"
+ VALUE "LegalCopyright", "Copyright © 2000-11 Miranda IM, 2012-25 Miranda NG team. This software is released under the terms of the GNU General Public License.\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mir_core.mir\0"
VALUE "PrivateBuild", "\0"
diff --git a/src/mir_core/src/Linux/CCtrlBase.cpp b/src/mir_core/src/Linux/CCtrlBase.cpp index e8d96cefd7..3f9dc91b0e 100644 --- a/src/mir_core/src/Linux/CCtrlBase.cpp +++ b/src/mir_core/src/Linux/CCtrlBase.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlButton.cpp b/src/mir_core/src/Linux/CCtrlButton.cpp index 336dcb4e09..f0d3a6c08a 100644 --- a/src/mir_core/src/Linux/CCtrlButton.cpp +++ b/src/mir_core/src/Linux/CCtrlButton.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlCheck.cpp b/src/mir_core/src/Linux/CCtrlCheck.cpp index 7284445251..89a57d314d 100644 --- a/src/mir_core/src/Linux/CCtrlCheck.cpp +++ b/src/mir_core/src/Linux/CCtrlCheck.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlClc.cpp b/src/mir_core/src/Linux/CCtrlClc.cpp index 1a8ffc20ac..ffad8bccbf 100644 --- a/src/mir_core/src/Linux/CCtrlClc.cpp +++ b/src/mir_core/src/Linux/CCtrlClc.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlColor.cpp b/src/mir_core/src/Linux/CCtrlColor.cpp index 441a4def0c..85b36a78c6 100644 --- a/src/mir_core/src/Linux/CCtrlColor.cpp +++ b/src/mir_core/src/Linux/CCtrlColor.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlCombo.cpp b/src/mir_core/src/Linux/CCtrlCombo.cpp index a655764771..7118bab58f 100644 --- a/src/mir_core/src/Linux/CCtrlCombo.cpp +++ b/src/mir_core/src/Linux/CCtrlCombo.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlData.cpp b/src/mir_core/src/Linux/CCtrlData.cpp index 6e21826542..0e4ea8cb37 100644 --- a/src/mir_core/src/Linux/CCtrlData.cpp +++ b/src/mir_core/src/Linux/CCtrlData.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlEdit.cpp b/src/mir_core/src/Linux/CCtrlEdit.cpp index 576806835f..cc399b4731 100644 --- a/src/mir_core/src/Linux/CCtrlEdit.cpp +++ b/src/mir_core/src/Linux/CCtrlEdit.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlHyperlink.cpp b/src/mir_core/src/Linux/CCtrlHyperlink.cpp index 6f6d526642..54331eaa23 100644 --- a/src/mir_core/src/Linux/CCtrlHyperlink.cpp +++ b/src/mir_core/src/Linux/CCtrlHyperlink.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlLabel.cpp b/src/mir_core/src/Linux/CCtrlLabel.cpp index 3d2834f311..644920c3d8 100644 --- a/src/mir_core/src/Linux/CCtrlLabel.cpp +++ b/src/mir_core/src/Linux/CCtrlLabel.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlListBox.cpp b/src/mir_core/src/Linux/CCtrlListBox.cpp index 3bc93093d2..b469229e82 100644 --- a/src/mir_core/src/Linux/CCtrlListBox.cpp +++ b/src/mir_core/src/Linux/CCtrlListBox.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlListView.cpp b/src/mir_core/src/Linux/CCtrlListView.cpp index ef22033eed..e1a7567f1b 100644 --- a/src/mir_core/src/Linux/CCtrlListView.cpp +++ b/src/mir_core/src/Linux/CCtrlListView.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlMButton.cpp b/src/mir_core/src/Linux/CCtrlMButton.cpp index e7a94999e6..a69c5f263c 100644 --- a/src/mir_core/src/Linux/CCtrlMButton.cpp +++ b/src/mir_core/src/Linux/CCtrlMButton.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlPages.cpp b/src/mir_core/src/Linux/CCtrlPages.cpp index 1202944610..6edb298b63 100644 --- a/src/mir_core/src/Linux/CCtrlPages.cpp +++ b/src/mir_core/src/Linux/CCtrlPages.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlSlider.cpp b/src/mir_core/src/Linux/CCtrlSlider.cpp index 11c2abf44e..fa7512ee6b 100644 --- a/src/mir_core/src/Linux/CCtrlSlider.cpp +++ b/src/mir_core/src/Linux/CCtrlSlider.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlSpin.cpp b/src/mir_core/src/Linux/CCtrlSpin.cpp index b527644141..645f6a176a 100644 --- a/src/mir_core/src/Linux/CCtrlSpin.cpp +++ b/src/mir_core/src/Linux/CCtrlSpin.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlTreeOpts.cpp b/src/mir_core/src/Linux/CCtrlTreeOpts.cpp index 0a5bee4824..28ed231abb 100644 --- a/src/mir_core/src/Linux/CCtrlTreeOpts.cpp +++ b/src/mir_core/src/Linux/CCtrlTreeOpts.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CCtrlTreeView.cpp b/src/mir_core/src/Linux/CCtrlTreeView.cpp index 0e1773c97d..5c8dd64a7b 100644 --- a/src/mir_core/src/Linux/CCtrlTreeView.cpp +++ b/src/mir_core/src/Linux/CCtrlTreeView.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CDbLink.cpp b/src/mir_core/src/Linux/CDbLink.cpp index 0f0dac1663..6ca3bbf5dd 100644 --- a/src/mir_core/src/Linux/CDbLink.cpp +++ b/src/mir_core/src/Linux/CDbLink.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CDlgBase.cpp b/src/mir_core/src/Linux/CDlgBase.cpp index 8dbb1affcd..73cb514584 100644 --- a/src/mir_core/src/Linux/CDlgBase.cpp +++ b/src/mir_core/src/Linux/CDlgBase.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CProgress.cpp b/src/mir_core/src/Linux/CProgress.cpp index 2e3f39e22b..fccc179048 100644 --- a/src/mir_core/src/Linux/CProgress.cpp +++ b/src/mir_core/src/Linux/CProgress.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CSplitter.cpp b/src/mir_core/src/Linux/CSplitter.cpp index d224e602ad..e14b5542e6 100644 --- a/src/mir_core/src/Linux/CSplitter.cpp +++ b/src/mir_core/src/Linux/CSplitter.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/CTimer.cpp b/src/mir_core/src/Linux/CTimer.cpp index d0789f2316..bf8982d1d6 100644 --- a/src/mir_core/src/Linux/CTimer.cpp +++ b/src/mir_core/src/Linux/CTimer.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/cctrldate.cpp b/src/mir_core/src/Linux/cctrldate.cpp index 0fadea9781..535b1a31c0 100644 --- a/src/mir_core/src/Linux/cctrldate.cpp +++ b/src/mir_core/src/Linux/cctrldate.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Linux/fileutil.cpp b/src/mir_core/src/Linux/fileutil.cpp index 1d9958bfd8..048bd575f6 100644 --- a/src/mir_core/src/Linux/fileutil.cpp +++ b/src/mir_core/src/Linux/fileutil.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-25 Miranda NG team (https://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
diff --git a/src/mir_core/src/Linux/strutil.cpp b/src/mir_core/src/Linux/strutil.cpp index 4d162ad7b9..52f837972a 100644 --- a/src/mir_core/src/Linux/strutil.cpp +++ b/src/mir_core/src/Linux/strutil.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-25 Miranda NG team (https://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
diff --git a/src/mir_core/src/Windows/CCtrlBase.cpp b/src/mir_core/src/Windows/CCtrlBase.cpp index 0c330b9032..946eb4989c 100644 --- a/src/mir_core/src/Windows/CCtrlBase.cpp +++ b/src/mir_core/src/Windows/CCtrlBase.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlButton.cpp b/src/mir_core/src/Windows/CCtrlButton.cpp index bd10e03cdf..2e7420ac05 100644 --- a/src/mir_core/src/Windows/CCtrlButton.cpp +++ b/src/mir_core/src/Windows/CCtrlButton.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlCheck.cpp b/src/mir_core/src/Windows/CCtrlCheck.cpp index feb3e550bd..6c9f145835 100644 --- a/src/mir_core/src/Windows/CCtrlCheck.cpp +++ b/src/mir_core/src/Windows/CCtrlCheck.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlClc.cpp b/src/mir_core/src/Windows/CCtrlClc.cpp index 1ce86a0ed5..bfd3a4d521 100644 --- a/src/mir_core/src/Windows/CCtrlClc.cpp +++ b/src/mir_core/src/Windows/CCtrlClc.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -117,9 +117,9 @@ int CCtrlClc::GetExtraColumns() const { return SendMessage(m_hwnd, CLM_GETEXTRACOLUMNS, 0, 0);
}
-uint8_t CCtrlClc::GetExtraImage(HANDLE hItem, int iColumn) const
+uint16_t CCtrlClc::GetExtraImage(HANDLE hItem, int iColumn) const
{
- return (uint8_t)(SendMessage(m_hwnd, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, 0)) & 0xFFFF);
+ return (uint16_t)(SendMessage(m_hwnd, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, 0)) & 0xFFFF);
}
HIMAGELIST CCtrlClc::GetExtraImageList() const
diff --git a/src/mir_core/src/Windows/CCtrlColor.cpp b/src/mir_core/src/Windows/CCtrlColor.cpp index 404311f860..f5e6b09e9a 100644 --- a/src/mir_core/src/Windows/CCtrlColor.cpp +++ b/src/mir_core/src/Windows/CCtrlColor.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlCombo.cpp b/src/mir_core/src/Windows/CCtrlCombo.cpp index c6d6294387..d13cb6500d 100644 --- a/src/mir_core/src/Windows/CCtrlCombo.cpp +++ b/src/mir_core/src/Windows/CCtrlCombo.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlData.cpp b/src/mir_core/src/Windows/CCtrlData.cpp index 6e21826542..0e4ea8cb37 100644 --- a/src/mir_core/src/Windows/CCtrlData.cpp +++ b/src/mir_core/src/Windows/CCtrlData.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlDate.cpp b/src/mir_core/src/Windows/CCtrlDate.cpp index 0fadea9781..535b1a31c0 100644 --- a/src/mir_core/src/Windows/CCtrlDate.cpp +++ b/src/mir_core/src/Windows/CCtrlDate.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlEdit.cpp b/src/mir_core/src/Windows/CCtrlEdit.cpp index f42db57188..9ca99f67bd 100644 --- a/src/mir_core/src/Windows/CCtrlEdit.cpp +++ b/src/mir_core/src/Windows/CCtrlEdit.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlHyperlink.cpp b/src/mir_core/src/Windows/CCtrlHyperlink.cpp index 6f6d526642..54331eaa23 100644 --- a/src/mir_core/src/Windows/CCtrlHyperlink.cpp +++ b/src/mir_core/src/Windows/CCtrlHyperlink.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlLabel.cpp b/src/mir_core/src/Windows/CCtrlLabel.cpp index 62f7a03e27..1a504e6845 100644 --- a/src/mir_core/src/Windows/CCtrlLabel.cpp +++ b/src/mir_core/src/Windows/CCtrlLabel.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlListBox.cpp b/src/mir_core/src/Windows/CCtrlListBox.cpp index 3bc93093d2..b469229e82 100644 --- a/src/mir_core/src/Windows/CCtrlListBox.cpp +++ b/src/mir_core/src/Windows/CCtrlListBox.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlListView.cpp b/src/mir_core/src/Windows/CCtrlListView.cpp index 51919408bb..34248ff0e6 100644 --- a/src/mir_core/src/Windows/CCtrlListView.cpp +++ b/src/mir_core/src/Windows/CCtrlListView.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlMButton.cpp b/src/mir_core/src/Windows/CCtrlMButton.cpp index ebe6042838..25ba53f15d 100644 --- a/src/mir_core/src/Windows/CCtrlMButton.cpp +++ b/src/mir_core/src/Windows/CCtrlMButton.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlPages.cpp b/src/mir_core/src/Windows/CCtrlPages.cpp index f8304a3d51..c523586980 100644 --- a/src/mir_core/src/Windows/CCtrlPages.cpp +++ b/src/mir_core/src/Windows/CCtrlPages.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlRichEdit.cpp b/src/mir_core/src/Windows/CCtrlRichEdit.cpp index ae58f516cf..fcdf08325f 100644 --- a/src/mir_core/src/Windows/CCtrlRichEdit.cpp +++ b/src/mir_core/src/Windows/CCtrlRichEdit.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlSlider.cpp b/src/mir_core/src/Windows/CCtrlSlider.cpp index e81b0cab1f..ef6d0f557e 100644 --- a/src/mir_core/src/Windows/CCtrlSlider.cpp +++ b/src/mir_core/src/Windows/CCtrlSlider.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlSpin.cpp b/src/mir_core/src/Windows/CCtrlSpin.cpp index 38c3616a88..905fe50a88 100644 --- a/src/mir_core/src/Windows/CCtrlSpin.cpp +++ b/src/mir_core/src/Windows/CCtrlSpin.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlTreeOpts.cpp b/src/mir_core/src/Windows/CCtrlTreeOpts.cpp index cc37285077..8b0f0a976b 100644 --- a/src/mir_core/src/Windows/CCtrlTreeOpts.cpp +++ b/src/mir_core/src/Windows/CCtrlTreeOpts.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CCtrlTreeView.cpp b/src/mir_core/src/Windows/CCtrlTreeView.cpp index 4b3a924d3e..0cf38694c4 100644 --- a/src/mir_core/src/Windows/CCtrlTreeView.cpp +++ b/src/mir_core/src/Windows/CCtrlTreeView.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CDbLink.cpp b/src/mir_core/src/Windows/CDbLink.cpp index 0f0dac1663..6ca3bbf5dd 100644 --- a/src/mir_core/src/Windows/CDbLink.cpp +++ b/src/mir_core/src/Windows/CDbLink.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CDlgBase.cpp b/src/mir_core/src/Windows/CDlgBase.cpp index b0f184acf3..1cafd83310 100644 --- a/src/mir_core/src/Windows/CDlgBase.cpp +++ b/src/mir_core/src/Windows/CDlgBase.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CProgress.cpp b/src/mir_core/src/Windows/CProgress.cpp index 2e3f39e22b..fccc179048 100644 --- a/src/mir_core/src/Windows/CProgress.cpp +++ b/src/mir_core/src/Windows/CProgress.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CSplitter.cpp b/src/mir_core/src/Windows/CSplitter.cpp index fc8ee7e561..2d3bc24651 100644 --- a/src/mir_core/src/Windows/CSplitter.cpp +++ b/src/mir_core/src/Windows/CSplitter.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/CTimer.cpp b/src/mir_core/src/Windows/CTimer.cpp index a2992e21b4..b7b026869c 100644 --- a/src/mir_core/src/Windows/CTimer.cpp +++ b/src/mir_core/src/Windows/CTimer.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (c) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/src/Windows/clipboard.cpp b/src/mir_core/src/Windows/clipboard.cpp index 425ed67bdf..cf71e9ddc6 100644 --- a/src/mir_core/src/Windows/clipboard.cpp +++ b/src/mir_core/src/Windows/clipboard.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org), +Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org), Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/mir_core/src/Windows/cmdline.cpp b/src/mir_core/src/Windows/cmdline.cpp index 81dd4bd69d..6116487f20 100644 --- a/src/mir_core/src/Windows/cmdline.cpp +++ b/src/mir_core/src/Windows/cmdline.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team,
+Copyright (C) 2012-25 Miranda NG team,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/Windows/colourpicker.cpp b/src/mir_core/src/Windows/colourpicker.cpp index e7d612139c..7e94b19729 100644 --- a/src/mir_core/src/Windows/colourpicker.cpp +++ b/src/mir_core/src/Windows/colourpicker.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/Windows/diatheme.cpp b/src/mir_core/src/Windows/diatheme.cpp index e525a32cd6..9e31eb3836 100644 --- a/src/mir_core/src/Windows/diatheme.cpp +++ b/src/mir_core/src/Windows/diatheme.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-25 Miranda NG team (https://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
diff --git a/src/mir_core/src/Windows/fileutil.cpp b/src/mir_core/src/Windows/fileutil.cpp index 595eb14d2e..84b047265d 100644 --- a/src/mir_core/src/Windows/fileutil.cpp +++ b/src/mir_core/src/Windows/fileutil.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-25 Miranda NG team (https://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
diff --git a/src/mir_core/src/Windows/hyperlink.cpp b/src/mir_core/src/Windows/hyperlink.cpp index aac486c113..bb5655cdb0 100644 --- a/src/mir_core/src/Windows/hyperlink.cpp +++ b/src/mir_core/src/Windows/hyperlink.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/Windows/icons.cpp b/src/mir_core/src/Windows/icons.cpp index babca11dec..1ed660cba9 100644 --- a/src/mir_core/src/Windows/icons.cpp +++ b/src/mir_core/src/Windows/icons.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team,
+Copyright (C) 2012-25 Miranda NG team,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/Windows/langpack.cpp b/src/mir_core/src/Windows/langpack.cpp index 1e4f5efa40..e9aa166bf4 100644 --- a/src/mir_core/src/Windows/langpack.cpp +++ b/src/mir_core/src/Windows/langpack.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/Windows/locks.cpp b/src/mir_core/src/Windows/locks.cpp index 5aaa5765d4..65f666c951 100644 --- a/src/mir_core/src/Windows/locks.cpp +++ b/src/mir_core/src/Windows/locks.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/Windows/miranda.cpp b/src/mir_core/src/Windows/miranda.cpp index 881b380dea..0e4bd9d344 100644 --- a/src/mir_core/src/Windows/miranda.cpp +++ b/src/mir_core/src/Windows/miranda.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -39,7 +39,7 @@ void InitHyperlink(); void InitTimeZones();
void InitWinver();
-HINSTANCE g_hInst = nullptr;
+HINSTANCE g_hInst = nullptr, g_hNtdll = GetModuleHandleA("ntdll.dll");
HCURSOR g_hCursorNS, g_hCursorWE;
HANDLE hThreadQueueEmpty;
diff --git a/src/mir_core/src/Windows/openurl.cpp b/src/mir_core/src/Windows/openurl.cpp index 11b2b36a4b..90b8da369c 100644 --- a/src/mir_core/src/Windows/openurl.cpp +++ b/src/mir_core/src/Windows/openurl.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/Windows/path.cpp b/src/mir_core/src/Windows/path.cpp index 5baba13f37..a9d95d9dd1 100644 --- a/src/mir_core/src/Windows/path.cpp +++ b/src/mir_core/src/Windows/path.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/Windows/resizer.cpp b/src/mir_core/src/Windows/resizer.cpp index 338b642d82..2cc98e4464 100644 --- a/src/mir_core/src/Windows/resizer.cpp +++ b/src/mir_core/src/Windows/resizer.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/Windows/shareable.cpp b/src/mir_core/src/Windows/shareable.cpp index 7e0a56981e..d358d06d27 100644 --- a/src/mir_core/src/Windows/shareable.cpp +++ b/src/mir_core/src/Windows/shareable.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org), +Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org), Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/mir_core/src/Windows/subclass.cpp b/src/mir_core/src/Windows/subclass.cpp index 67e50a46a3..26daeccb5a 100644 --- a/src/mir_core/src/Windows/subclass.cpp +++ b/src/mir_core/src/Windows/subclass.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-25 Miranda NG team (https://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
diff --git a/src/mir_core/src/Windows/threads.cpp b/src/mir_core/src/Windows/threads.cpp index c3cea1bdaf..898c6c0455 100644 --- a/src/mir_core/src/Windows/threads.cpp +++ b/src/mir_core/src/Windows/threads.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -305,7 +305,7 @@ typedef LONG (WINAPI *pNtQIT)(HANDLE, LONG, PVOID, ULONG, PULONG); static void* GetCurrentThreadEntryPoint()
{
- pNtQIT NtQueryInformationThread = (pNtQIT)GetProcAddress(GetModuleHandle(L"ntdll.dll"), "NtQueryInformationThread");
+ pNtQIT NtQueryInformationThread = (pNtQIT)GetProcAddress(g_hNtdll, "NtQueryInformationThread");
if (NtQueryInformationThread == nullptr)
return nullptr;
diff --git a/src/mir_core/src/Windows/timezones.cpp b/src/mir_core/src/Windows/timezones.cpp index f11ad48bb6..6bf31a0db7 100644 --- a/src/mir_core/src/Windows/timezones.cpp +++ b/src/mir_core/src/Windows/timezones.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/Windows/windowlist.cpp b/src/mir_core/src/Windows/windowlist.cpp index 37de1be5fd..03491b514f 100644 --- a/src/mir_core/src/Windows/windowlist.cpp +++ b/src/mir_core/src/Windows/windowlist.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/Windows/winutil.cpp b/src/mir_core/src/Windows/winutil.cpp index cdc0f58251..c6b22b4363 100644 --- a/src/mir_core/src/Windows/winutil.cpp +++ b/src/mir_core/src/Windows/winutil.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/Windows/winver.cpp b/src/mir_core/src/Windows/winver.cpp index 27a76dbb2e..b3fadf2043 100644 --- a/src/mir_core/src/Windows/winver.cpp +++ b/src/mir_core/src/Windows/winver.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-25 Miranda NG team (https://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
@@ -30,11 +30,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #endif
static int dwWinVer;
+static bool bIsWine = false;
void InitWinver()
{
uint32_t dwVer = LOWORD(GetVersion());
dwWinVer = MAKEWORD(HIBYTE(dwVer), LOBYTE(dwVer));
+ bIsWine = GetProcAddress(g_hNtdll, "wine_get_version") != 0;
}
MIR_CORE_DLL(BOOL) IsWinVerVistaPlus()
@@ -62,17 +64,21 @@ MIR_CORE_DLL(BOOL) IsWinVer10Plus() return dwWinVer >= _WIN32_WINNT_WIN10;
}
-MIR_CORE_DLL(BOOL) IsFullScreen()
+MIR_CORE_DLL(BOOL) IsWine()
{
- RECT rcScreen = { 0 };
+ return bIsWine;
+}
+MIR_CORE_DLL(BOOL) IsFullScreen()
+{
+ RECT rcScreen = {};
rcScreen.right = GetSystemMetrics(SM_CXSCREEN);
rcScreen.bottom = GetSystemMetrics(SM_CYSCREEN);
HMONITOR hMon = MonitorFromWindow(GetForegroundWindow(), MONITOR_DEFAULTTONEAREST);
MONITORINFO mi;
mi.cbSize = sizeof(mi);
- if (GetMonitorInfo(hMon, &mi))
+ if (GetMonitorInfoW(hMon, &mi))
rcScreen = mi.rcMonitor;
HWND hWndDesktop = GetDesktopWindow();
@@ -362,11 +368,8 @@ MIR_CORE_DLL(BOOL) OS_GetDisplayString(char *buf, size_t bufSize) ret.AppendFormat(" (build %d)", osvi.dwBuildNumber);
- HMODULE hNtDll = GetModuleHandleA("ntdll.dll");
- if (WGV wine_get_version = (WGV)GetProcAddress(hNtDll, "wine_get_version"))
- {
+ if (WGV wine_get_version = (WGV)GetProcAddress(g_hNtdll, "wine_get_version"))
ret.AppendFormat(" (Wine %s)", wine_get_version());
- }
mir_strncpy(buf, ret, bufSize);
return true;
diff --git a/src/mir_core/src/binbuffer.cpp b/src/mir_core/src/binbuffer.cpp index 50cffac8b4..c040e6f11a 100644 --- a/src/mir_core/src/binbuffer.cpp +++ b/src/mir_core/src/binbuffer.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-25 Miranda NG team (https://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
@@ -168,3 +168,29 @@ void MBinBuffer::remove(size_t sz) p->size -= (unsigned)sz;
}
}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+MBinBuffer& MBinBuffer::operator<<(uint8_t val)
+{
+ append(&val, sizeof(val));
+ return *this;
+}
+
+MBinBuffer& MBinBuffer::operator<<(uint16_t val)
+{
+ append(&val, sizeof(val));
+ return *this;
+}
+
+MBinBuffer& MBinBuffer::operator<<(uint32_t val)
+{
+ append(&val, sizeof(val));
+ return *this;
+}
+
+MBinBuffer& MBinBuffer::operator<<(uint64_t val)
+{
+ append(&val, sizeof(val));
+ return *this;
+}
diff --git a/src/mir_core/src/bitmaps.cpp b/src/mir_core/src/bitmaps.cpp index 8054f452c0..406aae00b6 100644 --- a/src/mir_core/src/bitmaps.cpp +++ b/src/mir_core/src/bitmaps.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team,
+Copyright (C) 2012-25 Miranda NG team,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp index b80528320a..5a6811ab82 100644 --- a/src/mir_core/src/db.cpp +++ b/src/mir_core/src/db.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -531,6 +531,14 @@ MIR_CORE_DLL(MEVENT) db_event_getById(const char *szModule, const char *szId) return (g_pCurrDb == nullptr) ? 0 : g_pCurrDb->GetEventById(szModule, szId);
}
+MIR_CORE_DLL(int) db_event_setJson(MEVENT hDbEvent, const char *pBlob)
+{
+ if (g_pCurrDb == nullptr)
+ return 1;
+
+ return g_pCurrDb->SetEventJson(hDbEvent, pBlob);
+}
+
MIR_CORE_DLL(int) db_event_setJson(MEVENT hDbEvent, const char *szSetting, DBVARIANT *dbv)
{
if (g_pCurrDb == nullptr)
@@ -545,6 +553,10 @@ MIR_CORE_DLL(int) db_event_setJson(MEVENT hDbEvent, const char *szSetting, DBVAR auto &json = dbei.setJson();
+ auto n = json.find(szSetting);
+ if (n != json.end())
+ json.erase(n);
+
switch (dbv->type) {
case DBVT_BYTE: json << INT_PARAM(szSetting, dbv->bVal); break;
case DBVT_WORD: json << INT_PARAM(szSetting, dbv->wVal); break;
@@ -561,7 +573,7 @@ MIR_CORE_DLL(int) db_event_setJson(MEVENT hDbEvent, const char *szSetting, DBVAR }
dbei.flushJson();
- return db_event_edit(hDbEvent, &dbei);
+ return g_pCurrDb->SetEventJson(hDbEvent, dbei.pBlob);
}
MIR_CORE_DLL(int) db_event_updateId(MEVENT hDbEvent, const char *szId)
diff --git a/src/mir_core/src/http.cpp b/src/mir_core/src/http.cpp index 6ee903a939..085eb971bc 100644 --- a/src/mir_core/src/http.cpp +++ b/src/mir_core/src/http.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-25 Miranda NG team (https://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
diff --git a/src/mir_core/src/lists.cpp b/src/mir_core/src/lists.cpp index 0862b35b7e..d63337068c 100644 --- a/src/mir_core/src/lists.cpp +++ b/src/mir_core/src/lists.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/logger.cpp b/src/mir_core/src/logger.cpp index a9995fab06..5bb0126b11 100644 --- a/src/mir_core/src/logger.cpp +++ b/src/mir_core/src/logger.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/memory.cpp b/src/mir_core/src/memory.cpp index aa66ec2cfd..ae4ad3cd89 100644 --- a/src/mir_core/src/memory.cpp +++ b/src/mir_core/src/memory.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index ab3a5ec23d..f0ce0a70db 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -606,7 +606,7 @@ mir_wstrcmpi @280 ?GetExpand@CCtrlClc@@QBEIPAX@Z @790 NONAME
?GetExtendedListViewStyle@CCtrlListView@@QBEIXZ @791 NONAME
?GetExtraColumns@CCtrlClc@@QBEHXZ @792 NONAME
-?GetExtraImage@CCtrlClc@@QBEEPAXH@Z @793 NONAME
+?GetExtraImage@CCtrlClc@@QBEGPAXH@Z @793 NONAME
?GetExtraImageList@CCtrlClc@@QBEPAU_IMAGELIST@@XZ @794 NONAME
?GetFirstVisible@CCtrlTreeView@@QBEPAU_TREEITEM@@XZ @795 NONAME
?GetFont@CCtrlClc@@QBEPAUHFONT__@@H@Z @796 NONAME
@@ -1583,3 +1583,10 @@ _db_event_delivered@8 @1806 NONAME ??0MClipUtf8@@QAE@PBD@Z @1808 NONAME
??_7MClipUtf8@@6B@ @1809 NONAME
?Copy@MClipUtf8@@UBEXXZ @1810 NONAME
+??6MBinBuffer@@QAEAAV0@E@Z @1811 NONAME
+??6MBinBuffer@@QAEAAV0@G@Z @1812 NONAME
+??6MBinBuffer@@QAEAAV0@I@Z @1813 NONAME
+??6MBinBuffer@@QAEAAV0@_K@Z @1814 NONAME
+_Utils_IsoToUnixTime@4 @1815 NONAME
+?db_event_setJson@@YGHIPBD@Z @1816 NONAME
+_IsWine@0 @1817 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 8cb06c15f1..935c5d83cb 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -606,7 +606,7 @@ mir_wstrcmpi @280 ?GetExpand@CCtrlClc@@QEBAIPEAX@Z @790 NONAME
?GetExtendedListViewStyle@CCtrlListView@@QEBAIXZ @791 NONAME
?GetExtraColumns@CCtrlClc@@QEBAHXZ @792 NONAME
-?GetExtraImage@CCtrlClc@@QEBAEPEAXH@Z @793 NONAME
+?GetExtraImage@CCtrlClc@@QEBAGPEAXH@Z @793 NONAME
?GetExtraImageList@CCtrlClc@@QEBAPEAU_IMAGELIST@@XZ @794 NONAME
?GetFirstVisible@CCtrlTreeView@@QEBAPEAU_TREEITEM@@XZ @795 NONAME
?GetFont@CCtrlClc@@QEBAPEAUHFONT__@@H@Z @796 NONAME
@@ -1583,3 +1583,10 @@ db_event_delivered @1806 NONAME ??0MClipUtf8@@QEAA@PEBD@Z @1808 NONAME
??_7MClipUtf8@@6B@ @1809 NONAME
?Copy@MClipUtf8@@UEBAXXZ @1810 NONAME
+??6MBinBuffer@@QEAAAEAV0@E@Z @1811 NONAME
+??6MBinBuffer@@QEAAAEAV0@G@Z @1812 NONAME
+??6MBinBuffer@@QEAAAEAV0@I@Z @1813 NONAME
+??6MBinBuffer@@QEAAAEAV0@_K@Z @1814 NONAME
+Utils_IsoToUnixTime @1815 NONAME
+?db_event_setJson@@YAHIPEBD@Z @1816 NONAME
+IsWine @1817 NONAME
diff --git a/src/mir_core/src/miranda.h b/src/mir_core/src/miranda.h index 295033a429..cedf24e528 100644 --- a/src/mir_core/src/miranda.h +++ b/src/mir_core/src/miranda.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -31,7 +31,7 @@ void DestroyModularEngine(void); int InitPathUtils(void);
-extern HINSTANCE g_hInst;
+extern HINSTANCE g_hInst, g_hNtdll;
extern HWND hAPCWindow;
extern HANDLE hThreadQueueEmpty;
extern HCURSOR g_hCursorNS, g_hCursorWE;
diff --git a/src/mir_core/src/modules.cpp b/src/mir_core/src/modules.cpp index f0f8485468..f41ae0bfac 100644 --- a/src/mir_core/src/modules.cpp +++ b/src/mir_core/src/modules.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/mstring.cpp b/src/mir_core/src/mstring.cpp index bc4b2f83bb..71994ff29f 100644 --- a/src/mir_core/src/mstring.cpp +++ b/src/mir_core/src/mstring.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/stdafx.cxx b/src/mir_core/src/stdafx.cxx index 87b7477097..72e87c2758 100644 --- a/src/mir_core/src/stdafx.cxx +++ b/src/mir_core/src/stdafx.cxx @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-25 Miranda NG team (https://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
diff --git a/src/mir_core/src/stdafx.h b/src/mir_core/src/stdafx.h index b512c6cc7e..bb818438e3 100644 --- a/src/mir_core/src/stdafx.h +++ b/src/mir_core/src/stdafx.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/utf.cpp b/src/mir_core/src/utf.cpp index dcfe60f9b8..180ff3ba15 100644 --- a/src/mir_core/src/utf.cpp +++ b/src/mir_core/src/utf.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/utils.cpp b/src/mir_core/src/utils.cpp index 7fb0f96c40..d6f953fde0 100644 --- a/src/mir_core/src/utils.cpp +++ b/src/mir_core/src/utils.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-24 Miranda NG team (https://miranda-ng.org),
+Copyright (C) 2012-25 Miranda NG team (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -584,3 +584,54 @@ MIR_CORE_DLL(bool) Utils_IsRtl(const wchar_t *pszwText) return false;
}
+
+MIR_CORE_DLL(time_t) Utils_IsoToUnixTime(const char *stamp)
+{
+ wchar_t date[9];
+ int i, y;
+
+ if (stamp == nullptr)
+ return 0;
+
+ auto *p = stamp;
+
+ // Get the date part
+ for (i = 0; *p != '\0' && i < 8 && isdigit(*p); p++, i++)
+ date[i] = *p;
+
+ // Parse year
+ if (i == 6) {
+ // 2-digit year (1970-2069)
+ y = (date[0] - '0') * 10 + (date[1] - '0');
+ if (y < 70) y += 100;
+ }
+ else if (i == 8) {
+ // 4-digit year
+ y = (date[0] - '0') * 1000 + (date[1] - '0') * 100 + (date[2] - '0') * 10 + date[3] - '0';
+ y -= 1900;
+ }
+ else return 0;
+
+ struct tm timestamp;
+ timestamp.tm_year = y;
+
+ // Parse month
+ timestamp.tm_mon = (date[i - 4] - '0') * 10 + date[i - 3] - '0' - 1;
+
+ // Parse date
+ timestamp.tm_mday = (date[i - 2] - '0') * 10 + date[i - 1] - '0';
+
+ // Skip any date/time delimiter
+ for (; *p != '\0' && !isdigit(*p); p++);
+
+ // Parse time
+ if (sscanf(p, "%d:%d:%d", ×tamp.tm_hour, ×tamp.tm_min, ×tamp.tm_sec) != 3)
+ return (time_t)0;
+
+ timestamp.tm_isdst = 0; // DST is already present in _timezone below
+ time_t t = mktime(×tamp);
+
+ _tzset();
+ t -= _timezone;
+ return (t >= 0) ? t : 0;
+}
|