Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-01 18:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add some missing definitions

Browse source 
Fix wrong structure alignment

svn path=/trunk/; revision=28591
This commit is contained in:
Hervé Poussineau 2007-08-27 06:56:39 +00:00
parent abf715b9b2
commit 6c31cb21d1
1 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

30
reactos/include/psdk/shellapi.h
View file

@ -124,7 +124,7 @@ extern "C" {
typedef WORD FILEOP_FLAGS; typedef WORD FILEOP_FLAGS;
typedef WORD PRINTEROP_FLAGS; typedef WORD PRINTEROP_FLAGS;
#include <pshpack2.h> #include <pshpack1.h>
typedef struct _AppBarData { typedef struct _AppBarData {
DWORD cbSize; DWORD cbSize;
HWND hWnd; HWND hWnd;
@ -187,6 +187,28 @@ typedef struct _NOTIFYICONDATAW {
#endif #endif
} NOTIFYICONDATAW,*PNOTIFYICONDATAW; } 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 { typedef struct _SHELLEXECUTEINFOA {
DWORD cbSize; DWORD cbSize;
ULONG fMask; ULONG fMask;
@ -310,7 +332,10 @@ HRESULT WINAPI SHEmptyRecycleBinA(HWND,LPCSTR,DWORD);
HRESULT WINAPI SHEmptyRecycleBinW(HWND,LPCWSTR,DWORD); HRESULT WINAPI SHEmptyRecycleBinW(HWND,LPCWSTR,DWORD);
#ifdef UNICODE #ifdef UNICODE
#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE
#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE
typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA; typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA;
typedef DRAGINFOW DRAGINFO,*LPDRAGINFO;
typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO; typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;
typedef SHFILEOPSTRUCTW SHFILEOPSTRUCT,*LPSHFILEOPSTRUCT; typedef SHFILEOPSTRUCTW SHFILEOPSTRUCT,*LPSHFILEOPSTRUCT;
typedef SHFILEINFOW SHFILEINFO; typedef SHFILEINFOW SHFILEINFO;
@ -332,7 +357,10 @@ typedef LPSHNAMEMAPPINGW LPSHNAMEMAPPING;
#define SHEmptyRecycleBin SHEmptyRecycleBinW #define SHEmptyRecycleBin SHEmptyRecycleBinW
#else #else
#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAA_V1_SIZE
#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAA_V2_SIZE
typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA; typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA;
typedef DRAGINFOA DRAGINFO,*LPDRAGINFO;
typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO; typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;
typedef SHFILEOPSTRUCTA SHFILEOPSTRUCT,*LPSHFILEOPSTRUCT; typedef SHFILEOPSTRUCTA SHFILEOPSTRUCT,*LPSHFILEOPSTRUCT;
typedef SHFILEINFOA SHFILEINFO; typedef SHFILEINFOA SHFILEINFO;