Mike McCormack : msiexec: Ignore the TRANSFORMS variable.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jan 4 08:42:06 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 3d2de3d5622f76b122ea132994c80a658731db77
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d2de3d5622f76b122ea132994c80a658731db77
Author: Mike McCormack <mike at codeweavers.com>
Date: Wed Jan 4 14:51:42 2006 +0100
msiexec: Ignore the TRANSFORMS variable.
Ignore the TRANSFORMS variable when building a list of transforms for
advertising. The variable is used to apply transforms when installing.
---
programs/msiexec/msiexec.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c
index 661b0f9..cff4dda 100644
--- a/programs/msiexec/msiexec.c
+++ b/programs/msiexec/msiexec.c
@@ -452,7 +452,6 @@ int main(int argc, char **argv)
DWORD RepairMode = 0;
DWORD AdvertiseMode = 0;
- LPWSTR Transforms = NULL;
struct string_list *transform_list = NULL;
LANGID Language = 0;
@@ -658,10 +657,6 @@ int main(int argc, char **argv)
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
StringListAppend(&transform_list, argvW[i]);
}
- else if(!msi_strprefix(argvW[i], "TRANSFORMS="))
- {
- StringListAppend(&transform_list, argvW[i]+11);
- }
else if(!msi_strequal(argvW[i], "/g"))
{
i++;
@@ -858,7 +853,6 @@ int main(int argc, char **argv)
MsiSetInternalUI(InstallUILevel, NULL);
Properties = build_properties( property_list );
- Transforms = build_transforms( transform_list );
if(FunctionInstallAdmin && FunctionPatch)
FunctionInstall = FALSE;
@@ -880,6 +874,7 @@ int main(int argc, char **argv)
}
else if(FunctionAdvertise)
{
+ LPWSTR Transforms = build_transforms( property_list );
ReturnCode = MsiAdvertiseProductW(PackageName, (LPWSTR) AdvertiseMode, Transforms, Language);
}
else if(FunctionPatch)
More information about the wine-cvs
mailing list