[Wine-patches] [eterhack eter-2.0.0] ntdll: Use msvcr90 from 1C8 directory (eterbug #8018).

Alexander Morozov amorozov на etersoft.ru
Вт Мар 20 16:23:41 MSK 2012


---
 dlls/ntdll/actctx.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index 4538c39..774f16e 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -1992,7 +1992,7 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl,
     TRACE( "looking for name=%s version=%s arch=%s\n",
            debugstr_w(ai->name), debugstr_version(&ai->version), debugstr_w(ai->arch) );
 
-    if (!strcasestr( __wine_main_argv[0], "sbis" ))
+    if (!strcasestr( __wine_main_argv[0], "sbis" ) && !strcasestr( __wine_main_argv[0], "1cv8" ))
         if ((status = lookup_winsxs(acl, ai)) != STATUS_NO_SUCH_FILE) return status;
 
     /* FIXME: add support for language specific lookup */
@@ -2053,7 +2053,8 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl,
     RtlFreeHeap( GetProcessHeap(), 0, directory );
     RtlFreeHeap( GetProcessHeap(), 0, buffer );
 
-    if (strcasestr( __wine_main_argv[0], "sbis" ) && status != STATUS_SUCCESS)
+    if ((strcasestr( __wine_main_argv[0], "sbis" ) || strcasestr( __wine_main_argv[0], "1cv8" )) &&
+        status != STATUS_SUCCESS)
         status = lookup_winsxs(acl, ai);
     return status;
 }
-- 
1.7.9.4



Подробная информация о списке рассылки Wine-patches