[akhaldi] 74849: [URLMON] Sync with Wine Staging 2.9. CORE-13362 700010f urlmon: Fix some spec file entries. c1ae3db urlmon: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. 9c4ac7f urlmon...

Author: akhaldi
Date: Sun Jun  4 01:46:26 2017
New Revision: 74849

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

700010f urlmon: Fix some spec file entries.
c1ae3db urlmon: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
9c4ac7f urlmon: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().

Modified:
    trunk/reactos/dll/win32/urlmon/urlmon.spec
    trunk/reactos/dll/win32/urlmon/urlmon_main.h
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/urlmon.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/urlmon.spec	[iso-8859-1] Sun Jun  4 01:46:26 2017
@@ -8,7 +8,7 @@
 #107 CoInternetApproveExtension
 108 stdcall -noname IsInternetESCEnabledLocal()
 #109 stub AsyncGetClassBits
-110 stdcall AsyncInstallDistributionUnit(ptr ptr ptr long long ptr ptr ptr long)
+110 stdcall AsyncInstallDistributionUnit(wstr wstr wstr long long wstr ptr ptr long)
 111 stdcall -noname IsProtectedModeURL(ptr)
 #112 IsProtectedModeIUri
 #113 IsFileInSpecialDirs
@@ -29,7 +29,7 @@
 128 stdcall CoInternetCreateZoneManager(ptr ptr long)
 #129 CoInternetFeatureSettingsChanged
 #130 stub CoInternetGetProtocolFlags
-131 stdcall CoInternetGetSecurityUrl(ptr ptr long long)
+131 stdcall CoInternetGetSecurityUrl(wstr ptr long long)
 132 stdcall CoInternetGetSecurityUrlEx(ptr ptr long long)
 133 stdcall CoInternetGetSession(long ptr long)
 134 stdcall CoInternetIsFeatureEnabled(long long)
@@ -38,7 +38,7 @@
 137 stdcall CoInternetIsFeatureZoneElevationEnabled(wstr wstr ptr long)
 138 stdcall CoInternetParseIUri(ptr long long wstr long ptr long)
 139 stdcall CoInternetParseUrl(wstr long long wstr long ptr long)
-140 stdcall CoInternetQueryInfo(ptr long long ptr long ptr long)
+140 stdcall CoInternetQueryInfo(wstr long long ptr long ptr long)
 141 stdcall CoInternetSetFeatureEnabled(long long long)
 142 stdcall CompareSecurityIds(ptr long ptr long long)
 #143 CompatFlagsFromClsid
@@ -61,11 +61,11 @@
 @ stdcall -private DllRegisterServer()
 @ stdcall -private DllRegisterServerEx()
 @ stdcall -private DllUnregisterServer()
-163 stdcall Extract(long ptr)
+163 stdcall Extract(ptr str)
 164 stdcall FaultInIEFeature(long ptr ptr long)
 #165 stub FindMediaType
 #166 stub FindMediaTypeClass
-167 stdcall FindMimeFromData(ptr ptr ptr long ptr long ptr long)
+167 stdcall FindMimeFromData(ptr wstr ptr long wstr long ptr long)
 #168 GetAddSitesFileUrl
 169 stdcall GetClassFileOrMime(ptr wstr ptr long wstr long ptr)
 #170 stub GetClassURL
@@ -77,7 +77,7 @@
 #176 GetPortFromUrlScheme
 #177 GetPropertyFromName
 #178 GetPropertyName
-179 stdcall GetSoftwareUpdateInfo(ptr ptr)
+179 stdcall GetSoftwareUpdateInfo(wstr ptr)
 #180 GetUrlmonThreadNotificationHwnd
 181 stdcall -stub HlinkGoBack(ptr)
 182 stdcall -stub HlinkGoForward(ptr)

Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/urlmon_main.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/urlmon_main.h	[iso-8859-1] Sun Jun  4 01:46:26 2017
@@ -245,24 +245,24 @@
 
 const char *debugstr_bindstatus(ULONG) DECLSPEC_HIDDEN;
 
-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 *heap_realloc_zero(void *mem, size_t len)
-{
-    return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 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 void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size)
+{
+    return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size);
 }
 
 static inline BOOL heap_free(void *mem)

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] Sun Jun  4 01:46:26 2017
@@ -188,7 +188,7 @@
 reactos/dll/win32/twain_32            # Synced to WineStaging-1.9.11
 reactos/dll/win32/updspapi            # Synced to WineStaging-1.9.11
 reactos/dll/win32/url                 # Synced to WineStaging-1.9.11
-reactos/dll/win32/urlmon              # Synced to WineStaging-2.2
+reactos/dll/win32/urlmon              # Synced to WineStaging-2.9
 reactos/dll/win32/usp10               # Synced to WineStaging-2.2
 reactos/dll/win32/uxtheme             # Forked
 reactos/dll/win32/vbscript            # Synced to WineStaging-1.9.23