[ros-diffs] [akhaldi] 74807: [IEFRAME] Sync with Wine Staging 2.9. CORE-13362 2bb8458 ieframe: Return DISP_E_UNKNOWNNAME in IShellUIHelper2::GetIDsOfNames. bd8bd97 ieframe: Fix IEWinMain spec file entry. f4993...

Author: akhaldi
Date: Sat Jun  3 22:27:36 2017
New Revision: 74807

URL: http://svn.reactos.org/svn/reactos?rev=74807&view=rev
Log:
[IEFRAME] Sync with Wine Staging 2.9. CORE-13362

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.

Modified:
    trunk/reactos/dll/win32/ieframe/ieframe.h
    trunk/reactos/dll/win32/ieframe/ieframe.spec
    trunk/reactos/dll/win32/ieframe/shelluihelper.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/ieframe/ieframe.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/ieframe.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/ieframe.h	[iso-8859-1] Sat Jun  3 22:27:36 2017
@@ -348,19 +348,19 @@
     InterlockedDecrement(&module_ref);
 }
 
-static inline void *heap_alloc(size_t len)
-{
-    return HeapAlloc(GetProcessHeap(), 0, len);
-}
-
-static inline void *heap_alloc_zero(size_t len)
-{
-    return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
-}
-
-static inline void *heap_realloc(void *mem, size_t len)
-{
-    return HeapReAlloc(GetProcessHeap(), 0, mem, len);
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
+{
+    return HeapAlloc(GetProcessHeap(), 0, size);
+}
+
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size)
+{
+    return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
+}
+
+static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size)
+{
+    return HeapReAlloc(GetProcessHeap(), 0, mem, size);
 }
 
 static inline BOOL heap_free(void *mem)

Modified: trunk/reactos/dll/win32/ieframe/ieframe.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/ieframe.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/ieframe.spec	[iso-8859-1] Sat Jun  3 22:27:36 2017
@@ -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)

Modified: trunk/reactos/dll/win32/ieframe/shelluihelper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/shelluih…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/shelluihelper.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/shelluihelper.c	[iso-8859-1] Sat Jun  3 22:27:36 2017
@@ -98,9 +98,13 @@
         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,

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] Sat Jun  3 22:27:36 2017
@@ -74,7 +74,7 @@
 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