https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d2139b7d8b9f8e36e07059b9ff8ee65ef5f29df
commit 9d2139b7d8b9f8e36e07059b9ff8ee65ef5f29df Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Sun Feb 4 01:51:46 2018 +0100 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Sun Feb 4 01:56:53 2018 +0100 [PSDK] Fix NOTIFYICONDATA structure; add NOTIFYICONDATA_V3_SIZE definitions. --- sdk/include/psdk/shellapi.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/include/psdk/shellapi.h b/sdk/include/psdk/shellapi.h index 5845c2a9bb..2e26e59868 100644 --- a/sdk/include/psdk/shellapi.h +++ b/sdk/include/psdk/shellapi.h @@ -217,8 +217,6 @@ typedef struct _NOTIFYICONDATAA { } DUMMYUNIONNAME; CHAR szInfoTitle[64]; DWORD dwInfoFlags; -#else - CHAR szTip[64]; #endif #if (NTDDI_VERSION >= NTDDI_WINXP) GUID guidItem; @@ -236,7 +234,7 @@ typedef struct _NOTIFYICONDATAW { UINT uCallbackMessage; HICON hIcon; #if (NTDDI_VERSION < NTDDI_WIN2K) - CHAR szTip[64]; + WCHAR szTip[64]; #endif #if (NTDDI_VERSION >= NTDDI_WIN2K) WCHAR szTip[128]; @@ -249,14 +247,12 @@ typedef struct _NOTIFYICONDATAW { } DUMMYUNIONNAME; WCHAR szInfoTitle[64]; DWORD dwInfoFlags; -#else - WCHAR szTip[64]; #endif #if (NTDDI_VERSION >= NTDDI_WINXP) GUID guidItem; #endif #if (NTDDI_VERSION >= NTDDI_VISTA) - HICON hBalloonIcon; + HICON hBalloonIcon; #endif } NOTIFYICONDATAW,*PNOTIFYICONDATAW; @@ -264,6 +260,8 @@ typedef struct _NOTIFYICONDATAW { #define NOTIFYICONDATAW_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAW, szTip[64]) #define NOTIFYICONDATAA_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAA, 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 typedef struct _DRAGINFOA { @@ -612,6 +610,7 @@ DoEnvironmentSubstW( #ifdef UNICODE #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE #define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE +#define NOTIFYICONDATA_V3_SIZE NOTIFYICONDATAW_V3_SIZE typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA; typedef DRAGINFOW DRAGINFO,*LPDRAGINFO; typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO; @@ -639,6 +638,7 @@ typedef LPSHNAMEMAPPINGW LPSHNAMEMAPPING; #else #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAA_V1_SIZE #define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAA_V2_SIZE +#define NOTIFYICONDATA_V3_SIZE NOTIFYICONDATAA_V3_SIZE typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA; typedef DRAGINFOA DRAGINFO,*LPDRAGINFO; typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;
