[akhaldi] 68429: [FUSION] Sync with Wine Staging 1.7.47. CORE-9924

Author: akhaldi
Date: Sun Jul 19 13:16:45 2015
New Revision: 68429

URL: http://svn.reactos.org/svn/reactos?rev=68429&view=rev
Log:
[FUSION] Sync with Wine Staging 1.7.47. CORE-9924

Modified:
    trunk/reactos/dll/win32/fusion/asmcache.c
    trunk/reactos/dll/win32/fusion/asmenum.c
    trunk/reactos/dll/win32/fusion/asmname.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/fusion/asmcache.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmcache.c...
==============================================================================
--- trunk/reactos/dll/win32/fusion/asmcache.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/asmcache.c	[iso-8859-1] Sun Jul 19 13:16:45 2015
@@ -151,7 +151,7 @@
         IsEqualIID(riid, &IID_IAssemblyCache))
     {
         IAssemblyCache_AddRef(iface);
-        *ppobj = This;
+        *ppobj = &This->IAssemblyCache_iface;
         return S_OK;
     }

@@ -580,7 +580,7 @@
         IsEqualIID(riid, &IID_IAssemblyCacheItem))
     {
         IAssemblyCacheItem_AddRef(iface);
-        *ppobj = This;
+        *ppobj = &This->IAssemblyCacheItem_iface;
         return S_OK;
     }

Modified: trunk/reactos/dll/win32/fusion/asmenum.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmenum.c?...
==============================================================================
--- trunk/reactos/dll/win32/fusion/asmenum.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/asmenum.c	[iso-8859-1] Sun Jul 19 13:16:45 2015
@@ -55,7 +55,7 @@
         IsEqualIID(riid, &IID_IAssemblyEnum))
     {
         IAssemblyEnum_AddRef(iface);
-        *ppobj = This;
+        *ppobj = &This->IAssemblyEnum_iface;
         return S_OK;
     }

Modified: trunk/reactos/dll/win32/fusion/asmname.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c?...
==============================================================================
--- trunk/reactos/dll/win32/fusion/asmname.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/asmname.c	[iso-8859-1] Sun Jul 19 13:16:45 2015
@@ -70,7 +70,7 @@
         IsEqualIID(riid, &IID_IAssemblyName))
     {
         IAssemblyName_AddRef(iface);
-        *ppobj = This;
+        *ppobj = &This->IAssemblyName_iface;
         return S_OK;
     }

@@ -213,12 +213,10 @@
                                                        LPDWORD pccDisplayName,
                                                        DWORD dwDisplayFlags)
 {
+    static const WCHAR equals[] = {'=',0};
     IAssemblyNameImpl *name = impl_from_IAssemblyName(iface);
-    WCHAR verstr[30];
+    WCHAR verstr[30], *cultureval = NULL;
     DWORD size;
-    LPWSTR cultureval = 0;
-
-    static const WCHAR equals[] = {'=',0};

TRACE("(%p, %p, %p, %d)\n", iface, szDisplayName,
           pccDisplayName, dwDisplayFlags);
@@ -228,9 +226,15 @@
         if (!name->displayname || !*name->displayname)
             return FUSION_E_INVALID_NAME;

-        size = min(*pccDisplayName, lstrlenW(name->displayname) + 1);
-
-        lstrcpynW(szDisplayName, name->displayname, size);
+        size = strlenW(name->displayname) + 1;
+
+        if (*pccDisplayName < size)
+        {
+            *pccDisplayName = size;
+            return E_NOT_SUFFICIENT_BUFFER;
+        }
+
+        if (szDisplayName) strcpyW(szDisplayName, name->displayname);
         *pccDisplayName = size;

return S_OK;
@@ -354,19 +358,24 @@
                                                 WCHAR *pwzName)
 {
     IAssemblyNameImpl *name = impl_from_IAssemblyName(iface);
+    DWORD len;

TRACE("(%p, %p, %p)\n", iface, lpcwBuffer, pwzName);

-    if (!name->name)
-    {
-        *pwzName = '\0';
-        *lpcwBuffer = 0;
-        return S_OK;
-    }
-
-    lstrcpyW(pwzName, name->name);
-    *lpcwBuffer = lstrlenW(pwzName) + 1;
-
+    if (name->name)
+        len = strlenW(name->name) + 1;
+    else
+        len = 0;
+
+    if (*lpcwBuffer < len)
+    {
+        *lpcwBuffer = len;
+        return E_NOT_SUFFICIENT_BUFFER;
+    }
+    if (!name->name) lpcwBuffer[0] = 0;
+    else strcpyW(pwzName, name->name);
+
+    *lpcwBuffer = len;
     return S_OK;
 }

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Jul 19 13:16:45 2015
@@ -69,7 +69,7 @@
 reactos/dll/win32/dwmapi              # Synced to WineStaging-1.7.37
 reactos/dll/win32/faultrep            # Synced to WineStaging-1.7.37
 reactos/dll/win32/fltlib              # Synced to WineStaging-1.7.47
-reactos/dll/win32/fusion              # Synced to WineStaging-1.7.37
+reactos/dll/win32/fusion              # Synced to WineStaging-1.7.47
 reactos/dll/win32/gdiplus             # Synced to WineStaging-1.7.37
 reactos/dll/win32/hhctrl.ocx          # Synced to WineStaging-1.7.37
 reactos/dll/win32/hlink               # Synced to WineStaging-1.7.37