Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
svn path=/trunk/; revision=68429
This commit is contained in:
Amine Khaldi 2015-07-19 13:16:45 +00:00
parent e5a146feaf
commit c2ad444c97
4 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/fusion/asmcache.c
View file

@ -151,7 +151,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_QueryInterface(IAssemblyCache *iface,
IsEqualIID(riid, &IID_IAssemblyCache))
{
IAssemblyCache_AddRef(iface);
*ppobj = This;
*ppobj = &This->IAssemblyCache_iface;
return S_OK;
}
@ -580,7 +580,7 @@ static HRESULT WINAPI IAssemblyCacheItemImpl_QueryInterface(IAssemblyCacheItem *
IsEqualIID(riid, &IID_IAssemblyCacheItem))
{
IAssemblyCacheItem_AddRef(iface);
*ppobj = This;
*ppobj = &This->IAssemblyCacheItem_iface;
return S_OK;
}

2
reactos/dll/win32/fusion/asmenum.c
View file

@ -55,7 +55,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface,
IsEqualIID(riid, &IID_IAssemblyEnum))
{
IAssemblyEnum_AddRef(iface);
*ppobj = This;
*ppobj = &This->IAssemblyEnum_iface;
return S_OK;
}

39
reactos/dll/win32/fusion/asmname.c
View file

@ -70,7 +70,7 @@ static HRESULT WINAPI IAssemblyNameImpl_QueryInterface(IAssemblyName *iface,
IsEqualIID(riid, &IID_IAssemblyName))
{
IAssemblyName_AddRef(iface);
*ppobj = This;
*ppobj = &This->IAssemblyName_iface;
return S_OK;
}
@ -213,12 +213,10 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface,
LPDWORD pccDisplayName,
DWORD dwDisplayFlags)
{
IAssemblyNameImpl *name = impl_from_IAssemblyName(iface);
WCHAR verstr[30];
DWORD size;
LPWSTR cultureval = 0;
static const WCHAR equals[] = {'=',0};
IAssemblyNameImpl *name = impl_from_IAssemblyName(iface);
WCHAR verstr[30], *cultureval = NULL;
DWORD size;
TRACE("(%p, %p, %p, %d)\n", iface, szDisplayName,
pccDisplayName, dwDisplayFlags);
@ -228,9 +226,15 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface,
if (!name->displayname || !*name->displayname)
return FUSION_E_INVALID_NAME;
size = min(*pccDisplayName, lstrlenW(name->displayname) + 1);
size = strlenW(name->displayname) + 1;
lstrcpynW(szDisplayName, name->displayname, size);
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 @@ static HRESULT WINAPI IAssemblyNameImpl_GetName(IAssemblyName *iface,
WCHAR *pwzName)
{
IAssemblyNameImpl *name = impl_from_IAssemblyName(iface);
DWORD len;
TRACE("(%p, %p, %p)\n", iface, lpcwBuffer, pwzName);
if (!name->name)
if (name->name)
len = strlenW(name->name) + 1;
else
len = 0;
if (*lpcwBuffer < len)
{
*pwzName = '\0';
*lpcwBuffer = 0;
return S_OK;
*lpcwBuffer = len;
return E_NOT_SUFFICIENT_BUFFER;
}
if (!name->name) lpcwBuffer[0] = 0;
else strcpyW(pwzName, name->name);
lstrcpyW(pwzName, name->name);
*lpcwBuffer = lstrlenW(pwzName) + 1;
*lpcwBuffer = len;
return S_OK;
}

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

@ -69,7 +69,7 @@ reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.37
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