ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed mismatches between the Wine headers and the Microsoft headers.

This commit is contained in:
Patrik Stridvall 2002-11-12 01:05:00 +00:00 committed by Alexandre Julliard
parent d31c8eca74
commit ced69a9cad
7 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shell32/clipboard.c
View File

@ -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);

2
dlls/shell32/pidl.c
View File

@ -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));

2
dlls/shell32/pidl.h
View File

@ -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

2
dlls/shell32/shv_bg_cmenu.c
View File

@ -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);

4
include/shellapi.h
View File

@ -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)

6
include/shlobj.h
View File

@ -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) */

4
include/shlwapi.h
View File

@ -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) */