Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-02 12:32:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IEFRAME] Sync with Wine Staging 2.9. CORE-13362

Browse source 
2bb8458 ieframe: Return DISP_E_UNKNOWNNAME in IShellUIHelper2::GetIDsOfNames.
bd8bd97 ieframe: Fix IEWinMain spec file entry.
f499395 ieframe: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.

svn path=/trunk/; revision=74807
This commit is contained in:
Amine Khaldi 2017-06-03 22:27:36 +00:00
parent fb9fc24487
commit 8de656fc77
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/win32/ieframe/ieframe.h
View file

@ -348,19 +348,19 @@ static inline void unlock_module(void) {
InterlockedDecrement(&module_ref);
}
static inline void *heap_alloc(size_t len)
static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
{
return HeapAlloc(GetProcessHeap(), 0, len);
return HeapAlloc(GetProcessHeap(), 0, size);
}
static inline void *heap_alloc_zero(size_t len)
static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size)
{
return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
}
static inline void *heap_realloc(void *mem, size_t len)
static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size)
{
return HeapReAlloc(GetProcessHeap(), 0, mem, len);
return HeapReAlloc(GetProcessHeap(), 0, mem, size);
}
static inline BOOL heap_free(void *mem)

2
reactos/dll/win32/ieframe/ieframe.spec
View file

@ -1,5 +1,5 @@
# ordinal exports
101 stdcall -noname IEWinMain(str long)
101 stdcall -noname IEWinMain(wstr long)
@ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(ptr ptr ptr)

10
reactos/dll/win32/ieframe/shelluihelper.c
View file

@ -98,9 +98,13 @@ static HRESULT WINAPI ShellUIHelper2_GetIDsOfNames(IShellUIHelper2 *iface, REFII
LCID lcid, DISPID *rgDispId)
{
ShellUIHelper *This = impl_from_IShellUIHelper2(iface);
FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
unsigned i;
FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
for(i = 0; i < cNames; i++)
FIXME("%s\n", debugstr_w(rgszNames[i]));
return DISP_E_UNKNOWNNAME;
}
static HRESULT WINAPI ShellUIHelper2_Invoke(IShellUIHelper2 *iface, DISPID dispIdMember,

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

@ -74,7 +74,7 @@ reactos/dll/win32/hlink # Synced to WineStaging-2.9
reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16
reactos/dll/win32/httpapi # Synced to WineStaging-2.9
reactos/dll/win32/iccvid # Synced to WineStaging-2.2
reactos/dll/win32/ieframe # Synced to WineStaging-2.2
reactos/dll/win32/ieframe # Synced to WineStaging-2.9
reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.2
reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11
reactos/dll/win32/imm32 # Synced to Wine-1.7.27