diff options
| author | George Hazan <ghazan@miranda.im> | 2021-03-28 20:38:45 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-03-28 20:38:45 +0300 |
| commit | 0eee94c3a780e0e9f87b26145b557a99e84d25e0 (patch) | |
| tree | 58287520f0c2284550764d5f66bbf0b7e5ded155 | |
| parent | 96171674a3c346419d490705d4e3b4e53d2f8ae4 (diff) | |
21 years after Win2k release we don't need win2k.h - everything we need is included into minimum Windows SDK 7.1
133 files changed, 56 insertions, 705 deletions
diff --git a/include/win2k.h b/include/win2k.h deleted file mode 100644 index 69cd94a263..0000000000 --- a/include/win2k.h +++ /dev/null @@ -1,550 +0,0 @@ -/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (C) 2012-21 Miranda NG team (https://miranda-ng.org)
-Copyright (c) 2000-08 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
-listed in contributors.txt.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#ifndef WIN2K_H__
-#define WIN2K_H__ 1
-
-// put stuff that's not apart of any SDKs but is used nonetheless
-
-#if _MSC_VER >= 1300
-#define NOWIN2K
-#endif
-
-#if WINVER >= 0x501
-#define NOWIN2K
-#endif
-
-#ifdef _MSC_VER
-#define BIGI(x) x##i64
-#else
-#define BIGI(x) x##LL
-#endif
-
-#ifndef _WIN32_WINNT_WIN8
-#define _WIN32_WINNT_WIN8 0x0602 // Windows 8
-#endif
-
-#ifndef _WIN32_WINNT_WINBLUE
-#define _WIN32_WINNT_WINBLUE 0x0603 // Windows 8.1
-#endif
-
-#ifndef _WIN32_WINNT_WIN10
-#define _WIN32_WINNT_WIN10 0x0A00 // Windows 10
-#endif
-
-// collapsible groups for Vista
-#ifndef LVGS_COLLAPSIBLE
- #define LVGS_COLLAPSIBLE 0x00000008
-#endif
-
-#ifndef SM_SERVERR2
- #define SM_SERVERR2 89
- #define VER_SUITE_STORAGE_SERVER 0x00002000
- #define VER_SUITE_COMPUTE_SERVER 0x00004000
- #define VER_SUITE_WH_SERVER 0x00008000
-#endif
-
-#if _MSC_VER
- #if !defined(DTBG_CLIPRECT)
- #define DTBG_CLIPRECT 0x00000001 // rcClip has been specified
- #define DTBG_DRAWSOLID 0x00000002 // DEPRECATED: draw transparent/alpha images as solid
- #define DTBG_OMITBORDER 0x00000004 // don't draw border of part
- #define DTBG_OMITCONTENT 0x00000008 // don't draw content area of part
- #define DTBG_COMPUTINGREGION 0x00000010 // TRUE if calling to compute region
- #define DTBG_MIRRORDC 0x00000020 // assume the hdc is mirrorred and
- // flip images as appropriate (currently
- // only supported for bgtype = imagefile)
- #define DTBG_NOMIRROR 0x00000040 // don't mirror the output, overrides everything else
-
- typedef struct _DTBGOPTS
- {
- DWORD dwSize; // size of the struct
- DWORD dwFlags; // which options have been specified
- RECT rcClip; // clipping rectangle
- } DTBGOPTS, *PDTBGOPTS;
- #endif
- #if !defined(DTT_COMPOSITED)
- #define DTT_TEXTCOLOR (1UL << 0) // crText has been specified
- #define DTT_BORDERCOLOR (1UL << 1) // crBorder has been specified
- #define DTT_SHADOWCOLOR (1UL << 2) // crShadow has been specified
- #define DTT_SHADOWTYPE (1UL << 3) // iTextShadowType has been specified
- #define DTT_SHADOWOFFSET (1UL << 4) // ptShadowOffset has been specified
- #define DTT_BORDERSIZE (1UL << 5) // iBorderSize has been specified
- #define DTT_FONTPROP (1UL << 6) // iFontPropId has been specified
- #define DTT_COLORPROP (1UL << 7) // iColorPropId has been specified
- #define DTT_STATEID (1UL << 8) // IStateId has been specified
- #define DTT_CALCRECT (1UL << 9) // Use pRect as and in/out parameter
- #define DTT_APPLYOVERLAY (1UL << 10) // fApplyOverlay has been specified
- #define DTT_GLOWSIZE (1UL << 11) // iGlowSize has been specified
- #define DTT_CALLBACK (1UL << 12) // pfnDrawTextCallback has been specified
- #define DTT_COMPOSITED (1UL << 13) // Draws text with antialiased alpha (needs a DIB section)
-
- typedef
- int
- (WINAPI *DTT_CALLBACK_PROC)
- (
- HDC hdc,
- LPWSTR pszText,
- int cchText,
- LPRECT prc,
- UINT dwFlags,
- LPARAM lParam);
-
- typedef struct _DTTOPTS
- {
- DWORD dwSize; // size of the struct
- DWORD dwFlags; // which options have been specified
- COLORREF crText; // color to use for text fill
- COLORREF crBorder; // color to use for text outline
- COLORREF crShadow; // color to use for text shadow
- int iTextShadowType; // TST_SINGLE or TST_CONTINUOUS
- POINT ptShadowOffset; // where shadow is drawn (relative to text)
- int iBorderSize; // Border radius around text
- int iFontPropId; // Font property to use for the text instead of TMT_FONT
- int iColorPropId; // Color property to use for the text instead of TMT_TEXTCOLOR
- int iStateId; // Alternate state id
- BOOL fApplyOverlay; // Overlay text on top of any text effect?
- int iGlowSize; // Glow radious around text
- DTT_CALLBACK_PROC pfnDrawTextCallback; // Callback for DrawText
- LPARAM lParam; // Parameter for callback
- } DTTOPTS, *PDTTOPTS;
-
- #define WTNCA_NODRAWCAPTION 0x00000001 // don't draw the window caption
- #define WTNCA_NODRAWICON 0x00000002 // don't draw the system icon
- #define WTNCA_NOSYSMENU 0x00000004 // don't expose the system menu icon functionality
- #define WTNCA_NOMIRRORHELP 0x00000008 // don't mirror the question mark, even in RTL layout
-
- enum WINDOWTHEMEATTRIBUTETYPE
- {
- WTA_NONCLIENT = 1
- };
-
- typedef struct _WTA_OPTIONS
- {
- DWORD dwFlags; // values for each style option specified in the bitmask
- DWORD dwMask; // bitmask for flags that are changing
- // valid options are: WTNCA_NODRAWCAPTION, WTNCA_NODRAWICON, WTNCA_NOSYSMENU
- } WTA_OPTIONS, *PWTA_OPTIONS;
- #endif
-#endif
-
-#if defined (__GNUC__)
- #define SECURITY_ENTRYPOINTA "InitSecurityInterfaceA"
- #define SECURITY_ENTRYPOINT SECURITY_ENTRYPOINTA
- #define FreeCredentialsHandle FreeCredentialsHandle
- #define FAPPCOMMAND_MASK 0xF000
- #define GET_APPCOMMAND_LPARAM(lParam) ((short)(HIWORD(lParam) & ~FAPPCOMMAND_MASK))
- #ifdef __cplusplus
- extern "C" {
- #endif
- WINGDIAPI BOOL WINAPI AlphaBlend(HDC, int, int, int, int, HDC, int, int, int, int, BLENDFUNCTION);
- #ifdef __cplusplus
- }
- #endif
- /* FIXME: MinGW doesn't provide _snscanf, we wrap unsafe sscanf here */
- #define _snscanf(buf, size, fmt, ...) sscanf(buf, fmt, ## __VA_ARGS__)
- #ifndef CDSIZEOF_STRUCT
- #define CDSIZEOF_STRUCT(structname, member) \
- (((int)((LPBYTE)(&((structname*)0)->member) - ((LPBYTE)((structname*)0)))) + sizeof(((structname*)0)->member))
- #endif
- #ifndef OPENFILENAME_SIZE_VERSION_400
- #define OPENFILENAME_SIZE_VERSION_400 CDSIZEOF_STRUCT(OPENFILENAME, lpTemplateName)
- #endif
- #ifndef NOTIFYICONDATAA_V1_SIZE
- #define NOTIFYICONDATAA_V1_SIZE CDSIZEOF_STRUCT(NOTIFYICONDATAA, szTip[64])
- #endif
- #ifndef NOTIFYICONDATA_V1_SIZE
- #define NOTIFYICONDATA_V1_SIZE CDSIZEOF_STRUCT(NOTIFYICONDATA, szTip[64])
- #endif
- #ifndef OPENFILENAMEW_SIZE_VERSION_400
- #define OPENFILENAMEW_SIZE_VERSION_400 CDSIZEOF_STRUCT(OPENFILENAMEW, lpTemplateName)
- #endif
- #ifndef NOTIFYICONDATAW_V1_SIZE
- #define NOTIFYICONDATAW_V1_SIZE CDSIZEOF_STRUCT(NOTIFYICONDATAW, szTip[64])
- #endif
- #ifndef TV_KEYDOWN
- typedef struct tagNMKEY {
- NMHDR hdr;
- UINT nVKey;
- UINT uFlags;
- } NMKEY, *LPNMKEY;
- typedef struct tagTVKEYDOWN
- {
- NMHDR hdr;
- WORD wVKey;
- UINT flags;
- } NMTVKEYDOWN, *LPNMTVKEYDOWN;
- #define TV_KEYDOWN NMTVKEYDOWN
- #endif
- #define ODS_HOTLIGHT 0x0040
- #define ODS_INACTIVE 0x0080
- #define OLERENDER_FORMAT 2
- #define SES_EXTENDBACKCOLOR 4
- #define SPI_GETFLATMENU 0x1022
- #define COLOR_HOTLIGHT 26
- #define COLOR_MENUBAR 30
- #define COLOR_MENUHILIGHT 29
- #define COLOR_HIGHLIGHT 13
- #define BP_PUSHBUTTON 1 // Push Button Type
- #define PBS_NORMAL 1
- #define PBS_HOT 2
- #define PBS_PRESSED 3
- #define PBS_DISABLED 4
- #define PBS_DEFAULTED 5
- #define BP_CHECKBOX 3 // CheckBox Type
- #define TP_BUTTON 1
- #define TS_NORMAL 1
- #define TS_HOT 2
- #define TS_PRESSED 3
- #define TS_DISABLED 4
- #define TS_CHECKED 5
- #define TS_HOTCHECKED 6
- #ifndef TTM_SETTITLE
- #ifndef UNICODE
- #define TTM_SETTITLE TTM_SETTITLEA
- #else
- #define TTM_SETTITLE TTM_SETTITLEW
- #endif
- #endif
- #define CBS_UNCHECKEDNORMAL 1
- #define CBS_UNCHECKEDHOT 2
- #define CBS_CHECKEDNORMAL 5
- #define CBS_CHECKEDHOT 6
- #define CFM_WEIGHT 0x00400000
- #define CFM_UNDERLINETYPE 0x00800000
- #define CFM_BACKCOLOR 0x04000000
- #define CFU_UNDERLINE 1
- #define CFU_UNDERLINEWORD 2
- #define EP_EDITTEXT 1 // Edit
- #define EP_CARET 2
- #define ETS_NORMAL 1
- #define ETS_HOT 2
- #define ETS_SELECTED 3
- #define ETS_DISABLED 4
- #define ETS_FOCUSED 5
- #define ETS_READONLY 6
- #define ETS_ASSIST 7
- #ifndef PBT_APMRESUMESUSPEND
- #define PBT_APMSUSPEND 0x0004
- #define PBT_APMRESUMESUSPEND 0x0007
- #endif
- #define AW_HOR_POSITIVE 0x00000001
- #define AW_VER_NEGATIVE 0x00000008
- #define AW_HIDE 0x00010000
- #define AW_ACTIVATE 0x00020000
- #define AW_SLIDE 0x00040000
- #define AW_BLEND 0x00080000
- #define WM_UNICHAR 0x0109
- #define LVS_EX_DOUBLEBUFFER 0x00010000
- #define RES_ICON 1
- #ifndef DFCS_HOT
- #define DFCS_HOT 0x1000
- #endif
- #define IP_TTL 7
- #ifndef IP_MULTICAST_IF
- #define IP_MULTICAST_IF 32
- #endif
- #define IMF_AUTOKEYBOARD 0x0001
- #define IMF_AUTOFONTSIZEADJUST 0x0010
- #define GRADIENT_FILL_RECT_H 0x00
- #define GRADIENT_FILL_RECT_V 0x01
- #define LANG_INVARIANT 0x7f
- #define LOCALE_INVARIANT (MAKELCID(MAKELANGID(LANG_INVARIANT, SUBLANG_NEUTRAL), SORT_DEFAULT))
- #define EN_ALIGN_RTL_EC 0x0701
- #ifndef OBJID_MENU
- #define OBJID_MENU ((LONG)0xFFFFFFFD)
- #endif
- #ifndef OBJID_VSCROLL
- #define OBJID_VSCROLL ((LONG)0xFFFFFFFB)
- #endif
- #define TreeView_SetCheckState(hwndTV, hti, fCheck) \
- TreeView_SetItemState(hwndTV, hti, INDEXTOSTATEIMAGEMASK((fCheck)?2:1), TVIS_STATEIMAGEMASK)
- #define TreeView_GetCheckState(hwndTV, hti) \
- ((((UINT)(SNDMSG((hwndTV), TVM_GETITEMSTATE, (WPARAM)(hti), TVIS_STATEIMAGEMASK))) >> 12) -1)
- #define ERROR_INTERNET_SEC_CERT_NO_REV 12056
- #define ERROR_INTERNET_SEC_CERT_REV_FAILED 12057
- #define APPCOMMAND_BROWSER_BACKWARD 1
- #define APPCOMMAND_BROWSER_FORWARD 2
- #define NIN_BALLOONHIDE (WM_USER +3)
- #define NIN_BALLOONTIMEOUT (WM_USER + 4)
- #define NIN_BALLOONUSERCLICK (WM_USER + 5)
-// SDK isn't present or some older VC compiler was used, include missing things.
-#elif !defined(NOWIN2K) && (!defined WS_EX_LAYERED || !defined IDC_HAND)
-
- #pragma message("win2k.h")
-
- #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
-
- #define PSDK_WORKAROUND
-
- #define MONITOR_DEFAULTTONEAREST 2
-
- #ifndef EM_SETTEXTEX
- #define EM_SETTEXTEX (WM_USER + 97)
- #define ST_DEFAULT 0
- #define ST_KEEPUNDO 1
- #define ST_SELECTION 2
- #define ST_NEWCHARS 4
- typedef struct _settextex
- {
- DWORD flags;
- UINT codepage;
- } SETTEXTEX;
- #endif
-
- #if(_WIN32_WINNT >= 0x0500)
- #define WS_EX_LAYERED 0x00080000
- #define MIIM_STRING 0x00000040
- #define MIIM_BITMAP 0x00000080
- #define MIIM_FTYPE 0x00000100
- #define HBMMENU_CALLBACK ((HBITMAP) -1)
- #define ODS_HOTLIGHT 0x0040
- #define ODS_INACTIVE 0x0080
- #define IDC_HAND MAKEINTRESOURCE(32649)
- #define COLOR_HOTLIGHT 26
- #define COLOR_MENUBAR 30
- #define COLOR_MENUHILIGHT 29
- #define COLOR_HIGHLIGHT 13
- #define SPI_GETFLATMENU 0x1022
- #define TVS_NOHSCROLL 0x8000
- #define SPI_GETLISTBOXSMOOTHSCROLLING 0x1006
- #define SPI_GETHOTTRACKING 0x100E
- #define BIF_NEWDIALOGSTYLE 0x0040
- #define LVS_EX_LABELTIP 0x00004000
- #define LVS_EX_DOUBLEBUFFER 0x00010000
- #define DFCS_HOT 0x1000
- #define FLASHW_TRAY 0x00000002;
- typedef struct {
- UINT cbSize;
- HWND hwnd;
- DWORD dwFlags;
- UINT uCount;
- DWORD dwTimeout;
- } FLASHWINFO;
- /* for the help plugin without the SDK */
- #define SM_XVIRTUALSCREEN 76
- #define SM_YVIRTUALSCREEN 77
- #define SM_CXVIRTUALSCREEN 78
- #define SM_CYVIRTUALSCREEN 79
- #define COLOR_HOTLIGHT 26
- #define VK_OEM_PLUS 0xBB
- #define VK_OEM_MINUS 0xBD
-
- /* the structure only needs to be defined for VC5 or lower */
- #if _MSC_VER < 1200
- typedef struct tagLASTINPUTINFO {
- UINT cbSize;
- DWORD dwTime;
- } LASTINPUTINFO, *PLASTINPUTINFO;
- #endif /* #if _MSC_VER < 1200 */
-
- #ifndef OPENFILENAME_SIZE_VERSION_400
- #define OPENFILENAME_SIZE_VERSION_400 sizeof(OPENFILENAME)
- #endif
-
- #ifndef CCM_SETVERSION
- #define CCM_SETVERSION (CCM_FIRST + 0x7)
- #endif
-
- #define SYSRGN 4
- WINGDIAPI int WINAPI GetRandomRgn(IN HDC, IN HRGN, IN INT);
-
- #endif /* _WIN32_WINNT >= 0x0500 */
-
- #define LWA_ALPHA 0x00000002
- #define AW_HIDE 0x00010000
- #define AW_BLEND 0x00080000
- #define SPI_GETSCREENSAVERRUNNING 114
- #define SM_CMONITORS 80
-
- #ifndef AW_ACTIVATE
- #define AW_ACTIVATE 0x00020000
- #define AW_SLIDE 0x00040000
- #define AW_VER_NEGATIVE 0x00000008
- #define AW_HOR_POSITIVE 0x00000001
- #endif
-
- #ifndef DWORD_PTR
- typedef DWORD DWORD_PTR;
- #endif
-
- #ifndef HMONITOR
- DECLARE_HANDLE(HMONITOR);
- typedef struct tagMONITORINFO
- {
- DWORD cbSize;
- RECT rcMonitor;
- RECT rcWork;
- DWORD dwFlags;
- } MONITORINFO, *LPMONITORINFO;
- #endif
-
-
- #ifndef IDropTargetHelper
- DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0);
- #define INTERFACE IDropTargetHelper
- DECLARE_INTERFACE_(IDropTargetHelper, IUnknown)
- {
- // IUnknown methods
- STDMETHOD (QueryInterface)(THIS_ REFIID riid, void **ppv) PURE;
- STDMETHOD_(ULONG, AddRef) (THIS) PURE;
- STDMETHOD_(ULONG, Release) (THIS) PURE;
-
- // IDropTargetHelper
- STDMETHOD (DragEnter)(THIS_ HWND hwndTarget, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) PURE;
- STDMETHOD (DragLeave)(THIS) PURE;
- STDMETHOD (DragOver)(THIS_ POINT* ppt, DWORD dwEffect) PURE;
- STDMETHOD (Drop)(THIS_ IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) PURE;
- STDMETHOD (Show)(THIS_ BOOL fShow) PURE;
-
- };
- #endif /* IDropTargetHelper */
-
- #define WM_MENURBUTTONUP 0x0122
-
-// tabsrmm uses these
-
-#define SES_EXTENDBACKCOLOR 4
-#define EM_SETEDITSTYLE (WM_USER + 204)
-#define EM_SETSCROLLPOS (WM_USER + 222)
-#define SF_USECODEPAGE 0x00000020
-
-#define TreeView_SetItemState(hwndTV, hti, data, _mask) \
-{ TVITEM _TVi; \
- _TVi.mask = TVIF_STATE; \
- _TVi.hItem = hti; \
- _TVi.stateMask = _mask; \
- _TVi.state = data; \
- SendMessage((hwndTV), TVM_SETITEM, 0, (LPARAM)(TV_ITEM *)&_TVi); \
-}
-
-#endif /* SDK check */
-
-#ifndef BPPF_ERASE
- typedef enum _BP_BUFFERFORMAT
- {
- BPBF_COMPATIBLEBITMAP, // Compatible bitmap
- BPBF_DIB, // Device-independent bitmap
- BPBF_TOPDOWNDIB, // Top-down device-independent bitmap
- BPBF_TOPDOWNMONODIB // Top-down monochrome device-independent bitmap
- } BP_BUFFERFORMAT;
-
-
- typedef struct _BP_PAINTPARAMS
- {
- DWORD cbSize;
- DWORD dwFlags; // BPPF_ flags
- const RECT * prcExclude;
- const BLENDFUNCTION * pBlendFunction;
- } BP_PAINTPARAMS, *PBP_PAINTPARAMS;
-
- #define BPPF_ERASE 1
- #define BPPF_NOCLIP 2
- #define BPPF_NONCLIENT 4
-#endif
-
-
- /* windows seven taskbar interface comes with sdk v7.0
- if not existent define on our own */
-#ifdef _SHLOBJ_H_
- #ifndef __ITaskbarList3_INTERFACE_DEFINED__
- #define __ITaskbarList3_INTERFACE_DEFINED__
- /* interface ITaskbarList3 */
-
- typedef
- enum TBPFLAG
- {
- TBPF_NOPROGRESS = 0,
- TBPF_INDETERMINATE = 0x1,
- TBPF_NORMAL = 0x2,
- TBPF_ERROR = 0x4,
- TBPF_PAUSED = 0x8
- } TBPFLAG;
-
- typedef struct THUMBBUTTON *LPTHUMBBUTTON;
-
- static const GUID IID_ITaskbarList3 = { 0xea1afb91, 0x9e28, 0x4b86, { 0x90, 0xE9, 0x9e, 0x9f, 0x8a, 0x5e, 0xef, 0xaf } };
-
- #ifdef INTERFACE
- #undef INTERFACE
- #endif
- #define INTERFACE ITaskbarList3
- DECLARE_INTERFACE_(ITaskbarList3, ITaskbarList2)
- {
- // IUnknown methods
- STDMETHOD (QueryInterface) (THIS_ REFIID riid, void **ppv) PURE;
- STDMETHOD_(ULONG, AddRef) (THIS) PURE;
- STDMETHOD_(ULONG, Release) (THIS) PURE;
-
- // overloaded ITaskbarList2 members
- STDMETHOD (HrInit) (THIS) PURE;
- STDMETHOD (AddTab) (THIS_ HWND hwnd) PURE;
- STDMETHOD (DeleteTab) (THIS_ HWND hwnd) PURE;
- STDMETHOD (ActivateTab) (THIS_ HWND hwnd) PURE;
- STDMETHOD (SetActiveAlt) (THIS_ HWND hwnd) PURE;
- STDMETHOD (MarkFullscreenWindow) (THIS_ HWND hwnd, int fFullscreen) PURE;
-
- // ITaskbarList3 members
- STDMETHOD (SetProgressValue) (THIS_ HWND hwnd, ULONGLONG ullCompleted, ULONGLONG ullTotal) PURE;
- STDMETHOD (SetProgressState) (THIS_ HWND hwnd, TBPFLAG tbpFlags) PURE;
- STDMETHOD (RegisterTab) (THIS_ HWND hwndTab, HWND hwndMDI) PURE;
- STDMETHOD (UnregisterTab) (THIS_ HWND hwndTab) PURE;
- STDMETHOD (SetTabOrder) (THIS_ HWND hwndTab, HWND hwndInsertBefore) PURE;
- STDMETHOD (SetTabActive) (THIS_ HWND hwndTab, HWND hwndMDI, DWORD dwReserved) PURE;
- STDMETHOD (ThumbBarAddButtons) (THIS_ HWND hwnd, UINT cButtons, LPTHUMBBUTTON pButton) PURE;
- STDMETHOD (ThumbBarUpdateButtons)(THIS_ HWND hwnd, UINT cButtons, LPTHUMBBUTTON pButton) PURE;
- STDMETHOD (ThumbBarSetImageList) (THIS_ HWND hwnd, HIMAGELIST himl) PURE;
- STDMETHOD (SetOverlayIcon) (THIS_ HWND hwnd, HICON hIcon, LPCWSTR pszDescription) PURE;
- STDMETHOD (SetThumbnailTooltip) (THIS_ HWND hwnd, LPCWSTR pszTip) PURE;
- STDMETHOD (SetThumbnailClip) (THIS_ HWND hwnd, RECT *prcClip) PURE;
- };
-
- #endif /* __ITaskbarList3_INTERFACE_DEFINED__ */
-#endif /* _SHLOBJ_H_ */
-
-#ifndef FILETYPEATTRIBUTEFLAGS
- #define FTA_Exclude 0x00000001
- #define FTA_Show 0x00000002
- #define FTA_HasExtension 0x00000004
- #define FTA_NoEdit 0x00000008
- #define FTA_NoRemove 0x00000010
- #define FTA_NoNewVerb 0x00000020
- #define FTA_NoEditVerb 0x00000040
- #define FTA_NoRemoveVerb 0x00000080
- #define FTA_NoEditDesc 0x00000100
- #define FTA_NoEditIcon 0x00000200
- #define FTA_NoEditDflt 0x00000400
- #define FTA_NoEditVerbCmd 0x00000800
- #define FTA_NoEditVerbExe 0x00001000
- #define FTA_NoDDE 0x00002000
- #define FTA_NoEditMIME 0x00008000
- #define FTA_OpenIsSafe 0x00010000
- #define FTA_AlwaysUnsafe 0x00020000
- #define FTA_AlwaysShowExt 0x00040000
- #define FTA_NoRecentDocs 0x00100000
- #define FTA_SafeForElevation 0x00200000
- #define FTA_AlwaysUseDirectInvoke 0x00400000
-#endif /* FTA_Exclude */
-
-#endif // WIN2K_H__
diff --git a/plugins/AVS/src/stdafx.h b/plugins/AVS/src/stdafx.h index 42419679a2..b698cbf861 100644 --- a/plugins/AVS/src/stdafx.h +++ b/plugins/AVS/src/stdafx.h @@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <time.h>
#include <malloc.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_clist.h>
#include <m_contacts.h>
diff --git a/plugins/AddContactPlus/src/stdafx.h b/plugins/AddContactPlus/src/stdafx.h index 1b31806a90..a95604ac51 100644 --- a/plugins/AddContactPlus/src/stdafx.h +++ b/plugins/AddContactPlus/src/stdafx.h @@ -25,7 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <commctrl.h>
#include <limits.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_utils.h>
#include <m_clistint.h>
diff --git a/plugins/Alarms/src/stdafx.h b/plugins/Alarms/src/stdafx.h index edb0265094..ef193d0b23 100755 --- a/plugins/Alarms/src/stdafx.h +++ b/plugins/Alarms/src/stdafx.h @@ -20,7 +20,6 @@ #include <m_cluiframes.h>
#include <m_fontservice.h>
#include <m_icolib.h>
-#include <win2k.h>
#include <m_toptoolbar.h>
#include <m_alarms.h>
diff --git a/plugins/AssocMgr/src/reg.cpp b/plugins/AssocMgr/src/reg.cpp index 82f19f5040..fda90a497c 100644 --- a/plugins/AssocMgr/src/reg.cpp +++ b/plugins/AssocMgr/src/reg.cpp @@ -21,6 +21,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
+#ifndef FILETYPEATTRIBUTEFLAGS
+ #define FTA_Exclude 0x00000001
+ #define FTA_Show 0x00000002
+ #define FTA_HasExtension 0x00000004
+ #define FTA_NoEdit 0x00000008
+ #define FTA_NoRemove 0x00000010
+ #define FTA_NoNewVerb 0x00000020
+ #define FTA_NoEditVerb 0x00000040
+ #define FTA_NoRemoveVerb 0x00000080
+ #define FTA_NoEditDesc 0x00000100
+ #define FTA_NoEditIcon 0x00000200
+ #define FTA_NoEditDflt 0x00000400
+ #define FTA_NoEditVerbCmd 0x00000800
+ #define FTA_NoEditVerbExe 0x00001000
+ #define FTA_NoDDE 0x00002000
+ #define FTA_NoEditMIME 0x00008000
+ #define FTA_OpenIsSafe 0x00010000
+ #define FTA_AlwaysUnsafe 0x00020000
+ #define FTA_AlwaysShowExt 0x00040000
+ #define FTA_NoRecentDocs 0x00100000
+ #define FTA_SafeForElevation 0x00200000
+ #define FTA_AlwaysUseDirectInvoke 0x00400000
+#endif /* FTA_Exclude */
+
#ifdef _DEBUG
// Debug: Ensure all registry calls do succeed and have valid parameters.
// Shows a details message box otherwise.
@@ -604,9 +628,9 @@ BOOL AddRegClass(const char *pszClassName, const wchar_t *pszTypeDescription, co {
DWORD dwFlags = 0, dwSize = sizeof(dwFlags);
RegQueryValueEx(hClassKey, L"EditFlags", nullptr, nullptr, (BYTE*)&dwFlags, &dwSize);
- if (fBrowserAutoOpen) dwFlags = (dwFlags&~FTA_AlwaysUnsafe) | FTA_OpenIsSafe;
+ if (fBrowserAutoOpen) dwFlags = (dwFlags & ~FTA_AlwaysUnsafe) | FTA_OpenIsSafe;
if (!fUrlProto) dwFlags |= FTA_HasExtension;
- else dwFlags = (dwFlags&~FTA_HasExtension) | FTA_Show; // show classes without extension
+ else dwFlags = (dwFlags & ~FTA_HasExtension) | FTA_Show; // show classes without extension
RegSetValueEx(hClassKey, L"EditFlags", 0, REG_DWORD, (BYTE*)&dwFlags, sizeof(dwFlags));
}
if (fIsShortcut) {
diff --git a/plugins/AssocMgr/src/stdafx.h b/plugins/AssocMgr/src/stdafx.h index 09096de40b..e4f910ac70 100644 --- a/plugins/AssocMgr/src/stdafx.h +++ b/plugins/AssocMgr/src/stdafx.h @@ -35,7 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_options.h>
#include <m_clist.h>
#include <m_gui.h>
-#include "win2k.h"
#include "m_assocmgr.h"
diff --git a/plugins/AutoRun/src/stdafx.h b/plugins/AutoRun/src/stdafx.h index 8de5e959f3..dfafa2cbdd 100644 --- a/plugins/AutoRun/src/stdafx.h +++ b/plugins/AutoRun/src/stdafx.h @@ -6,7 +6,6 @@ #include <m_langpack.h>
#include <m_options.h>
#include <m_database.h>
-#include <win2k.h>
#include "resource.h"
#include "version.h"
diff --git a/plugins/AutoShutdown/src/stdafx.h b/plugins/AutoShutdown/src/stdafx.h index e541eacbb1..e45715116c 100644 --- a/plugins/AutoShutdown/src/stdafx.h +++ b/plugins/AutoShutdown/src/stdafx.h @@ -52,7 +52,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_message.h>
#include <m_file.h>
#include <m_idle.h>
-#include <win2k.h>
#include <m_clistint.h>
#include <m_cluiframes.h>
#include <m_fontservice.h>
diff --git a/plugins/AvatarHistory/src/stdafx.h b/plugins/AvatarHistory/src/stdafx.h index 1bf87a8b61..69cdfc1246 100644 --- a/plugins/AvatarHistory/src/stdafx.h +++ b/plugins/AvatarHistory/src/stdafx.h @@ -20,7 +20,6 @@ #include <m_imgsrvc.h>
#include <m_timezones.h>
#include <m_icolib.h>
-#include <win2k.h>
#include <m_folders.h>
#include <m_metacontacts.h>
diff --git a/plugins/BASS_interface/src/stdafx.h b/plugins/BASS_interface/src/stdafx.h index 48bfe04616..b3afaccd9c 100644 --- a/plugins/BASS_interface/src/stdafx.h +++ b/plugins/BASS_interface/src/stdafx.h @@ -13,7 +13,6 @@ Copyright (C) 2010, 2011 tico-tico #include <m_skin.h>
#include <m_database.h>
#include <m_options.h>
-#include <win2k.h>
#include <m_clistint.h>
#include <m_cluiframes.h>
#include <m_fontservice.h>
diff --git a/plugins/BasicHistory/src/stdafx.h b/plugins/BasicHistory/src/stdafx.h index 81269b85ff..d7714814f4 100644 --- a/plugins/BasicHistory/src/stdafx.h +++ b/plugins/BasicHistory/src/stdafx.h @@ -53,7 +53,6 @@ #include <m_clc.h>
#include <m_utils.h>
#include <m_popup.h>
-#include <win2k.h>
#include "m_toptoolbar.h"
#include "m_smileyadd.h"
diff --git a/plugins/BossKeyPlus/src/stdafx.h b/plugins/BossKeyPlus/src/stdafx.h index faf4c00535..2e8cd39402 100644 --- a/plugins/BossKeyPlus/src/stdafx.h +++ b/plugins/BossKeyPlus/src/stdafx.h @@ -40,7 +40,6 @@ #include <m_message.h>
#include <m_hotkeys.h>
#include <m_gui.h>
-#include <win2k.h>
#include <m_variables.h>
#include <m_toptoolbar.h>
diff --git a/plugins/BuddyExpectator/src/stdafx.h b/plugins/BuddyExpectator/src/stdafx.h index 32063d5756..68145e12fa 100644 --- a/plugins/BuddyExpectator/src/stdafx.h +++ b/plugins/BuddyExpectator/src/stdafx.h @@ -35,7 +35,6 @@ #include <m_langpack.h>
#include <m_options.h>
#include <m_protosvc.h>
-#include <win2k.h>
#include <m_message.h>
#include <m_userinfo.h>
#include <m_icolib.h>
diff --git a/plugins/BuddyPounce/src/stdafx.h b/plugins/BuddyPounce/src/stdafx.h index dcebbbcd04..f3a346aef5 100644 --- a/plugins/BuddyPounce/src/stdafx.h +++ b/plugins/BuddyPounce/src/stdafx.h @@ -15,7 +15,6 @@ #include <m_protocols.h>
#include <m_options.h>
#include <m_protosvc.h>
-#include <win2k.h>
#include "resource.h"
#include "version.h"
diff --git a/plugins/CSList/src/stdafx.h b/plugins/CSList/src/stdafx.h index b2d0f0a639..b70f359d2e 100644 --- a/plugins/CSList/src/stdafx.h +++ b/plugins/CSList/src/stdafx.h @@ -47,7 +47,6 @@ Offers List of your Custom Statuses. #include <m_hotkeys.h>
#include <m_variables.h>
-#include <win2k.h>
#include "resource.h"
#include "version.h"
diff --git a/plugins/ChangeKeyboardLayout/src/stdafx.h b/plugins/ChangeKeyboardLayout/src/stdafx.h index ee2cb8bdec..d76e96c72f 100644 --- a/plugins/ChangeKeyboardLayout/src/stdafx.h +++ b/plugins/ChangeKeyboardLayout/src/stdafx.h @@ -14,7 +14,6 @@ #include <m_popup.h>
#include <m_utils.h>
#include <m_icolib.h>
-#include <win2k.h>
#include <m_ieview.h>
#include <m_changekeyboardlayout.h>
diff --git a/plugins/ClientChangeNotify/src/stdafx.h b/plugins/ClientChangeNotify/src/stdafx.h index b152ec70e5..fe24e4bb86 100644 --- a/plugins/ClientChangeNotify/src/stdafx.h +++ b/plugins/ClientChangeNotify/src/stdafx.h @@ -47,7 +47,6 @@ #include "m_protosvc.h"
#include "m_icolib.h"
#include "m_genmenu.h"
-#include "win2k.h"
#include "m_metacontacts.h"
#include "m_netlib.h"
diff --git a/plugins/Clist_blind/src/stdafx.h b/plugins/Clist_blind/src/stdafx.h index 84cf3bf1ec..4afbfc5001 100644 --- a/plugins/Clist_blind/src/stdafx.h +++ b/plugins/Clist_blind/src/stdafx.h @@ -35,7 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_langpack.h>
#include <m_options.h>
#include <m_protosvc.h>
-#include <win2k.h>
#include "resource.h"
#include "version.h"
diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index b284e83e37..bef48fc9ef 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -31,7 +31,6 @@ BOOL IS_WM_MOUSE_DOWN_IN_TRAY; BOOL g_trayTooltipActive = FALSE;
POINT tray_hover_pos = { 0 };
-// don't move to win2k.h, need new and old versions to work on 9x/2000/XP
#define NIF_STATE 0x00000008
#define NIF_INFO 0x00000010
diff --git a/plugins/Clist_modern/src/stdafx.h b/plugins/Clist_modern/src/stdafx.h index a6d87989a9..4fca6633eb 100644 --- a/plugins/Clist_modern/src/stdafx.h +++ b/plugins/Clist_modern/src/stdafx.h @@ -74,7 +74,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <newpluginapi.h>
#include <m_system.h>
-#include <win2k.h>
#include <m_database.h>
#include <m_langpack.h>
#include <m_options.h>
diff --git a/plugins/Clist_nicer/src/coolscroll.h b/plugins/Clist_nicer/src/coolscroll.h index 4ffc36fdf7..a77ad2f8b8 100644 --- a/plugins/Clist_nicer/src/coolscroll.h +++ b/plugins/Clist_nicer/src/coolscroll.h @@ -6,7 +6,6 @@ extern "C"{ #endif
#include <windows.h>
-#include <win2k.h>
// To complement the exisiting SB_HORZ, SB_VERT, SB_BOTH
// scrollbar identifiers
diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h index a540037329..80427aa16a 100644 --- a/plugins/Clist_nicer/src/stdafx.h +++ b/plugins/Clist_nicer/src/stdafx.h @@ -40,7 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <time.h>
#include <newpluginapi.h>
-#include <win2k.h>
#include <m_clistint.h>
#include <m_database.h>
#include <m_system.h>
diff --git a/plugins/Console/src/stdafx.h b/plugins/Console/src/stdafx.h index 3edfa2ab6e..31723041c8 100644 --- a/plugins/Console/src/stdafx.h +++ b/plugins/Console/src/stdafx.h @@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <malloc.h>
#include <newpluginapi.h>
-#include <win2k.h>
#include <m_netlib.h>
#include <m_database.h>
#include <m_options.h>
diff --git a/plugins/ContactsPlus/src/stdafx.h b/plugins/ContactsPlus/src/stdafx.h index c83bee9491..88a37c043f 100644 --- a/plugins/ContactsPlus/src/stdafx.h +++ b/plugins/ContactsPlus/src/stdafx.h @@ -42,7 +42,6 @@ #include "m_userinfo.h"
#include "m_button.h"
#include "m_message.h"
-#include "win2k.h"
#include "resource.h"
#include "version.h"
diff --git a/plugins/CountryFlags/src/stdafx.h b/plugins/CountryFlags/src/stdafx.h index 25142a7e1c..cebfc5762e 100644 --- a/plugins/CountryFlags/src/stdafx.h +++ b/plugins/CountryFlags/src/stdafx.h @@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <windows.h>
#include <commctrl.h> /* for ImageList functions */
-#include <win2k.h>
-
#include <newpluginapi.h>
#include <m_langpack.h>
#include <m_icolib.h>
diff --git a/plugins/Db3x_mmap/src/stdafx.h b/plugins/Db3x_mmap/src/stdafx.h index b14c1e0786..3882bb5d89 100644 --- a/plugins/Db3x_mmap/src/stdafx.h +++ b/plugins/Db3x_mmap/src/stdafx.h @@ -35,7 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <memory>
#include <newpluginapi.h>
-#include <win2k.h>
#include <m_system.h>
#include <m_database.h>
#include <m_langpack.h>
diff --git a/plugins/DbChecker/src/stdafx.h b/plugins/DbChecker/src/stdafx.h index c08189312e..b6cbb59ae2 100644 --- a/plugins/DbChecker/src/stdafx.h +++ b/plugins/DbChecker/src/stdafx.h @@ -35,7 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_gui.h> #include <m_icolib.h> #include <m_langpack.h> -#include <win2k.h> #include "resource.h" #include "version.h" diff --git a/plugins/DbEditorPP/src/stdafx.h b/plugins/DbEditorPP/src/stdafx.h index 85d47b9edd..afe1a23d68 100644 --- a/plugins/DbEditorPP/src/stdafx.h +++ b/plugins/DbEditorPP/src/stdafx.h @@ -13,7 +13,6 @@ #include <shlwapi.h>
#include <process.h>
#include <string.h>
-#include <win2k.h>
#include <malloc.h>
#include <newpluginapi.h>
diff --git a/plugins/Dbx_mdbx/src/stdafx.h b/plugins/Dbx_mdbx/src/stdafx.h index 7c5f564922..a3b257bc8e 100644 --- a/plugins/Dbx_mdbx/src/stdafx.h +++ b/plugins/Dbx_mdbx/src/stdafx.h @@ -38,7 +38,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <string>
#include <newpluginapi.h>
-#include <win2k.h>
#include <m_system.h>
#include <m_database.h>
#include <m_langpack.h>
diff --git a/plugins/ExternalAPI/m_variables.h b/plugins/ExternalAPI/m_variables.h index 3a7605c118..0dd9cfd828 100644 --- a/plugins/ExternalAPI/m_variables.h +++ b/plugins/ExternalAPI/m_variables.h @@ -28,10 +28,6 @@ #include <m_button.h>
#endif
-#ifndef _countof
-#include <win2k.h>
-#endif
-
// --------------------------------------------------------------------------
// String formatting
// --------------------------------------------------------------------------
diff --git a/plugins/FTPFileYM/src/stdafx.h b/plugins/FTPFileYM/src/stdafx.h index 0752376744..93959e8ccc 100644 --- a/plugins/FTPFileYM/src/stdafx.h +++ b/plugins/FTPFileYM/src/stdafx.h @@ -39,7 +39,6 @@ using namespace std; #include <m_options.h>
#include <m_protosvc.h>
#include <m_skin.h>
-#include <win2k.h>
#include <m_ftpfile.h>
diff --git a/plugins/FavContacts/src/stdafx.h b/plugins/FavContacts/src/stdafx.h index 84b456665c..f974139199 100644 --- a/plugins/FavContacts/src/stdafx.h +++ b/plugins/FavContacts/src/stdafx.h @@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <time.h>
#include <math.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_system.h>
#include <m_database.h>
diff --git a/plugins/FileAsMessage/src/stdafx.h b/plugins/FileAsMessage/src/stdafx.h index 047f16d9a2..17a663aeb2 100644 --- a/plugins/FileAsMessage/src/stdafx.h +++ b/plugins/FileAsMessage/src/stdafx.h @@ -20,7 +20,6 @@ #include <m_button.h> #include <m_netlib.h> #include <m_file.h> -#include <win2k.h> #include "dialog.h" #include "resource.h" diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h index 27f6b04b20..e25cb6ae39 100644 --- a/plugins/FingerprintNG/src/stdafx.h +++ b/plugins/FingerprintNG/src/stdafx.h @@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Miranda IM SDK includes
#include <newpluginapi.h>
-#include <win2k.h>
#include <m_database.h>
#include <m_langpack.h>
#include <m_icolib.h>
diff --git a/plugins/FloatingContacts/src/stdafx.h b/plugins/FloatingContacts/src/stdafx.h index 5d556a5548..cdde4073c2 100644 --- a/plugins/FloatingContacts/src/stdafx.h +++ b/plugins/FloatingContacts/src/stdafx.h @@ -22,7 +22,6 @@ #include <m_clistint.h>
#include <m_hotkeys.h>
#include <m_imgsrvc.h>
-#include <win2k.h>
#include "bitmap_funcs.h"
#include "fltcont.h"
diff --git a/plugins/HTTPServer/src/Glob.h b/plugins/HTTPServer/src/Glob.h index fe853b5e00..3b913cc840 100644 --- a/plugins/HTTPServer/src/Glob.h +++ b/plugins/HTTPServer/src/Glob.h @@ -27,7 +27,6 @@ #include <string>
using namespace std;
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_database.h>
#include <m_clistint.h>
diff --git a/plugins/HistoryLinkListPlus/src/stdafx.h b/plugins/HistoryLinkListPlus/src/stdafx.h index c14165320a..f1dc8bbf58 100644 --- a/plugins/HistoryLinkListPlus/src/stdafx.h +++ b/plugins/HistoryLinkListPlus/src/stdafx.h @@ -30,7 +30,6 @@ #include <m_database.h>
#include <m_langpack.h>
#include <m_timezones.h>
-#include <win2k.h>
#include <m_options.h>
#include "language.h"
diff --git a/plugins/HistorySweeperLight/src/stdafx.h b/plugins/HistorySweeperLight/src/stdafx.h index 73df99ec90..1c3bfd0e03 100644 --- a/plugins/HistorySweeperLight/src/stdafx.h +++ b/plugins/HistorySweeperLight/src/stdafx.h @@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <windows.h>
#include <time.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_database.h>
#include <m_langpack.h>
diff --git a/plugins/IEView/src/stdafx.h b/plugins/IEView/src/stdafx.h index 40881602f2..fa5ba81185 100644 --- a/plugins/IEView/src/stdafx.h +++ b/plugins/IEView/src/stdafx.h @@ -54,7 +54,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_smileyadd.h>
#include <m_srmm_int.h>
#include <m_timezones.h>
-#include <win2k.h>
#include "IEView.h"
#include "Utils.h"
diff --git a/plugins/IgnoreState/src/stdafx.h b/plugins/IgnoreState/src/stdafx.h index b7fced8013..e0514eeb54 100644 --- a/plugins/IgnoreState/src/stdafx.h +++ b/plugins/IgnoreState/src/stdafx.h @@ -25,7 +25,6 @@ #include <windows.h>
#include <commctrl.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_database.h>
#include <m_ignore.h>
diff --git a/plugins/Import/src/stdafx.h b/plugins/Import/src/stdafx.h index 51f3e93af9..2382cf261f 100644 --- a/plugins/Import/src/stdafx.h +++ b/plugins/Import/src/stdafx.h @@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <memory>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_langpack.h>
#include <m_clist.h>
diff --git a/plugins/KeyboardNotify/src/stdafx.h b/plugins/KeyboardNotify/src/stdafx.h index fa9a0960fe..1f5a4346cf 100644 --- a/plugins/KeyboardNotify/src/stdafx.h +++ b/plugins/KeyboardNotify/src/stdafx.h @@ -44,7 +44,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_protosvc.h>
#include <m_skin.h>
#include <m_xstatus.h>
-#include <win2k.h>
#include "flash.h"
#include "ignore.h"
diff --git a/plugins/ListeningTo/src/stdafx.h b/plugins/ListeningTo/src/stdafx.h index bcfab528fe..1f996ec4a1 100644 --- a/plugins/ListeningTo/src/stdafx.h +++ b/plugins/ListeningTo/src/stdafx.h @@ -30,7 +30,6 @@ Boston, MA 02111-1307, USA. #include <algorithm>
#include <newpluginapi.h>
-#include <win2k.h>
#include <m_protosvc.h>
#include <m_langpack.h>
#include <m_database.h>
diff --git a/plugins/MenuItemEx/src/stdafx.h b/plugins/MenuItemEx/src/stdafx.h index 701134cafd..94bf0ea81b 100644 --- a/plugins/MenuItemEx/src/stdafx.h +++ b/plugins/MenuItemEx/src/stdafx.h @@ -6,7 +6,6 @@ #include <windows.h>
#include <newpluginapi.h>
-#include <win2k.h>
#include <m_system.h>
#include <m_options.h>
#include <m_contacts.h>
diff --git a/plugins/MirFox/src/common.h b/plugins/MirFox/src/common.h index b664accb69..208dcfbd2c 100644 --- a/plugins/MirFox/src/common.h +++ b/plugins/MirFox/src/common.h @@ -6,7 +6,6 @@ #include <commctrl.h>
// Miranda headers
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_contacts.h>
#include <m_database.h>
diff --git a/plugins/MirOTR/src/stdafx.h b/plugins/MirOTR/src/stdafx.h index dfbe88fd4c..b6fbc5529a 100644 --- a/plugins/MirOTR/src/stdafx.h +++ b/plugins/MirOTR/src/stdafx.h @@ -35,7 +35,6 @@ using namespace std; #include <m_icolib.h>
#include <m_skin.h>
#include <m_gui.h>
-#include <win2k.h>
#include <m_genmenu.h>
#include <m_options.h>
diff --git a/plugins/MobileState/src/stdafx.h b/plugins/MobileState/src/stdafx.h index fde9068c21..afff4f09f0 100644 --- a/plugins/MobileState/src/stdafx.h +++ b/plugins/MobileState/src/stdafx.h @@ -29,7 +29,6 @@ #include <m_langpack.h>
#include <m_icolib.h>
#include <m_extraicons.h>
-#include <win2k.h>
#include "resource.h"
#include "version.h"
diff --git a/plugins/MsgPopup/src/stdafx.h b/plugins/MsgPopup/src/stdafx.h index 759bc6436a..1172759da4 100644 --- a/plugins/MsgPopup/src/stdafx.h +++ b/plugins/MsgPopup/src/stdafx.h @@ -31,7 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_langpack.h>
#include <m_options.h>
#include <m_popup.h>
-#include <win2k.h>
#include "options.h"
#include "resource.h"
diff --git a/plugins/Msg_Export/src/stdafx.h b/plugins/Msg_Export/src/stdafx.h index 4648e635f6..827cd39447 100755 --- a/plugins/Msg_Export/src/stdafx.h +++ b/plugins/Msg_Export/src/stdafx.h @@ -45,7 +45,6 @@ using namespace std; #include <m_protosvc.h>
#include <m_timezones.h>
#include <m_skin.h>
-#include <win2k.h>
#include <m_gui.h>
#include <m_json.h>
diff --git a/plugins/MyDetails/src/stdafx.h b/plugins/MyDetails/src/stdafx.h index c1a073d0eb..9949d13c2e 100644 --- a/plugins/MyDetails/src/stdafx.h +++ b/plugins/MyDetails/src/stdafx.h @@ -38,7 +38,6 @@ Boston, MA 02111-1307, USA. #include <m_xstatus.h>
#include <m_icolib.h>
#include <m_cluiframes.h>
-#include <win2k.h>
#include <m_gui.h>
#include <m_proto_listeningto.h>
diff --git a/plugins/NewAwaySysMod/src/stdafx.h b/plugins/NewAwaySysMod/src/stdafx.h index 5ff302b3bb..f9cea15ab4 100644 --- a/plugins/NewAwaySysMod/src/stdafx.h +++ b/plugins/NewAwaySysMod/src/stdafx.h @@ -51,7 +51,6 @@ #include "m_icolib.h"
#include "m_message.h"
#include "m_userinfo.h"
-#include "win2k.h"
#include "resource.h"
diff --git a/plugins/NewEventNotify/src/stdafx.h b/plugins/NewEventNotify/src/stdafx.h index 059636e836..f99ad18aa8 100644 --- a/plugins/NewEventNotify/src/stdafx.h +++ b/plugins/NewEventNotify/src/stdafx.h @@ -32,7 +32,6 @@ #include <windows.h>
#include <time.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_database.h>
#include <m_langpack.h>
diff --git a/plugins/NewStory/src/stdafx.h b/plugins/NewStory/src/stdafx.h index c4a5065c99..cf4437e53a 100644 --- a/plugins/NewStory/src/stdafx.h +++ b/plugins/NewStory/src/stdafx.h @@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA. //Miranda headers #include "newpluginapi.h" -#include "win2k.h" #include "m_chat_int.h" #include "m_clc.h" #include "m_clistint.h" diff --git a/plugins/NewXstatusNotify/src/stdafx.h b/plugins/NewXstatusNotify/src/stdafx.h index 48aec9fce8..270cb562d0 100644 --- a/plugins/NewXstatusNotify/src/stdafx.h +++ b/plugins/NewXstatusNotify/src/stdafx.h @@ -35,7 +35,6 @@ #include <malloc.h>
#include <newpluginapi.h>
-#include <win2k.h>
#include <m_button.h>
#include <m_clc.h>
#include <m_contacts.h>
diff --git a/plugins/New_GPG/src/stdafx.h b/plugins/New_GPG/src/stdafx.h index a61e35b2fd..bd63c508fc 100755 --- a/plugins/New_GPG/src/stdafx.h +++ b/plugins/New_GPG/src/stdafx.h @@ -67,7 +67,6 @@ using std::fstream; #include <m_icolib.h> #include <m_extraicons.h> #include <m_gui.h> -#include <win2k.h> #include <m_metacontacts.h> diff --git a/plugins/NoHistory/src/stdafx.h b/plugins/NoHistory/src/stdafx.h index 612f2e2aea..3810ddfb6c 100644 --- a/plugins/NoHistory/src/stdafx.h +++ b/plugins/NoHistory/src/stdafx.h @@ -4,7 +4,6 @@ #include <windows.h>
#include <commctrl.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_database.h>
#include <m_clist.h>
diff --git a/plugins/NotesAndReminders/src/stdafx.h b/plugins/NotesAndReminders/src/stdafx.h index c7107e60a0..f0a8a2bf7f 100644 --- a/plugins/NotesAndReminders/src/stdafx.h +++ b/plugins/NotesAndReminders/src/stdafx.h @@ -7,7 +7,6 @@ #include <time.h> #include <richedit.h> -#include <win2k.h> #include <newpluginapi.h> #include <m_database.h> #include <m_utils.h> diff --git a/plugins/Nudge/src/stdafx.h b/plugins/Nudge/src/stdafx.h index 7216df9ab0..a93ce13dca 100644 --- a/plugins/Nudge/src/stdafx.h +++ b/plugins/Nudge/src/stdafx.h @@ -21,7 +21,6 @@ #include <m_database.h>
#include <m_protosvc.h>
#include <m_icolib.h>
-#include <win2k.h>
#include <m_metacontacts.h>
#include <m_nudge.h>
diff --git a/plugins/OpenFolder/src/stdafx.h b/plugins/OpenFolder/src/stdafx.h index 2020c78b28..53672789f9 100644 --- a/plugins/OpenFolder/src/stdafx.h +++ b/plugins/OpenFolder/src/stdafx.h @@ -9,7 +9,6 @@ #include <m_langpack.h>
#include <m_utils.h>
#include <m_hotkeys.h>
-#include <win2k.h>
#include <m_toptoolbar.h>
diff --git a/plugins/PackUpdater/Src/stdafx.h b/plugins/PackUpdater/Src/stdafx.h index 69b3f64373..1561d42f87 100644 --- a/plugins/PackUpdater/Src/stdafx.h +++ b/plugins/PackUpdater/Src/stdafx.h @@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. #include <vector>
// Miranda header files
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_clist.h>
#include <m_skin.h>
diff --git a/plugins/Ping/src/stdafx.h b/plugins/Ping/src/stdafx.h index 80b2da686d..7fbb838d85 100644 --- a/plugins/Ping/src/stdafx.h +++ b/plugins/Ping/src/stdafx.h @@ -24,7 +24,6 @@ #include <m_cluiframes.h>
#include <m_fontservice.h>
#include <m_icolib.h>
-#include <win2k.h>
#include "resource.h"
#include "collection.h"
diff --git a/plugins/PluginUpdater/src/stdafx.h b/plugins/PluginUpdater/src/stdafx.h index ccac6fd5d8..41c5d38590 100644 --- a/plugins/PluginUpdater/src/stdafx.h +++ b/plugins/PluginUpdater/src/stdafx.h @@ -40,7 +40,6 @@ Boston, MA 02111-1307, USA. #include <m_icolib.h>
#include <m_assocmgr.h>
#include <m_gui.h>
-#include <win2k.h>
#include <m_folders.h>
diff --git a/plugins/Popup/src/stdafx.h b/plugins/Popup/src/stdafx.h index c469b6501a..56b645dd55 100644 --- a/plugins/Popup/src/stdafx.h +++ b/plugins/Popup/src/stdafx.h @@ -61,7 +61,6 @@ https://miranda-ng.org/distr/ #include <Uxtheme.h>
#include <newpluginapi.h>
-#include <win2k.h>
#include <m_clistint.h>
#include <m_options.h>
#include <m_skin.h>
diff --git a/plugins/ProfileManager/src/stdafx.h b/plugins/ProfileManager/src/stdafx.h index 26b605671a..5d730a7b90 100644 --- a/plugins/ProfileManager/src/stdafx.h +++ b/plugins/ProfileManager/src/stdafx.h @@ -7,7 +7,6 @@ #include <m_genmenu.h>
#include <m_clist.h>
#include <m_utils.h>
-#include <win2k.h>
#include "resource.h"
#include "version.h"
diff --git a/plugins/QuickContacts/src/stdafx.h b/plugins/QuickContacts/src/stdafx.h index 88dab13406..3f40173ac1 100644 --- a/plugins/QuickContacts/src/stdafx.h +++ b/plugins/QuickContacts/src/stdafx.h @@ -39,7 +39,6 @@ Boston, MA 02111-1307, USA. #include <m_history.h>
#include <m_icolib.h>
#include <m_hotkeys.h>
-#include <win2k.h>
#include <m_metacontacts.h>
#include <m_quickcontacts.h>
diff --git a/plugins/QuickMessages/src/stdafx.h b/plugins/QuickMessages/src/stdafx.h index e3f0bcfa72..aab8622051 100644 --- a/plugins/QuickMessages/src/stdafx.h +++ b/plugins/QuickMessages/src/stdafx.h @@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <m_protosvc.h>
#include <m_srmm_int.h>
#include <m_utils.h>
-#include <win2k.h>
#include "resource.h"
#include "version.h"
diff --git a/plugins/Rate/src/stdafx.h b/plugins/Rate/src/stdafx.h index 3523bdd1f9..ddcb3ef2d3 100644 --- a/plugins/Rate/src/stdafx.h +++ b/plugins/Rate/src/stdafx.h @@ -20,7 +20,6 @@ #include <windows.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_database.h>
#include <m_langpack.h>
diff --git a/plugins/RecentContacts/src/stdafx.h b/plugins/RecentContacts/src/stdafx.h index 1f9f020b49..c984a9e4af 100644 --- a/plugins/RecentContacts/src/stdafx.h +++ b/plugins/RecentContacts/src/stdafx.h @@ -17,7 +17,6 @@ #include <m_hotkeys.h>
#include <m_protosvc.h>
#include <m_options.h>
-#include <win2k.h>
#include <m_toptoolbar.h>
diff --git a/plugins/Restart/src/stdafx.h b/plugins/Restart/src/stdafx.h index 13536d7f07..e8767c7f41 100644 --- a/plugins/Restart/src/stdafx.h +++ b/plugins/Restart/src/stdafx.h @@ -8,7 +8,6 @@ #include <m_genmenu.h>
#include <m_clist.h>
#include <m_utils.h>
-#include <win2k.h>
#include "resource.h"
#include "version.h"
diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h index 62c24c9887..b439a70149 100644 --- a/plugins/Scriver/src/stdafx.h +++ b/plugins/Scriver/src/stdafx.h @@ -62,7 +62,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_xstatus.h>
#include <m_chat_int.h>
#include <m_srmm_int.h>
-#include <win2k.h>
#include <m_ieview.h>
#include <m_smileyadd.h>
diff --git a/plugins/SecureIM/src/commonheaders.h b/plugins/SecureIM/src/commonheaders.h index 4a4078f231..bbd2c7e47d 100644 --- a/plugins/SecureIM/src/commonheaders.h +++ b/plugins/SecureIM/src/commonheaders.h @@ -19,7 +19,6 @@ #include <process.h>
#include <time.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_contacts.h>
#include <m_database.h>
diff --git a/plugins/SeenPlugin/src/stdafx.h b/plugins/SeenPlugin/src/stdafx.h index 9f75e8522d..af9f7c8354 100644 --- a/plugins/SeenPlugin/src/stdafx.h +++ b/plugins/SeenPlugin/src/stdafx.h @@ -31,7 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <malloc.h>
#include <time.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_database.h>
#include <m_langpack.h>
diff --git a/plugins/SendScreenshotPlus/src/stdafx.h b/plugins/SendScreenshotPlus/src/stdafx.h index a4fe53bdee..11b55b6e2f 100644 --- a/plugins/SendScreenshotPlus/src/stdafx.h +++ b/plugins/SendScreenshotPlus/src/stdafx.h @@ -43,7 +43,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <string> using namespace std; -#include <win2k.h> #include <msapi/vsstyle.h> #include <msapi/vssym32.h> diff --git a/plugins/Sessions/Src/stdafx.h b/plugins/Sessions/Src/stdafx.h index f365495e02..41cfa7aa1b 100644 --- a/plugins/Sessions/Src/stdafx.h +++ b/plugins/Sessions/Src/stdafx.h @@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <m_message.h>
#include <m_clistint.h>
#include <m_hotkeys.h>
-#include <win2k.h>
#include <m_toptoolbar.h>
#include <m_sessions.h>
diff --git a/plugins/ShellExt/src/stdafx.h b/plugins/ShellExt/src/stdafx.h index a40ae5dee1..c0e846187d 100644 --- a/plugins/ShellExt/src/stdafx.h +++ b/plugins/ShellExt/src/stdafx.h @@ -20,7 +20,6 @@ #include <m_langpack.h>
#include <m_options.h>
#include <m_database.h>
-#include <win2k.h>
#include "version.h"
diff --git a/plugins/SimpleStatusMsg/src/stdafx.h b/plugins/SimpleStatusMsg/src/stdafx.h index 967308dedd..402d93dab3 100644 --- a/plugins/SimpleStatusMsg/src/stdafx.h +++ b/plugins/SimpleStatusMsg/src/stdafx.h @@ -37,7 +37,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <m_icolib.h>
#include <m_hotkeys.h>
#include <m_gui.h>
-#include <win2k.h>
#include <m_statusplugins.h>
#include <m_toptoolbar.h>
diff --git a/plugins/SkypeStatusChange/src/stdafx.h b/plugins/SkypeStatusChange/src/stdafx.h index 80a056e8ee..b289ef3b4a 100644 --- a/plugins/SkypeStatusChange/src/stdafx.h +++ b/plugins/SkypeStatusChange/src/stdafx.h @@ -13,7 +13,6 @@ #include <m_options.h>
#include <m_langpack.h>
#include <m_utils.h>
-#include <win2k.h>
struct CMPlugin : public PLUGIN<CMPlugin>
{
diff --git a/plugins/SmileyAdd/src/stdafx.h b/plugins/SmileyAdd/src/stdafx.h index 7de275f731..9b0df601a5 100644 --- a/plugins/SmileyAdd/src/stdafx.h +++ b/plugins/SmileyAdd/src/stdafx.h @@ -50,7 +50,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define NETLIB_NOLOGGING
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_button.h>
#include <m_clist.h>
diff --git a/plugins/SpellChecker/src/stdafx.h b/plugins/SpellChecker/src/stdafx.h index 6907c7aa30..de0e4a153f 100644 --- a/plugins/SpellChecker/src/stdafx.h +++ b/plugins/SpellChecker/src/stdafx.h @@ -43,7 +43,6 @@ using namespace std; #include <m_message.h>
#include <m_icolib.h>
#include <m_hotkeys.h>
-#include <win2k.h>
#include <m_system.h>
//own includes
diff --git a/plugins/SplashScreen/src/stdafx.h b/plugins/SplashScreen/src/stdafx.h index 10fd640553..67ce5b6130 100644 --- a/plugins/SplashScreen/src/stdafx.h +++ b/plugins/SplashScreen/src/stdafx.h @@ -27,7 +27,6 @@ #include <time.h>
#include <dshow.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_database.h>
#include <m_clist.h>
diff --git a/plugins/StartupSilence/src/stdafx.h b/plugins/StartupSilence/src/stdafx.h index 97a37291c3..821eee234a 100644 --- a/plugins/StartupSilence/src/stdafx.h +++ b/plugins/StartupSilence/src/stdafx.h @@ -15,7 +15,6 @@ #include <m_options.h>
#include <m_protocols.h>
#include <m_system.h>
-#include "win2k.h"
#include <m_toptoolbar.h>
diff --git a/plugins/StatusManager/src/stdafx.h b/plugins/StatusManager/src/stdafx.h index 52fdc095df..79f1a1e99b 100644 --- a/plugins/StatusManager/src/stdafx.h +++ b/plugins/StatusManager/src/stdafx.h @@ -32,7 +32,6 @@ #include <m_skin.h> #include <m_utils.h> #include <m_variables.h> -#include <win2k.h> #include "version.h" #include "resource.h" diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h index f676067a79..8520aa40ec 100644 --- a/plugins/TabSRMM/src/stdafx.h +++ b/plugins/TabSRMM/src/stdafx.h @@ -50,7 +50,6 @@ #include <m_avatars.h>
#include <m_message.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_imgsrvc.h>
#include <m_database.h>
diff --git a/plugins/TipperYM/src/stdafx.h b/plugins/TipperYM/src/stdafx.h index 0804c9e2af..1bc6c5d898 100644 --- a/plugins/TipperYM/src/stdafx.h +++ b/plugins/TipperYM/src/stdafx.h @@ -28,7 +28,6 @@ Boston, MA 02111-1307, USA. #include <windowsx.h>
#include <malloc.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_avatars.h>
#include <m_awaymsg.h>
diff --git a/plugins/TipperYM/src/translations.cpp b/plugins/TipperYM/src/translations.cpp index 36bfd55bc4..3f506ac7c8 100644 --- a/plugins/TipperYM/src/translations.cpp +++ b/plugins/TipperYM/src/translations.cpp @@ -656,7 +656,7 @@ wchar_t *TimezoneToTime(MCONTACT hContact, const char *szModuleName, const char timezone += tzi.DaylightBias / 30;
lift.QuadPart = *(__int64*)&ft;
- lift.QuadPart -= (__int64)timezone * BIGI(30) * BIGI(60) * BIGI(10000000);
+ lift.QuadPart -= (__int64)timezone * 30ll * 60ll * 10000000ll;
*(__int64*)&ft = lift.QuadPart;
FileTimeToSystemTime(&ft, &st);
GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, nullptr, buff, bufflen);
diff --git a/plugins/TooltipNotify/src/stdafx.h b/plugins/TooltipNotify/src/stdafx.h index 2edef92a43..b1468020a3 100644 --- a/plugins/TooltipNotify/src/stdafx.h +++ b/plugins/TooltipNotify/src/stdafx.h @@ -24,7 +24,6 @@ #include <m_langpack.h>
#include <m_clc.h>
#include <m_fontservice.h>
-#include <win2k.h>
#define MODULENAME "TooltipNotify"
diff --git a/plugins/TopToolBar/src/stdafx.h b/plugins/TopToolBar/src/stdafx.h index 1b2cd4f566..949f641402 100644 --- a/plugins/TopToolBar/src/stdafx.h +++ b/plugins/TopToolBar/src/stdafx.h @@ -5,7 +5,6 @@ #include <commctrl.h>
#include <stddef.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_database.h>
#include <m_skin.h>
diff --git a/plugins/TrafficCounter/src/stdafx.h b/plugins/TrafficCounter/src/stdafx.h index 01fc381ec8..8b15e10c58 100644 --- a/plugins/TrafficCounter/src/stdafx.h +++ b/plugins/TrafficCounter/src/stdafx.h @@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <windowsx.h>
#include <commctrl.h>
-#include <win2k.h>
#include <m_system.h>
#include <newpluginapi.h>
diff --git a/plugins/TranslitSwitcher/src/stdafx.h b/plugins/TranslitSwitcher/src/stdafx.h index 1d97874651..eb7fc77fab 100644 --- a/plugins/TranslitSwitcher/src/stdafx.h +++ b/plugins/TranslitSwitcher/src/stdafx.h @@ -27,7 +27,6 @@ Boston, MA 02111-1307, USA. #include <m_langpack.h>
#include <m_utils.h>
#include <m_hotkeys.h>
-#include <win2k.h>
#include <m_icolib.h>
#include <m_popup.h>
#include <m_srmm_int.h>
diff --git a/plugins/UserInfoEx/src/stdafx.h b/plugins/UserInfoEx/src/stdafx.h index c6bcb36aea..79494a1969 100644 --- a/plugins/UserInfoEx/src/stdafx.h +++ b/plugins/UserInfoEx/src/stdafx.h @@ -64,7 +64,6 @@ using namespace std; #include <m_message.h>
#include <m_userinfo.h>
#include <m_email.h>
-#include <win2k.h>
#include <msapi/vsstyle.h>
#include <msapi/vssym32.h>
#include <m_skin.h>
diff --git a/plugins/Variables/src/stdafx.h b/plugins/Variables/src/stdafx.h index 5fc89bf167..7147e2e8b6 100644 --- a/plugins/Variables/src/stdafx.h +++ b/plugins/Variables/src/stdafx.h @@ -32,7 +32,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include <pdh.h>
#include <pdhmsg.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_langpack.h>
#include <m_database.h>
diff --git a/plugins/VoiceService/src/stdafx.h b/plugins/VoiceService/src/stdafx.h index 22408dfe48..b0d759deed 100644 --- a/plugins/VoiceService/src/stdafx.h +++ b/plugins/VoiceService/src/stdafx.h @@ -37,7 +37,6 @@ Boston, MA 02111-1307, USA. using namespace std; // Miranda headers -#include <win2k.h> #include <newpluginapi.h> #include <m_system.h> #include <m_protocols.h> diff --git a/plugins/WhenWasIt/src/stdafx.h b/plugins/WhenWasIt/src/stdafx.h index 579b5d51a5..080ce8256f 100644 --- a/plugins/WhenWasIt/src/stdafx.h +++ b/plugins/WhenWasIt/src/stdafx.h @@ -44,7 +44,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_hotkeys.h>
#include <m_message.h>
#include <m_extraicons.h>
-#include <win2k.h>
#include <m_toptoolbar.h>
#include <m_metacontacts.h>
diff --git a/plugins/WhoUsesMyFiles/src/stdafx.h b/plugins/WhoUsesMyFiles/src/stdafx.h index d83387ebbd..36db3d98f4 100644 --- a/plugins/WhoUsesMyFiles/src/stdafx.h +++ b/plugins/WhoUsesMyFiles/src/stdafx.h @@ -13,7 +13,6 @@ #include <m_skin.h>
#include <m_utils.h>
#include <m_popup.h>
-#include <win2k.h>
#include <m_toptoolbar.h>
diff --git a/plugins/WinterSpeak/src/stdafx.h b/plugins/WinterSpeak/src/stdafx.h index ec79a75723..0778a728d6 100644 --- a/plugins/WinterSpeak/src/stdafx.h +++ b/plugins/WinterSpeak/src/stdafx.h @@ -11,7 +11,6 @@ #include <m_database.h>
#include <m_genmenu.h>
#include <m_utils.h>
-#include <win2k.h>
#include <m_options.h>
#include <m_protocols.h>
#include <m_protosvc.h>
diff --git a/plugins/XSoundNotify/src/stdafx.h b/plugins/XSoundNotify/src/stdafx.h index 9b3fcc09e1..b11bb55a1b 100644 --- a/plugins/XSoundNotify/src/stdafx.h +++ b/plugins/XSoundNotify/src/stdafx.h @@ -11,7 +11,6 @@ #include <m_langpack.h>
#include <m_clist.h>
#include <m_skin.h>
-#include <win2k.h>
#include <m_options.h>
#include <m_chat_int.h>
diff --git a/plugins/YARelay/src/stdafx.h b/plugins/YARelay/src/stdafx.h index 85acbb020a..9c1ed1eb25 100644 --- a/plugins/YARelay/src/stdafx.h +++ b/plugins/YARelay/src/stdafx.h @@ -30,7 +30,6 @@ Features: #include <m_contacts.h>
#include <m_options.h>
#include <m_protosvc.h>
-#include <win2k.h>
#include "resource.h"
#include "version.h"
diff --git a/plugins/wbOSD/src/stdafx.h b/plugins/wbOSD/src/stdafx.h index 2443ce67ca..41a85c54ab 100644 --- a/plugins/wbOSD/src/stdafx.h +++ b/plugins/wbOSD/src/stdafx.h @@ -21,7 +21,6 @@ Distributed under GNU's GPL 2 or later #include <m_clist.h>
#include <m_protosvc.h>
#include <m_ignore.h>
-#include <win2k.h>
#include <m_message.h>
#include "resource.h"
diff --git a/protocols/CurrencyRates/src/stdafx.h b/protocols/CurrencyRates/src/stdafx.h index 69cfb91df0..0d44c339f5 100644 --- a/protocols/CurrencyRates/src/stdafx.h +++ b/protocols/CurrencyRates/src/stdafx.h @@ -20,7 +20,6 @@ #include <newpluginapi.h> #include <m_database.h> -#include <win2k.h> #include <m_xml.h> #include <m_clist.h> #include <m_langpack.h> diff --git a/protocols/Discord/src/stdafx.h b/protocols/Discord/src/stdafx.h index 9d3951a4e9..e80ebac2cf 100644 --- a/protocols/Discord/src/stdafx.h +++ b/protocols/Discord/src/stdafx.h @@ -47,7 +47,6 @@ #include <m_utils.h> #include <m_voice.h> #include <m_voiceservice.h> -#include <win2k.h> #include "../../libs/zlib/src/zlib.h" diff --git a/protocols/Dummy/src/stdafx.h b/protocols/Dummy/src/stdafx.h index 0373de751c..ddc55299d5 100644 --- a/protocols/Dummy/src/stdafx.h +++ b/protocols/Dummy/src/stdafx.h @@ -53,11 +53,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <m_userinfo.h> #include <m_utils.h> #include <m_proto_listeningto.h> - #include <m_folders.h> -#include "win2k.h" - #include "resource.h" #include "dummy.h" #include "dummy_proto.h" diff --git a/protocols/Facebook/src/stdafx.h b/protocols/Facebook/src/stdafx.h index 35e52dcfc5..a347227114 100644 --- a/protocols/Facebook/src/stdafx.h +++ b/protocols/Facebook/src/stdafx.h @@ -28,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <string.h> #include <assert.h> -#include <win2k.h> #include <newpluginapi.h> #include <m_avatars.h> #include <m_chat_int.h> diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h index 977b798a53..a3f0a1278e 100644 --- a/protocols/Gadu-Gadu/src/gg.h +++ b/protocols/Gadu-Gadu/src/gg.h @@ -66,7 +66,6 @@ #include <m_json.h>
#include <m_chat_int.h>
#include <m_popup.h>
-#include <win2k.h>
#include <m_folders.h>
#include <m_gui.h>
diff --git a/protocols/ICQ-WIM/src/stdafx.h b/protocols/ICQ-WIM/src/stdafx.h index 1e9d5de7c7..2d9f2b66f5 100644 --- a/protocols/ICQ-WIM/src/stdafx.h +++ b/protocols/ICQ-WIM/src/stdafx.h @@ -67,7 +67,6 @@ #include <m_timezones.h> #include <m_userinfo.h> #include <m_utils.h> -#include <win2k.h> #include <openssl/evp.h> #include <openssl/hmac.h> diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 74df705b51..b93cf61176 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "stdafx.h"
-#include <win2k.h>
static void removeSpaces(wchar_t* p)
{
diff --git a/protocols/IRCG/src/stdafx.h b/protocols/IRCG/src/stdafx.h index 35d3d6ca94..e5278318ac 100644 --- a/protocols/IRCG/src/stdafx.h +++ b/protocols/IRCG/src/stdafx.h @@ -64,7 +64,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "m_chat_int.h"
#include "m_icolib.h"
#include "m_string.h"
-#include "win2k.h"
#include "m_gui.h"
#include "resource.h"
diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h index 483f77cc97..6fece86135 100755 --- a/protocols/JabberG/src/stdafx.h +++ b/protocols/JabberG/src/stdafx.h @@ -85,7 +85,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_userinfo.h>
#include <m_utils.h>
#include <m_xstatus.h>
-#include <win2k.h>
#include <m_imgsrvc.h>
#include <m_clc.h>
#include <m_xml.h>
diff --git a/protocols/LotusNotify/src/stdafx.h b/protocols/LotusNotify/src/stdafx.h index e4d7c40456..7a6bf951a8 100644 --- a/protocols/LotusNotify/src/stdafx.h +++ b/protocols/LotusNotify/src/stdafx.h @@ -10,7 +10,6 @@ //LotusNotify.h #include <m_core.h> -#include <win2k.h> #include <newpluginapi.h> #include <m_clistint.h> #include <m_skin.h> diff --git a/protocols/MinecraftDynmap/src/stdafx.h b/protocols/MinecraftDynmap/src/stdafx.h index e107eb0c52..0ad95df797 100644 --- a/protocols/MinecraftDynmap/src/stdafx.h +++ b/protocols/MinecraftDynmap/src/stdafx.h @@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <io.h> #include <windows.h> -#include <win2k.h> #include <commctrl.h> #include <newpluginapi.h> diff --git a/protocols/NewsAggregator/Src/stdafx.h b/protocols/NewsAggregator/Src/stdafx.h index e583659595..906b172c8e 100644 --- a/protocols/NewsAggregator/Src/stdafx.h +++ b/protocols/NewsAggregator/Src/stdafx.h @@ -41,7 +41,6 @@ Boston, MA 02111-1307, USA. #include <m_netlib.h> #include <m_icolib.h> #include <m_message.h> -#include <win2k.h> #include <m_xml.h> #include <m_avatars.h> #include <m_hotkeys.h> diff --git a/protocols/Non-IM Contact/src/stdafx.h b/protocols/Non-IM Contact/src/stdafx.h index e0d30707fe..d98b8e9607 100644 --- a/protocols/Non-IM Contact/src/stdafx.h +++ b/protocols/Non-IM Contact/src/stdafx.h @@ -44,7 +44,6 @@ struct DLGTEMPLATEEX #include <m_utils.h> #include <m_ignore.h> #include <m_netlib.h> -#include <win2k.h> #include "resource.h" diff --git a/protocols/Omegle/src/stdafx.h b/protocols/Omegle/src/stdafx.h index 7e35190ff9..256f6420ac 100644 --- a/protocols/Omegle/src/stdafx.h +++ b/protocols/Omegle/src/stdafx.h @@ -36,7 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <io.h>
#include <windows.h>
-#include <win2k.h>
#include <commctrl.h>
#include <newpluginapi.h>
diff --git a/protocols/Twitter/src/stdafx.h b/protocols/Twitter/src/stdafx.h index ea7820cf29..658303d9be 100644 --- a/protocols/Twitter/src/stdafx.h +++ b/protocols/Twitter/src/stdafx.h @@ -49,7 +49,6 @@ using std::map; #include <m_utils.h>
#include <m_hotkeys.h>
#include <m_json.h>
-#include <win2k.h>
#pragma warning(pop)
#include <openssl/hmac.h>
diff --git a/protocols/VKontakte/src/stdafx.h b/protocols/VKontakte/src/stdafx.h index ba93d6295a..991ebf26f4 100644 --- a/protocols/VKontakte/src/stdafx.h +++ b/protocols/VKontakte/src/stdafx.h @@ -55,8 +55,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <m_metacontacts.h>
#include <m_smileyadd.h>
-#include "win2k.h"
-
#include "resource.h"
#include "vk.h"
#include "vk_struct.h"
diff --git a/protocols/Weather/src/stdafx.h b/protocols/Weather/src/stdafx.h index 6d92215975..6436d766b9 100644 --- a/protocols/Weather/src/stdafx.h +++ b/protocols/Weather/src/stdafx.h @@ -53,7 +53,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <m_skin_eng.h> #include <m_cluiframes.h> #include <m_popup.h> -#include <win2k.h> #include <m_acc.h> #include <m_weather.h> diff --git a/protocols/YAMN/src/stdafx.h b/protocols/YAMN/src/stdafx.h index 6d56c51a15..2858640d6b 100644 --- a/protocols/YAMN/src/stdafx.h +++ b/protocols/YAMN/src/stdafx.h @@ -8,7 +8,6 @@ #include <windowsx.h> #include <commctrl.h> -#include <win2k.h> #include <newpluginapi.h> #include <m_clistint.h> #include <m_contacts.h> diff --git a/src/core/stdautoaway/src/stdafx.h b/src/core/stdautoaway/src/stdafx.h index 32d73b4cb6..841c4d50b9 100644 --- a/src/core/stdautoaway/src/stdafx.h +++ b/src/core/stdautoaway/src/stdafx.h @@ -40,7 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <direct.h>
#include <malloc.h>
-#include <win2k.h>
#include <m_system.h>
#include <newpluginapi.h>
#include <m_utils.h>
diff --git a/src/core/stdaway/src/stdafx.h b/src/core/stdaway/src/stdafx.h index a52a8558f9..f7863b348b 100644 --- a/src/core/stdaway/src/stdafx.h +++ b/src/core/stdaway/src/stdafx.h @@ -40,7 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <direct.h>
#include <malloc.h>
-#include <win2k.h>
#include <m_system.h>
#include <newpluginapi.h>
#include <m_utils.h>
diff --git a/src/core/stdclist/src/stdafx.h b/src/core/stdclist/src/stdafx.h index d76bf0a398..e189b79d12 100644 --- a/src/core/stdclist/src/stdafx.h +++ b/src/core/stdclist/src/stdafx.h @@ -37,7 +37,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <Uxtheme.h>
#include <shlwapi.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_clistint.h>
#include <m_system.h>
diff --git a/src/core/stdcrypt/src/stdafx.h b/src/core/stdcrypt/src/stdafx.h index d8e8900434..e97567258a 100644 --- a/src/core/stdcrypt/src/stdafx.h +++ b/src/core/stdcrypt/src/stdafx.h @@ -40,7 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <direct.h>
#include <malloc.h>
-#include <win2k.h>
#include <m_system.h>
#include <newpluginapi.h>
#include <m_utils.h>
diff --git a/src/core/stdemail/src/stdafx.h b/src/core/stdemail/src/stdafx.h index 39afdcfe2f..eac4283c5f 100644 --- a/src/core/stdemail/src/stdafx.h +++ b/src/core/stdemail/src/stdafx.h @@ -40,7 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <direct.h>
#include <malloc.h>
-#include <win2k.h>
#include <m_system.h>
#include <newpluginapi.h>
#include <m_utils.h>
diff --git a/src/core/stdfile/src/fileexistsdlg.cpp b/src/core/stdfile/src/fileexistsdlg.cpp index 923690c52f..da3037190f 100644 --- a/src/core/stdfile/src/fileexistsdlg.cpp +++ b/src/core/stdfile/src/fileexistsdlg.cpp @@ -31,7 +31,7 @@ static void SetControlToUnixTime(HWND hwndDlg, UINT idCtrl, time_t unixTime) SYSTEMTIME st;
char szTime[64], szDate[64], szOutput[128];
- liFiletime.QuadPart = (BIGI(11644473600)+(__int64)unixTime)*10000000;
+ liFiletime.QuadPart = (11644473600ll + (__int64)unixTime) * 10000000;
filetime.dwHighDateTime = liFiletime.HighPart;
filetime.dwLowDateTime = liFiletime.LowPart;
FileTimeToSystemTime(&filetime, &st);
@@ -52,7 +52,7 @@ static void DoAnnoyingShellCommand(HWND hwnd, const wchar_t *szFilename, int cmd IShellFolder *pDesktopFolder;
if (SHGetDesktopFolder(&pDesktopFolder) == NOERROR) {
ITEMIDLIST *pCurrentIdl;
- WCHAR* wszFilename = (LPWSTR)szFilename;
+ WCHAR *wszFilename = (LPWSTR)szFilename;
if (pDesktopFolder->ParseDisplayName(nullptr, nullptr, wszFilename, nullptr, &pCurrentIdl, nullptr) == NOERROR) {
if (pCurrentIdl->mkid.cb) {
@@ -60,18 +60,18 @@ static void DoAnnoyingShellCommand(HWND hwnd, const wchar_t *szFilename, int cmd IShellFolder *pFileFolder;
for (pidl = pCurrentIdl;;) {
- pidlNext = (ITEMIDLIST*)((PBYTE)pidl + pidl->mkid.cb);
+ pidlNext = (ITEMIDLIST *)((PBYTE)pidl + pidl->mkid.cb);
if (pidlNext->mkid.cb == 0) {
- pidlFilename = (ITEMIDLIST*)CoTaskMemAlloc(pidl->mkid.cb + sizeof(pidl->mkid.cb));
+ pidlFilename = (ITEMIDLIST *)CoTaskMemAlloc(pidl->mkid.cb + sizeof(pidl->mkid.cb));
memcpy(pidlFilename, pidl, pidl->mkid.cb + sizeof(pidl->mkid.cb));
pidl->mkid.cb = 0;
break;
}
pidl = pidlNext;
}
- if (pDesktopFolder->BindToObject(pCurrentIdl, nullptr, IID_IShellFolder, (void**)&pFileFolder) == NOERROR) {
+ if (pDesktopFolder->BindToObject(pCurrentIdl, nullptr, IID_IShellFolder, (void **)&pFileFolder) == NOERROR) {
IContextMenu *pContextMenu;
- if (pFileFolder->GetUIObjectOf(nullptr, 1, (LPCITEMIDLIST*)&pidlFilename, IID_IContextMenu, nullptr, (void**)&pContextMenu) == NOERROR) {
+ if (pFileFolder->GetUIObjectOf(nullptr, 1, (LPCITEMIDLIST *)&pidlFilename, IID_IContextMenu, nullptr, (void **)&pContextMenu) == NOERROR) {
switch (cmd) {
case C_PROPERTIES:
{
@@ -114,7 +114,7 @@ static void DoAnnoyingShellCommand(HWND hwnd, const wchar_t *szFilename, int cmd static LRESULT CALLBACK IconCtrlSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
- PROTOFILETRANSFERSTATUS* pft = (PROTOFILETRANSFERSTATUS*)GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA);
+ PROTOFILETRANSFERSTATUS *pft = (PROTOFILETRANSFERSTATUS *)GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA);
switch (msg) {
case WM_LBUTTONDBLCLK:
@@ -130,14 +130,15 @@ static LRESULT CALLBACK IconCtrlSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, return mir_callNextSubclass(hwnd, IconCtrlSubclassProc, msg, wParam, lParam);
}
-struct loadiconsstartinfo {
+struct loadiconsstartinfo
+{
HWND hwndDlg;
wchar_t *szFilename;
};
-void __cdecl LoadIconsAndTypesThread(void* param)
+void __cdecl LoadIconsAndTypesThread(void *param)
{
- loadiconsstartinfo *info = (loadiconsstartinfo*)param;
+ loadiconsstartinfo *info = (loadiconsstartinfo *)param;
SHFILEINFO fileInfo;
if (SHGetFileInfo(info->szFilename, 0, &fileInfo, sizeof(fileInfo), SHGFI_TYPENAME | SHGFI_ICON | SHGFI_LARGEICON)) {
@@ -196,7 +197,7 @@ void __cdecl LoadIconsAndTypesThread(void* param) INT_PTR CALLBACK DlgProcFileExists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
- PROTOFILETRANSFERSTATUS *fts = (PROTOFILETRANSFERSTATUS*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+ PROTOFILETRANSFERSTATUS *fts = (PROTOFILETRANSFERSTATUS *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
switch (msg) {
case WM_INITDIALOG:
TranslateDialogDefault(hwndDlg);
@@ -208,7 +209,7 @@ INT_PTR CALLBACK DlgProcFileExists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM SetPropA(hwndDlg, "Miranda.Preshutdown", HookEventMessage(ME_SYSTEM_PRESHUTDOWN, hwndDlg, M_PRESHUTDOWN));
SetPropA(hwndDlg, "Miranda.ParentWnd", dat->hwndParent);
- fts = (PROTOFILETRANSFERSTATUS*)mir_alloc(sizeof(PROTOFILETRANSFERSTATUS));
+ fts = (PROTOFILETRANSFERSTATUS *)mir_alloc(sizeof(PROTOFILETRANSFERSTATUS));
CopyProtoFileTransferStatus(fts, dat->fts);
SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)fts);
SetDlgItemText(hwndDlg, IDC_FILENAME, fts->szCurrentFile.w);
@@ -229,7 +230,7 @@ INT_PTR CALLBACK DlgProcFileExists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM }
}
- loadiconsstartinfo *lisi = (loadiconsstartinfo*)mir_alloc(sizeof(loadiconsstartinfo));
+ loadiconsstartinfo *lisi = (loadiconsstartinfo *)mir_alloc(sizeof(loadiconsstartinfo));
lisi->hwndDlg = hwndDlg;
lisi->szFilename = mir_wstrdup(fts->szCurrentFile.w);
//can be a little slow, so why not?
diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp index b3e9137524..cd48520cbe 100644 --- a/src/core/stdfile/src/filexferdlg.cpp +++ b/src/core/stdfile/src/filexferdlg.cpp @@ -318,13 +318,13 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR if (dat->bytesRecvedHistory[0] == dat->bytesRecvedHistory[dat->bytesRecvedHistorySize - 1]) mir_wstrcpy(szTime, L"??:??:??"); else { - li.QuadPart = BIGI(10000000)*(dat->transferStatus.currentFileSize - dat->transferStatus.currentFileProgress)*dat->bytesRecvedHistorySize / (dat->bytesRecvedHistory[0] - dat->bytesRecvedHistory[dat->bytesRecvedHistorySize - 1]); + li.QuadPart = 10000000ll*(dat->transferStatus.currentFileSize - dat->transferStatus.currentFileProgress)*dat->bytesRecvedHistorySize / (dat->bytesRecvedHistory[0] - dat->bytesRecvedHistory[dat->bytesRecvedHistorySize - 1]); ft.dwHighDateTime = li.HighPart; ft.dwLowDateTime = li.LowPart; FileTimeToSystemTime(&ft, &st); GetTimeFormat(LOCALE_USER_DEFAULT, TIME_FORCE24HOURFORMAT | TIME_NOTIMEMARKER, &st, NULL, szTime, _countof(szTime)); } if (dat->bytesRecvedHistory[0] != dat->bytesRecvedHistory[dat->bytesRecvedHistorySize - 1]) { - li.QuadPart = BIGI(10000000)*(dat->transferStatus.totalBytes - dat->transferStatus.totalProgress)*dat->bytesRecvedHistorySize / (dat->bytesRecvedHistory[0] - dat->bytesRecvedHistory[dat->bytesRecvedHistorySize - 1]); + li.QuadPart = 10000000ll*(dat->transferStatus.totalBytes - dat->transferStatus.totalProgress)*dat->bytesRecvedHistorySize / (dat->bytesRecvedHistory[0] - dat->bytesRecvedHistory[dat->bytesRecvedHistorySize - 1]); ft.dwHighDateTime = li.HighPart; ft.dwLowDateTime = li.LowPart; FileTimeToSystemTime(&ft, &st); GetTimeFormat(LOCALE_USER_DEFAULT, TIME_FORCE24HOURFORMAT | TIME_NOTIMEMARKER, &st, NULL, szTime, _countof(szTime)); @@ -598,7 +598,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR } const unsigned long lastPos = SendDlgItemMessage(hwndDlg, IDC_ALLFILESPROGRESS, PBM_GETPOS, 0, 0); - const unsigned long nextPos = fts->totalBytes ? (BIGI(100) * fts->totalProgress / fts->totalBytes) : 0; + const unsigned long nextPos = fts->totalBytes ? (100ll * fts->totalProgress / fts->totalBytes) : 0; if (lastPos != nextPos || firstTime) { SendDlgItemMessage(hwndDlg, IDC_ALLFILESPROGRESS, PBM_SETPOS, nextPos, 0); mir_snwprintf(str, L"%u%%", nextPos); diff --git a/src/core/stdfile/src/stdafx.h b/src/core/stdfile/src/stdafx.h index deee782c8c..96c2dce667 100644 --- a/src/core/stdfile/src/stdafx.h +++ b/src/core/stdfile/src/stdafx.h @@ -43,7 +43,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <sys/types.h>
#include <sys/stat.h>
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_system.h>
#include <m_database.h>
diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h index b0b88384ff..f535f65be1 100644 --- a/src/core/stdmsg/src/stdafx.h +++ b/src/core/stdmsg/src/stdafx.h @@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "resource.h"
-#include <win2k.h>
#include <newpluginapi.h>
#include <m_system.h>
#include <m_database.h>
diff --git a/src/core/stdpopup/src/stdafx.h b/src/core/stdpopup/src/stdafx.h index 9fbddc138a..cbfc804a58 100644 --- a/src/core/stdpopup/src/stdafx.h +++ b/src/core/stdpopup/src/stdafx.h @@ -24,7 +24,6 @@ #include <m_popup_int.h> #include <m_icolib.h> #include <m_toptoolbar.h> -#include <win2k.h> #include <m_ieview.h> //need this for special renderers diff --git a/src/core/stduihist/src/stdafx.h b/src/core/stduihist/src/stdafx.h index fdbd948dc1..b95dffe789 100644 --- a/src/core/stduihist/src/stdafx.h +++ b/src/core/stduihist/src/stdafx.h @@ -40,7 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <direct.h>
#include <malloc.h>
-#include <win2k.h>
#include <m_system.h>
#include <newpluginapi.h>
#include <m_database.h>
diff --git a/src/core/stduserinfo/src/stdafx.h b/src/core/stduserinfo/src/stdafx.h index 627ce29bdb..89ea62be05 100644 --- a/src/core/stduserinfo/src/stdafx.h +++ b/src/core/stduserinfo/src/stdafx.h @@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <direct.h>
#include <malloc.h>
-#include <win2k.h>
#include <m_system.h>
#include <m_core.h>
#include <newpluginapi.h>
diff --git a/src/core/stduseronline/src/stdafx.h b/src/core/stduseronline/src/stdafx.h index 3ebc2cdac7..2eb6a534e8 100644 --- a/src/core/stduseronline/src/stdafx.h +++ b/src/core/stduseronline/src/stdafx.h @@ -40,7 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <direct.h>
#include <malloc.h>
-#include <win2k.h>
#include <m_system.h>
#include <newpluginapi.h>
#include <m_database.h>
diff --git a/src/mir_app/src/stdafx.h b/src/mir_app/src/stdafx.h index 70dc6e1981..211f1f1736 100644 --- a/src/mir_app/src/stdafx.h +++ b/src/mir_app/src/stdafx.h @@ -58,8 +58,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <direct.h>
#define __NO_CMPLUGIN_NEEDED
-#include <win2k.h>
-
#include <newpluginapi.h>
#include <m_avatars.h>
#include <m_awaymsg.h>
diff --git a/src/mir_core/src/stdafx.h b/src/mir_core/src/stdafx.h index 7f2cf387cc..4934c8b1d9 100644 --- a/src/mir_core/src/stdafx.h +++ b/src/mir_core/src/stdafx.h @@ -50,8 +50,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <direct.h>
#define __NO_CMPLUGIN_NEEDED
-#include <win2k.h>
-
#include <m_system.h>
#include <m_database.h>
#include <m_db_int.h>
diff --git a/src/mir_core/src/winver.cpp b/src/mir_core/src/winver.cpp index b2f3ca3a1f..28ced22337 100644 --- a/src/mir_core/src/winver.cpp +++ b/src/mir_core/src/winver.cpp @@ -17,6 +17,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "stdafx.h"
+#ifndef _WIN32_WINNT_WIN8
+#define _WIN32_WINNT_WIN8 0x0602 // Windows 8
+#endif
+
+#ifndef _WIN32_WINNT_WINBLUE
+#define _WIN32_WINNT_WINBLUE 0x0603 // Windows 8.1
+#endif
+
+#ifndef _WIN32_WINNT_WIN10
+#define _WIN32_WINNT_WIN10 0x0A00 // Windows 10
+#endif
+
static int dwWinVer;
void InitWinver()
diff --git a/utils/mir_fonts.cpp b/utils/mir_fonts.cpp index 0f97ef2f5f..cd99916cc1 100644 --- a/utils/mir_fonts.cpp +++ b/utils/mir_fonts.cpp @@ -2,7 +2,6 @@ #include <m_system.h> #include <m_fontservice.h> -#include <win2k.h> #include "mir_fonts.h" |