Skip to content
Snippets Groups Projects
Commit ced69a9c authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard
Browse files

Fixed mismatches between the Wine headers and the Microsoft headers.

parent d31c8eca
No related branches found
No related tags found
No related merge requests found
......@@ -145,7 +145,7 @@ HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cid
{
int i,offset = 0, sizePidl, size;
HGLOBAL hGlobal;
LPCIDA pcida;
LPIDA pcida;
TRACE("(%p,%p,%u)\n", pidlRoot, apidl, cidl);
......
......@@ -1776,7 +1776,7 @@ LPITEMIDLIST * _ILCopyaPidl(LPITEMIDLIST * apidlsrc, UINT cidl)
*
* 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));
......
......@@ -194,6 +194,6 @@ BOOL pcheck (LPCITEMIDLIST pidl);
*/
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
......@@ -240,7 +240,7 @@ static BOOL DoPaste(
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);
......
......@@ -39,7 +39,7 @@ typedef struct _DRAGINFOA
BOOL fNC;
LPSTR lpFileList;
DWORD grfKeyState;
} DRAGINFOA, * LPDRAGINFOA;
} DRAGINFOA, *LPDRAGINFOA;
typedef struct _DRAGINFOW
{ UINT uSize;
......@@ -47,7 +47,7 @@ typedef struct _DRAGINFOW
BOOL fNC;
LPWSTR lpFileList;
DWORD grfKeyState;
} DRAGINFOW, LPDRAGINFOW;
} DRAGINFOW, *LPDRAGINFOW;
DECL_WINELIB_TYPE_AW(DRAGINFO)
DECL_WINELIB_TYPE_AW(LPDRAGINFO)
......
......@@ -29,6 +29,8 @@
extern "C" {
#endif /* defined(__cplusplus) */
#include "pshpack1.h"
/****************************************************************************
* SHITEMID, ITEMIDLIST, PIDL API
*/
......@@ -84,7 +86,7 @@ extern UINT cfShellIDList;
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 @@ typedef struct _DROPFILES
BOOL fWide;
} DROPFILES;
#include "poppack.h"
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
......
......@@ -27,6 +27,8 @@
extern "C" {
#endif /* defined(__cplusplus) */
#include "pshpack1.h"
#ifndef NO_SHLWAPI_REG
/* Registry functions */
......@@ -924,6 +926,8 @@ typedef struct _DLLVERSIONINFO2 {
HRESULT WINAPI DllInstall(BOOL,LPCWSTR);
#include "poppack.h"
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment