From 832c97fe3be0221e71d0018b9922abed75443c6d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 3 Mar 2016 13:03:11 +0000 Subject: [PATCH 1/1] [INETCOMM] Sync with Wine Staging 1.9.4. CORE-10912 [PSDK] Update objidl.idl. [MAPI32][OLE32] Adapt to objidl.idl changes. svn path=/trunk/; revision=70870 --- reactos/dll/win32/inetcomm/mimeole.c | 6 +++--- reactos/dll/win32/mapi32/imalloc.c | 6 +++--- reactos/dll/win32/ole32/ifs.c | 6 +++--- reactos/include/psdk/objidl.idl | 18 +++++++++--------- reactos/media/doc/README.WINE | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/reactos/dll/win32/inetcomm/mimeole.c b/reactos/dll/win32/inetcomm/mimeole.c index 01ed28bc939..06f0296daad 100644 --- a/reactos/dll/win32/inetcomm/mimeole.c +++ b/reactos/dll/win32/inetcomm/mimeole.c @@ -2803,7 +2803,7 @@ static ULONG WINAPI MimeAlloc_Release( static LPVOID WINAPI MimeAlloc_Alloc( IMimeAllocator* iface, - ULONG cb) + SIZE_T cb) { return CoTaskMemAlloc(cb); } @@ -2811,7 +2811,7 @@ static LPVOID WINAPI MimeAlloc_Alloc( static LPVOID WINAPI MimeAlloc_Realloc( IMimeAllocator* iface, LPVOID pv, - ULONG cb) + SIZE_T cb) { return CoTaskMemRealloc(pv, cb); } @@ -2823,7 +2823,7 @@ static void WINAPI MimeAlloc_Free( CoTaskMemFree(pv); } -static ULONG WINAPI MimeAlloc_GetSize( +static SIZE_T WINAPI MimeAlloc_GetSize( IMimeAllocator* iface, LPVOID pv) { diff --git a/reactos/dll/win32/mapi32/imalloc.c b/reactos/dll/win32/mapi32/imalloc.c index bd002cfe6c2..a3264aa2bec 100644 --- a/reactos/dll/win32/mapi32/imalloc.c +++ b/reactos/dll/win32/mapi32/imalloc.c @@ -96,7 +96,7 @@ static ULONG WINAPI IMAPIMalloc_fnRelease(LPMALLOC iface) /************************************************************************** * IMAPIMalloc_Alloc */ -static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb) +static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, SIZE_T cb) { TRACE("(%p)->(%d)\n", iface, cb); @@ -106,7 +106,7 @@ static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb) /************************************************************************** * IMAPIMalloc_Realloc */ -static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb) +static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, SIZE_T cb) { TRACE("(%p)->(%p, %d)\n", iface, pv, cb); @@ -132,7 +132,7 @@ static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv) /************************************************************************** * IMAPIMalloc_GetSize */ -static DWORD WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) +static SIZE_T WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) { TRACE("(%p)->(%p)\n", iface, pv); return LocalSize(pv); diff --git a/reactos/dll/win32/ole32/ifs.c b/reactos/dll/win32/ole32/ifs.c index 09e95c55958..207dd8640ae 100644 --- a/reactos/dll/win32/ole32/ifs.c +++ b/reactos/dll/win32/ole32/ifs.c @@ -148,7 +148,7 @@ static ULONG WINAPI IMalloc_fnAddRefRelease (LPMALLOC iface) { /****************************************************************************** * IMalloc32_Alloc [VTABLE] */ -static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface, DWORD cb) { +static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface, SIZE_T cb) { LPVOID addr; @@ -182,7 +182,7 @@ static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface, DWORD cb) { /****************************************************************************** * IMalloc32_Realloc [VTABLE] */ -static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) { +static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,SIZE_T cb) { LPVOID pNewMemory; @@ -270,7 +270,7 @@ static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) { * win95: size allocated (4 byte boundarys) * win2k: size originally requested !!! (allocated on 8 byte boundarys) */ -static DWORD WINAPI IMalloc_fnGetSize(LPMALLOC iface,LPVOID pv) { +static SIZE_T WINAPI IMalloc_fnGetSize(LPMALLOC iface,LPVOID pv) { DWORD cb; BOOL fSpyed = FALSE; diff --git a/reactos/include/psdk/objidl.idl b/reactos/include/psdk/objidl.idl index c18442fde1f..335282d74de 100644 --- a/reactos/include/psdk/objidl.idl +++ b/reactos/include/psdk/objidl.idl @@ -162,16 +162,16 @@ interface IMalloc : IUnknown typedef [unique] IMalloc *LPMALLOC; LPVOID Alloc( - [in] ULONG cb); + [in] SIZE_T cb); LPVOID Realloc( [in] LPVOID pv, - [in] ULONG cb); + [in] SIZE_T cb); void Free( [in] LPVOID pv); - ULONG GetSize( + SIZE_T GetSize( [in] LPVOID pv); int DidAlloc(LPVOID pv); @@ -188,8 +188,8 @@ interface IMallocSpy : IUnknown { typedef [unique] IMallocSpy *LPMALLOCSPY; - ULONG PreAlloc( - [in] ULONG cbRequest); + SIZE_T PreAlloc( + [in] SIZE_T cbRequest); LPVOID PostAlloc( [in] LPVOID pActual); @@ -201,9 +201,9 @@ interface IMallocSpy : IUnknown void PostFree( [in] BOOL fSpyed); - ULONG PreRealloc( + SIZE_T PreRealloc( [in] LPVOID pRequest, - [in] ULONG cbRequest, + [in] SIZE_T cbRequest, [out] LPVOID *ppNewRequest, [in] BOOL fSpyed); @@ -215,8 +215,8 @@ interface IMallocSpy : IUnknown [in] LPVOID pRequest, [in] BOOL fSpyed); - ULONG PostGetSize( - [in] ULONG cbActual, + SIZE_T PostGetSize( + [in] SIZE_T cbActual, [in] BOOL fSpyed); LPVOID PreDidAlloc( diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index fbc9fbbee6b..6c537839518 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -78,7 +78,7 @@ reactos/dll/win32/ieframe # Synced to WineStaging-1.9.4 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/imagehlp # Synced to WineStaging-1.7.55 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 -reactos/dll/win32/inetcomm # Synced to WineStaging-1.7.55 +reactos/dll/win32/inetcomm # Synced to WineStaging-1.9.4 reactos/dll/win32/inetmib1 # Synced to WineStaging-1.7.55 reactos/dll/win32/initpki # Synced to WineStaging-1.7.55 reactos/dll/win32/inseng # Synced to WineStaging-1.7.55 -- 2.17.1