Module: wine Branch: master Commit: 14a0486118d2424b3220ba28e4f84adfafb32749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a0486118d2424b3220ba28e4...
Author: Hans Leidekker hans@codeweavers.com Date: Tue May 22 10:10:22 2012 +0200
fusion: Get rid of some redundant buffer copying.
---
dlls/fusion/asmenum.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 1d4de5b..f4da88a 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -398,22 +398,20 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr;
+ strcpyW(path, buf); GetNativeSystemInfo(&info); if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { - strcpyW(path, buf); strcpyW(path + size - 1, gac_64); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; } - strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr;
- strcpyW(path, buf); strcpyW(path + size - 1, gac_msil); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) @@ -424,27 +422,24 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr;
+ strcpyW(path, buf); if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { - strcpyW(path, buf); strcpyW(path + size - 1, gac_64); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; } - strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr;
- strcpyW(path, buf); strcpyW(path + size - 1, gac_msil); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr;
- strcpyW(path, buf); strcpyW(path + size - 1, gac); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr))