Skip to content

W
wine-winehq
Commit 14a04861 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

fusion: Get rid of some redundant buffer copying.

parent be9459a9
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
dlls/fusion/asmenum.c
View file @ 14a04861
...@@ -398,22 +398,20 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) ...@@ -398,22 +398,20 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName)
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
strcpyW(path, buf);
GetNativeSystemInfo(&info); GetNativeSystemInfo(&info);
if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
{ {
strcpyW(path, buf);
strcpyW(path + size - 1, gac_64); strcpyW(path + size - 1, gac_64);
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
} }
strcpyW(path, buf);
strcpyW(path + size - 1, gac_32); strcpyW(path + size - 1, gac_32);
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
strcpyW(path, buf);
strcpyW(path + size - 1, gac_msil); strcpyW(path + size - 1, gac_msil);
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
if (FAILED(hr)) if (FAILED(hr))
...@@ -424,27 +422,24 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) ...@@ -424,27 +422,24 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName)
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
strcpyW(path, buf);
if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
{ {
strcpyW(path, buf);
strcpyW(path + size - 1, gac_64); strcpyW(path + size - 1, gac_64);
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
} }
strcpyW(path, buf);
strcpyW(path + size - 1, gac_32); strcpyW(path + size - 1, gac_32);
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
strcpyW(path, buf);
strcpyW(path + size - 1, gac_msil); strcpyW(path + size - 1, gac_msil);
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
strcpyW(path, buf);
strcpyW(path + size - 1, gac); strcpyW(path + size - 1, gac);
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
if (FAILED(hr)) if (FAILED(hr))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment