Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-28 17:38:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[INETCOMM] Sync with Wine Staging 1.9.4. CORE-10912 [PSDK] Update objidl.idl. [MAPI32][OLE32] Adapt to objidl.idl changes.

Browse source 
svn path=/trunk/; revision=70870
This commit is contained in:
Amine Khaldi 2016-03-03 13:03:11 +00:00
parent b1ef18e020
commit 832c97fe3b
5 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/inetcomm/mimeole.c
View file

@ -2803,7 +2803,7 @@ static ULONG WINAPI MimeAlloc_Release(
static LPVOID WINAPI MimeAlloc_Alloc( static LPVOID WINAPI MimeAlloc_Alloc(
IMimeAllocator* iface, IMimeAllocator* iface,
ULONG cb) SIZE_T cb)
{ {
return CoTaskMemAlloc(cb); return CoTaskMemAlloc(cb);
} }
@ -2811,7 +2811,7 @@ static LPVOID WINAPI MimeAlloc_Alloc(
static LPVOID WINAPI MimeAlloc_Realloc( static LPVOID WINAPI MimeAlloc_Realloc(
IMimeAllocator* iface, IMimeAllocator* iface,
LPVOID pv, LPVOID pv,
ULONG cb) SIZE_T cb)
{ {
return CoTaskMemRealloc(pv, cb); return CoTaskMemRealloc(pv, cb);
} }
@ -2823,7 +2823,7 @@ static void WINAPI MimeAlloc_Free(
CoTaskMemFree(pv); CoTaskMemFree(pv);
} }
static ULONG WINAPI MimeAlloc_GetSize( static SIZE_T WINAPI MimeAlloc_GetSize(
IMimeAllocator* iface, IMimeAllocator* iface,
LPVOID pv) LPVOID pv)
{ {

6
reactos/dll/win32/mapi32/imalloc.c
View file

@ -96,7 +96,7 @@ static ULONG WINAPI IMAPIMalloc_fnRelease(LPMALLOC iface)
/************************************************************************** /**************************************************************************
* IMAPIMalloc_Alloc * 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); TRACE("(%p)->(%d)\n", iface, cb);
@ -106,7 +106,7 @@ static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb)
/************************************************************************** /**************************************************************************
* IMAPIMalloc_Realloc * 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); TRACE("(%p)->(%p, %d)\n", iface, pv, cb);
@ -132,7 +132,7 @@ static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv)
/************************************************************************** /**************************************************************************
* IMAPIMalloc_GetSize * 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); TRACE("(%p)->(%p)\n", iface, pv);
return LocalSize(pv); return LocalSize(pv);

6
reactos/dll/win32/ole32/ifs.c
View file

@ -148,7 +148,7 @@ static ULONG WINAPI IMalloc_fnAddRefRelease (LPMALLOC iface) {
/****************************************************************************** /******************************************************************************
* IMalloc32_Alloc [VTABLE] * IMalloc32_Alloc [VTABLE]
*/ */
static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface, DWORD cb) { static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface, SIZE_T cb) {
LPVOID addr; LPVOID addr;
@ -182,7 +182,7 @@ static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface, DWORD cb) {
/****************************************************************************** /******************************************************************************
* IMalloc32_Realloc [VTABLE] * 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; LPVOID pNewMemory;
@ -270,7 +270,7 @@ static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) {
* win95: size allocated (4 byte boundarys) * win95: size allocated (4 byte boundarys)
* win2k: size originally requested !!! (allocated on 8 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; DWORD cb;
BOOL fSpyed = FALSE; BOOL fSpyed = FALSE;

18
reactos/include/psdk/objidl.idl
View file

@ -162,16 +162,16 @@ interface IMalloc : IUnknown
typedef [unique] IMalloc *LPMALLOC; typedef [unique] IMalloc *LPMALLOC;
LPVOID Alloc( LPVOID Alloc(
[in] ULONG cb); [in] SIZE_T cb);
LPVOID Realloc( LPVOID Realloc(
[in] LPVOID pv, [in] LPVOID pv,
[in] ULONG cb); [in] SIZE_T cb);
void Free( void Free(
[in] LPVOID pv); [in] LPVOID pv);
ULONG GetSize( SIZE_T GetSize(
[in] LPVOID pv); [in] LPVOID pv);
int DidAlloc(LPVOID pv); int DidAlloc(LPVOID pv);
@ -188,8 +188,8 @@ interface IMallocSpy : IUnknown
{ {
typedef [unique] IMallocSpy *LPMALLOCSPY; typedef [unique] IMallocSpy *LPMALLOCSPY;
ULONG PreAlloc( SIZE_T PreAlloc(
[in] ULONG cbRequest); [in] SIZE_T cbRequest);
LPVOID PostAlloc( LPVOID PostAlloc(
[in] LPVOID pActual); [in] LPVOID pActual);
@ -201,9 +201,9 @@ interface IMallocSpy : IUnknown
void PostFree( void PostFree(
[in] BOOL fSpyed); [in] BOOL fSpyed);
ULONG PreRealloc( SIZE_T PreRealloc(
[in] LPVOID pRequest, [in] LPVOID pRequest,
[in] ULONG cbRequest, [in] SIZE_T cbRequest,
[out] LPVOID *ppNewRequest, [out] LPVOID *ppNewRequest,
[in] BOOL fSpyed); [in] BOOL fSpyed);
@ -215,8 +215,8 @@ interface IMallocSpy : IUnknown
[in] LPVOID pRequest, [in] LPVOID pRequest,
[in] BOOL fSpyed); [in] BOOL fSpyed);
ULONG PostGetSize( SIZE_T PostGetSize(
[in] ULONG cbActual, [in] SIZE_T cbActual,
[in] BOOL fSpyed); [in] BOOL fSpyed);
LPVOID PreDidAlloc( LPVOID PreDidAlloc(

2
reactos/media/doc/README.WINE
View file

@ -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/imaadp32.acm # Synced to WineStaging-1.7.55
reactos/dll/win32/imagehlp # 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/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/inetmib1 # Synced to WineStaging-1.7.55
reactos/dll/win32/initpki # 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 reactos/dll/win32/inseng # Synced to WineStaging-1.7.55