[2/2] fusion: Get rid of some redundant buffer copying.

Hans Leidekker hans at codeweavers.com
Tue May 22 03:10:22 CDT 2012


---
 dlls/fusion/asmenum.c |    9 ++-------
 1 file 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))
-- 
1.7.10






More information about the wine-patches mailing list