ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fusion: Use the PEKIND type where appropriate.

This commit is contained in:
Hans Leidekker 2012-05-21 11:24:41 +02:00 committed by Alexandre Julliard
parent 2ed8056a2b
commit 08cbe5d26f
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/fusion/asmcache.c
View File

@ -94,7 +94,7 @@ static BOOL create_full_path(LPCWSTR path)
return ret; return ret;
} }
static BOOL get_assembly_directory(LPWSTR dir, DWORD size, BYTE architecture) static BOOL get_assembly_directory(LPWSTR dir, DWORD size, PEKIND architecture)
{ {
static const WCHAR gac[] = {'\\','a','s','s','e','m','b','l','y','\\','G','A','C',0}; static const WCHAR gac[] = {'\\','a','s','s','e','m','b','l','y','\\','G','A','C',0};
@ -107,6 +107,9 @@ static BOOL get_assembly_directory(LPWSTR dir, DWORD size, BYTE architecture)
switch (architecture) switch (architecture)
{ {
case peNone:
break;
case peMSIL: case peMSIL:
strcatW(dir, msil); strcatW(dir, msil);
break; break;
@ -118,6 +121,10 @@ static BOOL get_assembly_directory(LPWSTR dir, DWORD size, BYTE architecture)
case peAMD64: case peAMD64:
strcatW(dir, amd64); strcatW(dir, amd64);
break; break;
default:
WARN("unhandled architecture %u\n", architecture);
return FALSE;
} }
return TRUE; return TRUE;
@ -372,6 +379,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface,
WCHAR path[MAX_PATH]; WCHAR path[MAX_PATH];
WCHAR asmdir[MAX_PATH]; WCHAR asmdir[MAX_PATH];
LPWSTR ext; LPWSTR ext;
PEKIND architecture;
HRESULT hr; HRESULT hr;
TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, TRACE("(%p, %d, %s, %p)\n", iface, dwFlags,
@ -410,7 +418,8 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface,
cache_lock( cache ); cache_lock( cache );
get_assembly_directory(asmdir, MAX_PATH, assembly_get_architecture(assembly)); architecture = assembly_get_architecture(assembly);
get_assembly_directory(asmdir, MAX_PATH, architecture);
sprintfW(path, format, asmdir, name, version, token); sprintfW(path, format, asmdir, name, version, token);

4
dlls/fusion/assembly.c
View File

@ -811,10 +811,10 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version)
return S_OK; return S_OK;
} }
BYTE assembly_get_architecture(ASSEMBLY *assembly) PEKIND assembly_get_architecture(ASSEMBLY *assembly)
{ {
if ((assembly->corhdr->MajorRuntimeVersion == 2) && (assembly->corhdr->MinorRuntimeVersion == 0)) if ((assembly->corhdr->MajorRuntimeVersion == 2) && (assembly->corhdr->MinorRuntimeVersion == 0))
return 0; /* .NET 1.x assembly */ return peNone; /* .NET 1.x assembly */
if (assembly->nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) if (assembly->nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC)
return peAMD64; /* AMD64/IA64 assembly */ return peAMD64; /* AMD64/IA64 assembly */

2
dlls/fusion/fusionpriv.h
View File

@ -433,7 +433,7 @@ HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN;
HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) DECLSPEC_HIDDEN; HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) DECLSPEC_HIDDEN;
HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) DECLSPEC_HIDDEN; HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) DECLSPEC_HIDDEN;
HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) DECLSPEC_HIDDEN; HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) DECLSPEC_HIDDEN;
BYTE assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN; PEKIND assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN;
HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) DECLSPEC_HIDDEN; HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) DECLSPEC_HIDDEN;
HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN;