[akhaldi] 70870: [INETCOMM] Sync with Wine Staging 1.9.4. CORE-10912 [PSDK] Update objidl.idl. [MAPI32][OLE32] Adapt to objidl.idl changes.
5 Mar
2016
5 Mar
'16
10:36 a.m.
Author: akhaldi
Date: Thu Mar 3 13:03:11 2016
New Revision: 70870
URL: http://svn.reactos.org/svn/reactos?rev=70870&view=rev
Log:
[INETCOMM] Sync with Wine Staging 1.9.4. CORE-10912 [PSDK] Update objidl.idl.
[MAPI32][OLE32] Adapt to objidl.idl changes.
Modified:
trunk/reactos/dll/win32/inetcomm/mimeole.c
trunk/reactos/dll/win32/mapi32/imalloc.c
trunk/reactos/dll/win32/ole32/ifs.c
trunk/reactos/include/psdk/objidl.idl
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/inetcomm/mimeole.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/mimeole…
==============================================================================
--- trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] Thu Mar 3 13:03:11 2016
@@ -2803,7 +2803,7 @@
static LPVOID WINAPI MimeAlloc_Alloc(
IMimeAllocator* iface,
- ULONG cb)
+ SIZE_T cb)
{
return CoTaskMemAlloc(cb);
}
@@ -2811,7 +2811,7 @@
static LPVOID WINAPI MimeAlloc_Realloc(
IMimeAllocator* iface,
LPVOID pv,
- ULONG cb)
+ SIZE_T cb)
{
return CoTaskMemRealloc(pv, cb);
}
@@ -2823,7 +2823,7 @@
CoTaskMemFree(pv);
}
-static ULONG WINAPI MimeAlloc_GetSize(
+static SIZE_T WINAPI MimeAlloc_GetSize(
IMimeAllocator* iface,
LPVOID pv)
{
Modified: trunk/reactos/dll/win32/mapi32/imalloc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/imalloc.c…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/imalloc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/imalloc.c [iso-8859-1] Thu Mar 3 13:03:11 2016
@@ -96,7 +96,7 @@
/**************************************************************************
* 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 @@
/**************************************************************************
* 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 @@
/**************************************************************************
* 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);
Modified: trunk/reactos/dll/win32/ole32/ifs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ifs.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/ole32/ifs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/ifs.c [iso-8859-1] Thu Mar 3 13:03:11 2016
@@ -148,7 +148,7 @@
/******************************************************************************
* 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 @@
/******************************************************************************
* 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 @@
* 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;
Modified: trunk/reactos/include/psdk/objidl.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objidl.idl?re…
==============================================================================
--- trunk/reactos/include/psdk/objidl.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/objidl.idl [iso-8859-1] Thu Mar 3 13:03:11 2016
@@ -162,16 +162,16 @@
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 @@
{
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 @@
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 @@
[in] LPVOID pRequest,
[in] BOOL fSpyed);
- ULONG PostGetSize(
- [in] ULONG cbActual,
+ SIZE_T PostGetSize(
+ [in] SIZE_T cbActual,
[in] BOOL fSpyed);
LPVOID PreDidAlloc(
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Mar 3 13:03:11 2016
@@ -78,7 +78,7 @@
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
3319
days inactive
3319
days old
0 comments
1 participants
participants (1)
-
akhaldi＠svn.reactos.org