[ros-diffs] [hpoussin] 28591: Add some missing definitions Fix wrong structure alignment

[hpoussin at svn.reactos.org]

Author: hpoussin
Date: Mon Aug 27 10:56:39 2007
New Revision: 28591

URL: http://svn.reactos.org/svn/reactos?rev=28591&view=rev
Log:
Add some missing definitions
Fix wrong structure alignment

Modified:
    trunk/reactos/include/psdk/shellapi.h

Modified: trunk/reactos/include/psdk/shellapi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?rev=28591&r1=28590&r2=28591&view=diff
==============================================================================
--- trunk/reactos/include/psdk/shellapi.h (original)
+++ trunk/reactos/include/psdk/shellapi.h Mon Aug 27 10:56:39 2007
@@ -124,7 +124,7 @@
 
 typedef WORD FILEOP_FLAGS;
 typedef WORD PRINTEROP_FLAGS;
-#include <pshpack2.h>
+#include <pshpack1.h>
 typedef struct _AppBarData {
 	DWORD	cbSize;
 	HWND	hWnd;
@@ -186,6 +186,28 @@
 	GUID guidItem;
 #endif
 } NOTIFYICONDATAW,*PNOTIFYICONDATAW;
+
+#define NOTIFYICONDATAA_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAA, szTip[64])
+#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)
+
+#if WINVER >= 0x400
+typedef struct _DRAGINFOA {
+	UINT uSize;
+	POINT pt;
+	BOOL fNC;
+	LPSTR lpFileList;
+	DWORD grfKeyState;
+} DRAGINFOA,*LPDRAGINFOA;
+typedef struct _DRAGINFOW {
+	UINT uSize;
+	POINT pt;
+	BOOL fNC;
+	LPWSTR lpFileList;
+	DWORD grfKeyState;
+} DRAGINFOW,*LPDRAGINFOW;
+#endif
 
 typedef struct _SHELLEXECUTEINFOA {
 	DWORD cbSize;
@@ -310,7 +332,10 @@
 HRESULT WINAPI SHEmptyRecycleBinW(HWND,LPCWSTR,DWORD);
 
 #ifdef UNICODE
+#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE
+#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE
 typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA;
+typedef DRAGINFOW DRAGINFO,*LPDRAGINFO;
 typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;
 typedef SHFILEOPSTRUCTW SHFILEOPSTRUCT,*LPSHFILEOPSTRUCT;
 typedef SHFILEINFOW SHFILEINFO;
@@ -332,7 +357,10 @@
 #define SHEmptyRecycleBin SHEmptyRecycleBinW
 
 #else
+#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAA_V1_SIZE
+#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAA_V2_SIZE
 typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA;
+typedef DRAGINFOA DRAGINFO,*LPDRAGINFO;
 typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;
 typedef SHFILEOPSTRUCTA SHFILEOPSTRUCT,*LPSHFILEOPSTRUCT;
 typedef SHFILEINFOA SHFILEINFO;