#include <assert.h>
#include <winuser.h>
+#include <strsafe.h>
typedef struct {
IAssemblyName IAssemblyName_iface;
BYTE pubkey[8];
BOOL haspubkey;
+ PEKIND pekind;
+
LONG ref;
} IAssemblyNameImpl;
LPDWORD pcbProperty)
{
IAssemblyNameImpl *name = impl_from_IAssemblyName(iface);
+ DWORD size;
TRACE("(%p, %d, %p, %p)\n", iface, PropertyId, pvProperty, pcbProperty);
- *((LPWSTR)pvProperty) = '\0';
-
+ size = *pcbProperty;
switch (PropertyId)
{
case ASM_NAME_NULL_PUBLIC_KEY:
*pcbProperty = 0;
if (name->name)
{
- lstrcpyW(pvProperty, name->name);
*pcbProperty = (lstrlenW(name->name) + 1) * 2;
+ if (size < *pcbProperty)
+ return STRSAFE_E_INSUFFICIENT_BUFFER;
+ lstrcpyW(pvProperty, name->name);
}
break;
case ASM_NAME_MAJOR_VERSION:
*pcbProperty = 0;
- *((WORD *)pvProperty) = name->version[0];
if (name->versize >= 1)
+ {
*pcbProperty = sizeof(WORD);
+ if (size < *pcbProperty)
+ return STRSAFE_E_INSUFFICIENT_BUFFER;
+ *((WORD *)pvProperty) = name->version[0];
+ }
break;
case ASM_NAME_MINOR_VERSION:
*pcbProperty = 0;
- *((WORD *)pvProperty) = name->version[1];
if (name->versize >= 2)
+ {
*pcbProperty = sizeof(WORD);
+ if (size < *pcbProperty)
+ return STRSAFE_E_INSUFFICIENT_BUFFER;
+ *((WORD *)pvProperty) = name->version[1];
+ }
break;
case ASM_NAME_BUILD_NUMBER:
*pcbProperty = 0;
- *((WORD *)pvProperty) = name->version[2];
if (name->versize >= 3)
+ {
*pcbProperty = sizeof(WORD);
+ if (size < *pcbProperty)
+ return STRSAFE_E_INSUFFICIENT_BUFFER;
+ *((WORD *)pvProperty) = name->version[2];
+ }
break;
case ASM_NAME_REVISION_NUMBER:
*pcbProperty = 0;
- *((WORD *)pvProperty) = name->version[3];
if (name->versize >= 4)
+ {
*pcbProperty = sizeof(WORD);
+ if (size < *pcbProperty)
+ return STRSAFE_E_INSUFFICIENT_BUFFER;
+ *((WORD *)pvProperty) = name->version[3];
+ }
break;
case ASM_NAME_CULTURE:
*pcbProperty = 0;
if (name->culture)
{
- lstrcpyW(pvProperty, name->culture);
*pcbProperty = (lstrlenW(name->culture) + 1) * 2;
+ if (size < *pcbProperty)
+ return STRSAFE_E_INSUFFICIENT_BUFFER;
+ lstrcpyW(pvProperty, name->culture);
}
break;
*pcbProperty = 0;
if (name->haspubkey)
{
- memcpy(pvProperty, name->pubkey, sizeof(DWORD) * 2);
*pcbProperty = sizeof(DWORD) * 2;
+ if (size < *pcbProperty)
+ return STRSAFE_E_INSUFFICIENT_BUFFER;
+ memcpy(pvProperty, name->pubkey, sizeof(DWORD) * 2);
+ }
+ break;
+
+ case ASM_NAME_ARCHITECTURE:
+ *pcbProperty = 0;
+ if (name->pekind != peNone)
+ {
+ *pcbProperty = sizeof(PEKIND);
+ if (size < *pcbProperty)
+ return STRSAFE_E_INSUFFICIENT_BUFFER;
+ *((PEKIND *)pvProperty) = name->pekind;
}
break;
size += lstrlenW(separator) + lstrlenW(procarch) + lstrlenW(equals) + lstrlenW(name->procarch);
if (size > *pccDisplayName)
- return S_FALSE;
+ {
+ *pccDisplayName = size;
+ return E_NOT_SUFFICIENT_BUFFER;
+ }
/* Construct the string */
lstrcpyW(szDisplayName, name->name);
if ((dwDisplayFlags & ASM_DISPLAYF_PUBLIC_KEY_TOKEN) && (name->haspubkey))
{
WCHAR pkt[CHARS_PER_PUBKEY + 1];
- static const WCHAR spec[] = {'%','0','x','%','0','x','%','0','x',
- '%','0','x','%','0','x','%','0','x','%','0','x','%','0','x',0};
+ static const WCHAR spec[] = {'%','0','2','x','%','0','2','x','%','0','2','x',
+ '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x',0};
lstrcatW(szDisplayName, separator);
return S_OK;
}
+static HRESULT parse_procarch(IAssemblyNameImpl *name, LPCWSTR procarch)
+{
+ static const WCHAR msilW[] = {'m','s','i','l',0};
+ static const WCHAR x86W[] = {'x','8','6',0};
+ static const WCHAR ia64W[] = {'i','a','6','4',0};
+ static const WCHAR amd64W[] = {'a','m','d','6','4',0};
+
+ if (!lstrcmpiW(procarch, msilW))
+ name->pekind = peMSIL;
+ else if (!lstrcmpiW(procarch, x86W))
+ name->pekind = peI386;
+ else if (!lstrcmpiW(procarch, ia64W))
+ name->pekind = peIA64;
+ else if (!lstrcmpiW(procarch, amd64W))
+ name->pekind = peAMD64;
+ else
+ {
+ ERR("unrecognized architecture: %s\n", wine_dbgstr_w(procarch));
+ return FUSION_E_INVALID_NAME;
+ }
+
+ return S_OK;
+}
+
static WCHAR *parse_value( const WCHAR *str, unsigned int len )
{
WCHAR *ret;
{
name->procarch = value;
value = NULL;
+
+ hr = parse_procarch( name, name->procarch );
}
HeapFree( GetProcessHeap(), 0, value );