mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 13:34:53 +00:00
[PSDK] Fix NOTIFYICONDATA structure; add NOTIFYICONDATA_V3_SIZE definitions.
This commit is contained in:
parent
adcb9bd175
commit
9d2139b7d8
|
@ -217,8 +217,6 @@ typedef struct _NOTIFYICONDATAA {
|
||||||
} DUMMYUNIONNAME;
|
} DUMMYUNIONNAME;
|
||||||
CHAR szInfoTitle[64];
|
CHAR szInfoTitle[64];
|
||||||
DWORD dwInfoFlags;
|
DWORD dwInfoFlags;
|
||||||
#else
|
|
||||||
CHAR szTip[64];
|
|
||||||
#endif
|
#endif
|
||||||
#if (NTDDI_VERSION >= NTDDI_WINXP)
|
#if (NTDDI_VERSION >= NTDDI_WINXP)
|
||||||
GUID guidItem;
|
GUID guidItem;
|
||||||
|
@ -236,7 +234,7 @@ typedef struct _NOTIFYICONDATAW {
|
||||||
UINT uCallbackMessage;
|
UINT uCallbackMessage;
|
||||||
HICON hIcon;
|
HICON hIcon;
|
||||||
#if (NTDDI_VERSION < NTDDI_WIN2K)
|
#if (NTDDI_VERSION < NTDDI_WIN2K)
|
||||||
CHAR szTip[64];
|
WCHAR szTip[64];
|
||||||
#endif
|
#endif
|
||||||
#if (NTDDI_VERSION >= NTDDI_WIN2K)
|
#if (NTDDI_VERSION >= NTDDI_WIN2K)
|
||||||
WCHAR szTip[128];
|
WCHAR szTip[128];
|
||||||
|
@ -249,8 +247,6 @@ typedef struct _NOTIFYICONDATAW {
|
||||||
} DUMMYUNIONNAME;
|
} DUMMYUNIONNAME;
|
||||||
WCHAR szInfoTitle[64];
|
WCHAR szInfoTitle[64];
|
||||||
DWORD dwInfoFlags;
|
DWORD dwInfoFlags;
|
||||||
#else
|
|
||||||
WCHAR szTip[64];
|
|
||||||
#endif
|
#endif
|
||||||
#if (NTDDI_VERSION >= NTDDI_WINXP)
|
#if (NTDDI_VERSION >= NTDDI_WINXP)
|
||||||
GUID guidItem;
|
GUID guidItem;
|
||||||
|
@ -264,6 +260,8 @@ typedef struct _NOTIFYICONDATAW {
|
||||||
#define NOTIFYICONDATAW_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAW, szTip[64])
|
#define NOTIFYICONDATAW_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAW, szTip[64])
|
||||||
#define NOTIFYICONDATAA_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAA, guidItem)
|
#define NOTIFYICONDATAA_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAA, guidItem)
|
||||||
#define NOTIFYICONDATAW_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAW, guidItem)
|
#define NOTIFYICONDATAW_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAW, guidItem)
|
||||||
|
#define NOTIFYICONDATAA_V3_SIZE FIELD_OFFSET(NOTIFYICONDATAA, hBalloonIcon)
|
||||||
|
#define NOTIFYICONDATAW_V3_SIZE FIELD_OFFSET(NOTIFYICONDATAW, hBalloonIcon)
|
||||||
|
|
||||||
#if WINVER >= 0x400
|
#if WINVER >= 0x400
|
||||||
typedef struct _DRAGINFOA {
|
typedef struct _DRAGINFOA {
|
||||||
|
@ -612,6 +610,7 @@ DoEnvironmentSubstW(
|
||||||
#ifdef UNICODE
|
#ifdef UNICODE
|
||||||
#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE
|
#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE
|
||||||
#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE
|
#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE
|
||||||
|
#define NOTIFYICONDATA_V3_SIZE NOTIFYICONDATAW_V3_SIZE
|
||||||
typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA;
|
typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA;
|
||||||
typedef DRAGINFOW DRAGINFO,*LPDRAGINFO;
|
typedef DRAGINFOW DRAGINFO,*LPDRAGINFO;
|
||||||
typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;
|
typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;
|
||||||
|
@ -639,6 +638,7 @@ typedef LPSHNAMEMAPPINGW LPSHNAMEMAPPING;
|
||||||
#else
|
#else
|
||||||
#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAA_V1_SIZE
|
#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAA_V1_SIZE
|
||||||
#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAA_V2_SIZE
|
#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAA_V2_SIZE
|
||||||
|
#define NOTIFYICONDATA_V3_SIZE NOTIFYICONDATAA_V3_SIZE
|
||||||
typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA;
|
typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA;
|
||||||
typedef DRAGINFOA DRAGINFO,*LPDRAGINFO;
|
typedef DRAGINFOA DRAGINFO,*LPDRAGINFO;
|
||||||
typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;
|
typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;
|
||||||
|
|
Loading…
Reference in a new issue