JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/shellapi.h: Include all structs within pshpack2.h/ 

poppack.h block.
This commit is contained in:
Danny Smith 2003-07-31 05:40:39 +00:00
parent a16d51edf6
commit de03e10ca5
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/w32api/ChangeLog
View File

@ -1,3 +1,8 @@
2003-07-31 Danny Smith <dannysmith@users.sourceforge.net>
* include/shellapi.h: Include all structs within pshpack2.h/
poppack.h block.
2003-07-26 Danny Smith <dannysmith@users.sourceforge.net> 2003-07-26 Danny Smith <dannysmith@users.sourceforge.net>
* include/winuser.h (ASFW_ANY, LSFW_LOCK, LSFW_UNLOCK, * include/winuser.h (ASFW_ANY, LSFW_LOCK, LSFW_UNLOCK,

6
winsup/w32api/include/shellapi.h
View File

@ -1,6 +1,6 @@
#ifndef _SHELLAPI_H #ifndef _SHELLAPI_H
#define _SHELLAPI_H #define _SHELLAPI_H
#if __GNUC__ >=3 #if __GNUC__ >= 3
#pragma GCC system_header #pragma GCC system_header
#endif #endif
@ -96,6 +96,7 @@ extern "C" {
typedef WORD FILEOP_FLAGS; typedef WORD FILEOP_FLAGS;
typedef WORD PRINTEROP_FLAGS; typedef WORD PRINTEROP_FLAGS;
#include <pshpack2.h>
typedef struct _AppBarData { typedef struct _AppBarData {
DWORD cbSize; DWORD cbSize;
HWND hWnd; HWND hWnd;
@ -157,7 +158,6 @@ typedef struct _SHELLEXECUTEINFOW {
HANDLE hIcon; HANDLE hIcon;
HANDLE hProcess; HANDLE hProcess;
} SHELLEXECUTEINFOW,*LPSHELLEXECUTEINFOW; } SHELLEXECUTEINFOW,*LPSHELLEXECUTEINFOW;
#include <pshpack2.h>
typedef struct _SHFILEOPSTRUCTA { typedef struct _SHFILEOPSTRUCTA {
HWND hwnd; HWND hwnd;
UINT wFunc; UINT wFunc;
@ -178,7 +178,6 @@ typedef struct _SHFILEOPSTRUCTW {
PVOID hNameMappings; PVOID hNameMappings;
LPCWSTR lpszProgressTitle; LPCWSTR lpszProgressTitle;
} SHFILEOPSTRUCTW,*LPSHFILEOPSTRUCTW; } SHFILEOPSTRUCTW,*LPSHFILEOPSTRUCTW;
#include <poppack.h>
typedef struct _SHFILEINFOA { typedef struct _SHFILEINFOA {
HICON hIcon; HICON hIcon;
int iIcon; int iIcon;
@ -198,6 +197,7 @@ typedef struct _SHQUERYRBINFO {
__int64 i64Size; __int64 i64Size;
__int64 i64NumItems; __int64 i64NumItems;
} SHQUERYRBINFO, *LPSHQUERYRBINFO; } SHQUERYRBINFO, *LPSHQUERYRBINFO;
#include <poppack.h>
LPWSTR * WINAPI CommandLineToArgvW(LPCWSTR,int*); LPWSTR * WINAPI CommandLineToArgvW(LPCWSTR,int*);
void WINAPI DragAcceptFiles(HWND,BOOL); void WINAPI DragAcceptFiles(HWND,BOOL);