Fixed mismatches between the Wine headers and the Microsoft headers.
diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c
index f039a17..6e82ed1 100644
--- a/dlls/shell32/clipboard.c
+++ b/dlls/shell32/clipboard.c
@@ -145,7 +145,7 @@
{
int i,offset = 0, sizePidl, size;
HGLOBAL hGlobal;
- LPCIDA pcida;
+ LPIDA pcida;
TRACE("(%p,%p,%u)\n", pidlRoot, apidl, cidl);
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index ad4a4ab..8ec14e0 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1776,7 +1776,7 @@
*
* creates aPidl from CIDA
*/
-LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, LPCIDA cida)
+LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, LPIDA cida)
{
int i;
LPITEMIDLIST * dst = (LPITEMIDLIST*)SHAlloc(cida->cidl * sizeof(LPITEMIDLIST));
diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h
index 37c7280..e1b9220 100644
--- a/dlls/shell32/pidl.h
+++ b/dlls/shell32/pidl.h
@@ -194,6 +194,6 @@
*/
void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl);
LPITEMIDLIST * _ILCopyaPidl(LPITEMIDLIST * apidlsrc, UINT cidl);
-LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, LPCIDA cida);
+LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, LPIDA cida);
#endif
diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c
index b1fa3d2..7ad84a2 100644
--- a/dlls/shell32/shv_bg_cmenu.c
+++ b/dlls/shell32/shv_bg_cmenu.c
@@ -240,7 +240,7 @@
LPITEMIDLIST pidl;
IShellFolder *psfFrom = NULL, *psfDesktop;
- LPCIDA lpcida = GlobalLock(medium.u.hGlobal);
+ LPIDA lpcida = GlobalLock(medium.u.hGlobal);
TRACE("cida=%p\n", lpcida);
apidl = _ILCopyCidaToaPidl(&pidl, lpcida);
diff --git a/include/shellapi.h b/include/shellapi.h
index 223c138..708c81f 100644
--- a/include/shellapi.h
+++ b/include/shellapi.h
@@ -39,7 +39,7 @@
BOOL fNC;
LPSTR lpFileList;
DWORD grfKeyState;
-} DRAGINFOA, * LPDRAGINFOA;
+} DRAGINFOA, *LPDRAGINFOA;
typedef struct _DRAGINFOW
{ UINT uSize;
@@ -47,7 +47,7 @@
BOOL fNC;
LPWSTR lpFileList;
DWORD grfKeyState;
-} DRAGINFOW, LPDRAGINFOW;
+} DRAGINFOW, *LPDRAGINFOW;
DECL_WINELIB_TYPE_AW(DRAGINFO)
DECL_WINELIB_TYPE_AW(LPDRAGINFO)
diff --git a/include/shlobj.h b/include/shlobj.h
index 74b9d50..62f4054 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -29,6 +29,8 @@
extern "C" {
#endif /* defined(__cplusplus) */
+#include "pshpack1.h"
+
/****************************************************************************
* SHITEMID, ITEMIDLIST, PIDL API
*/
@@ -84,7 +86,7 @@
typedef struct
{ UINT cidl;
UINT aoffset[1];
-} CIDA, *LPCIDA,*LPIDA;
+} CIDA, *LPIDA;
#define CFSTR_SHELLIDLISTOFFSET "Shell Object Offsets" /* CF_OBJECTPOSITIONS */
#define CFSTR_NETRESOURCES "Net Resource" /* CF_NETRESOURCE */
@@ -543,6 +545,8 @@
BOOL fWide;
} DROPFILES;
+#include "poppack.h"
+
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
diff --git a/include/shlwapi.h b/include/shlwapi.h
index f7856dd..29d5edf 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -27,6 +27,8 @@
extern "C" {
#endif /* defined(__cplusplus) */
+#include "pshpack1.h"
+
#ifndef NO_SHLWAPI_REG
/* Registry functions */
@@ -924,6 +926,8 @@
HRESULT WINAPI DllInstall(BOOL,LPCWSTR);
+#include "poppack.h"
+
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
